Updated Finnish translation.

svn path=/trunk/; revision=8647

2 files changed, 4663 insertions, 2441 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 6346a46a78..c837fda12b 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-12  Jarkko Ranta  <jjranta@cc.joensuu.fi>
+
+	* fi.po: Updated Finnish translation.
+
 2001-03-11  Héctor García Álvarez <hector@scouts-es.org>
 
         * es.po: Updated Spanish translation.
diff --git a/po/fi.po b/po/fi.po
index c45c0d4cdd..93e3362e2a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,11 +2,10 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Jarkko Ranta <jjranta@cc.joensuu.fi> 2000.
 #
-#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-01-17 18:47-0500\n"
+"POT-Creation-Date: 2001-03-12 22:44+0000\n"
 "PO-Revision-Date: 2000-11-14 15:00+0300\n"
 "Last-Translator: Jarkko Ranta <jjranta@cc.joensuu.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -14,183 +13,11 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Bonobon komponenttijärjestelmän alustus epäonnistui"
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1090
-#: addressbook/gui/component/addressbook-factory.c:38
-#: addressbook/gui/widgets/test-minicard-view.c:45
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr "Bonobon alustus ei onnistunut"
-
-#: addressbook/gui/widgets/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:101
-#, fuzzy
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
-
-#: addressbook/gui/widgets/test-minicard-view.c:103
-msgid "This should test the reflow canvas item"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:36
-msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
-msgstr ""
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, fuzzy, c-format
-msgid "No such message: %s"
-msgstr "Viestin lähettäminen epäonnistui: %s"
-
-#: executive-summary/component/e-summary-callbacks.c:267
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:63
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Lähetetään sähköpostia"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:67
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "_Sulje"
-
-#: executive-summary/component/e-summary-url.c:68
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Siirrä kansioon"
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, fuzzy, c-format
-msgid "Move %s into the previous row"
-msgstr "Siirry edelliseen kohtaan"
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Move %s into the next row"
-msgstr "Siirry seuraavaan kohtaan"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Configure %s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:919
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Tiedostoa %s ei voitu avata:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:933
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "VIrhe luettaessa viestitiedostoa: %s"
-
-#: executive-summary/component/e-summary.c:951
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:443
-#: executive-summary/test-service/rdf-summary.c:479
-#: executive-summary/test-service/rdf-summary.c:524
-#, fuzzy
-msgid "Error"
-msgstr "Ei virhettä"
-
-#: mail/mail-config.c:799
-#, fuzzy
-msgid "Connecting to server"
-msgstr "Koeyhteys epäonnistui: \"%s\""
-
-#: mail/mail-config.c:801
-msgid "Connect to server"
-msgstr ""
-
-#: notes/component-factory.c:27
-msgid "New"
-msgstr "Uusi"
-
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "Create a new note"
-msgstr "Luo uusi kontakti"
-
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Bonobon komponenttijärjestelmän alustus epäonnistui"
-
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Bonobon alustus ei onnistunut"
-
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3053
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "Name: "
@@ -198,37 +25,37 @@ msgstr ""
 "\n"
 "Nimi: "
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3057
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3054
+#: addressbook/backend/ebook/e-card.c:3058
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3059
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3060
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3070
+#: addressbook/backend/ebook/e-card.c:3074
 msgid ""
 "\n"
 "Birth Date: "
@@ -236,7 +63,7 @@ msgstr ""
 "\n"
 "Syntymäpäivä: "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "Address:"
@@ -244,19 +71,19 @@ msgstr ""
 "\n"
 "Osoite:"
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Street:      "
@@ -264,7 +91,7 @@ msgstr ""
 "\n"
 "  Katu:        "
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3090
 msgid ""
 "\n"
 "  City:        "
@@ -272,13 +99,13 @@ msgstr ""
 "\n"
 "  Kaupunki:    "
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3091
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3092
 msgid ""
 "\n"
 "  Postal Code: "
@@ -286,7 +113,7 @@ msgstr ""
 "\n"
 "  Postinumero: "
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3093
 msgid ""
 "\n"
 "  Country:     "
@@ -294,25 +121,25 @@ msgstr ""
 "\n"
 "  Maa:         "
 
-#: addressbook/backend/ebook/e-card.c:3102
+#: addressbook/backend/ebook/e-card.c:3106
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3118
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3117
+#: addressbook/backend/ebook/e-card.c:3121
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3145
 msgid ""
 "\n"
 "E-mail:\n"
@@ -320,7 +147,7 @@ msgstr ""
 "\n"
 "Sähköposti:\n"
 
-#: addressbook/backend/ebook/e-card.c:3144
+#: addressbook/backend/ebook/e-card.c:3148
 msgid ""
 "\n"
 "E-mail:"
@@ -328,13 +155,13 @@ msgstr ""
 "\n"
 "Sähköposti:"
 
-#: addressbook/backend/ebook/e-card.c:3163
+#: addressbook/backend/ebook/e-card.c:3167
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3169
+#: addressbook/backend/ebook/e-card.c:3173
 msgid ""
 "\n"
 "Time Zone: "
@@ -342,13 +169,13 @@ msgstr ""
 "\n"
 "Aikavyöhyke: "
 
-#: addressbook/backend/ebook/e-card.c:3177
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3185
 msgid ""
 "\n"
 "Business Role: "
@@ -356,13 +183,13 @@ msgstr ""
 "\n"
 "Työn kuvaus:   "
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Name:  "
@@ -370,31 +197,31 @@ msgstr ""
 "\n"
 "  Nimi:  "
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3199
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3196
+#: addressbook/backend/ebook/e-card.c:3200
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3201
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3206
 msgid ""
 "\n"
 "Categories: "
@@ -402,7 +229,7 @@ msgstr ""
 "\n"
 "Kategoriat: "
 
-#: addressbook/backend/ebook/e-card.c:3203
+#: addressbook/backend/ebook/e-card.c:3207
 msgid ""
 "\n"
 "Comment: "
@@ -418,13 +245,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3220
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3219
+#: addressbook/backend/ebook/e-card.c:3223
 msgid ""
 "\n"
 "Public Key: "
@@ -432,6 +259,26 @@ msgstr ""
 "\n"
 "Julkinen avain: "
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
+msgid "Factory to import GnomeCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
+msgid "Imports GnomeCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
+#: addressbook/backend/ebook/load-pine-addressbook.c:17
+#: addressbook/backend/ebook/test-client-list.c:18
+#: addressbook/backend/ebook/test-client.c:29
+#: addressbook/conduit/address-conduit.c:1089
+#: addressbook/gui/component/addressbook-factory.c:39
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:965
+#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
+msgid "Could not initialize Bonobo"
+msgstr "Bonobon alustus ei onnistunut"
+
 #. This array must be in the same order as enumerations
 #. in GnomePilotConduitSyncType as they are used as index.
 #. Custom type implies Disabled state.
@@ -555,337 +402,422 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
+#: addressbook/conduit/address-conduit.c:651
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:652
+#: calendar/conduits/calendar/calendar-conduit.c:732
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
+#: addressbook/conduit/address-conduit.c:684
+#: addressbook/conduit/address-conduit.c:687
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-msgid "_Add"
-msgstr "_Lisää"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
-msgid "_Delete"
-msgstr "_Poista"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr "Puhelintyypit"
+#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
+msgid "Configure the address conduit"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr "Uusi puhelintyyppi"
+#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
+msgid "Evolution Address conduit "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
+#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:1
+#: calendar/gui/e-meeting-dialog.glade.h:1
+#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
+#: mail/mail-config.glade.h:4
 msgid "Add"
 msgstr "Lisää"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
+#: addressbook/contact-editor/contact-editor.glade.h:2
+msgid "Anni_versary:"
+msgstr ""
+
+#: addressbook/contact-editor/contact-editor.glade.h:3
+msgid "B_usiness"
+msgstr ""
+
+#: addressbook/contact-editor/contact-editor.glade.h:4
+msgid "Business _Fax"
+msgstr ""
+
+#: addressbook/contact-editor/contact-editor.glade.h:5
+msgid "C_ontacts..."
+msgstr ""
+
+#: addressbook/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
+#: calendar/gui/event-editor-dialog.glade.h:5
+msgid "Ca_tegories..."
+msgstr "Ka_tegoriat"
+
+#: addressbook/contact-editor/contact-editor.glade.h:7
 msgid "Contact Editor"
 msgstr "Kontaktinhallinta"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
-msgstr "_Koko nimi..."
+#: addressbook/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+msgid "Details"
+msgstr "Yksityiskohdat"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
+#: addressbook/contact-editor/contact-editor.glade.h:9
 msgid "File As:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr "Kotisivun osoite:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr "Haluaa sähköpostit HTML-muodossa"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
+#: addressbook/contact-editor/contact-editor.glade.h:10
+#: executive-summary/component/executive-summary-config.glade.h:3
+#: mail/mail-config.glade.h:27
+msgid "General"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-msgid "_Home"
-msgstr "_Koti"
+#: addressbook/contact-editor/contact-editor.glade.h:11
+msgid "New phone type"
+msgstr "Uusi puhelintyyppi"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
+#: addressbook/contact-editor/contact-editor.glade.h:12
+msgid "No_tes:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
-msgstr "_Matkapuhelin"
+#: addressbook/contact-editor/contact-editor.glade.h:13
+msgid "Phone Types"
+msgstr "Puhelintyypit"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
+#: addressbook/contact-editor/contact-editor.glade.h:14
+#: addressbook/contact-editor/e-contact-editor.c:1235
 msgid "Primary Email"
 msgstr "Ensisijainen sähköposti"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
-msgstr ""
+#: addressbook/contact-editor/contact-editor.glade.h:15
+msgid "Wants to receive _HTML mail"
+msgstr "Haluaa sähköpostit HTML-muodossa"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr ""
+#: addressbook/contact-editor/contact-editor.glade.h:16
+msgid "Web page address:"
+msgstr "Kotisivun osoite:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
+#: addressbook/contact-editor/contact-editor.glade.h:17
+#: mail/mail-config.glade.h:80
+msgid "_Add"
+msgstr "_Lisää"
+
+#: addressbook/contact-editor/contact-editor.glade.h:18
+msgid "_Address..."
+msgstr "_Osoite..."
+
+#: addressbook/contact-editor/contact-editor.glade.h:19
+msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-msgid "Ca_tegories..."
-msgstr "Ka_tegoriat"
+#: addressbook/contact-editor/contact-editor.glade.h:20
+msgid "_Birthday:"
+msgstr "_Syntymäpäivä:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
-msgstr "_Tehtävänimike:"
+#: addressbook/contact-editor/contact-editor.glade.h:21
+msgid "_Business"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#: addressbook/contact-editor/contact-editor.glade.h:22
 msgid "_Company:"
 msgstr "_Yritys:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr "_Osoite..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
-msgstr ""
+#: addressbook/contact-editor/contact-editor.glade.h:23
+#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
+msgid "_Delete"
+msgstr "_Poista"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
+#: addressbook/contact-editor/contact-editor.glade.h:24
 msgid "_Department:"
 msgstr "_Osasto:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
-msgstr ""
+#: addressbook/contact-editor/contact-editor.glade.h:25
+msgid "_Full Name..."
+msgstr "_Koko nimi..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
+#: addressbook/contact-editor/contact-editor.glade.h:26
+msgid "_Home"
+msgstr "_Koti"
+
+#: addressbook/contact-editor/contact-editor.glade.h:27
+msgid "_Job title:"
+msgstr "_Tehtävänimike:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:28
+msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
+#: addressbook/contact-editor/contact-editor.glade.h:29
+msgid "_Mobile"
+msgstr "_Matkapuhelin"
+
+#: addressbook/contact-editor/contact-editor.glade.h:30
 msgid "_Nickname:"
 msgstr "_Kutsumanimi:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
+#: addressbook/contact-editor/contact-editor.glade.h:31
+msgid "_Office:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr "_Syntymäpäivä:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
+#: addressbook/contact-editor/contact-editor.glade.h:32
+msgid "_Profession:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
+#: addressbook/contact-editor/contact-editor.glade.h:33
+msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
+#: addressbook/contact-editor/contact-editor.glade.h:34
+msgid "_This is the mailing address"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "No_tes:"
-msgstr ""
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Poista kontakti?"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
-msgstr "Yksityiskohdat"
+#: addressbook/contact-editor/e-contact-editor.c:578
+msgid "This contact belongs to these categories:"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/contact-editor/e-contact-editor.c:1193
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:568
+#: addressbook/contact-editor/e-contact-editor.c:1194
+#: addressbook/contact-editor/e-contact-editor.c:1261
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Business"
 msgstr "Työ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/contact-editor/e-contact-editor.c:1195
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Business 2"
 msgstr "Työ 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/contact-editor/e-contact-editor.c:1196
+#: addressbook/gui/widgets/e-addressbook-view.c:586
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1197
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
+#: addressbook/contact-editor/e-contact-editor.c:1198
+#: addressbook/gui/widgets/e-addressbook-view.c:585
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1199
 msgid "Company"
 msgstr "Yritys"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:569
+#: addressbook/contact-editor/e-contact-editor.c:1200
+#: addressbook/contact-editor/e-contact-editor.c:1262
+#: addressbook/gui/widgets/e-addressbook-view.c:582
 msgid "Home"
 msgstr "Koti"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/contact-editor/e-contact-editor.c:1201
+#: addressbook/gui/widgets/e-addressbook-view.c:589
 msgid "Home 2"
 msgstr "Koti 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/widgets/e-addressbook-view.c:587
 msgid "Home Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/contact-editor/e-contact-editor.c:1203
+#: addressbook/gui/widgets/e-addressbook-view.c:590
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
+#: addressbook/contact-editor/e-contact-editor.c:1204
+#: addressbook/gui/widgets/e-addressbook-view.c:584
 msgid "Mobile"
 msgstr "Matkapuhelin"
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
+#: addressbook/contact-editor/e-contact-editor.c:1205
+#: addressbook/contact-editor/e-contact-editor.c:1263
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
 msgid "Other"
 msgstr "Muu"
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
+#: addressbook/contact-editor/e-contact-editor.c:1206
 msgid "Other Fax"
 msgstr "Muu faksi"
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/contact-editor/e-contact-editor.c:1207
+#: addressbook/gui/widgets/e-addressbook-view.c:592
 msgid "Pager"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
+#: addressbook/contact-editor/e-contact-editor.c:1208
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Primary"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1290
+#: addressbook/contact-editor/e-contact-editor.c:1209
 msgid "Radio"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
+#: addressbook/contact-editor/e-contact-editor.c:1210
 msgid "Telex"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/contact-editor/e-contact-editor.c:1211
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/gui/widgets/e-addressbook-view.c:593
 msgid "Email 2"
 msgstr "Sähköposti 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/gui/widgets/e-addressbook-view.c:594
 msgid "Email 3"
 msgstr "Sähköposti 3"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
+#: addressbook/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "Osoite _2:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:2
+msgid "Canada"
+msgstr "Kanada"
+
+#: addressbook/contact-editor/fulladdr.glade.h:3
+msgid "Check Address"
+msgstr "Tarkista osoite"
+
+#: addressbook/contact-editor/fulladdr.glade.h:4
+msgid "Countr_y:"
+msgstr "M_aa:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:5
+msgid "Finland"
+msgstr "Suomi"
+
+#: addressbook/contact-editor/fulladdr.glade.h:6
+msgid "USA"
+msgstr "Yhdysvallat"
+
+#: addressbook/contact-editor/fulladdr.glade.h:7
+msgid "_Address:"
+msgstr "_Osoite:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:8
+msgid "_City:"
+msgstr "_Kaupunki:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:9
+msgid "_PO Box:"
+msgstr ""
+
+#: addressbook/contact-editor/fulladdr.glade.h:10
+msgid "_State/Province:"
+msgstr "_Osavaltio/Provinssi:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:11
+msgid "_ZIP Code:"
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Tarkasta kokonimi"
 
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
+#: addressbook/contact-editor/fullname.glade.h:2
+msgid "Dr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
+#: addressbook/contact-editor/fullname.glade.h:3
+msgid "Esq."
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:23
-msgid "_First:"
-msgstr "_Etunimi:"
+#: addressbook/contact-editor/fullname.glade.h:4
+msgid "I"
+msgstr "I"
 
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
+#: addressbook/contact-editor/fullname.glade.h:5
+msgid "II"
+msgstr "II"
+
+#: addressbook/contact-editor/fullname.glade.h:6
+msgid "III"
+msgstr "III"
+
+#: addressbook/contact-editor/fullname.glade.h:7
+msgid "Jr."
+msgstr "Jr."
+
+#: addressbook/contact-editor/fullname.glade.h:8
+msgid "Miss"
+msgstr "Neiti"
+
+#: addressbook/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr "Hra."
+
+#: addressbook/contact-editor/fullname.glade.h:10
+msgid "Mrs."
+msgstr "Rva."
+
+#: addressbook/contact-editor/fullname.glade.h:11
+msgid "Ms."
+msgstr "Nti."
+
+#: addressbook/contact-editor/fullname.glade.h:12
+msgid "Sr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:25
-msgid "_Middle:"
-msgstr "_Toinen nimi:"
+#: addressbook/contact-editor/fullname.glade.h:13
+msgid "_First:"
+msgstr "_Etunimi:"
 
-#: addressbook/contact-editor/fullname-strings.h:26
+#: addressbook/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Sukunimi:"
 
-#: addressbook/contact-editor/fullname-strings.h:27
+#: addressbook/contact-editor/fullname.glade.h:15
+msgid "_Middle:"
+msgstr "_Toinen nimi:"
+
+#: addressbook/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:231
-msgid "As _Minicards"
+#: addressbook/contact-editor/fullname.glade.h:17
+msgid "_Title:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook.c:237
+msgid "As _Minicards"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:243
+#: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:374
+#: addressbook/gui/component/addressbook.c:412
 #, c-format
 msgid "Enter password for %s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:402
+#: addressbook/gui/component/addressbook.c:440
 msgid "Unable to open addressbook"
 msgstr "Osoitekirjaa ei voitu avata"
 
-#: addressbook/gui/component/addressbook.c:407
+#: addressbook/gui/component/addressbook.c:445
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -897,27 +829,27 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:568
 msgid "Show All"
 msgstr "Näytä kaikki"
 
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
+#: addressbook/gui/component/addressbook.c:570
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:600
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:563
+#: addressbook/gui/component/addressbook.c:601
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:564
+#: addressbook/gui/component/addressbook.c:602
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:707
+#: addressbook/gui/component/addressbook.c:745
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -925,184 +857,413 @@ msgstr ""
 msgid "Other Contacts"
 msgstr "Muut kontaktit"
 
-#: addressbook/gui/component/addressbook-config.c:139
+#: addressbook/gui/component/addressbook-config.c:143
 msgid "LDAP Server"
 msgstr "LDAP-palvelin"
 
-#: addressbook/gui/component/addressbook-config.c:141
+#: addressbook/gui/component/addressbook-config.c:145
 msgid "File"
 msgstr "Tiedosto"
 
-#: addressbook/gui/component/addressbook-config.c:144
+#: addressbook/gui/component/addressbook-config.c:148
 msgid "Unknown addressbook type"
 msgstr "Tuntematon osoitekirjatyyppi"
 
-#: addressbook/gui/component/addressbook-config.c:153
+#: addressbook/gui/component/addressbook-config.c:158
 msgid "None (anonymous mode)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
+#: addressbook/gui/component/addressbook-config.c:160
+#: camel/providers/imap/camel-imap-store.c:260
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
+#: camel/providers/pop3/camel-pop3-store.c:145
 msgid "Password"
 msgstr "Salasana"
 
-#: addressbook/gui/component/addressbook-config.c:157
+#: addressbook/gui/component/addressbook-config.c:162
 msgid "SASL"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:160
+#: addressbook/gui/component/addressbook-config.c:165
 msgid "Unknown auth type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:169
+#: addressbook/gui/component/addressbook-config.c:174
 msgid "Base"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:171
+#: addressbook/gui/component/addressbook-config.c:176
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:173
+#: addressbook/gui/component/addressbook-config.c:178
 msgid "Subtree"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "Unknown scope type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:309
+#: addressbook/gui/component/addressbook-config.c:348
 msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:311
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:351
 msgid "Remember this password"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:360
+#: addressbook/gui/component/addressbook-config.c:401
+#: mail/mail-config.glade.h:28
 msgid "Host:"
 msgstr "Isäntä:"
 
-#: addressbook/gui/component/addressbook-config.c:361
+#: addressbook/gui/component/addressbook-config.c:402
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:404
 msgid "Port:"
 msgstr "Portti:"
 
-#: addressbook/gui/component/addressbook-config.c:364
+#: addressbook/gui/component/addressbook-config.c:405
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:409
 msgid "Root DN:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:384
+#: addressbook/gui/component/addressbook-config.c:410
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:430
 msgid "Search Scope:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:438
+#: addressbook/gui/component/addressbook-config.c:484
+#: mail/mail-config.glade.h:8
 msgid "Authentication:"
 msgstr "Todentaminen:"
 
-#: addressbook/gui/component/addressbook-config.c:455
+#: addressbook/gui/component/addressbook-config.c:502
+#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
 msgid "Path:"
 msgstr "Polku:"
 
-#: addressbook/gui/component/addressbook-config.c:460
+#: addressbook/gui/component/addressbook-config.c:503
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:508
 msgid "Create path if it doesn't exist."
 msgstr "Luo polku mikäli sitä ei ole olemassa."
 
-#: addressbook/gui/component/addressbook-config.c:593
+#: addressbook/gui/component/addressbook-config.c:642
 msgid "Edit Addressbook"
 msgstr "Muokkaa osoitekirjaa"
 
-#: addressbook/gui/component/addressbook-config.c:595
+#: addressbook/gui/component/addressbook-config.c:644
 msgid "Add Addressbook"
 msgstr "Lisää osoitekirja"
 
-#: addressbook/gui/component/addressbook-config.c:611
+#: addressbook/gui/component/addressbook-config.c:660
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
 msgstr ""
 "Valitse osoitekirjan tyyppi, ja anna sen jälkeen tarpeelliset tiedot siitä."
 
-#: addressbook/gui/component/addressbook-config.c:616
+#: addressbook/gui/component/addressbook-config.c:666
+#: mail/mail-config.glade.h:41
 msgid "Name:"
 msgstr "Nimi:"
 
-#: addressbook/gui/component/addressbook-config.c:617
+#: addressbook/gui/component/addressbook-config.c:667
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:669
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
+#: addressbook/gui/component/addressbook-config.c:670
+msgid "FIXME Description help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+msgid "Addressbook Sources"
+msgstr "Osoitekirjan lähteet"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+#: 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:19 mail/folder-browser.c:570
+#: mail/mail-config.glade.h:20 mail/mail-view.c:150
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
+#: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
+msgid "Delete"
+msgstr "Poista"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
+#: mail/mail-config.glade.h:22
+msgid "Edit"
+msgstr "Muokkaa"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/widgets/e-addressbook-view.c:578
+msgid "Name"
+msgstr "Nimi"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Evolution Addressbook minicard viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution component for handling contacts."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Factory for the Addressbook Minicard control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook's address displayer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Evolution addressbook component."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+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/select-names.glade.h:1
+msgid "Find..."
+msgstr "Etsi..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Message Recipients"
+msgstr "Vastaanottajat"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+msgid "Select Names"
+msgstr "Valitse nimet"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Select name from:"
+msgstr ""
+
+#: addressbook/gui/search/e-addressbook-search-dialog.c:150
 msgid "Search"
 msgstr "Etsi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
+#: addressbook/gui/widgets/alphabet.glade.h:1
+msgid "123"
+msgstr "123"
+
+#: addressbook/gui/widgets/alphabet.glade.h:2
+msgid "a"
+msgstr "a"
+
+#: addressbook/gui/widgets/alphabet.glade.h:3
+msgid "b"
+msgstr "b"
+
+#: addressbook/gui/widgets/alphabet.glade.h:4
+msgid "c"
+msgstr "c"
+
+#: addressbook/gui/widgets/alphabet.glade.h:5
+msgid "d"
+msgstr "d"
+
+#: addressbook/gui/widgets/alphabet.glade.h:6
+msgid "e"
+msgstr "e"
+
+#: addressbook/gui/widgets/alphabet.glade.h:7
+msgid "f"
+msgstr "f"
+
+#: addressbook/gui/widgets/alphabet.glade.h:8
+msgid "g"
+msgstr "g"
+
+#: addressbook/gui/widgets/alphabet.glade.h:9
+msgid "h"
+msgstr "h"
+
+#: addressbook/gui/widgets/alphabet.glade.h:10
+msgid "i"
+msgstr "i"
+
+#: addressbook/gui/widgets/alphabet.glade.h:11
+msgid "j"
+msgstr "j"
+
+#: addressbook/gui/widgets/alphabet.glade.h:12
+msgid "k"
+msgstr "k"
+
+#: addressbook/gui/widgets/alphabet.glade.h:13
+msgid "l"
+msgstr "l"
+
+#: addressbook/gui/widgets/alphabet.glade.h:14
+msgid "m"
+msgstr "m"
+
+#: addressbook/gui/widgets/alphabet.glade.h:15
+msgid "n"
+msgstr "n"
+
+#: addressbook/gui/widgets/alphabet.glade.h:16
+msgid "o"
+msgstr "o"
+
+#: addressbook/gui/widgets/alphabet.glade.h:17
+msgid "p"
+msgstr "p"
+
+#: addressbook/gui/widgets/alphabet.glade.h:18
+msgid "q"
+msgstr "q"
+
+#: addressbook/gui/widgets/alphabet.glade.h:19
+msgid "r"
+msgstr "r"
+
+#: addressbook/gui/widgets/alphabet.glade.h:20
+msgid "s"
+msgstr "s"
+
+#: addressbook/gui/widgets/alphabet.glade.h:21
+msgid "t"
+msgstr "t"
+
+#: addressbook/gui/widgets/alphabet.glade.h:22
+msgid "u"
+msgstr "u"
+
+#: addressbook/gui/widgets/alphabet.glade.h:23
+msgid "v"
+msgstr "v"
+
+#: addressbook/gui/widgets/alphabet.glade.h:24
+msgid "w"
+msgstr "w"
+
+#: addressbook/gui/widgets/alphabet.glade.h:25
+msgid "x"
+msgstr "x"
+
+#: addressbook/gui/widgets/alphabet.glade.h:26
+msgid "y"
+msgstr "y"
+
+#: addressbook/gui/widgets/alphabet.glade.h:27
+msgid "z"
+msgstr "z"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:481
+#: addressbook/gui/widgets/e-minicard.c:435
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-msgid "Name"
-msgstr "Nimi"
+#: addressbook/gui/widgets/e-addressbook-view.c:577
+msgid "* Click here to add a contact *"
+msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:566
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Email"
-msgstr "Sähköposti 2"
+msgstr "Sähköposti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:570
+#: addressbook/gui/widgets/e-addressbook-view.c:583
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/gui/widgets/e-addressbook-view.c:595
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-view.c:596
 msgid "Department"
-msgstr "_Osasto:"
+msgstr "Osasto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/gui/widgets/e-addressbook-view.c:597
 msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:585
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-view.c:598
 msgid "Title"
-msgstr "Tiedosto"
+msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/gui/widgets/e-addressbook-view.c:599
 msgid "Profession"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/gui/widgets/e-addressbook-view.c:600
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:589
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Nickname"
-msgstr "_Kutsumanimi:"
+msgstr "Kutsumanimi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Spouse"
-msgstr "Lähde"
+msgstr "Puoliso"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: addressbook/gui/widgets/e-addressbook-view.c:604
 msgid "Note"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Free-busy URL"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.c:606
+msgid "Click here to add a contact"
+msgstr "Napsauta tästä lisätäksesi kontaktin"
+
 #: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr "Tallenna osoitekirjaan"
 
-#: addressbook/gui/widgets/e-minicard-view.c:129
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -1111,6 +1272,179 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+msgid "Card View"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:1
+msgid "10 pt. Tahoma"
+msgstr "10 pt. Tahoma"
+
+#: addressbook/printing/e-contact-print.glade.h:2
+msgid "8 pt. Tahoma"
+msgstr "8 pt. Tahoma"
+
+#: addressbook/printing/e-contact-print.glade.h:3
+msgid "Blank forms at end:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:4
+msgid "Body"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:5
+msgid "Bottom:"
+msgstr "Ala:"
+
+#: addressbook/printing/e-contact-print.glade.h:6
+msgid "Dimensions:"
+msgstr "Mitat:"
+
+#: addressbook/printing/e-contact-print.glade.h:7
+msgid "Font..."
+msgstr "Kirjasin..."
+
+#: addressbook/printing/e-contact-print.glade.h:8
+msgid "Fonts"
+msgstr "Kirjasinlajit"
+
+#: addressbook/printing/e-contact-print.glade.h:9
+msgid "Footer:"
+msgstr "Alatunniste:"
+
+#: addressbook/printing/e-contact-print.glade.h:10
+msgid "Format"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:11
+msgid "Header"
+msgstr "Ylätunniste:"
+
+#: addressbook/printing/e-contact-print.glade.h:12
+msgid "Header/Footer"
+msgstr "Ylä-/Alatunniste"
+
+#: addressbook/printing/e-contact-print.glade.h:13
+msgid "Headings"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:14
+msgid "Headings for each letter"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:15
+msgid "Height:"
+msgstr "Korkeus:"
+
+#: addressbook/printing/e-contact-print.glade.h:16
+msgid "Immediately follow each other"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:17
+msgid "Include:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:18
+msgid "Landscape"
+msgstr "Vaaka"
+
+#: addressbook/printing/e-contact-print.glade.h:19
+msgid "Left:"
+msgstr "Vasen:"
+
+#: addressbook/printing/e-contact-print.glade.h:20
+msgid "Letter tabs on side"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:21
+msgid "Margins"
+msgstr "Reunukset"
+
+#: addressbook/printing/e-contact-print.glade.h:22
+#: executive-summary/component/executive-summary-config.glade.h:4
+msgid "Number of columns:"
+msgstr "Sarakkeiden määrä:"
+
+#: addressbook/printing/e-contact-print.glade.h:23
+msgid "Options"
+msgstr "Asetukset"
+
+#: addressbook/printing/e-contact-print.glade.h:24
+msgid "Orientation"
+msgstr "Suunta"
+
+#: addressbook/printing/e-contact-print.glade.h:25
+msgid "Page"
+msgstr "Sivu"
+
+#: addressbook/printing/e-contact-print.glade.h:26
+msgid "Page Setup:"
+msgstr "Sivun asetukset:"
+
+#: addressbook/printing/e-contact-print.glade.h:27
+msgid "Paper"
+msgstr "Paperi"
+
+#: addressbook/printing/e-contact-print.glade.h:28
+msgid "Paper source:"
+msgstr "Paperilähde:"
+
+#: addressbook/printing/e-contact-print.glade.h:29
+msgid "Portrait"
+msgstr "Pysty"
+
+#: addressbook/printing/e-contact-print.glade.h:30
+msgid "Preview:"
+msgstr "Esikatselu:"
+
+#: addressbook/printing/e-contact-print.glade.h:31
+msgid "Print using gray shading"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:32
+msgid "Reverse on even pages"
+msgstr "Peilikuvareunukset"
+
+#: addressbook/printing/e-contact-print.glade.h:33
+msgid "Right:"
+msgstr "Oikea:"
+
+#: addressbook/printing/e-contact-print.glade.h:34
+msgid "Sections:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:35
+msgid "Shading"
+msgstr "Varjostus"
+
+#: addressbook/printing/e-contact-print.glade.h:36
+msgid "Size:"
+msgstr "Koko:"
+
+#: addressbook/printing/e-contact-print.glade.h:37
+msgid "Start on a new page"
+msgstr "Aloita uudelta sivulta"
+
+#: addressbook/printing/e-contact-print.glade.h:38
+msgid "Style name:"
+msgstr "Tyylin nimi:"
+
+#: addressbook/printing/e-contact-print.glade.h:39
+msgid "Top:"
+msgstr "Ylä:"
+
+#: addressbook/printing/e-contact-print.glade.h:40
+msgid "Type:"
+msgstr "Tyyppi:"
+
+#: addressbook/printing/e-contact-print.glade.h:41
+msgid "Width:"
+msgstr "Leveys:"
+
+#: addressbook/printing/e-contact-print.glade.h:42
+msgid "label26"
+msgstr ""
+
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr ""
@@ -1119,16 +1453,32 @@ msgstr ""
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
+#: calendar/conduits/calendar/calendar-conduit.c:687
+#: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr "Virhe kommunikoitaessa kalenteripalvelimen kanssa"
 
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
+#: calendar/conduits/calendar/calendar-conduit.c:786
+#: calendar/conduits/calendar/calendar-conduit.c:789
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
+#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
+msgid "Configure the GnomeCal conduit"
+msgstr ""
+
+#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
+msgid "Evolution Calendar conduit"
+msgstr ""
+
+#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
+msgid "Configure the todo conduit"
+msgstr ""
+
+#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
+msgid "Evolution ToDo conduit "
+msgstr ""
+
 #: calendar/conduits/todo/todo-conduit-control-applet.c:127
 msgid "Evolution ToDo Conduit"
 msgstr ""
@@ -1137,196 +1487,267 @@ msgstr ""
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-#, fuzzy
-msgid "Reminder of your appointment at "
-msgstr "Muistuta kaikista tapaamisista"
-
-#: calendar/gui/alarm-notify.c:876
-msgid "Snooze"
-msgstr ""
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/calendar-commands.c:245
+#: calendar/gui/calendar-commands.c:233
 msgid "File not found"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:269
+#: calendar/gui/calendar-commands.c:257
 msgid "Open calendar"
 msgstr "Avaa kalenteri"
 
-#: calendar/gui/calendar-commands.c:311
+#: calendar/gui/calendar-commands.c:299
 msgid "Save calendar"
 msgstr "Tallenna kalenteri"
 
-#: calendar/gui/calendar-commands.c:448
+#: calendar/gui/calendar-commands.c:451
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:332
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr ""
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr ""
-
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:374
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
+#: calendar/gui/e-calendar-table.c:329
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:377
+#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
+#: calendar/gui/e-calendar-table.c:330
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:380
+#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
+#: calendar/gui/e-calendar-table.c:331
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
+#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
+#: calendar/gui/event-editor.c:1617
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:463
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:463
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:465
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:465
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:545
+#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: calendar/gui/e-calendar-table.c:351
+msgid "High"
+msgstr "Korkea"
+
+#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
+#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: calendar/gui/e-calendar-table.c:352
+msgid "Normal"
+msgstr "Tavallinen"
+
+#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: calendar/gui/e-calendar-table.c:353
+msgid "Low"
+msgstr "Matala"
+
+#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
+#: calendar/gui/e-calendar-table.c:405
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:548
+#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
+#: calendar/gui/e-calendar-table.c:404
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:774
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: calendar/gui/e-calendar-table.c:425
+msgid "Not Started"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:426
+msgid "In Progress"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: calendar/gui/e-calendar-table.c:427
+msgid "Completed"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
+#: calendar/gui/e-calendar-table.c:428
+msgid "Cancelled"
+msgstr "Peruutettu"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+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:800 e-util/e-time-utils.c:285
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/calendar-model.c:805
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
 "\n"
 "%s"
 msgstr ""
+"Päiväys tulee antaa seuraavassa muodossa: \n"
+"\n"
+"%s"
 
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
+#: calendar/gui/calendar-model.c:885
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr ""
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
+#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
+#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:756
+#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
+#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
+#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
+#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
+#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+msgid "None"
 msgstr ""
 
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:893
-msgid "%I:%M:%S %p%n"
+#: calendar/gui/calendar-model.c:973
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
 msgstr ""
 
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:896
-msgid "%H:%M:%S%n"
+#: calendar/gui/calendar-model.c:1013
+msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:900
-msgid "%I:%M %p%n"
+#: calendar/gui/calendar-model.c:1054
+msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
-msgid "%H:%M%n"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
+#: calendar/gui/e-calendar-table.c:354
+msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1023
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
+#: calendar/gui/calendar-model.c:1108
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1063
-msgid "The percent value must be between 0 and 100, inclusive"
+#: calendar/gui/calendar-model.c:1598
+msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1103
-msgid "The priority must be between 1 and 9, inclusive"
+#: calendar/gui/calendar-model.c:1600
+msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:97
+#: calendar/gui/calendar-model.c:1606
+msgid "Yes"
+msgstr "Kyllä"
+
+#: calendar/gui/calendar-model.c:1606
+msgid "No"
+msgstr "Ei"
+
+#: calendar/gui/calendar-summary.c:196
 msgid "%A, %e %B %Y"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
 msgid "%I:%M%p"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:302
-#, fuzzy
+#: calendar/gui/calendar-summary.c:437
 msgid "<b>Error loading calendar</b>"
-msgstr "VIrhe avattaessa tiedostoa: %s"
+msgstr "<b>Virhe ladattaessa kalenteria</b>"
 
-#: calendar/gui/calendar-summary.c:314
+#: calendar/gui/calendar-summary.c:449
 msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr ""
+msgstr "<b>Virhe ladattaessa kalenteria:<br>Metodia ei tuettu"
 
-#: calendar/gui/calendar-summary.c:484
-#, fuzzy
+#: calendar/gui/calendar-summary.c:616
 msgid "Display"
-msgstr "Päivä"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:489
-#, fuzzy
+#: calendar/gui/calendar-summary.c:621
 msgid "Show appointments"
-msgstr "Näytä tapaamisten lopetusajat"
+msgstr "Näytä tapaamiset"
 
-#: calendar/gui/calendar-summary.c:497
-#, fuzzy
+#: calendar/gui/calendar-summary.c:629
 msgid "Show tasks"
-msgstr "Näytä liitteet"
+msgstr "Näytä tehtävät"
 
-#: calendar/gui/calendar-summary.c:583
-#, fuzzy
+#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
-msgstr "Tulosta kalenteri"
+msgstr "Ladataan kalenteria"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:126
 msgid "The URI that the calendar will display"
 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:63 calendar/gui/main.c:49
+msgid "Could not initialize GNOME"
+msgstr "GNOMEn alustus ei onnistunut"
+
+#: calendar/gui/alarm-notify/notify-main.c:73
+msgid "Could not create the alarm notify service factory"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
@@ -1339,227 +1760,788 @@ msgstr ""
 msgid "No summary available."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:63
+#: calendar/gui/dialogs/alarm-notify.glade.h:1
+#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
+#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
+msgid "Close"
+msgstr "Sulje"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:2
+msgid "Edit appointment"
+msgstr "Muokkaa tapaamista"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:4
+msgid "Snooze time (minutes)"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid "05 minutes"
+msgstr "05 minuuttia"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+msgid "10 minutes"
+msgstr "10 minuuttia"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+msgid "12 hour (am/pm)"
+msgstr "12 tuntia (am/pm)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+msgid "15 minutes"
+msgstr "15 minuuttia"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+msgid "24 hour"
+msgstr "24 tuntia"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+msgid "30 minutes"
+msgstr "30 minuuttia"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "60 minutes"
+msgstr "60 minuuttia"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+msgid "Alarms timeout after"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "Audio Alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Beep when alarm windows appear."
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ui/evolution-calendar.xml.h:3
+msgid "Calendar"
+msgstr "Kalenteri"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Calendar Preferences"
+msgstr "Kalenterin asetukset"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+msgid "Colors"
+msgstr "Värit"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "Compress weekends"
+msgstr "Tiivistä viikonloput"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Date navigator options"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "Defaults"
+msgstr "Oletukset"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+msgid "Display options"
+msgstr "Näytä asetukset"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/e-calendar-table.c:161
+msgid "Due Date"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+msgid "Enable snoozing for"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid "End of day:"
+msgstr "Päivän loppu:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+msgid "First day of week:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "Fri"
+msgstr "Pe"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/event-editor.c:479
+msgid "Friday"
+msgstr "Perjantai"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+msgid "Highlight"
+msgstr "Korosta"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Items Due Today"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Items Due Today:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+msgid "Items Not Yet Due"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Items Not Yet Due:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "Mon"
+msgstr "Ma"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/event-editor.c:475
+msgid "Monday"
+msgstr "Maanantai"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+msgid "Overdue Items"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Overdue Items:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+msgid "Pick a color"
+msgstr "Valitse väri"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/e-calendar-table.c:164 filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:113
+msgid "Priority"
+msgstr "Prioriteetti"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+msgid "Remind me of all appointments"
+msgstr "Muistuta minua kaikista tapaamisista"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:21
+msgid "Reminders"
+msgstr "Muistutukset"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Sat"
+msgstr "La"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/event-editor.c:480
+msgid "Saturday"
+msgstr "Lauantai"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+msgid "Show"
+msgstr "Näytä"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Show appointment end times"
+msgstr "Näytä tapaamisten loppumisajat"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "Show week numbers"
+msgstr "Näytä viikkonumerot"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+msgid "Start of day:"
+msgstr "Päivän alku:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "Sun"
+msgstr "Su"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/event-editor.c:481
+msgid "Sunday"
+msgstr "Sunnuntai"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+msgid "TaskPad"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+msgid "Thu"
+msgstr "To"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/event-editor.c:478
+msgid "Thursday"
+msgstr "Torstai"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "Time Until Due"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+msgid "Time divisions:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+msgid "Time format:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+msgid "Tue"
+msgstr "Ti"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:476
+msgid "Tuesday"
+msgstr "Tiistai"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+msgid "Visual Alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+msgid "Wed"
+msgstr "Ke"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: calendar/gui/event-editor.c:477
+msgid "Wednesday"
+msgstr "Keskiviikko"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+msgid "Work week"
+msgstr "Työviikko"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+msgid "minutes before they occur."
+msgstr "minuuttia niitä ennen."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: mail/mail-config.glade.h:84
+msgid "seconds."
+msgstr "sekuntia."
+
+#: calendar/gui/dialogs/delete-comp.c:68
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Haluatko todella poistaa tapaamisen '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:66
+#: calendar/gui/dialogs/delete-comp.c:71
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Haluatko todella poistaa tämän nimettömän tapaamisen?"
 
-#: calendar/gui/dialogs/delete-comp.c:72
+#: calendar/gui/dialogs/delete-comp.c:77
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Haluatko todella poistaa tehtävän '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:75
+#: calendar/gui/dialogs/delete-comp.c:80
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Haluatko todella poistaa tämän nimettömän tehtävän?"
 
-#: calendar/gui/dialogs/delete-comp.c:81
+#: calendar/gui/dialogs/delete-comp.c:86
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:84
+#: calendar/gui/dialogs/delete-comp.c:89
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:690
-msgid "Edit Task"
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
+#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/event-editor-dialog.glade.h:6
+msgid "Classification"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+#: calendar/gui/event-editor-dialog.glade.h:8
+msgid "Date & Time"
+msgstr "Päiväys & Aika"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
+msgid "Date Completed:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: calendar/gui/event-editor-dialog.glade.h:16
+msgid "Pri_vate"
+msgstr "Y_ksityinen"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+msgid "Progress"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
+msgid "Pu_blic"
+msgstr "Y_leinen"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+msgid "Sta_rt Date:"
+msgstr "_Alkamispäivä:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:27
+msgid "Su_mmary:"
+msgstr "_Yhteenveto:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+msgid "Task"
+msgstr "Tehtävä"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:28
+msgid "_Confidential"
+msgstr "_Luottamuksellinen"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:29
+msgid "_Contacts..."
+msgstr "_Kontaktit..."
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+msgid "_Priority:"
+msgstr "_Prioriteetti:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+msgid "_Status:"
+msgstr "_Tila:"
+
+#: calendar/gui/dialogs/task-editor.c:689
+msgid "Edit Task"
+msgstr "Muokkaa tehtävää"
+
+#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
 #, c-format
 msgid "Task - %s"
-msgstr ""
+msgstr "Tehtävä - %s"
 
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:154
-#, fuzzy
+#: calendar/gui/e-calendar-table.c:156
 msgid "Categories"
-msgstr ""
-"\n"
-"Kategoriat: "
-
-#: calendar/gui/e-calendar-table.c:155
-msgid "Classification"
-msgstr ""
+msgstr "Kategoriat"
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:158
 msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:157
-#, fuzzy
+#: calendar/gui/e-calendar-table.c:159
 msgid "End Date"
-msgstr "_Loppumisaika:"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:158
-#, fuzzy
+#: calendar/gui/e-calendar-table.c:160
 msgid "Start Date"
-msgstr "_Alkamisaika:"
-
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:162
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
+#: calendar/gui/e-calendar-table.c:163
+msgid "Percent complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Prioriteetti"
-
-#: calendar/gui/e-calendar-table.c:163
-#, fuzzy
+#: calendar/gui/e-calendar-table.c:165
 msgid "Summary"
-msgstr "_Yhteenveto:"
+msgstr "Yhteenveto"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:166
 msgid "Transparency"
-msgstr ""
+msgstr "Läpinäkyvyys"
 
-#: calendar/gui/e-calendar-table.c:165
-#, fuzzy
+#: calendar/gui/e-calendar-table.c:167
 msgid "URL"
 msgstr "URL:"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:168
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:397
-msgid "Open..."
+#: calendar/gui/e-calendar-table.c:169
+msgid "Click here to add a task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
+#: calendar/gui/e-calendar-table.c:373
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:374
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:375
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:376
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:377
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:378
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:379
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:380
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:381
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:382
+#, c-format
+msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:400
+#: calendar/gui/e-calendar-table.c:383
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:550
 msgid "Mark Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark the task complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:673 mail/mail-view.c:150
-msgid "Delete"
-msgstr "Poista"
+#: calendar/gui/e-calendar-table.c:556
+msgid "Edit this task..."
+msgstr "Muokkaa tätä tehtävää..."
 
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:557
+msgid "Edit the task"
+msgstr "Muokkaa tehtävää"
+
+#: calendar/gui/e-calendar-table.c:559
+#: ui/evolution-task-editor-dialog.xml.h:19
+msgid "Delete this task"
+msgstr "Poista tämä tehtävä"
+
+#: calendar/gui/e-calendar-table.c:560
 msgid "Delete the task"
-msgstr ""
+msgstr "Poista tehtävä"
 
-#: calendar/gui/e-day-view-time-item.c:517
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1274
 #: calendar/gui/e-week-view-main-item.c:321
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1288
 #: calendar/gui/e-week-view-main-item.c:330
 msgid "%a %d %b"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1301
 #: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
+#: calendar/gui/print.c:613
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
+#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
+#: calendar/gui/print.c:612
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
-#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
-#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
-msgid "New appointment..."
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-day-view.c:3034
+#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
+msgid "New Appointment..."
 msgstr "Uusi tapaaminen..."
 
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
-#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
-msgid "Edit this appointment..."
-msgstr "Muokkaa tätä tapaamista..."
+#: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
+#: mail/folder-browser.c:541 ui/evolution-calendar.xml.h:15
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Avaa"
 
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-msgid "Delete this appointment"
+#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
+msgid "Delete this Appointment"
 msgstr "Poista tämä tapaaminen"
 
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
-msgstr "Tee tästä tapaamisesta siirrettävä"
+#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: ui/evolution-event-editor.xml.h:45
+msgid "Schedule Meeting"
+msgstr ""
+
+#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3251
+msgid "Make this Occurrence Movable"
+msgstr ""
+
+#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
+msgid "Delete this Occurrence"
+msgstr ""
+
+#: calendar/gui/e-day-view.c:3047
+msgid "Delete all Occurrences"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:153
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
+msgid "Component successfully updated."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:165
+msgid "There was an error loading the calendar file."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:189
+msgid "I couldn't open your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
+msgid "I couldn't load your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:462
+msgid "I couldn't read your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:475
+msgid "This is a reply from someone who was uninvited!"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:491
+msgid "I couldn't update your calendar store."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:532
+msgid "I couldn't delete the calendar component!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:542
+msgid "Component successfully deleted."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:686
+msgid "I don't recognize this type of calendar component."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:772
+msgid "Add to Calendar"
+msgstr "Lisää kalenteriin"
+
+#: calendar/gui/e-itip-control.c:806
+msgid "Accept"
+msgstr "Hyväksy"
+
+#: calendar/gui/e-itip-control.c:807
+msgid "Decline"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:808
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:852
+msgid "Update Calendar"
+msgstr "Päivitä kalenteri"
+
+#: calendar/gui/e-itip-control.c:875
+msgid "Cancel Meeting"
+msgstr "Peruuta tapaaminen"
+
+#: calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %%"
+
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:4
+msgid "Calendar Message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:5
+msgid "Date:"
+msgstr "Päiväys:"
+
+#: calendar/gui/e-itip-control.glade.h:8
+msgid "Loading calendar..."
+msgstr "Ladataan kalenteria..."
+
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:119
+msgid "Sender"
+msgstr "Lähettäjä"
+
+#: calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Yhteenveto:"
+
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:2
+msgid "Attendee"
+msgstr "Osanottaja"
+
+#: calendar/gui/e-meeting-dialog.glade.h:3
+msgid "Attendee address"
+msgstr "Osanottajan osoite"
+
+#: calendar/gui/e-meeting-dialog.glade.h:4
+msgid "Attendees: "
+msgstr "Osanottajat: "
+
+#: calendar/gui/e-meeting-dialog.glade.h:5
+msgid ""
+"Cancel\n"
+"Meeting"
+msgstr ""
+"Peruuta\n"
+"tapaaminen"
+
+#: calendar/gui/e-meeting-dialog.glade.h:7
+msgid "Chair"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:10
+msgid "Meeting Invitations"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:11
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:12
+msgid "Optional Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:13
+msgid "Organizer: "
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-msgid "Delete this occurrence"
+#: calendar/gui/e-meeting-dialog.glade.h:15
+msgid ""
+"Publish\n"
+"Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
+#: calendar/gui/e-meeting-dialog.glade.h:17
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:18
+msgid ""
+"Request\n"
+"Meeting"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
+#: calendar/gui/e-meeting-dialog.glade.h:20
+msgid "Required Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:21
+msgid "Role"
+msgstr "Rooli"
+
+#: calendar/gui/e-meeting-dialog.glade.h:22
+msgid ""
+"Schedule\n"
+"Time"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:134 mail/message-list.c:1171
+msgid "Status"
+msgstr "Tila"
+
+#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
+#: calendar/gui/e-tasks.c:501
 msgid "All"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:146
-#, fuzzy
+#: calendar/gui/e-tasks.c:154
 msgid "Category:"
-msgstr ""
-"\n"
-"Kategoriat: "
+msgstr "Kategoria:"
 
-#: calendar/gui/e-tasks.c:285
-#, fuzzy, c-format
+#: calendar/gui/e-tasks.c:297
+#, c-format
 msgid "Could not load the tasks in `%s'"
-msgstr "Viestin lähettäminen epäonnistui: %s"
+msgstr ""
 
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-tasks.c:309
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
@@ -1571,301 +2553,544 @@ msgstr ""
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/event-editor.c:331
+#: calendar/gui/e-week-view.c:3255
+msgid "Delete All Occurrences"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:1
+msgid "A_ll day event"
+msgstr "_Koko päivän kestävä tapahtuma"
+
+#: calendar/gui/event-editor-dialog.glade.h:3
+msgid "Appointment"
+msgstr "Tapaaminen"
+
+#: calendar/gui/event-editor-dialog.glade.h:4
+msgid "Appointment Basics"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:7
+msgid "Custom recurrence"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:10
+msgid "Every"
+msgstr "Joka"
+
+#: calendar/gui/event-editor-dialog.glade.h:11
+msgid "Exceptions"
+msgstr "Poikkeukset"
+
+#: calendar/gui/event-editor-dialog.glade.h:12
+msgid "Modify"
+msgstr "Muuta"
+
+#: calendar/gui/event-editor-dialog.glade.h:13
+msgid "No recurrence"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor.c:1577
+msgid "Play a sound"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:15
+msgid "Preview"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:18
+msgid "Recurrence"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:19
+msgid "Recurrence Rule"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:20
+msgid "Reminder"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor.c:1586
+msgid "Run a program"
+msgstr "Aja ohjelma"
+
+#: calendar/gui/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor.c:1583
+msgid "Send an email"
+msgstr "Lähetä sähköpostia"
+
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
+msgid "Settings..."
+msgstr "Asetukset..."
+
+#: calendar/gui/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor.c:1580
+msgid "Show a dialog"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:26
+msgid "Simple recurrence"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:30
+msgid "_End time:"
+msgstr "_Loppumisaika:"
+
+#: calendar/gui/event-editor-dialog.glade.h:31
+msgid "_Start time:"
+msgstr "_Alkamisaika:"
+
+#: calendar/gui/event-editor-dialog.glade.h:32
+msgid "_Starting date:"
+msgstr "_Alkamispäivä:"
+
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:10 filter/libfilter-i18n.h:63
+#: filter/libfilter-i18n.h:139
+msgid "after"
+msgstr "jälkeen"
+
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:64
+#: filter/libfilter-i18n.h:140
+msgid "before"
+msgstr "ennen"
+
+#: calendar/gui/event-editor-dialog.glade.h:35
+msgid "day(s)"
+msgstr "päivä(ä)"
+
+#: calendar/gui/event-editor-dialog.glade.h:36
+msgid "end of appointment"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:37
+msgid "for"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:38
+msgid "forever"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:39
+msgid "hour(s)"
+msgstr "tunti(a)"
+
+#: calendar/gui/event-editor-dialog.glade.h:40
+msgid "label21"
+msgstr "label21"
+
+#: calendar/gui/event-editor-dialog.glade.h:41
+msgid "label55"
+msgstr "label55"
+
+#: calendar/gui/event-editor-dialog.glade.h:42
+msgid "minute(s)"
+msgstr "minuuttia"
+
+#: calendar/gui/event-editor-dialog.glade.h:43
+msgid "month(s)"
+msgstr "kuukautta"
+
+#: calendar/gui/event-editor-dialog.glade.h:44
+msgid "start of appointment"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:45
+msgid "until"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:46
+msgid "week(s)"
+msgstr "viikkoa"
+
+#: calendar/gui/event-editor-dialog.glade.h:47
+msgid "year(s)"
+msgstr "vuotta"
+
+#: calendar/gui/event-editor.c:371
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: calendar/gui/event-editor.c:409
+#: calendar/gui/event-editor.c:449
 msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
 msgid "day"
 msgstr "päivä"
 
-#: calendar/gui/event-editor.c:435
-msgid "Monday"
-msgstr "Maanantai"
+#: calendar/gui/event-editor.c:601
+msgid "on the"
+msgstr ""
 
-#: calendar/gui/event-editor.c:436
-msgid "Tuesday"
-msgstr "Tiistai"
+#: calendar/gui/event-editor.c:608
+msgid "th"
+msgstr ""
 
-#: calendar/gui/event-editor.c:437
-msgid "Wednesday"
-msgstr "Keskiviikko"
+#: calendar/gui/event-editor.c:754
+msgid "occurrences"
+msgstr ""
 
-#: calendar/gui/event-editor.c:438
-msgid "Thursday"
-msgstr "Torstai"
+#: calendar/gui/event-editor.c:871
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
 
-#: calendar/gui/event-editor.c:439
-msgid "Friday"
-msgstr "Perjantai"
+#: calendar/gui/event-editor.c:1532
+#, c-format
+msgid " %d days"
+msgstr " %d päivää"
 
-#: calendar/gui/event-editor.c:440
-msgid "Saturday"
-msgstr "Lauantai"
+#: calendar/gui/event-editor.c:1534
+msgid " 1 day"
+msgstr " 1 päivä"
 
-#: calendar/gui/event-editor.c:441
-msgid "Sunday"
-msgstr "Sunnuntai"
+#: calendar/gui/event-editor.c:1537
+#, c-format
+msgid " %d weeks"
+msgstr " %d viikkoa"
 
-#: calendar/gui/event-editor.c:561
-msgid "on the"
+#: calendar/gui/event-editor.c:1539
+msgid " 1 week"
+msgstr " 1 viikko"
+
+#: calendar/gui/event-editor.c:1542
+#, c-format
+msgid " %d hours"
+msgstr " %d tuntia"
+
+#: calendar/gui/event-editor.c:1544
+msgid " 1 hour"
+msgstr " 1 tunti"
+
+#: calendar/gui/event-editor.c:1547
+#, c-format
+msgid " %d minutes"
+msgstr " %d minuuttia"
+
+#: calendar/gui/event-editor.c:1549
+msgid " 1 minute"
+msgstr " 1 minuutti"
+
+#: calendar/gui/event-editor.c:1552
+#, c-format
+msgid " %d seconds"
+msgstr " %d sekuntia"
+
+#: calendar/gui/event-editor.c:1554
+msgid " 1 second"
+msgstr " 1 sekunti"
+
+#: calendar/gui/event-editor.c:1601
+msgid " before start of appointment"
 msgstr ""
 
-#: calendar/gui/event-editor.c:568
-msgid "th"
+#: calendar/gui/event-editor.c:1603
+msgid " after start of appointment"
 msgstr ""
 
-#: calendar/gui/event-editor.c:722
-msgid "occurrences"
+#: calendar/gui/event-editor.c:1611
+msgid " before end of appointment"
 msgstr ""
 
-#: calendar/gui/event-editor.c:839
-msgid "This appointment contains recurrences that Evolution cannot edit."
+#: calendar/gui/event-editor.c:1613
+msgid " after end of appointment"
 msgstr ""
 
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
+#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
+#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
 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 ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:696
-#, fuzzy, c-format
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:695
+#, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
-"Tiedostoa %s ei voitu avata:\n"
-"%s"
 
-#: calendar/gui/gnome-cal.c:707
+#: calendar/gui/gnome-cal.c:706
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Su"
+#: calendar/gui/goto-dialog.glade.h:1
+msgid "April"
+msgstr ""
 
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Ma"
+#: calendar/gui/goto-dialog.glade.h:2
+msgid "August"
+msgstr ""
 
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Ti"
+#: calendar/gui/goto-dialog.glade.h:3
+msgid "December"
+msgstr ""
 
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Ke"
+#: calendar/gui/goto-dialog.glade.h:4
+msgid "February"
+msgstr ""
 
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "To"
+#: calendar/gui/goto-dialog.glade.h:5
+msgid "Go To Date"
+msgstr ""
 
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Pe"
+#: calendar/gui/goto-dialog.glade.h:6
+msgid "Go To Today"
+msgstr ""
 
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "La"
+#: calendar/gui/goto-dialog.glade.h:7
+msgid "January"
+msgstr "Tammikuu"
 
-#: calendar/gui/main.c:50
-msgid "Could not initialize GNOME"
-msgstr "GNOMEn alustus ei onnistunut"
+#: calendar/gui/goto-dialog.glade.h:8
+msgid "July"
+msgstr "Heinäkuu"
+
+#: calendar/gui/goto-dialog.glade.h:9
+msgid "June"
+msgstr "Kesäkuu"
+
+#: calendar/gui/goto-dialog.glade.h:10
+msgid "March"
+msgstr "Maaliskuu"
+
+#: calendar/gui/goto-dialog.glade.h:11
+msgid "May"
+msgstr "Toukokuu"
+
+#: calendar/gui/goto-dialog.glade.h:12
+msgid "November"
+msgstr "Marraskuu"
+
+#: calendar/gui/goto-dialog.glade.h:13
+msgid "October"
+msgstr "Lokakuu"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/goto-dialog.glade.h:14
+msgid "September"
+msgstr "Syyskuu"
+
+#: calendar/gui/print.c:296
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:302
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Su"
 msgstr "Su"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Mo"
 msgstr "Ma"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Tu"
 msgstr "Ti"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "We"
 msgstr "Ke"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Th"
 msgstr "To"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Fr"
 msgstr "Pe"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Sa"
 msgstr "La"
 
-#: calendar/gui/print.c:941
+#: calendar/gui/print.c:944
 msgid "Tasks"
 msgstr "Tehtävät"
 
 #. Day
-#: calendar/gui/print.c:1071
+#: calendar/gui/print.c:1074
 msgid "Current day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
+#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
 msgid "%a %b %d"
-msgstr ""
+msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1086
+#: calendar/gui/print.c:1089
 msgid "%a %d %Y"
-msgstr ""
+msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1097
+#: calendar/gui/print.c:1100
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1105
+#: calendar/gui/print.c:1108
 msgid "Current month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1112
+#: calendar/gui/print.c:1115
 msgid "Current year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1149
+#: calendar/gui/print.c:1152
 msgid "Print Calendar"
 msgstr "Tulosta kalenteri"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1287
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
+#: ui/evolution-mail.xml.h:32
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
 
@@ -1873,10 +3098,80 @@ msgstr "Tulostuksen esikatselu"
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
+#: calendar/gui/tasks-migrate.c:106
+msgid ""
+"Evolution has taken the tasks that were in your calendar folder and "
+"automatically migrated them to the new tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:109
+msgid ""
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:121
+#, c-format
+msgid ""
+"Could not open `%s'; no items from the calendar folder will be migrated to "
+"the tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:134
+#, c-format
+msgid ""
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
+msgstr ""
+
+#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
 msgid "SMTWTFS"
 msgstr ""
 
+#: camel/camel-filter-driver.c:790
+#, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr "Virhe jäsennettäessä suodatinta: %s: %s"
+
+#: camel/camel-filter-driver.c:795
+#, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "Virhe suoritettaessa suodatinta: %s: %s"
+
+#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#, c-format
+msgid "Error executing filter search: %s: %s"
+msgstr ""
+
+#: camel/camel-folder-search.c:320
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-folder-search.c:330
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-folder-search.c:477 camel/camel-folder-search.c:505
+msgid "(match-all) requires a single bool result"
+msgstr ""
+
+#: camel/camel-folder-search.c:551
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-folder-search.c:660 camel/camel-folder-search.c:697
+msgid "Invalid type in body-contains, expecting string"
+msgstr ""
+
 #. well, this is really only a programatic error
 #: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
 #: camel/camel-movemail.c:183
@@ -1963,69 +3258,183 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:184
+#: camel/camel-remote-store.c:176
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:188
+#: camel/camel-remote-store.c:180
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:318
-#, fuzzy
+#: camel/camel-remote-store.c:306
 msgid "Connection cancelled"
-msgstr "Peruutettu"
+msgstr "Yhteys peruutettu"
 
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
-#: camel/providers/smtp/camel-smtp-transport.c:160
+#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
+#: camel/providers/smtp/camel-smtp-transport.c:229
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
+#: camel/camel-remote-store.c:310 camel/camel-remote-store.c:323
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
+#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
+#: camel/camel-remote-store.c:539
 #: camel/providers/imap/camel-imap-command.c:289
-#, fuzzy
 msgid "Operation cancelled"
-msgstr "Avaa kalenteri"
+msgstr ""
+
+#: camel/camel-remote-store.c:544
+msgid "Server unexpectedly disconnected"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+msgid "Authentication failed."
+msgstr "Todennus epäonnistui."
+
+#: camel/camel-sasl-anonymous.c:106
+#, c-format
+msgid ""
+"Invalid email address trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:118
+#, c-format
+msgid ""
+"Invalid opaque trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:130
+#, c-format
+msgid ""
+"Invalid trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
+msgid "CRAM-MD5"
+msgstr "CRAM-MD5"
+
+#: camel/camel-sasl-cram-md5.c:34
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+msgid "DIGEST-MD5"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:39
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:761
+msgid "Server challenge too long (>2048 octets)\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:770
+msgid "Server challenge invalid\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:776
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:798
+msgid "Server response did not contain authorization data\n"
+msgstr ""
 
-#: camel/camel-service.c:137
+#: camel/camel-sasl-digest-md5.c:816
+msgid "Server response contained incomplete authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:826
+msgid "Server response does not match\n"
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:38
+msgid "Kerberos 4"
+msgstr "Kerberos 4"
+
+#: camel/camel-sasl-kerberos4.c:40
+msgid "This option will connect to the server using Kerberos 4 authentication."
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:158
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:215
+#: camel/providers/imap/camel-imap-store.c:380
+msgid "Bad authentication response from server."
+msgstr ""
+
+#: camel/camel-sasl-plain.c:29
+msgid "PLAIN"
+msgstr ""
+
+#: camel/camel-sasl-plain.c:31
+msgid ""
+"This option will connect to the server using a the PLAIN SASL mechanism if "
+"the server supports it."
+msgstr ""
+
+#: camel/camel-search-private.c:105
+#, c-format
+msgid "Regular expression compilation failed: %s: %s"
+msgstr ""
+
+#: camel/camel-service.c:142
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:146
+#: camel/camel-service.c:151
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:160
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:520
+#: camel/camel-service.c:512
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:523
+#: camel/camel-service.c:515
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:299
+#: camel/camel-session.c:54
+msgid "Virtual folder email provider"
+msgstr ""
+
+#: camel/camel-session.c:56
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: camel/camel-session.c:323
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:390
+#: camel/camel-session.c:418
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2034,30 +3443,24 @@ msgstr ""
 "Hakemistoa %s ei voitu luoda:\n"
 "%s"
 
-#: camel/camel-url.c:75
+#: camel/camel-url.c:77
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr ""
 
-#: camel/camel-url.c:90
+#: camel/camel-url.c:92
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr ""
 
-#: camel/camel-url.c:150
+#: camel/camel-url.c:152
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:133
+#: camel/camel-vee-folder.c:914
 #, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
+msgid "No such message: %s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:234
@@ -2070,7 +3473,7 @@ msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP-komento epäonnistui: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
@@ -2088,13 +3491,17 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:198
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
+#: camel/providers/imap/camel-imap-folder.c:329
+msgid "Scanning IMAP folder"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:837
+#: camel/providers/imap/camel-imap-folder.c:999
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2106,25 +3513,32 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:251
+#: camel/providers/imap/camel-imap-store.c:262
 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:260
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
+#: camel/providers/imap/camel-imap-store.c:407
+#, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
+msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr "Ota yhteys IMAP-palvelimeen Kerberos 4 -todentamista käyttäen."
+#: camel/providers/imap/camel-imap-store.c:418
+#, c-format
+msgid "No support for authentication type %s"
+msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:361
+#: camel/providers/imap/camel-imap-store.c:446
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:389
+#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:345
+msgid "You didn't enter a password."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:482
+#: camel/providers/smtp/camel-smtp-transport.c:353
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2132,7 +3546,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:645
+#: camel/providers/imap/camel-imap-store.c:756
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
@@ -2161,50 +3575,42 @@ msgstr ""
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:122
+#: camel/providers/local/camel-local-store.c:128
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-store.c:135
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:143
+#: camel/providers/local/camel-local-store.c:159
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
+#: camel/providers/local/camel-local-store.c:174
+msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:200
+#: camel/providers/local/camel-local-store.c:184
 #, c-format
 msgid "Local mail file %s"
 msgstr "Paikallinen viestitiedosto %s"
 
-#: camel/providers/local/camel-local-store.c:256
+#: camel/providers/local/camel-local-store.c:240
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Hakemistoa %s ei voitu uudelleennimetä seuraavaksi: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:297
+#: camel/providers/local/camel-local-store.c:282
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:306
+#: camel/providers/local/camel-local-store.c:292
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -2240,42 +3646,42 @@ msgstr ""
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-maildir-store.c:94
+#: camel/providers/local/camel-mh-store.c:88
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:98
+#: camel/providers/local/camel-mbox-store.c:99
+#: camel/providers/local/camel-mh-store.c:95
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Kansiota `%s' ei ole olemassa."
 
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:101
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:128
+#: camel/providers/local/camel-maildir-store.c:120
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
+#: camel/providers/local/camel-maildir-store.c:149
+#: camel/providers/local/camel-maildir-store.c:186
+#: camel/providers/local/camel-mh-store.c:125
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:158
+#: camel/providers/local/camel-maildir-store.c:150
 msgid "not a maildir directory"
 msgstr ""
 
@@ -2308,99 +3714,110 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:92
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:108
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:144
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ei ole tavallinen tiedosto."
 
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
+#: camel/providers/local/camel-mbox-store.c:136
+#: camel/providers/local/camel-mbox-store.c:159
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mbox-store.c:151
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:234
+#. 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:240
+msgid "Summarising folder"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:245
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:268
+#: camel/providers/local/camel-mbox-summary.c:287
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:362
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:477
-#: camel/providers/local/camel-mbox-summary.c:668
+#: camel/providers/local/camel-mbox-summary.c:493
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1317
+msgid "Synchronising folder"
+msgstr "Synkronoidaan kansiota"
+
+#: camel/providers/local/camel-mbox-summary.c:498
+#: camel/providers/local/camel-mbox-summary.c:699
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:493
+#: camel/providers/local/camel-mbox-summary.c:515
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:514
-#: camel/providers/local/camel-mbox-summary.c:522
-#: camel/providers/local/camel-mbox-summary.c:701
-#: camel/providers/local/camel-mbox-summary.c:709
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:548
+#: camel/providers/local/camel-mbox-summary.c:737
+#: camel/providers/local/camel-mbox-summary.c:745
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:565
+#: camel/providers/local/camel-mbox-summary.c:591
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:608
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:759
+#: camel/providers/local/camel-mbox-summary.c:626
+#: camel/providers/local/camel-mbox-summary.c:795
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:609
+#: camel/providers/local/camel-mbox-summary.c:635
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:646
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:830
+#: camel/providers/local/camel-mbox-summary.c:870
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Tuntematon virhe: %s"
@@ -2411,7 +3828,7 @@ msgstr "Tuntematon virhe: %s"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-store.c:116
+#: camel/providers/local/camel-mh-store.c:108
 #, c-format
 msgid "`%s' is not a directory."
 msgstr ""
@@ -2483,16 +3900,25 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:180
+#: camel/providers/pop3/camel-pop3-folder.c:145
+msgid "Retrieving POP summary"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:188
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:274
+#: camel/providers/pop3/camel-pop3-folder.c:282
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:288
+#: camel/providers/pop3/camel-pop3-folder.c:286
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "Haetaan POP-viestiä %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:304
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Viestiä ei saatu POP-palvelimelta %s: %s"
@@ -2507,70 +3933,71 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:147
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:158
+#: camel/providers/pop3/camel-pop3-store.c:157
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:170
+#: camel/providers/pop3/camel-pop3-store.c:169
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:331
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:375
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:394
+#: camel/providers/pop3/camel-pop3-store.c:397
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:400
+#: camel/providers/pop3/camel-pop3-store.c:437
 msgid "(Unknown)"
 msgstr "(tuntematon)"
 
-#: camel/providers/pop3/camel-pop3-store.c:424
+#: camel/providers/pop3/camel-pop3-store.c:427
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:541
+#: camel/providers/pop3/camel-pop3-store.c:535
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config.glade.h:61
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -2610,144 +4037,249 @@ msgstr ""
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
-msgid "sendmail"
+#: camel/providers/sendmail/camel-sendmail-transport.c:192
+msgid "Could not find 'From' address in message"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
+#: camel/providers/sendmail/camel-sendmail-transport.c:244
+msgid "sendmail"
+msgstr "sendmail"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
+#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
+msgid "SMTP"
+msgstr "SMTP"
+
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:143
+msgid "Syntax error, command unrecognized"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:145
+msgid "Syntax error in parameters or arguments"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:147
+msgid "Command not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:149
+msgid "Command parameter not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:151
+msgid "System status, or system help reply"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:153
+msgid "Help message"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:155
+msgid "Service ready"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:157
+msgid "Service closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:159
+msgid "Service not available, closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:161
+msgid "Requested mail action okay, completed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:163
+msgid "User not local; will forward to <forward-path>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:165
+msgid "Requested mail action not taken: mailbox unavailable"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:167
+msgid "Requested action not taken: mailbox unavailable"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Requested action aborted: error in processing"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:171
+msgid "User not local; please try <forward-path>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:173
+msgid "Requested action not taken: insufficient system storage"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:175
+msgid "Requested mail action aborted: exceeded storage allocation"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:177
+msgid "Requested action not taken: mailbox name not allowed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:179
+msgid "Start mail input; end with <CRLF>.<CRLF>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:181
+msgid "Transaction failed"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:185
+msgid "A password transition is needed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:187
+msgid "Authentication mechanism is too weak"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:189
+msgid "Encryption required for requested authentication mechanism"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:191
+msgid "Temporary authentication failure"
+msgstr "Väliaikainen todennusvirhe"
+
+#: camel/providers/smtp/camel-smtp-transport.c:193
+msgid "Authentication required"
+msgstr "Todennus vaaditaan"
+
+#: camel/providers/smtp/camel-smtp-transport.c:258
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:279
+#: camel/providers/smtp/camel-smtp-transport.c:330
+#, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:438
 msgid "No authentication required"
-msgstr "Todentamista ei vaadita"
+msgstr "Todennusta ei vaadita"
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:440
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
 "authentication. This should be fine for connecting to most SMTP servers."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:290
-#: camel/providers/smtp/camel-smtp-transport.c:295
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/providers/smtp/camel-smtp-transport.c:292
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-"Tämä valinta yhdistää SMTP-palvelimeen käyttäen CRAM-MD5 -todentamista."
-
-#: camel/providers/smtp/camel-smtp-transport.c:320
+#: camel/providers/smtp/camel-smtp-transport.c:483
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:322
+#: camel/providers/smtp/camel-smtp-transport.c:485
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:347
+#: camel/providers/smtp/camel-smtp-transport.c:510
 msgid "Cannot send message: sender address not defined."
 msgstr "Viestiä ei voida lähettää: lähettäjän osoitetta ei ole määritelty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "Cannot send message: sender address not valid."
 msgstr "Viestiä ei voida lähettää: lähettäjän osoite on epäkelpo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:531
 msgid "Cannot send message: no recipients defined."
 msgstr "Viestiä ei voida lähettää: vastaanottajia ei ole määritelty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:462
+#: camel/providers/smtp/camel-smtp-transport.c:625
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:478
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:679
+#: camel/providers/smtp/camel-smtp-transport.c:691
+#, c-format
+msgid "AUTH request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:749
+msgid "Bad authentication response from server.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:774
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:818
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:574
-msgid "RCPT TO response error: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:837
+#, c-format
+msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:868
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:620
+#: camel/providers/smtp/camel-smtp-transport.c:887
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:635
-#: camel/providers/smtp/camel-smtp-transport.c:653
+#: camel/providers/smtp/camel-smtp-transport.c:902
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:693
+#: camel/providers/smtp/camel-smtp-transport.c:963
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:709
+#: camel/providers/smtp/camel-smtp-transport.c:982
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:732
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
 #: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr ""
@@ -2773,16 +4305,17 @@ msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
 msgid "attachment"
 msgstr "liite"
 
 #: composer/e-msg-composer-attachment-bar.c:413
+#: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Liitä tiedosto"
 
-#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
-#: shell/e-shortcuts-view.c:377
+#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
+#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Poista"
 
@@ -2798,92 +4331,102 @@ msgstr "Lisää liite..."
 msgid "Attach a file to the message"
 msgstr "Lisää viestiin liitetiedoston"
 
-#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
-#: mail/mail-format.c:624
-msgid "From:"
-msgstr "Lähettäjä:"
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
+#: ui/evolution-mail.xml.h:1
+msgid "Attachment"
+msgstr "Liite"
 
-#: composer/e-msg-composer-hdrs.c:257
-msgid "Click here for the address book"
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Attachment properties"
+msgstr "Liitteen ominaisuudet"
+
+#: composer/e-msg-composer-attachment.glade.h:4
+msgid "File name:"
+msgstr "Tiedostonimi:"
+
+#: composer/e-msg-composer-attachment.glade.h:5
+msgid "Inline attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:313
-msgid "Enter the identity you wish to send this message from"
+#: composer/e-msg-composer-attachment.glade.h:6
+msgid "MIME type:"
+msgstr "MIME-tyyppi:"
+
+#: composer/e-msg-composer-attachment.glade.h:7
+msgid "Send as:"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:314
+msgid "Click here for the address book"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
+msgid "From:"
+msgstr "Lähettäjä:"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:601
+msgid "Subject:"
+msgstr "Aihe:"
+
+#: composer/e-msg-composer-hdrs.c:365 mail/mail-format.c:683
 msgid "To:"
 msgstr "Vastaanottaja:"
 
-#: composer/e-msg-composer-hdrs.c:318
+#: composer/e-msg-composer-hdrs.c:366
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:685
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:370
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:373
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:329
+#: composer/e-msg-composer-hdrs.c:374
 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-hdrs.c:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr "Aihe:"
-
-#: composer/e-msg-composer-hdrs.c:336
-msgid "Enter the subject of the mail"
-msgstr "Anna sähköpostin aihe"
-
-#: composer/e-msg-composer.c:430
+#: composer/e-msg-composer.c:518
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:598
+#: composer/e-msg-composer.c:706
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
-#: composer/e-msg-composer.c:609
+#: composer/e-msg-composer.c:717
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:629
+#: composer/e-msg-composer.c:737
 #, c-format
 msgid "Error loading file: %s"
 msgstr "VIrhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:651
-msgid "Saving changes to message..."
-msgstr "Tallennetaan muutokset..."
-
-#: composer/e-msg-composer.c:653
-msgid "Save changes to message..."
-msgstr ""
-
-#: composer/e-msg-composer.c:694
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:817 evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:192
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:758
+#: composer/e-msg-composer.c:823
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -2893,27 +4436,27 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: composer/e-msg-composer.c:783
+#: composer/e-msg-composer.c:848
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:974
 msgid "That file does not exist."
 msgstr "Tiedostoa ei ole olemassa."
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:984
 msgid "That is not a regular file."
 msgstr "Se ei ole tavallinen tiedosto."
 
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:994
 msgid "That file exists but is not readable."
 msgstr "Tiedosto on olemassa, muttei lukukelpoinen."
 
-#: composer/e-msg-composer.c:939
+#: composer/e-msg-composer.c:1004
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Tiedosto vaikutti avattavalta, mutta avaaminen epäonnistui."
 
-#: composer/e-msg-composer.c:961
+#: composer/e-msg-composer.c:1026
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -2921,22 +4464,244 @@ msgstr ""
 "Tiedosto on hyvin suuri (yli 100K).\n"
 "Haluatko varmasti liittää sen?"
 
-#: composer/e-msg-composer.c:982
+#: composer/e-msg-composer.c:1047
 msgid "An error occurred while reading the file."
 msgstr "Virhe luettaessa tiedostoa."
 
-#: composer/e-msg-composer.c:1362
+#: composer/e-msg-composer.c:1327 composer/e-msg-composer.c:1655
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: composer/e-msg-composer.c:1439
+#: composer/e-msg-composer.c:1739
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:346
+#: composer/evolution-composer.c:352
+msgid ""
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
+msgstr ""
+
+#: composer/evolution-composer.c:367
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
+#: data/evolution.keys.in.h:1
+msgid "address card"
+msgstr ""
+
+#: data/evolution.keys.in.h:2
+msgid "calendar information"
+msgstr ""
+
+#. strptime format for a date.
+#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
+msgid "%m/%d/%Y"
+msgstr ""
+
+#. strptime format for a time of day, in 12-hour format.
+#. If it is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+msgid "%I:%M:%S %p%n"
+msgstr ""
+
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+msgid "%H:%M:%S%n"
+msgstr ""
+
+#. strptime format for time of day, without seconds, 12-hour format.
+#. If it is is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
+msgid "%I:%M %p%n"
+msgstr ""
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+msgid "%H:%M%n"
+msgstr ""
+
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:267
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
+msgid "%a %m/%d/%Y"
+msgstr ""
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:272
+msgid "%a %m/%d/%Y %H:%M"
+msgstr ""
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:281
+msgid "%a %m/%d/%Y %I:%M %p"
+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/component/component-factory.c:152
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr ""
+
+#: executive-summary/component/e-summary-callbacks.c:290
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:69
+#: executive-summary/component/e-summary-url.c:74
+#: executive-summary/component/e-summary-url.c:81
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:71
+#, c-format
+msgid "Send an email to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:72
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:75
+#, c-format
+msgid "Close %s"
+msgstr "Sulje %s"
+
+#: executive-summary/component/e-summary-url.c:76
+#, c-format
+msgid "Move %s to the left"
+msgstr "Siirrä %s vasemmalle"
+
+#: executive-summary/component/e-summary-url.c:77
+#, c-format
+msgid "Move %s to the right"
+msgstr "Siirrä %s oikealle"
+
+#: executive-summary/component/e-summary-url.c:78
+#, c-format
+msgid "Move %s into the previous row"
+msgstr "Siirrä %s edelliselle riville"
+
+#: executive-summary/component/e-summary-url.c:79
+#, c-format
+msgid "Move %s into the next row"
+msgstr "Siirrä %s seuraavalle riville"
+
+#: executive-summary/component/e-summary-url.c:80
+#, c-format
+msgid "Configure %s"
+msgstr "Aseta %s"
+
+#: executive-summary/component/e-summary.c:918
+#, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"HTML-tiedostoa ei voitu avata:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:932
+#, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr ""
+
+#: executive-summary/component/e-summary.c:950
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/executive-summary-config.glade.h:1
+msgid "Appearance"
+msgstr ""
+
+#: executive-summary/component/executive-summary-config.glade.h:2
+msgid "Background:"
+msgstr ""
+
+#: executive-summary/component/main.c:60
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
+msgid "Factory for the RDF summary."
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
+msgid "RDF Summary"
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
+msgid "Factory for the test bonobo component."
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
+msgid "Factory for the test component."
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
+msgid "Test bonobo service"
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
+msgid "Test service"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:509
+#: executive-summary/test-service/rdf-summary.c:546
+#: executive-summary/test-service/rdf-summary.c:591
+#: widgets/misc/e-messagebox.c:155
+msgid "Error"
+msgstr "Virhe"
+
+#: executive-summary/test-service/rdf-summary.c:765
+msgid "Update automatically"
+msgstr "Päivitä automaattisesti"
+
+#: executive-summary/test-service/rdf-summary.c:775
+msgid "Update now"
+msgstr "Päivitä heti"
+
+#: executive-summary/test-service/rdf-summary.c:785
+msgid "Update every "
+msgstr "Päivitä joka"
+
+#: executive-summary/test-service/rdf-summary.c:793
+#: filter/filter-datespec.c:67
+msgid "minutes"
+msgstr "minuutti"
+
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr "vuosi"
@@ -2977,10 +4742,6 @@ msgstr "tuntia"
 msgid "minute"
 msgstr "minuutti"
 
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minuuttia"
-
 #: filter/filter-datespec.c:68
 msgid "second"
 msgstr "sekunti"
@@ -2991,11 +4752,11 @@ msgstr "sekuntia"
 
 #: filter/filter-datespec.c:183
 msgid "Oops. You have forgotten to choose a date."
-msgstr ""
+msgstr "Hups. Olet unohtanut valita päivän."
 
 #: filter/filter-datespec.c:185
 msgid "Oops. You have chosen an invalid date."
-msgstr ""
+msgstr "Hups. Olet valinnut epäkelvon päivän."
 
 #: filter/filter-datespec.c:259
 msgid ""
@@ -3043,8 +4804,8 @@ msgstr "nyt"
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:336
+#: mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr ""
 
@@ -3052,29 +4813,20 @@ msgstr ""
 msgid "Edit Filter Rule"
 msgstr ""
 
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr ""
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr ""
-
-#: filter/filter-editor.c:456
+#: filter/filter-editor.c:457 filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr ""
 
 #. and now for the action area
-#: filter/filter-filter.c:401
+#: filter/filter-filter.c:403
 msgid "Then"
 msgstr "Sitten"
 
-#: filter/filter-filter.c:414
+#: filter/filter-filter.c:416
 msgid "Add action"
 msgstr "Lisää toiminto"
 
-#: filter/filter-filter.c:420
+#: filter/filter-filter.c:422
 msgid "Remove action"
 msgstr "Poista toiminto"
 
@@ -3084,7 +4836,7 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
 msgid "Select Folder"
 msgstr ""
 
@@ -3096,235 +4848,302 @@ msgstr ""
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:185
+#: filter/filter-input.c:189
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
-#, c-format
-msgid "Failed to perform regex search on message header: %s"
-msgstr ""
-
 #: filter/filter-part.c:467
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:530
+#: filter/filter-rule.c:572
 msgid "Rule name: "
 msgstr "Säännön nimi: "
 
-#: filter/filter-rule.c:534
+#: filter/filter-rule.c:576
 msgid "Untitled"
 msgstr "Nimetön"
 
-#: filter/filter-rule.c:550
+#: filter/filter-rule.c:592
 msgid "If"
 msgstr "Jos"
 
-#: filter/filter-rule.c:567
+#: filter/filter-rule.c:609
 msgid "Execute actions"
 msgstr "Suorita toiminnot"
 
-#: filter/filter-rule.c:571
+#: filter/filter-rule.c:613
 msgid "if all criteria are met"
 msgstr "kaikki ehdot täytetään"
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:618
 msgid "if any criteria are met"
 msgstr "mikään ehdoista täyttyy"
 
-#: filter/filter-rule.c:587
+#: filter/filter-rule.c:629
 msgid "Add criterion"
 msgstr "Lisää ehto"
 
-#: filter/filter-rule.c:593
+#: filter/filter-rule.c:635
 msgid "Remove criterion"
 msgstr "Poista ehto"
 
-#: filter/filter-system-flag.c:63
+#: filter/filter-system-flag.c:67
 msgid "Replied to"
 msgstr ""
 
 #. { _("Deleted"), "Deleted" },
 #. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
+#: filter/filter-system-flag.c:70
 msgid "Important"
 msgstr ""
 
-#: filter/filter-system-flag.c:67
+#: filter/filter-system-flag.c:71
 msgid "Read"
 msgstr "Lue"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr ""
+
+#: filter/filter.glade.h:6
+msgid "Filter Rules"
+msgstr ""
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Tulevat"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "Lähtevät"
+
+#: filter/filter.glade.h:10
+msgid "Virtual Folders"
+msgstr ""
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr ""
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr ""
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr ""
+
+#: filter/libfilter-i18n.h:7 mail/message-list.c:624
+msgid "Answered"
+msgstr ""
+
+#: filter/libfilter-i18n.h:14
 msgid "Assign Colour"
 msgstr ""
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:15
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:16
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:17
 msgid "Date received"
 msgstr "Otettu vastaan"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:18
 msgid "Date sent"
 msgstr "Lähetetty"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:24
+msgid "Deleted"
+msgstr "Poistettu"
+
+#: filter/libfilter-i18n.h:25
+msgid "Draft"
+msgstr "Luonnos"
+
+#: filter/libfilter-i18n.h:28 filter/libfilter-i18n.h:83
 msgid "Expression"
 msgstr ""
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:29 mail/message-list.c:1171
+msgid "Flagged"
+msgstr ""
+
+#: filter/libfilter-i18n.h:30 filter/libfilter-i18n.h:84
 msgid "Forward to Address"
 msgstr ""
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:31
+msgid "Mailing list"
+msgstr ""
+
+#: filter/libfilter-i18n.h:32 filter/libfilter-i18n.h:98
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:33
 msgid "Message Header"
 msgstr "Viestin otsikko"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:34 filter/libfilter-i18n.h:99
 msgid "Message was received"
 msgstr "Viesti vastaanotettu"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:35 filter/libfilter-i18n.h:100
 msgid "Message was sent"
 msgstr "Viesti lähetetty"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:36 filter/libfilter-i18n.h:101
 msgid "Move to Folder"
 msgstr "Siirrä kansioon"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:41 filter/libfilter-i18n.h:114
 msgid "Recipients"
 msgstr "Vastaanottajat"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:42 filter/libfilter-i18n.h:117
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
+#: filter/libfilter-i18n.h:44 mail/message-list.c:621
+msgid "Seen"
+msgstr ""
+
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1171
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Lähettäjä"
+#: filter/libfilter-i18n.h:50
+msgid "Set Flag"
+msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:52 filter/libfilter-i18n.h:122
 msgid "Set Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:54 filter/libfilter-i18n.h:125
+#: mail/mail-config.glade.h:68
 msgid "Source"
 msgstr "Lähde"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:55 filter/libfilter-i18n.h:126
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-msgid "Status"
-msgstr "Tila"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:60 filter/libfilter-i18n.h:136
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+#: filter/libfilter-i18n.h:61 filter/libfilter-i18n.h:137
+#: mail/message-list.c:1172
 msgid "Subject"
 msgstr "Aihe"
 
-#: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "jälkeen"
-
-#: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "ennen"
-
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:65 filter/libfilter-i18n.h:141
 msgid "contains"
 msgstr "sisältää"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:67 filter/libfilter-i18n.h:75
+#: filter/libfilter-i18n.h:142
 msgid "does not contain"
 msgstr "ei sisällä"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:68 filter/libfilter-i18n.h:76
+#: filter/libfilter-i18n.h:143
 msgid "does not end with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:69 filter/libfilter-i18n.h:77
+#: filter/libfilter-i18n.h:144
 msgid "does not exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:70 filter/libfilter-i18n.h:78
+#: filter/libfilter-i18n.h:145
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:71 filter/libfilter-i18n.h:79
+#: filter/libfilter-i18n.h:146
 msgid "does not start with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:72 filter/libfilter-i18n.h:80
+#: filter/libfilter-i18n.h:147
 msgid "ends with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:73 filter/libfilter-i18n.h:81
+#: filter/libfilter-i18n.h:148
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:86 filter/libfilter-i18n.h:93
+#: filter/libfilter-i18n.h:104 filter/libfilter-i18n.h:152
+msgid "is"
+msgstr "on"
+
+#: filter/libfilter-i18n.h:87 filter/libfilter-i18n.h:94
+#: filter/libfilter-i18n.h:149
 msgid "is greater than"
 msgstr "on suurempi kuin"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:88 filter/libfilter-i18n.h:95
+#: filter/libfilter-i18n.h:150
 msgid "is less than"
 msgstr "on pienempi kuin"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:89 filter/libfilter-i18n.h:96
+#: filter/libfilter-i18n.h:151
 msgid "is not"
 msgstr "ei ole"
 
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "on"
+#: filter/libfilter-i18n.h:91
+msgid "matches regex"
+msgstr ""
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:106 filter/libfilter-i18n.h:110
+#: filter/libfilter-i18n.h:153
 msgid "on or after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:107 filter/libfilter-i18n.h:111
+#: filter/libfilter-i18n.h:154
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:123 filter/libfilter-i18n.h:129
+#: filter/libfilter-i18n.h:155
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:131 filter/libfilter-i18n.h:133
+#: filter/libfilter-i18n.h:156
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:158
 msgid "was after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:159
 msgid "was before"
 msgstr ""
 
@@ -3344,163 +5163,239 @@ msgstr ""
 msgid "Edit VFolder Rule"
 msgstr ""
 
-#: mail/component-factory.c:284
+#: mail/component-factory.c:303
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:320
+#: mail/component-factory.c:376
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr ""
-
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
+#: mail/folder-browser-factory.c:214
+#, c-format
+msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser.c:239
-msgid "Body contains"
+#: mail/folder-browser-factory.c:216 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:240
-msgid "Subject contains"
-msgstr "Aihe sisältää"
-
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
+#: mail/folder-browser.c:219
+msgid "Store search as vFolder"
 msgstr ""
 
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
-msgstr "Aihe ei sisällä"
-
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:508
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:646
+#: mail/folder-browser.c:511
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:514
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:517 mail/folder-browser.c:701
+msgid "VFolder on Mailing List"
+msgstr ""
+
+#: mail/folder-browser.c:523
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:650
+#: mail/folder-browser.c:526
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:651
+#: mail/folder-browser.c:529
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
+#: mail/folder-browser.c:532 mail/folder-browser.c:700
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:658
-msgid "Open"
-msgstr "Avaa"
-
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr "Muokkaa"
-
-#: mail/folder-browser.c:660
+#: mail/folder-browser.c:543
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
-#: mail/folder-browser.c:661 mail/mail-view.c:148
+#: mail/folder-browser.c:545 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
+#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Tulosta"
 
-#: mail/folder-browser.c:663
+#: mail/folder-browser.c:550
 msgid "Reply to Sender"
 msgstr "Vastaa lähettäjälle"
 
-#: mail/folder-browser.c:664 mail/mail-view.c:141
+#: mail/folder-browser.c:552 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
-#: mail/folder-browser.c:665 mail/mail-view.c:144
+#: mail/folder-browser.c:554 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
 msgid "Forward"
 msgstr ""
 
-#: mail/folder-browser.c:666
+#: mail/folder-browser.c:556
 msgid "Forward inline"
 msgstr ""
 
-#: mail/folder-browser.c:668
+#: mail/folder-browser.c:559
 msgid "Mark as Read"
 msgstr "Merkitse luetuksi"
 
-#: mail/folder-browser.c:669
+#: mail/folder-browser.c:561
 msgid "Mark as Unread"
 msgstr "Merkitse lukemattomaksi"
 
-#: mail/folder-browser.c:671
+#: mail/folder-browser.c:566
 msgid "Move to Folder..."
 msgstr "Siirrä kansioon..."
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:568
 msgid "Copy to Folder..."
 msgstr "Kopioi kansioon..."
 
-#: mail/folder-browser.c:674
+#: mail/folder-browser.c:572
 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:678
+#. { _("Add Sender to Address Book"),  NULL,
+#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
+#. { "",                               NULL,
+#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
+#: mail/folder-browser.c:582
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:586
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:703
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
-#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
+#: mail/folder-browser.c:704
+#, c-format
+msgid "VFolder on Mailing List (%s)"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
 msgstr ""
 
-#: mail/mail-accounts.c:115
-#, fuzzy
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
+msgid "Factory to import mbox into Evolution"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
+msgid "Imports mbox files into Evolution"
+msgstr ""
+
+#: mail/local-config.glade.h:1
+msgid "Current store format:"
+msgstr ""
+
+#: mail/local-config.glade.h:2
+msgid "Mailbox Format"
+msgstr ""
+
+#: mail/local-config.glade.h:3
+msgid "New store format:"
+msgstr ""
+
+#: mail/local-config.glade.h:4
+msgid ""
+"Note: When converting between mailbox formats, a failure\n"
+"(such as lack of disk space) may not be automatically\n"
+"recoverable.  Please use this feature with care."
+msgstr ""
+
+#: mail/local-config.glade.h:7
+msgid "maildir"
+msgstr ""
+
+#: mail/local-config.glade.h:8
+msgid "mbox"
+msgstr ""
+
+#: mail/local-config.glade.h:9
+msgid "mh"
+msgstr ""
+
+#: mail/mail-accounts.c:116
 msgid " (default)"
-msgstr "Oletus"
+msgstr " (oletus)"
+
+#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+msgid "Are you sure you want to delete this account?"
+msgstr ""
+
+#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
+msgid "Are you sure you want to delete this news account?"
+msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
+#: mail/mail-accounts.c:423
 msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/mail-account-editor.c:274
+#: mail/mail-account-editor.c:307
 msgid ""
 "One or more of your servers are not configured correctly.\n"
 "Do you wish to save anyway?"
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:634
+#: mail/mail-account-editor.c:706
 msgid "Evolution Account Editor"
 msgstr ""
 
+#: mail/mail-account-editor.c:727
+msgid "Unspecified"
+msgstr ""
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -3516,12 +5411,12 @@ msgstr "Aihe on %s"
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:331
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-callbacks.c:83
+#: mail/mail-callbacks.c:85
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -3529,27 +5424,23 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:136
+#: mail/mail-callbacks.c:138
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:223
+#: mail/mail-callbacks.c:194
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:232
-msgid "You have no Outbox configured"
-msgstr ""
-
-#: mail/mail-callbacks.c:279
+#: mail/mail-callbacks.c:227
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -3557,28 +5448,32 @@ msgstr ""
 "Viestillä ei ole aihetta.\n"
 "Lähetetäänkö toedella?"
 
-#: mail/mail-callbacks.c:345
-#, fuzzy
+#: mail/mail-callbacks.c:294
 msgid "You must configure an account before you can send this email."
-msgstr "Lähettääksesi tämän viestin sinuun tulee määrittää vastaanottajat"
+msgstr ""
 
-#: mail/mail-callbacks.c:365
+#: mail/mail-callbacks.c:316
 msgid "You must specify recipients in order to send this message."
-msgstr "Lähettääksesi tämän viestin sinuun tulee määrittää vastaanottajat"
+msgstr "Lähettääksesi tämän viestin sinuun tulee määritellä vastaanottajat."
+
+#: mail/mail-callbacks.c:579
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
 
-#: mail/mail-callbacks.c:594
+#: mail/mail-callbacks.c:761
 msgid "Forwarded message:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:675
+#: mail/mail-callbacks.c:864
 msgid "Move message(s) to"
 msgstr "Siirrä viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:677
+#: mail/mail-callbacks.c:866
 msgid "Copy message(s) to"
 msgstr "Kopioi viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:812
+#: mail/mail-callbacks.c:1007
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -3586,47 +5481,302 @@ msgstr ""
 "Voit muokata vain Luonnokset\n"
 "-kansiossa olevia viestejä."
 
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
+#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/mail-callbacks.c:893
+#: mail/mail-callbacks.c:1088
 msgid "Save Message As..."
 msgstr "Tallenna viesti nimellä..."
 
-#: mail/mail-callbacks.c:895
+#: mail/mail-callbacks.c:1090
 msgid "Save Messages As..."
 msgstr "Tallenna viestit nimellä..."
 
-#: mail/mail-callbacks.c:979
+#: mail/mail-callbacks.c:1198
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1028
+#: mail/mail-callbacks.c:1247
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/mail-callbacks.c:1075
+#: mail/mail-callbacks.c:1294
 msgid "Printing of message failed"
 msgstr "Viestin tulostus epäonnistui"
 
-#: mail/mail-config-druid.c:363
+#: mail/mail-config.glade.h:1
+msgid "Account"
+msgstr ""
+
+#: mail/mail-config.glade.h:2
+msgid "Account Information"
+msgstr ""
+
+#: mail/mail-config.glade.h:3
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config.glade.h:5
+msgid "Advanced"
+msgstr ""
+
+#: mail/mail-config.glade.h:6
+msgid "Authentication"
+msgstr "Todentaminen"
+
+#: mail/mail-config.glade.h:7
+msgid "Authentication Type:"
+msgstr "Todentamistyyppi:"
+
+#: mail/mail-config.glade.h:9
+msgid "Automatically check mail every"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Check settings"
+msgstr ""
+
+#: mail/mail-config.glade.h:12
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email \n"
+"using Evolution. \n"
+"\n"
+"Click \"Finish\" to save your settings."
+msgstr ""
+
+#: mail/mail-config.glade.h:19
+msgid "De_fault"
+msgstr "_Oletukset"
+
+#: mail/mail-config.glade.h:21
+msgid "Done"
+msgstr ""
+
+#: mail/mail-config.glade.h:23
+msgid "Email Address:"
+msgstr "Sähköpostiosoite:"
+
+#: mail/mail-config.glade.h:24
+msgid "Email address:"
+msgstr "Sähköpostiosoite:"
+
+#: mail/mail-config.glade.h:25
+msgid "Evolution Mail Configuration"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+msgid "Full Name:"
+msgstr "Koko nimi:"
+
+#: mail/mail-config.glade.h:29
+msgid "Hostname:"
+msgstr "Isäntänimi:"
+
+#: mail/mail-config.glade.h:30
+msgid "IMAP"
+msgstr "IMAP"
+
+#: mail/mail-config.glade.h:31
+msgid "Identity"
+msgstr ""
+
+#: mail/mail-config.glade.h:32
+msgid "Include this account when receiving mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
+msgid "Keep mail on server"
+msgstr ""
+
+#: mail/mail-config.glade.h:34
+msgid "Kerberos"
+msgstr "Kerberos"
+
+#: mail/mail-config.glade.h:35
+msgid "Mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:36
+msgid "Mail Account"
+msgstr ""
+
+#: mail/mail-config.glade.h:37
+msgid "Mail Configuration"
+msgstr ""
+
+#: mail/mail-config.glade.h:38
+msgid "Mail Configuration Druid"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+msgid "Make this my default account"
+msgstr ""
+
+#: mail/mail-config.glade.h:40
+msgid "Mark messages as \"Read\" after:"
+msgstr ""
+
+#: mail/mail-config.glade.h:42
+msgid "News"
+msgstr ""
+
+#: mail/mail-config.glade.h:44
+msgid "Optional"
+msgstr ""
+
+#: mail/mail-config.glade.h:45
+msgid "Organization:"
+msgstr "Organisaatio:"
+
+#: mail/mail-config.glade.h:47
+msgid "PGP binary path:"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+msgid "Password:"
+msgstr "Salasana:"
+
+#: mail/mail-config.glade.h:50
+msgid "Plain Text"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
+msgid "Receiving Email"
+msgstr ""
+
+#: mail/mail-config.glade.h:52
+msgid "Remember my password"
+msgstr "Muista salasana"
+
+#: mail/mail-config.glade.h:53
+msgid "Reply address:"
+msgstr ""
+
+#: mail/mail-config.glade.h:54
+msgid "Required"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Save password"
+msgstr "Tallenna salasana"
+
+#: mail/mail-config.glade.h:57
+msgid "Select PGP binary"
+msgstr ""
+
+#: mail/mail-config.glade.h:58
+msgid "Select signature file"
+msgstr "Valitse allekirjoitustiedosto"
+
+#: mail/mail-config.glade.h:59
+msgid "Send mail in HTML format by default."
+msgstr "Lähetä sähköpostit oletuksena HTML-muodossa."
+
+#: mail/mail-config.glade.h:60
+msgid "Sending Email"
+msgstr "Lähetetään sähköposteja"
+
+#: mail/mail-config.glade.h:62
+msgid "Server Configuration"
+msgstr "Palvelimen asetukset"
+
+#: mail/mail-config.glade.h:63
+msgid "Server Type: "
+msgstr "Palvelintyyppi: "
+
+#: mail/mail-config.glade.h:64
+msgid "Server requires authentication"
+msgstr "Palvelin vaati todennuksen"
+
+#: mail/mail-config.glade.h:65
+msgid "Server type:"
+msgstr "Palvelintyyppi:"
+
+#: mail/mail-config.glade.h:66
+msgid "Signature file:"
+msgstr "Allekirjoitustiedosto:"
+
+#: mail/mail-config.glade.h:67
+msgid "Signature:"
+msgstr "Allekirjoitus:"
+
+#: mail/mail-config.glade.h:69
+msgid "Sources"
+msgstr "Lähteet"
+
+#: mail/mail-config.glade.h:70
+msgid "This server requires a secure connection (SSL)"
+msgstr "Tämä palvelin vaatii turvatun yhteyden (SSL)"
+
+#: mail/mail-config.glade.h:71
+msgid "Transport"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Transport Authentication"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+msgid "Type"
+msgstr "Tyyppi"
+
+#: mail/mail-config.glade.h:74
+msgid ""
+"Type the name by which you would like to refer to these servers. For "
+"example: \"Work\" or \"Home\"."
+msgstr ""
+"Anna nimi jolla haluat viitata näihin palvelimiin. Esimerkiksi \"Työ\" tai "
+"\"Koti\"."
+
+#: mail/mail-config.glade.h:75
+msgid "User Information"
+msgstr "Käyttäjätiedot"
+
+#: mail/mail-config.glade.h:76
+msgid "Username:"
+msgstr "Käyttäjänimi:"
+
+#: mail/mail-config.glade.h:77
+msgid ""
+"Welcome to the Evolution Mail Configuration Druid.\n"
+"\n"
+"Click \"Next\" to begin. "
+msgstr ""
+
+#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
+msgid "_Edit"
+msgstr "_Muokkaa"
+
+#: mail/mail-config.glade.h:83
+msgid "minutes."
+msgstr ""
+
+#: mail/mail-config-druid.c:421
 #, c-format
 msgid ""
 "Failed to verify the incoming mail configuration.\n"
 "You may experience problems retrieving your mail from %s"
 msgstr ""
 
-#: mail/mail-config-druid.c:629
+#: mail/mail-config-druid.c:515
+msgid "Namespace:"
+msgstr ""
+
+#: mail/mail-config-druid.c:708
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -3634,633 +5784,636 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:949
+#: mail/mail-config-druid.c:1215
 msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-display.c:98
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-"Tiedostoa %s ei voitu avata:\n"
-"%s"
-
-#: mail/mail-display.c:131
-#, c-format
-msgid "Could not write data: %s"
-msgstr ""
-
-#: mail/mail-display.c:229
+#: mail/mail-display.c:189
 msgid "Save Attachment"
 msgstr "Tallenna liite"
 
-#: mail/mail-display.c:269
+#: mail/mail-display.c:229
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Väliaikaishakemistoa ei voitu luoda: %s"
 
-#: mail/mail-display.c:311
+#: mail/mail-display.c:290
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:313
+#: mail/mail-display.c:292
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:315
+#: mail/mail-display.c:294
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:323
 msgid "External Viewer"
 msgstr "Ulkoinen katselin"
 
-#: mail/mail-display.c:365
+#: mail/mail-display.c:346
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:369
+#: mail/mail-display.c:350
 msgid "Hide"
 msgstr "Piilota"
 
-#: mail/mail-format.c:504
+#: mail/mail-format.c:506
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:626
+#: mail/mail-format.c:681
 msgid "Reply-To:"
 msgstr ""
 
-#: mail/mail-format.c:856
+#: mail/mail-format.c:704
+msgid "Loading message content"
+msgstr ""
+
+#: mail/mail-format.c:993
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:999
 msgid "Encrypted message"
 msgstr "Salattu viesti"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:1000
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1438
+#: mail/mail-format.c:1069 mail/mail-format.c:1456
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1077 mail/mail-format.c:1464
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1677
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1689
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1454
+#: mail/mail-format.c:1693
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1488
+#: mail/mail-format.c:1727
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1493
+#: mail/mail-format.c:1732
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1663
+#: mail/mail-local.c:335
 #, c-format
-msgid "On %s, %s wrote:\n"
+msgid "No such folder %s"
+msgstr ""
+
+#: mail/mail-local.c:508
+#, c-format
+msgid "Opening '%s'"
 msgstr ""
 
-#: mail/mail-local.c:204
+#: mail/mail-local.c:786
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:208
+#: mail/mail-local.c:790
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:251
+#: mail/mail-local.c:814
 msgid "Reconfiguring folder"
 msgstr ""
 
-#: mail/mail-local.c:269
+#. first, 'close' the old folder
+#: mail/mail-local.c:843
 msgid "Closing current folder"
 msgstr ""
 
-#: mail/mail-local.c:295
+#: mail/mail-local.c:875
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:313
+#: mail/mail-local.c:893
 msgid "Creating new folder"
 msgstr "Luodaan uutta kansiota"
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:907
 msgid "Copying messages"
 msgstr "Kopioidaan viestejä"
 
-#: mail/mail-local.c:348
+#: mail/mail-local.c:928
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:379
+#: mail/mail-local.c:967
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:787
-msgid "Registering local folder"
-msgstr ""
-
-#: mail/mail-local.c:789
-msgid "Register local folder"
-msgstr ""
-
-#: mail/mail-local.c:893
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-mt.c:85
+#: mail/mail-mt.c:177
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:87
+#: mail/mail-mt.c:179
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
-#, fuzzy
+#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:875
 msgid "Working"
-msgstr "Siirretään"
-
-#: mail/mail-ops.c:107
-#, c-format
-msgid "Fetching email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:109
-#, c-format
-msgid "Fetch email from %s"
-msgstr ""
+#: mail/mail-mt.c:666
+msgid "Do you accept?"
+msgstr "Hyväksytkö?"
 
-#: mail/mail-ops.c:359
-#, c-format
-msgid "There is no new mail at %s."
+#: mail/mail-mt.c:857
+msgid "Evolution progress"
 msgstr ""
 
-#: mail/mail-ops.c:430
-msgid "Filtering email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:432
-msgid "Filter email on demand"
-msgstr ""
-
-#: mail/mail-ops.c:563
+#: mail/mail-ops.c:516
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Lähetetään \"%s\""
 
-#: mail/mail-ops.c:565
+#: mail/mail-ops.c:518
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
-#: mail/mail-ops.c:682
-msgid "Sending queue"
+#: mail/mail-ops.c:752
+msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:684
-msgid "Send queue"
-msgstr ""
-
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
+#: mail/mail-ops.c:825
 #, c-format
-msgid "Appending \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
-msgid "Appending a message without a subject"
+msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:912
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "Siirretään viestejä \"%s\" -> \"%s\""
-
-#: mail/mail-ops.c:914
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "Kopioidaan viestejä \"%s\" -> \"%s\""
-
-#: mail/mail-ops.c:917
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "Siirrä viestejä kansiosta \"%s\" kansioon \"%s\""
-
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:825
 #, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "Kopioi viestejä kansiosta \"%s\" kansioon \"%s\""
+msgid "Copying messages to %s"
+msgstr ""
 
-#: mail/mail-ops.c:950
+#: mail/mail-ops.c:842
 msgid "Moving"
 msgstr "Siirretään"
 
-#: mail/mail-ops.c:953
+#: mail/mail-ops.c:845
 msgid "Copying"
 msgstr "Kopioidaan"
 
-#: mail/mail-ops.c:973
+#: mail/mail-ops.c:856
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1048
+#: mail/mail-ops.c:927
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
-msgid "(No description)"
-msgstr "(ei kuvausta)"
-
-#: mail/mail-ops.c:1179
+#: mail/mail-ops.c:1074
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
+#: mail/mail-ops.c:1115 mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1351
-msgid "Synchronising folder"
-msgstr "Synkronoidaan kansiota"
+#: mail/mail-ops.c:1182
+#, c-format
+msgid "Opening store %s"
+msgstr ""
 
-#: mail/mail-ops.c:1401
+#: mail/mail-ops.c:1369
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1450
+#: mail/mail-ops.c:1418
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viestiä %s"
 
-#: mail/mail-ops.c:1517
+#: mail/mail-ops.c:1485
 msgid "Retrieving messages"
 msgstr "Haetaan viestejä"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1495
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1675
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr ""
-
-#: mail/mail-ops.c:1677
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr ""
-
-#: mail/mail-ops.c:1843
+#: mail/mail-ops.c:1569
 msgid "Saving messages"
 msgstr "Tallennetaan viestejä"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1648
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1935
+#: mail/mail-ops.c:1661
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1949
+#: mail/mail-ops.c:1675
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
-msgstr "Peruuta"
+#: mail/mail-ops.c:1749
+msgid "Saving attachment"
+msgstr "Tallennetaan liite"
 
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr ""
-
-#: mail/mail-threads.c:302
+#: mail/mail-ops.c:1764
 #, c-format
 msgid ""
-"Error while preparing to %s:\n"
-"%s"
+"Cannot create output file: %s:\n"
+" %s"
 msgstr ""
 
-#: mail/mail-threads.c:676
+#: mail/mail-ops.c:1792
 #, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
+msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr ""
+#: mail/mail-search-dialogue.c:107
+msgid "_Search"
+msgstr "_Etsi"
 
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr ""
+#: mail/mail-send-recv.c:136
+msgid "Cancelling ..."
+msgstr "Peruutetaan ..."
 
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
-msgstr ""
+#: mail/mail-send-recv.c:231
+msgid "Send & Receive mail"
+msgstr "Lähetä & vastaanota postia"
 
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr ""
+#: mail/mail-send-recv.c:234
+msgid "Receiving"
+msgstr "Otetaan vastaan"
 
-#: mail/mail-tools.c:189
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr ""
+#: mail/mail-send-recv.c:283
+msgid "Updating ..."
+msgstr "Päivitetään ..."
 
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, c-format
-msgid "Examining %s"
-msgstr ""
+#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
+msgid "Waiting ..."
+msgstr "Odotetaan ..."
 
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
-msgstr ""
+#: mail/mail-send-recv.c:304
+msgid "Sending"
+msgstr "Lähetetään"
 
-#: mail/mail-tools.c:300
-#, c-format
-msgid "Retrieving message %d of %d"
-msgstr ""
+#: mail/mail-send-recv.c:469
+msgid "Cancelled."
+msgstr "Peruutettu."
 
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, c-format
-msgid "Writing message %d of %d"
+#: mail/mail-send-recv.c:473
+msgid "Complete."
+msgstr "Valmis."
+
+#: mail/mail-summary.c:111
+msgid "Incomplete message written on pipe!"
 msgstr ""
 
-#: mail/mail-tools.c:347
+#: mail/mail-tools.c:138
 #, c-format
-msgid "Saving changes to %s"
+msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:381
+#: mail/mail-tools.c:185
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr ""
 
-#: mail/mail-tools.c:391
+#: mail/mail-tools.c:195
 msgid "Fwd: (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:427
+#: mail/mail-tools.c:212
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:214
 msgid "Forwarded message (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:530
+#: mail/mail-tools.c:411
 #, c-format
 msgid ""
-"Cannot open location `%s':\n"
-"%s"
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
 msgstr ""
 
-#: mail/mail-vfolder.c:149
+#: mail/mail-vfolder.c:248
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:298
+#: 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:138
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
 msgid "Reply"
 msgstr "Vastaa"
 
-#: mail/mail-view.c:138
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr ""
 
-#: mail/mail-view.c:141
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr ""
 
-#: mail/mail-view.c:144
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
 msgid "Forward this message"
 msgstr ""
 
-#: mail/mail-view.c:148
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
 msgid "Print the selected message"
 msgstr "Tulosta valittu viesti"
 
-#: mail/mail-view.c:150
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:8
 msgid "Delete this message"
 msgstr "Poista tämä viesti"
 
-#: mail/message-list.c:599
+#: mail/message-list.c:618
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:602
-msgid "Seen"
+#: mail/message-list.c:627
+msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:605
-msgid "Answered"
+#: mail/message-list.c:630
+msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:890
+#: mail/message-list.c:952
 #, c-format
 msgid "[ %s ]"
 msgstr ""
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:902 mail/message-list.c:918
+#: mail/message-list.c:964 mail/message-list.c:980
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:905 mail/message-list.c:921
+#: mail/message-list.c:967 mail/message-list.c:983
 msgid "<unknown>"
 msgstr "<tuntematon>"
 
-#: mail/message-list.c:973
+#: mail/message-list.c:1035
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:980
+#: mail/message-list.c:1042
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:989
+#: mail/message-list.c:1051
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1063
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1009
+#: mail/message-list.c:1071
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1011
+#: mail/message-list.c:1073
 msgid "%b %d %Y"
-msgstr ""
-
-#: mail/message-list.c:1109
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.c:1109
-#, fuzzy
-msgid "Attachment"
-msgstr "liite"
+msgstr "%b %d %Y"
 
-#: mail/message-list.c:1110
-#, fuzzy
+#: mail/message-list.c:1172
 msgid "From"
-msgstr "Lähettäjä:"
+msgstr "Lähettäjä"
 
-#: mail/message-list.c:1110
-#, fuzzy
+#: mail/message-list.c:1172
 msgid "Date"
-msgstr "jälkeen"
+msgstr "Päiväys"
 
-#: mail/message-list.c:1110
-#, fuzzy
+#: mail/message-list.c:1172
 msgid "Received"
 msgstr "Otettu vastaan"
 
-#: mail/message-list.c:1111
-#, fuzzy
+#: mail/message-list.c:1173
 msgid "To"
-msgstr "Vastaanottaja:"
+msgstr "Vastaanottaja"
 
-#: mail/message-list.c:1111
-#, fuzzy
+#: mail/message-list.c:1173
 msgid "Size"
-msgstr "Koko:"
+msgstr "Koko"
 
-#: mail/openpgp-utils.c:78
-#, fuzzy, c-format
+#: mail/openpgp-utils.c:89
+#, c-format
 msgid "Please enter your %s passphrase for %s"
-msgstr "Anna PGP/GPG-salasanasi"
+msgstr ""
 
-#: mail/openpgp-utils.c:81
-#, fuzzy, c-format
+#: mail/openpgp-utils.c:92
+#, c-format
 msgid "Please enter your %s passphrase"
-msgstr "Anna PGP/GPG-salasanasi"
+msgstr ""
 
-#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
-#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
+#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
 msgid "No GPG/PGP program available."
 msgstr "GPG/PGP-ohjelmaa ei ole."
 
-#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
-#: mail/openpgp-utils.c:898
+#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
+#: mail/openpgp-utils.c:920
 msgid "No password provided."
 msgstr "Ei salasanaa."
 
-#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
-#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
+#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+#: mail/openpgp-utils.c:588
 msgid "No recipients specified"
 msgstr ""
 
-#: mail/openpgp-utils.c:1065
+#: mail/openpgp-utils.c:1088
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Väliaikaistiedostoa ei voitu luoda: %s"
 
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
-#, fuzzy
+#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
 msgid "Folder"
-msgstr "_Kansio"
+msgstr "Kansio"
 
-#: mail/subscribe-dialog.c:63
-#, fuzzy
+#: mail/subscribe-dialog.c:65
 msgid "Store"
-msgstr "Lähde"
+msgstr ""
 
-#: mail/subscribe-dialog.c:145
+#: mail/subscribe-dialog.c:147
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:178
+#: mail/subscribe-dialog.c:177
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:181
+#: mail/subscribe-dialog.c:280
+#, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr ""
+
+#: mail/subscribe-dialog.c:282
 #, c-format
-msgid "Get store for \"%s\""
+msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:289
+#: 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 ""
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/importer/importer.c:157
 #, c-format
-msgid "Subscribing to folder \"%s\""
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+
+#: shell/importer/importer.c:175 shell/importer/importer.c:202
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+
+#: shell/importer/importer.c:309
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
 msgstr ""
 
-#: mail/subscribe-dialog.c:293
+#: shell/importer/importer.c:319
+msgid "Importing"
+msgstr ""
+
+#: shell/importer/importer.c:327
 #, c-format
-msgid "Unsubscribing from folder \"%s\""
+msgid ""
+"Importing %s.\n"
+"Starting %s"
 msgstr ""
 
-#: mail/subscribe-dialog.c:297
+#: shell/importer/importer.c:342
 #, c-format
-msgid "Subscribe to folder \"%s\""
+msgid "Error loading %s"
 msgstr ""
 
-#: mail/subscribe-dialog.c:300
+#: shell/importer/importer.c:357
 #, c-format
-msgid "Unsubscribe from folder \"%s\""
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/importer/importer.c:428
+msgid "Automatic"
+msgstr ""
+
+#: shell/importer/importer.c:478
+msgid "Filename:"
+msgstr "Tiedostonimi:"
+
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
+msgid "Select a file"
+msgstr "Valitse tiedosto"
+
+#: shell/importer/importer.c:493
+msgid "File type:"
+msgstr "Tiedoston tyyppi:"
+
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
+msgid "Import"
+msgstr ""
+
+#: shell/importer/importer.c:609
+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 ""
+
+#: 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:112 shell/e-setup.c:185
@@ -4286,7 +6439,7 @@ msgid "Evolution files successfully installed."
 msgstr ""
 
 #: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
+msgid "This seems to be the first time you are running Evolution."
 msgstr "Tämä näyttäisi olevan ensimmäinen kerta kun käytät Evolutionia."
 
 #: shell/e-setup.c:190
@@ -4328,18 +6481,18 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:82
+#: shell/e-shell-folder-creation-dialog.c:96
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:134
+#: shell/e-shell-folder-creation-dialog.c:153
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:225
+#: shell/e-shell-folder-creation-dialog.c:245
 msgid "Evolution - Create new folder"
 msgstr ""
 
@@ -4349,7 +6502,7 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:297
+#: shell/e-shell-folder-selection-dialog.c:318
 msgid "New..."
 msgstr "Uusi..."
 
@@ -4357,54 +6510,53 @@ msgstr "Uusi..."
 msgid "(Untitled)"
 msgstr "(Nimetön)"
 
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:159
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy could not be run."
 msgstr "Bug buddya ei voitu ajaa."
 
-#: shell/e-shell-view-menu.c:172
-#, fuzzy
+#: shell/e-shell-view-menu.c:194
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
+msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:196
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:334
+#: shell/e-shell-view-menu.c:360
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view.c:140
+#: shell/e-shell-view.c:143
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:468
+#: shell/e-shell-view.c:474
 msgid "Folders"
-msgstr ""
+msgstr "Kansiot"
 
-#: shell/e-shell-view.c:1098
-#, fuzzy, c-format
+#: shell/e-shell-view.c:1124
+#, c-format
 msgid "%s - Evolution %s"
-msgstr "Evolution"
+msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1100
+#: shell/e-shell-view.c:1126
 #, c-format
 msgid "%s - Evolution %s [%s]"
-msgstr ""
+msgstr "%s - Evolution %s [%s]"
 
 #: shell/e-shell.c:372
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1212
+#: shell/e-shell.c:1238
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -4428,7 +6580,7 @@ msgstr ""
 
 #: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
-msgstr ""
+msgstr "Älä poista"
 
 #: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
@@ -4456,7 +6608,7 @@ msgstr ""
 
 #: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
-msgstr ""
+msgstr "_Poista tämä ryhmä..."
 
 #: shell/e-shortcuts-view.c:284
 msgid "Remove this shortcut group"
@@ -4482,89 +6634,94 @@ msgstr ""
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:358
+#: shell/e-shortcuts.c:375
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage-set-view.c:338
+#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
 msgid "_View"
 msgstr "_Näytä"
 
-#: shell/e-storage-set-view.c:338
+#: shell/e-storage-set-view.c:468
 msgid "View the selected folder"
 msgstr ""
 
-#: shell/e-storage.c:138
+#: shell/e-storage.c:178
 msgid "(No name)"
 msgstr "(Ei nimeä)"
 
-#: shell/e-storage.c:389
+#: shell/e-storage.c:429
 msgid "No error"
 msgstr "Ei virhettä"
 
-#: shell/e-storage.c:391
+#: shell/e-storage.c:431
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
-#: shell/e-storage.c:393
+#: shell/e-storage.c:433
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:395
+#: shell/e-storage.c:435
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:397
+#: shell/e-storage.c:437
 msgid "I/O error"
 msgstr "I/O-virhe"
 
-#: shell/e-storage.c:399
+#: shell/e-storage.c:439
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:401
+#: shell/e-storage.c:441
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:403
+#: shell/e-storage.c:443
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:405
+#: shell/e-storage.c:445
 msgid "Permission denied"
 msgstr ""
 
-#: shell/e-storage.c:407
+#: shell/e-storage.c:447
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:409
+#: shell/e-storage.c:449
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr ""
+
 #: shell/main.c:74
+#, c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
+"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
+"Evolution is not yet complete. It's getting close, but there are\n"
+"places where features are either missing or only half working. If\n"
+"you can't figure out how to do something, it's probably because\n"
+"there's no way to do it yet! :-)\n"
 "\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
+"We hope Evolution will be usable for you, but we still feel the\n"
+"need to warn you that it may: crash, lose your mail, leave stray\n"
+"processes running, consume 100% of your CPU, send non-\n"
+"compliant commands to your servers, and generally embarass you\n"
+"in front of your friends and co-workers. Use only as directed.\n"
 "\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:101
+#: shell/main.c:99
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -4572,1286 +6729,1347 @@ msgstr ""
 "Kiitos\n"
 "The Evolution Team\n"
 
-#: shell/main.c:132
+#: shell/main.c:130
 msgid "Cannot initialize the Evolution shell."
 msgstr ""
 
-#: shell/main.c:178
+#: shell/main.c:176
 msgid "Disable."
 msgstr ""
 
-#: shell/main.c:198
+#: shell/main.c:196
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobon komponenttijärjestelmän alustus epäonnistui"
 
-#: ui/evolution-contact-editor.xml:7
-#, fuzzy
-msgid "FIXME: _Appointment"
-msgstr "_Uusi tapaaminen"
+#: ui/evolution-addressbook.xml.h:2
+msgid "Create new contact"
+msgstr "Luo uusi kontakti"
 
-#: ui/evolution-contact-editor.xml:8
-msgid "FIXME: Meeting Re_quest"
-msgstr ""
+#: ui/evolution-addressbook.xml.h:4
+msgid "Delete a contact"
+msgstr "Poista kontakti"
 
-#: ui/evolution-contact-editor.xml:10
-msgid "FIXME: _Mail Message"
-msgstr ""
+#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
+msgid "Find"
+msgstr "Etsi"
 
-#: ui/evolution-contact-editor.xml:11
-msgid "FIXME: _Contact"
-msgstr "_Kontakti"
+#: ui/evolution-addressbook.xml.h:6
+msgid "Find a contact"
+msgstr "Etsi kontakti"
 
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
-msgstr ""
+#: ui/evolution-addressbook.xml.h:7
+msgid "New contact"
+msgstr "Uusi kontakti"
 
-#: ui/evolution-contact-editor.xml:13
-msgid "FIXME: Task _Request"
-msgstr ""
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
+#: ui/evolution-mail.xml.h:30
+msgid "Previews the message to be printed"
+msgstr "Esikatsele tulostettavaa viestiä"
 
-#: ui/evolution-contact-editor.xml:14
-msgid "FIXME: _Journal Entry"
-msgstr ""
+#: ui/evolution-addressbook.xml.h:11
+msgid "Print contacts"
+msgstr "Tulosta kontaktit"
 
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
-msgstr ""
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
+msgid "Stop"
+msgstr "Pysäytä"
 
-#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
-msgid "FIXME: Ch_oose Form..."
-msgstr ""
+#: ui/evolution-addressbook.xml.h:13
+msgid "Stop Loading"
+msgstr "Pysäytä lataaminen"
 
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
-msgstr ""
+#: ui/evolution-addressbook.xml.h:14
+msgid "View All"
+msgstr "Näytä kaikki"
 
-#: ui/evolution-contact-editor.xml:24
-msgid "FIXME: Define Print _Styles..."
-msgstr ""
+#: ui/evolution-addressbook.xml.h:15
+msgid "View all contacts"
+msgstr "Näytä kaikki kontaktit"
 
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
-msgstr "_Lähetä"
+#: ui/evolution-addressbook.xml.h:16
+msgid "_Addressbook Sources..."
+msgstr "_Osoitekirjan lähteet..."
 
-#: ui/evolution-contact-editor.xml:35
-msgid "FIXME: Save Attac_hments..."
-msgstr "Tallenna L_iitteet..."
+#: ui/evolution-addressbook.xml.h:17
+msgid "_Contact"
+msgstr "_Kontakti"
 
-#: ui/evolution-contact-editor.xml:38
-msgid "FIXME: _Move to Folder..."
-msgstr "_Siirrä kansioon..."
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15
+msgid "_Print..."
+msgstr "T_ulosta..."
 
-#: ui/evolution-contact-editor.xml:39
-msgid "FIXME: Cop_y to Folder..."
-msgstr "_Kopioi kansioon..."
+#: ui/evolution-addressbook.xml.h:19
+msgid "_Search for contacts"
+msgstr "_Etsi kontakteja"
 
-#: ui/evolution-contact-editor.xml:41
-#, fuzzy
-msgid "Page Set_up"
-msgstr "Sivun asetukset:"
+#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
+msgid "_Tools"
+msgstr "_Työkalut"
 
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
-msgstr "Tulostuksen _esikatselu"
+#: ui/evolution-calendar.xml.h:1
+msgid "5 Days"
+msgstr "5 päivää"
 
-#: ui/evolution-contact-editor.xml:63
-#, fuzzy
-msgid "FIXME: Paste _Special..."
-msgstr "_Tiedosto..."
+#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
+msgid "Alter preferences"
+msgstr "Muuta asetuksia"
 
-#: ui/evolution-contact-editor.xml:68
-#, fuzzy
-msgid "FIXME: Mark as U_nread"
-msgstr "Merkitse lukemattomaksi"
+#: ui/evolution-calendar.xml.h:4
+msgid "Create a new appointment"
+msgstr "Luo uusi tapaaminen"
 
-#: ui/evolution-contact-editor.xml:72
-msgid "_Object"
-msgstr ""
+#: ui/evolution-calendar.xml.h:5
+msgid "Create a new calendar"
+msgstr "Luo uusi kalenteri"
 
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
-msgstr ""
+#: ui/evolution-calendar.xml.h:6
+msgid "Day"
+msgstr "Päivä"
 
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
-msgstr ""
+#: ui/evolution-calendar.xml.h:7
+msgid "Go To"
+msgstr "Siirry"
 
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
+#: ui/evolution-calendar.xml.h:8
+msgid "Go back in time"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
+#: ui/evolution-calendar.xml.h:9
+msgid "Go forward in time"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:91
-msgid "FIXME: _Standard"
+#: ui/evolution-calendar.xml.h:10
+msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:93
-#, fuzzy
-msgid "FIXME: __Formatting"
-msgstr "_Kontakti"
+#: ui/evolution-calendar.xml.h:11
+msgid "Go to present time"
+msgstr "Siirry nykyiseen aikaan"
 
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
-msgstr ""
+#: ui/evolution-calendar.xml.h:12
+msgid "Month"
+msgstr "Kuukausi"
 
-#: ui/evolution-contact-editor.xml:101
-msgid "Pre_vious"
-msgstr "_Edellinen"
-
-#: ui/evolution-contact-editor.xml:102
-#, fuzzy
-msgid "Ne_xt"
-msgstr "_Seuraava"
+#: ui/evolution-calendar.xml.h:13
+msgid "New Appointment"
+msgstr "Uusi tapaaminen"
 
-#: ui/evolution-contact-editor.xml:104
-msgid "_Toolbars"
-msgstr "_Työkalupalkit"
+#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-task-editor-dialog.xml.h:32
+msgid "Next"
+msgstr "Seuraava"
 
-#: ui/evolution-contact-editor.xml:109
-msgid "FIXME: _File..."
-msgstr "_Tiedosto..."
+#: ui/evolution-calendar.xml.h:16
+msgid "Open Calendar"
+msgstr "Avaa kalenteri"
 
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
+#: ui/evolution-calendar.xml.h:17
+msgid "Prev"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:111
-msgid "FIXME: _Object..."
-msgstr ""
+#: ui/evolution-calendar.xml.h:21
+msgid "Print calendar"
+msgstr "Tulosta kalenteri"
 
-#: ui/evolution-contact-editor.xml:116
-msgid "FIXME: _Font..."
-msgstr "_Kirjasin..."
+#: ui/evolution-calendar.xml.h:22
+msgid "Print this Calendar"
+msgstr "Tulosta tämä kalenteri"
 
-#: ui/evolution-contact-editor.xml:117
-msgid "FIXME: _Paragraph..."
-msgstr ""
+#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
+msgid "Save As"
+msgstr "Tallenna nimellä"
 
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
+#: ui/evolution-calendar.xml.h:24
+msgid "Save calendar as something else"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
-msgstr ""
+#: ui/evolution-calendar.xml.h:26
+msgid "Show 1 day"
+msgstr "Näytä 1 päivä"
 
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
-msgstr ""
+#: ui/evolution-calendar.xml.h:27
+msgid "Show 1 month"
+msgstr "Näytä 1 kuukausi"
 
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
-msgstr ""
+#: ui/evolution-calendar.xml.h:28
+msgid "Show 1 week"
+msgstr "Näytä 1 viikko"
 
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
-msgstr ""
+#: ui/evolution-calendar.xml.h:29
+msgid "Show the working week"
+msgstr "Näytä työviikko"
 
-#: ui/evolution-contact-editor.xml:135
-msgid "FIXME: _Spelling..."
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
+#: widgets/misc/e-dateedit.c:413
+msgid "Today"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:137
-msgid "_Forms"
-msgstr ""
+#: ui/evolution-calendar.xml.h:31
+msgid "Week"
+msgstr "Viikko"
 
-#: ui/evolution-contact-editor.xml:142
-#, fuzzy
-msgid "FIXME: _New Contact"
-msgstr "_Kontakti"
+#: ui/evolution-calendar.xml.h:32
+msgid "_Appointment"
+msgstr "_Tapaaminen"
 
-#: ui/evolution-contact-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
-msgstr ""
+#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
+msgid "_New"
+msgstr "_Uusi"
 
-#: ui/evolution-contact-editor.xml:145
-#, fuzzy
-msgid "FIXME: New _Letter to Contact"
-msgstr "_Kontakti"
+#: ui/evolution-calendar.xml.h:34
+msgid "_Open Calendar"
+msgstr "_Avaa kalenteri"
 
-#: ui/evolution-contact-editor.xml:146
-#, fuzzy
-msgid "FIXME: New _Message to Contact"
-msgstr "Lähetä _viesti kontaktille..."
+#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: ui/evolution-tasks.xml.h:8
+msgid "_Save As..."
+msgstr "Tallenna _nimellä..."
 
-#: ui/evolution-contact-editor.xml:147
-#, fuzzy
-msgid "FIXME: New Meetin_g with Contact"
-msgstr "_Kontakti"
+#: ui/evolution-contact-editor.xml.h:2
+msgid "Delete this item"
+msgstr "Poista tämä kohta"
 
-#: ui/evolution-contact-editor.xml:148
-#, fuzzy
-msgid "FIXME: _Plan a Meeting..."
-msgstr "_Tiedosto..."
+#: ui/evolution-contact-editor.xml.h:3
+msgid "Delete..."
+msgstr "Poista..."
 
-#: ui/evolution-contact-editor.xml:149
-#, fuzzy
-msgid "FIXME: New _Task for Contact"
-msgstr "_Kontakti"
+#: ui/evolution-contact-editor.xml.h:4
+msgid "Help"
+msgstr "Apua"
 
-#: ui/evolution-contact-editor.xml:150
-msgid "FIXME: New _Journal Entry for Contact"
+#: ui/evolution-contact-editor.xml.h:5
+msgid "Print En_velope..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:152
-#, fuzzy
-msgid "FIXME: _Flag for Follow Up..."
-msgstr "_Kopioi kansioon..."
+#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
+#: ui/evolution-task-editor-dialog.xml.h:40
+msgid "Print this item"
+msgstr "Tulosta tämä kohta"
 
-#: ui/evolution-contact-editor.xml:153
-msgid "FIXME: _Display Map of Address"
-msgstr ""
+#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
+#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
+msgid "Print..."
+msgstr "Tulosta..."
 
-#: ui/evolution-contact-editor.xml:154
-#, fuzzy
-msgid "FIXME: _Open Web Page"
-msgstr "_Lähetä"
+#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-task-editor-dialog.xml.h:51
+msgid "Save _As..."
+msgstr "Tallenna _nimellä..."
 
-#: ui/evolution-contact-editor.xml:156
-msgid "FIXME: Forward as _vCard"
-msgstr ""
+#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:52
+msgid "Save and Close"
+msgstr "Tallenna ja sulje"
 
-#: ui/evolution-contact-editor.xml:157
-msgid "FIXME: For_ward"
-msgstr ""
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Save the contact and close the dialog box"
+msgstr "Tallenna kontakti ja sulje ikkuna"
 
-#: ui/evolution-contact-editor.xml:169
-msgid "_Insert"
-msgstr "Li_sää"
-
-#: ui/evolution-contact-editor.xml:170
-msgid "F_ormat"
+#: ui/evolution-contact-editor.xml.h:11
+msgid "Se_nd contact to other..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:171
-msgid "_Tools"
-msgstr "_Työkalut"
-
-#: ui/evolution-contact-editor.xml:172
-msgid "Actio_ns"
-msgstr "T_oiminnot"
-
-#: ui/evolution-contact-editor.xml:246
-#, fuzzy
-msgid "FIXME: Previous"
-msgstr "Edellinen"
-
-#: ui/evolution-contact-editor.xml:247
-msgid "Go to the previous item"
-msgstr "Siirry edelliseen kohtaan"
+#: ui/evolution-contact-editor.xml.h:12
+msgid "See online help"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:249
-#, fuzzy
-msgid "FIXME: Next"
-msgstr "Apua"
+#: ui/evolution-contact-editor.xml.h:13
+msgid "Send _message to contact..."
+msgstr "Lähetä _viesti kontaktille..."
 
-#: ui/evolution-contact-editor.xml:250
-msgid "Go to the next item"
-msgstr "Siirry seuraavaan kohtaan"
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
+msgid "_File"
+msgstr "_Tiedosto"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr ""
+#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-task-editor-dialog.xml.h:85
+msgid "_Save"
+msgstr "_Tallenna"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr ""
+#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
+msgid "About this application"
+msgstr "Tietoja tästä sovelluksesta"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr ""
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
+msgid "About..."
+msgstr "Tietoja..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr ""
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
+msgid "Actio_ns"
+msgstr "T_oiminnot"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr ""
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
+msgid "Address _Book... (FIXME)"
+msgstr "_Osoitekirja..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
+msgid "C_lear"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Asetukset"
+#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
+msgid "C_ut"
+msgstr "L_eikkaa"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
+#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
+msgid "Chec_k Names (FIXME)"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
+msgid "Clear"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
+msgid "Clear the selection"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#: ui/evolution-event-editor.xml.h:11
+msgid "Close this appointment"
+msgstr "Sulje tämä tapaaminen"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr ""
+#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
+msgid "Cop_y to Folder... (FIXME)"
+msgstr "Kopioi kansioon..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
+#: ui/evolution-task-editor-dialog.xml.h:14
+msgid "Copy"
+msgstr "Kopioi"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr ""
+#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
+msgid "Copy the selection"
+msgstr "Kopioi valinta"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr ""
+#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
+msgid "Cut"
+msgstr "Leikkaa"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr ""
+#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
+msgid "Cut the selection"
+msgstr "Leikkaa valinta"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr ""
+#: ui/evolution-event-editor.xml.h:18
+msgid "Delete this appointment"
+msgstr "Poista tämä tapaaminen"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
+#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
+msgid "Dump XML"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
+#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
+msgid "Dump the UI Xml description"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
+#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
+msgid "Fi_rst Item in Folder (FIXME)"
 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
-msgid "MTWTFSS"
+#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
+msgid "For_ward (FIXME)"
 msgstr ""
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
+#: ui/evolution-event-editor.xml.h:23
+msgid "Forward as v_Calendar (FIXME)"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Nyt"
-
-#: widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr ""
+#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
+msgid "Go to the next item"
+msgstr "Siirry seuraavaan kohtaan"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr ""
+#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
+msgid "Go to the previous item"
+msgstr "Siirry edelliseen kohtaan"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
+#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
+msgid "In_complete Task (FIXME)"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:176
-msgid "Sear_ch"
+#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
+msgid "Modify the file's properties"
 msgstr ""
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Ryhmä %i"
-
-#~ msgid "Delete Contact?"
-#~ msgstr "Poista kontakti?"
-
-#~ msgid "Address _2:"
-#~ msgstr "Osoite _2:"
-
-#~ msgid "Canada"
-#~ msgstr "Kanada"
-
-#~ msgid "Check Address"
-#~ msgstr "Tarkista osoite"
-
-#~ msgid "Countr_y:"
-#~ msgstr "M_aa:"
-
-#~ msgid "Finland"
-#~ msgstr "Suomi"
-
-#~ msgid "USA"
-#~ msgstr "Yhdysvallat"
-
-#~ msgid "_Address:"
-#~ msgstr "_Osoite:"
-
-#~ msgid "_City:"
-#~ msgstr "_Kaupunki:"
-
-#~ msgid "_State/Province:"
-#~ msgstr "_Osavaltio/Provinssi:"
-
-#~ msgid "URI"
-#~ msgstr "URI"
-
-#~ msgid "Find..."
-#~ msgstr "Etsi..."
-
-#~ msgid "Message Recipients"
-#~ msgstr "Vastaanottajat"
-
-#~ msgid "Select Names"
-#~ msgstr "Valitse nimet"
-
-#~ msgid "123"
-#~ msgstr "123"
-
-#~ msgid "a"
-#~ msgstr "a"
-
-#~ msgid "b"
-#~ msgstr "b"
-
-#~ msgid "c"
-#~ msgstr "c"
-
-#~ msgid "d"
-#~ msgstr "d"
-
-#~ msgid "e"
-#~ msgstr "e"
-
-#~ msgid "f"
-#~ msgstr "f"
-
-#~ msgid "g"
-#~ msgstr "g"
-
-#~ msgid "h"
-#~ msgstr "h"
-
-#~ msgid "i"
-#~ msgstr "i"
-
-#~ msgid "j"
-#~ msgstr "j"
-
-#~ msgid "k"
-#~ msgstr "k"
-
-#~ msgid "l"
-#~ msgstr "l"
-
-#~ msgid "m"
-#~ msgstr "m"
-
-#~ msgid "n"
-#~ msgstr "n"
-
-#~ msgid "o"
-#~ msgstr "o"
-
-#~ msgid "p"
-#~ msgstr "p"
-
-#~ msgid "q"
-#~ msgstr "q"
-
-#~ msgid "r"
-#~ msgstr "r"
-
-#~ msgid "s"
-#~ msgstr "s"
-
-#~ msgid "t"
-#~ msgstr "t"
-
-#~ msgid "u"
-#~ msgstr "u"
-
-#~ msgid "v"
-#~ msgstr "v"
-
-#~ msgid "w"
-#~ msgstr "w"
-
-#~ msgid "x"
-#~ msgstr "x"
-
-#~ msgid "y"
-#~ msgstr "y"
-
-#~ msgid "z"
-#~ msgstr "z"
-
-#~ msgid "10 pt. Tahoma"
-#~ msgstr "10 pt. Tahoma"
-
-#~ msgid "8 pt. Tahoma"
-#~ msgstr "8 pt. Tahoma"
-
-#~ msgid "Bottom:"
-#~ msgstr "Ala:"
-
-#~ msgid "Dimensions:"
-#~ msgstr "Mitat:"
-
-#~ msgid "Font..."
-#~ msgstr "Kirjasin..."
-
-#~ msgid "Fonts"
-#~ msgstr "Kirjasinlajit"
-
-#~ msgid "Footer:"
-#~ msgstr "Alatunniste:"
-
-#~ msgid "Header"
-#~ msgstr "Ylätunniste:"
-
-#~ msgid "Header/Footer"
-#~ msgstr "Ylä-/Alatunniste"
-
-#~ msgid "Height:"
-#~ msgstr "Korkeus:"
-
-#~ msgid "Landscape"
-#~ msgstr "Vaaka"
-
-#~ msgid "Left:"
-#~ msgstr "Vasen:"
+#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
+msgid "N_ext"
+msgstr "_Seuraava"
 
-#~ msgid "Margins"
-#~ msgstr "Reunukset"
+#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
+msgid "Paste"
+msgstr "Liitä"
 
-#~ msgid "Number of columns:"
-#~ msgstr "Sarakkeiden määrä:"
+#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
+msgid "Paste the clipboard"
+msgstr "Liitä leikepöytä"
 
-#~ msgid "Options"
-#~ msgstr "Asetukset"
+#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
+msgid "Pre_vious"
+msgstr "_Edellinen"
 
-#~ msgid "Orientation"
-#~ msgstr "Suunta"
+#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
+msgid "Previous"
+msgstr "Edellinen"
 
-#~ msgid "Page"
-#~ msgstr "Sivu"
+#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
+msgid "Print Pre_view"
+msgstr "Tulostuksen esikatselu"
 
-#~ msgid "Paper"
-#~ msgstr "Paperi"
+#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
+msgid "Print S_etup..."
+msgstr "Tulost_usasetukset"
 
-#~ msgid "Paper source:"
-#~ msgstr "Paperilähde:"
+#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
+msgid "Print Setup"
+msgstr "Tulostusasetukset"
 
-#~ msgid "Portrait"
-#~ msgstr "Pysty"
+#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:207
+msgid "Save"
+msgstr "Tallenna"
 
-#~ msgid "Preview:"
-#~ msgstr "Esikatselu:"
+#: ui/evolution-event-editor.xml.h:43
+msgid "Save the appointment and close the dialog box"
+msgstr "Tallenna tapaaminen ja sulje tapaamisikkuna"
 
-#~ msgid "Reverse on even pages"
-#~ msgstr "Peilikuvareunukset"
+#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
+#: ui/evolution-task-editor-dialog.xml.h:53
+msgid "Save the current file"
+msgstr "Tallenna nykyinen tiedosto"
 
-#~ msgid "Right:"
-#~ msgstr "Oikea:"
+#: ui/evolution-event-editor.xml.h:46
+msgid "Schedule _Meeting"
+msgstr ""
 
-#~ msgid "Shading"
-#~ msgstr "Varjostus"
+#: ui/evolution-event-editor.xml.h:47
+msgid "Schedule some sort of a meeting"
+msgstr ""
 
-#~ msgid "Style name:"
-#~ msgstr "Tyylin nimi:"
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
+msgid "Select All"
+msgstr "Valitse kaikki"
 
-#~ msgid "Top:"
-#~ msgstr "Ylä:"
+#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
+msgid "Select everything"
+msgstr "Merkitsee kaikki valituksi"
 
-#~ msgid "Type:"
-#~ msgstr "Tyyppi:"
+#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
+msgid "Setup the page settings for your current printer"
+msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
 
-#~ msgid "Width:"
-#~ msgstr "Leveys:"
+#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
+msgid "Task _Request (FIXME)"
+msgstr ""
 
-#~ msgid "Edit appointment"
-#~ msgstr "Muokkaa tapaamista"
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:37
+#: ui/evolution-task-editor-dialog.xml.h:63
+msgid "_About..."
+msgstr "_Tietoja..."
 
-#~ msgid "05 minutes"
-#~ msgstr "05 minuuttia"
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:40
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
+msgid "_Close"
+msgstr "_Sulje"
 
-#~ msgid "10 minutes"
-#~ msgstr "10 minuuttia"
+#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
+#: ui/evolution.xml.h:27
+msgid "_Contact (FIXME)"
+msgstr "_Kontakti"
 
-#~ msgid "12 hour (am/pm)"
-#~ msgstr "12 tuntia (am/pm)"
+#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
+msgid "_Copy"
+msgstr "_Kopioi"
 
-#~ msgid "15 minutes"
-#~ msgstr "15 minuuttia"
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:68
+msgid "_Debug"
+msgstr ""
 
-#~ msgid "24 hour"
-#~ msgstr "24 tuntia"
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:45
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
+msgid "_Help"
+msgstr "_Apua"
 
-#~ msgid "30 minutes"
-#~ msgstr "30 minuuttia"
+#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
+msgid "_Item (FIXME)"
+msgstr ""
 
-#~ msgid "60 minutes"
-#~ msgstr "60 minuuttia"
+#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
+msgid "_Journal Entry (FIXME)"
+msgstr ""
 
-#~ msgid "Calendar"
-#~ msgstr "Kalenteri"
+#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
+msgid "_Last Item in Folder (FIXME)"
+msgstr ""
 
-#~ msgid "Calendar Preferences"
-#~ msgstr "Kalenterin asetukset"
+#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
+msgid "_Mail Message (FIXME)"
+msgstr ""
 
-#~ msgid "Colors"
-#~ msgstr "Värit"
+#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
+msgid "_Move to Folder... (FIXME)"
+msgstr "_Siirrä kansioon..."
 
-#~ msgid "Compress weekends"
-#~ msgstr "Tiivistä viikonloput"
+#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
+msgid "_Note (FIXME)"
+msgstr ""
 
-#~ msgid "Defaults"
-#~ msgstr "Oletukset"
+#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
+msgid "_Paste"
+msgstr "L_iitä"
 
-#~ msgid "End of day:"
-#~ msgstr "Päivän loppu:"
+#: 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"
 
-#~ msgid "Pick a color"
-#~ msgstr "Valitse väri"
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-task-editor-dialog.xml.h:83
+msgid "_Properties..."
+msgstr "_Ominaisuudet..."
 
-#~ msgid "Show"
-#~ msgstr "Näytä"
+#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
+msgid "_Select All"
+msgstr "Valitse k_aikki"
 
-#~ msgid "Show week numbers"
-#~ msgstr "Näytä viikkonumerot"
+#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
+#: ui/evolution.xml.h:40
+msgid "_Task (FIXME)"
+msgstr "_Tehtävä"
 
-#~ msgid "Start of day:"
-#~ msgstr "Päivän alku:"
+#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
+msgid "_Unread Item (FIXME)"
+msgstr ""
 
-#~ msgid "Work week"
-#~ msgstr "Työviikko"
+#: ui/evolution-executive-summary.xml.h:1
+msgid "Add Service"
+msgstr "Lisää palvelu"
 
-#~ msgid "minutes before they occur."
-#~ msgstr "minuuttia niitä ennen."
+#: ui/evolution-executive-summary.xml.h:2
+msgid "Add a new service to the Executive Summary"
+msgstr ""
 
-#~ msgid "seconds."
-#~ msgstr "sekuntia."
+#: ui/evolution-executive-summary.xml.h:3
+msgid "Create a new email"
+msgstr "Luo uusi sähköposti"
 
-#~ msgid "C_lassification:"
-#~ msgstr "_Luokitus"
+#: ui/evolution-executive-summary.xml.h:4
+msgid "Executive Summary Settings..."
+msgstr ""
 
-#~ msgid "High"
-#~ msgstr "Korkea"
+#: ui/evolution-executive-summary.xml.h:5
+msgid "New Mail"
+msgstr "Uusi sähköposti"
 
-#~ msgid "Low"
-#~ msgstr "Matala"
+#: ui/evolution-mail.xml.h:2
+msgid "Compose"
+msgstr "Kirjoita"
 
-#~ msgid "Normal"
-#~ msgstr "Tavallinen"
+#: ui/evolution-mail.xml.h:3
+msgid "Compose a new message"
+msgstr "Kirjoita uusi viesti"
 
-#~ msgid "Task"
-#~ msgstr "Tehtävä"
+#: ui/evolution-mail.xml.h:5
+msgid "Copy message to a new folder"
+msgstr "Kopioi viesti uuteen kansioon"
 
-#~ msgid "_Contacts..."
-#~ msgstr "_Kontaktit..."
+#: ui/evolution-mail.xml.h:6
+msgid "Create _Virtual Folder From Message"
+msgstr ""
 
-#~ msgid "_Priority:"
-#~ msgstr "_Prioriteetti:"
+#: ui/evolution-mail.xml.h:9
+msgid "Display all of the message headers"
+msgstr ""
 
-#~ msgid "A_ll day event"
-#~ msgstr "_Koko päivän kestävä tapahtuma"
+#: ui/evolution-mail.xml.h:10
+msgid "Empty Trash"
+msgstr ""
 
-#~ msgid "Days"
-#~ msgstr "Päivää"
+#: ui/evolution-mail.xml.h:11
+msgid "Filter on Se_nder"
+msgstr ""
 
-#~ msgid "Every"
-#~ msgstr "Joka"
+#: ui/evolution-mail.xml.h:12
+msgid "Filter on _Recipients"
+msgstr ""
 
-#~ msgid "Exceptions"
-#~ msgstr "Poikkeukset"
+#: ui/evolution-mail.xml.h:13
+msgid "Filter on _Subject"
+msgstr ""
 
-#~ msgid "Hours"
-#~ msgstr "Tuntia"
+#: ui/evolution-mail.xml.h:14
+msgid "Forget _Passwords"
+msgstr ""
 
-#~ msgid "Minutes"
-#~ msgstr "Minuuttia"
+#: ui/evolution-mail.xml.h:16
+msgid "Forward As"
+msgstr ""
 
-#~ msgid "Modify"
-#~ msgstr "Muuta"
+#: ui/evolution-mail.xml.h:18
+msgid "Full Headers"
+msgstr ""
 
-#~ msgid "Pri_vate"
-#~ msgstr "Y_ksityinen"
+#: ui/evolution-mail.xml.h:19
+msgid "Hide S_elected Messages"
+msgstr ""
 
-#~ msgid "Pu_blic"
-#~ msgstr "Y_leinen"
+#: ui/evolution-mail.xml.h:20
+msgid "Hide _Deleted Messages"
+msgstr ""
 
-#~ msgid "Time"
-#~ msgstr "Aika"
+#: ui/evolution-mail.xml.h:21
+msgid "Hide _Read messages"
+msgstr "Piilota _luetut viestit"
 
-#~ msgid "_Confidential"
-#~ msgstr "_Luottamuksellinen"
+#: ui/evolution-mail.xml.h:22
+msgid "Inline"
+msgstr ""
 
-#~ msgid "_Contacts"
-#~ msgstr "_Kontaktit"
+#: ui/evolution-mail.xml.h:23
+msgid "Manage _Subscriptions..."
+msgstr ""
 
-#~ msgid "_Starting date:"
-#~ msgstr "_Alkamispäivä:"
+#: ui/evolution-mail.xml.h:24
+msgid "Mar_k as Read"
+msgstr "Merkitse _luetuksi"
 
-#~ msgid "File name:"
-#~ msgstr "Tiedostonimi:"
+#: ui/evolution-mail.xml.h:25
+msgid "Mark All as R_ead"
+msgstr "Merkitse ka_ikki luetuksi"
 
-#~ msgid "Incoming"
-#~ msgstr "Tulevat"
+#: ui/evolution-mail.xml.h:26
+msgid "Mark as U_nread"
+msgstr "Merkitse luke_mattomaksi"
 
-#~ msgid "Outgoing"
-#~ msgstr "Lähtevät"
+#: ui/evolution-mail.xml.h:27
+msgid "Message _Display"
+msgstr ""
 
-#~ msgid "Save"
-#~ msgstr "Tallenna"
+#: ui/evolution-mail.xml.h:28
+msgid "Move"
+msgstr "Siirrä"
 
-#~ msgid "Show all hidden"
-#~ msgstr "Näytä kaikki piilotetut"
+#: ui/evolution-mail.xml.h:29
+msgid "Move message to a new folder"
+msgstr "Siirrä viesti uuteen kansioon"
 
-#~ msgid "Hide selected"
-#~ msgstr "Piilota valitut"
+#: ui/evolution-mail.xml.h:33
+msgid "Print message to the printer"
+msgstr "Tulosta viesti tulostimella"
 
-#~ msgid "Hide read"
-#~ msgstr "Piilota luetut"
+#: ui/evolution-mail.xml.h:36
+msgid "Quoted"
+msgstr ""
 
-#~ msgid "Hide deleted"
-#~ msgstr "Piilota poistetut"
+#: ui/evolution-mail.xml.h:37
+msgid "Redirect (FIXME: implement me)"
+msgstr ""
 
-#~ msgid "Hide Subject"
-#~ msgstr "Piilota aihe"
+#: ui/evolution-mail.xml.h:40
+msgid "Reply to _All"
+msgstr "Vastaa _kaikille"
 
-#~ msgid "Hide Messages"
-#~ msgstr "Piilota viestit"
+#: ui/evolution-mail.xml.h:43
+msgid "S_ource"
+msgstr "_Lähde"
 
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Piilota aihe \"%s\""
+#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
+msgid "Select _All"
+msgstr "Valitse _kaikki"
 
-#~ msgid "Authentication"
-#~ msgstr "Todentaminen"
+#: ui/evolution-mail.xml.h:45
+msgid "Select _Thread"
+msgstr ""
 
-#~ msgid "Authentication Type:"
-#~ msgstr "Todentamistyyppi:"
+#: ui/evolution-mail.xml.h:46
+msgid "Send and Receive"
+msgstr ""
 
-#~ msgid "E-Mail Address:"
-#~ msgstr "Sähköpostiosoite:"
+#: ui/evolution-mail.xml.h:47
+msgid "Send queued mail and retrieve new mail"
+msgstr ""
 
-#~ msgid "Email Address:"
-#~ msgstr "Sähköpostiosoite:"
+#: ui/evolution-mail.xml.h:48
+msgid "Show _All"
+msgstr "Näytä k_aikki"
 
-#~ msgid "Full Name:"
-#~ msgstr "Koko nimi:"
+#: ui/evolution-mail.xml.h:50
+msgid "Threaded Message list"
+msgstr ""
 
-#~ msgid "Hostname:"
-#~ msgstr "Isännän nimi:"
+#: ui/evolution-mail.xml.h:51
+msgid "VFolder on Se_nder"
+msgstr ""
 
-#~ msgid "Kerberos"
-#~ msgstr "Kerberos"
+#: ui/evolution-mail.xml.h:52
+msgid "VFolder on _Recipients"
+msgstr ""
 
-#~ msgid "Organization:"
-#~ msgstr "Organisaatio:"
+#: ui/evolution-mail.xml.h:53
+msgid "VFolder on _Subject"
+msgstr ""
 
-#~ msgid "Password:"
-#~ msgstr "Salasana:"
+#: ui/evolution-mail.xml.h:54
+msgid "View Raw Message Source"
+msgstr ""
 
-#~ msgid "SMTP"
-#~ msgstr "SMTP"
+#: ui/evolution-mail.xml.h:55
+msgid "Virtual Folder _Editor..."
+msgstr ""
 
-#~ msgid "Save password"
-#~ msgstr "Tallenna salasana"
+#: ui/evolution-mail.xml.h:56
+msgid "_Actions"
+msgstr "T_oiminnot"
 
-#~ msgid "Select signature file"
-#~ msgstr "Valitse allekirjoitustiedosto"
+#: ui/evolution-mail.xml.h:57
+msgid "_Apply Filters"
+msgstr ""
 
-#~ msgid "Server Configuration"
-#~ msgstr "Palvelimen asetukset"
+#: ui/evolution-mail.xml.h:58
+msgid "_Compose"
+msgstr "_Kirjoita"
 
-#~ msgid "Server Type: "
-#~ msgstr "Palvelintyyppi: "
+#: ui/evolution-mail.xml.h:59
+msgid "_Copy to Folder..."
+msgstr "_Kopioi kansioon..."
 
-#~ msgid "Server requires authentication"
-#~ msgstr "Palvelin vaati todennuksen"
+#: ui/evolution-mail.xml.h:60
+msgid "_Create Filter From Message"
+msgstr ""
 
-#~ msgid "Servers"
-#~ msgstr "Palvelimet"
+#: ui/evolution-mail.xml.h:62
+msgid "_Expunge"
+msgstr ""
 
-#~ msgid "Signature file:"
-#~ msgstr "Allekirjoitustiedosto:"
+#: ui/evolution-mail.xml.h:63
+msgid "_Filters..."
+msgstr "_Suodattimet..."
 
-#~ msgid "Sources"
-#~ msgstr "Lähteet"
+#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
+msgid "_Folder"
+msgstr "_Kansio"
 
-#~ msgid "This server requires a secure connection (SSL)"
-#~ msgstr "Tämä palvelin vaatii turvatun yhteyden (SSL)"
+#: ui/evolution-mail.xml.h:65
+msgid "_Forward"
+msgstr ""
 
-#~ msgid "Type"
-#~ msgstr "Tyyppi"
+#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr ""
 
-#~ msgid ""
-#~ "Type the name by which you would like to refer to these servers. For "
-#~ "example: \"Work\" or \"Home\"."
-#~ msgstr ""
-#~ "Anna nimi jolla haluat viitata näihin palvelimiin. Esimerkiksi \"Työ\" tai "
-#~ "\"Koti\"."
+#: ui/evolution-mail.xml.h:67
+msgid "_Mail Message"
+msgstr ""
 
-#~ msgid "User Information"
-#~ msgstr "Käyttäjätiedot"
+#: ui/evolution-mail.xml.h:68
+msgid "_Mail Settings..."
+msgstr ""
 
-#~ msgid "Username:"
-#~ msgstr "Käyttäjänimi:"
+#: ui/evolution-mail.xml.h:69
+msgid "_Message Hiding"
+msgstr ""
 
-#~ msgid "minute(s)"
-#~ msgstr "minuutti(a)"
+#: ui/evolution-mail.xml.h:70
+msgid "_Move to Folder..."
+msgstr "_Siirrä kansioon..."
 
-#~ msgid ""
-#~ "Enter your name and email address to be used in outgoing mail. You may also, "
-#~ "optionally, enter the name of your organization, and the name of a file to "
-#~ "read your signature from."
-#~ msgstr ""
-#~ "Anna nimi ja sähköpostiosoite, joita käytetään lähtevässä postissa. Voit "
-#~ "myös halutessasi antaa organisaatiosi nimen, sekä tiedostonimen, josta "
-#~ "allekirjoituksesi luetaan."
+#: ui/evolution-mail.xml.h:71
+msgid "_Open Selected Items"
+msgstr ""
 
-#~ msgid "Full name:"
-#~ msgstr "Koko nimi:"
+#: ui/evolution-mail.xml.h:74
+msgid "_Send and Receive"
+msgstr ""
 
-#~ msgid "Email address:"
-#~ msgstr "Sähköpostiosoite:"
+#: ui/evolution-mail.xml.h:75
+msgid "_Threaded"
+msgstr ""
 
-#~ msgid "Signature File"
-#~ msgstr "Allekirjoitustiedosto"
+#: ui/evolution-mail.xml.h:77
+msgid "_Undelete"
+msgstr "_Palauta"
 
-#~ msgid "Server:"
-#~ msgstr "Palvelin:"
+#: ui/evolution-message-composer.xml.h:1
+msgid "Attach"
+msgstr "Liitä"
 
-#~ msgid "Detect supported types..."
-#~ msgstr "Etsi tuettuja tyyppejä..."
+#: ui/evolution-message-composer.xml.h:4
+#: ui/evolution-task-editor-dialog.xml.h:12
+msgid "Close the current file"
+msgstr "Sulje nykyinen tiedosto"
 
-#~ msgid "Don't delete messages from server"
-#~ msgstr "Älä poista viestejä palvelimelta"
+#: ui/evolution-message-composer.xml.h:5
+msgid "Encrypt this message with PGP"
+msgstr "Salaa tämä viesti PGP:llä"
 
-#~ msgid "Test Settings"
-#~ msgstr "Kokeile asetuksia"
+#: ui/evolution-message-composer.xml.h:6
+msgid "F_ormat"
+msgstr ""
 
-#~ msgid "Add Source"
-#~ msgstr "Lisää lähde"
+#: ui/evolution-message-composer.xml.h:7
+msgid "HTML"
+msgstr "HTML"
 
-#~ msgid "Edit Source"
-#~ msgstr "Muokkaa lähdettä"
+#: ui/evolution-message-composer.xml.h:8
+msgid "Insert a file as text into the message"
+msgstr "Liitä tiedosto viestiin tekstinä"
 
-#~ msgid "Add News Server"
-#~ msgstr "Lisää uutispalvelin"
+#: ui/evolution-message-composer.xml.h:9
+msgid "Insert text file..."
+msgstr "Liitä tekstitiedosto..."
 
-#~ msgid "Edit News Server"
-#~ msgstr "Muokkaa uutispalvelinta"
+#: ui/evolution-message-composer.xml.h:11
+msgid "Open a file"
+msgstr "Avaa tiedosto"
 
-#~ msgid "Testing \"%s\""
-#~ msgstr "Kokeillaan: \"%s\""
+#: ui/evolution-message-composer.xml.h:12
+msgid "PGP Encrypt"
+msgstr "PGP-salaus"
 
-#~ msgid "The connection was successful!"
-#~ msgstr "Yhdistäminen onnistui!"
+#: ui/evolution-message-composer.xml.h:13
+msgid "PGP Sign"
+msgstr "PGP-allekirjoitus"
 
-#~ msgid "Address"
-#~ msgstr "Osoite"
+#: ui/evolution-message-composer.xml.h:17
+msgid "Save _Draft"
+msgstr ""
 
-#~ msgid "Mark message as seen [ms]: "
-#~ msgstr "Merkitse viesti nähdyksi [ms]: "
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save in _folder... (FIXME)"
+msgstr "Tallenna _kansioon..."
 
-#~ msgid "News Servers"
-#~ msgstr "Uutispalvelimet"
+#: ui/evolution-message-composer.xml.h:19
+msgid "Save in folder..."
+msgstr "Tallenna kansioon..."
 
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Lähetä viestit HTML-muodossa"
+#: ui/evolution-message-composer.xml.h:21
+msgid "Save the current file with a different name"
+msgstr "Tallenna tiedosto uudella nimellä"
 
-#~ msgid "No GPG/PGP support available in this copy of Evolution."
-#~ msgstr "Tässä Evolutionin versiossa ei ole GPG/PGP-tukea."
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save the message in a specified folder"
+msgstr "Tallenna viesti johonkin tiettyyn kansioon"
 
-#~ msgid "Delete a contact"
-#~ msgstr "Poista kontakti"
+#: ui/evolution-message-composer.xml.h:23
+msgid "Send"
+msgstr "Lähetä"
 
-#~ msgid "Find"
-#~ msgstr "Etsi"
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send _Later"
+msgstr "Lähetä _myöhemmin"
 
-#~ msgid "Find a contact"
-#~ msgstr "Etsi kontakti"
+#: ui/evolution-message-composer.xml.h:25
+msgid "Send _later"
+msgstr "Lähetä _myöhemmin"
 
-#~ msgid "Print contacts"
-#~ msgstr "Tulosta kontaktit"
+#: ui/evolution-message-composer.xml.h:26
+msgid "Send the mail in HTML format"
+msgstr "Lähetä viesti HTML-muodossa"
 
-#~ msgid "Stop"
-#~ msgstr "Pysäytä"
+#: ui/evolution-message-composer.xml.h:27
+msgid "Send the message later"
+msgstr "Lähetä viesti myöhemmin"
 
-#~ msgid "Stop Loading"
-#~ msgstr "Pysäytä lataaminen"
+#: ui/evolution-message-composer.xml.h:28
+msgid "Send the message now"
+msgstr "Lähetä viesti heti"
 
-#~ msgid "View All"
-#~ msgstr "Näytä kaikki"
+#: ui/evolution-message-composer.xml.h:29
+msgid "Send this message now"
+msgstr "Lähetä viesti heti"
 
-#~ msgid "View all contacts"
-#~ msgstr "Näytä kaikki kontaktit"
+#: ui/evolution-message-composer.xml.h:30
+msgid "Show / hide attachments"
+msgstr "Näytä / piilota liitetiedostot"
 
-#~ msgid "_Print Contacts..."
-#~ msgstr "_Tulosta kontaktit..."
+#: ui/evolution-message-composer.xml.h:31
+msgid "Show _attachments"
+msgstr "Näytä _liitteet"
 
-#~ msgid "_Search for contacts"
-#~ msgstr "_Etsi kontakteja"
+#: ui/evolution-message-composer.xml.h:32
+msgid "Show attachments"
+msgstr "Näytä liitteet"
 
-#~ msgid "5 Days"
-#~ msgstr "5 päivää"
+#: ui/evolution-message-composer.xml.h:33
+msgid "Sign this message with your PGP key"
+msgstr "Allekirjoita viesti PGP-avaimellasi"
 
-#~ msgid "Alter preferences"
-#~ msgstr "Muuta asetuksia"
+#: ui/evolution-message-composer.xml.h:34
+msgid "Toggles whether the BCC field is displayed"
+msgstr ""
 
-#~ msgid "Ca_lendar"
-#~ msgstr "_Kalenteri"
+#: ui/evolution-message-composer.xml.h:35
+msgid "Toggles whether the CC field is displayed"
+msgstr ""
 
-#~ msgid "Calendar Preferences..."
-#~ msgstr "Kalenterin asetukset..."
+#: ui/evolution-message-composer.xml.h:36
+msgid "Toggles whether the From chooser is displayed"
+msgstr ""
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Luo uusi tapaaminen"
+#: ui/evolution-message-composer.xml.h:38
+msgid "_Bcc Field"
+msgstr ""
 
-#~ msgid "Create a new calendar"
-#~ msgstr "Luo uusi kalenteri"
+#: ui/evolution-message-composer.xml.h:39
+msgid "_Cc Field"
+msgstr ""
 
-#~ msgid "Month"
-#~ msgstr "Kuukausi"
+#: ui/evolution-message-composer.xml.h:44
+msgid "_From Field"
+msgstr ""
 
-#~ msgid "Open a calendar"
-#~ msgstr "Avaa kalenteri"
+#: ui/evolution-message-composer.xml.h:46
+msgid "_Insert"
+msgstr "Li_sää"
 
-#~ msgid "Print this calendar"
-#~ msgstr "Tulosta tämä kalenteri"
+#: ui/evolution-message-composer.xml.h:47
+msgid "_Insert text file... (FIXME)"
+msgstr "_Liitä tekstitiedosto..."
 
-#~ msgid "Show 1 day"
-#~ msgstr "Näytä 1 päivä"
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Open..."
+msgstr "_Avaa..."
 
-#~ msgid "Show 1 month"
-#~ msgstr "Näytä 1 kuukausi"
+#: ui/evolution-message-composer.xml.h:50
+msgid "_Security"
+msgstr "_Turvallisuus"
 
-#~ msgid "Show 1 week"
-#~ msgstr "Näytä 1 viikko"
+#: ui/evolution-subscribe.xml.h:1
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
 
-#~ msgid "Show the working week"
-#~ msgstr "Näytä työviikko"
+#: ui/evolution-subscribe.xml.h:3
+msgid "F_older"
+msgstr "_Kansio"
 
-#~ msgid "Week"
-#~ msgstr "Viikko"
+#: ui/evolution-subscribe.xml.h:4
+msgid "Refresh List"
+msgstr ""
 
-#~ msgid "_New"
-#~ msgstr "_Uusi"
+#: ui/evolution-subscribe.xml.h:5
+msgid "Refresh List of Folders"
+msgstr ""
 
-#~ msgid "_Open Calendar"
-#~ msgstr "_Avaa kalenteri"
+#: ui/evolution-subscribe.xml.h:6
+msgid "Remove folder from your list of subscribed folders"
+msgstr ""
 
-#~ msgid "_Print this calendar"
-#~ msgstr "_Tulosta tämä kalenteri"
+#: ui/evolution-subscribe.xml.h:8
+msgid "Subscribe"
+msgstr "Tilaa"
 
-#~ msgid "_Save As..."
-#~ msgstr "Tallenna _nimellä..."
+#: ui/evolution-subscribe.xml.h:9
+msgid "Unsubscribe"
+msgstr "Poista tilaus"
 
-#~ msgid "Delete..."
-#~ msgstr "Poista..."
+#: ui/evolution-task-editor-dialog.xml.h:5
+msgid "Assig_n Task (FIXME)"
+msgstr ""
 
-#~ msgid "Help"
-#~ msgstr "Apua"
+#: ui/evolution-task-editor-dialog.xml.h:24
+msgid "Find Again"
+msgstr "Etsi uudelleen"
 
-#~ msgid "Print..."
-#~ msgstr "Tulosta..."
+#: ui/evolution-task-editor-dialog.xml.h:29
+msgid "Meeting Re_quest (FIXME)"
+msgstr ""
 
-#~ msgid "Save _As..."
-#~ msgstr "Tallenna _nimellä..."
+#: ui/evolution-task-editor-dialog.xml.h:43
+msgid "Redo"
+msgstr "Tee uudelleen"
 
-#~ msgid "Save and Close"
-#~ msgstr "Tallenna ja sulje"
+#: ui/evolution-task-editor-dialog.xml.h:44
+msgid "Redo the undone action"
+msgstr "Tee kumottu toiminto uudelleen"
 
-#~ msgid "Save the contact and close the dialog box"
-#~ msgstr "Tallenna kontakti ja sulje ikkuna"
+#: ui/evolution-task-editor-dialog.xml.h:45
+msgid "Replace"
+msgstr "Korvaa"
 
-#~ msgid "_File"
-#~ msgstr "_Tiedosto"
+#: ui/evolution-task-editor-dialog.xml.h:46
+msgid "Replace a string"
+msgstr "Korvaa merkkijono"
 
-#~ msgid "_Print..."
-#~ msgstr "T_ulosta..."
+#: ui/evolution-task-editor-dialog.xml.h:47
+msgid "Reply to A_ll (FIXME)"
+msgstr "Vastaa kaiki_lle"
 
-#~ msgid "_Save"
-#~ msgstr "_Tallenna"
+#: ui/evolution-task-editor-dialog.xml.h:48
+msgid "S_end Status Report (FIXME)"
+msgstr ""
 
-#~ msgid "About..."
-#~ msgstr "Tietoja..."
+#: ui/evolution-task-editor-dialog.xml.h:49
+msgid "S_kip Occurrence (FIXME)"
+msgstr ""
 
-#~ msgid "C_ut"
-#~ msgstr "L_eikkaa"
+#: ui/evolution-task-editor-dialog.xml.h:54
+msgid "Save the task and close the dialog box"
+msgstr "Tallenna tehtävä ja sulje ikkuna"
 
-#~ msgid "Close this appointment"
-#~ msgstr "Sulje tämä tapaaminen"
+#: ui/evolution-task-editor-dialog.xml.h:55
+msgid "Search again for the same string"
+msgstr "Etsi uudelleen samaa merkkijonoa"
 
-#~ msgid "Copy"
-#~ msgstr "Kopioi"
+#: ui/evolution-task-editor-dialog.xml.h:56
+msgid "Search for a string"
+msgstr "Etsi merkkijonoa"
 
-#~ msgid "Copy the selection"
-#~ msgstr "Kopioi valinta"
+#: ui/evolution-task-editor-dialog.xml.h:61
+msgid "Undo"
+msgstr "Kumoa"
 
-#~ msgid "Cut"
-#~ msgstr "Leikkaa"
+#: ui/evolution-task-editor-dialog.xml.h:62
+msgid "Undo the last action"
+msgstr "Kumoa edellinen toiminto"
 
-#~ msgid "Cut the selection"
-#~ msgstr "Leikkaa valinta"
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
+msgid "_Appointment (FIXME)"
+msgstr "_Tapaaminen"
 
-#~ msgid "Find Again"
-#~ msgstr "Etsi uudelleen"
+#: ui/evolution-task-editor-dialog.xml.h:77
+msgid "_Mark Complete (FIXME)"
+msgstr ""
 
-#~ msgid "Find _Again"
-#~ msgstr "Etsi uude_lleen"
+#: ui/evolution-task-editor-dialog.xml.h:84
+msgid "_Reply (FIXME)"
+msgstr "_Vastaa"
 
-#~ msgid "Paste"
-#~ msgstr "Liitä"
+#: ui/evolution-tasks.xml.h:2
+msgid "Create a new task"
+msgstr "Luo uusi tehtävä"
 
-#~ msgid "Paste the clipboard"
-#~ msgstr "Liitä leikepöytä"
+#: ui/evolution-tasks.xml.h:3
+msgid "New Task"
+msgstr "Uusi tehtävä"
 
-#~ msgid "Print S_etup..."
-#~ msgstr "Tulost_usasetukset"
+#: ui/evolution-tasks.xml.h:5
+msgid "Save task as something else"
+msgstr ""
 
-#~ msgid "Print Setup"
-#~ msgstr "Tulostusasetukset"
+#: ui/evolution-tasks.xml.h:6
+msgid "Tasks Preferences..."
+msgstr ""
 
-#~ msgid "Redo"
-#~ msgstr "Tee uudelleen"
+#: ui/evolution-tasks.xml.h:9
+msgid "_Task"
+msgstr "_Tehtävä"
 
-#~ msgid "Redo the undone action"
-#~ msgstr "Tee kumottu toiminto uudelleen"
+#: ui/evolution.xml.h:1
+msgid "About Evolution..."
+msgstr "Tietoja Evolutionista..."
 
-#~ msgid "Replace"
-#~ msgstr "Korvaa"
+#: ui/evolution.xml.h:3
+msgid "Close this window"
+msgstr "Sulje tämä ikkuna"
 
-#~ msgid "Replace a string"
-#~ msgstr "Korvaa merkkijono"
+#: ui/evolution.xml.h:4
+msgid "Customi_ze Toolbars..."
+msgstr ""
 
-#~ msgid "Save the appointment and close the dialog box"
-#~ msgstr "Tallenna tapaaminen ja sulje tapaamisikkuna"
+#: ui/evolution.xml.h:5
+msgid "Customize"
+msgstr ""
 
-#~ msgid "Save the current file"
-#~ msgstr "Tallenna nykyinen tiedosto"
+#: ui/evolution.xml.h:6
+msgid "Customize toolbars"
+msgstr ""
 
-#~ msgid "Search again for the same string"
-#~ msgstr "Etsi uudelleen samaa merkkijonoa"
+#: ui/evolution.xml.h:7
+msgid "Display a different folder"
+msgstr ""
 
-#~ msgid "Search for a string"
-#~ msgstr "Etsi merkkijonoa"
+#: ui/evolution.xml.h:8
+msgid "E_xit"
+msgstr "_Poistu"
 
-#~ msgid "Select All"
-#~ msgstr "Valitse kaikki"
+#: ui/evolution.xml.h:9
+msgid "Evolution bar _shortcut"
+msgstr ""
 
-#~ msgid "Select everything"
-#~ msgstr "Merkitsee kaikki valituksi"
+#: ui/evolution.xml.h:10
+msgid "Exit the program"
+msgstr "Poistu ohjelmasta"
 
-#~ msgid "Setup the page settings for your current printer"
-#~ msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
+#: ui/evolution.xml.h:11
+msgid "Getting _Started"
+msgstr ""
 
-#~ msgid "Undo"
-#~ msgstr "Kumoa"
+#: ui/evolution.xml.h:12
+msgid "Import an external file format"
+msgstr ""
 
-#~ msgid "Undo the last action"
-#~ msgstr "Kumoa edellinen toiminto"
+#: ui/evolution.xml.h:13
+msgid "Main toolbar"
+msgstr ""
 
-#~ msgid "_About..."
-#~ msgstr "_Tietoja..."
+#: ui/evolution.xml.h:14
+msgid "Show information about Evolution"
+msgstr ""
 
-#~ msgid "_Copy"
-#~ msgstr "_Kopioi"
+#: ui/evolution.xml.h:15
+msgid "Submit Bug Report"
+msgstr ""
 
-#~ msgid "_Edit"
-#~ msgstr "_Muokkaa"
+#: ui/evolution.xml.h:16
+msgid "Submit _Bug Report"
+msgstr ""
 
-#~ msgid "_Find..."
-#~ msgstr "_Etsi..."
+#: ui/evolution.xml.h:17
+msgid "Submit bug report using Bug Buddy."
+msgstr ""
 
-#~ msgid "_Help"
-#~ msgstr "_Apua"
+#: ui/evolution.xml.h:18
+msgid "Toggle whether to show the folder bar"
+msgstr ""
 
-#~ msgid "_Paste"
-#~ msgstr "L_iitä"
+#: ui/evolution.xml.h:19
+msgid "Toggle whether to show the shortcut bar"
+msgstr ""
 
-#~ msgid "_Print"
-#~ msgstr "_Tulosta"
+#: ui/evolution.xml.h:20
+msgid "Using the C_ontact Manager"
+msgstr ""
 
-#~ msgid "_Replace..."
-#~ msgstr "_Korvaa..."
+#: ui/evolution.xml.h:21
+msgid "Using the _Calendar"
+msgstr ""
 
-#~ msgid "Hide _Deleted messages"
-#~ msgstr "Piilota _poistetut viestit"
+#: ui/evolution.xml.h:22
+msgid "Using the _Mailer"
+msgstr ""
 
-#~ msgid "Hide _Read messages"
-#~ msgstr "Piilota _luetut viestit"
+#: ui/evolution.xml.h:23
+msgid "Work Offline"
+msgstr ""
 
-#~ msgid "Hide _Selected messages"
-#~ msgstr "Piilota _valitut viestit"
+#: ui/evolution.xml.h:24
+msgid "_About Evolution..."
+msgstr "_Tietoja Evolutionista..."
 
-#~ msgid "Mark As U_nread"
-#~ msgstr "Merkitse _lukemattomaksi"
+#: ui/evolution.xml.h:31
+msgid "_Folder Bar"
+msgstr ""
 
-#~ msgid "Move"
-#~ msgstr "Siirrä"
+#: ui/evolution.xml.h:32
+msgid "_Go to Folder..."
+msgstr "_Siirry kansioon..."
 
-#~ msgid "Previews the message to be printed"
-#~ msgstr "Esikatsele tulostettavaa viestiä"
+#: ui/evolution.xml.h:34
+msgid "_Import file..."
+msgstr ""
 
-#~ msgid "Print Preview of message..."
-#~ msgstr "Viestin tulostuksen esikatselu..."
+#: ui/evolution.xml.h:35
+msgid "_Index"
+msgstr ""
 
-#~ msgid "Print message..."
-#~ msgstr "Tulosta viesti..."
+#: ui/evolution.xml.h:36
+msgid "_Mail message"
+msgstr ""
 
-#~ msgid "Reply to _All"
-#~ msgstr "Vastaa _Kaikille"
+#: ui/evolution.xml.h:38
+msgid "_New Folder"
+msgstr "_Uusi kansio"
 
-#~ msgid "Reply to _Sender"
-#~ msgstr "Vastaa _Lähettäjälle"
+#: ui/evolution.xml.h:39
+msgid "_Shortcut Bar"
+msgstr ""
 
-#~ msgid "Select _All"
-#~ msgstr "Valitse _kaikki"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
 
-#~ msgid "Show _All messages"
-#~ msgstr "Näytä _kaikki viestit"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr ""
 
-#~ msgid "_Copy to Folder..."
-#~ msgstr "_Kopioi kansioon..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr ""
 
-#~ msgid "_Edit Message"
-#~ msgstr "_Muokkaa viestiä"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr ""
 
-#~ msgid "_Message"
-#~ msgstr "_Viesti"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr ""
 
-#~ msgid "_Move to Folder..."
-#~ msgstr "_Siirrä kansioon..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_Asetukset"
 
-#~ msgid "_Print Message"
-#~ msgstr "_Tulosta viesti"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr ""
 
-#~ msgid "_Save Message As..."
-#~ msgstr "Tallenna _viesti nimellä..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr ""
 
-#~ msgid "_Undelete"
-#~ msgstr "_Palauta"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr ""
 
-#~ msgid "Attach"
-#~ msgstr "Liitä"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+msgid "_<<"
+msgstr "_<<"
 
-#~ msgid "Close the current file"
-#~ msgstr "Sulje nykyinen tiedosto"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+msgid "_Autopick"
+msgstr ""
 
-#~ msgid "Encrypt this message with PGP"
-#~ msgstr "Salaa tämä viesti PGP:llä"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
+msgstr ">_>"
 
-#~ msgid "HTML"
-#~ msgstr "HTML"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+msgid "_All People and Resources"
+msgstr ""
 
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Liitä tiedosto viestiin tekstinä"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr ""
 
-#~ msgid "Insert text file..."
-#~ msgstr "Liitä tekstitiedosto..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr ""
 
-#~ msgid "Open a file"
-#~ msgstr "Avaa tiedosto"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr ""
 
-#~ msgid "PGP Encrypt"
-#~ msgstr "PGP-salaus"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr ""
 
-#~ msgid "PGP Sign"
-#~ msgstr "PGP-allekirjoitus"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr ""
 
-#~ msgid "Save As"
-#~ msgstr "Tallenna nimellä..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr ""
 
-#~ msgid "Save in _folder... (FIXME)"
-#~ msgstr "Tallenna _kansioon..."
+#. 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
+msgid "MTWTFSS"
+msgstr ""
 
-#~ msgid "Save in folder..."
-#~ msgstr "Tallenna kansioon..."
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
+msgid "%B %Y"
+msgstr ""
 
-#~ msgid "Save the current file with a different name"
-#~ msgstr "Tallenna tiedosto uudella nimellä"
+#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "Nyt"
 
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Tallenna viesti johonkin tiettyyn kansioon"
+#: widgets/misc/e-cell-date-edit.c:239
+msgid "OK"
+msgstr ""
 
-#~ msgid "Send"
-#~ msgstr "Lähetä"
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr ""
 
-#~ msgid "Send _Later"
-#~ msgstr "Lähetä _myöhemmin"
+#. strftime format of a time in 24-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:460
+msgid "%H:%M:%S"
+msgstr ""
 
-#~ msgid "Send _later"
-#~ msgstr "Lähetä _myöhemmin"
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
+msgstr ""
 
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "Lähetä viesti HTML-muodossa"
+#. strftime format of a time in 12-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:469
+msgid "%I:%M:%S %p"
+msgstr ""
 
-#~ msgid "Send the message later"
-#~ msgstr "Lähetä viesti myöhemmin"
+#. FIXME: Better message needed.
+#: widgets/misc/e-cell-date-edit.c:736
+msgid "The time is invalid"
+msgstr ""
 
-#~ msgid "Send the message now"
-#~ msgstr "Lähetä viesti heti"
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
 
-#~ msgid "Send this message now"
-#~ msgstr "Lähetä viesti heti"
+#: widgets/misc/e-filter-bar.c:134
+msgid "Save Search"
+msgstr "Tallenna haku"
 
-#~ msgid "Show / hide attachments"
-#~ msgstr "Näytä / piilota liitetiedostot"
+#: widgets/misc/e-filter-bar.c:205
+msgid "Advanced Search"
+msgstr "Edistynyt haku"
 
-#~ msgid "Show _attachments"
-#~ msgstr "Näytä _liitteet"
+#: widgets/misc/e-filter-bar.c:285
+msgid "Advanced ..."
+msgstr "Edistynyt ..."
 
-#~ msgid "Sign this message with your PGP key"
-#~ msgstr "Allekirjoita viesti PGP-avaimellasi"
+#: widgets/misc/e-messagebox.c:141
+msgid "Information"
+msgstr ""
 
-#~ msgid "_Insert text file... (FIXME)"
-#~ msgstr "_Liitä tekstitiedosto..."
+#: widgets/misc/e-messagebox.c:148
+msgid "Warning"
+msgstr ""
 
-#~ msgid "_Open..."
-#~ msgstr "_Avaa..."
+#: widgets/misc/e-messagebox.c:162
+msgid "Question"
+msgstr "Kysymys"
 
-#~ msgid "_Security"
-#~ msgstr "_Turvallisuus"
+#: widgets/misc/e-messagebox.c:169
+msgid "Message"
+msgstr "Viesti"
 
-#~ msgid "Subscribe"
-#~ msgstr "Tilaa"
+#. Add the "Don't show this message again." checkbox
+#: widgets/misc/e-messagebox.c:213
+msgid "Don't show this message again."
+msgstr ""
 
-#~ msgid "Unsubscribe"
-#~ msgstr "Poista tilaus"
+#: widgets/misc/e-search-bar.c:140
+msgid "Sear_ch"
+msgstr ""
 
-#~ msgid "E_xit"
-#~ msgstr "_Poistu"
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
+msgid "The Personal Addressbook Server"
+msgstr ""
 
-#~ msgid "Exit the program"
-#~ msgstr "Poistu ohjelmasta"
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+msgid "The Personal Calendar Server; calendar factory"
+msgstr ""
 
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "_Tapaaminen"
+#: wombat/wombat.c:153
+msgid "setup_vfs(): could not initialize GNOME-VFS"
+msgstr ""
 
-#~ msgid "_Contact (FIXME)"
-#~ msgstr "_Kontakti"
+#: wombat/wombat.c:165
+msgid "init_corba(): could not initialize GNOME"
+msgstr ""
 
-#~ msgid "_Go to Folder..."
-#~ msgstr "_Siirry kansioon..."
+#: wombat/wombat.c:178
+msgid "init_bonobo(): could not initialize Bonobo"
+msgstr "init_bonobo(): Bonobon alustus ei onnistunut"
 
-#~ msgid "_Settings"
-#~ msgstr "_Asetukset"
+#: evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
+msgstr ""