Updated Finnish translation

svn path=/trunk/; revision=9623

2 files changed, 1408 insertions, 1211 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 8c75725dc0..b2a015a988 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-28  Jarkko Ranta  <jjranta@cc.joensuu.fi>
+
+	* fi.po: Updated Finnish translation.
+
 2001-04-28  Peter Williams  <peterw@ximian.com>
 
 	* POTFILES.in: Reflect Danw's move of mail/session.c to
diff --git a/po/fi.po b/po/fi.po
index f06f5e582d..3da1c25a11 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-04-17 13:50+0000\n"
-"PO-Revision-Date: 2001-04-11 15:00+0300\n"
+"POT-Creation-Date: 2001-04-29 11:21+0000\n"
+"PO-Revision-Date: 2001-04-25 15:00+0300\n"
 "Last-Translator: Jarkko Ranta <jjranta@cc.joensuu.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -15,7 +15,7 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card.c:3209
 msgid "Card: "
-msgstr ""
+msgstr "Kortti: "
 
 #: addressbook/backend/ebook/e-card.c:3211
 msgid ""
@@ -30,24 +30,32 @@ msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
+"\n"
+"  Etuliite:   "
 
 #: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
+"\n"
+"  Etunimi:    "
 
 #: addressbook/backend/ebook/e-card.c:3214
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
+"\n"
+"  Muut nimet: "
 
 #: addressbook/backend/ebook/e-card.c:3215
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
+"\n"
+"  Sukunimi:   "
 
 #: addressbook/backend/ebook/e-card.c:3216
 msgid ""
@@ -76,6 +84,8 @@ msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
+"\n"
+"  Postilokero: "
 
 #: addressbook/backend/ebook/e-card.c:3244
 msgid ""
@@ -132,12 +142,16 @@ msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
+"\n"
+"Puhelimet:\n"
 
 #: addressbook/backend/ebook/e-card.c:3277
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
+"\n"
+"Puhelin:"
 
 #: addressbook/backend/ebook/e-card.c:3301
 msgid ""
@@ -174,6 +188,8 @@ msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
+"\n"
+"Maant. sijainti: "
 
 #: addressbook/backend/ebook/e-card.c:3341
 msgid ""
@@ -200,24 +216,32 @@ msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
+"\n"
+"  Yksikkö: "
 
 #: addressbook/backend/ebook/e-card.c:3356
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
+"\n"
+"  Yksikkö2: "
 
 #: addressbook/backend/ebook/e-card.c:3357
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
+"\n"
+"  Yksikkö3: "
 
 #: addressbook/backend/ebook/e-card.c:3358
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
+"\n"
+"  Yksikkö4: "
 
 #: addressbook/backend/ebook/e-card.c:3362
 msgid ""
@@ -257,6 +281,10 @@ msgstr ""
 "\n"
 "Julkinen avain: "
 
+#: addressbook/backend/ebook/e-destination.c:232
+msgid "???"
+msgstr "???"
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
 msgid "Factory to import GnomeCard files into Evolution."
 msgstr ""
@@ -270,16 +298,16 @@ msgstr ""
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:43
+#: addressbook/gui/component/addressbook-factory.c:42
 #: calendar/conduits/calendar/calendar-conduit.c:1151
 #: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:99 calendar/gui/main.c:57
+#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
 msgid "Could not initialize Bonobo"
 msgstr "Bonobon alustus ei onnistunut"
 
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
-msgstr ""
+msgstr "Kohdistimen lataaminen epäonnistui\n"
 
 #: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
@@ -394,15 +422,16 @@ msgstr "_Syntymäpäivä:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:21
 msgid "_Business"
-msgstr ""
+msgstr "_Työ"
 
 #: addressbook/contact-editor/contact-editor.glade.h:22
 msgid "_Company:"
 msgstr "_Yritys:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:93 ui/evolution-task-editor-dialog.xml.h:69
+#: mail/folder-browser.c:625 mail/mail-config.glade.h:75
+#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:98
+#: ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Poista"
 
@@ -448,11 +477,7 @@ msgstr "Puoli_so:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:34
 msgid "_This is the mailing address"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Poista kontakti?"
+msgstr "_Tämä on postitusosoite"
 
 #: addressbook/contact-editor/e-contact-editor.c:603
 msgid "This contact belongs to these categories:"
@@ -475,7 +500,7 @@ msgstr "Työ 2"
 #: addressbook/contact-editor/e-contact-editor.c:1245
 #: addressbook/gui/widgets/e-addressbook-view.c:656
 msgid "Business Fax"
-msgstr "Työ-faksi"
+msgstr "Työ/faksi"
 
 #: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Callback"
@@ -501,7 +526,7 @@ msgstr "Koti 2"
 #: addressbook/contact-editor/e-contact-editor.c:1251
 #: addressbook/gui/widgets/e-addressbook-view.c:657
 msgid "Home Fax"
-msgstr "Koti-faksi"
+msgstr "Koti/faksi"
 
 #: addressbook/contact-editor/e-contact-editor.c:1252
 #: addressbook/gui/widgets/e-addressbook-view.c:660
@@ -514,7 +539,7 @@ msgstr "Matkapuhelin"
 
 #: addressbook/contact-editor/e-contact-editor.c:1254
 #: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:40
 msgid "Other"
 msgstr "Muut"
 
@@ -530,7 +555,7 @@ msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:1257
 msgid "Primary"
-msgstr ""
+msgstr "Ensisijainen"
 
 #: addressbook/contact-editor/e-contact-editor.c:1258
 #: addressbook/gui/widgets/e-addressbook-view.c:664
@@ -556,20 +581,24 @@ msgstr "Sähköposti 2"
 msgid "Email 3"
 msgstr "Sähköposti 3"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:223
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Poista kontakti?"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:233
 msgid "Contact Quick-Add"
 msgstr "Kontaktin pikalisäys"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:225
+#: addressbook/contact-editor/e-contact-quick-add.c:235
 msgid "Edit Full"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:262
+#: addressbook/contact-editor/e-contact-quick-add.c:276
 #: addressbook/gui/widgets/e-addressbook-view.c:643
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:268
+#: addressbook/contact-editor/e-contact-quick-add.c:282
 msgid "E-mail"
 msgstr "Sähköposti"
 
@@ -725,24 +754,20 @@ msgstr ""
 
 #: addressbook/gui/component/addressbook.c:587 calendar/gui/gnome-cal.c:236
 msgid "Any field contains"
-msgstr ""
+msgstr "Mikä tahansa kenttä sisältää"
 
 #: addressbook/gui/component/addressbook.c:588
 msgid "Name contains"
-msgstr ""
+msgstr "Nimi sisältää"
 
 #: addressbook/gui/component/addressbook.c:589
 msgid "Email contains"
-msgstr ""
+msgstr "Sähköposti sisältää"
 
 #: addressbook/gui/component/addressbook.c:732
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "Muut kontaktit"
-
 #: addressbook/gui/component/addressbook-config.c:148
 msgid "LDAP Server"
 msgstr "LDAP-palvelin"
@@ -801,12 +826,12 @@ msgstr ""
 #: addressbook/gui/component/addressbook-config.c:356
 #: mail/mail-config.glade.h:50
 msgid "Remember this password"
-msgstr ""
+msgstr "Muista tämä salasana"
 
 #: addressbook/gui/component/addressbook-config.c:406
 #: mail/mail-config.glade.h:28
 msgid "Host:"
-msgstr "Isäntä:"
+msgstr "Isäntäpalvelin:"
 
 #: addressbook/gui/component/addressbook-config.c:407
 msgid "FIXME Host help text here."
@@ -892,10 +917,10 @@ msgstr "Osoitekirjan lähteet"
 #: addressbook/gui/widgets/e-minicard.c:673
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/folder-browser.c:597
-#: mail/mail-config.glade.h:19 mail/mail-view.c:156
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
+#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:19
+#: mail/message-browser.c:203 ui/evolution-addressbook.xml.h:3
+#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "Poista"
 
@@ -913,6 +938,10 @@ msgstr "Nimi"
 msgid "URI"
 msgstr "URI"
 
+#: addressbook/gui/component/addressbook-storage.c:99
+msgid "Other Contacts"
+msgstr "Muut kontaktit"
+
 #: addressbook/gui/component/e-address-widget.c:365
 msgid "Disable Queries"
 msgstr ""
@@ -975,16 +1004,8 @@ msgstr ""
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr ""
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr ""
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:402
+#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
 #: filter/filter-rule.c:549 filter/filter.glade.h:9
 #: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
 msgid "Remove"
@@ -994,6 +1015,14 @@ msgstr "Poista"
 msgid "Remove All"
 msgstr "Poista kaikki"
 
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr ""
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Etsi..."
@@ -1140,10 +1169,9 @@ msgid "Send message to contact"
 msgstr "Lähetä viesti kontaktille"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
-#: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:51
-#: ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-minicard.c:671 mail/message-browser.c:200
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
+#: ui/evolution-mail.xml.h:55 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Tulosta"
 
@@ -1465,6 +1493,46 @@ msgstr ""
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
+#: calendar/gui/alarm-notify/alarm-queue.c:586
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:941
+msgid "Reminder of your appointment at "
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr ""
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:890
+#: calendar/gui/alarm-notify/alarm-queue.c:945
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:56
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+msgid "Could not initialize GNOME"
+msgstr "GNOMEn alustus ei onnistunut"
+
+#: calendar/gui/alarm-notify/notify-main.c:108
+msgid "Could not create the alarm notify service factory"
+msgstr ""
+
 #: calendar/gui/calendar-commands.c:266
 msgid "File not found"
 msgstr ""
@@ -1482,108 +1550,108 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
+#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
 #: calendar/gui/e-calendar-table.c:330
 msgid "Public"
 msgstr "Julkinen"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
+#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
 #: calendar/gui/e-calendar-table.c:331
 msgid "Private"
 msgstr "Henkilökohtainen"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
 #: calendar/gui/e-calendar-table.c:332
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1592
-#: calendar/gui/event-editor.c:1619
+#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1606
+#: calendar/gui/event-editor.c:1633
 #: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Unknown"
 msgstr "Tuntematon"
 
 #: calendar/gui/calendar-model.c:457
 msgid "N"
-msgstr ""
+msgstr "P"
 
 #: calendar/gui/calendar-model.c:457
 msgid "S"
-msgstr ""
+msgstr "E"
 
 #: calendar/gui/calendar-model.c:459
 msgid "E"
-msgstr ""
+msgstr "I"
 
 #: calendar/gui/calendar-model.c:459
 msgid "W"
-msgstr ""
+msgstr "L"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:690
 msgid "High"
 msgstr "Korkea"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
-#: calendar/gui/calendar-model.c:1569
+#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
+#: calendar/gui/calendar-model.c:1572
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:689
 msgid "Normal"
 msgstr "Tavallinen"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
+#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:688
 msgid "Low"
 msgstr "Matala"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
 #: calendar/gui/e-calendar-table.c:406
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
 #: calendar/gui/e-calendar-table.c:405
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
+#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:14
 #: calendar/gui/e-calendar-table.c:426
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:11
 #: calendar/gui/e-calendar-table.c:427
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:6
 #: calendar/gui/e-calendar-table.c:428
 msgid "Completed"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
-#: camel/camel-service.c:586
+#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Peruutettu"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:287
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:799
+#: calendar/gui/calendar-model.c:802
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1594,7 +1662,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:879
+#: calendar/gui/calendar-model.c:882
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
@@ -1602,89 +1670,102 @@ msgstr ""
 "'Määrittelemätön'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
-#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
+#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
+#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:329
 #: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
 #: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1129
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
-#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
+#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1179
+#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
+#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
 msgid "None"
 msgstr "Määrittelemätön"
 
-#: calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:970
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1007
+#: calendar/gui/calendar-model.c:1010
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1048
+#: calendar/gui/calendar-model.c:1051
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "Prioriteetin tulee olla 'Korkea', 'Tavallinen', 'Matala' tai "
 "'Määrittelemätön'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1061
+#: calendar/gui/calendar-model.c:1064
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 #: calendar/gui/e-calendar-table.c:355
 msgid "Undefined"
 msgstr "Määrittelemätön"
 
-#: calendar/gui/calendar-model.c:1102
+#: calendar/gui/calendar-model.c:1105
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1571
+#: calendar/gui/calendar-model.c:1574
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1573
+#: calendar/gui/calendar-model.c:1576
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1582
 msgid "Yes"
 msgstr "Kyllä"
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1582
 msgid "No"
 msgstr "Ei"
 
-#: calendar/gui/calendar-summary.c:196
+#: calendar/gui/calendar-summary.c:198
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
+#: calendar/gui/calendar-summary.c:207
+msgid "Appointments"
+msgstr "Tapaamiset"
+
+#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
 msgid "%I:%M%p"
 msgstr "%I:%M%p"
 
-#: calendar/gui/calendar-summary.c:437
+#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Tehtävät"
+
+#: calendar/gui/calendar-summary.c:443
 msgid "<b>Error loading calendar</b>"
 msgstr "<b>Virhe ladattaessa kalenteria</b>"
 
-#: calendar/gui/calendar-summary.c:449
+#: calendar/gui/calendar-summary.c:455
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr "<b>Virhe ladattaessa kalenteria:<br>Metodia ei tueta"
 
-#: calendar/gui/calendar-summary.c:616
+#: calendar/gui/calendar-summary.c:622
 msgid "Display"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:621
+#: calendar/gui/calendar-summary.c:627
 msgid "Show appointments"
 msgstr "Näytä tapaamiset"
 
-#: calendar/gui/calendar-summary.c:629
+#: calendar/gui/calendar-summary.c:635
 msgid "Show tasks"
 msgstr "Näytä tehtävät"
 
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
+#: calendar/gui/calendar-summary.c:690
+msgid "Things to do"
+msgstr ""
+
+#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Ladataan kalenteria"
 
@@ -1692,46 +1773,6 @@ msgstr "Ladataan kalenteria"
 msgid "The URI that the calendar will display"
 msgstr "URI jonka kalenteri näyttää"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr ""
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr ""
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
-msgstr ""
-
-#: calendar/gui/alarm-notify/notify-main.c:56
-#, c-format
-msgid ""
-"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
-"know."
-msgstr ""
-
-#: calendar/gui/alarm-notify/notify-main.c:94 calendar/gui/main.c:52
-msgid "Could not initialize GNOME"
-msgstr "GNOMEn alustus ei onnistunut"
-
-#: calendar/gui/alarm-notify/notify-main.c:109
-msgid "Could not create the alarm notify service factory"
-msgstr ""
-
 #: calendar/gui/dialogs/alarm-notify-dialog.c:189
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
@@ -1850,7 +1891,7 @@ msgid "Fri"
 msgstr "Pe"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/event-editor.c:484
 msgid "Friday"
 msgstr "Perjantai"
 
@@ -1879,7 +1920,7 @@ msgid "Mon"
 msgstr "Ma"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:480
 msgid "Monday"
 msgstr "Maanantai"
 
@@ -1915,7 +1956,7 @@ msgid "Sat"
 msgstr "La"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/event-editor.c:485
 msgid "Saturday"
 msgstr "Lauantai"
 
@@ -1940,7 +1981,7 @@ msgid "Sun"
 msgstr "Su"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/event-editor.c:486
 msgid "Sunday"
 msgstr "Sunnuntai"
 
@@ -1953,7 +1994,7 @@ msgid "Thu"
 msgstr "To"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/event-editor.c:483
 msgid "Thursday"
 msgstr "Torstai"
 
@@ -1974,7 +2015,7 @@ msgid "Tue"
 msgstr "Ti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:481
 msgid "Tuesday"
 msgstr "Tiistai"
 
@@ -1987,7 +2028,7 @@ msgid "Wed"
 msgstr "Ke"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:482
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
@@ -2033,6 +2074,29 @@ msgstr ""
 
 #: calendar/gui/dialogs/save-comp.c:51
 msgid "Do you want to save changes?"
+msgstr "Haluatko tallentaa muutokset?"
+
+#: calendar/gui/dialogs/task-editor.c:707
+msgid "Edit Task"
+msgstr "Muokkaa tehtävää"
+
+#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:382
+msgid "No summary"
+msgstr "Ei kuvausta"
+
+#: calendar/gui/dialogs/task-editor.c:719 calendar/gui/event-editor.c:388
+#, c-format
+msgid "Appointment - %s"
+msgstr "Tapaaminen - %s"
+
+#: calendar/gui/dialogs/task-editor.c:722 calendar/gui/event-editor.c:391
+#, c-format
+msgid "Task - %s"
+msgstr "Tehtävä - %s"
+
+#: calendar/gui/dialogs/task-editor.c:725 calendar/gui/event-editor.c:394
+#, c-format
+msgid "Journal entry - %s"
 msgstr ""
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:2
@@ -2108,29 +2172,6 @@ msgstr "_Prioriteetti:"
 msgid "_Status:"
 msgstr "_Tila:"
 
-#: calendar/gui/dialogs/task-editor.c:697
-msgid "Edit Task"
-msgstr "Muokkaa tehtävää"
-
-#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
-msgid "No summary"
-msgstr "Ei kuvausta"
-
-#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
-#, c-format
-msgid "Appointment - %s"
-msgstr "Tapaaminen - %s"
-
-#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Task - %s"
-msgstr "Tehtävä - %s"
-
-#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
-#, c-format
-msgid "Journal entry - %s"
-msgstr ""
-
 #: calendar/gui/e-calendar-table.c:157
 msgid "Categories"
 msgstr "Ryhmät"
@@ -2157,7 +2198,7 @@ msgstr ""
 
 #: calendar/gui/e-calendar-table.c:166
 msgid "Summary"
-msgstr "Kauvaus"
+msgstr "Kuvaus"
 
 #: calendar/gui/e-calendar-table.c:167
 msgid "Transparency"
@@ -2255,10 +2296,17 @@ msgstr "Poista tämä tehtävä"
 msgid "Delete the task"
 msgstr "Poista tehtävä"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr ""
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
+#: calendar/gui/print.c:617
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
+#: calendar/gui/print.c:616
+msgid "pm"
+msgstr "pm"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
@@ -2281,18 +2329,6 @@ msgstr "%a %d %b"
 msgid "%d %b"
 msgstr "%d %b"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr "pm"
-
 #: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
 msgid "New Appointment"
 msgstr "Uusi tapaaminen"
@@ -2310,8 +2346,7 @@ msgid "Go to Date..."
 msgstr "Siirry päivään..."
 
 #: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
-#: ui/evolution-message-composer.xml.h:10
+#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Avaa"
 
@@ -2336,6 +2371,11 @@ msgstr ""
 msgid "Delete all Occurrences"
 msgstr ""
 
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
+
 #: calendar/gui/e-itip-control.c:161
 msgid "I couldn't update your calendar file!\n"
 msgstr ""
@@ -2350,15 +2390,15 @@ msgstr ""
 
 #: calendar/gui/e-itip-control.c:197
 msgid "I couldn't open your calendar file!\n"
-msgstr ""
+msgstr "En pystynyt avaamaan kalenteritiedostoasi!\n"
 
 #: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
 msgid "I couldn't load your calendar file!\n"
-msgstr ""
+msgstr "En pystynyt lataamaan kalenteritiedostoasi!\n"
 
 #: calendar/gui/e-itip-control.c:470
 msgid "I couldn't read your calendar file!\n"
-msgstr ""
+msgstr "En pystynyt lukemaan kalenteritiedostoasi!\n"
 
 #: calendar/gui/e-itip-control.c:483
 msgid "This is a reply from someone who was uninvited!"
@@ -2417,7 +2457,7 @@ msgstr ""
 msgid "Calendar Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
 msgid "Date:"
 msgstr "Päiväys:"
 
@@ -2485,38 +2525,38 @@ msgstr ""
 msgid "Organizer: "
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:15
+#: calendar/gui/e-meeting-dialog.glade.h:14
 msgid ""
 "Publish\n"
 "Event"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:17
+#: calendar/gui/e-meeting-dialog.glade.h:16
 msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:18
+#: calendar/gui/e-meeting-dialog.glade.h:17
 msgid ""
 "Request\n"
 "Meeting"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:20
+#: calendar/gui/e-meeting-dialog.glade.h:19
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:21
+#: calendar/gui/e-meeting-dialog.glade.h:20
 msgid "Role"
 msgstr "Rooli"
 
-#: calendar/gui/e-meeting-dialog.glade.h:22
+#: calendar/gui/e-meeting-dialog.glade.h:21
 msgid ""
 "Schedule\n"
 "Time"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1052
+#: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
+#: mail/message-list.c:1082
 msgid "Status"
 msgstr "Tila"
 
@@ -2539,21 +2579,120 @@ msgstr ""
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
-msgid "%d %B"
-msgstr "%d %B"
+#: calendar/gui/event-editor.c:376
+msgid "Edit Appointment"
+msgstr "Muokkaa tapaamista"
 
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "Uusi tapaaminen..."
+#: calendar/gui/event-editor.c:454
+msgid "on"
+msgstr ""
 
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
+#: calendar/gui/event-editor.c:479 filter/filter-datespec.c:81
+msgid "day"
+msgstr "päivä"
+
+#: calendar/gui/event-editor.c:606
+msgid "on the"
+msgstr ""
+
+#: calendar/gui/event-editor.c:613
+msgid "th"
+msgstr "."
+
+#: calendar/gui/event-editor.c:759
+msgid "occurrences"
 msgstr ""
 
+#: calendar/gui/event-editor.c:876
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
+
+#: calendar/gui/event-editor.c:1548
+#, c-format
+msgid " %d days"
+msgstr " %d päivää"
+
+#: calendar/gui/event-editor.c:1550
+msgid " 1 day"
+msgstr " 1 päivä"
+
+#: calendar/gui/event-editor.c:1553
+#, c-format
+msgid " %d weeks"
+msgstr " %d viikkoa"
+
+#: calendar/gui/event-editor.c:1555
+msgid " 1 week"
+msgstr " 1 viikko"
+
+#: calendar/gui/event-editor.c:1558
+#, c-format
+msgid " %d hours"
+msgstr " %d tuntia"
+
+#: calendar/gui/event-editor.c:1560
+msgid " 1 hour"
+msgstr " 1 tunti"
+
+#: calendar/gui/event-editor.c:1563
+#, c-format
+msgid " %d minutes"
+msgstr " %d minuuttia"
+
+#: calendar/gui/event-editor.c:1565
+msgid " 1 minute"
+msgstr " 1 minuutti"
+
+#: calendar/gui/event-editor.c:1568
+#, c-format
+msgid " %d seconds"
+msgstr " %d sekuntia"
+
+#: calendar/gui/event-editor.c:1570
+msgid " 1 second"
+msgstr " 1 sekunti"
+
+#: calendar/gui/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor.c:1593
+msgid "Play a sound"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor.c:1596
+msgid "Show a dialog"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor.c:1599
+msgid "Send an email"
+msgstr "Lähetä sähköpostia"
+
+#: calendar/gui/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor.c:1602
+msgid "Run a program"
+msgstr "Aja ohjelma"
+
+#: calendar/gui/event-editor.c:1617
+msgid " before start of appointment"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1619
+msgid " after start of appointment"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1627
+msgid " before end of appointment"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1629
+msgid " after end of appointment"
+msgstr ""
+
+#: calendar/gui/event-editor.c:3137 calendar/gui/print.c:1097
+#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
+
 #: calendar/gui/event-editor-dialog.glade.h:1
 msgid "A_ll day event"
 msgstr "_Koko päivän kestävä tapahtuma"
@@ -2586,11 +2725,6 @@ msgstr "Muuta"
 msgid "No recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1579
-msgid "Play a sound"
-msgstr ""
-
 #: calendar/gui/event-editor-dialog.glade.h:15
 msgid "Preview"
 msgstr ""
@@ -2607,25 +2741,10 @@ msgstr ""
 msgid "Reminder"
 msgstr "Muistutus"
 
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1588
-msgid "Run a program"
-msgstr "Aja ohjelma"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1585
-msgid "Send an email"
-msgstr "Lähetä sähköpostia"
-
 #: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
 msgid "Settings..."
 msgstr "Asetukset..."
 
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1582
-msgid "Show a dialog"
-msgstr ""
-
 #: calendar/gui/event-editor-dialog.glade.h:26
 msgid "Simple recurrence"
 msgstr ""
@@ -2695,100 +2814,51 @@ msgstr "viikkoa"
 msgid "year(s)"
 msgstr "vuotta"
 
-#: calendar/gui/event-editor.c:373
-msgid "Edit Appointment"
-msgstr "Muokkaa tapaamista"
-
-#: calendar/gui/event-editor.c:451
-msgid "on"
-msgstr ""
-
-#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
-msgid "day"
-msgstr "päivä"
-
-#: calendar/gui/event-editor.c:603
-msgid "on the"
-msgstr ""
-
-#: calendar/gui/event-editor.c:610
-msgid "th"
-msgstr "."
-
-#: calendar/gui/event-editor.c:756
-msgid "occurrences"
-msgstr ""
+#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
+msgid "New Appointment..."
+msgstr "Uusi tapaaminen..."
 
-#: calendar/gui/event-editor.c:873
-msgid "This appointment contains recurrences that Evolution cannot edit."
+#: calendar/gui/e-week-view.c:3314
+msgid "Delete All Occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1534
-#, c-format
-msgid " %d days"
-msgstr " %d päivää"
-
-#: calendar/gui/event-editor.c:1536
-msgid " 1 day"
-msgstr " 1 päivä"
-
-#: calendar/gui/event-editor.c:1539
-#, c-format
-msgid " %d weeks"
-msgstr " %d viikkoa"
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:342
+msgid "%d %B"
+msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:1541
-msgid " 1 week"
-msgstr " 1 viikko"
+#: calendar/gui/gnome-cal.c:223
+msgid "Show all "
+msgstr "Näytä kaikki "
 
-#: calendar/gui/event-editor.c:1544
-#, c-format
-msgid " %d hours"
-msgstr " %d tuntia"
+#: calendar/gui/gnome-cal.c:237
+msgid "Summary contains"
+msgstr "Yhteenveto sisältää"
 
-#: calendar/gui/event-editor.c:1546
-msgid " 1 hour"
-msgstr " 1 tunti"
+#: calendar/gui/gnome-cal.c:238
+msgid "Description contains"
+msgstr "Kuvaus sisältää"
 
-#: calendar/gui/event-editor.c:1549
-#, c-format
-msgid " %d minutes"
-msgstr " %d minuuttia"
+#: calendar/gui/gnome-cal.c:239
+msgid "Comment contains"
+msgstr "Kommentti sisältää"
 
-#: calendar/gui/event-editor.c:1551
-msgid " 1 minute"
-msgstr " 1 minuutti"
+#: calendar/gui/gnome-cal.c:240
+msgid "Has category"
+msgstr "Sisältää ryhmän"
 
-#: calendar/gui/event-editor.c:1554
+#: calendar/gui/gnome-cal.c:843
 #, c-format
-msgid " %d seconds"
-msgstr " %d sekuntia"
-
-#: calendar/gui/event-editor.c:1556
-msgid " 1 second"
-msgstr " 1 sekunti"
-
-#: calendar/gui/event-editor.c:1603
-msgid " before start of appointment"
-msgstr ""
-
-#: calendar/gui/event-editor.c:1605
-msgid " after start of appointment"
-msgstr ""
-
-#: calendar/gui/event-editor.c:1613
-msgid " before end of appointment"
+msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1615
-msgid " after end of appointment"
+#: calendar/gui/gnome-cal.c:854
+#, c-format
+msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/event-editor.c:3123 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
 msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
@@ -2821,36 +2891,6 @@ msgstr ""
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:223
-msgid "Show all "
-msgstr "Näytä kaikki "
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Summary contains"
-msgstr "Yhteenveto sisältää"
-
-#: calendar/gui/gnome-cal.c:238
-msgid "Description contains"
-msgstr "Kuvaus sisältää"
-
-#: calendar/gui/gnome-cal.c:239
-msgid "Comment contains"
-msgstr "Kommentti sisältää"
-
-#: calendar/gui/gnome-cal.c:240
-msgid "Has category"
-msgstr "Sisältää ryhmän"
-
-#: calendar/gui/gnome-cal.c:843
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:854
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr ""
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Huhtikuu"
@@ -3059,10 +3099,6 @@ msgstr "Pe"
 msgid "Sa"
 msgstr "La"
 
-#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Tehtävät"
-
 #. Day
 #: calendar/gui/print.c:1078
 msgid "Current day (%a %b %d %Y)"
@@ -3095,9 +3131,9 @@ msgstr ""
 msgid "Print Calendar"
 msgstr "Tulosta kalenteri"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1406
+#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1524
 #: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:57
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
 
@@ -3302,12 +3338,12 @@ msgstr "Viestin tallentaminen väliaikaistiedostoon %s epäonnistui: %s"
 #: camel/camel-movemail.c:306
 #, c-format
 msgid "Could not create pipe: %s"
-msgstr ""
+msgstr "Putken luonti epäonnistui: %s"
 
 #: camel/camel-movemail.c:318
 #, c-format
 msgid "Could not fork: %s"
-msgstr ""
+msgstr "Haaroitus epäonnistui: %s"
 
 #: camel/camel-movemail.c:356
 #, c-format
@@ -3323,54 +3359,54 @@ msgstr "(tuntematon virhe)"
 msgid "Error copying mail temp file: %s"
 msgstr "Virhe kopioitaessa viestin väliaikaistiedostoa: %s"
 
-#: camel/camel-pgp-context.c:190
+#: camel/camel-pgp-context.c:188
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:191
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:513
+#: camel/camel-pgp-context.c:509
 msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:520 camel/camel-pgp-context.c:692
-#: camel/camel-pgp-context.c:1061 camel/camel-pgp-context.c:1273
+#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
+#: camel/camel-pgp-context.c:1055 camel/camel-pgp-context.c:1267
 msgid "No password provided."
-msgstr "Ei salasanaa."
+msgstr "Ei annettu salasanaa."
 
-#: camel/camel-pgp-context.c:526 camel/camel-pgp-context.c:698
-#: camel/camel-pgp-context.c:881 camel/camel-pgp-context.c:1068
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
+#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1062
+#: camel/camel-pgp-context.c:1274
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr ""
+msgstr "Putken luominen GPG/PGP:lle epäonnistui: %s"
 
-#: camel/camel-pgp-context.c:685
+#: camel/camel-pgp-context.c:681
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:875
+#: camel/camel-pgp-context.c:871
 msgid "No plaintext to verify."
 msgstr ""
 
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:888
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Väliaikaistiedostoa ei voitu luoda: %s"
 
-#: camel/camel-pgp-context.c:1051
+#: camel/camel-pgp-context.c:1045
 msgid "No plaintext to encrypt."
 msgstr "Ei puhdasta tekstiä salattavaksi."
 
-#: camel/camel-pgp-context.c:1077
+#: camel/camel-pgp-context.c:1071
 msgid "No recipients specified"
 msgstr "Vastaanottajia ei ole määritelty"
 
-#: camel/camel-pgp-context.c:1265
+#: camel/camel-pgp-context.c:1259
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -3518,68 +3554,76 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:416
+#: camel/providers/imap/camel-imap-store.c:421
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr ""
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
 msgstr "Tämä valitsin yhdistää palvelimeen yksinkertaista salasanaa käyttäen."
 
-#: camel/camel-search-private.c:110
+#: camel/camel-sasl-login.c:127
+msgid "Unknown authentication state."
+msgstr "Tuntematon todennustila."
+
+#: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:152
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:168
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:554
+#: camel/camel-service.c:548
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:581
+#: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:606
+#: camel/camel-service.c:600
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:608
+#: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:58
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:273 camel/camel-session.c:363
+#: camel/camel-session.c:294 camel/camel-session.c:363
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:462
+#: camel/camel-session.c:478
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3589,11 +3633,34 @@ msgstr ""
 "%s"
 
 #. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:994 mail/mail-ops.c:1001
-#: mail/mail-ops.c:1019 mail/mail-ops.c:1020
+#: camel/camel-store.c:380 mail/mail-ops.c:1007 mail/mail-ops.c:1014
+#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
 msgid "Trash"
 msgstr "Roskakori"
 
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -3604,11 +3671,20 @@ msgstr "URL:n `%s' jäsentäminen epäonnistui"
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:546
 #, c-format
 msgid "No such message: %s"
 msgstr "Ei kyseistä viestiä: %s"
 
+#: camel/camel-vtrash-folder.c:109
+msgid "You cannot copy messages from this trash folder."
+msgstr "Et voi kopioida viestejä tästä roskakorista."
+
+#: camel/providers/imap/camel-imap-message-cache.c:130
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Välimuistihakemistoa ei voitu avata: %s"
+
 #: camel/providers/imap/camel-imap-command.c:209
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
@@ -3664,7 +3740,7 @@ msgstr "Tarkastetaan onko uutta sähköpostia"
 msgid "Check for new messages in all folders"
 msgstr "Etsi uusia viestejä kaikista kansioista"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:534
 msgid "Folders"
 msgstr "Kansiot"
 
@@ -3696,28 +3772,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ota yhteys IMAP-palvelimeen tekstimuotoista salasanaa käyttäen."
 
-#: camel/providers/imap/camel-imap-store.c:439
+#: camel/providers/imap/camel-imap-store.c:444
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:449
+#: camel/providers/imap/camel-imap-store.c:454
 #: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:474
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:489
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:493
+#: camel/providers/smtp/camel-smtp-transport.c:402
 msgid "You didn't enter a password."
-msgstr ""
+msgstr "Et antanut salasanaa."
 
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:521
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3725,17 +3801,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:864
+#: camel/providers/imap/camel-imap-store.c:868
 #, c-format
 msgid "%s is not a selectable folder"
 msgstr "%s ei ole valittavissa oleva kansio"
 
-#: camel/providers/imap/camel-imap-store.c:878
+#: camel/providers/imap/camel-imap-store.c:882
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1381
+#: camel/providers/imap/camel-imap-store.c:1385
 msgid "You must be working online to complete this operation"
 msgstr ""
 
@@ -3803,6 +3879,10 @@ msgstr ""
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
+#: camel/providers/local/camel-local-summary.c:404
+msgid "Unable to add message to summary: unknown reason"
+msgstr ""
+
 #: camel/providers/local/camel-maildir-folder.c:150
 #: camel/providers/local/camel-maildir-folder.c:158
 #: camel/providers/local/camel-maildir-folder.c:169
@@ -3867,12 +3947,18 @@ msgstr ""
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
-msgstr ""
+msgstr "Kansion `%s' poistaminen epäonnistui: %s"
 
 #: camel/providers/local/camel-maildir-store.c:152
 msgid "not a maildir directory"
 msgstr ""
 
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr ""
+
 #: camel/providers/local/camel-mbox-folder.c:152
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
@@ -3942,75 +4028,75 @@ msgstr ""
 
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:249
 msgid "Summarising folder"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-mbox-summary.c:254
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-mbox-summary.c:296
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-mbox-summary.c:371
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1395
 msgid "Synchronising folder"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/providers/local/camel-mbox-summary.c:506
-#: camel/providers/local/camel-mbox-summary.c:707
+#: camel/providers/local/camel-mbox-summary.c:507
+#: camel/providers/local/camel-mbox-summary.c:708
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:523
+#: camel/providers/local/camel-mbox-summary.c:524
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:556
-#: camel/providers/local/camel-mbox-summary.c:745
-#: camel/providers/local/camel-mbox-summary.c:753
+#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:557
+#: camel/providers/local/camel-mbox-summary.c:746
+#: camel/providers/local/camel-mbox-summary.c:754
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:616
+#: camel/providers/local/camel-mbox-summary.c:617
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:634
-#: camel/providers/local/camel-mbox-summary.c:803
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:643
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:654
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-mbox-summary.c:879
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Tuntematon virhe: %s"
@@ -4024,6 +4110,11 @@ msgstr ""
 #: camel/providers/local/camel-mh-store.c:110
 #, c-format
 msgid "`%s' is not a directory."
+msgstr "`%s' ei ole hakemisto."
+
+#: camel/providers/local/camel-mh-summary.c:218
+#, c-format
+msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-auth.c:45
@@ -4037,7 +4128,7 @@ msgstr ""
 
 #: camel/providers/nntp/camel-nntp-auth.c:72
 msgid "Failed to send username to server"
-msgstr ""
+msgstr "Käyttäjätunnuksen lähetys palvelimelle epäonnistui"
 
 #: camel/providers/nntp/camel-nntp-auth.c:81
 msgid "Server rejected username/password"
@@ -4095,23 +4186,33 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-folder.c:149
 msgid "Retrieving POP summary"
-msgstr ""
+msgstr "Haetaan POP-yhteenvetoa"
+
+#: camel/providers/pop3/camel-pop3-folder.c:155
+#, c-format
+msgid "Could not check POP server for new messages: %s"
+msgstr "Uusien viestien haku POP-palvelimelta epäonnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:192
+#: camel/providers/pop3/camel-pop3-folder.c:199
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:289
+#: camel/providers/pop3/camel-pop3-folder.c:296
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Haetaan POP-viestiä %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:307
+#: camel/providers/pop3/camel-pop3-folder.c:303
+#, c-format
+msgid "Could not fetch message: %s"
+msgstr "Viestin hakeminen epäonnistui: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:320
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Viestiä ei saatu POP-palvelimelta %s: %s"
@@ -4157,47 +4258,52 @@ msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:207
+#: camel/providers/pop3/camel-pop3-store.c:209
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:319
+#: camel/providers/pop3/camel-pop3-store.c:225
+#, c-format
+msgid "Could not connect to server: %s"
+msgstr "Yhdistäminen palvelimeen epäonnistui: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:329
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:358
+#: camel/providers/pop3/camel-pop3-store.c:368
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:377
+#: camel/providers/pop3/camel-pop3-store.c:386
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:380
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:426
 msgid "(Unknown)"
 msgstr "(tuntematon)"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
+#: camel/providers/pop3/camel-pop3-store.c:416
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:424
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:491
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
@@ -4373,12 +4479,12 @@ msgstr ""
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/smtp/camel-smtp-transport.c:387
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/smtp/camel-smtp-transport.c:410
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4386,109 +4492,109 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:526
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:528
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:553
 msgid "Cannot send message: sender address not defined."
-msgstr "Viestiä ei voida lähettää: lähettäjän osoitetta ei ole määritelty"
+msgstr "Viestiä ei voida lähettää: lähettäjän osoitetta ei ole määritelty."
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:560
 msgid "Cannot send message: sender address not valid."
-msgstr "Viestiä ei voida lähettää: lähettäjän osoite on epäkelpo"
+msgstr "Viestiä ei voida lähettää: lähettäjän osoite on epäkelpo."
 
-#: camel/providers/smtp/camel-smtp-transport.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:574
 msgid "Cannot send message: no recipients defined."
-msgstr "Viestiä ei voida lähettää: vastaanottajia ei ole määritelty"
+msgstr "Viestiä ei voida lähettää: vastaanottajia ei ole määritelty."
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:668
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:687
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:720
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:736
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:735
+#: camel/providers/smtp/camel-smtp-transport.c:747
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:797
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:823
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:843
+#: camel/providers/smtp/camel-smtp-transport.c:842
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:867
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:886
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:917
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:936
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:969
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:988
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1031
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1054
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1073
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -4539,7 +4645,7 @@ msgstr "Lisää liite..."
 msgid "Attach a file to the message"
 msgstr "Lisää viestiin liitetiedoston"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1082
 msgid "Attachment"
 msgstr "Liite"
 
@@ -4563,90 +4669,39 @@ msgstr "MIME-tyyppi:"
 msgid "Send as:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:321
-msgid "Click here for the address book"
-msgstr ""
-
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
-msgid "From:"
-msgstr "Lähettäjä:"
-
-#.
-#. * Reply-To:
-#.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
-msgid "Reply-To:"
-msgstr "Vastausosoite:"
-
-#.
-#. * Subject:
-#.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
-msgid "Subject:"
-msgstr "Aihe:"
-
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
-msgid "To:"
-msgstr "Vastaanottaja:"
-
-#: composer/e-msg-composer-hdrs.c:384
-msgid "Enter the recipients of the message"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
-msgid "Cc:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:388
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:391
-msgid "Bcc:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:392
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-
-#: composer/e-msg-composer.c:528
+#: composer/e-msg-composer.c:529
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:716
+#: composer/e-msg-composer.c:699
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
-#: composer/e-msg-composer.c:727
+#: composer/e-msg-composer.c:710
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:730
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Virhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:802
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:877 data/evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:860 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:206
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:883
+#: composer/e-msg-composer.c:866
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4656,27 +4711,27 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:891
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:1034
+#: composer/e-msg-composer.c:1017
 msgid "That file does not exist."
 msgstr "Tiedostoa ei ole olemassa."
 
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1027
 msgid "That is not a regular file."
 msgstr "Se ei ole tavallinen tiedosto."
 
-#: composer/e-msg-composer.c:1054
+#: composer/e-msg-composer.c:1037
 msgid "That file exists but is not readable."
 msgstr "Tiedosto on olemassa, muttei lukukelpoinen."
 
-#: composer/e-msg-composer.c:1064
+#: composer/e-msg-composer.c:1047
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Tiedosto vaikutti avattavalta, mutta avaaminen epäonnistui."
 
-#: composer/e-msg-composer.c:1086
+#: composer/e-msg-composer.c:1069
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4684,18 +4739,70 @@ msgstr ""
 "Tiedosto on hyvin suuri (yli 100K).\n"
 "Haluatko varmasti liittää sen?"
 
-#: composer/e-msg-composer.c:1107
+#: composer/e-msg-composer.c:1090
 msgid "An error occurred while reading the file."
 msgstr "Virhe luettaessa tiedostoa."
 
-#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
+#: composer/e-msg-composer.c:1391 composer/e-msg-composer.c:1734
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: composer/e-msg-composer.c:1829
+#: composer/e-msg-composer.c:1825
 msgid "Could not create composer window."
 msgstr ""
 
+#: composer/e-msg-composer-hdrs.c:323
+msgid "Click here for the address book"
+msgstr ""
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:744
+msgid "From:"
+msgstr "Lähettäjä:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:360 mail/mail-format.c:746
+msgid "Reply-To:"
+msgstr "Vastausosoite:"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:371 mail/mail-format.c:643
+msgid "Subject:"
+msgstr "Aihe:"
+
+#: composer/e-msg-composer-hdrs.c:385 mail/mail-format.c:748
+msgid "To:"
+msgstr "Vastaanottaja:"
+
+#: composer/e-msg-composer-hdrs.c:386
+msgid "Enter the recipients of the message"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:389 mail/mail-format.c:750
+msgid "Cc:"
+msgstr "Kopiot:"
+
+#: composer/e-msg-composer-hdrs.c:390
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Anna osoitteet joihin lähetetään kopio viestistä (Cc)"
+
+#: composer/e-msg-composer-hdrs.c:393
+msgid "Bcc:"
+msgstr "Piilokopiot:"
+
+#: composer/e-msg-composer-hdrs.c:394
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr "Anna osoitteet joihin lähetetään kopiot viestistä ilman että"
+" muut vastaanottajat näkisivät tätä (Bcc)"
+
 #: composer/evolution-composer.c:355
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -4721,7 +4828,7 @@ msgstr ""
 #. strptime format for a date.
 #: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
+#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -4750,7 +4857,7 @@ msgstr "%H:%M%n"
 #. strftime format of a weekday and a date.
 #: e-util/e-time-utils.c:269
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -4768,8 +4875,8 @@ msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
-#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
+#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
+#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -4780,8 +4887,8 @@ msgstr "%H:%M:%S"
 
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
-#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
+#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
+#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -4790,16 +4897,28 @@ msgstr "%I:%M %p"
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
+#: executive-summary/component/component-factory.c:152
+msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr ""
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
+#: executive-summary/component/e-summary.c:924
+#, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
 msgstr ""
+"HTML-tiedostoa ei voitu avata:\n"
+"%s"
 
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
+#: executive-summary/component/e-summary.c:938
+#, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr ""
+
+#: executive-summary/component/e-summary.c:956
+msgid "File does not have a place for the services.\n"
 msgstr ""
 
 #: executive-summary/component/e-summary-callbacks.c:290
@@ -4867,26 +4986,6 @@ msgstr "Siirrä %s seuraavalle riville"
 msgid "Configure %s"
 msgstr "Aseta %s"
 
-#: executive-summary/component/e-summary.c:924
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"HTML-tiedostoa ei voitu avata:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:938
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:956
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
 #: executive-summary/component/executive-summary-config.glade.h:1
 msgid "Appearance"
 msgstr "Ulkonäkö"
@@ -4902,6 +5001,14 @@ msgid ""
 "you compiled Bonobo against GOAD instead of OAF."
 msgstr ""
 
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr ""
+
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr ""
+
 #: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
 msgid "Factory for the RDF summary."
 msgstr ""
@@ -5006,20 +5113,20 @@ msgstr "Hups. Olet unohtanut valita päivän."
 msgid "Oops. You have chosen an invalid date."
 msgstr "Hups. Olet valinnut epäkelvon päivän."
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:276
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:298
+#: filter/filter-datespec.c:299
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:338
+#: filter/filter-datespec.c:339
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5027,28 +5134,28 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:374
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:374
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:375
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:432
+#: filter/filter-datespec.c:433
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
+#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
 msgid "now"
 msgstr "nyt"
 
-#: filter/filter-datespec.c:706
+#: filter/filter-datespec.c:707
 msgid "<click here to select a date>"
 msgstr ""
 
@@ -5057,11 +5164,11 @@ msgid "Filter Rules"
 msgstr ""
 
 #. and now for the action area
-#: filter/filter-filter.c:453
+#: filter/filter-filter.c:452
 msgid "Then"
 msgstr "Sitten"
 
-#: filter/filter-filter.c:467
+#: filter/filter-filter.c:466
 msgid "Add action"
 msgstr "Lisää toiminto"
 
@@ -5071,58 +5178,19 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
 #: mail/mail-account-gui.c:682
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-folder.c:247
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:293
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:194
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-
-#: filter/filter-part.c:475
-msgid "Test"
-msgstr ""
-
-#: filter/filter-rule.c:626
-msgid "Rule name: "
-msgstr "Säännön nimi: "
-
-#: filter/filter-rule.c:630
-msgid "Untitled"
-msgstr "Nimetön"
-
-#: filter/filter-rule.c:646
-msgid "If"
-msgstr "Jos"
-
-#: filter/filter-rule.c:664
-msgid "Execute actions"
-msgstr "Suorita toiminnot"
-
-#: filter/filter-rule.c:668
-msgid "if all criteria are met"
-msgstr "kaikki ehdot täytetään"
-
-#: filter/filter-rule.c:673
-msgid "if any criteria are met"
-msgstr "mikään ehdoista täyttyy"
-
-#: filter/filter-rule.c:684
-msgid "Add criterion"
-msgstr "Lisää ehto"
-
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr ""
@@ -5163,6 +5231,53 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
+#: filter/filter-input.c:193
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+
+#: filter/filter-part.c:488
+msgid "Test"
+msgstr ""
+
+#: filter/filter-rule.c:626
+msgid "Rule name: "
+msgstr "Säännön nimi: "
+
+#: filter/filter-rule.c:630
+msgid "Untitled"
+msgstr "Nimetön"
+
+#: filter/filter-rule.c:646
+msgid "If"
+msgstr "Jos"
+
+#: filter/filter-rule.c:664
+msgid "Execute actions"
+msgstr "Suorita toiminnot"
+
+#: filter/filter-rule.c:668
+msgid "if all criteria are met"
+msgstr "kaikki ehdot täytetään"
+
+#: filter/filter-rule.c:673
+msgid "if any criteria are met"
+msgstr "mikään ehdoista täyttyy"
+
+#: filter/filter-rule.c:684
+msgid "Add criterion"
+msgstr "Lisää ehto"
+
+#: filter/filter-rule.c:770
+msgid "incoming"
+msgstr "tulevat"
+
+#: filter/filter-rule.c:770
+msgid "outgoing"
+msgstr "lähtevät"
+
 #: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr ""
@@ -5311,8 +5426,8 @@ msgstr ""
 msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:203 filter/score-rule.c:205
-#: mail/message-list.c:1052
+#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.c:1082
 msgid "Score"
 msgstr ""
 
@@ -5344,7 +5459,7 @@ msgstr "alkaa merkkijonolla"
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1053
+#: filter/libfilter-i18n.h:51 mail/message-list.c:1083
 msgid "Subject"
 msgstr "Aihe"
 
@@ -5356,6 +5471,18 @@ msgstr ""
 msgid "was before"
 msgstr ""
 
+#: filter/rule-editor.c:147
+msgid "Rules"
+msgstr "Säännöt"
+
+#: filter/rule-editor.c:240
+msgid "Add Rule"
+msgstr "Lisää sääntö"
+
+#: filter/rule-editor.c:299
+msgid "Edit Rule"
+msgstr "Muokkaa sääntöä"
+
 #: filter/score-editor.c:130
 msgid "Score Rules"
 msgstr ""
@@ -5368,118 +5495,136 @@ msgstr ""
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-factory.c:211
-#, c-format
-msgid "Properties for \"%s\""
-msgstr ""
-
-#: mail/folder-browser-factory.c:213 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr ""
-
-#: mail/folder-browser.c:225
+#: mail/folder-browser.c:253
 msgid "Store search as vFolder"
 msgstr ""
 
-#: mail/folder-browser.c:533
-msgid "VFolder on Subject"
+#: mail/folder-browser.c:561 ui/evolution-mail.xml.h:91
+msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:536
-msgid "VFolder on Sender"
+#: mail/folder-browser.c:564 ui/evolution-mail.xml.h:89
+msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:539
-msgid "VFolder on Recipients"
+#: mail/folder-browser.c:567 ui/evolution-mail.xml.h:90
+msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:542 mail/folder-browser.c:733
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:570 ui/evolution-mail.xml.h:88
+msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:548
-msgid "Filter on Subject"
-msgstr "Suodata aiheen mukaan"
+#: mail/folder-browser.c:576
+msgid "Filter on Sub_ject"
+msgstr "Suodata a_iheen mukaan"
 
-#: mail/folder-browser.c:551
-msgid "Filter on Sender"
-msgstr "Suodata lähettäjän mukaan"
+#: mail/folder-browser.c:579
+msgid "Filter on Sen_der"
+msgstr "Suodata _lähettäjän mukaan"
 
-#: mail/folder-browser.c:554
-msgid "Filter on Recipients"
-msgstr "Suodata vastaanottajien mukaan"
+#: mail/folder-browser.c:582
+msgid "Filter on Re_cipients"
+msgstr "Suodata _vastaanottajien mukaan"
 
-#: mail/folder-browser.c:557 mail/folder-browser.c:732
-msgid "Filter on Mailing List"
-msgstr "Suodata postituslistan mukaan"
+#: mail/folder-browser.c:585
+msgid "Filter on _Mailing List"
+msgstr "Suodata _postituslistan mukaan"
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:594
+msgid "_Open"
+msgstr "_Avaa"
+
+#: mail/folder-browser.c:596
 msgid "Resend"
 msgstr "Lähetä uudelleen"
 
-#: mail/folder-browser.c:570
-msgid "Save As..."
-msgstr "Tallenna nimellä..."
+#: mail/folder-browser.c:598 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail.xml.h:113 ui/evolution-tasks.xml.h:8
+msgid "_Save As..."
+msgstr "Tallenna _nimellä..."
 
-#: mail/folder-browser.c:577
-msgid "Reply to Sender"
-msgstr "Vastaa lähettäjälle"
+#: mail/folder-browser.c:600 ui/evolution-event-editor.xml.h:69
+#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+msgid "_Print"
+msgstr "_Tulosta"
 
-#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:61
-msgid "Reply to All"
-msgstr "Vastaa kaikille"
+#: mail/folder-browser.c:605
+msgid "_Reply to Sender"
+msgstr "_Vastaa lähettäjälle"
 
-#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:25
-msgid "Forward"
-msgstr "Välitä"
+#: mail/folder-browser.c:607 ui/evolution-mail.xml.h:66
+msgid "Reply to _All"
+msgstr "Vastaa _kaikille"
 
-#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:27
-msgid "Forward inline"
+#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:102
+msgid "_Forward"
+msgstr "_Välitä"
+
+#: mail/folder-browser.c:611
+msgid "Forward _inline"
 msgstr ""
 
-#: mail/folder-browser.c:586
-msgid "Mark as Read"
-msgstr "Merkitse luetuksi"
+#: mail/folder-browser.c:614 ui/evolution-mail.xml.h:40
+msgid "Mar_k as Read"
+msgstr "Merkitse _luetuksi"
 
-#: mail/folder-browser.c:588
-msgid "Mark as Unread"
-msgstr "Merkitse lukemattomaksi"
+#: mail/folder-browser.c:616 ui/evolution-mail.xml.h:44
+msgid "Mark as U_nread"
+msgstr "Merkitse luke_mattomaksi"
 
-#: mail/folder-browser.c:593
-msgid "Move to Folder..."
-msgstr "Siirrä kansioon..."
+#: mail/folder-browser.c:621 ui/evolution-mail.xml.h:107
+msgid "_Move to Folder..."
+msgstr "_Siirrä kansioon..."
 
-#: mail/folder-browser.c:595
-msgid "Copy to Folder..."
-msgstr "Kopioi kansioon..."
+#: mail/folder-browser.c:623 ui/evolution-mail.xml.h:96
+msgid "_Copy to Folder..."
+msgstr "_Kopioi kansioon..."
 
-#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:82
-msgid "Undelete"
-msgstr "Palauta"
+#: mail/folder-browser.c:627 ui/evolution-mail.xml.h:118
+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:609 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:637 ui/evolution-mail.xml.h:1
 msgid "Apply Filters"
-msgstr ""
+msgstr "Toteuta suodattimet"
 
-#: mail/folder-browser.c:613
-msgid "Create Rule From Message"
+#: mail/folder-browser.c:641
+msgid "Create Ru_le From Message"
+msgstr "_Luo viestistä sääntö"
+
+#: mail/folder-browser.c:780
+msgid "Filter on Mailing List"
+msgstr "Suodata postituslistan mukaan"
+
+#: mail/folder-browser.c:781
+msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:783
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Suodata postituslistan mukaan (%s)"
 
-#: mail/folder-browser.c:736
+#: mail/folder-browser.c:784
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-browser-factory.c:213
+#, c-format
+msgid "Properties for \"%s\""
+msgstr ""
+
+#: mail/folder-browser-factory.c:215 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+msgid "Properties"
+msgstr ""
+
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
 msgid "Evolution component for handling mail."
 msgstr ""
@@ -5512,6 +5657,50 @@ msgstr ""
 msgid "Factory for the Mail Summary component."
 msgstr ""
 
+#: mail/importers/elm-importer.c:420
+msgid ""
+"Evolution has found Elm mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution on löytänyt Elmin sähköpostitiedostoja.\n"
+"Haluatko tuoda nämä postit Evolutioniin?"
+
+#: mail/importers/elm-importer.c:430
+msgid "Elm mail"
+msgstr "Elm-sähköposti"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+msgid "Factory to import mbox into Evolution"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+msgid "Imports mbox files into Evolution"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr ""
+
+#: mail/importers/netscape-importer.c:440
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: mail/importers/pine-importer.c:385
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: mail/importers/pine-importer.c:395
+msgid "Pine mail"
+msgstr "Pine-sähköposti"
+
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr ""
@@ -5543,6 +5732,15 @@ msgstr ""
 msgid "mh"
 msgstr ""
 
+#: mail/mail-account-editor.c:105
+msgid "You have not filled in all of the required information."
+msgstr ""
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:173
+msgid "Evolution Account Editor"
+msgstr ""
+
 #: mail/mail-accounts.c:121 mail/mail-accounts.c:165
 msgid " (default)"
 msgstr " (oletus)"
@@ -5568,15 +5766,6 @@ msgstr ""
 msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/mail-account-editor.c:105
-msgid "You have not filled in all of the required information."
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
-msgid "Evolution Account Editor"
-msgstr ""
-
 #: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
@@ -5597,11 +5786,11 @@ msgstr ""
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 msgid "Add Filter Rule"
 msgstr "Lisää suodatussääntö"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5609,23 +5798,23 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5633,32 +5822,37 @@ msgstr ""
 "Viestillä ei ole aihetta.\n"
 "Lähetetäänkö toedella?"
 
-#: mail/mail-callbacks.c:308
+#: mail/mail-callbacks.c:311
 msgid "You must specify recipients in order to send this message."
 msgstr "Lähettääksesi tämän viestin sinuun tulee määritellä vastaanottajat."
 
-#: mail/mail-callbacks.c:351
+#: mail/mail-callbacks.c:354
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:591
+#: mail/mail-callbacks.c:593
 #, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "%s %s kirjoitti:\n"
+msgid "On %s, %s wrote:"
+msgstr "%s %s kirjoitti:"
 
-#: mail/mail-callbacks.c:773
+#: mail/mail-callbacks.c:774
 msgid "Forwarded message:\n"
 msgstr "Välitetty viesti:\n"
 
-#: mail/mail-callbacks.c:876
+#: mail/mail-callbacks.c:877
 msgid "Move message(s) to"
 msgstr "Siirrä viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:878
+#: mail/mail-callbacks.c:879
 msgid "Copy message(s) to"
 msgstr "Kopioi viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:1089
+#: mail/mail-callbacks.c:1156
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1170
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5666,7 +5860,7 @@ msgstr ""
 "Voit muokata vain Luonnokset\n"
 "-kansiossa olevia viestejä."
 
-#: mail/mail-callbacks.c:1120
+#: mail/mail-callbacks.c:1202
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -5674,11 +5868,15 @@ msgstr ""
 "Voit lähettää uudelleen vain\n"
 "\"Lähetetyt\"-kansiossa olevia viestejä."
 
-#: mail/mail-callbacks.c:1153 mail/mail-display.c:90
+#: mail/mail-callbacks.c:1224
+msgid "No Message Selected"
+msgstr "Ei viestejä valittuna"
+
+#: mail/mail-callbacks.c:1250 mail/mail-display.c:90
 msgid "Overwrite file?"
 msgstr "Kirjoita tiedoston yli?"
 
-#: mail/mail-callbacks.c:1157 mail/mail-display.c:94
+#: mail/mail-callbacks.c:1254 mail/mail-display.c:94
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5686,33 +5884,73 @@ msgstr ""
 "Saman niminen tiedosto on jo olemassa.\n"
 "Kirjoitetaanko sen yli?"
 
-#: mail/mail-callbacks.c:1201
+#: mail/mail-callbacks.c:1298
 msgid "Save Message As..."
 msgstr "Tallenna viesti nimellä..."
 
-#: mail/mail-callbacks.c:1203
+#: mail/mail-callbacks.c:1300
 msgid "Save Messages As..."
 msgstr "Tallenna viestit nimellä..."
 
-#: mail/mail-callbacks.c:1317
+#: mail/mail-callbacks.c:1435
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1366 ui/evolution-mail.xml.h:52
+#: mail/mail-callbacks.c:1484 ui/evolution-mail.xml.h:56
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/mail-callbacks.c:1413
+#: mail/mail-callbacks.c:1531
 msgid "Printing of message failed"
 msgstr "Viestin tulostus epäonnistui"
 
-#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#: mail/mail-callbacks.c:1609
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr ""
+
+#: mail/mail-config.c:1121 mail/mail-config.c:1124
 msgid "Connecting to server..."
 msgstr ""
 
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+
+#. set window title
+#: mail/mail-config-druid.c:445
+msgid "Evolution Account Wizard"
+msgstr ""
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr ""
@@ -5924,45 +6162,10 @@ msgstr ""
 
 #: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
 #: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:30
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: mail/mail-config-druid.c:99
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-
-#: mail/mail-config-druid.c:101
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
-msgstr ""
-
-#: mail/mail-config-druid.c:105
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
-msgstr ""
-
-#: mail/mail-config-druid.c:107
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
-msgstr ""
-
-#. set window title
-#: mail/mail-config-druid.c:445
-msgid "Evolution Account Wizard"
-msgstr ""
-
 #: mail/mail-display.c:194
 msgid "Save Attachment"
 msgstr "Tallenna liite"
@@ -5998,76 +6201,76 @@ msgstr ""
 msgid "Hide"
 msgstr "Piilota"
 
-#: mail/mail-display.c:1102
+#: mail/mail-display.c:1107
 msgid "Open link in browser"
 msgstr "Avaa linkki selaimessa"
 
-#: mail/mail-display.c:1104
+#: mail/mail-display.c:1109
 msgid "Save as (FIXME)"
 msgstr "Tallenna nimellä"
 
-#: mail/mail-display.c:1106
+#: mail/mail-display.c:1111
 msgid "Copy location (FIXME)"
 msgstr "Kopioi sijainti"
 
-#: mail/mail-format.c:518
+#: mail/mail-format.c:522
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:560
+#: mail/mail-format.c:564
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:742
+#: mail/mail-format.c:771
 msgid "Loading message content"
 msgstr "Ladataan viestin sisältöä"
 
-#: mail/mail-format.c:1036
+#: mail/mail-format.c:1071
 msgid "No GPG/PGP program configured."
 msgstr ""
 
-#: mail/mail-format.c:1051
+#: mail/mail-format.c:1086
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1057
+#: mail/mail-format.c:1092
 msgid "Encrypted message"
 msgstr "Salattu viesti"
 
-#: mail/mail-format.c:1058
+#: mail/mail-format.c:1093
 msgid "Click icon to decrypt."
 msgstr "Napsauta kuvaketta salauksen purkamiseksi."
 
-#: mail/mail-format.c:1148 mail/mail-format.c:1536
+#: mail/mail-format.c:1183 mail/mail-format.c:1571
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1156 mail/mail-format.c:1544
+#: mail/mail-format.c:1191 mail/mail-format.c:1579
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1757
+#: mail/mail-format.c:1792
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1769
+#: mail/mail-format.c:1804
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1773
+#: mail/mail-format.c:1808
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1807
+#: mail/mail-format.c:1842
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1812
+#: mail/mail-format.c:1847
 msgid "Malformed external-body part."
 msgstr ""
 
@@ -6132,142 +6335,138 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:192
+#: mail/mail-mt.c:193
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
+#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
 msgid "Working"
 msgstr ""
 
-#: mail/mail-mt.c:679 mail/session.c:98
-msgid "Do you accept?"
-msgstr "Hyväksytkö?"
-
-#: mail/mail-mt.c:873
+#: mail/mail-mt.c:862
 msgid "Evolution progress"
 msgstr ""
 
-#: mail/mail-ops.c:587
+#: mail/mail-ops.c:599
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Lähetetään \"%s\""
 
-#: mail/mail-ops.c:589
+#: mail/mail-ops.c:603
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:718
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Lähetetään viestiä %d / %d"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:737
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:811
+#: mail/mail-ops.c:825
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:914
 msgid "Moving"
 msgstr "Siirretään"
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:917
 msgid "Copying"
 msgstr "Kopioidaan"
 
-#: mail/mail-ops.c:978
+#: mail/mail-ops.c:992
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1139
+#: mail/mail-ops.c:1152
 msgid "Forwarded messages"
 msgstr "Välitetyt viestit"
 
-#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
+#: mail/mail-ops.c:1193 mail/mail-ops.c:1331
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1247
+#: mail/mail-ops.c:1260
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1447
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1483
+#: mail/mail-ops.c:1496
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viestiä %s"
 
-#: mail/mail-ops.c:1550
+#: mail/mail-ops.c:1563
 msgid "Retrieving messages"
 msgstr "Haetaan viestejä"
 
-#: mail/mail-ops.c:1560
+#: mail/mail-ops.c:1573
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1634
+#: mail/mail-ops.c:1647
 msgid "Saving messages"
 msgstr "Tallennetaan viestejä"
 
-#: mail/mail-ops.c:1713
+#: mail/mail-ops.c:1726
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1726
+#: mail/mail-ops.c:1739
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1740
+#: mail/mail-ops.c:1753
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1827
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:1842
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1857
+#: mail/mail-ops.c:1870
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
@@ -6304,10 +6503,14 @@ msgstr "Lähetetään"
 msgid "Cancelled."
 msgstr "Peruutettu."
 
-#: mail/mail-summary.c:109
+#: mail/mail-summary.c:110
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
+#: mail/mail-summary.c:468
+msgid "Mail Summary"
+msgstr ""
+
 #: mail/mail-tools.c:141
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
@@ -6331,7 +6534,7 @@ msgstr "Välitetty viesti - %s"
 msgid "Forwarded message (no subject)"
 msgstr "Välitetty viesti (ei aihetta)"
 
-#: mail/mail-tools.c:414
+#: mail/mail-tools.c:415
 #, c-format
 msgid ""
 "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
@@ -6342,121 +6545,152 @@ msgstr ""
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:427
+#: mail/mail-vfolder.c:426
 msgid "New VFolder"
 msgstr ""
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:60
+#: mail/message-browser.c:189 ui/evolution-mail.xml.h:64
 msgid "Reply"
 msgstr "Vastaa"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:66
+#: mail/message-browser.c:189 ui/evolution-mail.xml.h:70
 msgid "Reply to the sender of this message"
 msgstr "Vastaa tämän viestin lähettäjälle"
 
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:64
+#: mail/message-browser.c:192 ui/evolution-mail.xml.h:65
+msgid "Reply to All"
+msgstr "Vastaa kaikille"
+
+#: mail/message-browser.c:192 ui/evolution-mail.xml.h:68
 msgid "Reply to all recipients of this message"
 msgstr "Vastaa kaikille tämän viestin vastaanottajille"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:29
+#: mail/message-browser.c:195 ui/evolution-mail.xml.h:25
+msgid "Forward"
+msgstr "Välitä"
+
+#: mail/message-browser.c:195 ui/evolution-mail.xml.h:29
 msgid "Forward this message"
 msgstr "Välitä tämä viesti"
 
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:57
+#: mail/message-browser.c:200 ui/evolution-mail.xml.h:61
 msgid "Print the selected message"
 msgstr "Tulosta valittu viesti"
 
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
+#: mail/message-browser.c:203 ui/evolution-mail.xml.h:13
 msgid "Delete this message"
 msgstr "Poista tämä viesti"
 
-#: mail/message-list.c:648
+#: mail/message-browser.c:208 ui/evolution-event-editor.xml.h:33
+#: ui/evolution-mail.xml.h:54 ui/evolution-task-editor-dialog.xml.h:36
+msgid "Previous"
+msgstr "Edellinen"
+
+#: mail/message-browser.c:208
+msgid "Previous message"
+msgstr "Edellinen viesti"
+
+#: mail/message-browser.c:211 ui/evolution-calendar.xml.h:18
+#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:50
+#: ui/evolution-task-editor-dialog.xml.h:32
+msgid "Next"
+msgstr "Seuraava"
+
+#: mail/message-browser.c:211
+msgid "Next message"
+msgstr "Seuraava viesti"
+
+#: mail/message-list.c:678
 msgid "Unseen"
-msgstr ""
+msgstr "Nähty"
 
-#: mail/message-list.c:649
+#: mail/message-list.c:679
 msgid "Seen"
-msgstr ""
+msgstr "Näkemättä"
 
-#: mail/message-list.c:650
+#: mail/message-list.c:680
 msgid "Answered"
-msgstr ""
+msgstr "Vastattu"
 
-#: mail/message-list.c:651
+#: mail/message-list.c:681
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:652
+#: mail/message-list.c:682
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:656
+#: mail/message-list.c:686
 msgid "Lowest"
 msgstr "Matalin"
 
-#: mail/message-list.c:657
+#: mail/message-list.c:687
 msgid "Lower"
 msgstr "Matalampi"
 
-#: mail/message-list.c:661
+#: mail/message-list.c:691
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: mail/message-list.c:662
+#: mail/message-list.c:692
 msgid "Highest"
 msgstr "Korkein"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:942
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:949
 msgid "Today %l:%M %p"
 msgstr "Tänään %l:%M %p"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:958
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l:%M %p"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:970
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:978
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:980
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1052
+#: mail/message-list.c:1082
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1053
+#: mail/message-list.c:1083
 msgid "From"
 msgstr "Lähettäjä"
 
-#: mail/message-list.c:1053
+#: mail/message-list.c:1083
 msgid "Date"
 msgstr "Päiväys"
 
-#: mail/message-list.c:1053
+#: mail/message-list.c:1083
 msgid "Received"
 msgstr "Otettu vastaan"
 
-#: mail/message-list.c:1054
+#: mail/message-list.c:1084
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: mail/message-list.c:1054
+#: mail/message-list.c:1084
 msgid "Size"
 msgstr "Koko"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+#: mail/mail-session.c:161
+msgid "User canceled operation."
+msgstr ""
+
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:47
 msgid "Folder"
 msgstr "Kansio"
 
@@ -6488,118 +6722,6 @@ msgstr ""
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Kansion nimi:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "Kansion tyyppi:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr ""
-
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr ""
-
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
-msgstr "Virhe %s:n käynnistyksessä"
-
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "Virhe %s:n lataamisessa"
-
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-
-#: shell/importer/importer.c:473
-msgid "Automatic"
-msgstr ""
-
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "Tiedostonimi:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "Valitse tiedosto"
-
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "Tiedoston tyyppi:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr ""
-
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr ""
-
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr ""
-
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-
 #: shell/e-setup.c:118 shell/e-setup.c:191
 msgid "Evolution installation"
 msgstr ""
@@ -6665,6 +6787,18 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
+#: shell/e-shell.c:379
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr ""
+
+#: shell/e-shell.c:1249
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+
 #: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
 msgid ""
@@ -6694,6 +6828,20 @@ msgstr "Uusi..."
 msgid "(Untitled)"
 msgstr "(Nimetön)"
 
+#: shell/e-shell-view.c:148
+msgid "(No folder displayed)"
+msgstr ""
+
+#: shell/e-shell-view.c:1184
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1186
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
 #: shell/e-shell-view-menu.c:173
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug budday ei löytynyt $PATH:istasi."
@@ -6717,31 +6865,9 @@ msgstr ""
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view.c:148
-msgid "(No folder displayed)"
-msgstr ""
-
-#: shell/e-shell-view.c:1134
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1136
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell.c:378
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr ""
-
-#: shell/e-shell.c:1248
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
+#: shell/e-shortcuts.c:381
+msgid "Error saving shortcuts."
+msgstr "Virhe tallennettaessa oikoteitä."
 
 #: shell/e-shortcuts-view.c:134
 msgid "Create new shortcut group"
@@ -6814,20 +6940,6 @@ msgstr ""
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Poista tämä oikotie oikotiepalkista"
 
-#: shell/e-shortcuts.c:379
-msgid "Error saving shortcuts."
-msgstr "Virhe tallennettaessa oikoteitä."
-
-#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
-msgid "_View"
-msgstr "_Näytä"
-
-#: shell/e-storage-set-view.c:649
-msgid "View the selected folder"
-msgstr ""
-
 #: shell/e-storage.c:178
 msgid "(No name)"
 msgstr "(Ei nimeä)"
@@ -6876,11 +6988,137 @@ msgstr ""
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
+#: shell/e-storage-set-view.c:650 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:44
+msgid "_View"
+msgstr "_Näytä"
+
+#: shell/e-storage-set-view.c:650
+msgid "View the selected folder"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Kansion nimi:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder type:"
+msgstr "Kansion tyyppi:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
+msgstr ""
+
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
 msgid "The Evolution shell."
 msgstr ""
 
-#: shell/main.c:83
+#: shell/importer/importer.c:87
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/importer/importer.c:182
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+
+#: shell/importer/importer.c:202 shell/importer/importer.c:233
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+
+#: shell/importer/importer.c:341
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+
+#: shell/importer/importer.c:351
+msgid "Importing"
+msgstr ""
+
+#: shell/importer/importer.c:359
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/importer/importer.c:372
+#, c-format
+msgid "Error starting %s"
+msgstr "Virhe %s:n käynnistyksessä"
+
+#: shell/importer/importer.c:387
+#, c-format
+msgid "Error loading %s"
+msgstr "Virhe %s:n lataamisessa"
+
+#: shell/importer/importer.c:402
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/importer/importer.c:473
+msgid "Automatic"
+msgstr ""
+
+#: shell/importer/importer.c:523
+msgid "Filename:"
+msgstr "Tiedostonimi:"
+
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
+msgid "Select a file"
+msgstr "Valitse tiedosto"
+
+#: shell/importer/importer.c:538
+msgid "File type:"
+msgstr "Tiedoston tyyppi:"
+
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
+msgid "Import"
+msgstr ""
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Utility"
+msgstr ""
+
+#: shell/importer/import.glade.h:3
+msgid "Evolution Importer Utility"
+msgstr ""
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+
+#: shell/importer/intelligent.c:143
+msgid "Don't ask me again"
+msgstr "Älä kysy tätä enää uudelleen"
+
+#: shell/main.c:82
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
@@ -6901,7 +7139,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:108
+#: shell/main.c:107
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6909,19 +7147,19 @@ msgstr ""
 "Kiitos\n"
 "The Evolution Team\n"
 
-#: shell/main.c:139
+#: shell/main.c:138
 msgid "Cannot initialize the Evolution shell."
 msgstr ""
 
-#: shell/main.c:185
+#: shell/main.c:184
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:186
+#: shell/main.c:185
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:219
+#: shell/main.c:217
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobon komponenttijärjestelmän alustus epäonnistui"
 
@@ -6945,7 +7183,7 @@ msgstr "Etsi kontakti"
 msgid "New contact"
 msgstr "Uusi kontakti"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:50
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:53
 msgid "Previews the message to be printed"
 msgstr "Esikatsele tulostettavaa viestiä"
 
@@ -6953,7 +7191,7 @@ msgstr "Esikatsele tulostettavaa viestiä"
 msgid "Print contacts"
 msgstr "Tulosta kontaktit"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:79
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:84
 msgid "Stop"
 msgstr "Pysäytä"
 
@@ -6987,8 +7225,8 @@ msgid "_Search for contacts"
 msgstr "_Etsi kontakteja"
 
 #: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:112
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:117
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:43
 msgid "_Tools"
 msgstr "T_yökalut"
 
@@ -7052,11 +7290,6 @@ msgstr "Kuukausi"
 msgid "New _Event"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Seuraava"
-
 #: ui/evolution-calendar.xml.h:20
 msgid "Open Calendar"
 msgstr "Avaa kalenteri"
@@ -7101,8 +7334,8 @@ msgstr "Näytä 1 viikko"
 msgid "Show the working week"
 msgstr "Näytä työviikko"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
-#: widgets/misc/e-dateedit.c:422
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
+#: widgets/misc/e-dateedit.c:424
 msgid "Today"
 msgstr "Tänään"
 
@@ -7127,7 +7360,7 @@ msgid "_Month"
 msgstr "_Kuukausi"
 
 #: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:39
 msgid "_New"
 msgstr "_Uusi"
 
@@ -7135,11 +7368,6 @@ msgstr "_Uusi"
 msgid "_Open Calendar"
 msgstr "_Avaa kalenteri"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:108
-#: ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "Tallenna _nimellä..."
-
 #: ui/evolution-calendar.xml.h:45
 msgid "_Week"
 msgstr "_Viikko"
@@ -7166,7 +7394,7 @@ msgid "Print this item"
 msgstr "Tulosta tämä kohta"
 
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:58 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:62 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Tulosta..."
 
@@ -7199,7 +7427,7 @@ msgstr "Lähetä _viesti kontaktille..."
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
 #: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
 msgid "_File"
 msgstr "_Tiedosto"
 
@@ -7326,10 +7554,6 @@ msgstr "Liitä leikepöytä"
 msgid "Pre_vious"
 msgstr "_Edellinen"
 
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Edellinen"
-
 #: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
 msgid "Print Pre_view"
 msgstr "Tulostuksen esikatselu"
@@ -7364,7 +7588,7 @@ msgstr ""
 msgid "Schedule some sort of a meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:69
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:74
 #: ui/evolution-task-editor-dialog.xml.h:57
 msgid "Select All"
 msgstr "Valitse kaikki"
@@ -7387,12 +7611,12 @@ msgid "_About..."
 msgstr "_Tietoja..."
 
 #: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Sulje"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:29
 msgid "_Contact (FIXME)"
 msgstr "_Kontakti"
 
@@ -7406,7 +7630,7 @@ msgid "_Debug"
 msgstr ""
 
 #: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:35
 msgid "_Help"
 msgstr "_Ohje"
 
@@ -7438,12 +7662,7 @@ msgstr ""
 msgid "_Paste"
 msgstr "L_iitä"
 
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "_Tulosta"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:104
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:109
 #: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "_Ominaisuudet..."
@@ -7453,7 +7672,7 @@ msgid "_Select All"
 msgstr "Valitse k_aikki"
 
 #: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:42
 msgid "_Task (FIXME)"
 msgstr "_Tehtävä"
 
@@ -7565,6 +7784,10 @@ msgstr "_Unohda salasanat"
 msgid "Forward As"
 msgstr ""
 
+#: ui/evolution-mail.xml.h:27
+msgid "Forward inline"
+msgstr ""
+
 #: ui/evolution-mail.xml.h:28
 msgid "Forward the selected mail to someone"
 msgstr ""
@@ -7578,134 +7801,134 @@ msgid "Full _Headers"
 msgstr "Täydet _otsikkotiedot"
 
 #: ui/evolution-mail.xml.h:32
+msgid "Go to the next message"
+msgstr "Siirry seuraavaan viestiin"
+
+#: ui/evolution-mail.xml.h:33
+msgid "Go to the previous message"
+msgstr "Siirry edelliseen viestiin"
+
+#: ui/evolution-mail.xml.h:34
 msgid "Hide Deleted Messages"
 msgstr "Piilota poistetut viestit"
 
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:35
 msgid "Hide S_elected Messages"
 msgstr "Piilota valitut vi_estit"
 
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail.xml.h:36
 msgid "Hide _Deleted Messages"
 msgstr "Piilota _poistetut viestit"
 
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:37
 msgid "Hide _Read messages"
 msgstr "Piilota _luetut viestit"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:38
 msgid "Invert Selection"
 msgstr "Käännä valinta"
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:39
 msgid "Manage _Subscriptions..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:38
-msgid "Mar_k as Read"
-msgstr "Merkitse _luetuksi"
-
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:41
 msgid "Mark All as R_ead"
 msgstr "Merkitse ka_ikki luetuksi"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:42
 msgid "Mark As Read"
 msgstr "Merkitse luetuksi"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:43
 msgid "Mark As U_nread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Mark as U_nread"
-msgstr "Merkitse luke_mattomaksi"
-
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:45
 msgid "Mark the selected messages as having been read"
 msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Merkitse valitut viestit lukemattomiksi"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:47
 msgid "Move"
 msgstr "Siirrä"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:48
 msgid "Move message to a new folder"
 msgstr "Siirrä viesti uuteen kansioon"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:49
 msgid "Move selected messages to another folder"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:51
 msgid "Open in New Window"
 msgstr "Avaa uudessa ikkunassa"
 
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:52
 msgid "Open the current message in a new window"
 msgstr "Avaa valittu viesti uudessa ikkunassa"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:58
 msgid "Print Preview of message..."
 msgstr "Tulostuksen esikatselu viestistä..."
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:59
 msgid "Print message to the printer"
 msgstr "Tulosta viesti tulostimella"
 
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:60
 msgid "Print message..."
 msgstr "Tulosta viesti..."
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:63
 msgid "Redirect (FIXME: implement me)"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:62
-msgid "Reply to _All"
-msgstr "Vastaa _kaikille"
-
-#: ui/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:67
 msgid "Reply to all"
 msgstr "Vastaa kaikille"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:69
 msgid "Reply to sender"
 msgstr "Vastaa lähettäjälle"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:71
+msgid "S_earch Message"
+msgstr "_Etsi viestiä"
+
+#: ui/evolution-mail.xml.h:72
 msgid "S_ource"
 msgstr "_Lähde"
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:73
 msgid "Save the message into a new file"
 msgstr "Tallenna viesti uuteen tiedostoon"
 
-#: ui/evolution-mail.xml.h:70 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:75 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Valitse _kaikki"
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail.xml.h:76
 msgid "Select _Thread"
 msgstr "Valitse _säie"
 
-#: ui/evolution-mail.xml.h:72
+#: ui/evolution-mail.xml.h:77
 msgid "Send / Receive"
 msgstr "Lähetä / Vastaanota"
 
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail.xml.h:78
 msgid "Send a reply to the person who sent you this mail"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail.xml.h:79
 msgid "Send a single mail in reply to all the selected mail"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail.xml.h:80
 msgid ""
 "Send queued mail\n"
 "    and retrieve new mail"
@@ -7713,130 +7936,102 @@ msgstr ""
 "lähetä jonossa olevat viestit\n"
 "    ja hae uudet viestit"
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail.xml.h:82
 msgid "Send queued mail and retrieve new mail"
 msgstr "Lähetä jonossa olevat viestit ja hae uudet viestit"
 
-#: ui/evolution-mail.xml.h:78
+#: ui/evolution-mail.xml.h:83
 msgid "Show _All"
 msgstr "Näytä k_aikki"
 
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail.xml.h:85
 msgid "Threaded Message list"
 msgstr "Säikeistetty viesti-ikkuna"
 
-#: ui/evolution-mail.xml.h:81
+#: ui/evolution-mail.xml.h:86
 msgid "Un-delete the selected messages"
 msgstr "Peruuta valittujen viestien poistaminen"
 
-#: ui/evolution-mail.xml.h:83
-msgid "VFolder on Mailing _List"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:84
-msgid "VFolder on Se_nder"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:85
-msgid "VFolder on _Recipients"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:86
-msgid "VFolder on _Subject"
-msgstr ""
-
 #: ui/evolution-mail.xml.h:87
+msgid "Undelete"
+msgstr "Palauta"
+
+#: ui/evolution-mail.xml.h:92
 msgid "View Raw Message Source"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:88
+#: ui/evolution-mail.xml.h:93
 msgid "Virtual Folder _Editor..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:89
+#: ui/evolution-mail.xml.h:94
 msgid "_Apply Filters"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:90
+#: ui/evolution-mail.xml.h:95
 msgid "_Attachment"
 msgstr "_Liite"
 
-#: ui/evolution-mail.xml.h:91
-msgid "_Copy to Folder..."
-msgstr "_Kopioi kansioon..."
-
-#: ui/evolution-mail.xml.h:92
+#: ui/evolution-mail.xml.h:97
 msgid "_Create Filter From Message"
 msgstr "_Luo viestistä suodatin"
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail.xml.h:99
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:95
+#: ui/evolution-mail.xml.h:100
 msgid "_Filters..."
 msgstr "S_uodattimet..."
 
-#: ui/evolution-mail.xml.h:96 ui/evolution.xml.h:31
+#: ui/evolution-mail.xml.h:101 ui/evolution.xml.h:32
 msgid "_Folder"
 msgstr "_Kansio"
 
-#: ui/evolution-mail.xml.h:97
-msgid "_Forward"
-msgstr "_Välitä"
-
-#: ui/evolution-mail.xml.h:98
+#: ui/evolution-mail.xml.h:103
 msgid "_Inline"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:99 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:104 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Käännä valinta"
 
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail.xml.h:105
 msgid "_Mail Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail.xml.h:106
 msgid "_Mail Settings..."
 msgstr "_Sähköpostiasetukset..."
 
-#: ui/evolution-mail.xml.h:102
-msgid "_Move to Folder..."
-msgstr "_Siirrä kansioon..."
-
-#: ui/evolution-mail.xml.h:103
+#: ui/evolution-mail.xml.h:108
 msgid "_Open Selected Items"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:105
+#: ui/evolution-mail.xml.h:110
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:106
+#: ui/evolution-mail.xml.h:111
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: ui/evolution-mail.xml.h:107
+#: ui/evolution-mail.xml.h:112
 msgid "_Resend Messages"
 msgstr "Lähetä viestejä _uudelleen"
 
-#: ui/evolution-mail.xml.h:109
+#: ui/evolution-mail.xml.h:114
 msgid "_Save Message As..."
 msgstr "_Tallenna viesti nimellä..."
 
-#: ui/evolution-mail.xml.h:110
+#: ui/evolution-mail.xml.h:115
 msgid "_Send / Receive"
 msgstr "_Lähetä / Vastaanota"
 
-#: ui/evolution-mail.xml.h:111
+#: ui/evolution-mail.xml.h:116
 msgid "_Threaded"
 msgstr "_Säikeistys"
 
-#: ui/evolution-mail.xml.h:113
-msgid "_Undelete"
-msgstr "_Palauta"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Liitä"
@@ -8078,7 +8273,7 @@ msgstr "Kumoa"
 msgid "Undo the last action"
 msgstr "Kumoa edellinen toiminto"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
 msgid "_Appointment (FIXME)"
 msgstr "_Tapaaminen"
 
@@ -8139,184 +8334,220 @@ msgid "E_xit"
 msgstr "_Poistu"
 
 #: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
+msgid "Evolution _Window"
 msgstr ""
 
 #: ui/evolution.xml.h:10
+msgid "Evolution bar _shortcut"
+msgstr ""
+
+#: ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Poistu ohjelmasta"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:12
 msgid "Getting _Started"
 msgstr ""
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:13
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:14
 msgid "Main toolbar"
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:15
 msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Lähetä virheraportti"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Lähetä _virheraportti"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:18
 msgid "Submit bug report using Bug Buddy."
 msgstr "Lähetä virheraportti käyttäen Bug Buddy:a."
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether to show the folder bar"
 msgstr "Määritä, näytetäänkö kansiopalkki"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:20
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Määritä, näytetäänkö oikotiepalkki"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Using the C_ontact Manager"
 msgstr ""
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "Using the _Calendar"
 msgstr "_Kalenterin käyttö"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:23
 msgid "Using the _Mailer"
 msgstr ""
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:24
 msgid "Work Offline"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_About Evolution..."
 msgstr "_Tietoja Evolutionista..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Actions"
 msgstr "T_oiminnot"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:33
 msgid "_Folder Bar"
 msgstr "_Kansiopalkki"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:34
 msgid "_Go to Folder..."
 msgstr "_Siirry kansioon..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:36
 msgid "_Import file..."
 msgstr ""
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:37
 msgid "_Index"
 msgstr ""
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:38
 msgid "_Mail message"
 msgstr ""
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:40
 msgid "_New Folder"
 msgstr "_Uusi kansio"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:41
 msgid "_Shortcut Bar"
 msgstr "_Oikotiepalkki"
 
-#. 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:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
+#: views/addressbook/galview.xml.h:1
+msgid "Adress Cards"
+msgstr ""
+
+#: views/addressbook/galview.xml.h:2
+msgid "By Company"
+msgstr "Yrityksen mukaan"
+
+#: views/addressbook/galview.xml.h:3
+msgid "Phone List"
+msgstr ""
+
+#: views/mail/galview.xml.h:1
+msgid "By Sender"
+msgstr "Lähettäjän mukaan"
+
+#: views/mail/galview.xml.h:2
+msgid "By Status"
+msgstr "Tilan mukaan"
+
+#: views/mail/galview.xml.h:3
+msgid "By Subject"
+msgstr "Aiheen mukaan"
+
+#: views/mail/galview.xml.h:4
+msgid "Messages"
+msgstr ""
+
+#: views/tasks/galview.xml.h:2
+msgid "With Category"
+msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
 msgstr "_Asetukset"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 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:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
 #: widgets/menus/gal-view-menus.c:177
 msgid "_Current View"
 msgstr "_Nykyinen näkymä"
@@ -8327,29 +8558,29 @@ msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
+#: widgets/misc/e-calendar-item.c:422
 msgid "MTWTFSS"
 msgstr "MTKTPLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
+#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
+#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
 msgid "Now"
 msgstr "Nyt"
 
-#: widgets/misc/e-cell-date-edit.c:242
+#: widgets/misc/e-cell-date-edit.c:245
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:723
+#: widgets/misc/e-cell-date-edit.c:726
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ajan tulee olla muodossa: %s"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
@@ -8390,38 +8621,6 @@ msgstr "Älä näytä tätä viestiä enää."
 msgid "Sear_ch"
 msgstr "_Etsi"
 
-#: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
-msgstr ""
-
-#: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Yrityksen mukaan"
-
-#: views/addressbook/galview.xml.h:3
-msgid "Phone List"
-msgstr ""
-
-#: views/mail/galview.xml.h:1
-msgid "By Sender"
-msgstr "Lähettäjän mukaan"
-
-#: views/mail/galview.xml.h:2
-msgid "By Status"
-msgstr "Tilan mukaan"
-
-#: views/mail/galview.xml.h:3
-msgid "By Subject"
-msgstr "Aiheen mukaan"
-
-#: views/mail/galview.xml.h:4
-msgid "Messages"
-msgstr ""
-
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
-msgstr ""
-
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr ""
@@ -8441,9 +8640,3 @@ msgstr "init_corba(): GNOME:n alustus epäonnistui"
 #: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobon alustus epäonnistui"
-
-#~ msgid "Is Not"
-#~ msgstr "Ei Ole"
-
-#~ msgid "Is"
-#~ msgstr "On"