Do this everywhere, also fixup CLEANFILES

Do this everywhere, also fixup CLEANFILES

2001-04-14  Michael Meeks  <michael@ximian.com>

	* Makefile.am (dist-hook): remove built sources from dist.

svn path=/trunk/; revision=9309

1 files changed, 515 insertions, 323 deletions

diff --git a/po/fi.po b/po/fi.po
index aa36ac2265..83b9f60345 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-04-11 22:02+0000\n"
+"POT-Creation-Date: 2001-04-14 08:51-0400\n"
 "PO-Revision-Date: 2001-04-11 15:00+0300\n"
 "Last-Translator: Jarkko Ranta <jjranta@cc.joensuu.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -13,11 +13,11 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3269
+#: addressbook/backend/ebook/e-card.c:3209
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3271
+#: addressbook/backend/ebook/e-card.c:3211
 msgid ""
 "\n"
 "Name: "
@@ -25,37 +25,37 @@ msgstr ""
 "\n"
 "Nimi: "
 
-#: addressbook/backend/ebook/e-card.c:3272
+#: addressbook/backend/ebook/e-card.c:3212
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3273
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3214
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3275
+#: addressbook/backend/ebook/e-card.c:3215
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3276
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3290
+#: addressbook/backend/ebook/e-card.c:3230
 msgid ""
 "\n"
 "Birth Date: "
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "Syntymäpäivä: "
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3241
 msgid ""
 "\n"
 "Address:"
@@ -71,19 +71,19 @@ msgstr ""
 "\n"
 "Osoite:"
 
-#: addressbook/backend/ebook/e-card.c:3303
+#: addressbook/backend/ebook/e-card.c:3243
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3244
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3305
+#: addressbook/backend/ebook/e-card.c:3245
 msgid ""
 "\n"
 "  Street:      "
@@ -91,7 +91,7 @@ msgstr ""
 "\n"
 "  Katu:        "
 
-#: addressbook/backend/ebook/e-card.c:3306
+#: addressbook/backend/ebook/e-card.c:3246
 msgid ""
 "\n"
 "  City:        "
@@ -99,13 +99,13 @@ msgstr ""
 "\n"
 "  Kaupunki:    "
 
-#: addressbook/backend/ebook/e-card.c:3307
+#: addressbook/backend/ebook/e-card.c:3247
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3308
+#: addressbook/backend/ebook/e-card.c:3248
 msgid ""
 "\n"
 "  Postal Code: "
@@ -113,7 +113,7 @@ msgstr ""
 "\n"
 "  Postinumero: "
 
-#: addressbook/backend/ebook/e-card.c:3309
+#: addressbook/backend/ebook/e-card.c:3249
 msgid ""
 "\n"
 "  Country:     "
@@ -121,25 +121,25 @@ msgstr ""
 "\n"
 "  Maa:         "
 
-#: addressbook/backend/ebook/e-card.c:3322
+#: addressbook/backend/ebook/e-card.c:3262
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3334
+#: addressbook/backend/ebook/e-card.c:3274
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3277
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3361
+#: addressbook/backend/ebook/e-card.c:3301
 msgid ""
 "\n"
 "E-mail:\n"
@@ -147,7 +147,7 @@ msgstr ""
 "\n"
 "Sähköposti:\n"
 
-#: addressbook/backend/ebook/e-card.c:3364
+#: addressbook/backend/ebook/e-card.c:3304
 msgid ""
 "\n"
 "E-mail:"
@@ -155,13 +155,13 @@ msgstr ""
 "\n"
 "Sähköposti:"
 
-#: addressbook/backend/ebook/e-card.c:3383
+#: addressbook/backend/ebook/e-card.c:3323
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3389
+#: addressbook/backend/ebook/e-card.c:3329
 msgid ""
 "\n"
 "Time Zone: "
@@ -169,25 +169,25 @@ msgstr ""
 "\n"
 "Aikavyöhyke: "
 
-#: addressbook/backend/ebook/e-card.c:3397
+#: addressbook/backend/ebook/e-card.c:3337
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3401
+#: addressbook/backend/ebook/e-card.c:3341
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3413
+#: addressbook/backend/ebook/e-card.c:3353
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3414
+#: addressbook/backend/ebook/e-card.c:3354
 msgid ""
 "\n"
 "  Name:  "
@@ -195,31 +195,31 @@ msgstr ""
 "\n"
 "  Nimi:  "
 
-#: addressbook/backend/ebook/e-card.c:3415
+#: addressbook/backend/ebook/e-card.c:3355
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3416
+#: addressbook/backend/ebook/e-card.c:3356
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3417
+#: addressbook/backend/ebook/e-card.c:3357
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3418
+#: addressbook/backend/ebook/e-card.c:3358
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3422
+#: addressbook/backend/ebook/e-card.c:3362
 msgid ""
 "\n"
 "Categories: "
@@ -227,7 +227,7 @@ msgstr ""
 "\n"
 "Ryhmät: "
 
-#: addressbook/backend/ebook/e-card.c:3423
+#: addressbook/backend/ebook/e-card.c:3363
 msgid ""
 "\n"
 "Comment: "
@@ -243,13 +243,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3436
+#: addressbook/backend/ebook/e-card.c:3376
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3439
+#: addressbook/backend/ebook/e-card.c:3379
 msgid ""
 "\n"
 "Public Key: "
@@ -269,7 +269,7 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1089
+#: addressbook/conduit/address-conduit.c:1092
 #: addressbook/gui/component/addressbook-factory.c:43
 #: calendar/conduits/calendar/calendar-conduit.c:1151
 #: calendar/conduits/todo/todo-conduit.c:965
@@ -285,20 +285,20 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:651
+#: addressbook/conduit/address-conduit.c:654
 #: calendar/conduits/calendar/calendar-conduit.c:731
 #: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:652
+#: addressbook/conduit/address-conduit.c:655
 #: calendar/conduits/calendar/calendar-conduit.c:732
 #: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:684
 #: addressbook/conduit/address-conduit.c:687
+#: addressbook/conduit/address-conduit.c:690
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -402,7 +402,7 @@ msgstr "_Yritys:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
 #: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:60 ui/evolution-task-editor-dialog.xml.h:69
+#: ui/evolution-mail.xml.h:91 ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Poista"
 
@@ -895,7 +895,7 @@ msgstr "Osoitekirjan lähteet"
 #: filter/libfilter-i18n.h:8 mail/folder-browser.c:597
 #: mail/mail-config.glade.h:19 mail/mail-view.c:156
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
+#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "Poista"
 
@@ -985,7 +985,7 @@ msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:131
 #: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:402
-#: filter/filter-rule.c:547 filter/filter.glade.h:9
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
 #: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
 msgid "Remove"
 msgstr "Poista"
@@ -1142,7 +1142,7 @@ msgstr "Lähetä viesti kontaktille"
 #: addressbook/gui/widgets/e-addressbook-view.c:576
 #: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
 #: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:29
+#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:50
 #: ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Tulosta"
@@ -1521,20 +1521,20 @@ msgstr ""
 
 #: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:627
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
 msgid "High"
 msgstr "Korkea"
 
 #: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
 #: calendar/gui/calendar-model.c:1569
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:626
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
 msgid "Normal"
 msgstr "Tavallinen"
 
 #: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:625
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
 msgid "Low"
 msgstr "Matala"
 
@@ -1604,9 +1604,9 @@ msgstr ""
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
 #: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:968
+#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
 #: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1124
+#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1129
 #: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
 #: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
 msgid "None"
@@ -2255,77 +2255,77 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1290
+#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1304
+#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1317
+#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:572 calendar/gui/e-week-view.c:302
+#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
 #: calendar/gui/print.c:617
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:575 calendar/gui/e-week-view.c:305
+#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
 #: calendar/gui/print.c:616
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3036 ui/evolution-calendar.xml.h:16
+#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
 msgid "New Appointment"
 msgstr "Uusi tapaaminen"
 
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3242
+#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
 msgid "New All Day Event"
 msgstr "Uusi koko päivän tapahtuma"
 
-#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3247
+#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
 msgid "Go to Today"
 msgstr "Siirry tähän päivään"
 
-#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3249
+#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
 msgid "Go to Date..."
 msgstr "Siirry päivään..."
 
-#: calendar/gui/e-day-view.c:3052 calendar/gui/e-week-view.c:3255
+#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
 #: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Avaa"
 
-#: calendar/gui/e-day-view.c:3054 calendar/gui/e-week-view.c:3257
+#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
 msgid "Delete this Appointment"
 msgstr "Poista tämä tapaaminen"
 
-#: calendar/gui/e-day-view.c:3056 calendar/gui/e-week-view.c:3259
+#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
 #: ui/evolution-event-editor.xml.h:45
 msgid "Schedule Meeting"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3065 calendar/gui/e-week-view.c:3272
+#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
 msgid "Make this Occurrence Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3067 calendar/gui/e-week-view.c:3274
+#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
 msgid "Delete this Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3069
+#: calendar/gui/e-day-view.c:3179
 msgid "Delete all Occurrences"
 msgstr ""
 
@@ -2410,7 +2410,7 @@ msgstr ""
 msgid "Calendar Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:613
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
 msgid "Date:"
 msgstr "Päiväys:"
 
@@ -2508,8 +2508,8 @@ msgid ""
 "Time"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:30
-#: mail/message-list.c:1019
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
+#: mail/message-list.c:1052
 msgid "Status"
 msgstr "Tila"
 
@@ -2539,11 +2539,11 @@ msgstr ""
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:3240 calendar/gui/e-week-view.c:3263
+#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
 msgid "New Appointment..."
 msgstr "Uusi tapaaminen..."
 
-#: calendar/gui/e-week-view.c:3276
+#: calendar/gui/e-week-view.c:3314
 msgid "Delete All Occurrences"
 msgstr ""
 
@@ -2635,11 +2635,11 @@ msgstr "_Alkamisaika:"
 msgid "_Starting date:"
 msgstr "_Alkamispäivä:"
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:33
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
 msgid "after"
 msgstr "jälkeen"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
 msgid "before"
 msgstr "ennen"
 
@@ -3069,7 +3069,7 @@ msgstr "Tulosta kalenteri"
 
 #: calendar/gui/print.c:1321 mail/mail-callbacks.c:1342
 #: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:52
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
 
@@ -3109,6 +3109,26 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SMTKTPL"
 
+#: camel/camel-cipher-context.c:169
+msgid "Signing is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:207
+msgid "Clearsigning is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:245
+msgid "Verifying is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:286
+msgid "Encryption is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:326
+msgid "Decryption is not supported by this cipher"
+msgstr ""
+
 #: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
 msgid "Syncing folders"
 msgstr "Synkronoidaan kansiota"
@@ -3162,7 +3182,7 @@ msgstr "Virhe jäsennettäessä suodatinta: %s: %s"
 msgid "Error executing filter: %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: camel/camel-filter-search.c:431 camel/camel-filter-search.c:437
+#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -3275,6 +3295,58 @@ msgstr "(tuntematon virhe)"
 msgid "Error copying mail temp file: %s"
 msgstr "Virhe kopioitaessa viestin väliaikaistiedostoa: %s"
 
+#: camel/camel-pgp-context.c:186
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:189
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr ""
+
+#: camel/camel-pgp-context.c:509
+msgid "No plaintext to sign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
+#: camel/camel-pgp-context.c:1021 camel/camel-pgp-context.c:1235
+msgid "No password provided."
+msgstr "Ei salasanaa."
+
+#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
+#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1028
+#: camel/camel-pgp-context.c:1242
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:681
+msgid "No plaintext to clearsign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:871
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:888
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Väliaikaistiedostoa ei voitu luoda: %s"
+
+#: camel/camel-pgp-context.c:1011
+#, fuzzy
+msgid "No plaintext to encrypt."
+msgstr "Napsauta kuvaketta salauksen purkamiseksi."
+
+#: camel/camel-pgp-context.c:1037
+msgid "No recipients specified"
+msgstr ""
+
+#: camel/camel-pgp-context.c:1227
+msgid "No ciphertext to decrypt."
+msgstr ""
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -3292,37 +3364,37 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:189
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:193
+#: camel/camel-remote-store.c:190
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:243
+#: camel/camel-remote-store.c:240
 msgid "Connection cancelled"
 msgstr "Yhteys peruutettu"
 
-#: camel/camel-remote-store.c:246
+#: camel/camel-remote-store.c:243
 #: camel/providers/smtp/camel-smtp-transport.c:261
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:247
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:328 camel/camel-remote-store.c:390
-#: camel/camel-remote-store.c:461
+#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
+#: camel/camel-remote-store.c:458
 #: camel/providers/imap/camel-imap-command.c:264
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:467
+#: camel/camel-remote-store.c:464
 msgid "Server unexpectedly disconnected"
 msgstr ""
 
@@ -3490,12 +3562,12 @@ msgstr ""
 "%s"
 
 #. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:995 mail/mail-ops.c:1002
-#: mail/mail-ops.c:1020 mail/mail-ops.c:1021
+#: camel/camel-store.c:380 mail/mail-ops.c:994 mail/mail-ops.c:1001
+#: mail/mail-ops.c:1019 mail/mail-ops.c:1020
 msgid "Trash"
 msgstr "Roskakori"
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL:n `%s' jäsentäminen epäonnistui"
@@ -3565,7 +3637,7 @@ msgstr "Tarkastetaan onko uutta sähköpostia"
 msgid "Check for new messages in all folders"
 msgstr "Etsi uusia viestejä kaikista kansioista"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:479
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
 msgid "Folders"
 msgstr "Kansiot"
 
@@ -3619,7 +3691,6 @@ msgid "You didn't enter a password."
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:518
-#: camel/providers/smtp/camel-smtp-transport.c:411
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3627,17 +3698,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:858
+#: camel/providers/imap/camel-imap-store.c:865
 #, c-format
 msgid "%s is not a selectable folder"
 msgstr "%s ei ole valittavissa oleva kansio"
 
-#: camel/providers/imap/camel-imap-store.c:872
+#: camel/providers/imap/camel-imap-store.c:879
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1373
+#: camel/providers/imap/camel-imap-store.c:1382
 msgid "You must be working online to complete this operation"
 msgstr ""
 
@@ -3864,7 +3935,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1383
+#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
 msgid "Synchronising folder"
 msgstr "Synkronoidaan kansiota"
 
@@ -4280,6 +4351,14 @@ msgstr ""
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
+#: camel/providers/smtp/camel-smtp-transport.c:411
+#, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+
 #: camel/providers/smtp/camel-smtp-transport.c:527
 #, c-format
 msgid "SMTP server %s"
@@ -4433,7 +4512,7 @@ msgstr "Lisää liite..."
 msgid "Attach a file to the message"
 msgstr "Lisää viestiin liitetiedoston"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1019
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
 msgid "Attachment"
 msgstr "Liite"
 
@@ -4464,25 +4543,25 @@ msgstr ""
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:709
+#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
 msgid "From:"
 msgstr "Lähettäjä:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:711
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
 msgid "Reply-To:"
 msgstr "Vastausosoite:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:633
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:713
+#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
 msgid "To:"
 msgstr "Vastaanottaja:"
 
@@ -4490,7 +4569,7 @@ msgstr "Vastaanottaja:"
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:715
+#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
 msgid "Cc:"
 msgstr ""
 
@@ -4966,7 +5045,7 @@ msgid ""
 msgstr ""
 
 #: filter/filter-folder.c:222 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:678
+#: mail/mail-account-gui.c:682
 msgid "Select Folder"
 msgstr ""
 
@@ -4989,31 +5068,31 @@ msgstr ""
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:624
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "Säännön nimi: "
 
-#: filter/filter-rule.c:628
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "Nimetön"
 
-#: filter/filter-rule.c:644
+#: filter/filter-rule.c:646
 msgid "If"
 msgstr "Jos"
 
-#: filter/filter-rule.c:662
+#: filter/filter-rule.c:664
 msgid "Execute actions"
 msgstr "Suorita toiminnot"
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:668
 msgid "if all criteria are met"
 msgstr "kaikki ehdot täytetään"
 
-#: filter/filter-rule.c:671
+#: filter/filter-rule.c:673
 msgid "if any criteria are met"
 msgstr "mikään ehdoista täyttyy"
 
-#: filter/filter-rule.c:682
+#: filter/filter-rule.c:684
 msgid "Add criterion"
 msgstr "Lisää ehto"
 
@@ -5111,139 +5190,154 @@ msgid "Important"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "Is Not"
+msgstr "ei ole"
+
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Is"
+msgstr "I"
+
+#: filter/libfilter-i18n.h:18
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:19
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:20
 msgid "Message Header"
 msgstr "Viestin otsikko"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:21
 msgid "Message was received"
 msgstr "Viesti vastaanotettu"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:22
 msgid "Message was sent"
 msgstr "Viesti lähetetty"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:23
 msgid "Move to Folder"
 msgstr "Siirrä kansioon"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:24
 msgid "Read"
 msgstr "Lue"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:25
 msgid "Recipients"
 msgstr "Vastaanottajat"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:26
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:27
 msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 filter/score-rule.c:203 filter/score-rule.c:205
-#: mail/message-list.c:1019
+#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
+#: mail/message-list.c:1052
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:29
 msgid "Sender"
 msgstr "Lähettäjä"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:30
 msgid "Set Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "Source Account"
+msgstr "Tili"
+
+#: filter/libfilter-i18n.h:32
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:34
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32 mail/message-list.c:1020
+#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
 msgid "Subject"
 msgstr "Aihe"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:38
 msgid "contains"
 msgstr "sisältää"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:39
 msgid "does not contain"
 msgstr "ei sisällä"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:40
 msgid "does not end with"
 msgstr "ei lopu merkkijonoon"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:41
 msgid "does not exist"
 msgstr "ei ole olemassa"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:42
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:43
 msgid "does not start with"
 msgstr "ei ala merkkijonolla"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:44
 msgid "ends with"
 msgstr "loppuu merkkijonoon"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:45
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:46
 msgid "is greater than"
 msgstr "on suurempi kuin"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:47
 msgid "is less than"
 msgstr "on pienempi kuin"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:48
 msgid "is not"
 msgstr "ei ole"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:49
 msgid "is"
 msgstr "on"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:50
 msgid "on or after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "alkaa merkkijonolla"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:54
 msgid "was after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:55
 msgid "was before"
 msgstr ""
 
@@ -5251,11 +5345,11 @@ msgstr ""
 msgid "Score Rules"
 msgstr ""
 
-#: mail/component-factory.c:332
+#: mail/component-factory.c:329
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:405
+#: mail/component-factory.c:402
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -5317,15 +5411,15 @@ msgstr "Tallenna nimellä..."
 msgid "Reply to Sender"
 msgstr "Vastaa lähettäjälle"
 
-#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:36
+#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:60
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
-#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:14
+#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
 msgid "Forward"
 msgstr "Välitä"
 
-#: mail/folder-browser.c:583
+#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
 msgid "Forward inline"
 msgstr ""
 
@@ -5345,7 +5439,7 @@ msgstr "Siirrä kansioon..."
 msgid "Copy to Folder..."
 msgstr "Kopioi kansioon..."
 
-#: mail/folder-browser.c:599
+#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
 msgid "Undelete"
 msgstr "Palauta"
 
@@ -5353,7 +5447,7 @@ msgstr "Palauta"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:609
+#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
 msgid "Apply Filters"
 msgstr ""
 
@@ -5592,7 +5686,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1302
+#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
@@ -5889,72 +5983,72 @@ msgstr ""
 msgid "Hide"
 msgstr "Piilota"
 
-#: mail/mail-display.c:1100
+#: mail/mail-display.c:1102
 msgid "Open link in browser"
 msgstr "Avaa linkki selaimessa"
 
-#: mail/mail-display.c:1102
+#: mail/mail-display.c:1104
 msgid "Save as (FIXME)"
 msgstr "Tallenna nimellä"
 
-#: mail/mail-display.c:1104
+#: mail/mail-display.c:1106
 msgid "Copy location (FIXME)"
 msgstr "Kopioi sijainti"
 
-#: mail/mail-format.c:512
+#: mail/mail-format.c:518
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:554
+#: mail/mail-format.c:560
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:736
+#: mail/mail-format.c:742
 msgid "Loading message content"
 msgstr "Ladataan viestin sisältöä"
 
-#: mail/mail-format.c:1025
+#: mail/mail-format.c:1046
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1031
+#: mail/mail-format.c:1052
 msgid "Encrypted message"
 msgstr "Salattu viesti"
 
-#: mail/mail-format.c:1032
+#: mail/mail-format.c:1053
 msgid "Click icon to decrypt."
 msgstr "Napsauta kuvaketta salauksen purkamiseksi."
 
-#: mail/mail-format.c:1101 mail/mail-format.c:1488
+#: mail/mail-format.c:1137 mail/mail-format.c:1526
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1109 mail/mail-format.c:1496
+#: mail/mail-format.c:1145 mail/mail-format.c:1534
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1709
+#: mail/mail-format.c:1747
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1721
+#: mail/mail-format.c:1759
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1725
+#: mail/mail-format.c:1763
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1759
+#: mail/mail-format.c:1797
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1764
+#: mail/mail-format.c:1802
 msgid "Malformed external-body part."
 msgstr ""
 
@@ -6038,123 +6132,123 @@ msgstr "Hyväksytkö?"
 msgid "Evolution progress"
 msgstr ""
 
-#: mail/mail-ops.c:588
+#: mail/mail-ops.c:587
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Lähetetään \"%s\""
 
-#: mail/mail-ops.c:590
+#: mail/mail-ops.c:589
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
-#: mail/mail-ops.c:705
+#: mail/mail-ops.c:704
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Lähetetään viestiä %d / %d"
 
-#: mail/mail-ops.c:724
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:726 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:812
+#: mail/mail-ops.c:811
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:885
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:885
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:900
 msgid "Moving"
 msgstr "Siirretään"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:903
 msgid "Copying"
 msgstr "Kopioidaan"
 
-#: mail/mail-ops.c:979
+#: mail/mail-ops.c:978
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1140
+#: mail/mail-ops.c:1139
 msgid "Forwarded messages"
 msgstr "Välitetyt viestit"
 
-#: mail/mail-ops.c:1181 mail/mail-ops.c:1319
+#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1247
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1435
+#: mail/mail-ops.c:1434
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1484
+#: mail/mail-ops.c:1483
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viestiä %s"
 
-#: mail/mail-ops.c:1551
+#: mail/mail-ops.c:1550
 msgid "Retrieving messages"
 msgstr "Haetaan viestejä"
 
-#: mail/mail-ops.c:1561
+#: mail/mail-ops.c:1560
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1635
+#: mail/mail-ops.c:1634
 msgid "Saving messages"
 msgstr "Tallennetaan viestejä"
 
-#: mail/mail-ops.c:1714
+#: mail/mail-ops.c:1713
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1727
+#: mail/mail-ops.c:1726
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1741
+#: mail/mail-ops.c:1740
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1815
+#: mail/mail-ops.c:1814
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: mail/mail-ops.c:1830
+#: mail/mail-ops.c:1829
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1858
+#: mail/mail-ops.c:1857
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
@@ -6235,149 +6329,114 @@ msgstr ""
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:35
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
 msgid "Reply"
 msgstr "Vastaa"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:39
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
 msgid "Reply to the sender of this message"
 msgstr "Vastaa tämän viestin lähettäjälle"
 
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:38
+#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
 msgid "Reply to all recipients of this message"
 msgstr "Vastaa kaikille tämän viestin vastaanottajille"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:16
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
 msgid "Forward this message"
 msgstr "Välitä tämä viesti"
 
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:32
+#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
 msgid "Print the selected message"
 msgstr "Tulosta valittu viesti"
 
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:7
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
 msgid "Delete this message"
 msgstr "Poista tämä viesti"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:648
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:616
+#: mail/message-list.c:649
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:617
+#: mail/message-list.c:650
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:618
+#: mail/message-list.c:651
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:619
+#: mail/message-list.c:652
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:623
+#: mail/message-list.c:656
 msgid "Lowest"
 msgstr "Matalin"
 
-#: mail/message-list.c:624
+#: mail/message-list.c:657
 msgid "Lower"
 msgstr "Matalampi"
 
-#: mail/message-list.c:628
+#: mail/message-list.c:661
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: mail/message-list.c:629
+#: mail/message-list.c:662
 msgid "Highest"
 msgstr "Korkein"
 
-#: mail/message-list.c:879
+#: mail/message-list.c:912
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:886
+#: mail/message-list.c:919
 msgid "Today %l:%M %p"
 msgstr "Tänään %l:%M %p"
 
-#: mail/message-list.c:895
+#: mail/message-list.c:928
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l:%M %p"
 
-#: mail/message-list.c:907
+#: mail/message-list.c:940
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:948
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:917
+#: mail/message-list.c:950
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1052
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1020
+#: mail/message-list.c:1053
 msgid "From"
 msgstr "Lähettäjä"
 
-#: mail/message-list.c:1020
+#: mail/message-list.c:1053
 msgid "Date"
 msgstr "Päiväys"
 
-#: mail/message-list.c:1020
+#: mail/message-list.c:1053
 msgid "Received"
 msgstr "Otettu vastaan"
 
-#: mail/message-list.c:1021
+#: mail/message-list.c:1054
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: mail/message-list.c:1021
+#: mail/message-list.c:1054
 msgid "Size"
 msgstr "Koko"
 
-#: mail/openpgp-utils.c:92
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr ""
-
-#: mail/openpgp-utils.c:95
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr ""
-
-#: mail/openpgp-utils.c:455 mail/openpgp-utils.c:562 mail/openpgp-utils.c:766
-#: mail/openpgp-utils.c:920 mail/openpgp-utils.c:1079
-msgid "No GPG/PGP program available."
-msgstr "GPG/PGP-ohjelmaa ei ole."
-
-#: mail/openpgp-utils.c:462 mail/openpgp-utils.c:571 mail/openpgp-utils.c:773
-#: mail/openpgp-utils.c:927
-msgid "No password provided."
-msgstr "Ei salasanaa."
-
-#: mail/openpgp-utils.c:470 mail/openpgp-utils.c:578 mail/openpgp-utils.c:779
-#: mail/openpgp-utils.c:935 mail/openpgp-utils.c:1085
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: mail/openpgp-utils.c:592
-msgid "No recipients specified"
-msgstr ""
-
-#: mail/openpgp-utils.c:1096
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Väliaikaistiedostoa ei voitu luoda: %s"
-
 #: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
 msgid "Folder"
 msgstr "Kansio"
@@ -6643,12 +6702,12 @@ msgstr ""
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1129
+#: shell/e-shell-view.c:1134
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1131
+#: shell/e-shell-view.c:1136
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
@@ -6867,7 +6926,7 @@ msgstr "Etsi kontakti"
 msgid "New contact"
 msgstr "Uusi kontakti"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:28
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
 msgid "Previews the message to be printed"
 msgstr "Esikatsele tulostettavaa viestiä"
 
@@ -6875,7 +6934,7 @@ msgstr "Esikatsele tulostettavaa viestiä"
 msgid "Print contacts"
 msgstr "Tulosta kontaktit"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:48
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
 msgid "Stop"
 msgstr "Pysäytä"
 
@@ -6909,7 +6968,7 @@ msgid "_Search for contacts"
 msgstr "_Etsi kontakteja"
 
 #: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:78
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:110
 #: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
 msgid "_Tools"
 msgstr "T_yökalut"
@@ -7057,7 +7116,7 @@ msgstr "_Uusi"
 msgid "_Open Calendar"
 msgstr "_Avaa kalenteri"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:75
+#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
 #: ui/evolution-tasks.xml.h:8
 msgid "_Save As..."
 msgstr "Tallenna _nimellä..."
@@ -7088,7 +7147,7 @@ msgid "Print this item"
 msgstr "Tulosta tämä kohta"
 
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:33 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Tulosta..."
 
@@ -7175,7 +7234,7 @@ msgstr "Sulje tämä tapaaminen"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "Kopioi kansioon..."
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
 #: ui/evolution-task-editor-dialog.xml.h:14
 msgid "Copy"
 msgstr "Kopioi"
@@ -7286,7 +7345,8 @@ msgstr ""
 msgid "Schedule some sort of a meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:68
+#: ui/evolution-task-editor-dialog.xml.h:57
 msgid "Select All"
 msgstr "Valitse kaikki"
 
@@ -7364,7 +7424,7 @@ msgstr "L_iitä"
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:71
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
 #: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "_Ominaisuudet..."
@@ -7402,123 +7462,244 @@ msgstr ""
 msgid "New Mail"
 msgstr "Uusi sähköposti"
 
-#: ui/evolution-mail.xml.h:1
+#: ui/evolution-mail.xml.h:2
+msgid "Apply any new filters to the mail in this box"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:3
+msgid "Change the properties of this folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:4
 msgid "Compose"
 msgstr "Kirjoita"
 
-#: ui/evolution-mail.xml.h:2
+#: ui/evolution-mail.xml.h:5
 msgid "Compose a new message"
 msgstr "Kirjoita uusi viesti"
 
-#: ui/evolution-mail.xml.h:4
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Configure Folder..."
+msgstr "Siirrä kansioon..."
+
+#: ui/evolution-mail.xml.h:8
 msgid "Copy message to a new folder"
 msgstr "Kopioi viesti uuteen kansioon"
 
-#: ui/evolution-mail.xml.h:5
+#: ui/evolution-mail.xml.h:9
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "Kopioi viesti uuteen kansioon"
+
+#: ui/evolution-mail.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:8
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Delete the selected messages"
+msgstr "Tulosta valittu viesti"
+
+#: ui/evolution-mail.xml.h:14
 msgid "Display all of the message headers"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:15
+#, fuzzy
+msgid "Edit Message"
+msgstr "Tulosta viesti"
+
+#: ui/evolution-mail.xml.h:16
+#, fuzzy
+msgid "Edit the current message"
+msgstr "Tulosta valittu viesti"
+
+#: ui/evolution-mail.xml.h:17
 msgid "Empty _Trash"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail.xml.h:18
+msgid "Expunge"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:19
 msgid "Filter on Se_nder"
 msgstr "Suodata _lähettäjän mukaan"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail.xml.h:20
 msgid "Filter on _Recipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail.xml.h:21
 msgid "Filter on _Subject"
 msgstr "Suodata _aiheen mukaan"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail.xml.h:22
+msgid "Finaly remove all mails tagged for deletion"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:23
 msgid "Forget _Passwords"
 msgstr "_Unohda salasanat"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:25
 msgid "Forward As"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail.xml.h:27
+msgid "Forward the selected mail to someone"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:29
+msgid "Forward this message in-line with your mail, so you can edit it"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:30
 msgid "Full _Headers"
 msgstr "Täydet _otsikkotiedot"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail.xml.h:31
 msgid "Hide Deleted Messages"
 msgstr "Piilota poistetut viestit"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail.xml.h:32
 msgid "Hide S_elected Messages"
 msgstr "Piilota valitut vi_estit"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:33
 msgid "Hide _Deleted Messages"
 msgstr "Piilota _poistetut viestit"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:34
 msgid "Hide _Read messages"
 msgstr "Piilota _luetut viestit"
 
-#: ui/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:35
+#, fuzzy
+msgid "Invert Selection"
+msgstr "_Käännä valinta"
+
+#: ui/evolution-mail.xml.h:36
 msgid "Manage _Subscriptions..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:37
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:38
 msgid "Mark All as R_ead"
 msgstr "Merkitse ka_ikki luetuksi"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:39
+#, fuzzy
+msgid "Mark As Read"
+msgstr "Merkitse luetuksi"
+
+#: ui/evolution-mail.xml.h:40
+#, fuzzy
+msgid "Mark As U_nread"
+msgstr "Merkitse luke_mattomaksi"
+
+#: ui/evolution-mail.xml.h:41
 msgid "Mark as U_nread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:42
+#, fuzzy
+msgid "Mark the selected messages as having been read"
+msgstr "Tulosta valittu viesti"
+
+#: ui/evolution-mail.xml.h:43
+msgid "Mark the selected messages as not having been read"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:44
 msgid "Move"
 msgstr "Siirrä"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:45
 msgid "Move message to a new folder"
 msgstr "Siirrä viesti uuteen kansioon"
 
-#: ui/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:46
+#, fuzzy
+msgid "Move selected messages to another folder"
+msgstr "Siirrä viesti uuteen kansioon"
+
+#: ui/evolution-mail.xml.h:47
+#, fuzzy
+msgid "Open in New Window"
+msgstr "Avaa linkki selaimessa"
+
+#: ui/evolution-mail.xml.h:48
+#, fuzzy
+msgid "Open the current message in a new window"
+msgstr "Lähetä viesti heti"
+
+#: ui/evolution-mail.xml.h:53
+#, fuzzy
+msgid "Print Preview of message..."
+msgstr "Tulostuksen esikatselu"
+
+#: ui/evolution-mail.xml.h:54
 msgid "Print message to the printer"
 msgstr "Tulosta viesti tulostimella"
 
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail.xml.h:55
+#, fuzzy
+msgid "Print message..."
+msgstr "Tulosta viesti"
+
+#: ui/evolution-mail.xml.h:58
 msgid "Redirect (FIXME: implement me)"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:61
 msgid "Reply to _All"
 msgstr "Vastaa _kaikille"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:62
+#, fuzzy
+msgid "Reply to all"
+msgstr "Vastaa kaikille"
+
+#: ui/evolution-mail.xml.h:64
+#, fuzzy
+msgid "Reply to sender"
+msgstr "Vastaa lähettäjälle"
+
+#: ui/evolution-mail.xml.h:66
 msgid "S_ource"
 msgstr "_Lähde"
 
-#: ui/evolution-mail.xml.h:41 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:67
+#, fuzzy
+msgid "Save the message into a new file"
+msgstr "Tallenna viesti johonkin tiettyyn kansioon"
+
+#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Valitse _kaikki"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:70
 msgid "Select _Thread"
 msgstr "Valitse _säie"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:71
 msgid "Send / Receive"
 msgstr "Lähetä / Vastaanota"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:72
+msgid "Send a reply to the person who sent you this mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:73
+msgid "Send a single mail in reply to all the selected mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:74
 msgid ""
 "Send queued mail\n"
 "    and retrieve new mail"
@@ -7526,119 +7707,125 @@ msgstr ""
 "lähetä jonossa olevat viestit\n"
 "    ja hae uudet viestit"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:76
 msgid "Send queued mail and retrieve new mail"
 msgstr "Lähetä jonossa olevat viestit ja hae uudet viestit"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:77
 msgid "Show _All"
 msgstr "Näytä k_aikki"
 
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:79
 msgid "Threaded Message list"
 msgstr "Säikeistetty viesti-ikkuna"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:80
+#, fuzzy
+msgid "Un-delete the selected messages"
+msgstr "Tulosta valittu viesti"
+
+#: ui/evolution-mail.xml.h:82
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:83
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:84
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:85
 msgid "View Raw Message Source"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:86
 msgid "Virtual Folder _Editor..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:87
 msgid "_Apply Filters"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:88
 msgid "_Attachment"
 msgstr "_Liite"
 
-#: ui/evolution-mail.xml.h:57
-msgid "_Compose"
-msgstr "_Kirjoita"
-
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:89
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:90
 msgid "_Create Filter From Message"
 msgstr "_Luo viestistä suodatin"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:92
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:93
 msgid "_Filters..."
 msgstr "S_uodattimet..."
 
-#: ui/evolution-mail.xml.h:63 ui/evolution.xml.h:31
+#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
 msgid "_Folder"
 msgstr "_Kansio"
 
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:95
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:96
 msgid "_Inline"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:97 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Käännä valinta"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:98
 msgid "_Mail Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:99
 msgid "_Mail Settings..."
 msgstr "_Sähköpostiasetukset..."
 
-#: ui/evolution-mail.xml.h:69
+#: ui/evolution-mail.xml.h:100
 msgid "_Move to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail.xml.h:101
 msgid "_Open Selected Items"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:72
+#: ui/evolution-mail.xml.h:103
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail.xml.h:104
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail.xml.h:105
 msgid "_Resend Messages"
 msgstr "Lähetä viestejä _uudelleen"
 
-#: ui/evolution-mail.xml.h:76
+#: ui/evolution-mail.xml.h:107
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "Tallenna viesti nimellä..."
+
+#: ui/evolution-mail.xml.h:108
 msgid "_Send / Receive"
 msgstr "_Lähetä / Vastaanota"
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail.xml.h:109
 msgid "_Threaded"
 msgstr "_Säikeistys"
 
-#: ui/evolution-mail.xml.h:79
+#: ui/evolution-mail.xml.h:111
 msgid "_Undelete"
 msgstr "_Palauta"
 
@@ -8122,11 +8309,11 @@ msgstr ""
 msgid "All Attendees"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:178
+#: widgets/menus/gal-view-menus.c:177
 msgid "_Current View"
 msgstr "_Nykyinen näkymä"
 
-#: widgets/menus/gal-view-menus.c:198
+#: widgets/menus/gal-view-menus.c:196
 msgid "Define Views"
 msgstr ""
 
@@ -8247,3 +8434,8 @@ msgstr "init_corba(): GNOME:n alustus epäonnistui"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobon alustus epäonnistui"
 
+#~ msgid "No GPG/PGP program available."
+#~ msgstr "GPG/PGP-ohjelmaa ei ole."
+
+#~ msgid "_Compose"
+#~ msgstr "_Kirjoita"