Added Azeri language file

fixed various po files
fixed a no-c-format tag

svn path=/trunk/; revision=8733

1 files changed, 497 insertions, 590 deletions

diff --git a/po/fi.po b/po/fi.po
index 93e3362e2a..3b131b7eed 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-03-12 22:44+0000\n"
+"POT-Creation-Date: 2001-03-15 11:18+0100\n"
 "PO-Revision-Date: 2000-11-14 15:00+0300\n"
 "Last-Translator: Jarkko Ranta <jjranta@cc.joensuu.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -279,121 +279,6 @@ msgstr ""
 msgid "Could not initialize Bonobo"
 msgstr "Bonobon alustus ei onnistunut"
 
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: 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: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: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: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: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: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: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 "JP Rosevear <jpr@helixcode.com>"
-
-#: 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:127
-msgid "Evolution Addressbook Conduit"
-msgstr ""
-
-#: 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:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr ""
-
-#: 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: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: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: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
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-
-#: 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 "Ei yhteyttä gnome-pilot -demoniin"
-
-#: 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 ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr ""
@@ -419,14 +304,6 @@ msgstr ""
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr ""
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr ""
-
 #: addressbook/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/component/addressbook-config.glade.h:1
 #: calendar/gui/e-meeting-dialog.glade.h:1
@@ -489,7 +366,7 @@ msgid "Phone Types"
 msgstr "Puhelintyypit"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Primary Email"
 msgstr "Ensisijainen sähköposti"
 
@@ -580,113 +457,132 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr "Poista kontakti?"
 
-#: addressbook/contact-editor/e-contact-editor.c:578
+#: addressbook/contact-editor/e-contact-editor.c:590
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1193
+#: addressbook/contact-editor/e-contact-editor.c:1229
 #: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1194
-#: addressbook/contact-editor/e-contact-editor.c:1261
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1297
 #: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Business"
 msgstr "Työ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1195
+#: addressbook/contact-editor/e-contact-editor.c:1231
 #: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Business 2"
 msgstr "Työ 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1196
+#: addressbook/contact-editor/e-contact-editor.c:1232
 #: addressbook/gui/widgets/e-addressbook-view.c:586
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1197
+#: addressbook/contact-editor/e-contact-editor.c:1233
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1198
+#: addressbook/contact-editor/e-contact-editor.c:1234
 #: addressbook/gui/widgets/e-addressbook-view.c:585
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/contact-editor/e-contact-editor.c:1199
+#: addressbook/contact-editor/e-contact-editor.c:1235
 msgid "Company"
 msgstr "Yritys"
 
-#: addressbook/contact-editor/e-contact-editor.c:1200
-#: addressbook/contact-editor/e-contact-editor.c:1262
+#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1298
 #: addressbook/gui/widgets/e-addressbook-view.c:582
 msgid "Home"
 msgstr "Koti"
 
-#: addressbook/contact-editor/e-contact-editor.c:1201
+#: addressbook/contact-editor/e-contact-editor.c:1237
 #: addressbook/gui/widgets/e-addressbook-view.c:589
 msgid "Home 2"
 msgstr "Koti 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1202
+#: addressbook/contact-editor/e-contact-editor.c:1238
 #: addressbook/gui/widgets/e-addressbook-view.c:587
 msgid "Home Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1203
+#: addressbook/contact-editor/e-contact-editor.c:1239
 #: addressbook/gui/widgets/e-addressbook-view.c:590
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1204
+#: addressbook/contact-editor/e-contact-editor.c:1240
 #: addressbook/gui/widgets/e-addressbook-view.c:584
 msgid "Mobile"
 msgstr "Matkapuhelin"
 
-#: addressbook/contact-editor/e-contact-editor.c:1205
-#: addressbook/contact-editor/e-contact-editor.c:1263
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:1299
 #: addressbook/gui/widgets/e-addressbook-view.c:591
 #: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
 msgid "Other"
 msgstr "Muu"
 
-#: addressbook/contact-editor/e-contact-editor.c:1206
+#: addressbook/contact-editor/e-contact-editor.c:1242
 msgid "Other Fax"
 msgstr "Muu faksi"
 
-#: addressbook/contact-editor/e-contact-editor.c:1207
+#: addressbook/contact-editor/e-contact-editor.c:1243
 #: addressbook/gui/widgets/e-addressbook-view.c:592
 msgid "Pager"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1208
+#: addressbook/contact-editor/e-contact-editor.c:1244
 #: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Primary"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1209
+#: addressbook/contact-editor/e-contact-editor.c:1245
 msgid "Radio"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1210
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Telex"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1211
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1272
 #: addressbook/gui/widgets/e-addressbook-view.c:593
 msgid "Email 2"
 msgstr "Sähköposti 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/contact-editor/e-contact-editor.c:1273
 #: addressbook/gui/widgets/e-addressbook-view.c:594
 msgid "Email 3"
 msgstr "Sähköposti 3"
 
+#: addressbook/contact-editor/e-contact-quick-add.c:214
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:216
+#, fuzzy
+msgid "Edit Full"
+msgstr "Muokkaa"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:253
+#, fuzzy
+msgid "Full Name"
+msgstr "Koko nimi:"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:259
+#, fuzzy
+msgid "E-mail"
+msgstr "Sähköposti"
+
 #: addressbook/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Osoite _2:"
@@ -874,7 +770,7 @@ msgid "None (anonymous mode)"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:260
+#: camel/providers/imap/camel-imap-store.c:261
 #: camel/providers/nntp/camel-nntp-store.c:293
 #: camel/providers/pop3/camel-pop3-store.c:145
 msgid "Password"
@@ -1004,7 +900,7 @@ msgstr "Osoitekirjan lähteet"
 #: addressbook/gui/component/addressbook-config.glade.h:3
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:19 mail/folder-browser.c:570
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
 #: mail/mail-config.glade.h:20 mail/mail-view.c:150
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
 #: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
@@ -1026,6 +922,12 @@ msgstr "Nimi"
 msgid "URI"
 msgstr "URI"
 
+#: addressbook/gui/component/e-address-widget.c:259
+#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "Muut kontaktit"
+
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
 msgid "A Bonobo control for displaying an address."
 msgstr ""
@@ -1070,6 +972,21 @@ msgstr ""
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:121
+#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
+#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
+msgid "Remove"
+msgstr "Poista"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#, fuzzy
+msgid "Remove All"
+msgstr "Poista"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Edit Contact Info"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Etsi..."
@@ -1441,18 +1358,6 @@ msgstr "Tyyppi:"
 msgid "Width:"
 msgstr "Leveys:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr ""
-
-#: 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:687
 #: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
@@ -1463,30 +1368,6 @@ msgstr "Virhe kommunikoitaessa kalenteripalvelimen kanssa"
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the GnomeCal conduit"
-msgstr ""
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar conduit"
-msgstr ""
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the todo conduit"
-msgstr ""
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-msgid "Evolution ToDo conduit "
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr ""
-
 #: calendar/conduits/todo/todo-conduit.c:600
 #: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
@@ -1526,7 +1407,7 @@ msgstr ""
 
 #: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
 #: calendar/gui/event-editor.c:1617
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Unknown"
 msgstr ""
 
@@ -1912,8 +1793,7 @@ msgid "Pick a color"
 msgstr "Valitse väri"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:164 filter/libfilter-i18n.h:38
-#: filter/libfilter-i18n.h:113
+#: calendar/gui/e-calendar-table.c:164
 msgid "Priority"
 msgstr "Prioriteetti"
 
@@ -2315,7 +2195,7 @@ msgid "New Appointment..."
 msgstr "Uusi tapaaminen..."
 
 #: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
-#: mail/folder-browser.c:541 ui/evolution-calendar.xml.h:15
+#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Avaa"
@@ -2435,8 +2315,7 @@ msgstr "Ladataan kalenteria..."
 msgid "Organizer:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:48
-#: filter/libfilter-i18n.h:119
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
 msgid "Sender"
 msgstr "Lähettäjä"
 
@@ -2522,8 +2401,8 @@ msgid ""
 "Time"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:58
-#: filter/libfilter-i18n.h:134 mail/message-list.c:1171
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
+#: mail/message-list.c:1171
 msgid "Status"
 msgstr "Tila"
 
@@ -2645,14 +2524,12 @@ msgstr "_Alkamisaika:"
 msgid "_Starting date:"
 msgstr "_Alkamispäivä:"
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:5
-#: filter/libfilter-i18n.h:10 filter/libfilter-i18n.h:63
-#: filter/libfilter-i18n.h:139
+#. Automatically generated. Do not edit.
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "jälkeen"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:64
-#: filter/libfilter-i18n.h:140
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "ennen"
 
@@ -2677,34 +2554,26 @@ msgid "hour(s)"
 msgstr "tunti(a)"
 
 #: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "minute(s)"
 msgstr "minuuttia"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "month(s)"
 msgstr "kuukautta"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "start of appointment"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "until"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "week(s)"
 msgstr "viikkoa"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "year(s)"
 msgstr "vuotta"
 
@@ -3088,7 +2957,7 @@ msgstr ""
 msgid "Print Calendar"
 msgstr "Tulosta kalenteri"
 
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1287
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
 #: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
 #: ui/evolution-mail.xml.h:32
 msgid "Print Preview"
@@ -3145,30 +3014,30 @@ msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:320
+#: camel/camel-folder-search.c:323
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:330
+#: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:477 camel/camel-folder-search.c:505
+#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:551
+#: camel/camel-folder-search.c:554
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:660 camel/camel-folder-search.c:697
+#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -3248,47 +3117,47 @@ msgstr ""
 msgid "(Unknown error)"
 msgstr "(tuntematon virhe)"
 
-#: camel/camel-provider.c:133
+#: camel/camel-provider.c:137
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:145
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:176
+#: camel/camel-remote-store.c:181
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:180
+#: camel/camel-remote-store.c:185
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:306
+#: camel/camel-remote-store.c:232
 msgid "Connection cancelled"
 msgstr "Yhteys peruutettu"
 
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:229
+#: camel/camel-remote-store.c:235
+#: camel/providers/smtp/camel-smtp-transport.c:244
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:310 camel/camel-remote-store.c:323
+#: camel/camel-remote-store.c:236
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:539
+#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
+#: camel/camel-remote-store.c:448
 #: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:544
+#: camel/camel-remote-store.c:453
 msgid "Server unexpectedly disconnected"
 msgstr ""
 
@@ -3377,7 +3246,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:380
+#: camel/providers/imap/camel-imap-store.c:381
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -3429,12 +3298,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:323
+#: camel/camel-session.c:322
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:418
+#: camel/camel-session.c:417
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3443,6 +3312,13 @@ msgstr ""
 "Hakemistoa %s ei voitu luoda:\n"
 "%s"
 
+#. Fill in the new fields
+#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
+#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#, fuzzy
+msgid "Trash"
+msgstr "Tehtävä"
+
 #: camel/camel-url.c:77
 #, c-format
 msgid "URL string `%s' contains no protocol"
@@ -3458,7 +3334,7 @@ msgstr ""
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
 
-#: camel/camel-vee-folder.c:914
+#: camel/camel-vee-folder.c:960
 #, c-format
 msgid "No such message: %s"
 msgstr ""
@@ -3513,32 +3389,41 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:262
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Secure IMAPv4"
+msgstr "IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:263
 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:407
+#: camel/providers/imap/camel-imap-store.c:415
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:418
+#: camel/providers/imap/camel-imap-store.c:426
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:446
+#: camel/providers/imap/camel-imap-store.c:454
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:461
-#: camel/providers/smtp/camel-smtp-transport.c:345
+#: camel/providers/imap/camel-imap-store.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:373
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:482
-#: camel/providers/smtp/camel-smtp-transport.c:353
+#: camel/providers/imap/camel-imap-store.c:498
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3546,7 +3431,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:756
+#: camel/providers/imap/camel-imap-store.c:772
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
@@ -3769,7 +3654,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1317
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
 msgid "Synchronising folder"
 msgstr "Synkronoidaan kansiota"
 
@@ -3916,7 +3801,7 @@ msgstr ""
 #: camel/providers/pop3/camel-pop3-folder.c:286
 #, c-format
 msgid "Retrieving POP message %d"
-msgstr "Haetaan POP-viestiä %s"
+msgstr "Haetaan POP-viestiä %d"
 
 #: camel/providers/pop3/camel-pop3-folder.c:304
 #, c-format
@@ -3933,6 +3818,17 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
+#: camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Secure POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:56
+msgid ""
+"For connecting to POP servers over an SSL connection. 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:147
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
@@ -3991,7 +3887,7 @@ msgid ""
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:535
+#: camel/providers/pop3/camel-pop3-store.c:543
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
@@ -4041,11 +3937,11 @@ msgstr ""
 msgid "Could not find 'From' address in message"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:244
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:246
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
@@ -4057,225 +3953,235 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:143
+#: camel/providers/smtp/camel-smtp-provider.c:53
+msgid "Secure SMTP"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:55
+msgid ""
+"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+"connection.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:147
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:145
+#: camel/providers/smtp/camel-smtp-transport.c:149
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:151
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:153
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:155
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:157
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:159
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:161
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:163
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Temporary authentication failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Authentication required"
 msgstr "Todennus vaaditaan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:258
+#: camel/providers/smtp/camel-smtp-transport.c:286
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:330
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:438
+#: camel/providers/smtp/camel-smtp-transport.c:466
 msgid "No authentication required"
 msgstr "Todennusta ei vaadita"
 
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:468
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
 "authentication. This should be fine for connecting to most SMTP servers."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:483
+#: camel/providers/smtp/camel-smtp-transport.c:511
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:485
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:538
 msgid "Cannot send message: sender address not defined."
 msgstr "Viestiä ei voida lähettää: lähettäjän osoitetta ei ole määritelty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:545
 msgid "Cannot send message: sender address not valid."
 msgstr "Viestiä ei voida lähettää: lähettäjän osoite on epäkelpo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:531
+#: camel/providers/smtp/camel-smtp-transport.c:559
 msgid "Cannot send message: no recipients defined."
 msgstr "Viestiä ei voida lähettää: vastaanottajia ei ole määritelty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:625
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:679
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:719
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:749
+#: camel/providers/smtp/camel-smtp-transport.c:777
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:774
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:821
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:818
+#: camel/providers/smtp/camel-smtp-transport.c:846
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:837
+#: camel/providers/smtp/camel-smtp-transport.c:865
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:896
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:915
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:902
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:967
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:991
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:982
+#: camel/providers/smtp/camel-smtp-transport.c:1010
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1033
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1052
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -4314,11 +4220,6 @@ msgstr "liite"
 msgid "Attach a file"
 msgstr "Liitä tiedosto"
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Poista"
-
 #: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr ""
@@ -4368,33 +4269,40 @@ msgid "From:"
 msgstr "Lähettäjä:"
 
 #.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+msgid "Reply-To:"
+msgstr ""
+
+#.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:601
+#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: composer/e-msg-composer-hdrs.c:365 mail/mail-format.c:683
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
 msgid "To:"
 msgstr "Vastaanottaja:"
 
-#: composer/e-msg-composer-hdrs.c:366
+#: composer/e-msg-composer-hdrs.c:377
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:685
+#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:370
+#: composer/e-msg-composer-hdrs.c:381
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:385
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4421,12 +4329,12 @@ msgstr "Virhe tallennettaessa tiedostoa: %s"
 msgid "Error loading file: %s"
 msgstr "VIrhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:817 evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:192
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:823
+#: composer/e-msg-composer.c:824
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4436,27 +4344,27 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: composer/e-msg-composer.c:848
+#: composer/e-msg-composer.c:849
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:974
+#: composer/e-msg-composer.c:975
 msgid "That file does not exist."
 msgstr "Tiedostoa ei ole olemassa."
 
-#: composer/e-msg-composer.c:984
+#: composer/e-msg-composer.c:985
 msgid "That is not a regular file."
 msgstr "Se ei ole tavallinen tiedosto."
 
-#: composer/e-msg-composer.c:994
+#: composer/e-msg-composer.c:995
 msgid "That file exists but is not readable."
 msgstr "Tiedosto on olemassa, muttei lukukelpoinen."
 
-#: composer/e-msg-composer.c:1004
+#: composer/e-msg-composer.c:1005
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Tiedosto vaikutti avattavalta, mutta avaaminen epäonnistui."
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1027
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4464,15 +4372,15 @@ msgstr ""
 "Tiedosto on hyvin suuri (yli 100K).\n"
 "Haluatko varmasti liittää sen?"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1048
 msgid "An error occurred while reading the file."
 msgstr "Virhe luettaessa tiedostoa."
 
-#: composer/e-msg-composer.c:1327 composer/e-msg-composer.c:1655
+#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: composer/e-msg-composer.c:1739
+#: composer/e-msg-composer.c:1765
 msgid "Could not create composer window."
 msgstr ""
 
@@ -4486,6 +4394,10 @@ msgstr ""
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
+#: data/evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
+msgstr ""
+
 #: data/evolution.keys.in.h:1
 msgid "address card"
 msgstr ""
@@ -4804,29 +4716,20 @@ msgstr "nyt"
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:336
-#: mail/mail-autofilter.c:358
-msgid "Add Filter Rule"
-msgstr ""
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr ""
-
-#: filter/filter-editor.c:457 filter/filter.glade.h:4
-msgid "Edit Filters"
+#: filter/filter-editor.c:126 filter/filter.glade.h:6
+msgid "Filter Rules"
 msgstr ""
 
 #. and now for the action area
-#: filter/filter-filter.c:403
+#: filter/filter-filter.c:424
 msgid "Then"
 msgstr "Sitten"
 
-#: filter/filter-filter.c:416
+#: filter/filter-filter.c:437
 msgid "Add action"
 msgstr "Lisää toiminto"
 
-#: filter/filter-filter.c:422
+#: filter/filter-filter.c:443
 msgid "Remove action"
 msgstr "Poista toiminto"
 
@@ -4859,35 +4762,35 @@ msgstr ""
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:572
+#: filter/filter-rule.c:597
 msgid "Rule name: "
 msgstr "Säännön nimi: "
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:601
 msgid "Untitled"
 msgstr "Nimetön"
 
-#: filter/filter-rule.c:592
+#: filter/filter-rule.c:617
 msgid "If"
 msgstr "Jos"
 
-#: filter/filter-rule.c:609
+#: filter/filter-rule.c:634
 msgid "Execute actions"
 msgstr "Suorita toiminnot"
 
-#: filter/filter-rule.c:613
+#: filter/filter-rule.c:638
 msgid "if all criteria are met"
 msgstr "kaikki ehdot täytetään"
 
-#: filter/filter-rule.c:618
+#: filter/filter-rule.c:643
 msgid "if any criteria are met"
 msgstr "mikään ehdoista täyttyy"
 
-#: filter/filter-rule.c:629
+#: filter/filter-rule.c:654
 msgid "Add criterion"
 msgstr "Lisää ehto"
 
-#: filter/filter-rule.c:635
+#: filter/filter-rule.c:660
 msgid "Remove criterion"
 msgstr "Poista ehto"
 
@@ -4895,8 +4798,8 @@ msgstr "Poista ehto"
 msgid "Replied to"
 msgstr ""
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
+#. { N_("Deleted"), "Deleted" },
+#. { N_("Draft"), "Draft" },
 #: filter/filter-system-flag.c:70
 msgid "Important"
 msgstr ""
@@ -4905,12 +4808,12 @@ msgstr ""
 msgid "Read"
 msgstr "Lue"
 
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
 msgstr ""
 
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
 msgstr ""
 
 #: filter/filter.glade.h:7
@@ -4921,7 +4824,7 @@ msgstr "Tulevat"
 msgid "Outgoing"
 msgstr "Lähtevät"
 
-#: filter/filter.glade.h:10
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
 msgid "Virtual Folders"
 msgstr ""
 
@@ -4945,238 +4848,195 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
-#: filter/libfilter-i18n.h:7 mail/message-list.c:624
-msgid "Answered"
-msgstr ""
-
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr ""
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:5
+#, fuzzy
+msgid "Attachments"
+msgstr "Liite"
+
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "sisältää"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Otettu vastaan"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Lähetetty"
 
-#: filter/libfilter-i18n.h:24
-msgid "Deleted"
-msgstr "Poistettu"
+#: filter/libfilter-i18n.h:12
+msgid "does not contain"
+msgstr "ei sisällä"
 
-#: filter/libfilter-i18n.h:25
-msgid "Draft"
-msgstr "Luonnos"
+#: filter/libfilter-i18n.h:13
+msgid "does not end with"
+msgstr ""
 
-#: filter/libfilter-i18n.h:28 filter/libfilter-i18n.h:83
-msgid "Expression"
+#: filter/libfilter-i18n.h:14
+msgid "does not exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29 mail/message-list.c:1171
-msgid "Flagged"
+#: filter/libfilter-i18n.h:15
+msgid "does not sound like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:16
+msgid "does not start with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:17
+msgid "Do Not Exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:18
+msgid "ends with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Exist"
+msgstr "_Poistu"
+
+#: filter/libfilter-i18n.h:20
+msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30 filter/libfilter-i18n.h:84
+#: filter/libfilter-i18n.h:21
+msgid "Expression"
+msgstr ""
+
+#: filter/libfilter-i18n.h:22
 msgid "Forward to Address"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:23
+msgid "is"
+msgstr "on"
+
+#: filter/libfilter-i18n.h:24
+msgid "is greater than"
+msgstr "on suurempi kuin"
+
+#: filter/libfilter-i18n.h:25
+msgid "is less than"
+msgstr "on pienempi kuin"
+
+#: filter/libfilter-i18n.h:26
+msgid "is not"
+msgstr "ei ole"
+
+#: filter/libfilter-i18n.h:27
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32 filter/libfilter-i18n.h:98
+#: filter/libfilter-i18n.h:28
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:29
 msgid "Message Header"
 msgstr "Viestin otsikko"
 
-#: filter/libfilter-i18n.h:34 filter/libfilter-i18n.h:99
+#: filter/libfilter-i18n.h:30
 msgid "Message was received"
 msgstr "Viesti vastaanotettu"
 
-#: filter/libfilter-i18n.h:35 filter/libfilter-i18n.h:100
+#: filter/libfilter-i18n.h:31
 msgid "Message was sent"
 msgstr "Viesti lähetetty"
 
-#: filter/libfilter-i18n.h:36 filter/libfilter-i18n.h:101
+#: filter/libfilter-i18n.h:32
 msgid "Move to Folder"
 msgstr "Siirrä kansioon"
 
-#: filter/libfilter-i18n.h:41 filter/libfilter-i18n.h:114
+#: filter/libfilter-i18n.h:33
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:34
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:35
 msgid "Recipients"
 msgstr "Vastaanottajat"
 
-#: filter/libfilter-i18n.h:42 filter/libfilter-i18n.h:117
+#: filter/libfilter-i18n.h:36
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44 mail/message-list.c:621
-msgid "Seen"
-msgstr ""
-
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:192 filter/score-rule.c:194
+#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
 #: mail/message-list.c:1171
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
-msgid "Set Flag"
+#: filter/libfilter-i18n.h:39
+msgid "Set Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:52 filter/libfilter-i18n.h:122
-msgid "Set Status"
+#: filter/libfilter-i18n.h:40
+msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:54 filter/libfilter-i18n.h:125
-#: mail/mail-config.glade.h:68
+#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
 msgid "Source"
 msgstr "Lähde"
 
-#: filter/libfilter-i18n.h:55 filter/libfilter-i18n.h:126
+#: filter/libfilter-i18n.h:42
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:60 filter/libfilter-i18n.h:136
+#: filter/libfilter-i18n.h:43
+msgid "starts with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:45
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:61 filter/libfilter-i18n.h:137
-#: mail/message-list.c:1172
+#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
 msgid "Subject"
 msgstr "Aihe"
 
-#: filter/libfilter-i18n.h:65 filter/libfilter-i18n.h:141
-msgid "contains"
-msgstr "sisältää"
-
-#: filter/libfilter-i18n.h:67 filter/libfilter-i18n.h:75
-#: filter/libfilter-i18n.h:142
-msgid "does not contain"
-msgstr "ei sisällä"
-
-#: filter/libfilter-i18n.h:68 filter/libfilter-i18n.h:76
-#: filter/libfilter-i18n.h:143
-msgid "does not end with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:69 filter/libfilter-i18n.h:77
-#: filter/libfilter-i18n.h:144
-msgid "does not exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:70 filter/libfilter-i18n.h:78
-#: filter/libfilter-i18n.h:145
-msgid "does not sound like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:71 filter/libfilter-i18n.h:79
-#: filter/libfilter-i18n.h:146
-msgid "does not start with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:72 filter/libfilter-i18n.h:80
-#: filter/libfilter-i18n.h:147
-msgid "ends with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:73 filter/libfilter-i18n.h:81
-#: filter/libfilter-i18n.h:148
-msgid "exists"
-msgstr ""
-
-#: filter/libfilter-i18n.h:86 filter/libfilter-i18n.h:93
-#: filter/libfilter-i18n.h:104 filter/libfilter-i18n.h:152
-msgid "is"
-msgstr "on"
-
-#: filter/libfilter-i18n.h:87 filter/libfilter-i18n.h:94
-#: filter/libfilter-i18n.h:149
-msgid "is greater than"
-msgstr "on suurempi kuin"
-
-#: filter/libfilter-i18n.h:88 filter/libfilter-i18n.h:95
-#: filter/libfilter-i18n.h:150
-msgid "is less than"
-msgstr "on pienempi kuin"
-
-#: filter/libfilter-i18n.h:89 filter/libfilter-i18n.h:96
-#: filter/libfilter-i18n.h:151
-msgid "is not"
-msgstr "ei ole"
-
-#: filter/libfilter-i18n.h:91
-msgid "matches regex"
-msgstr ""
-
-#: filter/libfilter-i18n.h:106 filter/libfilter-i18n.h:110
-#: filter/libfilter-i18n.h:153
-msgid "on or after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:107 filter/libfilter-i18n.h:111
-#: filter/libfilter-i18n.h:154
-msgid "on or before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:123 filter/libfilter-i18n.h:129
-#: filter/libfilter-i18n.h:155
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:131 filter/libfilter-i18n.h:133
-#: filter/libfilter-i18n.h:156
-msgid "starts with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:158
+#: filter/libfilter-i18n.h:47
 msgid "was after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:159
+#: 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 ""
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
+#: filter/score-editor.c:126
+msgid "Score Rules"
 msgstr ""
 
-#: mail/component-factory.c:303
+#: mail/component-factory.c:306
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:376
+#: mail/component-factory.c:379
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-factory.c:214
+#: mail/folder-browser-factory.c:237
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-factory.c:216 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 msgid "Properties"
 msgstr ""
@@ -5185,81 +5045,81 @@ msgstr ""
 msgid "Store search as vFolder"
 msgstr ""
 
-#: mail/folder-browser.c:508
+#: mail/folder-browser.c:509
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:511
+#: mail/folder-browser.c:512
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:514
+#: mail/folder-browser.c:515
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:517 mail/folder-browser.c:701
+#: mail/folder-browser.c:518 mail/folder-browser.c:702
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:523
+#: mail/folder-browser.c:524
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:526
+#: mail/folder-browser.c:527
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:529
+#: mail/folder-browser.c:530
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:532 mail/folder-browser.c:700
+#: mail/folder-browser.c:533 mail/folder-browser.c:701
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:543
+#: mail/folder-browser.c:544
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
-#: mail/folder-browser.c:545 mail/mail-view.c:148
+#: mail/folder-browser.c:546 mail/mail-view.c:148
 #: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
 #: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Tulosta"
 
-#: mail/folder-browser.c:550
+#: mail/folder-browser.c:551
 msgid "Reply to Sender"
 msgstr "Vastaa lähettäjälle"
 
-#: mail/folder-browser.c:552 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
+#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
-#: mail/folder-browser.c:554 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
+#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
 msgid "Forward"
 msgstr ""
 
-#: mail/folder-browser.c:556
+#: mail/folder-browser.c:557
 msgid "Forward inline"
 msgstr ""
 
-#: mail/folder-browser.c:559
+#: mail/folder-browser.c:560
 msgid "Mark as Read"
 msgstr "Merkitse luetuksi"
 
-#: mail/folder-browser.c:561
+#: mail/folder-browser.c:562
 msgid "Mark as Unread"
 msgstr "Merkitse lukemattomaksi"
 
-#: mail/folder-browser.c:566
+#: mail/folder-browser.c:567
 msgid "Move to Folder..."
 msgstr "Siirrä kansioon..."
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:569
 msgid "Copy to Folder..."
 msgstr "Kopioi kansioon..."
 
-#: mail/folder-browser.c:572
+#: mail/folder-browser.c:573
 msgid "Undelete"
 msgstr "Palauta"
 
@@ -5267,20 +5127,20 @@ msgstr "Palauta"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:582
+#: mail/folder-browser.c:583
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:586
+#: mail/folder-browser.c:587
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:703
+#: mail/folder-browser.c:704
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:704
+#: mail/folder-browser.c:705
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
@@ -5317,22 +5177,6 @@ msgstr ""
 msgid "Factory for the Mail Summary component."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr ""
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr ""
@@ -5416,6 +5260,10 @@ msgstr ""
 msgid "%s mailing list"
 msgstr ""
 
+#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+msgid "Add Filter Rule"
+msgstr ""
+
 #: mail/mail-callbacks.c:85
 msgid ""
 "You have not configured the mail client.\n"
@@ -5499,18 +5347,18 @@ msgstr "Tallenna viesti nimellä..."
 msgid "Save Messages As..."
 msgstr "Tallenna viestit nimellä..."
 
-#: mail/mail-callbacks.c:1198
+#: mail/mail-callbacks.c:1204
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1247
+#: mail/mail-callbacks.c:1253
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/mail-callbacks.c:1294
+#: mail/mail-callbacks.c:1300
 msgid "Printing of message failed"
 msgstr "Viestin tulostus epäonnistui"
 
@@ -5756,7 +5604,7 @@ msgid ""
 msgstr ""
 
 #: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
 msgid "_Edit"
 msgstr "_Muokkaa"
@@ -5828,10 +5676,6 @@ msgstr "Piilota"
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:681
-msgid "Reply-To:"
-msgstr ""
-
 #: mail/mail-format.c:704
 msgid "Loading message content"
 msgstr ""
@@ -5948,15 +5792,15 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:875
+#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
 msgid "Working"
 msgstr ""
 
-#: mail/mail-mt.c:666
+#: mail/mail-mt.c:666 mail/session.c:91
 msgid "Do you accept?"
 msgstr "Hyväksytkö?"
 
-#: mail/mail-mt.c:857
+#: mail/mail-mt.c:860
 msgid "Evolution progress"
 msgstr ""
 
@@ -6001,73 +5845,73 @@ msgstr ""
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1074
+#: mail/mail-ops.c:1085
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1115 mail/mail-ops.c:1253
+#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1182
+#: mail/mail-ops.c:1193
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1369
+#: mail/mail-ops.c:1380
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1418
+#: mail/mail-ops.c:1429
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viestiä %s"
 
-#: mail/mail-ops.c:1485
+#: mail/mail-ops.c:1496
 msgid "Retrieving messages"
 msgstr "Haetaan viestejä"
 
-#: mail/mail-ops.c:1495
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1580
 msgid "Saving messages"
 msgstr "Tallennetaan viestejä"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1659
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1661
+#: mail/mail-ops.c:1672
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1686
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1749
+#: mail/mail-ops.c:1760
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1775
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1792
+#: mail/mail-ops.c:1803
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
@@ -6180,6 +6024,14 @@ msgstr "Poista tämä viesti"
 msgid "Unseen"
 msgstr ""
 
+#: mail/message-list.c:621
+msgid "Seen"
+msgstr ""
+
+#: mail/message-list.c:624
+msgid "Answered"
+msgstr ""
+
 #: mail/message-list.c:627
 msgid "Multiple Unseen Messages"
 msgstr ""
@@ -6227,6 +6079,10 @@ msgstr ""
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
+#: mail/message-list.c:1171
+msgid "Flagged"
+msgstr ""
+
 #: mail/message-list.c:1172
 msgid "From"
 msgstr "Lähettäjä"
@@ -6556,7 +6412,7 @@ msgstr "%s - Evolution %s [%s]"
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1238
+#: shell/e-shell.c:1242
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6639,7 +6495,7 @@ msgid "Error saving shortcuts."
 msgstr ""
 
 #: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:53
 #: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
 msgid "_View"
 msgstr "_Näytä"
@@ -6700,8 +6556,8 @@ msgstr ""
 msgid "The Evolution shell."
 msgstr ""
 
-#: shell/main.c:74
-#, c-format
+#: shell/main.c:73
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
@@ -6721,7 +6577,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:99
+#: shell/main.c:98
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6729,15 +6585,15 @@ msgstr ""
 "Kiitos\n"
 "The Evolution Team\n"
 
-#: shell/main.c:130
+#: shell/main.c:129
 msgid "Cannot initialize the Evolution shell."
 msgstr ""
 
-#: shell/main.c:176
+#: shell/main.c:175
 msgid "Disable."
 msgstr ""
 
-#: shell/main.c:196
+#: shell/main.c:195
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobon komponenttijärjestelmän alustus epäonnistui"
 
@@ -6983,13 +6839,13 @@ msgid "Send _message to contact..."
 msgstr "Lähetä _viesti kontaktille..."
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
 #: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Tiedosto"
 
 #: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "_Tallenna"
@@ -7128,7 +6984,7 @@ msgid "Print Setup"
 msgstr "Tulostusasetukset"
 
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:207
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "Tallenna"
 
@@ -7165,12 +7021,12 @@ msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
 msgid "Task _Request (FIXME)"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:37
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
 #: ui/evolution-task-editor-dialog.xml.h:63
 msgid "_About..."
 msgstr "_Tietoja..."
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:40
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
 #: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
 msgid "_Close"
 msgstr "_Sulje"
@@ -7184,12 +7040,12 @@ msgstr "_Kontakti"
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
 #: ui/evolution-task-editor-dialog.xml.h:68
 msgid "_Debug"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:45
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
 #: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
 msgid "_Help"
 msgstr "_Apua"
@@ -7610,31 +7466,40 @@ msgstr ""
 msgid "Toggles whether the From chooser is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:38
-msgid "_Bcc Field"
+#: ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:39
+msgid "_Bcc Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:45
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Insert"
 msgstr "Li_sää"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:48
 msgid "_Insert text file... (FIXME)"
 msgstr "_Liitä tekstitiedosto..."
 
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Open..."
 msgstr "_Avaa..."
 
 #: ui/evolution-message-composer.xml.h:50
+#, fuzzy
+msgid "_Reply-To Field"
+msgstr "Vastaa lähettäjälle"
+
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Security"
 msgstr "_Turvallisuus"
 
@@ -7957,6 +7822,10 @@ msgstr ""
 msgid "All Attendees"
 msgstr ""
 
+#: widgets/menus/gal-view-menus.c:171
+msgid "_Current View"
+msgstr ""
+
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
 #: widgets/misc/e-calendar-item.c:421
@@ -8013,15 +7882,15 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:134
+#: widgets/misc/e-filter-bar.c:160
 msgid "Save Search"
 msgstr "Tallenna haku"
 
-#: widgets/misc/e-filter-bar.c:205
+#: widgets/misc/e-filter-bar.c:231
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
-#: widgets/misc/e-filter-bar.c:285
+#: widgets/misc/e-filter-bar.c:311
 msgid "Advanced ..."
 msgstr "Edistynyt ..."
 
@@ -8070,6 +7939,44 @@ msgstr ""
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobon alustus ei onnistunut"
 
-#: evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr ""
+#~ msgid "Synchronize"
+#~ msgstr "Synkronoi"
+
+#~ msgid "Copy From Pilot"
+#~ msgstr "Kopioi Pilotista"
+
+#~ msgid "Copy To Pilot"
+#~ msgstr "Kopioi Pilotiin"
+
+#~ msgid "JP Rosevear <jpr@helixcode.com>"
+#~ msgstr "JP Rosevear <jpr@helixcode.com>"
+
+#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
+
+#~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+#~ msgstr "(C) 1998-2000 the Free Software Foundation and Helix Code"
+
+#~ msgid "gnome-unknown.xpm"
+#~ msgstr "gnome-unknown.xpm"
+
+#~ msgid "Synchronize Action"
+#~ msgstr "Synkronoi toiminto"
+
+#~ msgid "Not connected to the gnome-pilot daemon"
+#~ msgstr "Ei yhteyttä gnome-pilot -demoniin"
+
+#~ msgid "label21"
+#~ msgstr "label21"
+
+#~ msgid "label55"
+#~ msgstr "label55"
+
+#~ msgid "Deleted"
+#~ msgstr "Poistettu"
+
+#~ msgid "Draft"
+#~ msgstr "Luonnos"
+
+#~ msgid "Add Rule"
+#~ msgstr "Lisää sääntö"