fi.po: Updated Finnish translation

svn path=/trunk/; revision=6349

2 files changed, 2605 insertions, 907 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 2242600e0a..cdbb43bf75 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-02  Jarkko Ranta  <jjranta@cc.joensuu.fi>
+
+	* fi.po: Updated Finnish translation.
+
 2000-11-02  Christian Rose  <menthos@menthos.com>
 
 	* sv.po: Updated Swedish translation.
diff --git a/po/fi.po b/po/fi.po
index c5ce44e9e3..db8a4701b7 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2000-10-20 08:05+0300\n"
+"POT-Creation-Date: 2000-11-02 11:28+0200\n"
 "PO-Revision-Date: 2000-09-13 15:00+0300\n"
 "Last-Translator: Jarkko Ranta <jjranta@cc.joensuu.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -13,14 +13,250 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/e-card.c:3044
+msgid "Card: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3046
+msgid ""
+"\n"
+"Name: "
+msgstr ""
+"\n"
+"Nimi: "
+
+#: addressbook/backend/ebook/e-card.c:3047
+msgid ""
+"\n"
+"  Prefix:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3048
+msgid ""
+"\n"
+"  Given:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3049
+msgid ""
+"\n"
+"  Additional: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3050
+msgid ""
+"\n"
+"  Family:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3051
+msgid ""
+"\n"
+"  Suffix:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3065
+msgid ""
+"\n"
+"Birth Date: "
+msgstr ""
+"\n"
+"Syntymäpäivä: "
+
+#: addressbook/backend/ebook/e-card.c:3076
+msgid ""
+"\n"
+"Address:"
+msgstr ""
+"\n"
+"Osoite:"
+
+#: addressbook/backend/ebook/e-card.c:3078
+msgid ""
+"\n"
+"  Postal Box:  "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3079
+msgid ""
+"\n"
+"  Ext:         "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3080
+msgid ""
+"\n"
+"  Street:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3081
+msgid ""
+"\n"
+"  City:        "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3082
+msgid ""
+"\n"
+"  Region:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3083
+msgid ""
+"\n"
+"  Postal Code: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3084
+msgid ""
+"\n"
+"  Country:     "
+msgstr ""
+"\n"
+"  Maa:     "
+
+#: addressbook/backend/ebook/e-card.c:3097
+msgid ""
+"\n"
+"Delivery Label: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3109
+msgid ""
+"\n"
+"Telephones:\n"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3112
+msgid ""
+"\n"
+"Telephone:"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3136
+msgid ""
+"\n"
+"E-mail:\n"
+msgstr ""
+"\n"
+"Sähköposti:\n"
+
+#: addressbook/backend/ebook/e-card.c:3139
+msgid ""
+"\n"
+"E-mail:"
+msgstr ""
+"\n"
+"Sähköposti:"
+
+#: addressbook/backend/ebook/e-card.c:3158
+msgid ""
+"\n"
+"Mailer: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3164
+msgid ""
+"\n"
+"Time Zone: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3172
+msgid ""
+"\n"
+"Geo Location: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3176
+msgid ""
+"\n"
+"Business Role: "
+msgstr ""
+"\n"
+"Työn kuvaus: "
+
+#: addressbook/backend/ebook/e-card.c:3188
+msgid ""
+"\n"
+"Org: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3189
+msgid ""
+"\n"
+"  Name:  "
+msgstr ""
+"\n"
+"  Nimi:  "
+
+#: addressbook/backend/ebook/e-card.c:3190
+msgid ""
+"\n"
+"  Unit:  "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3191
+msgid ""
+"\n"
+"  Unit2: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3192
+msgid ""
+"\n"
+"  Unit3: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3193
+msgid ""
+"\n"
+"  Unit4: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3197
+msgid ""
+"\n"
+"Categories: "
+msgstr ""
+"\n"
+"Kategoriat: "
+
+#: addressbook/backend/ebook/e-card.c:3198
+msgid ""
+"\n"
+"Comment: "
+msgstr ""
+
+#. if (crd->sound.prop.used) {
+#. if (crd->sound.type != SOUND_PHONETIC)
+#. addPropSizedValue (string, _ ("\nPronunciation: "),
+#. crd->sound.data, crd->sound.size);
+#. else
+#. add_strProp_to_string (string, _ ("\nPronunciation: "),
+#. crd->sound.data);
+#.
+#. add_SoundType (string, crd->sound.type);
+#. }
+#: addressbook/backend/ebook/e-card.c:3211
+msgid ""
+"\n"
+"Unique String: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3214
+msgid ""
+"\n"
+"Public Key: "
+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:1215
+#: addressbook/conduit/address-conduit.c:910
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1188
-#: calendar/conduits/todo/todo-conduit.c:1069 calendar/gui/main.c:55
+#: calendar/conduits/calendar/calendar-conduit.c:1091
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
 msgid "Could not initialize Bonobo"
 msgstr "Bonobon alustus ei onnistunut"
 
@@ -28,80 +264,94 @@ msgstr "Bonobon alustus ei onnistunut"
 #. in GnomePilotConduitSyncType as they are used as index.
 #. Custom type implies Disabled state.
 #.
-#: addressbook/conduit/address-conduit-control-applet.c:54
+#: addressbook/conduit/address-conduit-control-applet.c:77
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
 #: calendar/conduits/todo/todo-conduit-control-applet.c:77
 msgid "Disabled"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:55
+#: addressbook/conduit/address-conduit-control-applet.c:78
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
 #: calendar/conduits/todo/todo-conduit-control-applet.c:78
 msgid "Synchronize"
 msgstr "Synkronoi"
 
-#: addressbook/conduit/address-conduit-control-applet.c:56
+#: addressbook/conduit/address-conduit-control-applet.c:79
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
 #: calendar/conduits/todo/todo-conduit-control-applet.c:79
 msgid "Copy From Pilot"
 msgstr "Kopioi Pilotista"
 
-#: addressbook/conduit/address-conduit-control-applet.c:57
+#: addressbook/conduit/address-conduit-control-applet.c:80
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
 #: calendar/conduits/todo/todo-conduit-control-applet.c:80
 msgid "Copy To Pilot"
 msgstr "Kopioi Pilotiin"
 
-#: addressbook/conduit/address-conduit-control-applet.c:58
+#: addressbook/conduit/address-conduit-control-applet.c:81
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
 #: calendar/conduits/todo/todo-conduit-control-applet.c:81
 msgid "Merge From Pilot"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:59
+#: addressbook/conduit/address-conduit-control-applet.c:82
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
 #: calendar/conduits/todo/todo-conduit-control-applet.c:82
 msgid "Merge To Pilot"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:143
+#: addressbook/conduit/address-conduit-control-applet.c:121
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
+#: calendar/conduits/todo/todo-conduit-control-applet.c:121
+msgid "JP Rosevear <jpr@helixcode.com>"
+msgstr ""
+
+#: addressbook/conduit/address-conduit-control-applet.c:122
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
+#: calendar/conduits/todo/todo-conduit-control-applet.c:122
+msgid "Original Author:"
+msgstr ""
+
+#: addressbook/conduit/address-conduit-control-applet.c:123
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
 #: calendar/conduits/todo/todo-conduit-control-applet.c:123
 msgid "Eskil Heyn Olsen <deity@eskil.dk>"
 msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
 
-#: addressbook/conduit/address-conduit-control-applet.c:145
-msgid "Gpilotd address conduit"
+#: addressbook/conduit/address-conduit-control-applet.c:127
+msgid "Evolution Addressbook Conduit"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:146
-msgid "(C) 1998 the Free Software Foundation"
-msgstr "(C) 1998 the Free Software Foundation"
+#: addressbook/conduit/address-conduit-control-applet.c:128
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
+#: calendar/conduits/todo/todo-conduit-control-applet.c:128
+msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+msgstr "(C) 1998-2000 the Free Software Foundation and Helix Code"
 
-#: addressbook/conduit/address-conduit-control-applet.c:148
-msgid "Configuration utility for the address conduit.\n"
+#: addressbook/conduit/address-conduit-control-applet.c:130
+msgid "Configuration utility for the evolution addressbook conduit.\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:149
+#: addressbook/conduit/address-conduit-control-applet.c:131
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
 #: calendar/conduits/todo/todo-conduit-control-applet.c:131
 msgid "gnome-unknown.xpm"
 msgstr "gnome-unknown.xpm"
 
-#: addressbook/conduit/address-conduit-control-applet.c:190
+#: addressbook/conduit/address-conduit-control-applet.c:162
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
 #: calendar/conduits/todo/todo-conduit-control-applet.c:162
 msgid "Synchronize Action"
 msgstr "Synkronoi toiminto"
 
-#: addressbook/conduit/address-conduit-control-applet.c:261
+#: addressbook/conduit/address-conduit-control-applet.c:214
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
 #: calendar/conduits/todo/todo-conduit-control-applet.c:214
 msgid "Conduit state"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:315
-#: addressbook/conduit/address-conduit-control-applet.c:328
+#: addressbook/conduit/address-conduit-control-applet.c:266
+#: addressbook/conduit/address-conduit-control-applet.c:279
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
 #: calendar/conduits/todo/todo-conduit-control-applet.c:266
@@ -111,13 +361,13 @@ msgid ""
 "'Pilot Link Properties' capplet first."
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:334
+#: addressbook/conduit/address-conduit-control-applet.c:285
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
 #: calendar/conduits/todo/todo-conduit-control-applet.c:285
 msgid "Not connected to the gnome-pilot daemon"
-msgstr ""
+msgstr "Ei yhteyttä gnome-pilot -demoniin"
 
-#: addressbook/conduit/address-conduit-control-applet.c:339
+#: addressbook/conduit/address-conduit-control-applet.c:290
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
 #: calendar/conduits/todo/todo-conduit-control-applet.c:290
 msgid ""
@@ -125,29 +375,30 @@ msgid ""
 "pilot list from the gnome-pilot daemon"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:127
-#: addressbook/conduit/address-conduit.c:141
-msgid "BLARG\n"
+#: addressbook/conduit/address-conduit.c:193
+msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:471
-#, c-format
-msgid "Address holds %ld address entries"
+#: addressbook/conduit/address-conduit.c:206
+msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:497
-#: addressbook/conduit/address-conduit.c:499
-msgid "Could not start addressbook server"
-msgstr "Osoitekirjapalvelinta ei voitu aloittaa"
+#: addressbook/conduit/address-conduit.c:490
+#: calendar/conduits/calendar/calendar-conduit.c:651
+#: calendar/conduits/todo/todo-conduit.c:524
+msgid "Could not start wombat server"
+msgstr ""
 
-#: addressbook/conduit/address-conduit.c:512
-#: addressbook/conduit/address-conduit.c:515
-msgid "Could not read pilot's Address application block"
+#: addressbook/conduit/address-conduit.c:491
+#: calendar/conduits/calendar/calendar-conduit.c:652
+#: calendar/conduits/todo/todo-conduit.c:525
+msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:853
-msgid "Error while communicating with address server"
-msgstr "Virhe kommunikoitaessa osoitepalvelimen kanssa"
+#: addressbook/conduit/address-conduit.c:517
+#: addressbook/conduit/address-conduit.c:520
+msgid "Could not read pilot's Address application block"
+msgstr ""
 
 #.
 #. * Translatable strings file generated by Glade.
@@ -286,7 +537,7 @@ msgid "_Add"
 msgstr "_Lisää"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-mail.h:31
+#: ui/evolution-event-editor.h:72 ui/evolution-mail.h:48
 msgid "_Delete"
 msgstr "_Poista"
 
@@ -300,8 +551,10 @@ msgid "New phone type"
 msgstr "Uusi puhelintyyppi"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: calendar/gui/event-editor-dialog.glade.h:90 mail/mail-config.glade.h:11
-#: mail/mail-config.glade.h:16 mail/mail-config.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:71 filter/filter.glade.h:12
+#: filter/filter.glade.h:17 filter/filter.glade.h:21 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:11 mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:22
 msgid "Add"
 msgstr "Lisää"
 
@@ -356,7 +609,7 @@ msgstr ""
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 msgid "Ca_tegories..."
-msgstr ""
+msgstr "Ka_tegoriat"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:27
 msgid "_Job title:"
@@ -517,11 +770,22 @@ msgstr "_Sukunimi:"
 msgid "_Suffix:"
 msgstr ""
 
+#: addressbook/gui/component/addressbook.c:275
+msgid "Quick Search"
+msgstr "Pikaetsintä"
+
 #: addressbook/gui/component/addressbook.c:310
 msgid "As _Minicards"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:316 ui/evolution-addressbook.h:10
+#.
+#. *  This file is autogenerated from evolution-addressbook.xml, do not edit
+#. *
+#. *  This file contains translatable strings generated by
+#. * bonobo-ui-extract. Add this file to your project's
+#. * POTFILES.in. DO NOT compile it as part of your application.
+#.
+#: addressbook/gui/component/addressbook.c:316 ui/evolution-addressbook.h:9
 msgid "As _Table"
 msgstr ""
 
@@ -572,7 +836,6 @@ msgid "Root DN:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-server-dialog.glade.h:11
-#: composer/e-msg-composer-address-dialog.glade.h:8
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -734,7 +997,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/folder-browser.c:487
+#: mail/folder-browser.c:494 mail/mail-search-dialogue.c:101
 msgid "Search"
 msgstr "Etsi"
 
@@ -841,7 +1104,6 @@ msgstr "Tyyppi:"
 
 #: addressbook/printing/e-contact-print.glade.h:31
 #: addressbook/printing/e-contact-print.glade.h:43
-#: calendar/gui/event-editor-dialog.glade.h:80
 msgid "label26"
 msgstr ""
 
@@ -928,46 +1190,21 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr ""
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 the Free Software Foundation and Helix Code"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:688
-#: calendar/conduits/todo/todo-conduit.c:569
+#: calendar/conduits/calendar/calendar-conduit.c:607
+#: calendar/conduits/todo/todo-conduit.c:480
 msgid "Error while communicating with calendar server"
 msgstr "Virhe kommunikoitaessa kalenteripalvelimen kanssa"
 
-#: calendar/conduits/calendar/calendar-conduit.c:733
-#: calendar/conduits/todo/todo-conduit.c:614
-msgid "Could not start wombat server"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit.c:734
-#: calendar/conduits/todo/todo-conduit.c:615
-msgid "Could not start wombat"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit.c:797
-#: calendar/conduits/calendar/calendar-conduit.c:800
+#: calendar/conduits/calendar/calendar-conduit.c:706
+#: calendar/conduits/calendar/calendar-conduit.c:709
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -979,8 +1216,8 @@ msgstr ""
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:678
-#: calendar/conduits/todo/todo-conduit.c:681
+#: calendar/conduits/todo/todo-conduit.c:579
+#: calendar/conduits/todo/todo-conduit.c:582
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -1024,15 +1261,15 @@ msgstr ""
 msgid "To-Do item that is overdue:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:386
+#: calendar/gui/calendar-commands.c:382
 msgid "File not found"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:410
+#: calendar/gui/calendar-commands.c:406
 msgid "Open calendar"
 msgstr "Avaa kalenteri"
 
-#: calendar/gui/calendar-commands.c:449
+#: calendar/gui/calendar-commands.c:445
 msgid "Save calendar"
 msgstr "Tallenna kalenteri"
 
@@ -1045,13 +1282,13 @@ msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:740
+#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:726
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:743
+#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:729
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
@@ -1098,7 +1335,7 @@ msgstr ""
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:748
+#: calendar/gui/calendar-model.c:734
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1107,7 +1344,7 @@ msgid ""
 msgstr ""
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:849 calendar/gui/calendar-model.c:897
+#: calendar/gui/calendar-model.c:835 calendar/gui/calendar-model.c:883
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:480 widgets/misc/e-dateedit.c:512
 #: widgets/misc/e-dateedit.c:669 widgets/misc/e-dateedit.c:725
@@ -1116,38 +1353,38 @@ 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:867
+#: calendar/gui/calendar-model.c:853
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:870
+#: calendar/gui/calendar-model.c:856
 msgid "%H:%M:%S%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:874
+#: calendar/gui/calendar-model.c:860
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:877
+#: calendar/gui/calendar-model.c:863
 msgid "%H:%M%n"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:997
+#: calendar/gui/calendar-model.c:983
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1037
+#: calendar/gui/calendar-model.c:1023
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1077
+#: calendar/gui/calendar-model.c:1063
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr ""
 
@@ -1173,11 +1410,12 @@ msgstr ""
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: ui/evolution-contact-editor.h:14 ui/evolution-subscribe.h:10
+#: ui/evolution-contact-editor.h:14 ui/evolution-event-editor.h:19
+#: ui/evolution-subscribe.h:10
 msgid "Close"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1426
+#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1458
 msgid "Snooze"
 msgstr ""
 
@@ -1203,44 +1441,37 @@ msgid "Work week"
 msgstr "työviikko"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: calendar/gui/event-editor-dialog.glade.h:53
 #: calendar/gui/gnome-month-item.c:737
 msgid "Mon"
 msgstr "Ma"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/event-editor-dialog.glade.h:54
 #: calendar/gui/gnome-month-item.c:738
 msgid "Tue"
 msgstr "Ti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: calendar/gui/event-editor-dialog.glade.h:55
 #: calendar/gui/gnome-month-item.c:739
 msgid "Wed"
 msgstr "Ke"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/event-editor-dialog.glade.h:56
 #: calendar/gui/gnome-month-item.c:740
 msgid "Thu"
 msgstr "To"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/event-editor-dialog.glade.h:57
 #: calendar/gui/gnome-month-item.c:741
 msgid "Fri"
 msgstr "Pe"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/event-editor-dialog.glade.h:58
 #: calendar/gui/gnome-month-item.c:742
 msgid "Sat"
 msgstr "La"
 
 #. Initialize by default to three-letter day names
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:59
 #: calendar/gui/gnome-month-item.c:736
 msgid "Sun"
 msgstr "Su"
@@ -1249,31 +1480,38 @@ msgstr "Su"
 msgid "First day of week:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 calendar/gui/prop.c:354
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:45 calendar/gui/prop.c:354
 msgid "Monday"
 msgstr "Maanantai"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:46
 msgid "Tuesday"
 msgstr "Tiistai"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:47
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:48
 msgid "Thursday"
 msgstr "Torstai"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:49
 msgid "Friday"
 msgstr "Perjantai"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:50
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23 calendar/gui/prop.c:353
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:51 calendar/gui/prop.c:353
 msgid "Sunday"
 msgstr "Sunnuntai"
 
@@ -1358,6 +1596,7 @@ msgid "Time Until Due"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:611
+#: filter/libfilter-i18n.h:18
 msgid "Priority"
 msgstr ""
 
@@ -1449,21 +1688,21 @@ msgstr ""
 msgid "Edit Task"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:663 calendar/gui/event-editor.c:285
+#: calendar/gui/dialogs/task-editor.c:663 calendar/gui/event-editor.c:303
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:669 calendar/gui/event-editor.c:291
+#: calendar/gui/dialogs/task-editor.c:669 calendar/gui/event-editor.c:309
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: calendar/gui/dialogs/task-editor.c:672 calendar/gui/event-editor.c:294
+#: calendar/gui/dialogs/task-editor.c:672 calendar/gui/event-editor.c:312
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:675 calendar/gui/event-editor.c:297
+#: calendar/gui/dialogs/task-editor.c:675 calendar/gui/event-editor.c:315
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
@@ -1534,9 +1773,8 @@ msgid "C_lassification:"
 msgstr "_Luokitus"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:989
-#: widgets/misc/e-dateedit.c:337 widgets/misc/e-dateedit.c:709
-#: widgets/misc/e-dateedit.c:1171
+#: shell/e-shell-view.c:1017 widgets/misc/e-dateedit.c:337
+#: widgets/misc/e-dateedit.c:709 widgets/misc/e-dateedit.c:1171
 msgid "None"
 msgstr ""
 
@@ -1573,11 +1811,13 @@ msgid "Mark the task complete"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:300
-#: calendar/gui/event-editor-dialog.glade.h:92 mail/mail-config.glade.h:13
-#: mail/mail-config.glade.h:18 mail/mail-config.glade.h:24
-#: mail/mail-view.c:163 ui/evolution-addressbook.h:20
-#: ui/evolution-contact-editor.h:12 ui/evolution-contact-editor.h:19
-#: ui/evolution-mail.h:59
+#: calendar/gui/event-editor-dialog.glade.h:73 filter/filter.glade.h:14
+#: filter/filter.glade.h:19 filter/libfilter-i18n.h:8
+#: mail/mail-config.glade.h:13 mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:24 mail/mail-view.c:163
+#: ui/evolution-addressbook.h:11 ui/evolution-contact-editor.h:12
+#: ui/evolution-contact-editor.h:19 ui/evolution-event-editor.h:13
+#: ui/evolution-mail.h:13
 msgid "Delete"
 msgstr "Poista"
 
@@ -1623,6 +1863,7 @@ msgid "Edit this appointment..."
 msgstr "Muokkaa tätä tapaamista..."
 
 #: calendar/gui/e-day-view.c:2639 calendar/gui/e-week-view.c:2937
+#: ui/evolution-event-editor.h:14
 msgid "Delete this appointment"
 msgstr "Poista tämä tapaaminen"
 
@@ -1645,20 +1886,25 @@ msgstr ""
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/event-editor.c:279
+#: calendar/gui/event-editor.c:297
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: calendar/gui/event-editor.c:1749 calendar/gui/print.c:1085
+#: calendar/gui/event-editor.c:342
+msgid "on"
+msgstr ""
+
+#: calendar/gui/event-editor.c:470
+msgid "ocurrences"
+msgstr ""
+
+#: calendar/gui/event-editor.c:2397 calendar/gui/print.c:1085
 #: calendar/gui/print.c:1087 calendar/gui/print.c:1088
 msgid "%a %b %d %Y"
 msgstr ""
 
 #. todo
 #.
-#. build some of the recur stuff by hand to take into account
-#. the start-on-monday preference?
-#.
 #. get the apply button to work right
 #.
 #. make the properties stuff unglobal
@@ -1679,7 +1925,8 @@ msgid "event-editor-dialog"
 msgstr ""
 
 #: calendar/gui/event-editor-dialog.glade.h:8
-msgid "_Summary:"
+#: calendar/gui/event-editor-dialog.glade.h:56
+msgid "Su_mmary:"
 msgstr "_Yhteenveto:"
 
 #: calendar/gui/event-editor-dialog.glade.h:9
@@ -1687,12 +1934,12 @@ msgid "Time"
 msgstr "Aika"
 
 #: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Start time:"
-msgstr "Alkamisaika:"
+msgid "_Start time:"
+msgstr "_Alkamisaika:"
 
 #: calendar/gui/event-editor-dialog.glade.h:11
-msgid "End time:"
-msgstr "Loppumisaika:"
+msgid "_End time:"
+msgstr "_Loppumisaika:"
 
 #: calendar/gui/event-editor-dialog.glade.h:12
 msgid "A_ll day event"
@@ -1715,17 +1962,44 @@ msgid "_Confidential"
 msgstr "_Luottamuksellinen"
 
 #: calendar/gui/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:27
+msgid "Minutes"
+msgstr "Minuuttia"
+
+#: calendar/gui/event-editor-dialog.glade.h:19
 #: calendar/gui/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor-dialog.glade.h:28
+msgid "Hours"
+msgstr "Tuntia"
+
+#: calendar/gui/event-editor-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:23
 #: calendar/gui/event-editor-dialog.glade.h:26
+#: calendar/gui/event-editor-dialog.glade.h:29
+msgid "Days"
+msgstr "Päivää"
+
 #: calendar/gui/event-editor-dialog.glade.h:30
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days\n"
+msgid "_Display"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:31
+msgid "_Program"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:32
+msgid "_Mail"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:33
+msgid "Mail _to:"
 msgstr ""
 
 #: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Display"
+msgid "_Run program:"
 msgstr ""
 
 #: calendar/gui/event-editor-dialog.glade.h:35
@@ -1733,153 +2007,120 @@ msgid "_Audio"
 msgstr ""
 
 #: calendar/gui/event-editor-dialog.glade.h:36
-msgid "_Program"
+msgid "Reminder"
 msgstr ""
 
 #: calendar/gui/event-editor-dialog.glade.h:37
-msgid "_Mail"
-msgstr ""
-
 #: calendar/gui/event-editor-dialog.glade.h:38
-msgid "Mail _to:"
+msgid "Recur on the"
 msgstr ""
 
 #: calendar/gui/event-editor-dialog.glade.h:39
-msgid "_Run program:"
+msgid "th day of the month"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "Reminder"
+#: calendar/gui/event-editor-dialog.glade.h:40 calendar/gui/print.c:288
+msgid "1st"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "Recurrence rule"
+#: calendar/gui/event-editor-dialog.glade.h:41 calendar/gui/print.c:288
+msgid "2nd"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "Daily"
+#: calendar/gui/event-editor-dialog.glade.h:42 calendar/gui/print.c:288
+msgid "3rd"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "Weekly"
+#: calendar/gui/event-editor-dialog.glade.h:43 calendar/gui/print.c:288
+msgid "4th"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "Monthly"
+#: calendar/gui/event-editor-dialog.glade.h:44 calendar/gui/print.c:288
+msgid "5th"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "Yearly"
-msgstr ""
+#: calendar/gui/event-editor-dialog.glade.h:52
+#: calendar/gui/event-editor-dialog.glade.h:62
+msgid "Every"
+msgstr "Joka"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "label23"
+#: calendar/gui/event-editor-dialog.glade.h:53
+#: calendar/gui/event-editor-dialog.glade.h:65
+msgid "month(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:48
-#: calendar/gui/event-editor-dialog.glade.h:51
-#: calendar/gui/event-editor-dialog.glade.h:81
-msgid "Every "
+#: calendar/gui/event-editor-dialog.glade.h:54
+#: calendar/gui/event-editor-dialog.glade.h:78
+msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:49
-msgid "day(s)"
+#: calendar/gui/event-editor-dialog.glade.h:55
+msgid "Appointment Basics"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "label24"
+#: calendar/gui/event-editor-dialog.glade.h:57
+msgid "_Starting date:"
+msgstr "_Alkamispäivä:"
+
+#: calendar/gui/event-editor-dialog.glade.h:58
+msgid "Recurrence Rule"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:52
-msgid "week(s)"
+#: calendar/gui/event-editor-dialog.glade.h:59
+msgid "No recurrence"
 msgstr ""
 
 #: calendar/gui/event-editor-dialog.glade.h:60
-msgid "label25"
+msgid "Simple recurrence"
 msgstr ""
 
 #: calendar/gui/event-editor-dialog.glade.h:61
-#: calendar/gui/event-editor-dialog.glade.h:62
-msgid "Recur on the"
+msgid "Custom recurrence"
 msgstr ""
 
 #: calendar/gui/event-editor-dialog.glade.h:63
-msgid "th day of the month"
+msgid "day(s)"
 msgstr ""
 
 #: calendar/gui/event-editor-dialog.glade.h:64
-msgid ""
-"1st\n"
-"2nd\n"
-"3rd\n"
-"4th\n"
-"5th\n"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:70
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday\n"
-msgstr ""
-"Maanantai\n"
-"Tiistai\n"
-"Keskiviikko\n"
-"Torstai\n"
-"Perjantai\n"
-"Lauantai\n"
-"Sunnuntai\n"
-
-#: calendar/gui/event-editor-dialog.glade.h:78
-msgid "Every"
-msgstr "Joka"
-
-#: calendar/gui/event-editor-dialog.glade.h:79
-msgid "month(s)"
+msgid "week(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:82
+#: calendar/gui/event-editor-dialog.glade.h:66
 msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:83
-msgid "label27"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:84
-msgid "Ending date"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:85
-msgid "Repeat forever"
+#: calendar/gui/event-editor-dialog.glade.h:67
+msgid "for"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:86
-msgid "End on "
+#: calendar/gui/event-editor-dialog.glade.h:68
+msgid "until"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:87
-msgid "End after"
+#: calendar/gui/event-editor-dialog.glade.h:69
+msgid "forever"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:88
-msgid "occurrence(s)"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:89
+#: calendar/gui/event-editor-dialog.glade.h:70
 msgid "Exceptions"
 msgstr "Poikkeukset"
 
-#: calendar/gui/event-editor-dialog.glade.h:91
-msgid "Change"
+#: calendar/gui/event-editor-dialog.glade.h:72
+msgid "Modify"
 msgstr "Muuta"
 
-#: calendar/gui/event-editor-dialog.glade.h:93
-msgid "Recurrence"
+#: calendar/gui/event-editor-dialog.glade.h:74
+msgid "label21"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:75
+msgid ""
+"This appointment has custom recurrence rules that cannot be edited by "
+"Evolution.\n"
+"\n"
+"However, the appointment will recur at the appropriate time and will be "
+"displayed properly in the calendar views."
 msgstr ""
 
 #: calendar/gui/getdate.y:391
@@ -1978,11 +2219,11 @@ msgstr "perjantai"
 msgid "saturday"
 msgstr "lauantai"
 
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:61
+#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
 msgid "year"
 msgstr "vuosi"
 
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:62
+#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
 msgid "month"
 msgstr "kuukausi"
 
@@ -1990,19 +2231,19 @@ msgstr "kuukausi"
 msgid "fortnight"
 msgstr ""
 
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:63
+#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
 msgid "week"
 msgstr "viikko"
 
-#: calendar/gui/getdate.y:424 filter/filter-datespec.c:64
+#: calendar/gui/getdate.y:424 filter/filter-datespec.c:65
 msgid "day"
 msgstr "päivä"
 
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:65
+#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
 msgid "hour"
 msgstr "tunti"
 
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:66
+#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
 msgid "minute"
 msgstr "minuutti"
 
@@ -2010,7 +2251,7 @@ msgstr "minuutti"
 msgid "min"
 msgstr "min"
 
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:67
+#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
 msgid "second"
 msgstr "sekunti"
 
@@ -2030,8 +2271,8 @@ msgstr ""
 msgid "today"
 msgstr ""
 
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:504
-#: filter/filter-datespec.c:664
+#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
+#: filter/filter-datespec.c:693
 msgid "now"
 msgstr "nyt"
 
@@ -2120,28 +2361,29 @@ msgstr ""
 msgid "Item Comments:"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:696 calendar/gui/gnome-cal.c:1434
-#: calendar/gui/gnome-cal.c:1490
+#: calendar/gui/gnome-cal.c:710 calendar/gui/gnome-cal.c:1466
+#: calendar/gui/gnome-cal.c:1522
 msgid "Reminder of your appointment at "
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1130
+#: calendar/gui/gnome-cal.c:1144
 #, c-format
 msgid "Could not load the calendar in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1141
+#: calendar/gui/gnome-cal.c:1155
 #, c-format
 msgid "Could not create a calendar in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1152
+#: calendar/gui/gnome-cal.c:1166
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1439 calendar/gui/gnome-cal.c:1494
+#: calendar/gui/gnome-cal.c:1471 calendar/gui/gnome-cal.c:1526
+#: mail/mail-search-dialogue.c:101
 msgid "Ok"
 msgstr "Ok"
 
@@ -2165,26 +2407,6 @@ msgstr ""
 msgid "Go to today"
 msgstr ""
 
-#: calendar/gui/print.c:288
-msgid "1st"
-msgstr ""
-
-#: calendar/gui/print.c:288
-msgid "2nd"
-msgstr ""
-
-#: calendar/gui/print.c:288
-msgid "3rd"
-msgstr ""
-
-#: calendar/gui/print.c:288
-msgid "4th"
-msgstr ""
-
-#: calendar/gui/print.c:288
-msgid "5th"
-msgstr ""
-
 #: calendar/gui/print.c:289
 msgid "6th"
 msgstr ""
@@ -2353,7 +2575,7 @@ msgstr ""
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:801
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:833
 msgid "Print Preview"
 msgstr ""
 
@@ -2461,132 +2683,703 @@ msgstr ""
 msgid "Enable snoozing for "
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:186
-msgid "Cut"
-msgstr "Leikkaa"
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: calendar/gui/weekday-picker.c:326 widgets/misc/e-calendar-item.c:416
+msgid "MTWTFSS"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:187
-msgid "Cut selected item into clipboard"
+#: calendar/gui/weekday-picker.c:328 calendar/gui/weekday-picker.c:418
+msgid "SMTWTFS"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:190 ui/evolution-mail.h:55
-msgid "Copy"
-msgstr "Kopioi"
+#: camel/camel-movemail.c:96
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:191
-msgid "Copy selected item into clipboard"
+#: camel/camel-movemail.c:133 camel/camel-movemail.c:180
+#, c-format
+msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:194
-#: composer/e-msg-composer-address-dialog.c:202
-msgid "Paste"
-msgstr "Liitä"
+#: camel/camel-movemail.c:143
+#, c-format
+msgid "Could not open mail file %s: %s"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:195
-#: composer/e-msg-composer-address-dialog.c:203
-msgid "Paste item from clipboard"
+#: camel/camel-movemail.c:153
+#, c-format
+msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:529
-msgid "Select recipients' addresses"
+#: camel/camel-movemail.c:194
+#, c-format
+msgid "Could not test lock file for %s: %s"
 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.
-#.
-#: composer/e-msg-composer-address-dialog.glade.h:7
-msgid "Recipient list:"
+#: camel/camel-movemail.c:214
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:9
-msgid "Search..."
-msgstr "Etsi..."
+#: camel/camel-movemail.c:240
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "VIrhe luettaessa viestitiedostoa: %s"
 
-#: composer/e-msg-composer-address-dialog.glade.h:10
-msgid "Name"
-msgstr "Nimi"
+#: camel/camel-movemail.c:251
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Virhe kirjoitettaessa väliaikaista viestitiedostoa: %s"
 
-#: composer/e-msg-composer-address-dialog.glade.h:11
-#: mail/mail-config.glade.h:8
-msgid "Address"
-msgstr "Osoite"
+#: camel/camel-movemail.c:269
+#, c-format
+msgid "Failed to store mail in temp file %s: %s"
+msgstr "Viestin tallentaminen väliaikaistiedostoon %s epäonnistui: "
+"%s"
+
+#: camel/camel-movemail.c:301
+#, c-format
+msgid "Could not create pipe: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:313
+#, c-format
+msgid "Could not fork: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:351
+#, c-format
+msgid "Movemail program failed: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:352
+msgid "(Unknown error)"
+msgstr "(tuntematon virhe)"
+
+#: camel/camel-provider.c:133
+#, c-format
+msgid "Could not load %s: %s"
+msgstr ""
+
+#: camel/camel-provider.c:141
+#, c-format
+msgid "Could not load %s: No initialization code in module."
+msgstr ""
+
+#: camel/camel-remote-store.c:185
+#, c-format
+msgid "%s server %s"
+msgstr ""
+
+#: camel/camel-remote-store.c:189
+#, c-format
+msgid "%s service for %s on %s"
+msgstr ""
+
+#: camel/camel-remote-store.c:230
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr ""
+
+#: camel/camel-remote-store.c:231
+msgid "(unknown host)"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:12
-msgid "Properties..."
+#: camel/camel-service.c:120
+#, c-format
+msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:13
-msgid "Add..."
-msgstr "Lisää..."
+#: camel/camel-service.c:129
+#, c-format
+msgid "URL '%s' needs a host component"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:14
-msgid "To: >>"
-msgstr "Vastaanottaja: >>"
+#: camel/camel-service.c:138
+#, c-format
+msgid "URL '%s' needs a path component"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:15
-msgid "Cc: >>"
+#: camel/camel-service.c:497
+#, c-format
+msgid "No such host %s."
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:16
-msgid "Bcc: >>"
+#: camel/camel-service.c:500
+#, c-format
+msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:17
-msgid "label9"
+#: camel/camel-session.c:271
+#, c-format
+msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:18
-msgid "label7"
+#: camel/camel-session.c:359
+#, c-format
+msgid ""
+"Could not create directory %s:\n"
+"%s"
 msgstr ""
+"Hakemistoa %s ei voitu luoda:\n"
+"%s"
 
-#: composer/e-msg-composer-address-dialog.glade.h:19
-msgid "label8"
+#: camel/camel-url.c:77
+#, c-format
+msgid "URL string `%s' contains no protocol"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:82
+#: camel/camel-url.c:92
+#, c-format
+msgid "URL string `%s' contains an invalid protocol"
+msgstr ""
+
+#: camel/camel-url.c:153
+#, c-format
+msgid "Port number in URL `%s' is non-numeric"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:216
+#, c-format
+msgid "Unexpected response from IMAP server: %s"
+msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
+
+#: camel/providers/imap/camel-imap-command.c:224
+#, c-format
+msgid "IMAP command failed: %s"
+msgstr "IMAP-komento epäonnistui: %s"
+
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:349
+msgid "Unknown error"
+msgstr "Tuntematon virhe"
+
+#: camel/providers/imap/camel-imap-command.c:366
+#, c-format
+msgid "IMAP server response did not contain %s information"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:402
+#, c-format
+msgid "Unexpected OK response from IMAP server: %s"
+msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:216
+#, c-format
+msgid "Could not load summary for %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:581
+msgid "Could not find message body in FETCH response."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:39
+msgid "IMAPv4"
+msgstr "IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:41
+msgid "For reading and storing mail on IMAP servers."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:240
+#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/pop3/camel-pop3-store.c:152
+msgid "Password"
+msgstr "Salasana"
+
+#: camel/providers/imap/camel-imap-store.c:242
+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:251
+msgid "Kerberos 4"
+msgstr "Kerberos 4"
+
+#: camel/providers/imap/camel-imap-store.c:253
+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:339
+#, c-format
+msgid "%sPlease enter the IMAP password for %s@%s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:365
+#, c-format
+msgid ""
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:545
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "Hakemistoa %s ei voitu luoda: %s"
+
+#. FIXME: right error code
+#: camel/providers/mbox/camel-mbox-folder.c:223
+msgid "Could not create summary"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-folder.c:389
+#: camel/providers/mbox/camel-mbox-folder.c:392
+#, c-format
+msgid "Cannot append message to mbox file: %s"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-folder.c:496
+#, c-format
+msgid "Cannot get message: %s"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-provider.c:34
+msgid "UNIX mbox-format mail files"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-provider.c:36
+msgid ""
+"For reading mail delivered by the local system, and for storing mail on "
+"local disk."
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-store.c:121
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-store.c:128
+#: camel/providers/mh/camel-mh-store.c:122
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Kansiota `%s' ei ole olemassa."
+
+#: camel/providers/mbox/camel-mbox-store.c:137
+#, c-format
+msgid ""
+"Could not create file `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-store.c:146
+#: camel/providers/mbox/camel-mbox-store.c:180
+#, c-format
+msgid "`%s' is not a regular file."
+msgstr `%s' ei ole tavallinen tiedosto."
+
+#: camel/providers/mbox/camel-mbox-store.c:172
+#: camel/providers/mbox/camel-mbox-store.c:208
+#, c-format
+msgid ""
+"Could not delete folder `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-store.c:187
+#, c-format
+msgid "Folder `%s' is not empty. Not deleted."
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-store.c:225
+#, c-format
+msgid "Could not rename folder %s to %s: destination exists"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-store.c:263
+msgid "Mbox folders may not be nested."
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-store.c:277
+#, c-format
+msgid "Local mail file %s"
+msgstr "Paikallinen viestitiedosto %s"
+
+#: camel/providers/mbox/camel-mbox-summary.c:667
+#, c-format
+msgid "Could not open summary %s"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-summary.c:688
+#, c-format
+msgid "Cannot open temporary mailbox: %s"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-summary.c:734
+msgid "Summary mismatch, aborting sync"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-summary.c:754
+msgid "Summary mismatch, X-Evolution header missing"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-summary.c:776
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-summary.c:789
+#: camel/providers/mbox/camel-mbox-summary.c:807
+#, c-format
+msgid "Cannot copy data to output file: %s"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-summary.c:832
+#, c-format
+msgid "Could not close source folder %s: %s"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-summary.c:841
+#, c-format
+msgid "Could not close temp folder: %s"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-summary.c:849
+#, c-format
+msgid "Could not rename folder: %s"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-summary.c:861
+#, c-format
+msgid "Unknown error: %s"
+msgstr "Tuntematon virhe: %s"
+
+#. FIXME: right error code
+#: camel/providers/mh/camel-mh-folder.c:213
+msgid "Could not load or create summary"
+msgstr ""
+
+#: camel/providers/mh/camel-mh-folder.c:336
+#: camel/providers/mh/camel-mh-folder.c:339
+#, c-format
+msgid "Cannot append message to mh folder: %s"
+msgstr ""
+
+#: camel/providers/mh/camel-mh-folder.c:405
+#, c-format
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+
+#: camel/providers/mh/camel-mh-provider.c:34
+msgid "UNIX MH-format mail directories"
+msgstr ""
+
+#: camel/providers/mh/camel-mh-provider.c:36
+msgid "For storing local mail in MH-like mail directories"
+msgstr ""
+
+#: camel/providers/mh/camel-mh-store.c:115
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/mh/camel-mh-store.c:130
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/mh/camel-mh-store.c:139
+#, c-format
+msgid "`%s' is not a directory."
+msgstr ""
+
+#: camel/providers/mh/camel-mh-store.c:158
+#: camel/providers/mh/camel-mh-store.c:171
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr ""
+
+#: camel/providers/mh/camel-mh-store.c:189
+#: camel/providers/mh/camel-mh-store.c:193
+#, c-format
+msgid "Could not rename folder `%s': %s"
+msgstr ""
+
+#: camel/providers/mh/camel-mh-store.c:197
+#, c-format
+msgid "Could not rename folder `%s': %s exists"
+msgstr ""
+
+#: camel/providers/mh/camel-mh-store.c:205
+msgid "MH folders may not be nested."
+msgstr ""
+
+#: camel/providers/mh/camel-mh-store.c:217
+#, c-format
+msgid "Local mail directory %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:41
+#, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:62
+msgid "Server rejected username"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:68
+msgid "Failed to send username to server"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:77
+msgid "Server rejected username/password"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:140
+#, c-format
+msgid "Message %s not found."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+msgid "Could not get group list from server."
+msgstr "Ei saatu ryhmäluetteloa palvelimelta."
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:94
+#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-provider.c:38
+msgid "USENET news"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-provider.c:40
+msgid "This is a provider for reading from and posting toUSENET newsgroups."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:226
+#, c-format
+msgid "Could not open directory for news server: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:288
+#, c-format
+msgid "USENET News via %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:295
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:500
+#, c-format
+msgid "Unable to open or create .newsrc file for %s: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:177
+msgid "Could not open folder: message listing was incomplete."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:271
+#, c-format
+msgid "No message with uid %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:285
+#, c-format
+msgid "Could not retrieve message from POP server %s: %s"
+msgstr "Viestiä ei saatu POP-palvelimelta %s: %s"
+
+#: camel/providers/pop3/camel-pop3-provider.c:34
+msgid "POP"
+msgstr "POP"
+
+#: camel/providers/pop3/camel-pop3-provider.c:36
+msgid ""
+"For connecting to POP servers. The POP protocol can also be used to retrieve "
+"mail from certain web mail providers and proprietary email systems."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:154
+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:164
+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:176
+msgid ""
+"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:221
+#, c-format
+msgid "Could not authenticate to KPOP server: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:339
+#, c-format
+msgid "Could not connect to POP server on %s."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:393
+#, c-format
+msgid "%sPlease enter the POP3 password for %s@%s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:412
+#, c-format
+msgid ""
+"Unable to connect to POP server.\n"
+"Error sending username: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:452
+msgid "(Unknown)"
+msgstr "(tuntematon)"
+
+#: camel/providers/pop3/camel-pop3-store.c:442
+msgid ""
+"Unable to connect to POP server.\n"
+"No support for requested authentication mechanism."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:450
+#, c-format
+msgid ""
+"Unable to connect to POP server.\n"
+"Error sending password: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:557
+#, c-format
+msgid "No such folder `%s'."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-provider.c:34
+msgid "Sendmail"
+msgstr "Sendmail"
+
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#, c-format
+msgid "Could not create pipe to sendmail: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#, c-format
+msgid "Could not fork sendmail: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#, c-format
+msgid "Could not send message: %s"
+msgstr "Viestin lähettäminen epäonnistui: %s"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#, c-format
+msgid "sendmail exited with signal %s: mail not sent."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#, c-format
+msgid "Could not execute %s: mail not sent."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#, c-format
+msgid "sendmail exited with status %d: mail not sent."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:220
+msgid "sendmail"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:222
+msgid "Mail delivery via the sendmail program"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:36
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+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:86
 msgid "1 byte"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:84
+#: composer/e-msg-composer-attachment-bar.c:88
 #, c-format
 msgid "%u bytes"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:91
+#: composer/e-msg-composer-attachment-bar.c:95
 #, c-format
 msgid "%.1fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%.1fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%.1fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:411
-msgid "Add attachment"
-msgstr ""
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:300 mail/mail-display.c:116
+msgid "attachment"
+msgstr "liite"
 
-#: composer/e-msg-composer-attachment-bar.c:474 shell/e-shortcuts-view.c:239
+#: composer/e-msg-composer-attachment-bar.c:396
+msgid "Attach a file"
+msgstr "Liitä tiedosto"
+
+#: composer/e-msg-composer-attachment-bar.c:443 filter/filter.glade.h:22
+#: filter/filter.glade.h:25 shell/e-shortcuts-view.c:239
 #: shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Poista"
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:475
 msgid "Add attachment..."
 msgstr "Lisää liite..."
 
-#: composer/e-msg-composer-attachment-bar.c:507
+#: composer/e-msg-composer-attachment-bar.c:476
 msgid "Attach a file to the message"
 msgstr "Lisää viestiin liitetiedoston"
 
@@ -2607,79 +3400,92 @@ msgstr ""
 msgid "File name:"
 msgstr "Tiedostonimi:"
 
-#: composer/e-msg-composer-hdrs.c:138 composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:295
+#: mail/mail-format.c:588
 msgid "From:"
 msgstr "Lähettäjä:"
 
-#: composer/e-msg-composer-hdrs.c:244
+#: composer/e-msg-composer-hdrs.c:243
 msgid "Click here for the address book"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:297
+#: composer/e-msg-composer-hdrs.c:296
 msgid "Enter the identity you wish to send this message from"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:601
 msgid "To:"
 msgstr "Vastaanottaja:"
 
-#: composer/e-msg-composer-hdrs.c:302
+#: composer/e-msg-composer-hdrs.c:301
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:305 mail/mail-format.c:608
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:307
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:312
+#: composer/e-msg-composer-hdrs.c:311
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:313
+#: composer/e-msg-composer-hdrs.c:312
 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:319
+#: composer/e-msg-composer-hdrs.c:318 mail/mail-format.c:613
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Enter the subject of the mail"
 msgstr "Anna sähköpostin aihe"
 
-#: composer/e-msg-composer.c:408
+#: composer/e-msg-composer.c:302
+#, c-format
+msgid ""
+"Could not open signature file %s:\n"
+"%s"
+msgstr ""
+
+#: composer/e-msg-composer.c:458
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
-#: composer/e-msg-composer.c:419
+#: composer/e-msg-composer.c:469
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:439
+#: composer/e-msg-composer.c:489
 #, c-format
 msgid "Error loading file: %s"
 msgstr "VIrhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:461
+#: composer/e-msg-composer.c:511
 msgid "Saving changes to message..."
 msgstr "Tallennetaan muutokset..."
 
-#: composer/e-msg-composer.c:463
-msgid "About to save changes to message..."
-msgstr "Tallentamaisillaan muutokset..."
+#: composer/e-msg-composer.c:513
+msgid "Save changes to message..."
+msgstr ""
+
+#: composer/e-msg-composer.c:554
+#, c-format
+msgid "Error saving composition to 'Drafts': %s"
+msgstr ""
 
-#: composer/e-msg-composer.c:548 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:598 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:554
+#: composer/e-msg-composer.c:604
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -2689,27 +3495,27 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: composer/e-msg-composer.c:576
+#: composer/e-msg-composer.c:626
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:702
+#: composer/e-msg-composer.c:752
 msgid "That file does not exist."
 msgstr "Tiedostoa ei ole olemassa."
 
-#: composer/e-msg-composer.c:712
+#: composer/e-msg-composer.c:762
 msgid "That is not a regular file."
 msgstr "Se ei ole tavallinen tiedosto."
 
-#: composer/e-msg-composer.c:722
+#: composer/e-msg-composer.c:772
 msgid "That file exists but is not readable."
 msgstr "Tiedosto on olemassa, muttei lukukelpoinen."
 
-#: composer/e-msg-composer.c:732
+#: composer/e-msg-composer.c:782
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Tiedosto vaikutti avattavalta, mutta avaaminen epäonnistui."
 
-#: composer/e-msg-composer.c:754
+#: composer/e-msg-composer.c:804
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -2717,60 +3523,72 @@ msgstr ""
 "Tiedosto on hyvin suuri (yli 100K).\n"
 "Haluatko varmasti liittää sen?"
 
-#: composer/e-msg-composer.c:775
+#: composer/e-msg-composer.c:825
 msgid "An error occurred while reading the file."
 msgstr "Virhe luettaessa tiedostoa."
 
-#: composer/e-msg-composer.c:1137
+#: composer/e-msg-composer.c:1197
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: composer/e-msg-composer.c:1211
+#: composer/e-msg-composer.c:1271
 msgid "Could not create composer window."
 msgstr ""
 
-#: filter/filter-datespec.c:61
+#: composer/evolution-composer.c:307
+msgid "Cannot initialize Evolution's composer."
+msgstr ""
+
+#: filter/filter-datespec.c:62
 msgid "years"
 msgstr "vuotta"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:63
 msgid "months"
 msgstr "kuukautta"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr "viikkoa"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:65
 msgid "days"
 msgstr "päivää"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr "tuntia"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "minuuttia"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr "sekuntia"
 
-#: filter/filter-datespec.c:232
+#: filter/filter-datespec.c:183
+msgid "Oops. You have forgotten to choose a date."
+msgstr ""
+
+#: filter/filter-datespec.c:185
+msgid "Oops. You have chosen an invalid date."
+msgstr ""
+
+#: filter/filter-datespec.c:259
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:254
+#: filter/filter-datespec.c:282
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:293
+#: filter/filter-datespec.c:322
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -2778,98 +3596,333 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:329
+#: filter/filter-datespec.c:358
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:387
+#: filter/filter-datespec.c:416
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:661
+#: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-editor.c:158 filter/score-editor.c:127
-#: filter/vfolder-editor.c:153
-msgid "Add Rule"
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:343
+msgid "Add Filter Rule"
+msgstr ""
+
+#: filter/filter-editor.c:233
+msgid "Edit Filter Rule"
 msgstr ""
 
-#: filter/filter-editor.c:199
-msgid "Edit Rule"
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: filter/filter-editor.c:456 filter/filter.glade.h:7
+msgid "Edit Filters"
 msgstr ""
 
 #. and now for the action area
-#: filter/filter-filter.c:396
+#: filter/filter-filter.c:401
 msgid "Then"
 msgstr "Sitten"
 
-#: filter/filter-filter.c:409
+#: filter/filter-filter.c:414
 msgid "Add action"
 msgstr "Lisää toiminto"
 
-#: filter/filter-filter.c:415
+#: filter/filter-filter.c:420
 msgid "Remove action"
 msgstr "Poista toiminto"
 
-#: filter/filter-folder.c:186 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:143
+msgid ""
+"Oops, you forgot to choose a folder.\n"
+"Please go back and specify a valid folder to deliver mail to."
+msgstr ""
+
+#: filter/filter-folder.c:212 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-folder.c:209
+#: filter/filter-folder.c:235
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:253
+#: filter/filter-folder.c:281
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-part.c:420
+#: filter/filter-input.c:188
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+
+#: filter/filter-part.c:458
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:494
+#: filter/filter-rule.c:520
 msgid "Rule name: "
-msgstr ""
+msgstr "Säännön nimi: "
 
-#: filter/filter-rule.c:498
-msgid "untitled"
-msgstr "nimetön"
+#: filter/filter-rule.c:524
+msgid "Untitled"
+msgstr "Nimetön"
 
-#: filter/filter-rule.c:509
+#: filter/filter-rule.c:538
 msgid "If"
 msgstr "Jos"
 
-#: filter/filter-rule.c:526
+#: filter/filter-rule.c:555
 msgid "Execute actions"
 msgstr "Suorita toiminnot"
 
-#: filter/filter-rule.c:530
+#: filter/filter-rule.c:559
 msgid "if all criteria are met"
-msgstr "kaikki kriteerit täytetään"
+msgstr "kaikki ehdot täytetään"
 
-#: filter/filter-rule.c:537
+#: filter/filter-rule.c:564
 msgid "if any criteria are met"
-msgstr "mikään kriteereistä täytetään"
+msgstr "mikään ehdoista täyttyy"
+
+#: filter/filter-rule.c:575
+msgid "Add criterion"
+msgstr "Lisää ehto"
+
+#: filter/filter-rule.c:581
+msgid "Remove criterion"
+msgstr "Poista ehto"
+
+#: filter/filter.glade.h:8
+msgid ""
+"Incoming\n"
+"Outgoing\n"
+msgstr ""
+
+#: filter/filter.glade.h:11
+msgid "Filter Rules"
+msgstr ""
+
+#: filter/filter.glade.h:13 filter/filter.glade.h:18
+#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:23
+msgid "Edit"
+msgstr "Muokkaa"
+
+#: filter/filter.glade.h:15
+msgid "Edit VFolders"
+msgstr ""
+
+#: filter/filter.glade.h:16
+msgid "Virtual Folders"
+msgstr ""
+
+#: filter/filter.glade.h:20 filter/filter.glade.h:23
+msgid "vFolder Sources"
+msgstr ""
+
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2 mail/message-list.c:543
+msgid "Answered"
+msgstr ""
+
+#: filter/libfilter-i18n.h:3
+msgid "Assign Colour"
+msgstr ""
+
+#: filter/libfilter-i18n.h:4
+msgid "Assign Score"
+msgstr ""
+
+#: filter/libfilter-i18n.h:5
+msgid "Copy to Folder"
+msgstr "Kopioi kansioon"
+
+#: filter/libfilter-i18n.h:6
+msgid "Date received"
+msgstr "Otettu vastaan"
+
+#: filter/libfilter-i18n.h:7
+msgid "Date sent"
+msgstr "Lähetetty"
+
+#: filter/libfilter-i18n.h:9
+msgid "Deleted"
+msgstr "Poistettu"
+
+#: filter/libfilter-i18n.h:10
+msgid "Draft"
+msgstr ""
+
+#: filter/libfilter-i18n.h:11
+msgid "Expression"
+msgstr ""
+
+#: filter/libfilter-i18n.h:12
+msgid "Flagged"
+msgstr ""
+
+#: filter/libfilter-i18n.h:13
+msgid "Forward to Address"
+msgstr ""
+
+#: filter/libfilter-i18n.h:14
+msgid "Message Body"
+msgstr ""
 
-#: filter/filter-rule.c:550
-msgid "More criterion"
-msgstr "Lisäkriteerit"
+#: filter/libfilter-i18n.h:15
+msgid "Message was received"
+msgstr "Viesti vastaanotettu"
 
-#: filter/filter-rule.c:556
-msgid "Fewer criterion"
+#: filter/libfilter-i18n.h:16
+msgid "Message was sent"
+msgstr "Viesti lähetetty"
+
+#: filter/libfilter-i18n.h:17
+msgid "Move to Folder"
+msgstr "Siirrä kansioon"
+
+#: filter/libfilter-i18n.h:19
+msgid "Recipients"
+msgstr "Vastaanottajat"
+
+#: filter/libfilter-i18n.h:20 mail/message-list.c:540
+msgid "Seen"
+msgstr ""
+
+#: filter/libfilter-i18n.h:21
+msgid "Sender"
+msgstr "Lähettäjä"
+
+#: filter/libfilter-i18n.h:22
+msgid "Set Flag"
+msgstr ""
+
+#: filter/libfilter-i18n.h:23
+msgid "Source"
+msgstr "Lähde"
+
+#: filter/libfilter-i18n.h:24
+msgid "Specific header"
+msgstr ""
+
+#: filter/libfilter-i18n.h:25
+msgid "Stop Processing"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26
+msgid "Subject"
+msgstr "Aihe"
+
+#: filter/libfilter-i18n.h:27
+msgid "after"
+msgstr "jälkeen"
+
+#: filter/libfilter-i18n.h:28
+msgid "before"
+msgstr "ennen"
+
+#: filter/libfilter-i18n.h:29
+msgid "contains"
+msgstr "sisältää"
+
+#: filter/libfilter-i18n.h:30
+msgid "does not contain"
+msgstr "ei sisällä"
+
+#: filter/libfilter-i18n.h:31
+msgid "does not end with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:32
+msgid "does not exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:33
+msgid "does not match regex"
+msgstr ""
+
+#: filter/libfilter-i18n.h:34
+msgid "does not sound like"
 msgstr ""
 
-#: filter/score-editor.c:165
+#: filter/libfilter-i18n.h:35
+msgid "does not start with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:36
+msgid "ends with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
+msgid "exists"
+msgstr ""
+
+#: filter/libfilter-i18n.h:38
+msgid "is greater than"
+msgstr "on suurempi kuin"
+
+#: filter/libfilter-i18n.h:39
+msgid "is less than"
+msgstr "on pienempi kuin"
+
+#: filter/libfilter-i18n.h:40
+msgid "is not"
+msgstr "ei ole"
+
+#: filter/libfilter-i18n.h:41
+msgid "is"
+msgstr "on"
+
+#: filter/libfilter-i18n.h:42
+msgid "matches regex"
+msgstr ""
+
+#: filter/libfilter-i18n.h:43
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:44
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:45
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:46
+msgid "starts with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:47
+msgid "was after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:48
+msgid "was before"
+msgstr ""
+
+#: filter/score-editor.c:127
+msgid "Add Rule"
+msgstr "Lisää sääntö"
+
+#: filter/score-editor.c:166
 msgid "Edit Score Rule"
 msgstr ""
 
@@ -2877,45 +3930,89 @@ msgstr ""
 msgid "Score"
 msgstr ""
 
-#: filter/vfolder-editor.c:192
+#: filter/vfolder-editor.c:155
+msgid "Add VFolder Rule"
+msgstr ""
+
+#: filter/vfolder-editor.c:204
 msgid "Edit VFolder Rule"
 msgstr ""
 
-#: mail/component-factory.c:236
+#: mail/component-factory.c:229
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:243
+#: mail/component-factory.c:235
 msgid "Cannot initialize Evolution's mail summary component."
 msgstr "Evolutionin sähköpostin yhteenvetokomponentin alustus epäonnistui."
 
-#: mail/component-factory.c:248
+#: mail/component-factory.c:240
 msgid "Cannot initialize Evolution's mail storage hash."
 msgstr ""
 
-#: mail/folder-browser.c:485
+#: mail/component-factory.c:278
+msgid "Cannot register storage with shell"
+msgstr ""
+
+#: mail/folder-browser.c:137
+msgid "Body or subject contains"
+msgstr ""
+
+#: mail/folder-browser.c:138
+msgid "Body contains"
+msgstr ""
+
+#: mail/folder-browser.c:139
+msgid "Subject contains"
+msgstr "Aihe sisältää"
+
+#: mail/folder-browser.c:140
+msgid "Body does not contain"
+msgstr ""
+
+#: mail/folder-browser.c:141
+msgid "Subject does not contain"
+msgstr "Aihe ei sisällä"
+
+#: mail/folder-browser.c:142
+msgid "Custom search"
+msgstr ""
+
+#: mail/folder-browser.c:314
+msgid "Custom"
+msgstr ""
+
+#: mail/folder-browser.c:492
 msgid "Full Search"
 msgstr ""
 
-#: mail/folder-browser.c:490
+#.
+#. *  This file is autogenerated from evolution-event-editor.xml, do not edit
+#. *
+#. *  This file contains translatable strings generated by
+#. * bonobo-ui-extract. Add this file to your project's
+#. * POTFILES.in. DO NOT compile it as part of your application.
+#.
+#: mail/folder-browser.c:497 ui/evolution-event-editor.h:9
 msgid "Save"
 msgstr "Tallenna"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:76
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:219
 #, c-format
-msgid "Mail from %s"
-msgstr ""
+msgid "Subject is %s"
+msgstr "Aihe on %s"
 
-#: mail/mail-autofilter.c:283 mail/mail-autofilter.c:332
-msgid "Add Filter Rule"
+#: mail/mail-autofilter.c:237
+#, c-format
+msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:328
+#: mail/mail-autofilter.c:339
 #, c-format
 msgid "%s mailing list"
 msgstr ""
@@ -2940,21 +4037,37 @@ msgid ""
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:243
+#: mail/mail-callbacks.c:163 mail/mail-callbacks.c:175
+msgid "You have no mail sources configured"
+msgstr ""
+
+#: mail/mail-callbacks.c:212
+msgid "You have not set a mail transport method"
+msgstr ""
+
+#: mail/mail-callbacks.c:221
+msgid "You have no Outbox configured"
+msgstr ""
+
+#: mail/mail-callbacks.c:245
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:513
+#: mail/mail-callbacks.c:290
+msgid "You must specify recipients in order to send this message."
+msgstr ""
+
+#: mail/mail-callbacks.c:532
 msgid "Move message(s) to"
 msgstr "Siirrä viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:515
+#: mail/mail-callbacks.c:534
 msgid "Copy message(s) to"
 msgstr "Kopioi viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:617
+#: mail/mail-callbacks.c:649
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -2962,18 +4075,18 @@ msgstr ""
 "Voit muokata vain Luonnokset\n"
 "-kansiossa olevia viestejä."
 
-#: mail/mail-callbacks.c:716
+#: mail/mail-callbacks.c:748
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:761 mail/message-list.c:1560
+#: mail/mail-callbacks.c:793 mail/message-list.c:2033
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/mail-callbacks.c:808
+#: mail/mail-callbacks.c:840
 msgid "Printing of message failed"
 msgstr "Viestin tulostus epäonnistui"
 
@@ -3023,19 +4136,23 @@ msgstr "Polku:"
 msgid "Authentication:"
 msgstr "Todentaminen:"
 
-#: mail/mail-config-gui.c:941
+#: mail/mail-config-gui.c:940
 msgid "Detect supported types..."
 msgstr "Etsi tuettuja tyyppejä..."
 
-#: mail/mail-config-gui.c:968
+#: mail/mail-config-gui.c:967
 msgid "Don't delete messages from server"
 msgstr "Älä poista viestejä palvelimelta"
 
-#: mail/mail-config-gui.c:980
+#: mail/mail-config-gui.c:979
 msgid "Test Settings"
 msgstr "Kokeile asetuksia"
 
-#: mail/mail-config-gui.c:1112 mail/mail-config-gui.c:1160
+#: mail/mail-config-gui.c:1106
+msgid "Mail source type:"
+msgstr ""
+
+#: mail/mail-config-gui.c:1111 mail/mail-config-gui.c:1159
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -3044,7 +4161,11 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1136
+#: mail/mail-config-gui.c:1130
+msgid "News source type:"
+msgstr ""
+
+#: mail/mail-config-gui.c:1135
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -3053,44 +4174,54 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1155
+#: mail/mail-config-gui.c:1154
 msgid "Mail transport type:"
 msgstr ""
 
-#: mail/mail-config-gui.c:1210
+#: mail/mail-config-gui.c:1209
 msgid "Add Identity"
 msgstr ""
 
-#: mail/mail-config-gui.c:1212
+#: mail/mail-config-gui.c:1211
 msgid "Edit Identity"
 msgstr ""
 
-#: mail/mail-config-gui.c:1310
+#: mail/mail-config-gui.c:1309
 msgid "Add Source"
 msgstr "Lisää lähde"
 
-#: mail/mail-config-gui.c:1312
+#: mail/mail-config-gui.c:1311
 msgid "Edit Source"
 msgstr "Muokkaa lähdettä"
 
-#: mail/mail-config-gui.c:1407
+#: mail/mail-config-gui.c:1406
 msgid "Add News Server"
 msgstr "Lisää uutispalvelin"
 
-#: mail/mail-config-gui.c:1409
+#: mail/mail-config-gui.c:1408
 msgid "Edit News Server"
 msgstr "Muokkaa uutispalvelinta"
 
-#: mail/mail-config-gui.c:2283
+#: mail/mail-config-gui.c:2232
+#, c-format
+msgid "Testing \"%s\""
+msgstr "Kokeillaan: \"%s\""
+
+#: mail/mail-config-gui.c:2234
+#, c-format
+msgid "Test connection to \"%s\""
+msgstr "Koeyhteys epäonnistui: \"%s\""
+
+#: mail/mail-config-gui.c:2275
 msgid "The connection was successful!"
 msgstr "Yhdistäminen onnistui!"
 
-#: mail/mail-config-gui.c:2333
+#: mail/mail-config-gui.c:2325
 #, c-format
 msgid "Querying authorization capabilities of \"%s\""
 msgstr ""
 
-#: mail/mail-config-gui.c:2335
+#: mail/mail-config-gui.c:2327
 #, c-format
 msgid "Query authorization at \"%s\""
 msgstr ""
@@ -3140,15 +4271,14 @@ msgstr ""
 msgid "Identities"
 msgstr ""
 
+#: mail/mail-config.glade.h:8
+msgid "Address"
+msgstr "Osoite"
+
 #: mail/mail-config.glade.h:9
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "Muokkaa"
-
 #: mail/mail-config.glade.h:15
 msgid "Sources"
 msgstr "Lähteet"
@@ -3173,6 +4303,21 @@ msgstr "Lähetä viestit HTML-muodossa"
 msgid "Mark message as seen [ms]: "
 msgstr "Merkitse viesti nähdyksi [ms]: "
 
+#: mail/mail-crypto.c:137
+#, c-format
+msgid "Couldn't create pipe to %s: %s"
+msgstr ""
+
+#: mail/mail-crypto.c:164
+#, c-format
+msgid "Could not execute %s: %s\n"
+msgstr ""
+
+#: mail/mail-crypto.c:168
+#, c-format
+msgid "Cannot fork %s: %s"
+msgstr ""
+
 #: mail/mail-crypto.c:345 mail/mail-crypto.c:441 mail/mail-crypto.c:604
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Anna PGP/GPG-salasanasi"
@@ -3190,16 +4335,37 @@ msgstr ""
 msgid "No GPG/PGP program available."
 msgstr "GPG/PGP-ohjelmaa ei ole."
 
-#: mail/mail-display.c:68
+#: mail/mail-display.c:66
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-display.c:72
+#: mail/mail-display.c:70
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
+#: mail/mail-display.c:84
+#, c-format
+msgid ""
+"Could not open file %s:\n"
+"%s"
+msgstr ""
+
+#: mail/mail-display.c:96
+#, c-format
+msgid "Could not write data: %s"
+msgstr ""
+
+#: mail/mail-display.c:192
+msgid "Save Attachment"
+msgstr "Tallenna liite"
+
+#: mail/mail-display.c:232
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Väliaikaishakemistoa ei voitu luoda: %s"
+
 #: mail/mail-display.c:274
 msgid "Save to Disk..."
 msgstr ""
@@ -3213,19 +4379,68 @@ msgstr ""
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:299
+#: mail/mail-display.c:302
 msgid "External Viewer"
 msgstr "Ulkoinen katselin"
 
-#: mail/mail-display.c:322
+#: mail/mail-display.c:325
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:326
+#: mail/mail-display.c:329
 msgid "Hide"
 msgstr ""
 
+#: mail/mail-format.c:477
+#, c-format
+msgid "%s attachment"
+msgstr ""
+
+#: mail/mail-format.c:594
+msgid "Reply-To:"
+msgstr ""
+
+#: mail/mail-format.c:834
+msgid "No GPG/PGP support available in this copy of Evolution."
+msgstr ""
+
+#: mail/mail-format.c:846
+msgid "Encrypted message not displayed"
+msgstr ""
+
+#: mail/mail-format.c:852
+msgid "Encrypted message"
+msgstr "Salattu viesti"
+
+#: mail/mail-format.c:853
+msgid "Click icon to decrypt."
+msgstr ""
+
+#: mail/mail-format.c:1455
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1467
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr ""
+
+#: mail/mail-format.c:1471
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1505
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+
+#: mail/mail-format.c:1510
+msgid "Malformed external-body part."
+msgstr ""
+
 #: mail/mail-local.c:279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
@@ -3236,6 +4451,35 @@ msgstr ""
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
+#: mail/mail-local.c:327
+msgid "Closing current folder"
+msgstr ""
+
+#: mail/mail-local.c:359
+msgid "Renaming old folder and opening"
+msgstr ""
+
+#: mail/mail-local.c:380
+msgid "Creating new folder"
+msgstr "Luodaan uutta kansiota"
+
+#: mail/mail-local.c:395
+msgid "Copying messages"
+msgstr "Kopioidaan viestejä"
+
+#: mail/mail-local.c:407
+#, 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:443
+msgid ""
+"If you can no longer open this mailbox, then\n"
+"you may need to repair it manually."
+msgstr ""
+
 #. This is how we could do to display extra information about the
 #. folder.
 #: mail/mail-local-storage.c:97
@@ -3252,256 +4496,263 @@ msgstr ""
 msgid "Fetch email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:109
-#, c-format
-msgid "Retrieving messages : %s"
-msgstr ""
-
-#: mail/mail-ops.c:252
+#: mail/mail-ops.c:310
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: mail/mail-ops.c:309
+#: mail/mail-ops.c:365
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:311
+#: mail/mail-ops.c:367
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:440
+#: mail/mail-ops.c:499
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Lähetetään \"%s\""
 
-#: mail/mail-ops.c:445
+#: mail/mail-ops.c:504
 msgid "Sending a message without a subject"
 msgstr "Lähetetään viesti ilman aihetta"
 
-#: mail/mail-ops.c:448
+#: mail/mail-ops.c:507
 #, c-format
 msgid "Send \"%s\""
 msgstr "Lähetä \"%s\""
 
-#: mail/mail-ops.c:451
+#: mail/mail-ops.c:510
 msgid "Send a message without a subject"
 msgstr "Lähetä viesti ilman aihetta"
 
-#: mail/mail-ops.c:595
+#: mail/mail-ops.c:681
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:597
+#: mail/mail-ops.c:683
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:733 mail/mail-ops.c:740
+#: mail/mail-ops.c:819 mail/mail-ops.c:826
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:737 mail/mail-ops.c:743
+#: mail/mail-ops.c:823 mail/mail-ops.c:829
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:815
+#: mail/mail-ops.c:901
 #, c-format
 msgid "Expunging \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:817
+#: mail/mail-ops.c:903
 #, c-format
 msgid "Expunge \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:876
+#: mail/mail-ops.c:962
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Siirretään viestejä \"%s\" -> \"%s\""
 
-#: mail/mail-ops.c:878
+#: mail/mail-ops.c:964
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopioidaan viestejä \"%s\" -> \"%s\""
 
-#: mail/mail-ops.c:881
+#: mail/mail-ops.c:967
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Siirrä viestejä kansiosta \"%s\" kansioon \"%s\""
 
-#: mail/mail-ops.c:883
+#: mail/mail-ops.c:969
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopioi viestejä kansiosta \"%s\" kansioon \"%s\""
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:1000
 msgid "Moving"
 msgstr "Siirretään"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:1003
 msgid "Copying"
 msgstr "Kopioidaan"
 
-#: mail/mail-ops.c:937
+#: mail/mail-ops.c:1023
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1102
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1019
+#: mail/mail-ops.c:1105
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1050
+#: mail/mail-ops.c:1136
 #, c-format
 msgid "Marking message %d of %d"
 msgstr "Siirretään viestejä \"%s\" -> \"%s\""
 
-#: mail/mail-ops.c:1170
+#: mail/mail-ops.c:1259
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1173
+#: mail/mail-ops.c:1261
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1244 mail/subscribe-dialog.c:163
+#: mail/mail-ops.c:1330 mail/subscribe-dialog.c:322
 msgid "(No description)"
 msgstr "(ei kuvausta)"
 
-#: mail/mail-ops.c:1304
+#: mail/mail-ops.c:1391
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1307
+#: mail/mail-ops.c:1394
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1410
+#: mail/mail-ops.c:1497
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1415
+#: mail/mail-ops.c:1502
 msgid "Forwarding a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:1418
+#: mail/mail-ops.c:1505
 #, c-format
 msgid "Forward message \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1423
+#: mail/mail-ops.c:1510
 msgid "Forward a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:1460
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1477
+#: mail/mail-ops.c:1564
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 
-#: mail/mail-ops.c:1563
+#: mail/mail-ops.c:1650
 #, c-format
 msgid "Loading \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1652
 #, c-format
 msgid "Load \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1667
+#: mail/mail-ops.c:1754
 #, c-format
 msgid "Creating \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1669
+#: mail/mail-ops.c:1756
 #, c-format
 msgid "Create \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1717
+#: mail/mail-ops.c:1804
 msgid "Exception while reporting result to shell component listener."
 msgstr ""
 
-#: mail/mail-ops.c:1763
+#: mail/mail-ops.c:1850
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Synkronoidaan \"%s\""
 
-#: mail/mail-ops.c:1765
+#: mail/mail-ops.c:1852
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Synkronoi \"%s\""
 
-#: mail/mail-ops.c:1828
+#: mail/mail-ops.c:1915
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1831
+#: mail/mail-ops.c:1918
 msgid "Clearing message display"
 msgstr ""
 
-#: mail/mail-ops.c:1834
+#: mail/mail-ops.c:1921
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1837
+#: mail/mail-ops.c:1924
 msgid "Clear message display"
 msgstr ""
 
-#: mail/mail-ops.c:1946
+#: mail/mail-ops.c:2033
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1949
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2053
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Loading %s Folder"
 msgstr ""
 
-#: mail/mail-ops.c:2055
+#: mail/mail-ops.c:2142
 #, c-format
 msgid "Load %s Folder"
 msgstr ""
 
-#: mail/mail-ops.c:2122
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2125
+#: mail/mail-ops.c:2212
 #, c-format
 msgid "View messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2151
+#: mail/mail-ops.c:2238
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr ""
 
+#: mail/mail-search-dialogue.c:101
+msgid "Cancel"
+msgstr "Peruuta"
+
+#: mail/mail-summary.c:97 mail/mail-threads.c:701
+msgid "Incomplete message written on pipe!"
+msgstr ""
+
+#: mail/mail-summary.c:370
+msgid "Mailbox summary"
+msgstr ""
+
 #: mail/mail-threads.c:299
 #, c-format
 msgid ""
@@ -3516,10 +4767,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:701
-msgid "Incomplete message written on pipe!"
-msgstr ""
-
 #: mail/mail-threads.c:705
 msgid "Error reading commands from dispatching thread."
 msgstr ""
@@ -3541,153 +4788,225 @@ msgstr ""
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
+#. Get all uids of source
+#: mail/mail-tools.c:264
+#, c-format
+msgid "Examining %s"
+msgstr ""
+
 #: mail/mail-tools.c:294
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
-#: mail/mail-tools.c:387
+#. Info
+#: mail/mail-tools.c:315
 #, c-format
-msgid "[%s] %s"
+msgid "Retrieving message %d of %d"
 msgstr ""
 
-#: mail/mail-tools.c:389
+#. Append it to dest
+#: mail/mail-tools.c:328
+#, c-format
+msgid "Writing message %d of %d"
+msgstr ""
+
+#: mail/mail-tools.c:357
+#, c-format
+msgid "Saving changes to %s"
+msgstr ""
+
+#: mail/mail-tools.c:391
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr ""
 
-#: mail/mail-tools.c:398
+#: mail/mail-tools.c:400
 msgid "Fwd: (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:435
+#: mail/mail-tools.c:437
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:437
+#: mail/mail-tools.c:439
 msgid "Forwarded message (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:549
+#: mail/mail-tools.c:510
 #, c-format
 msgid "Don't know protocol to open URI `%s'"
 msgstr ""
 
-#: mail/mail-tools.c:578
+#: mail/mail-tools.c:539
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
 "%s"
 msgstr ""
 
+#: mail/mail-vfolder.c:147
+msgid "VFolders"
+msgstr ""
+
 #: mail/mail-vfolder.c:292
 msgid "New VFolder"
 msgstr ""
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:151 ui/evolution-mail.h:47
+#: mail/mail-view.c:151 ui/evolution-mail.h:34
 msgid "Reply"
 msgstr "Vastaa"
 
-#: mail/mail-view.c:151 ui/evolution-mail.h:48
+#: mail/mail-view.c:151 ui/evolution-mail.h:39
 msgid "Reply to the sender of this message"
 msgstr ""
 
-#: mail/mail-view.c:154 mail/message-list.c:1563 ui/evolution-mail.h:49
+#: mail/mail-view.c:154 mail/message-list.c:2036 ui/evolution-mail.h:35
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
-#: mail/mail-view.c:154 ui/evolution-mail.h:50
+#: mail/mail-view.c:154 ui/evolution-mail.h:38
 msgid "Reply to all recipients of this message"
 msgstr ""
 
-#: mail/mail-view.c:157 ui/evolution-mail.h:51
+#: mail/mail-view.c:157 ui/evolution-mail.h:19
 msgid "Forward"
 msgstr ""
 
-#: mail/mail-view.c:157 ui/evolution-mail.h:52
+#: mail/mail-view.c:157 ui/evolution-mail.h:20
 msgid "Forward this message"
 msgstr ""
 
-#: mail/mail-view.c:161 ui/evolution-addressbook.h:18
-#: ui/evolution-calendar.h:24 ui/evolution-mail.h:57
+#: mail/mail-view.c:161 ui/evolution-addressbook.h:16
+#: ui/evolution-calendar.h:26 ui/evolution-mail.h:29
 msgid "Print"
 msgstr "Tulosta"
 
-#: mail/mail-view.c:161 ui/evolution-mail.h:58
+#: mail/mail-view.c:161 ui/evolution-mail.h:33
 msgid "Print the selected message"
 msgstr "Tulosta valittu viesti"
 
-#: mail/mail-view.c:163 ui/evolution-mail.h:60
+#: mail/mail-view.c:163 ui/evolution-mail.h:14
 msgid "Delete this message"
 msgstr "Poista tämä viesti"
 
-#: mail/message-list.c:1558
+#: mail/message-list.c:537
+msgid "Unseen"
+msgstr ""
+
+#: mail/message-list.c:2031
 msgid "Open in New Window"
 msgstr "Avaa uudessa ikkunassa"
 
-#: mail/message-list.c:1559
+#: mail/message-list.c:2032
 msgid "Edit Message"
 msgstr "Muokkaa viestiä"
 
-#: mail/message-list.c:1562
+#: mail/message-list.c:2035
 msgid "Reply to Sender"
 msgstr "Vastaa lähettäjälle"
 
-#: mail/message-list.c:1564
+#: mail/message-list.c:2037
 msgid "Forward Message"
 msgstr ""
 
-#: mail/message-list.c:1566
+#: mail/message-list.c:2039
 msgid "Delete Message"
 msgstr "Poista viesti"
 
-#: mail/message-list.c:1567
+#: mail/message-list.c:2040
 msgid "Move Message"
 msgstr "Siirrä viesti"
 
-#: mail/message-list.c:1568
+#: mail/message-list.c:2041
 msgid "Copy Message"
 msgstr "Kopioi viesti"
 
-#: mail/message-list.c:1570
+#: mail/message-list.c:2043
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/message-list.c:1571
+#: mail/message-list.c:2044
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/message-list.c:1572
+#: mail/message-list.c:2045
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/message-list.c:1574
+#: mail/message-list.c:2047
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/message-list.c:1575
+#: mail/message-list.c:2048
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/message-list.c:1576
+#: mail/message-list.c:2049
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/message-list.c:1577 mail/message-list.c:1600
+#: mail/message-list.c:2050 mail/message-list.c:2073
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/message-list.c:1602
+#: mail/message-list.c:2075
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/subscribe-dialog.c:118
-msgid "Display folders containing:"
+#: mail/message-list.c:2225
+msgid "Rebuilding message view"
+msgstr ""
+
+#: mail/message-list.c:2227
+msgid "Rebuild message view"
+msgstr ""
+
+#: mail/message-thread.c:582
+msgid "Threading message list"
+msgstr ""
+
+#: mail/message-thread.c:584
+msgid "Thread message list"
+msgstr ""
+
+#: mail/subscribe-dialog.c:137
+msgid "Display folders starting with:"
+msgstr ""
+
+#: mail/subscribe-dialog.c:170
+#, c-format
+msgid "Getting store for \"%s\""
+msgstr ""
+
+#: mail/subscribe-dialog.c:173
+#, c-format
+msgid "Get store for \"%s\""
+msgstr ""
+
+#: mail/subscribe-dialog.c:278
+#, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr ""
+
+#: mail/subscribe-dialog.c:281
+#, c-format
+msgid "Subscribe to folder \"%s\""
+msgstr ""
+
+#: mail/subscribe-dialog.c:385
+#, c-format
+msgid "Unsubscribing to folder \"%s\""
+msgstr ""
+
+#: mail/subscribe-dialog.c:388
+#, c-format
+msgid "Unsubscribe to folder \"%s\""
 msgstr ""
 
 #: shell/e-setup.c:106 shell/e-setup.c:175
@@ -3703,7 +5022,6 @@ msgstr ""
 #: shell/e-setup.c:111
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
-""
 
 #: shell/e-setup.c:152
 msgid "Could not update files correctly"
@@ -3729,7 +5047,7 @@ msgid ""
 "%s\n"
 "Error: %s"
 msgstr ""
-"Ei voida luoda hakemistoa\n"
+"Ei voitu luoda hakemistoa\n"
 "%s\n"
 "Virhe: %s"
 
@@ -3820,12 +5138,12 @@ msgstr ""
 msgid "Folders"
 msgstr ""
 
-#: shell/e-shell-view.c:993
+#: shell/e-shell-view.c:1021
 #, c-format
 msgid "Evolution - %s"
 msgstr ""
 
-#: shell/e-shell-view.c:1133
+#: shell/e-shell-view.c:1167
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' has died unexpectedly.  :-(\n"
@@ -3904,63 +5222,60 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage.c:127
+#: shell/e-storage.c:128
 msgid "(No name)"
 msgstr "(Ei nimeä)"
 
-#: shell/e-storage.c:318
+#: shell/e-storage.c:327
 msgid "No error"
 msgstr "Ei virhettä"
 
-#: shell/e-storage.c:320
+#: shell/e-storage.c:329
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
-#: shell/e-storage.c:322
+#: shell/e-storage.c:331
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:324
+#: shell/e-storage.c:333
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:326
+#: shell/e-storage.c:335
 msgid "I/O error"
 msgstr "I/O-virhe"
 
-#: shell/e-storage.c:328
+#: shell/e-storage.c:337
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:330
+#: shell/e-storage.c:339
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:332
+#: shell/e-storage.c:341
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:334
+#: shell/e-storage.c:343
 msgid "Permission denied"
 msgstr ""
 
-#: shell/e-storage.c:336
+#: shell/e-storage.c:345
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:338
+#: shell/e-storage.c:347
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:340
-msgid "Unknown error"
-msgstr "Tuntematon virhe"
-
-#: shell/e-storage-set-view.c:223 ui/evolution.h:15 ui/evolution.h:29
+#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.h:91
+#: ui/evolution.h:39
 msgid "_View"
 msgstr "_Näytä"
 
-#: shell/e-storage-set-view.c:223
+#: shell/e-storage-set-view.c:235
 msgid "View the selected folder"
 msgstr ""
 
@@ -3998,7 +5313,7 @@ msgstr ""
 msgid "Cannot initialize the Evolution shell."
 msgstr ""
 
-#: shell/main.c:160
+#: shell/main.c:162
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobon komponenttijärjestelmän alustus epäonnistui"
 
@@ -4010,75 +5325,68 @@ msgstr "Bonobon komponenttijärjestelmän alustus epäonnistui"
 #. * POTFILES.in. DO NOT compile it as part of your application.
 #.
 #: ui/evolution-addressbook-ldap.h:9
-msgid "_Actions"
-msgstr "T_oiminnot"
-
-#: ui/evolution-addressbook-ldap.h:10
 msgid "N_ew Directory Server"
 msgstr ""
 
-#.
-#. *  This file is autogenerated from evolution-addressbook.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-addressbook.h:9
-msgid "_Print Contacts..."
-msgstr "_Tulosta kontaktit..."
-
-#: ui/evolution-addressbook.h:11
-msgid "_New Contact"
-msgstr "_Uusi kontakti"
-
-#: ui/evolution-addressbook.h:12
-msgid "_Tools"
-msgstr "_Työkalut"
-
-#: ui/evolution-addressbook.h:13
-msgid "_Search for contacts"
-msgstr "_Etsi kontakteja"
-
-#: ui/evolution-addressbook.h:14 ui/evolution-calendar.h:22
-msgid "New"
-msgstr "Uusi"
+#: ui/evolution-addressbook-ldap.h:10
+msgid "_Actions"
+msgstr "T_oiminnot"
 
-#: ui/evolution-addressbook.h:15
+#: ui/evolution-addressbook.h:10
 msgid "Create a new contact"
 msgstr "Luo uusi kontakti"
 
-#: ui/evolution-addressbook.h:16
+#: ui/evolution-addressbook.h:12
+msgid "Delete a contact"
+msgstr "Poista kontakti"
+
+#: ui/evolution-addressbook.h:13 ui/evolution-event-editor.h:33
 msgid "Find"
 msgstr "Etsi"
 
-#: ui/evolution-addressbook.h:17
+#: ui/evolution-addressbook.h:14
 msgid "Find a contact"
 msgstr "Etsi kontakti"
 
-#: ui/evolution-addressbook.h:19
+#: ui/evolution-addressbook.h:15 ui/evolution-calendar.h:21
+msgid "New"
+msgstr "Uusi"
+
+#: ui/evolution-addressbook.h:17
 msgid "Print contacts"
 msgstr "Tulosta kontaktit"
 
-#: ui/evolution-addressbook.h:21
-msgid "Delete a contact"
-msgstr "Poista kontakti"
+#: ui/evolution-addressbook.h:18
+msgid "Stop"
+msgstr "Pysäytä"
 
-#: ui/evolution-addressbook.h:22
+#: ui/evolution-addressbook.h:19
+msgid "Stop Loading"
+msgstr "Pysäytä lataaminen"
+
+#: ui/evolution-addressbook.h:20
 msgid "View All"
 msgstr "Näytä kaikki"
 
-#: ui/evolution-addressbook.h:23
+#: ui/evolution-addressbook.h:21
 msgid "View all contacts"
 msgstr "Näytä kaikki kontaktit"
 
+#: ui/evolution-addressbook.h:22
+msgid "_New Contact"
+msgstr "_Uusi kontakti"
+
+#: ui/evolution-addressbook.h:23
+msgid "_Print Contacts..."
+msgstr "_Tulosta kontaktit..."
+
 #: ui/evolution-addressbook.h:24
-msgid "Stop"
-msgstr "Pysäytä"
+msgid "_Search for contacts"
+msgstr "_Etsi kontakteja"
 
-#: ui/evolution-addressbook.h:25
-msgid "Stop Loading"
-msgstr "Pysäytä lataaminen"
+#: ui/evolution-addressbook.h:25 ui/evolution-event-editor.h:113
+msgid "_Tools"
+msgstr "_Työkalut"
 
 #.
 #. *  This file is autogenerated from evolution-calendar.xml, do not edit
@@ -4087,125 +5395,125 @@ msgstr "Pysäytä lataaminen"
 #. * bonobo-ui-extract. Add this file to your project's
 #. * POTFILES.in. DO NOT compile it as part of your application.
 #.
-#: ui/evolution-calendar.h:9 ui/evolution.h:14
-msgid "_New"
-msgstr "_Uusi"
+#: ui/evolution-calendar.h:9
+msgid "5 Days"
+msgstr "5 päivää"
 
 #: ui/evolution-calendar.h:10
-msgid "New Ca_lendar"
-msgstr ""
+msgid "Alter preferences"
+msgstr "Muuta asetuksia"
 
 #: ui/evolution-calendar.h:11
-msgid "Create a new calendar"
-msgstr "Luo uusi kalenteri"
+msgid "Calendar Preferences..."
+msgstr "Kalenterin asetukset..."
 
 #: ui/evolution-calendar.h:12
-msgid "_Open"
-msgstr "_Avaa"
+msgid "Create a new appointment"
+msgstr "Luo uusi tapaaminen"
 
 #: ui/evolution-calendar.h:13
-msgid "_Open Calendar"
-msgstr "_Avaa kalenteri"
+msgid "Create a new calendar"
+msgstr "Luo uusi kalenteri"
 
 #: ui/evolution-calendar.h:14
-msgid "Open a calendar"
-msgstr "Avaa kalenteri"
+msgid "Day"
+msgstr "Päivä"
 
 #: ui/evolution-calendar.h:15
-msgid "_Save Calendar As"
-msgstr "Tallenna kalenteri _nimellä"
+msgid "Go back in time"
+msgstr ""
 
 #: ui/evolution-calendar.h:16
-msgid "Save calendar As something else"
+msgid "Go forward in time"
 msgstr ""
 
 #: ui/evolution-calendar.h:17
-msgid "_Print this calendar"
-msgstr "_Tulosta tämä kalenteri"
+msgid "Go to"
+msgstr ""
 
 #: ui/evolution-calendar.h:18
-msgid "_New appointment..."
-msgstr "_Uusi tapaaminen..."
+msgid "Go to a specific date"
+msgstr ""
 
-#: ui/evolution-calendar.h:19 ui/evolution-calendar.h:23
-msgid "Create a new appointment"
-msgstr "Luo uusi tapaaminen"
+#: ui/evolution-calendar.h:19
+msgid "Go to present time"
+msgstr ""
 
 #: ui/evolution-calendar.h:20
-msgid "Calendar Preferences..."
-msgstr "Kalenterin asetukset..."
+msgid "Month"
+msgstr "Kuukausi"
 
-#: ui/evolution-calendar.h:21
-msgid "Alter preferences"
-msgstr "Muuta asetuksia"
+#: ui/evolution-calendar.h:22
+msgid "New Ca_lendar"
+msgstr ""
 
-#: ui/evolution-calendar.h:25
-msgid "Print this calendar"
-msgstr "Tulosta tämä kalenteri"
+#: ui/evolution-calendar.h:23 ui/evolution-event-editor.h:45
+msgid "Next"
+msgstr ""
+
+#: ui/evolution-calendar.h:24
+msgid "Open a calendar"
+msgstr "Avaa kalenteri"
 
-#: ui/evolution-calendar.h:26
+#: ui/evolution-calendar.h:25
 msgid "Prev"
 msgstr ""
 
 #: ui/evolution-calendar.h:27
-msgid "Go back in time"
-msgstr ""
+msgid "Print this calendar"
+msgstr "Tulosta tämä kalenteri"
 
-#: ui/evolution-calendar.h:28 widgets/misc/e-dateedit.c:331
-msgid "Today"
+#: ui/evolution-calendar.h:28
+msgid "Save calendar As something else"
 msgstr ""
 
 #: ui/evolution-calendar.h:29
-msgid "Go to present time"
-msgstr ""
+msgid "Show 1 day"
+msgstr "Näytä 1 päivä"
 
 #: ui/evolution-calendar.h:30
-msgid "Next"
-msgstr ""
+msgid "Show 1 month"
+msgstr "Näytä 1 kuukausi"
 
 #: ui/evolution-calendar.h:31
-msgid "Go forward in time"
-msgstr ""
+msgid "Show 1 week"
+msgstr "Näytä 1 viikko"
 
 #: ui/evolution-calendar.h:32
-msgid "Go to"
-msgstr ""
+msgid "Show the working week"
+msgstr "Näytä työviikko"
 
-#: ui/evolution-calendar.h:33
-msgid "Go to a specific date"
+#: ui/evolution-calendar.h:33 widgets/misc/e-dateedit.c:331
+msgid "Today"
 msgstr ""
 
 #: ui/evolution-calendar.h:34
-msgid "Day"
-msgstr "Päivä"
+msgid "Week"
+msgstr "Viikko"
 
-#: ui/evolution-calendar.h:35
-msgid "Show 1 day"
-msgstr "Näytä 1 päivä"
+#: ui/evolution-calendar.h:35 ui/evolution.h:35
+msgid "_New"
+msgstr "_Uusi"
 
 #: ui/evolution-calendar.h:36
-msgid "5 Days"
-msgstr "5 päivää"
+msgid "_New appointment..."
+msgstr "_Uusi tapaaminen..."
 
 #: ui/evolution-calendar.h:37
-msgid "Show the working week"
-msgstr "Näytä työviikko"
+msgid "_Open"
+msgstr "_Avaa"
 
 #: ui/evolution-calendar.h:38
-msgid "Week"
-msgstr "Viikko"
+msgid "_Open Calendar"
+msgstr "_Avaa kalenteri"
 
 #: ui/evolution-calendar.h:39
-msgid "Show 1 week"
-msgstr "Näytä 1 viikko"
+msgid "_Print this calendar"
+msgstr "_Tulosta tämä kalenteri"
 
 #: ui/evolution-calendar.h:40
-msgid "Month"
-msgstr "Kuukausi"
-
-#: ui/evolution-calendar.h:41
-msgid "Show 1 month"
-msgstr "Näytä 1 kuukausi"
+msgid "_Save Calendar As"
+msgstr "Tallenna kalenteri _nimellä"
 
 #.
 #. *  This file is autogenerated from evolution-contact-editor.xml, do not edit
@@ -4214,12 +5522,12 @@ msgstr "Näytä 1 kuukausi"
 #. * bonobo-ui-extract. Add this file to your project's
 #. * POTFILES.in. DO NOT compile it as part of your application.
 #.
-#: ui/evolution-contact-editor.h:9 ui/evolution-subscribe.h:9
-#: ui/evolution.h:13
+#: ui/evolution-contact-editor.h:9 ui/evolution-event-editor.h:55
+#: ui/evolution-subscribe.h:19 ui/evolution.h:29
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ui/evolution-contact-editor.h:10
+#: ui/evolution-contact-editor.h:10 ui/evolution-event-editor.h:69
 msgid "_Save"
 msgstr "_Tallenna"
 
@@ -4227,11 +5535,11 @@ msgstr "_Tallenna"
 msgid "Save _As"
 msgstr "Tallenna _nimellä..."
 
-#: ui/evolution-contact-editor.h:13
+#: ui/evolution-contact-editor.h:13 ui/evolution-event-editor.h:66
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: ui/evolution-contact-editor.h:15
+#: ui/evolution-contact-editor.h:15 ui/evolution-event-editor.h:11
 msgid "Save and Close"
 msgstr "Tallenna ja sulje"
 
@@ -4239,11 +5547,11 @@ msgstr "Tallenna ja sulje"
 msgid "Save the contact and close the dialog box"
 msgstr "Tallenna kontakti ja sulje ikkuna"
 
-#: ui/evolution-contact-editor.h:17
+#: ui/evolution-contact-editor.h:17 ui/evolution-event-editor.h:15
 msgid "Print..."
 msgstr "Tulosta..."
 
-#: ui/evolution-contact-editor.h:18
+#: ui/evolution-contact-editor.h:18 ui/evolution-event-editor.h:16
 msgid "Print this item"
 msgstr ""
 
@@ -4251,6 +5559,427 @@ msgstr ""
 msgid "Delete this item"
 msgstr ""
 
+#: ui/evolution-event-editor.h:10
+msgid "Save the current file"
+msgstr "Tallenna nykyinen tiedosto"
+
+#: ui/evolution-event-editor.h:12
+msgid "Save the appointment and close the dialog box"
+msgstr "Tallenna tapaaminen ja sulje tapaamisikkuna"
+
+#: ui/evolution-event-editor.h:17
+msgid "Print Setup"
+msgstr "Tulostusasetukset"
+
+#: ui/evolution-event-editor.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
+
+#: ui/evolution-event-editor.h:20
+msgid "Close this appointment"
+msgstr "Sulje tämä tapaaminen"
+
+#: ui/evolution-event-editor.h:21
+msgid "Cut"
+msgstr "Leikkaa"
+
+#: ui/evolution-event-editor.h:22
+msgid "Cut the selection"
+msgstr "Leikkaa valinta"
+
+#: ui/evolution-event-editor.h:23 ui/evolution-mail.h:11
+msgid "Copy"
+msgstr "Kopioi"
+
+#: ui/evolution-event-editor.h:24
+msgid "Copy the selection"
+msgstr "Kopioi valinta"
+
+#: ui/evolution-event-editor.h:25
+msgid "Paste"
+msgstr "Liitä"
+
+#: ui/evolution-event-editor.h:26
+msgid "Paste the clipboard"
+msgstr "Liitä leikepöytä"
+
+#: ui/evolution-event-editor.h:27
+msgid "Clear"
+msgstr ""
+
+#: ui/evolution-event-editor.h:28
+msgid "Clear the selection"
+msgstr ""
+
+#: ui/evolution-event-editor.h:29
+msgid "Undo"
+msgstr "Kumoa"
+
+#: ui/evolution-event-editor.h:30
+msgid "Undo the last action"
+msgstr "Kumoa edellinen toiminto"
+
+#: ui/evolution-event-editor.h:31
+msgid "Redo"
+msgstr "Tee uudelleen"
+
+#: ui/evolution-event-editor.h:32
+msgid "Redo the undone action"
+msgstr "Tee kumottu toiminto uudelleen"
+
+#: ui/evolution-event-editor.h:34
+msgid "Search for a string"
+msgstr "Etsi merkkijonoa"
+
+#: ui/evolution-event-editor.h:35
+msgid "Find Again"
+msgstr "Etsi uudelleen"
+
+#: ui/evolution-event-editor.h:36
+msgid "Search again for the same string"
+msgstr "Etsi uudelleen samaa merkkijonoa"
+
+#: ui/evolution-event-editor.h:37
+msgid "Replace"
+msgstr "Korvaa"
+
+#: ui/evolution-event-editor.h:38
+msgid "Replace a string"
+msgstr "Korvaa merkkijono"
+
+#: ui/evolution-event-editor.h:39
+msgid "Select All"
+msgstr "Valitse kaikki"
+
+#: ui/evolution-event-editor.h:40
+msgid "Select everything"
+msgstr "Merkitsee kaikki valituksi"
+
+#: ui/evolution-event-editor.h:41
+msgid "Properties"
+msgstr ""
+
+#: ui/evolution-event-editor.h:42
+msgid "Modify the file's properties"
+msgstr ""
+
+#: ui/evolution-event-editor.h:43
+msgid "Previous"
+msgstr "Edellinen"
+
+#: ui/evolution-event-editor.h:44
+msgid "Go to the previous item"
+msgstr "Siirry edelliseen kohtaan"
+
+#: ui/evolution-event-editor.h:46
+msgid "Go to the next item"
+msgstr "Siirry seuraavaan kohtaan"
+
+#: ui/evolution-event-editor.h:47
+msgid "FIXME: Schedule Meeting"
+msgstr ""
+
+#: ui/evolution-event-editor.h:48
+msgid "Schedule some sort of a meeting"
+msgstr ""
+
+#: ui/evolution-event-editor.h:49
+msgid "About..."
+msgstr "Tietoja..."
+
+#: ui/evolution-event-editor.h:50
+msgid "About this application"
+msgstr ""
+
+#: ui/evolution-event-editor.h:51
+msgid "FIXME: Help"
+msgstr "Apua"
+
+#: ui/evolution-event-editor.h:52
+msgid "See online help"
+msgstr ""
+
+#: ui/evolution-event-editor.h:53
+msgid "Dump XML"
+msgstr ""
+
+#: ui/evolution-event-editor.h:54
+msgid "Dump the UI Xml description"
+msgstr ""
+
+#: ui/evolution-event-editor.h:56
+msgid "FIXME: _Mail Message"
+msgstr ""
+
+#: ui/evolution-event-editor.h:57
+msgid "FIXME: _Contact"
+msgstr "_Kontakti"
+
+#: ui/evolution-event-editor.h:58
+msgid "FIXME: _Task"
+msgstr ""
+
+#: ui/evolution-event-editor.h:59
+msgid "FIXME: Task _Request"
+msgstr ""
+
+#: ui/evolution-event-editor.h:60
+msgid "FIXME: _Journal Entry"
+msgstr ""
+
+#: ui/evolution-event-editor.h:61
+msgid "FIXME: _Note"
+msgstr ""
+
+#: ui/evolution-event-editor.h:62 ui/evolution-event-editor.h:118
+msgid "FIXME: Ch_oose Form..."
+msgstr ""
+
+#: ui/evolution-event-editor.h:63
+msgid "FIXME: _Memo Style"
+msgstr ""
+
+#: ui/evolution-event-editor.h:64
+msgid "FIXME: Define Print _Styles"
+msgstr ""
+
+#: ui/evolution-event-editor.h:65
+msgid "FIXME: Print Pre_view"
+msgstr "Tulostuksen _esikatselu"
+
+#: ui/evolution-event-editor.h:67
+msgid "Print S_etup..."
+msgstr "Tulost_usasetukset"
+
+#: ui/evolution-event-editor.h:68
+msgid "FIXME: S_end"
+msgstr "_Lähetä"
+
+#: ui/evolution-event-editor.h:70
+msgid "Save _As..."
+msgstr "Tallenna _nimellä..."
+
+#: ui/evolution-event-editor.h:71
+msgid "FIXME: Save Attac_hments..."
+msgstr "Tallenna L_iitteet..."
+
+#: ui/evolution-event-editor.h:73
+msgid "FIXME: _Move to Folder..."
+msgstr "_Siirrä kansioon..."
+
+#: ui/evolution-event-editor.h:74
+msgid "FIXME: Cop_y to Folder..."
+msgstr "_Kopioi kansioon..."
+
+#: ui/evolution-event-editor.h:75
+msgid "_Properties..."
+msgstr ""
+
+#: ui/evolution-event-editor.h:76
+msgid "_Close"
+msgstr "_Sulje"
+
+#: ui/evolution-event-editor.h:77 ui/evolution-subscribe.h:18
+#: ui/evolution.h:28
+msgid "_Edit"
+msgstr "_Muokkaa"
+
+#: ui/evolution-event-editor.h:78
+msgid "_Undo"
+msgstr ""
+
+#: ui/evolution-event-editor.h:79
+msgid "_Redo"
+msgstr ""
+
+#: ui/evolution-event-editor.h:80
+msgid "C_ut"
+msgstr "L_eikkaa"
+
+#: ui/evolution-event-editor.h:81
+msgid "_Copy"
+msgstr "_Kopioi"
+
+#: ui/evolution-event-editor.h:82
+msgid "_Paste"
+msgstr "L_iitä"
+
+#: ui/evolution-event-editor.h:83
+msgid "FIXME: Paste _Special... "
+msgstr ""
+
+#: ui/evolution-event-editor.h:84 ui/evolution-event-editor.h:85
+msgid "C_lear"
+msgstr ""
+
+#: ui/evolution-event-editor.h:86
+msgid "_Find..."
+msgstr "_Etsi..."
+
+#: ui/evolution-event-editor.h:87
+msgid "Find _Again"
+msgstr "Etsi uude_lleen"
+
+#: ui/evolution-event-editor.h:88
+msgid "_Replace..."
+msgstr "_Korvaa..."
+
+#: ui/evolution-event-editor.h:89
+msgid "_Object"
+msgstr ""
+
+#: ui/evolution-event-editor.h:90
+msgid "FIXME: what goes here?"
+msgstr ""
+
+#: ui/evolution-event-editor.h:92
+msgid "Pre_vious"
+msgstr "_Edellinen"
+
+#: ui/evolution-event-editor.h:93 ui/evolution-event-editor.h:98
+msgid "FIXME: _Item"
+msgstr ""
+
+#: ui/evolution-event-editor.h:94 ui/evolution-event-editor.h:99
+msgid "FIXME: _Unread Item"
+msgstr ""
+
+#: ui/evolution-event-editor.h:95 ui/evolution-event-editor.h:100
+msgid "FIXME: In_complete Task"
+msgstr ""
+
+#: ui/evolution-event-editor.h:96
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr ""
+
+#: ui/evolution-event-editor.h:97
+msgid "N_ext"
+msgstr "_Seuraava"
+
+#: ui/evolution-event-editor.h:101
+msgid "FIXME: _Last Item in Folder"
+msgstr ""
+
+#: ui/evolution-event-editor.h:102
+msgid "_Toolbars"
+msgstr "_Työkalupalkit"
+
+#: ui/evolution-event-editor.h:103
+msgid "FIXME: _Standard"
+msgstr ""
+
+#: ui/evolution-event-editor.h:104
+msgid "FIXME: _Formatting"
+msgstr ""
+
+#: ui/evolution-event-editor.h:105
+msgid "FIXME: _Customize..."
+msgstr ""
+
+#: ui/evolution-event-editor.h:106
+msgid "_Insert"
+msgstr "Li_sää"
+
+#: ui/evolution-event-editor.h:107
+msgid "FIXME: _File..."
+msgstr "_Tiedosto..."
+
+#: ui/evolution-event-editor.h:108
+msgid "FIXME: It_em..."
+msgstr ""
+
+#: ui/evolution-event-editor.h:109
+msgid "FIXME: _Object..."
+msgstr ""
+
+#: ui/evolution-event-editor.h:110
+msgid "F_ormat"
+msgstr ""
+
+#: ui/evolution-event-editor.h:111
+msgid "FIXME: _Font..."
+msgstr "_Kirjasin..."
+
+#: ui/evolution-event-editor.h:112
+msgid "FIXME: _Paragraph..."
+msgstr ""
+
+#: ui/evolution-event-editor.h:114
+msgid "FIXME: _Spelling..."
+msgstr ""
+
+#: ui/evolution-event-editor.h:115
+msgid "FIXME: Chec_k Names"
+msgstr ""
+
+#: ui/evolution-event-editor.h:116
+msgid "FIXME: Address _Book..."
+msgstr ""
+
+#: ui/evolution-event-editor.h:117
+msgid "_Forms"
+msgstr ""
+
+#: ui/evolution-event-editor.h:119
+msgid "FIXME: Desi_gn This Form"
+msgstr ""
+
+#: ui/evolution-event-editor.h:120
+msgid "FIXME: D_esign a Form..."
+msgstr ""
+
+#: ui/evolution-event-editor.h:121
+msgid "FIXME: Publish _Form..."
+msgstr ""
+
+#: ui/evolution-event-editor.h:122
+msgid "FIXME: Pu_blish Form As..."
+msgstr ""
+
+#: ui/evolution-event-editor.h:123
+msgid "FIXME: Script _Debugger"
+msgstr ""
+
+#: ui/evolution-event-editor.h:124
+msgid "Actio_ns"
+msgstr "T_oiminnot"
+
+#: ui/evolution-event-editor.h:125
+msgid "FIXME: _New Appointment"
+msgstr "_Uusi tapaaminen"
+
+#: ui/evolution-event-editor.h:126
+msgid "FIXME: Rec_urrence..."
+msgstr ""
+
+#: ui/evolution-event-editor.h:127
+msgid "FIXME: Schedule _Meeting"
+msgstr ""
+
+#: ui/evolution-event-editor.h:128
+msgid "FIXME: Forward as v_Calendar"
+msgstr ""
+
+#: ui/evolution-event-editor.h:129
+msgid "FIXME: For_ward"
+msgstr ""
+
+#: ui/evolution-event-editor.h:130 ui/evolution.h:32
+msgid "_Help"
+msgstr "_Apua"
+
+#: ui/evolution-event-editor.h:131
+msgid "_About..."
+msgstr "_Tietoja..."
+
+#: ui/evolution-event-editor.h:132
+msgid "_Debug"
+msgstr ""
+
+#: ui/evolution-event-editor.h:133
+msgid "FIXME: Insert File"
+msgstr ""
+
 #.
 #. *  This file is autogenerated from evolution-mail.xml, do not edit
 #. *
@@ -4259,195 +5988,198 @@ msgstr ""
 #. * POTFILES.in. DO NOT compile it as part of your application.
 #.
 #: ui/evolution-mail.h:9
-msgid "_Threaded"
+msgid "Compose"
 msgstr ""
 
 #: ui/evolution-mail.h:10
-msgid "Threaded Message list"
+msgid "Compose a new message"
 msgstr ""
 
-#: ui/evolution-mail.h:11
-msgid "Print message..."
-msgstr "Tulosta viesti..."
-
 #: ui/evolution-mail.h:12
-msgid "Print message to the printer"
+msgid "Copy message to a new folder"
 msgstr ""
 
-#: ui/evolution-mail.h:13
-msgid "Print Preview of message..."
-msgstr "Viestin tulostuksen esikatselu..."
-
-#: ui/evolution-mail.h:14
-msgid "Previews the message to be printed"
-msgstr "Esikatsele tulostettavaa viestiä"
-
-#: ui/evolution-mail.h:15 ui/evolution-subscribe.h:12
-msgid "Select _All"
-msgstr "Valitse _kaikki"
+#: ui/evolution-mail.h:15 ui/evolution-subscribe.h:11
+msgid "F_older"
+msgstr ""
 
 #: ui/evolution-mail.h:16
-msgid "_Invert Selection"
+msgid "Fi_lter on Sender"
 msgstr ""
 
 #: ui/evolution-mail.h:17
-msgid "Mail _Filters..."
+msgid "Filter on Rec_ipients"
 msgstr ""
 
 #: ui/evolution-mail.h:18
-msgid "_Virtual Folder Editor..."
-msgstr ""
-
-#: ui/evolution-mail.h:19
-msgid "_Mail Configuration..."
-msgstr ""
-
-#: ui/evolution-mail.h:20
-msgid "Manage Subscriptions..."
+msgid "Forget _Passwords"
 msgstr ""
 
 #: ui/evolution-mail.h:21
-msgid "Forget _Passwords"
+msgid "Get Mail"
 msgstr ""
 
 #: ui/evolution-mail.h:22
-msgid "_Message"
-msgstr "_Viesti"
+msgid "Mail _Filters..."
+msgstr ""
 
 #: ui/evolution-mail.h:23
-msgid "_Open in New Window"
+msgid "Manage Subscriptions..."
 msgstr ""
 
 #: ui/evolution-mail.h:24
-msgid "_Edit Message"
-msgstr "_Muokkaa viestiä"
+msgid "Mar_k As Read"
+msgstr ""
 
 #: ui/evolution-mail.h:25
-msgid "_Print Message"
-msgstr "_Tulosta viesti"
+msgid "Mark As U_nread"
+msgstr "Merkitse _lukemattomaksi"
 
 #: ui/evolution-mail.h:26
-msgid "Reply to _Sender"
-msgstr "Vastaa _Lähettäjälle"
+msgid "Move"
+msgstr "Siirrä"
 
 #: ui/evolution-mail.h:27
-msgid "Reply to _All"
-msgstr "Vastaa _Kaikille"
-
-#: ui/evolution-mail.h:28
-msgid "_Forward"
+msgid "Move message to a new folder"
 msgstr ""
 
-#: ui/evolution-mail.h:29
-msgid "Mar_k As Read"
-msgstr ""
+#: ui/evolution-mail.h:28
+msgid "Previews the message to be printed"
+msgstr "Esikatsele tulostettavaa viestiä"
 
 #: ui/evolution-mail.h:30
-msgid "Mark As U_nread"
-msgstr "Merkitse _lukemattomaksi"
-
-#: ui/evolution-mail.h:32
-msgid "_Move to Folder"
-msgstr "_Siirrä kansioon"
-
-#: ui/evolution-mail.h:33
-msgid "_Copy to Folder"
-msgstr "_Kopioi kansioon"
+msgid "Print Preview of message..."
+msgstr "Viestin tulostuksen esikatselu..."
 
-#: ui/evolution-mail.h:34
-msgid "_VFolder on Subject"
+#: ui/evolution-mail.h:31
+msgid "Print message to the printer"
 msgstr ""
 
-#: ui/evolution-mail.h:35
-msgid "VFolder on Se_nder"
-msgstr ""
+#: ui/evolution-mail.h:32
+msgid "Print message..."
+msgstr "Tulosta viesti..."
 
 #: ui/evolution-mail.h:36
-msgid "VFolder on _Recipients"
-msgstr ""
+msgid "Reply to _All"
+msgstr "Vastaa _Kaikille"
 
 #: ui/evolution-mail.h:37
-msgid "_Filter on Subject"
-msgstr ""
-
-#: ui/evolution-mail.h:38
-msgid "Fi_lter on Sender"
-msgstr ""
-
-#: ui/evolution-mail.h:39
-msgid "Filter on Rec_ipients"
-msgstr ""
+msgid "Reply to _Sender"
+msgstr "Vastaa _Lähettäjälle"
 
-#: ui/evolution-mail.h:40 ui/evolution-subscribe.h:14
-msgid "F_older"
-msgstr ""
+#: ui/evolution-mail.h:40 ui/evolution-subscribe.h:15
+msgid "Select _All"
+msgstr "Valitse _kaikki"
 
 #: ui/evolution-mail.h:41
-msgid "_Expunge"
+msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
 #: ui/evolution-mail.h:42
-msgid "_Configure Folder"
+msgid "Threaded Message list"
 msgstr ""
 
 #: ui/evolution-mail.h:43
-msgid "Get Mail"
+msgid "VFolder on Se_nder"
 msgstr ""
 
 #: ui/evolution-mail.h:44
-msgid "Send queued mail and retrieve new mail"
+msgid "VFolder on _Recipients"
 msgstr ""
 
 #: ui/evolution-mail.h:45
-msgid "Compose"
+msgid "_Apply Filters"
 msgstr ""
 
 #: ui/evolution-mail.h:46
-msgid "Compose a new message"
+msgid "_Configure Folder"
 msgstr ""
 
-#: ui/evolution-mail.h:53
-msgid "Move"
-msgstr "Siirrä"
+#: ui/evolution-mail.h:47
+msgid "_Copy to Folder"
+msgstr "_Kopioi kansioon"
+
+#: ui/evolution-mail.h:49
+msgid "_Edit Message"
+msgstr "_Muokkaa viestiä"
+
+#: ui/evolution-mail.h:50
+msgid "_Expunge"
+msgstr ""
+
+#: ui/evolution-mail.h:51
+msgid "_Filter on Subject"
+msgstr ""
+
+#: ui/evolution-mail.h:52
+msgid "_Forward"
+msgstr ""
+
+#: ui/evolution-mail.h:53 ui/evolution-subscribe.h:20
+msgid "_Invert Selection"
+msgstr ""
 
 #: ui/evolution-mail.h:54
-msgid "Move message to a new folder"
+msgid "_Mail Configuration..."
 msgstr ""
 
+#: ui/evolution-mail.h:55
+msgid "_Message"
+msgstr "_Viesti"
+
 #: ui/evolution-mail.h:56
-msgid "Copy message to a new folder"
+msgid "_Move to Folder"
+msgstr "_Siirrä kansioon"
+
+#: ui/evolution-mail.h:57
+msgid "_Open in New Window"
 msgstr ""
 
-#: ui/evolution-subscribe.h:11 ui/evolution.h:28
-msgid "_Edit"
-msgstr "_Muokkaa"
+#: ui/evolution-mail.h:58
+msgid "_Print Message"
+msgstr "_Tulosta viesti"
 
-#: ui/evolution-subscribe.h:13
-msgid "_Unselect All"
-msgstr "_Poista kaikki valinnat"
+#: ui/evolution-mail.h:59
+msgid "_Threaded"
+msgstr ""
 
-#: ui/evolution-subscribe.h:15 ui/evolution-subscribe.h:17
-msgid "Subscribe"
+#: ui/evolution-mail.h:60
+msgid "_VFolder on Subject"
 msgstr ""
 
-#: ui/evolution-subscribe.h:16 ui/evolution-subscribe.h:19
-msgid "Unsubscribe"
+#: ui/evolution-mail.h:61
+msgid "_Virtual Folder Editor..."
 msgstr ""
 
-#: ui/evolution-subscribe.h:18
+#.
+#. *  This file is autogenerated from evolution-subscribe.xml, do not edit
+#. *
+#. *  This file contains translatable strings generated by
+#. * bonobo-ui-extract. Add this file to your project's
+#. * POTFILES.in. DO NOT compile it as part of your application.
+#.
+#: ui/evolution-subscribe.h:9
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.h:20
+#: ui/evolution-subscribe.h:12
+msgid "Refresh List"
+msgstr ""
+
+#: ui/evolution-subscribe.h:13
+msgid "Refresh List of Folders"
+msgstr ""
+
+#: ui/evolution-subscribe.h:14
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.h:21
-msgid "Refresh List"
+#: ui/evolution-subscribe.h:16
+msgid "Subscribe"
 msgstr ""
 
-#: ui/evolution-subscribe.h:22
-msgid "Refresh List of Folders"
+#: ui/evolution-subscribe.h:17
+msgid "Unsubscribe"
 msgstr ""
 
 #.
@@ -4458,111 +6190,107 @@ msgstr ""
 #. * POTFILES.in. DO NOT compile it as part of your application.
 #.
 #: ui/evolution.h:9
-msgid "Show the _Shortcut Bar"
+msgid "Create a new folder"
 msgstr ""
 
 #: ui/evolution.h:10
-msgid "Toggle whether to show the shortcut bar"
+msgid "Display a different folder"
 msgstr ""
 
 #: ui/evolution.h:11
-msgid "Show the _Folder Bar"
-msgstr ""
+msgid "E_xit"
+msgstr "_Poistu"
 
 #: ui/evolution.h:12
-msgid "Toggle whether to show the folder bar"
+msgid "Evolution bar _shortcut"
+msgstr ""
+
+#: ui/evolution.h:13
+msgid "Exit the program"
+msgstr ""
+
+#: ui/evolution.h:14
+msgid "Getting _Started"
+msgstr ""
+
+#: ui/evolution.h:15
+msgid "Show information about Evolution"
 msgstr ""
 
 #: ui/evolution.h:16
-msgid "_Folder"
+msgid "Show the _Folder Bar"
 msgstr ""
 
 #: ui/evolution.h:17
-msgid "Evolution bar _shortcut"
+msgid "Show the _Shortcut Bar"
 msgstr ""
 
 #: ui/evolution.h:18
-msgid "_Mail message (FIXME)"
+msgid "Submit bug report using Bug Buddy"
 msgstr ""
 
 #: ui/evolution.h:19
-msgid "_Appointment (FIXME)"
-msgstr "_Tapaaminen"
+msgid "Toggle whether to show the folder bar"
+msgstr ""
 
 #: ui/evolution.h:20
-msgid "_Contact (FIXME)"
-msgstr "_Kontakti"
+msgid "Toggle whether to show the shortcut bar"
+msgstr ""
 
 #: ui/evolution.h:21
-msgid "_Task (FIXME)"
+msgid "Using the C_ontact Manager"
 msgstr ""
 
 #: ui/evolution.h:22
-msgid "_Go to Folder..."
+msgid "Using the _Calendar"
 msgstr ""
 
 #: ui/evolution.h:23
-msgid "Display a different folder"
+msgid "Using the _Mailer"
 msgstr ""
 
 #: ui/evolution.h:24
-msgid "_Create New Folder..."
+msgid "_About Evolution..."
 msgstr ""
 
 #: ui/evolution.h:25
-msgid "Create a new folder"
-msgstr ""
+msgid "_Appointment (FIXME)"
+msgstr "_Tapaaminen"
 
 #: ui/evolution.h:26
-msgid "E_xit"
-msgstr "_Poistu"
+msgid "_Contact (FIXME)"
+msgstr "_Kontakti"
 
 #: ui/evolution.h:27
-msgid "Exit the program"
+msgid "_Create New Folder..."
 msgstr ""
 
 #: ui/evolution.h:30
-msgid "_Settings"
-msgstr "_Asetukset"
+msgid "_Folder"
+msgstr ""
 
 #: ui/evolution.h:31
-msgid "_Help"
-msgstr "_Apua"
-
-#: ui/evolution.h:32
-msgid "_Index"
+msgid "_Go to Folder..."
 msgstr ""
 
 #: ui/evolution.h:33
-msgid "Getting _Started"
+msgid "_Index"
 msgstr ""
 
 #: ui/evolution.h:34
-msgid "Using the _Mailer"
-msgstr ""
-
-#: ui/evolution.h:35
-msgid "Using the _Calendar"
+msgid "_Mail message (FIXME)"
 msgstr ""
 
 #: ui/evolution.h:36
-msgid "Using the C_ontact Manager"
-msgstr ""
+msgid "_Settings"
+msgstr "_Asetukset"
 
 #: ui/evolution.h:37
 msgid "_Submit Bug Report"
 msgstr ""
 
 #: ui/evolution.h:38
-msgid "Submit bug report using Bug Buddy"
-msgstr ""
-
-#: ui/evolution.h:39
-msgid "_About Evolution..."
-msgstr ""
-
-#: ui/evolution.h:40
-msgid "Show information about Evolution"
+msgid "_Task (FIXME)"
 msgstr ""
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
@@ -4648,18 +6376,12 @@ msgstr ""
 msgid "%A, %B %d, %Y"
 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:415
-msgid "MTWTFSS"
-msgstr ""
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1039 widgets/misc/e-calendar-item.c:2670
+#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:106
+#: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr "..."
 
@@ -4686,35 +6408,58 @@ msgstr ""
 msgid "Group %i"
 msgstr "Ryhmä %i"
 
-#~ msgid "FIXME: _Appointment"
-#~ msgstr "_Tapaaminen"
+#~ msgid "(C) 1998 the Free Software Foundation"
+#~ msgstr "(C) 1998 the Free Software Foundation"
+
+#~ msgid "Error while communicating with address server"
+#~ msgstr "Virhe kommunikoitaessa osoitepalvelimen kanssa"
 
-#~ msgid "FIXME: _Contact"
-#~ msgstr "_Kontakti"
+#~ msgid "_Summary:"
+#~ msgstr "_Yhteenveto:"
 
-#~ msgid "FIXME: S_end"
-#~ msgstr "_Lähetä"
+#~ msgid ""
+#~ "Monday\n"
+#~ "Tuesday\n"
+#~ "Wednesday\n"
+#~ "Thursday\n"
+#~ "Friday\n"
+#~ "Saturday\n"
+#~ "Sunday\n"
+#~ msgstr ""
+#~ "Maanantai\n"
+#~ "Tiistai\n"
+#~ "Keskiviikko\n"
+#~ "Torstai\n"
+#~ "Perjantai\n"
+#~ "Lauantai\n"
+#~ "Sunnuntai\n"
 
-#~ msgid "FIXME: Save Attac_hments..."
-#~ msgstr "Tallenna L_iitteet..."
+#~ msgid "Search..."
+#~ msgstr "Etsi..."
 
-#~ msgid "FIXME: Print Pre_view"
-#~ msgstr "Tulostuksen _esikatselu"
+#~ msgid "Name"
+#~ msgstr "Nimi"
 
-#~ msgid "Pre_vious"
-#~ msgstr "_Edellinen"
+#~ msgid "Add..."
+#~ msgstr "Lisää..."
 
-#~ msgid "Ne_xt"
-#~ msgstr "_Seuraava"
+#~ msgid "To: >>"
+#~ msgstr "Vastaanottaja: >>"
 
-#~ msgid "_Toolbars"
-#~ msgstr "_Työkalupalkit"
+#~ msgid "About to save changes to message..."
+#~ msgstr "Tallentamaisillaan muutokset..."
 
-#~ msgid "FIXME: _File..."
-#~ msgstr "_Tiedosto..."
+#~ msgid "More criterion"
+#~ msgstr "Lisää ehtoja"
 
-#~ msgid "FIXME: _Font..."
-#~ msgstr "_Kirjasin..."
+#~ msgid "Fewer criterion"
+#~ msgstr "Vähemmän ehtoja"
+
+#~ msgid "_Unselect All"
+#~ msgstr "_Poista kaikki valinnat"
+
+#~ msgid "FIXME: _Appointment"
+#~ msgstr "_Tapaaminen"
 
 #~ msgid "FIXME: _New Contact"
 #~ msgstr "Uusi _kontakti"
@@ -4725,33 +6470,12 @@ msgstr "Ryhmä %i"
 #~ msgid "FIXME: New Meetin_g with Contact"
 #~ msgstr "_Tapaaminen kontaktin kanssa"
 
-#~ msgid "FIXME: _Plan a Meeting..."
-#~ msgstr "S_uunnittele tapaaminen..."
-
-#~ msgid "FIXME: _Open Web Page"
-#~ msgstr "_Avaa verkkosivu"
-
-#~ msgid "FIXME: Insert File..."
-#~ msgstr "Liitä tiedosto..."
-
 #~ msgid "Insert a file as an attachment"
 #~ msgstr "Lisää liitetiedosto"
 
 #~ msgid "FIXME: Previous"
 #~ msgstr "Edellinen"
 
-#~ msgid "Go to the previous item"
-#~ msgstr "Siirry edelliseen kohtaan"
-
-#~ msgid "FIXME: Next"
-#~ msgstr "Seuraava"
-
-#~ msgid "Go to the next item"
-#~ msgstr "Siirry seuraavaan kohtaan"
-
-#~ msgid "FIXME: Help"
-#~ msgstr "Apua"
-
 #~ msgid "Copyright (C) 2000, Helix Code, Inc."
 #~ msgstr "Copyright (C) 2000, Helix Code, Inc."
 
@@ -4761,21 +6485,12 @@ msgstr "Ryhmä %i"
 #~ msgid "Show 1 year"
 #~ msgstr "Näytä 1 vuosi"
 
-#~ msgid "FIXME: _New Appointment"
-#~ msgstr "_Uusi tapaaminen"
-
 #~ msgid "Save and close this appointment"
 #~ msgstr "Tallenna ja sulje tämä tapaaminen"
 
-#~ msgid "Close this appointment"
-#~ msgstr "Sulje tämä tapaaminen"
-
 #~ msgid "Load a previously saved message"
 #~ msgstr "Lataa aiemmin tallennettu viesti"
 
-#~ msgid "_Save..."
-#~ msgstr "_Tallenna..."
-
 #~ msgid "Save message"
 #~ msgstr "Tallenna viesti"
 
@@ -4806,9 +6521,6 @@ msgstr "Ryhmä %i"
 #~ msgid "Send _Later"
 #~ msgstr "Lähetä _myöhemmin"
 
-#~ msgid "_Close..."
-#~ msgstr "_Sulje..."
-
 #~ msgid "Quit the message composer"
 #~ msgstr "Sulje viestiohjelma"
 
@@ -4824,18 +6536,12 @@ msgstr "Ryhmä %i"
 #~ msgid "Show/hide attachments"
 #~ msgstr "Näytä/piilota liitetiedostot"
 
-#~ msgid "Send"
-#~ msgstr "Lähetä"
-
 #~ msgid "Send this message"
 #~ msgstr "Lähetä viesti"
 
 #~ msgid "Attach"
 #~ msgstr "Liitä"
 
-#~ msgid "Attach a file"
-#~ msgstr "Liitä tiedosto"
-
 #~ msgid "Port:"
 #~ msgstr "Portti:"
 
@@ -4845,15 +6551,6 @@ msgstr "Ryhmä %i"
 #~ msgid "From"
 #~ msgstr "Lähettäjä"
 
-#~ msgid "Subject"
-#~ msgstr "Aihe"
-
-#~ msgid "Date"
-#~ msgstr "Päiväys"
-
-#~ msgid "Received"
-#~ msgstr "Vastaanotettu"
-
 #~ msgid "To"
 #~ msgstr "Vastaanottaja"
 
@@ -4877,6 +6574,3 @@ msgstr "Ryhmä %i"
 
 #~ msgid "Sort Descending"
 #~ msgstr "Järjestä laskevassa järjestyksessä"
-
-#~ msgid "Unsort"
-#~ msgstr "Poista järjestys"