Updated Finnish translation

svn path=/trunk/; revision=33958

1 files changed, 1014 insertions, 837 deletions

diff --git a/po/fi.po b/po/fi.po
index eb583eef53..8f098c47b3 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-16 14:32+0100\n"
+"POT-Creation-Date: 2007-08-06 16:38+0300\n"
 "PO-Revision-Date: 2007-03-05 17:08+0300\n"
 "Last-Translator: Ilkka Tuohela <hile@iki.fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
@@ -109,7 +109,7 @@ msgstr "Siirry tähän päivään"
 msgid "Go to Date"
 msgstr "Siirry päivään"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:299
+#: ../a11y/calendar/ea-day-view-main-item.c:303
 #: ../a11y/calendar/ea-week-view-main-item.c:301
 msgid "a table to view and select the current time range"
 msgstr "taulukko, josta voi nähdä ja nykyisen aikaalueen"
@@ -154,7 +154,7 @@ msgid "calendar view for one or more days"
 msgstr "Kalenteri näkymä yhdelle tai useammalle päivälle"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:726
+#: ../calendar/gui/calendar-component.c:734
 msgid "%A %d %b %Y"
 msgstr "%A %d. %Bta %Y"
 
@@ -165,9 +165,9 @@ msgstr "%A %d. %Bta %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:729
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:2106
+#: ../calendar/gui/calendar-component.c:737
+#: ../calendar/gui/e-day-view-top-item.c:1318
+#: ../calendar/gui/e-day-view.c:2109
 #: ../calendar/gui/e-week-view-main-item.c:319
 #: ../calendar/gui/e-week-view-main-item.c:533
 msgid "%a %d %b"
@@ -176,9 +176,9 @@ msgstr "%a %d %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:731
-#: ../calendar/gui/calendar-component.c:736
-#: ../calendar/gui/calendar-component.c:738
+#: ../calendar/gui/calendar-component.c:739
+#: ../calendar/gui/calendar-component.c:744
+#: ../calendar/gui/calendar-component.c:746
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -186,10 +186,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:763
+#: ../calendar/gui/calendar-component.c:758
 #: ../calendar/gui/calendar-component.c:765
+#: ../calendar/gui/calendar-component.c:771
+#: ../calendar/gui/calendar-component.c:773
 msgid "%d %b %Y"
 msgstr "%d. %Bta %Y"
 
@@ -199,9 +199,9 @@ msgstr "%d. %Bta %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:755
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:2122
+#: ../calendar/gui/calendar-component.c:763
+#: ../calendar/gui/e-day-view-top-item.c:1322
+#: ../calendar/gui/e-day-view.c:2125
 #: ../calendar/gui/e-week-view-main-item.c:333
 #: ../calendar/gui/e-week-view-main-item.c:547
 msgid "%d %b"
@@ -295,7 +295,7 @@ msgstr "Taulukon solu"
 
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:574
+#: ../widgets/table/e-table-click-to-add.c:571
 msgid "click to add"
 msgstr "lisää napsauttamalla"
 
@@ -593,7 +593,8 @@ msgstr "Määrittele automaatinen täydennys"
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:277 ../calendar/gui/migration.c:402
+#: ../calendar/gui/calendar-component.c:284 ../calendar/gui/migration.c:402
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
 #: ../plugins/exchange-operations/exchange-folder.c:581
 msgid "Contacts"
 msgstr "Yhteystiedot"
@@ -652,10 +653,10 @@ msgstr "Tällä tietokoneella"
 #: ../addressbook/gui/component/addressbook-migrate.c:496
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../calendar/gui/calendar-component.c:246
-#: ../calendar/gui/memos-component.c:208 ../calendar/gui/migration.c:491
+#: ../calendar/gui/calendar-component.c:247
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:491
 #: ../calendar/gui/migration.c:590 ../calendar/gui/migration.c:1103
-#: ../calendar/gui/tasks-component.c:204 ../filter/filter-label.c:122
+#: ../calendar/gui/tasks-component.c:205 ../filter/filter-label.c:122
 #: ../mail/em-migrate.c:1056 ../mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Henkilökohtainen"
@@ -683,7 +684,7 @@ msgid "Create a new contact list"
 msgstr "Luo uusi yhteystietoluettelo"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1208
+#: ../addressbook/gui/component/addressbook-config.c:1209
 msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
@@ -719,7 +720,7 @@ msgstr "Kopioi kirjan sisältö paikallisesti yhteydettömään käyttöön"
 #: ../calendar/gui/dialogs/calendar-setup.c:376
 #: ../calendar/gui/dialogs/calendar-setup.c:387
 #: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
-#: ../plugins/itip-formatter/itip-formatter.c:2228
+#: ../plugins/itip-formatter/itip-formatter.c:2237
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Yleiset"
@@ -745,7 +746,7 @@ msgid "Details"
 msgstr "Yksityiskohtaiset"
 
 #: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:849
+#: ../mail/em-folder-browser.c:850
 msgid "Searching"
 msgstr "Etsitään"
 
@@ -753,7 +754,7 @@ msgstr "Etsitään"
 msgid "Downloading"
 msgstr "Haetaan"
 
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-config.c:1207
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Osoitekirjan ominaisuudet"
@@ -820,18 +821,18 @@ msgstr ""
 "Odota kärsivällisesti kun Evolution muuntaa Pilotin synkronointitietojasi..."
 
 #: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../mail/em-folder-utils.c:504
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeä \"%s\" uudestaan: "
 
 #: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../mail/em-folder-utils.c:506
 msgid "Rename Folder"
 msgstr "Nimeä kansio uudestaan"
 
 #: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../mail/em-folder-utils.c:512
 msgid "Folder names cannot contain '/'"
 msgstr "Kansion nimi ei voi sisältää merkkiä '/'"
 
@@ -846,11 +847,11 @@ msgstr "_Uusi osoitekirja"
 #. FIXME: need to disable for undeletable folders
 #: ../addressbook/gui/component/addressbook-view.c:957
 #: ../addressbook/gui/widgets/e-addressbook-view.c:981
-#: ../calendar/gui/calendar-component.c:590
-#: ../calendar/gui/e-calendar-table.c:1303
-#: ../calendar/gui/e-calendar-view.c:1701 ../calendar/gui/e-memo-table.c:919
-#: ../calendar/gui/memos-component.c:458 ../calendar/gui/tasks-component.c:449
-#: ../mail/em-folder-tree.c:2122 ../mail/em-folder-view.c:1157
+#: ../calendar/gui/calendar-component.c:598
+#: ../calendar/gui/e-calendar-table.c:1375
+#: ../calendar/gui/e-calendar-view.c:1701 ../calendar/gui/e-memo-table.c:992
+#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../mail/em-folder-tree.c:2127 ../mail/em-folder-view.c:1157
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -862,8 +863,8 @@ msgid "Save As Vcard..."
 msgstr "Tallenna Vcardina..."
 
 #: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:591
-#: ../calendar/gui/memos-component.c:459 ../calendar/gui/tasks-component.c:450
+#: ../calendar/gui/calendar-component.c:599
+#: ../calendar/gui/memos-component.c:467 ../calendar/gui/tasks-component.c:458
 msgid "_Properties..."
 msgstr "_Ominaisuudet..."
 
@@ -1239,7 +1240,7 @@ msgstr "kortteja"
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
 #: ../mail/em-account-editor.c:2054
-#: ../plugins/calendar-http/calendar-http.c:286
+#: ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:561
 msgid "minutes"
 msgstr "minuutti"
@@ -1297,7 +1298,7 @@ msgstr "Yhteystieto"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:551
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:566
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2419
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
 msgid "Contact Editor"
 msgstr "Yhteystietojen muokkain"
 
@@ -1342,7 +1343,7 @@ msgstr "Puhelin"
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:580
 #: ../filter/filter-label.c:121 ../mail/em-migrate.c:1055
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:156
 msgid "Work"
 msgstr "Työ"
 
@@ -1475,10 +1476,10 @@ msgstr "Osoite"
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
 #: ../addressbook/gui/widgets/e-minicard-view.c:522
 #: ../addressbook/gui/widgets/e-minicard.c:187
-#: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1830 ../widgets/text/e-entry.c:1263
-#: ../widgets/text/e-entry.c:1264 ../widgets/text/e-text.c:3609
-#: ../widgets/text/e-text.c:3610
+#: ../widgets/menus/gal-define-views-model.c:179
+#: ../widgets/table/e-cell-text.c:1826 ../widgets/text/e-entry.c:1258
+#: ../widgets/text/e-entry.c:1259 ../widgets/text/e-text.c:3606
+#: ../widgets/text/e-text.c:3607
 msgid "Editable"
 msgstr "Muokattava"
 
@@ -2453,10 +2454,10 @@ msgstr "Zimbabwe"
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
 #: ../plugins/exchange-operations/exchange-delegates.c:958
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:52
+#: ../plugins/plugin-manager/plugin-manager.c:54
 #: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:354
-#: ../widgets/menus/gal-view-new-dialog.c:73
+#: ../widgets/menus/gal-define-views-dialog.c:348
+#: ../widgets/menus/gal-view-new-dialog.c:65
 msgid "Name"
 msgstr "Nimi"
 
@@ -2556,20 +2557,20 @@ msgid "Changed"
 msgstr "Muutettu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:561
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2414
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Yhteystietojen muokkain - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2801
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "Valitse kuva tälle henkilölle"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2802
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "_Ei kuvaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3103
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2577,23 +2578,23 @@ msgstr ""
 "Yhteystieto on virheellinen:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3107
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3117
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' sisältää virheellisen muotoilun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3114
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' sisältää virheellisen muotoilun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3129
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3140
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3150
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' on tyhjä"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3155
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3165
 msgid "Invalid contact."
 msgstr "Virheellinen yhteystieto."
 
@@ -2605,15 +2606,15 @@ msgstr "Yhteystiedon pikalisäys"
 msgid "_Edit Full"
 msgstr "Muokkaa _kaikkia tietoja"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:338
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:339
 msgid "_Full name"
 msgstr "_Koko nimi"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:349
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:350
 msgid "E_mail"
 msgstr "Sähkö_posti"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:360
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:361
 msgid "_Select Address Book"
 msgstr "_Valitse osoitekirja"
 
@@ -2913,12 +2914,12 @@ msgid "Error getting book view"
 msgstr "Virhe haettaessa kirjanäkymää"
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
-#: ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-table.c:3340
-#: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1207 ../widgets/text/e-entry.c:1208
-#: ../widgets/text/e-text.c:3473 ../widgets/text/e-text.c:3474
+#: ../widgets/table/e-table-click-to-add.c:500
+#: ../widgets/table/e-table-selection-model.c:307
+#: ../widgets/table/e-table.c:3335
+#: ../widgets/table/e-tree-selection-model.c:821
+#: ../widgets/text/e-entry.c:1202 ../widgets/text/e-entry.c:1203
+#: ../widgets/text/e-text.c:3470 ../widgets/text/e-text.c:3471
 msgid "Model"
 msgstr "Malli"
 
@@ -2946,8 +2947,8 @@ msgstr "Tallenna VCardina..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:959
 #: ../calendar/gui/dialogs/comp-editor.c:1124
-#: ../calendar/gui/e-calendar-table.c:1281
-#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:902
+#: ../calendar/gui/e-calendar-table.c:1353
+#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:975
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Avaa"
@@ -3002,12 +3003,12 @@ msgid "Cu_t"
 msgstr "_Leikkaa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:979
-#: ../calendar/gui/calendar-component.c:589
+#: ../calendar/gui/calendar-component.c:597
 #: ../calendar/gui/dialogs/comp-editor.c:463
-#: ../calendar/gui/e-calendar-table.c:1289
-#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:910
-#: ../calendar/gui/memos-component.c:457 ../calendar/gui/tasks-component.c:448
-#: ../composer/e-msg-composer.c:3180 ../mail/em-folder-tree.c:1006
+#: ../calendar/gui/e-calendar-table.c:1361
+#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:983
+#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
+#: ../composer/e-msg-composer.c:3215 ../mail/em-folder-tree.c:1006
 #: ../mail/em-folder-view.c:1142 ../mail/message-list.c:1962
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
@@ -3022,8 +3023,8 @@ msgstr "L_iitä"
 
 #. All, unmatched, separator
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1636
-#: ../calendar/gui/cal-search-bar.c:619 ../calendar/gui/cal-search-bar.c:662
-#: ../calendar/gui/cal-search-bar.c:681
+#: ../calendar/gui/cal-search-bar.c:618 ../calendar/gui/cal-search-bar.c:661
+#: ../calendar/gui/cal-search-bar.c:680
 msgid "Any Category"
 msgstr "Mikä tahansa luokka"
 
@@ -3064,6 +3065,7 @@ msgstr "Autopuhelin"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/e-cal-component-memo-preview.c:169
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3203,32 +3205,32 @@ msgstr "Kotisivu"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:150
-#: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
-#: ../widgets/table/e-table-click-to-add.c:516
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:658
+#: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
+#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
+#: ../widgets/table/e-table-click-to-add.c:514
+#: ../widgets/table/e-table-col.c:99
+#: ../widgets/table/e-table-field-chooser-item.c:657
+#: ../widgets/table/e-table-group-container.c:966
 #: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
+#: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3024 ../widgets/table/e-table-item.c:3025
-#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3652
+#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/text/e-text.c:3648 ../widgets/text/e-text.c:3649
 msgid "Width"
 msgstr "Leveys"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:157
-#: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
-#: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-field-chooser-item.c:665
+#: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
+#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
+#: ../widgets/table/e-table-click-to-add.c:521
+#: ../widgets/table/e-table-field-chooser-item.c:664
+#: ../widgets/table/e-table-group-container.c:959
 #: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
+#: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3030 ../widgets/table/e-table-item.c:3031
-#: ../widgets/text/e-text.c:3659 ../widgets/text/e-text.c:3660
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/text/e-text.c:3656 ../widgets/text/e-text.c:3657
 msgid "Height"
 msgstr "Korkeus"
 
@@ -3334,7 +3336,7 @@ msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2602
+#: ../mail/em-folder-view.c:2604
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
@@ -3380,9 +3382,10 @@ msgstr "Videokeskustelu"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:573
 #: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:774
+#: ../calendar/gui/calendar-component.c:782
 #: ../calendar/gui/dialogs/calendar-setup.c:366
 #: ../calendar/gui/gnome-cal.c:2354
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
 #: ../plugins/exchange-operations/exchange-folder.c:575
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:396
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
@@ -3491,10 +3494,10 @@ msgstr "Protokolla ei ole tuettu"
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:63
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-cal-component-preview.c:239
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:664
-#: ../calendar/gui/e-calendar-table.c:464 ../calendar/gui/print.c:2351
+#: ../calendar/gui/e-calendar-table.c:475 ../calendar/gui/print.c:2351
 msgid "Canceled"
 msgstr "Peruutettu"
 
@@ -3845,12 +3848,12 @@ msgid "Format"
 msgstr "Muoto"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:495
-#: ../widgets/table/e-table-field-chooser-dialog.c:91
-#: ../widgets/table/e-table-field-chooser-item.c:651
-#: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1898
-#: ../widgets/table/e-table-selection-model.c:318
+#: ../widgets/table/e-table-click-to-add.c:493
+#: ../widgets/table/e-table-field-chooser-dialog.c:81
+#: ../widgets/table/e-table-field-chooser-item.c:650
+#: ../widgets/table/e-table-field-chooser.c:81
+#: ../widgets/table/e-table-header-item.c:1896
+#: ../widgets/table/e-table-selection-model.c:314
 msgid "Header"
 msgstr "Ylätunniste:"
 
@@ -4043,8 +4046,9 @@ msgid "Export in asynchronous mode"
 msgstr "Vie asynkronisesti"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
+#, fuzzy
 msgid ""
-"The number of cards in out output file in asynchronous mode, default size "
+"The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr ""
 "Korttien lukumäärä yhdessä tulostiedostossa käytettäessä asynkronista tilaa. "
@@ -4447,7 +4451,7 @@ msgid "_Save Changes"
 msgstr "_Tallenna muutokset"
 
 #: ../calendar/calendar.error.xml.h:74
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:140
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:139
 msgid "_Send"
 msgstr "_Lähetä"
 
@@ -4460,7 +4464,7 @@ msgstr "_Lähetä huomautus"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../smime/gui/component.c:50
+#: ../calendar/common/authentication.c:50 ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "Syötä salasana"
 
@@ -4507,12 +4511,12 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Pilotin tehtävälistan ohjelmalohkoa ei voi kirjoittaa"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2219
+#: ../plugins/itip-formatter/itip-formatter.c:2228
 msgid "Calendar and Tasks"
 msgstr "Kalenteri ja tehtävät"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1380
+#: ../calendar/gui/calendar-component.c:1388
 msgid "Calendars"
 msgstr "Kalenterit"
 
@@ -4553,21 +4557,22 @@ msgid "Memo_s"
 msgstr "Mui_stilaput"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:324 ../calendar/gui/e-memos.c:1093
-#: ../calendar/gui/gnome-cal.c:1669 ../calendar/gui/memos-component.c:536
-#: ../calendar/gui/memos-component.c:1013 ../calendar/gui/memos-control.c:336
+#: ../calendar/gui/e-memo-table.c:335 ../calendar/gui/e-memos.c:1093
+#: ../calendar/gui/gnome-cal.c:1669 ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:1021 ../calendar/gui/memos-control.c:336
 #: ../calendar/gui/memos-control.c:352
 msgid "Memos"
 msgstr "Muistilaput"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:527 ../calendar/gui/e-tasks.c:1357
+#: ../calendar/gui/e-calendar-table.c:538 ../calendar/gui/e-tasks.c:1357
 #: ../calendar/gui/gnome-cal.c:1541 ../calendar/gui/print.c:1809
-#: ../calendar/gui/tasks-component.c:527
-#: ../calendar/gui/tasks-component.c:1018 ../calendar/gui/tasks-control.c:478
+#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:1026 ../calendar/gui/tasks-control.c:478
 #: ../calendar/gui/tasks-control.c:494
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
 #: ../plugins/exchange-operations/exchange-folder.c:587
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:397
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:541
@@ -4598,7 +4603,7 @@ msgstr[1] "minuuttia"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:287
+#: ../plugins/calendar-http/calendar-http.c:289
 #: ../plugins/calendar-weather/calendar-weather.c:562
 msgid "hours"
 msgid_plural "hours"
@@ -4616,8 +4621,8 @@ msgstr "Tapaamiset"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1570
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1615
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1621
 #: ../calendar/gui/e-itip-control.c:1145
 #: ../plugins/itip-formatter/itip-view.c:998
 msgid "Location:"
@@ -4629,7 +4634,7 @@ msgstr "Torkkumisaika:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:164
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:163
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
@@ -4650,31 +4655,31 @@ msgstr "_Torku"
 msgid "location of appointment"
 msgstr "tapaamisen sijainti"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1429
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1552
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1474
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
 msgid "No summary available."
 msgstr "Ei yhteenvetoa saatavilla"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1438
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1440
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1483
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
 msgid "No description available."
 msgstr "Ei kuvausta saatavilla"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1448
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1493
 msgid "No location information available."
 msgstr "Ei sijaintitietoja saatavilla"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1492
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1537
 #, c-format
 msgid "You have %d alarms"
 msgstr "Sinulla on %d hälytystä"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1654
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1682
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1658
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4686,7 +4691,7 @@ msgstr ""
 "lähettämään sähköpostia. Evolution näyttää sen sijaan\n"
 "tavallisen huomautusikkunan."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4703,7 +4708,7 @@ msgstr ""
 "\n"
 "Haluatko varmasti suorittaa tämän ohjelman?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1747
 msgid "Do not ask me about this program again."
 msgstr "Älä kysy tästä ohjelmasta enää uudestaan"
 
@@ -4712,7 +4717,10 @@ msgid "Could not initialize Bonobo"
 msgstr "Bonobon alustus ei onnistunut"
 
 #: ../calendar/gui/alarm-notify/notify-main.c:153
-msgid "Could not create the alarm notify service factory"
+#, fuzzy
+msgid ""
+"Could not create the alarm notify service factory, maybe it's already "
+"running..."
 msgstr "Hälytyksien ja huomautusten palvelun tehdasta ei voi luoda"
 
 #: ../calendar/gui/alarm-notify/util.c:41
@@ -5195,37 +5203,41 @@ msgstr "Kommentti sisältää"
 msgid "Location contains"
 msgstr "Sijainti sisältää"
 
-#: ../calendar/gui/cal-search-bar.c:623 ../calendar/gui/cal-search-bar.c:666
-#: ../calendar/gui/cal-search-bar.c:685
+#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
+#: ../calendar/gui/cal-search-bar.c:684
 msgid "Unmatched"
 msgstr "Täsmäämättömät"
 
-#: ../calendar/gui/cal-search-bar.c:631
-msgid "Next 7 days Tasks"
+#: ../calendar/gui/cal-search-bar.c:630
+#, fuzzy
+msgid "Next 7 Days' Tasks"
 msgstr "Seuraavien 7 päivän tehtävät"
 
-#: ../calendar/gui/cal-search-bar.c:635
+#: ../calendar/gui/cal-search-bar.c:634
 msgid "Active Tasks"
 msgstr "Aktiiviset tehtävät"
 
-#: ../calendar/gui/cal-search-bar.c:639
-msgid "Over Due Tasks"
+#: ../calendar/gui/cal-search-bar.c:638
+#, fuzzy
+msgid "Overdue Tasks"
 msgstr "Vanhentuneet tehtävät"
 
-#: ../calendar/gui/cal-search-bar.c:643
+#: ../calendar/gui/cal-search-bar.c:642
 msgid "Completed Tasks"
 msgstr "Valmistuneet tehtävät"
 
-#: ../calendar/gui/cal-search-bar.c:647
-msgid "Tasks With Attachments"
+#: ../calendar/gui/cal-search-bar.c:646
+#, fuzzy
+msgid "Tasks with Attachments"
 msgstr "Tehtävät, joissa on liitteitä"
 
-#: ../calendar/gui/cal-search-bar.c:693
+#: ../calendar/gui/cal-search-bar.c:692
 msgid "Active Appointments"
 msgstr "Aktiiviset tapaamiset"
 
-#: ../calendar/gui/cal-search-bar.c:697
-msgid "Next 7 Day Appointments"
+#: ../calendar/gui/cal-search-bar.c:696
+#, fuzzy
+msgid "Next 7 Days' Appointments"
 msgstr "Seuraavan 7 päivän tapaamiset"
 
 #: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
@@ -5249,7 +5261,7 @@ msgstr "Poista vanhemmat tapahtumat kuin"
 
 #: ../calendar/gui/calendar-commands.c:335
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-http/calendar-http.c:290
 #: ../plugins/calendar-weather/calendar-weather.c:563
 #: ../widgets/misc/e-send-options.glade.h:38
 msgid "days"
@@ -5259,90 +5271,90 @@ msgstr "päivä"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:265
-#: ../calendar/gui/memos-component.c:227 ../calendar/gui/migration.c:511
+#: ../calendar/gui/calendar-component.c:272
+#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:511
 #: ../calendar/gui/migration.c:609 ../calendar/gui/migration.c:1122
-#: ../calendar/gui/tasks-component.c:223
+#: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr "Verkossa"
 
-#: ../calendar/gui/calendar-component.c:283 ../calendar/gui/migration.c:405
+#: ../calendar/gui/calendar-component.c:290 ../calendar/gui/migration.c:405
 msgid "Birthdays & Anniversaries"
 msgstr "Syntymä- ja vuosipäivät"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:290
+#: ../calendar/gui/calendar-component.c:299
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Sää"
 
-#: ../calendar/gui/calendar-component.c:588
+#: ../calendar/gui/calendar-component.c:596
 msgid "_New Calendar"
 msgstr "_Uusi kalenteri"
 
-#: ../calendar/gui/calendar-component.c:918
+#: ../calendar/gui/calendar-component.c:926
 msgid "Failed upgrading calendars."
 msgstr "Kalenterien päivitys epäonnistui."
 
-#: ../calendar/gui/calendar-component.c:1217
+#: ../calendar/gui/calendar-component.c:1225
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Kalenterin \"%s\" avaus tehtävien ja kokousten luontia varten epäonnistui"
 
-#: ../calendar/gui/calendar-component.c:1233
+#: ../calendar/gui/calendar-component.c:1241
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Tehtävien ja kokousten luontia varten ei löydy kalenteria"
 
-#: ../calendar/gui/calendar-component.c:1355
+#: ../calendar/gui/calendar-component.c:1363
 msgid "Calendar Source Selector"
 msgstr "Kalenterilähteen valinta"
 
-#: ../calendar/gui/calendar-component.c:1563
+#: ../calendar/gui/calendar-component.c:1581
 msgid "New appointment"
 msgstr "Uusi tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1564
+#: ../calendar/gui/calendar-component.c:1582
 msgid "_Appointment"
 msgstr "_Tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1565
+#: ../calendar/gui/calendar-component.c:1583
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1571
+#: ../calendar/gui/calendar-component.c:1589
 msgid "New meeting"
 msgstr "Uusi tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1572
+#: ../calendar/gui/calendar-component.c:1590
 msgid "M_eeting"
 msgstr "_Kokous"
 
-#: ../calendar/gui/calendar-component.c:1573
+#: ../calendar/gui/calendar-component.c:1591
 msgid "Create a new meeting request"
 msgstr "Luo uusi kokouskutsu"
 
-#: ../calendar/gui/calendar-component.c:1579
+#: ../calendar/gui/calendar-component.c:1597
 msgid "New all day appointment"
 msgstr "Uusi koko päivän tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1580
+#: ../calendar/gui/calendar-component.c:1598
 msgid "All Day A_ppointment"
 msgstr "Koko _päivän tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1581
+#: ../calendar/gui/calendar-component.c:1599
 msgid "Create a new all-day appointment"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1605
 msgid "New calendar"
 msgstr "Uusi kalenteri"
 
-#: ../calendar/gui/calendar-component.c:1588
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Cale_ndar"
 msgstr "_Kalenteri"
 
-#: ../calendar/gui/calendar-component.c:1589
+#: ../calendar/gui/calendar-component.c:1607
 msgid "Create a new calendar"
 msgstr "Luo uusi kalenteri"
 
@@ -5364,12 +5376,14 @@ msgstr "Kuukausinäkymä"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:2
-msgid "Description Contain"
+#, fuzzy
+msgid "Description Contains"
 msgstr "Kuvaus sisältää"
 
 #: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
 #: ../calendar/gui/tasktypes.xml.h:3
-msgid "Summary Contain"
+#, fuzzy
+msgid "Summary Contains"
 msgstr "Yhteenveto sisältää"
 
 #: ../calendar/gui/comp-editor-factory.c:415
@@ -5525,7 +5539,7 @@ msgstr "_Ehdota liitteen automaattista näyttämistä"
 msgid "Attach file(s)"
 msgstr "Liitä tiedosto(t)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:479
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:484
 msgid "Selected Calendars for Alarms"
 msgstr "Valitse kalenterit hälytyksille"
 
@@ -5551,7 +5565,7 @@ msgstr ""
 "<i>%u ja %d korvataan käyttäjällä ja aluenimellä sähköpostiosoitteesta.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Hälytykset</span>"
 
@@ -5560,7 +5574,7 @@ msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">Vapaa/varattu-tietojen oletuspalvelin</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Yleistä</span>"
@@ -5886,28 +5900,28 @@ msgstr "(erääntyy "
 msgid "Due "
 msgstr "Erääntyy "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2917
+#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2962
 #, c-format
 msgid "Attached message - %s"
 msgstr "Liitetty viesti - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2922
-#: ../composer/e-msg-composer.c:3117
+#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2967
+#: ../composer/e-msg-composer.c:3152
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Liitetty viesti"
 msgstr[1] "%d liitettyä viestiä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3181
-#: ../mail/em-folder-tree.c:1007 ../mail/em-folder-utils.c:368
+#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3216
+#: ../mail/em-folder-tree.c:1007 ../mail/em-folder-utils.c:369
 #: ../mail/em-folder-view.c:1038 ../mail/message-list.c:1963
 msgid "_Move"
 msgstr "_Siirrä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3183
+#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3218
 #: ../mail/em-folder-tree.c:1009 ../mail/message-list.c:1965
 msgid "Cancel _Drag"
 msgstr "Peruuta _raahaus"
@@ -5916,7 +5930,7 @@ msgstr "Peruuta _raahaus"
 msgid "Could not update object"
 msgstr "Kohdetta ei voi päivittää"
 
-#: ../calendar/gui/dialogs/comp-editor.c:971 ../composer/e-msg-composer.c:2534
+#: ../calendar/gui/dialogs/comp-editor.c:971 ../composer/e-msg-composer.c:2579
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5934,7 +5948,7 @@ msgstr "Näytä _liitepalkki"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1125
 #: ../calendar/gui/dialogs/event-page.c:1913
-#: ../calendar/gui/dialogs/task-page.c:1201 ../composer/e-msg-composer.c:3698
+#: ../calendar/gui/dialogs/task-page.c:1201 ../composer/e-msg-composer.c:3733
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:18
@@ -5942,18 +5956,18 @@ msgid "_Remove"
 msgstr "_Poista"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1126
-#: ../composer/e-msg-composer.c:3699 ../mail/em-folder-tree.c:2129
+#: ../composer/e-msg-composer.c:3734 ../mail/em-folder-tree.c:2134
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:35
 msgid "_Properties"
 msgstr "_Ominaisuudet..."
 
 #: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../composer/e-msg-composer.c:3701
+#: ../composer/e-msg-composer.c:3736
 msgid "_Add attachment..."
 msgstr "_Lisää liite..."
 
 #: ../calendar/gui/dialogs/comp-editor.c:1566
-#: ../mail/em-format-html-display.c:2315
+#: ../mail/em-format-html-display.c:2318
 msgid "Show Attachments"
 msgstr "Näytä liitteet"
 
@@ -6002,7 +6016,7 @@ msgid "No summary"
 msgstr "Ei kuvausta"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2789 ../mail/em-utils.c:370
-#: ../widgets/misc/e-attachment-bar.c:350
+#: ../widgets/misc/e-attachment-bar.c:358
 msgid "attachment"
 msgstr "liite"
 
@@ -6133,7 +6147,7 @@ msgid "Event with no end date"
 msgstr "Tapahtuma ilman päättymispäivää"
 
 #: ../calendar/gui/dialogs/event-page.c:1272
-#: ../calendar/gui/dialogs/memo-page.c:685
+#: ../calendar/gui/dialogs/memo-page.c:683
 #: ../calendar/gui/dialogs/task-page.c:849
 msgid "Start date is wrong"
 msgstr "Aloituspäiväys on virheellinen"
@@ -6151,13 +6165,13 @@ msgid "End time is wrong"
 msgstr "Lopetusaika on virheellinen"
 
 #: ../calendar/gui/dialogs/event-page.c:1469
-#: ../calendar/gui/dialogs/memo-page.c:720
+#: ../calendar/gui/dialogs/memo-page.c:718
 #: ../calendar/gui/dialogs/task-page.c:906
 msgid "The organizer selected no longer has an account."
 msgstr "Valitulla järjestäjällä ei enää ole käyttäjätiliä"
 
 #: ../calendar/gui/dialogs/event-page.c:1475
-#: ../calendar/gui/dialogs/memo-page.c:726
+#: ../calendar/gui/dialogs/memo-page.c:724
 #: ../calendar/gui/dialogs/task-page.c:912
 msgid "An organizer is required."
 msgstr "Järjestäjä vaaditaan."
@@ -6206,15 +6220,15 @@ msgstr "Muokkaa"
 #: ../calendar/gui/dialogs/event-page.c:2977
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:656
-#: ../calendar/gui/e-itip-control.c:1131 ../composer/e-msg-composer.c:2318
+#: ../calendar/gui/e-itip-control.c:1131 ../composer/e-msg-composer.c:2363
 #: ../filter/filter-rule.c:891 ../mail/em-account-editor.c:701
-#: ../mail/em-account-editor.c:1421 ../mail/em-account-prefs.c:475
+#: ../mail/em-account-editor.c:1421 ../mail/em-account-prefs.c:478
 #: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:189
+#: ../plugins/exchange-operations/exchange-delegates-user.c:200
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1910
+#: ../plugins/itip-formatter/itip-formatter.c:1919
 #: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1504
 #: ../widgets/misc/e-dateedit.c:1718
 msgid "None"
@@ -6306,14 +6320,16 @@ msgstr "Järjestäjä:"
 msgid "Memo"
 msgstr "Muistilappu"
 
-#: ../calendar/gui/dialogs/memo-page.c:868
+#: ../calendar/gui/dialogs/memo-page.c:866
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Muistilappuja kohteesta '%s' ei voi avata."
 
-#: ../calendar/gui/dialogs/memo-page.c:1019 ../mail/em-format-html.c:1503
-#: ../mail/em-format-quote.c:207 ../mail/em-format.c:851
-#: ../mail/em-mailer-prefs.c:89 ../mail/message-list.etspec.h:18
+#: ../calendar/gui/dialogs/memo-page.c:1017 ../mail/em-format-html.c:1508
+#: ../mail/em-format-html.c:1522 ../mail/em-format-html.c:1580
+#: ../mail/em-format-html.c:1606 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:852 ../mail/em-mailer-prefs.c:89
+#: ../mail/message-list.etspec.h:18
 msgid "To"
 msgstr "Vastaanottaja"
 
@@ -6560,48 +6576,48 @@ msgstr "<span weight=\"bold\">Tila</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:662
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/e-itip-control.c:923
+#: ../calendar/gui/e-calendar-table.c:474 ../calendar/gui/e-itip-control.c:923
 #: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
 #: ../calendar/gui/print.c:2348 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Valmis"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1034
+#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../calendar/gui/e-calendar-table.c:399 ../mail/message-list.c:1034
 msgid "High"
 msgstr "Korkea"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:230
+#: ../calendar/gui/e-cal-component-preview.c:233
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:660
 #: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2345
+#: ../calendar/gui/e-calendar-table.c:473 ../calendar/gui/print.c:2345
 msgid "In Progress"
 msgstr "Työn alla"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-calendar-table.c:390 ../mail/message-list.c:1032
+#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-calendar-table.c:401 ../mail/message-list.c:1032
 msgid "Low"
 msgstr "Matala"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-cal-component-preview.c:257
+#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:400
 #: ../mail/message-list.c:1033
 msgid "Normal"
 msgstr "Tavallinen"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:240
+#: ../calendar/gui/e-cal-component-preview.c:243
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:658
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2342
+#: ../calendar/gui/e-calendar-table.c:472 ../calendar/gui/print.c:2342
 msgid "Not Started"
 msgstr "Ei aloitettu"
 
@@ -6614,7 +6630,7 @@ msgid "Stat_us:"
 msgstr "_Tila:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:402
 msgid "Undefined"
 msgstr "Määrittelemätön"
 
@@ -6632,7 +6648,7 @@ msgid "_Web Page:"
 msgstr "_Kotisivun osoite:"
 
 #: ../calendar/gui/dialogs/task-editor.c:424
-#: ../calendar/gui/tasks-component.c:1250
+#: ../calendar/gui/tasks-component.c:1258
 msgid "_Task"
 msgstr "_Tehtävä"
 
@@ -6644,7 +6660,7 @@ msgstr "Tehtävän yksityiskohdat"
 msgid "Due date is wrong"
 msgstr "Eräpäivä on virheellinen"
 
-#: ../calendar/gui/dialogs/task-page.c:1650
+#: ../calendar/gui/dialogs/task-page.c:1646
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Tehtäviä kohteesta '%s' ei voi avata."
@@ -6750,71 +6766,71 @@ msgid "%s for an unknown trigger type"
 msgstr "%s tuntemattomalle liipasintyypille"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3000
+#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3002
 #, c-format
 msgid "Click to open %s"
 msgstr "Napsauta avataksesi %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:157
-#: ../calendar/gui/e-cal-component-preview.c:157 ../filter/filter-rule.c:805
+#: ../calendar/gui/e-cal-component-memo-preview.c:160
+#: ../calendar/gui/e-cal-component-preview.c:160 ../filter/filter-rule.c:805
 #: ../shell/e-shell-folder-title-bar.c:593
 msgid "Untitled"
 msgstr "Nimetön"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:208
-#: ../calendar/gui/e-cal-component-preview.c:197
-#: ../calendar/gui/e-cal-component-preview.c:208
+#: ../calendar/gui/e-cal-component-memo-preview.c:212
+#: ../calendar/gui/e-cal-component-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:211
 msgid "Start Date:"
 msgstr "Alkamispäivä:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:221
-#: ../calendar/gui/e-cal-component-preview.c:271
+#: ../calendar/gui/e-cal-component-memo-preview.c:225
+#: ../calendar/gui/e-cal-component-preview.c:274
 #: ../calendar/gui/e-itip-control.c:1191
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:68
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:254
-#: ../calendar/gui/e-cal-component-preview.c:304
+#: ../calendar/gui/e-cal-component-memo-preview.c:258
+#: ../calendar/gui/e-cal-component-preview.c:307
 msgid "Web Page:"
 msgstr "WWW-sivu:"
 
-#: ../calendar/gui/e-cal-component-preview.c:190
+#: ../calendar/gui/e-cal-component-preview.c:193
 #: ../calendar/gui/e-itip-control.c:1135
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Kuvaus:"
 
-#: ../calendar/gui/e-cal-component-preview.c:219
+#: ../calendar/gui/e-cal-component-preview.c:222
 msgid "Due Date:"
 msgstr "Eräpäivä:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:226
+#: ../calendar/gui/e-cal-component-preview.c:229
 #: ../calendar/gui/e-itip-control.c:1159
 #: ../plugins/exchange-operations/exchange-account-setup.c:269
 #: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Status:"
 msgstr "Tila:"
 
-#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-component-preview.c:253
 msgid "Priority:"
 msgstr "Prioriteetti:"
 
 #: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:377
 msgid "Public"
 msgstr "Julkinen"
 
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:378
 msgid "Private"
 msgstr "Henkilökohtainen"
 
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:368
+#: ../calendar/gui/e-calendar-table.c:379
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
@@ -6835,12 +6851,12 @@ msgid "Summary"
 msgstr "Kuvaus"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:440
+#: ../calendar/gui/e-calendar-table.c:451
 msgid "Free"
 msgstr "Vapaa"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:441
+#: ../calendar/gui/e-calendar-table.c:452
 #: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Varattu"
@@ -6879,9 +6895,9 @@ msgstr "Ei"
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
 #: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1206
 #: ../plugins/itip-formatter/itip-formatter.c:393
-#: ../plugins/itip-formatter/itip-formatter.c:1935
-#: ../plugins/plugin-manager/plugin-manager.c:77
-#: ../widgets/misc/e-attachment-bar.c:712
+#: ../plugins/itip-formatter/itip-formatter.c:1944
+#: ../plugins/plugin-manager/plugin-manager.c:82
+#: ../widgets/misc/e-attachment-bar.c:721
 #: ../widgets/misc/e-charset-picker.c:64
 msgid "Unknown"
 msgstr "Tuntematon"
@@ -6898,7 +6914,7 @@ msgstr "Annettu tehtäväksi"
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2160
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2163
 msgid "Select folder to save selected attachments..."
 msgstr "Valitse kansio, johon valitut liitteet tallennetaan..."
 
@@ -6907,8 +6923,8 @@ msgstr "Valitse kansio, johon valitut liitteet tallennetaan..."
 msgid "untitled_image.%s"
 msgstr "nimetön_kuva.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1283
-#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:904
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1355
+#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:977
 #: ../mail/em-folder-view.c:1153 ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Save As..."
 msgstr "Tallenna _nimellä..."
@@ -6927,78 +6943,78 @@ msgstr "Tallenna _valitut"
 msgid "Open in %s..."
 msgstr "Avaa ohjelmassa %s..."
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:421
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:422
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:423
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:424
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:425
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:426
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:427
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:428
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:429
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:430
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:431
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:705
-#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:483
+#: ../calendar/gui/e-calendar-table.c:716
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:494
 msgid "Deleting selected objects"
 msgstr "Poistetaan valitut kohteet"
 
-#: ../calendar/gui/e-calendar-table.c:958
-#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:660
+#: ../calendar/gui/e-calendar-table.c:995
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:697
 msgid "Updating objects"
 msgstr "Päivitetään olioita"
 
-#: ../calendar/gui/e-calendar-table.c:1107
-#: ../calendar/gui/e-calendar-view.c:1229 ../calendar/gui/e-memo-table.c:799
-#: ../composer/e-msg-composer.c:1355
+#: ../calendar/gui/e-calendar-table.c:1179
+#: ../calendar/gui/e-calendar-view.c:1229 ../calendar/gui/e-memo-table.c:872
+#: ../composer/e-msg-composer.c:1399
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
-#: ../calendar/gui/e-calendar-table.c:1278
+#: ../calendar/gui/e-calendar-table.c:1350
 #: ../calendar/gui/e-calendar-view.c:1662
 msgid "New _Task"
 msgstr "Uusi _tehtävä"
 
-#: ../calendar/gui/e-calendar-table.c:1282 ../calendar/gui/e-memo-table.c:903
+#: ../calendar/gui/e-calendar-table.c:1354 ../calendar/gui/e-memo-table.c:976
 msgid "Open _Web Page"
 msgstr "_Avaa www-sivu"
 
-#: ../calendar/gui/e-calendar-table.c:1284
+#: ../calendar/gui/e-calendar-table.c:1356
 #: ../calendar/gui/e-calendar-view.c:1665
-#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:905
+#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:978
 #: ../mail/em-folder-view.c:1154
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
@@ -7007,52 +7023,52 @@ msgstr "_Avaa www-sivu"
 msgid "_Print..."
 msgstr "T_ulosta..."
 
-#: ../calendar/gui/e-calendar-table.c:1288
-#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:909
+#: ../calendar/gui/e-calendar-table.c:1360
+#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:982
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "L_eikkaa"
 
-#: ../calendar/gui/e-calendar-table.c:1290
+#: ../calendar/gui/e-calendar-table.c:1362
 #: ../calendar/gui/e-calendar-view.c:1668
-#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:911
+#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:984
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "L_iitä"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1366 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Anna tehtäväksi"
 
-#: ../calendar/gui/e-calendar-table.c:1295 ../calendar/gui/e-memo-table.c:915
+#: ../calendar/gui/e-calendar-table.c:1367 ../calendar/gui/e-memo-table.c:988
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Välitä iCalendar-muodossa"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1368
 msgid "_Mark as Complete"
 msgstr "_Merkitse valmiiksi"
 
-#: ../calendar/gui/e-calendar-table.c:1297
+#: ../calendar/gui/e-calendar-table.c:1369
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merkitse valitut tehtävät valmiiksi"
 
-#: ../calendar/gui/e-calendar-table.c:1298
+#: ../calendar/gui/e-calendar-table.c:1370
 msgid "_Mark as Incomplete"
 msgstr "_Merkitse keskeneräiseksi"
 
-#: ../calendar/gui/e-calendar-table.c:1299
+#: ../calendar/gui/e-calendar-table.c:1371
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Merkitse valitut tehtävät keskeneräisiksi"
 
-#: ../calendar/gui/e-calendar-table.c:1304
+#: ../calendar/gui/e-calendar-table.c:1376
 msgid "_Delete Selected Tasks"
 msgstr "_Poista valitut tehtävät"
 
-#: ../calendar/gui/e-calendar-table.c:1537
+#: ../calendar/gui/e-calendar-table.c:1610
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Lisää tehtävä tästä"
@@ -7062,7 +7078,7 @@ msgstr "Lisää tehtävä tästä"
 msgid "% Complete"
 msgstr "% valmiina"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:698
+#: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "Valmis"
 
@@ -7227,21 +7243,21 @@ msgstr "%02i minuutin välein"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:1311
-#: ../calendar/gui/e-day-view.c:2089
+#: ../calendar/gui/e-day-view-top-item.c:1314
+#: ../calendar/gui/e-day-view.c:2092
 #: ../calendar/gui/e-week-view-main-item.c:310
 #: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1503
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:746 ../calendar/gui/e-day-view.c:1089
+#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1092
 #: ../calendar/gui/e-week-view.c:503 ../calendar/gui/print.c:811
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1092
+#: ../calendar/gui/e-day-view.c:752 ../calendar/gui/e-day-view.c:1095
 #: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:813
 msgid "pm"
 msgstr "pm"
@@ -7387,12 +7403,12 @@ msgstr ""
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
 #: ../calendar/gui/itip-utils.c:802
-#: ../plugins/itip-formatter/itip-formatter.c:1923
+#: ../plugins/itip-formatter/itip-formatter.c:1932
 msgid "Accepted"
 msgstr "Hyväksytty"
 
 #: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:805
-#: ../plugins/itip-formatter/itip-formatter.c:1926
+#: ../plugins/itip-formatter/itip-formatter.c:1935
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
 
@@ -7400,7 +7416,7 @@ msgstr "Alustavasti hyväksytty"
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
 #: ../calendar/gui/itip-utils.c:808 ../calendar/gui/itip-utils.c:837
-#: ../plugins/itip-formatter/itip-formatter.c:1929
+#: ../plugins/itip-formatter/itip-formatter.c:1938
 msgid "Declined"
 msgstr "Hylätty"
 
@@ -7772,7 +7788,7 @@ msgstr "Alustava"
 #: ../calendar/gui/e-meeting-list-view.c:208
 #: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
 #: ../calendar/gui/itip-utils.c:811
-#: ../plugins/itip-formatter/itip-formatter.c:1932
+#: ../plugins/itip-formatter/itip-formatter.c:1941
 msgid "Delegated"
 msgstr "Valtuutettu"
 
@@ -7905,11 +7921,11 @@ msgstr "Kieli"
 msgid "Member"
 msgstr "Jäsen"
 
-#: ../calendar/gui/e-memo-table.c:920
+#: ../calendar/gui/e-memo-table.c:993
 msgid "_Delete Selected Memos"
 msgstr "_Poista valitut muistilaput"
 
-#: ../calendar/gui/e-memo-table.c:1071 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1144 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Lisää muistilappu tästä"
 
@@ -8119,76 +8135,76 @@ msgstr "iCalendarin tiedot"
 msgid "You must be an attendee of the event."
 msgstr "Sinun täytyy osallistua tapahtumaan."
 
-#: ../calendar/gui/memos-component.c:456
+#: ../calendar/gui/memos-component.c:464
 msgid "_New Memo List"
 msgstr "_Uusi muistilappulista"
 
-#: ../calendar/gui/memos-component.c:532
+#: ../calendar/gui/memos-component.c:540
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d muistilappu"
 msgstr[1] "%d muistilappua"
 
-#: ../calendar/gui/memos-component.c:534 ../calendar/gui/tasks-component.c:525
+#: ../calendar/gui/memos-component.c:542 ../calendar/gui/tasks-component.c:533
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d valittu"
 msgstr[1] ", %d valittua"
 
-#: ../calendar/gui/memos-component.c:581
+#: ../calendar/gui/memos-component.c:589
 msgid "Failed upgrading memos."
 msgstr "Muistilappujen päivitys epäonnistui."
 
-#: ../calendar/gui/memos-component.c:879
+#: ../calendar/gui/memos-component.c:887
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "Muistilappulistaa '%s' ei voi avata uusien tapahtumien ja kokousten "
 "lisäämistä varten"
 
-#: ../calendar/gui/memos-component.c:892
+#: ../calendar/gui/memos-component.c:900
 msgid "There is no calendar available for creating memos"
 msgstr "Muistilappujen luomiseen tarvittavaa kalenteria ei ole saatavilla"
 
-#: ../calendar/gui/memos-component.c:988
+#: ../calendar/gui/memos-component.c:996
 msgid "Memo Source Selector"
 msgstr "Muistilappujen lähteen valinta"
 
-#: ../calendar/gui/memos-component.c:1171
+#: ../calendar/gui/memos-component.c:1179
 msgid "New memo"
 msgstr "Uusi muistilappu"
 
-#: ../calendar/gui/memos-component.c:1172
+#: ../calendar/gui/memos-component.c:1180
 msgid "Mem_o"
 msgstr "M_uistilappu"
 
-#: ../calendar/gui/memos-component.c:1173
+#: ../calendar/gui/memos-component.c:1181
 msgid "Create a new memo"
 msgstr "Luo uusi muistilappu"
 
-#: ../calendar/gui/memos-component.c:1179
+#: ../calendar/gui/memos-component.c:1187
 msgid "New shared memo"
 msgstr "Uusi jaettu muistilappu"
 
-#: ../calendar/gui/memos-component.c:1180
+#: ../calendar/gui/memos-component.c:1188
 msgid "_Shared memo"
 msgstr "_Jaettu muistilappu"
 
-#: ../calendar/gui/memos-component.c:1181
+#: ../calendar/gui/memos-component.c:1189
 msgid "Create a shared new memo"
 msgstr "Luo uusi jaettu muistilappu"
 
-#: ../calendar/gui/memos-component.c:1187
+#: ../calendar/gui/memos-component.c:1195
 msgid "New memo list"
 msgstr "Uusi muistilappulista"
 
-#: ../calendar/gui/memos-component.c:1188
+#: ../calendar/gui/memos-component.c:1196
 msgid "Memo li_st"
 msgstr "Muistilappuli_sta"
 
-#: ../calendar/gui/memos-component.c:1189
+#: ../calendar/gui/memos-component.c:1197
 msgid "Create a new memo list"
 msgstr "Luo uusi muistilappulista"
 
@@ -8445,65 +8461,65 @@ msgstr "Yhteystiedot: "
 msgid "Upcoming Appointments"
 msgstr "Tulevat tapaamiset"
 
-#: ../calendar/gui/tasks-component.c:447
+#: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "_Uusi tehtävälista"
 
-#: ../calendar/gui/tasks-component.c:523
+#: ../calendar/gui/tasks-component.c:531
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tehtävä"
 msgstr[1] "%d tehtävää"
 
-#: ../calendar/gui/tasks-component.c:572
+#: ../calendar/gui/tasks-component.c:580
 msgid "Failed upgrading tasks."
 msgstr "Tehtävälistan päivitys epäonnistui."
 
-#: ../calendar/gui/tasks-component.c:883
+#: ../calendar/gui/tasks-component.c:891
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Tehtävälistaa '%s' ei voi avata uusien tehtävien ja tapaamisten tekemistä "
 "varten"
 
-#: ../calendar/gui/tasks-component.c:896
+#: ../calendar/gui/tasks-component.c:904
 msgid "There is no calendar available for creating tasks"
 msgstr "Tehtävien luomiseen tarvittavaa kalenteria ei ole saatavilla"
 
-#: ../calendar/gui/tasks-component.c:993
+#: ../calendar/gui/tasks-component.c:1001
 msgid "Task Source Selector"
 msgstr "Tehtävien lähteen valinta"
 
-#: ../calendar/gui/tasks-component.c:1249
+#: ../calendar/gui/tasks-component.c:1257
 msgid "New task"
 msgstr "Uusi tehtävä"
 
-#: ../calendar/gui/tasks-component.c:1251
+#: ../calendar/gui/tasks-component.c:1259
 msgid "Create a new task"
 msgstr "Luo uusi tehtävä"
 
-#: ../calendar/gui/tasks-component.c:1257
+#: ../calendar/gui/tasks-component.c:1265
 msgid "New assigned task"
 msgstr "Uusi tehtäväksianto"
 
-#: ../calendar/gui/tasks-component.c:1258
+#: ../calendar/gui/tasks-component.c:1266
 msgid "Assigne_d Task"
 msgstr "Tehtäväksi_anto"
 
-#: ../calendar/gui/tasks-component.c:1259
+#: ../calendar/gui/tasks-component.c:1267
 msgid "Create a new assigned task"
 msgstr "Luo uusi tehtäväksianto"
 
-#: ../calendar/gui/tasks-component.c:1265
+#: ../calendar/gui/tasks-component.c:1273
 msgid "New task list"
 msgstr "Uusi tehtävälista"
 
-#: ../calendar/gui/tasks-component.c:1266
+#: ../calendar/gui/tasks-component.c:1274
 msgid "Tas_k list"
 msgstr "_Tehtävälista"
 
-#: ../calendar/gui/tasks-component.c:1267
+#: ../calendar/gui/tasks-component.c:1275
 msgid "Create a new task list"
 msgstr "Luo uusi tehtävälista"
 
@@ -10187,14 +10203,14 @@ msgstr "Lii_tä"
 msgid "Insert Attachment"
 msgstr "Lisää liite"
 
-#: ../composer/e-msg-composer.c:834
+#: ../composer/e-msg-composer.c:835
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Lähtevää viestiä ei voida allekirjoittaa: allekirjoitusvarmennetta ei ole "
 "asetettu tälle tilille"
 
-#: ../composer/e-msg-composer.c:841
+#: ../composer/e-msg-composer.c:842
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10202,52 +10218,52 @@ msgstr ""
 "Lähtevää viestiä ei voida salata: Salausvarmennetta ei ole asetettu tälle "
 "tilille"
 
-#: ../composer/e-msg-composer.c:1301 ../composer/e-msg-composer.c:2563
+#: ../composer/e-msg-composer.c:1345 ../composer/e-msg-composer.c:2608
 msgid "Hide _Attachment Bar"
 msgstr "Piilota _liitepalkki"
 
-#: ../composer/e-msg-composer.c:1304 ../composer/e-msg-composer.c:2566
-#: ../composer/e-msg-composer.c:3944
+#: ../composer/e-msg-composer.c:1348 ../composer/e-msg-composer.c:2611
+#: ../composer/e-msg-composer.c:3979
 msgid "Show _Attachment Bar"
 msgstr "Näytä _liitepalkki"
 
-#: ../composer/e-msg-composer.c:1336 ../composer/e-msg-composer.c:1370
+#: ../composer/e-msg-composer.c:1380 ../composer/e-msg-composer.c:1414
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Tuntematon syy"
 
-#: ../composer/e-msg-composer.c:1408
+#: ../composer/e-msg-composer.c:1452
 msgid "Could not open file"
 msgstr "Tiedostoa ei voi avata"
 
-#: ../composer/e-msg-composer.c:1416
+#: ../composer/e-msg-composer.c:1460
 msgid "Unable to retrieve message from editor"
 msgstr "Viestiä ei voida hakea muokkaimelta"
 
-#: ../composer/e-msg-composer.c:1701
+#: ../composer/e-msg-composer.c:1745
 msgid "Untitled Message"
 msgstr "Nimeämätön viesti"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1736
+#: ../composer/e-msg-composer.c:1781
 msgid "Open File"
 msgstr "Avaa tiedosto"
 
-#: ../composer/e-msg-composer.c:2198 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2243 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Automaattisesti luotu"
 
-#: ../composer/e-msg-composer.c:2301
+#: ../composer/e-msg-composer.c:2346
 msgid "Si_gnature:"
 msgstr "_Allekirjoitus:"
 
-#: ../composer/e-msg-composer.c:2577 ../composer/e-msg-composer.c:3826
-#: ../composer/e-msg-composer.c:3829
+#: ../composer/e-msg-composer.c:2622 ../composer/e-msg-composer.c:3861
+#: ../composer/e-msg-composer.c:3864
 msgid "Compose Message"
 msgstr "Uusi viesti"
 
-#: ../composer/e-msg-composer.c:5054
+#: ../composer/e-msg-composer.c:5104
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10483,7 +10499,7 @@ msgstr "Tiedosto &quot;{0}&quot;on jo olemassa."
 msgid "Overwrite file?"
 msgstr "Kirjoita tiedoston yli?"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:139
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:138
 msgid "_Overwrite"
 msgstr "_Ylikirjoita"
 
@@ -10614,7 +10630,7 @@ msgstr "Tärkeä"
 
 #. forest green
 #: ../filter/filter-label.c:123 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Tehtävää"
 
@@ -10698,7 +10714,7 @@ msgstr "Päiväys puuttuu."
 msgid "Missing file name."
 msgstr "Tiedostonimi puuttuu."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
 msgid "Missing name."
 msgstr "Nimi puuttuu."
 
@@ -10786,7 +10802,7 @@ msgstr "tämänhetkinen aika"
 msgid "the time you specify"
 msgstr "määrittelemäsi aika"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:289
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
 #: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "weeks"
 msgstr "viikkoa"
@@ -10860,7 +10876,7 @@ msgid "Mail"
 msgstr "Sähköposti"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:532
+#: ../mail/em-account-prefs.c:535
 msgid "Mail Accounts"
 msgstr "Sähköpostitilit"
 
@@ -10912,7 +10928,7 @@ msgstr "Vastaanotto"
 msgid "Automatically check for _new mail every"
 msgstr "T_arkista onko uutta postia joka"
 
-#: ../mail/em-account-editor.c:2227 ../mail/mail-config.glade.h:134
+#: ../mail/em-account-editor.c:2227 ../mail/mail-config.glade.h:132
 msgid "Sending Email"
 msgstr "Lähetys"
 
@@ -10935,7 +10951,7 @@ msgstr "Vastaanoton asetukset"
 msgid "Checking for New Mail"
 msgstr "Uusien viestien haku"
 
-#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:32
+#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:33
 msgid "Account Editor"
 msgstr "Tilimuokkain"
 
@@ -10943,33 +10959,33 @@ msgstr "Tilimuokkain"
 msgid "Evolution Account Assistant"
 msgstr "Evolutionin sähköpostitilien apulainen"
 
-#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:409
+#: ../mail/em-account-prefs.c:334 ../mail/em-account-prefs.c:379
+#: ../mail/em-account-prefs.c:412
 msgid "Di_sable"
 msgstr "_Ei käytössä"
 
-#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:411 ../mail/mail-config.glade.h:74
+#: ../mail/em-account-prefs.c:334 ../mail/em-account-prefs.c:379
+#: ../mail/em-account-prefs.c:414 ../mail/mail-config.glade.h:74
 #: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "Kä_ytä"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:466
+#: ../mail/em-account-prefs.c:469
 msgid "[Default]"
 msgstr "[Oletus]"
 
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:945
-#: ../plugins/plugin-manager/plugin-manager.c:261
+#: ../mail/em-account-prefs.c:522 ../mail/em-composer-prefs.c:949
+#: ../plugins/plugin-manager/plugin-manager.c:284
 #: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:528
 msgid "Account name"
 msgstr "Tilin nimi"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:530
 msgid "Protocol"
 msgstr "Protokolla"
 
@@ -10978,15 +10994,15 @@ msgstr "Protokolla"
 msgid "Unnamed"
 msgstr "Nimeämätön"
 
-#: ../mail/em-composer-prefs.c:951
+#: ../mail/em-composer-prefs.c:955
 msgid "Language(s)"
 msgstr "Kielet"
 
-#: ../mail/em-composer-prefs.c:994
+#: ../mail/em-composer-prefs.c:998
 msgid "Add signature script"
 msgstr "Lisää allekirjoitus-skripti"
 
-#: ../mail/em-composer-prefs.c:1014
+#: ../mail/em-composer-prefs.c:1018
 msgid "Signature(s)"
 msgstr "Allekirjoitukset"
 
@@ -11267,8 +11283,8 @@ msgstr "alkaa"
 msgid "Stop Processing"
 msgstr "Pysäytä käsittely"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1674
-#: ../mail/em-format-quote.c:320 ../mail/em-format.c:854
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1679
+#: ../mail/em-format-quote.c:320 ../mail/em-format.c:855
 #: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:17
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:6
@@ -11282,54 +11298,55 @@ msgstr "Poista tilan asetus"
 
 #. and now for the action area
 #: ../mail/em-filter-rule.c:488
-msgid "<b>Then</b>"
-msgstr "<b>Silloin</b>"
+#, fuzzy
+msgid "Then"
+msgstr "sitten"
 
-#: ../mail/em-folder-browser.c:170
+#: ../mail/em-folder-browser.c:171
 msgid "C_reate Search Folder From Search..."
 msgstr "Luo _hakunäkymä haun perusteella..."
 
-#: ../mail/em-folder-browser.c:192
+#: ../mail/em-folder-browser.c:193
 msgid "All Messages"
 msgstr "Kaikki viestit"
 
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:194
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../mail/em-folder-browser.c:195
+#: ../mail/em-folder-browser.c:196
 msgid "No Label"
 msgstr "Ei merkintää"
 
-#: ../mail/em-folder-browser.c:202
+#: ../mail/em-folder-browser.c:203
 msgid "Read Messages"
 msgstr "Luetut viestit"
 
-#: ../mail/em-folder-browser.c:203
+#: ../mail/em-folder-browser.c:204
 msgid "Recent Messages"
 msgstr "Viimeisimmät viestit"
 
-#: ../mail/em-folder-browser.c:204
+#: ../mail/em-folder-browser.c:205
 msgid "Last 5 Days' Messages"
 msgstr "Viimeisten viiden päivän viestit"
 
-#: ../mail/em-folder-browser.c:205
+#: ../mail/em-folder-browser.c:206
 msgid "Messages with Attachments"
 msgstr "Viestit, joissa on liitteitä"
 
-#: ../mail/em-folder-browser.c:206
+#: ../mail/em-folder-browser.c:207
 msgid "Important Messages"
 msgstr "Tärkeät viestit"
 
-#: ../mail/em-folder-browser.c:207
+#: ../mail/em-folder-browser.c:208
 msgid "Messages Not Junk"
 msgstr "Viestit, jotka eivät ole roskapostia"
 
-#: ../mail/em-folder-browser.c:1025
+#: ../mail/em-folder-browser.c:1026
 msgid "Account Search"
 msgstr "Haku tileiltä"
 
-#: ../mail/em-folder-browser.c:1069
+#: ../mail/em-folder-browser.c:1070
 msgid "All Account Search"
 msgstr "Hae kaikilta tileiltä"
 
@@ -11380,8 +11397,9 @@ msgid "Drafts"
 msgstr "Luonnokset"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:487 ../mail/em-folder-tree.c:2462
+#: ../mail/em-folder-tree-model.c:487 ../mail/em-folder-tree.c:2572
 #: ../mail/mail-component.c:151
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
 #: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "Saapuneet"
@@ -11454,12 +11472,12 @@ msgstr "_Kopioi kansioon"
 msgid "_Move to Folder"
 msgstr "_Siirrä kansioon"
 
-#: ../mail/em-folder-tree.c:1710 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1715 ../mail/mail-ops.c:1060
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Etsitään kansioita kohteessa \"%s\""
 
-#: ../mail/em-folder-tree.c:2110 ../ui/evolution-addressbook.xml.h:64
+#: ../mail/em-folder-tree.c:2115 ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:32
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
@@ -11467,67 +11485,67 @@ msgstr "Etsitään kansioita kohteessa \"%s\""
 msgid "_View"
 msgstr "_Näytä"
 
-#: ../mail/em-folder-tree.c:2111
+#: ../mail/em-folder-tree.c:2116
 msgid "Open in _New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
-#: ../mail/em-folder-tree.c:2115
+#: ../mail/em-folder-tree.c:2120
 msgid "_Copy..."
 msgstr "_Kopioi..."
 
-#: ../mail/em-folder-tree.c:2116
+#: ../mail/em-folder-tree.c:2121
 msgid "_Move..."
 msgstr "_Siirrä..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2120
+#: ../mail/em-folder-tree.c:2125
 msgid "_New Folder..."
 msgstr "_Uusi kansio..."
 
-#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:36
+#: ../mail/em-folder-tree.c:2128 ../ui/evolution-mail-list.xml.h:36
 msgid "_Rename..."
 msgstr "_Nimeä uudestaan..."
 
-#: ../mail/em-folder-tree.c:2124
+#: ../mail/em-folder-tree.c:2129
 msgid "Re_fresh"
 msgstr "Vi_rkistä"
 
-#: ../mail/em-folder-tree.c:2125
+#: ../mail/em-folder-tree.c:2130
 msgid "Fl_ush Outbox"
 msgstr "T_yhjennä lähtevien kansio"
 
-#: ../mail/em-folder-tree.c:2131 ../mail/mail.error.xml.h:136
+#: ../mail/em-folder-tree.c:2136 ../mail/mail.error.xml.h:135
 msgid "_Empty Trash"
 msgstr "_Tyhjennä roskakori"
 
-#: ../mail/em-folder-utils.c:104
+#: ../mail/em-folder-utils.c:105
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Kopioidaan %s paikkaan %s"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1038
+#: ../mail/em-folder-utils.c:369 ../mail/em-folder-view.c:1038
 #: ../mail/em-folder-view.c:1053
 #: ../mail/importers/evolution-mbox-importer.c:86
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1053
+#: ../mail/em-folder-utils.c:369 ../mail/em-folder-view.c:1053
 msgid "C_opy"
 msgstr "_Kopioi"
 
-#: ../mail/em-folder-utils.c:581
+#: ../mail/em-folder-utils.c:590
 #: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Luodaan kansiota %s"
 
-#: ../mail/em-folder-utils.c:730
+#: ../mail/em-folder-utils.c:750
 #: ../plugins/groupwise-features/install-shared.c:164
 #: ../plugins/groupwise-features/share-folder-common.c:388
 msgid "Create folder"
 msgstr "Luo uusi kansio"
 
-#: ../mail/em-folder-utils.c:730
+#: ../mail/em-folder-utils.c:750
 #: ../plugins/groupwise-features/install-shared.c:164
 #: ../plugins/groupwise-features/share-folder-common.c:388
 msgid "Specify where to create the folder:"
@@ -11658,37 +11676,38 @@ msgstr "Oletukset"
 msgid "Unable to retrieve message"
 msgstr "Viestiä ei voida hakea"
 
-#: ../mail/em-folder-view.c:2377
-msgid "<b>Retrieving Message...</b>"
+#: ../mail/em-folder-view.c:2375
+#, fuzzy
+msgid "Retrieving Message..."
 msgstr "<b>Haetaan viestiä...</b>"
 
-#: ../mail/em-folder-view.c:2601
+#: ../mail/em-folder-view.c:2603
 msgid "C_all To..."
 msgstr "_Soita..."
 
-#: ../mail/em-folder-view.c:2604
+#: ../mail/em-folder-view.c:2606
 msgid "Create _Search Folder"
 msgstr "Luo uusi hakunäkymä"
 
-#: ../mail/em-folder-view.c:2605
+#: ../mail/em-folder-view.c:2607
 msgid "_From this Address"
 msgstr "_Tästä osoitteesta"
 
-#: ../mail/em-folder-view.c:2606
+#: ../mail/em-folder-view.c:2608
 msgid "_To this Address"
 msgstr "_Osoitteeseen:"
 
-#: ../mail/em-folder-view.c:2981
+#: ../mail/em-folder-view.c:2983
 #, c-format
 msgid "Click to mail %s"
 msgstr "Napsauta lähettääksesi %s"
 
-#: ../mail/em-folder-view.c:2993
+#: ../mail/em-folder-view.c:2995
 #, c-format
 msgid "Click to call %s"
 msgstr "Soita numeroon %s napsauttamalla"
 
-#: ../mail/em-folder-view.c:2998
+#: ../mail/em-folder-view.c:3000
 msgid "Click to hide/unhide addresses"
 msgstr "Napsauta piilottaaksesi tai näyttääksesi osoitteet"
 
@@ -11851,56 +11870,56 @@ msgstr "Sovita _leveyteen"
 msgid "Show _Original Size"
 msgstr "Näytä alkuperäinen k_oko"
 
-#: ../mail/em-format-html-display.c:1900 ../mail/em-format-html-display.c:2511
-#: ../mail/mail-config.glade.h:43 ../mail/message-list.etspec.h:1
+#: ../mail/em-format-html-display.c:1903 ../mail/em-format-html-display.c:2514
+#: ../mail/mail-config.glade.h:44 ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Liite"
 
-#: ../mail/em-format-html-display.c:2114
+#: ../mail/em-format-html-display.c:2117
 msgid "Save attachment as"
 msgstr "Tallenna liite nimellä"
 
-#: ../mail/em-format-html-display.c:2118
+#: ../mail/em-format-html-display.c:2121
 msgid "Select folder to save all attachments"
 msgstr "Valitse kansio, johon kaikki liitteet tallennetaan"
 
-#: ../mail/em-format-html-display.c:2169
+#: ../mail/em-format-html-display.c:2172
 msgid "_Save Selected..."
 msgstr "_Tallenna valinta..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2236
+#: ../mail/em-format-html-display.c:2239
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d lii_te"
 msgstr[1] "%d lii_tettä"
 
-#: ../mail/em-format-html-display.c:2243 ../mail/em-format-html-display.c:2321
+#: ../mail/em-format-html-display.c:2246 ../mail/em-format-html-display.c:2324
 msgid "S_ave"
 msgstr "T_allenna"
 
-#: ../mail/em-format-html-display.c:2254
+#: ../mail/em-format-html-display.c:2257
 msgid "S_ave All"
 msgstr "Tallenna _kaikki"
 
-#: ../mail/em-format-html-display.c:2317
+#: ../mail/em-format-html-display.c:2320
 msgid "No Attachment"
 msgstr "Ei liitteitä"
 
-#: ../mail/em-format-html-display.c:2448 ../mail/em-format-html-display.c:2484
+#: ../mail/em-format-html-display.c:2451 ../mail/em-format-html-display.c:2487
 msgid "View _Unformatted"
 msgstr "Näytä _muotoilematon"
 
-#: ../mail/em-format-html-display.c:2450
+#: ../mail/em-format-html-display.c:2453
 msgid "Hide _Unformatted"
 msgstr "Piilota _muotoilematon"
 
-#: ../mail/em-format-html-display.c:2503
+#: ../mail/em-format-html-display.c:2506
 msgid "O_pen With"
 msgstr "Avaa _ohjelmalla"
 
-#: ../mail/em-format-html-display.c:2574
+#: ../mail/em-format-html-display.c:2577
 msgid ""
 "Evolution cannot render this email as it is too large to handle. You can "
 "view it unformatted or with an external text editor."
@@ -11956,97 +11975,116 @@ msgstr ""
 msgid "Formatting message"
 msgstr "Muotoillaan viestiä"
 
-#: ../mail/em-format-html.c:1503 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:849 ../mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1376
+#, fuzzy
+msgid "Formatting Message..."
+msgstr "Muotoillaan viestiä"
+
+#: ../mail/em-format-html.c:1508 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:87
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "Lähettäjä"
 
-#: ../mail/em-format-html.c:1503 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:88
+#: ../mail/em-format-html.c:1508 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:851 ../mail/em-mailer-prefs.c:88
 msgid "Reply-To"
 msgstr "Vastausosoite"
 
-#: ../mail/em-format-html.c:1503 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:852 ../mail/em-mailer-prefs.c:90
+#: ../mail/em-format-html.c:1508 ../mail/em-format-html.c:1523
+#: ../mail/em-format-html.c:1587 ../mail/em-format-html.c:1609
+#: ../mail/em-format-quote.c:207 ../mail/em-format.c:853
+#: ../mail/em-mailer-prefs.c:90
 msgid "Cc"
 msgstr "Kopiot"
 
-#: ../mail/em-format-html.c:1503 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:853 ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-html.c:1508 ../mail/em-format-html.c:1524
+#: ../mail/em-format-html.c:1593 ../mail/em-format-html.c:1612
+#: ../mail/em-format-quote.c:207 ../mail/em-format.c:854
+#: ../mail/em-mailer-prefs.c:91
 msgid "Bcc"
 msgstr "Piilokopiot"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1678 ../mail/em-format-quote.c:329
-#: ../mail/em-mailer-prefs.c:1182
+#: ../mail/em-format-html.c:1683 ../mail/em-format-quote.c:329
+#: ../mail/em-mailer-prefs.c:1196
 msgid "Mailer"
 msgstr "Postittaja"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1705
-msgid "<I> (%a, %R %Z)</I>"
+#: ../mail/em-format-html.c:1710
+#, fuzzy
+msgid " (%a, %R %Z)"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1708
-msgid "<I> (%R %Z)</I>"
+#: ../mail/em-format-html.c:1715
+#, fuzzy
+msgid " (%R %Z)"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1718 ../mail/em-format-quote.c:336
-#: ../mail/em-format.c:855 ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format-html.c:1727 ../mail/em-format-quote.c:336
+#: ../mail/em-format.c:856 ../mail/em-mailer-prefs.c:93
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
 #: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "Päiväys"
 
-#: ../mail/em-format-html.c:1741 ../mail/em-format.c:856
+#: ../mail/em-format-html.c:1750 ../mail/em-format.c:857
 #: ../mail/em-mailer-prefs.c:94
 msgid "Newsgroups"
 msgstr "Uutisryhmät"
 
-#: ../mail/em-format.c:1120
+#. To translators: This message suggests to the receipients that the sender of the mail is
+#. different from the one listed in From field.
+#.
+#: ../mail/em-format-html.c:1837
+#, fuzzy, c-format
+msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+msgstr "Vastaa henkilön <b>%s</b> puolesta"
+
+#: ../mail/em-format.c:1121
 #, c-format
 msgid "%s attachment"
 msgstr "Liite: %s"
 
-#: ../mail/em-format.c:1159
+#: ../mail/em-format.c:1160
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME viestin tulkitseminen epäonnistui: tuntematon virhe"
 
-#: ../mail/em-format.c:1292 ../mail/em-format.c:1448
+#: ../mail/em-format.c:1293 ../mail/em-format.c:1449
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME-viestin tulkisteminen epäonnistui, näytetään lähdekoodi"
 
-#: ../mail/em-format.c:1300
+#: ../mail/em-format.c:1301
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tuntematon salausmuoto muodolle multipart/encrypted"
 
-#: ../mail/em-format.c:1310
+#: ../mail/em-format.c:1311
 msgid "Could not parse PGP/MIME message"
 msgstr "PGP/MIME-viestiä ei voitu tulkita"
 
-#: ../mail/em-format.c:1310
+#: ../mail/em-format.c:1311
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "PGP/MIME-viestiä ei voitu tulkita: tuntematon virhe"
 
-#: ../mail/em-format.c:1467
+#: ../mail/em-format.c:1468
 msgid "Unsupported signature format"
 msgstr "Allekirjoituksen muoto ei ole tuettu"
 
-#: ../mail/em-format.c:1475 ../mail/em-format.c:1541
+#: ../mail/em-format.c:1476 ../mail/em-format.c:1542
 msgid "Error verifying signature"
 msgstr "Virhe tarkistettaessa allekirjoitusta"
 
-#: ../mail/em-format.c:1475 ../mail/em-format.c:1541
+#: ../mail/em-format.c:1476 ../mail/em-format.c:1542
 msgid "Unknown error verifying signature"
 msgstr "Tuntematon virhe tarkistettaessa allekirjoitusta"
 
-#: ../mail/em-format.c:1612
+#: ../mail/em-format.c:1613
 msgid "Could not parse PGP message"
 msgstr "PGP-piestiä ei voitu tulkita"
 
-#: ../mail/em-format.c:1612
+#: ../mail/em-format.c:1613
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP-piestiä ei voitu tulkita: tuntematon virhe"
 
@@ -12066,19 +12104,19 @@ msgstr "Kerran viikossa"
 msgid "Once per month"
 msgstr "Kerran kuussa"
 
-#: ../mail/em-mailer-prefs.c:777
+#: ../mail/em-mailer-prefs.c:787
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s-liitännäinen on käytettävissä ja ohjelma on asennettu."
 
-#: ../mail/em-mailer-prefs.c:785
+#: ../mail/em-mailer-prefs.c:795
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "%s-liitännäinen ei ole käytettävissä. Tarkista että sen paketti on asennettu."
 
-#: ../mail/em-mailer-prefs.c:806
+#: ../mail/em-mailer-prefs.c:816
 msgid "No Junk plugin available"
 msgstr "Roskapostiliitännäistä ei ole saatavilla"
 
@@ -13069,158 +13107,158 @@ msgid "<b>Sig_natures</b>"
 msgstr "<b>Alle_kirjoitukset</b>"
 
 #: ../mail/mail-config.glade.h:6
+msgid "<b>Top Posting Option</b> (Not Recommended)"
+msgstr "<b>Yläpostituksen valinta</b> (ei suositeltu)"
+
+#: ../mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>Kielet</b>"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Tilin tiedot</span>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Tunnistustapa</span>"
 
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Tunnistus</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Viestien kirjoitus</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Asetukset</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Oletustoimintatapa</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Poista viesti</span>"
 
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">_Näytettävät otsakkeet</span>"
 
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Merkinnät ja värit</span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Kuvien lataus</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Viestin näyttö</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Viestin kirjasimet</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Viestin vastaanottajat</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Huomautus uusista viesteistä</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Valinnaiset tiedot</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Vaihtoehdot</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Tulostettavat kirjasimet</span>"
 
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Vaadittavat tiedot</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Turvallisuus</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Lähetetyt viestit ja luonnokset</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Palvelimen asetukset</span>"
 
-#: ../mail/mail-config.glade.h:33
+#: ../mail/mail-config.glade.h:34
 msgid "Account Management"
 msgstr "Tilinhallinta"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Add Ne_w Signature..."
 msgstr "Lisää uusi _allekirjoitus..."
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add _Script"
 msgstr "Lisää _skripti"
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Allekirjoita _aina lähtevät viestit käytettäessä tätä sähköpostitiliä"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr "_Salaa myös itselleni salattua sähköpostia lähetettäessä"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Lähetä aina kopio (Cc) osoitteeseen:"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Lähetä aina _piiloitettu kopio (Bcc) osoitteeseen:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Luota salattaessa aina avaimiin avainrenkaassani"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr "Salaa _aina myös itselle lähetettäessä salattua sähköpostia"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Attach original message"
 msgstr "Liitä alkuperäinen viesti"
 
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.glade.h:45
 msgid "Automatically insert _smiley images"
 msgstr "Lisää _hymiöt kuvina automaattisesti"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balttilainen (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balttilainen (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:47
-msgid "Beep w_hen new mail arrives"
-msgstr "_Piippaa kun uutta sähköpostia saapuu"
-
 #: ../mail/mail-config.glade.h:48
 msgid "C_haracter set:"
 msgstr "_Merkistö:"
@@ -13330,13 +13368,14 @@ msgid "Encrypt out_going messages (by default)"
 msgstr "Salaa lähtevät viestit oletuksena"
 
 #: ../mail/mail-config.glade.h:81
-msgid "Fi_xed width Font:"
-msgstr "_Tasalevyinen kirjasin:"
-
-#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "_Tasalevyinen:"
 
+#: ../mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Fix_ed width Font:"
+msgstr "_Tasalevyinen kirjasin:"
+
 #: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Kirjasimen ominaisuudet"
@@ -13489,78 +13528,70 @@ msgid "Se_lect..."
 msgstr "_Valitse..."
 
 #: ../mail/mail-config.glade.h:127
-msgid "Select Drafts Folder"
-msgstr "Valitse luonnosten kansio"
-
-#: ../mail/mail-config.glade.h:128
 msgid "Select HTML fixed width font"
 msgstr "Valitse HTML-viestin tasalevyinen kirjasin"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:128
 msgid "Select HTML fixed width font for printing"
 msgstr "Valitse HTML-viestin tasalevyinen kirjasin tulostusta varten"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:129
 msgid "Select HTML variable width font"
 msgstr "Valite HTML-viestin vaihtuvalevyinen kirjasin"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:130
 msgid "Select HTML variable width font for printing"
 msgstr "Valitse HTML-viestin vaihtuvalevyinen kirjasin tulostusta varten"
 
-#: ../mail/mail-config.glade.h:132
-msgid "Select Sent Folder"
-msgstr "Valitse lähetettyjen kansio"
-
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:131
 msgid "Select sound file"
 msgstr "Valitse äänitiedosto"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:133
 msgid "Sending Mail"
 msgstr "Lähtevä posti"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:134
 msgid "Sent _Messages Folder:"
 msgstr "Lähetettyjen _viestien kansio:"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:135
 msgid "Ser_ver requires authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:136
 msgid "Server _Type: "
 msgstr "Palvelintyyppi: "
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:137
 msgid "Sig_ning certificate:"
 msgstr "_Allekirjoitusvarmenne:"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:138
 msgid "Signat_ure:"
 msgstr "_Allekirjoitus:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:139
 msgid "Signatures"
 msgstr "Allekirjoitukset"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:140
 msgid "Signatures Table"
 msgstr "Allekirjoitusten taulu"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:141
 msgid "Specify _filename:"
 msgstr "Anna _tiedostonimi:"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:142
 msgid "Spell Checking"
 msgstr "Oikoluku"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:143
 msgid "T_ype: "
 msgstr "_Tyyppi:"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:144
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -13568,7 +13599,7 @@ msgstr ""
 "Lista käytettävissä olevista kielistä riippuu ainoastaan siitä, mille "
 "kielille sinulla on sanastoja asennettuna."
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:145
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13578,7 +13609,7 @@ msgstr ""
 "Nimi jonka valitset on käytössä ainoastaan tässä listassa\n"
 "näytettäessä."
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13586,15 +13617,15 @@ msgstr ""
 "Anna nimi jolla haluaisit kutsua tätä sähköpostitiliä.\n"
 "Esimerkiksi \"Työ\" tai \"Henkilökohtaista\""
 
-#: ../mail/mail-config.glade.h:153 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:151 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "Käyttäjät_unnus:"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "_Vaihtuva leveys:"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13604,30 +13635,39 @@ msgstr ""
 "\n"
 "Valitse \"Eteenpäin\" aloittaaksesi."
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:157
 msgid "_Add Signature"
 msgstr "_Lisää allekirjoitus:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:158
 msgid "_Always load images from the Internet"
 msgstr "Lataa _aina kuvat verkosta"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_Beep when new mail arrives"
+msgstr "_Piippaa kun uutta sähköpostia saapuu"
+
+#: ../mail/mail-config.glade.h:160
 msgid "_Default junk plugin:"
 msgstr "_Roskapostin oletusliitännäinen"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Älä huomauta uuden sähköpostin saapumisesta"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:162
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Älä allekirjoita kokouskutsuja (Outlook-yhteensopivuus)"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:164
 msgid "_Forward style:"
 msgstr "_Välitä tyyli:"
 
+#: ../mail/mail-config.glade.h:165
+msgid "_Keep Signature above the original message on replying"
+msgstr "_Pidä allekirjoitus alkuperäisen viestin yllä vastattaessa"
+
 #: ../mail/mail-config.glade.h:166
 msgid "_Load images in mail from contacts"
 msgstr "_Hae viestin kuvat, jos yhteystieto on osoitekirjassa"
@@ -13795,7 +13835,7 @@ msgstr "_Merkki:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Laita tähän rasti, jos hyväksyt lisenssiehdot"
 
-#: ../mail/mail-folder-cache.c:875
+#: ../mail/mail-folder-cache.c:877
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingataan %s"
@@ -13842,7 +13882,7 @@ msgstr "%d viestin %d:stä epäonnistui"
 msgid "Canceled."
 msgstr "Peruttu."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:698
 msgid "Complete."
 msgstr "Valmis."
 
@@ -14308,7 +14348,8 @@ msgid "Do not disable"
 msgstr "Älä poista käytöstä"
 
 #: ../mail/mail.error.xml.h:49
-msgid "Do you want the operation to be performed in the subfolders?"
+#, fuzzy
+msgid "Do you want the operation to be performed also in the subfolders?"
 msgstr "Haluatko toiminnon tehtäväksi alikansioissa?"
 
 #: ../mail/mail.error.xml.h:50
@@ -14416,21 +14457,23 @@ msgid "Mark all messages as read"
 msgstr "Merkitse kaikki viestit luetuiksi"
 
 #: ../mail/mail.error.xml.h:72
-msgid "Mark all messages in subfolders as read?"
+#, fuzzy
+msgid "Mark all messages in this folder and subfolders as read?"
 msgstr "Merkitse kaikki alikansioiden viestit luetuksi?"
 
 #: ../mail/mail.error.xml.h:73
-msgid "Mark as _Read"
-msgstr "Merkitse _luetuksi"
-
-#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "Kansio puuttuu."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 msgid "No sources selected."
 msgstr "Lähteitä ei ole valittuna."
 
+#: ../mail/mail.error.xml.h:76
+#, fuzzy
+msgid "Only on _Current Folder"
+msgstr "Valittu kansio"
+
 #: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "Liian monen viestin avaus kerralla voi viedä pitkän ajan."
@@ -14680,21 +14723,22 @@ msgid "_Discard changes"
 msgstr "_Hylkää muutokset"
 
 #: ../mail/mail.error.xml.h:134
-msgid "_Do not Mark as Read"
-msgstr "Älä merkitse _luetuksi"
-
-#: ../mail/mail.error.xml.h:135
 msgid "_Do not Synchronize"
 msgstr "Ä_lä synkronoi"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:136
 msgid "_Expunge"
 msgstr "_Poista pysyvästi"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:137
 msgid "_Open Messages"
 msgstr "_Avaa viestit"
 
+#: ../mail/mail.error.xml.h:140
+#, fuzzy
+msgid "on Current Folder and _Subfolders"
+msgstr "Luo alikansioita"
+
 #: ../mail/message-list.c:1022
 msgid "Unseen"
 msgstr "Nähty"
@@ -14731,30 +14775,30 @@ msgstr "Korkeampi"
 msgid "Highest"
 msgstr "Korkein"
 
-#: ../mail/message-list.c:1508 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1508 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
 #: ../mail/message-list.c:1515 ../plugins/itip-formatter/itip-view.c:203
-#: ../widgets/table/e-cell-date.c:72
+#: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Tänään %l.%M %p"
 
-#: ../mail/message-list.c:1524 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1524 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l.%M %p"
 
-#: ../mail/message-list.c:1536 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1536 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l.%M %p"
 
-#: ../mail/message-list.c:1544 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1544 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l.%M %p"
 
-#: ../mail/message-list.c:1546 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1546 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
@@ -14863,6 +14907,42 @@ msgstr "Paikalliset osoitekirjat"
 msgid "Provides core functionality for local address books."
 msgstr "Tarjoaa paikallisten osoitekirjojen perustoiminnot."
 
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.in.h:1
+#, fuzzy
+msgid "Enable attachment reminder plugin"
+msgstr "Käytä ja poista käytöstä liitännäsiä"
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.in.h:2
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr ""
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:376
+msgid "Keywords"
+msgstr ""
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:422
+#, fuzzy
+msgid "Attachment Reminder Preferences"
+msgstr "Liitteen ominaisuudet"
+
+#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
+#, fuzzy
+msgid "Remind _missing attachments"
+msgstr "Tallennetaan liite"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+#, fuzzy
+msgid "Attachment Reminder"
+msgstr "Liitepalkki"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid ""
+"Looks for clues in a message for mention of attachments and warns if the "
+"attachment is missing"
+msgstr ""
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
@@ -15021,9 +15101,9 @@ msgid ""
 "toggle button."
 msgstr ""
 "Evolution varmuuskopiointi voidaan käynnistä vain, kun Evolution ei ole "
-"käynnissä. Varmista että olet tallentannut ja sulkenut kaikki ikkunat "
-"ennen jatkamista. Voit asetta evolutionin käynnistymään automaattisesti, "
-"kun varmuuskopiointi on päättynyt."
+"käynnissä. Varmista että olet tallentannut ja sulkenut kaikki ikkunat ennen "
+"jatkamista. Voit asetta evolutionin käynnistymään automaattisesti, kun "
+"varmuuskopiointi on päättynyt."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid "Invalid Evolution archive"
@@ -15041,12 +15121,11 @@ msgid ""
 "you proceed. If you want Evolution to restart automatically restart after "
 "restore, please enable the toggle button."
 msgstr ""
-"Tämä poistaa kaikki nykyiset Evolutionin tiedot ja asetukset, ja "
-"palauttaa ne varmuuskopiosta. Varmuuskopion palautus voidaan käynnistää "
-"vain, kun Evolution ei ole käynnissä. Varmista että olet tallentannut "
-"ja sulkenut kaikki ikkunat ennen jatkamista. Voit asetta evolutionin "
-"käynnistymään automaattisesti, kun varmuuskopiointi on päättynyt."
-
+"Tämä poistaa kaikki nykyiset Evolutionin tiedot ja asetukset, ja palauttaa "
+"ne varmuuskopiosta. Varmuuskopion palautus voidaan käynnistää vain, kun "
+"Evolution ei ole käynnissä. Varmista että olet tallentannut ja sulkenut "
+"kaikki ikkunat ennen jatkamista. Voit asetta evolutionin käynnistymään "
+"automaattisesti, kun varmuuskopiointi on päättynyt."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
@@ -15060,39 +15139,39 @@ msgstr "_Palauta asetukset..."
 msgid "_Backup Settings..."
 msgstr "_Varmuuskopioi asetukset..."
 
-#: ../plugins/bbdb/bbdb.c:459 ../plugins/bbdb/bbdb.c:468
+#: ../plugins/bbdb/bbdb.c:451 ../plugins/bbdb/bbdb.c:460
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automaattiset yhteystiedot"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:483
+#: ../plugins/bbdb/bbdb.c:475
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr "Lisää lähettäjä _automaattisesti osoitekirjaan, kun viestiin vastataan"
 
-#: ../plugins/bbdb/bbdb.c:489
+#: ../plugins/bbdb/bbdb.c:481
 msgid "Select Address book for Automatic Contacts"
 msgstr "Valitse osoitekirja automaattisille yhteystiedoille"
 
-#: ../plugins/bbdb/bbdb.c:504
+#: ../plugins/bbdb/bbdb.c:496
 msgid "Instant Messaging Contacts"
 msgstr "Pikaviestinnän yhteystiedot"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:519
+#: ../plugins/bbdb/bbdb.c:511
 msgid ""
 "Periodically synchronize contact information and images from gaim buddy list"
 msgstr ""
 "Hae ja yhdistä säännöllisin väliajoin yhteystiedot ja kuvat gaimin "
 "kaverilistasta"
 
-#: ../plugins/bbdb/bbdb.c:525
+#: ../plugins/bbdb/bbdb.c:517
 msgid "Select Address book for Gaim buddy list"
 msgstr "Valitse osoitekirja Gaimin kaverilistalle"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:536
+#: ../plugins/bbdb/bbdb.c:528
 msgid "Synchronize with _buddy list now"
 msgstr "Yhdistä tiedot _kaverilistasta"
 
@@ -15109,7 +15188,7 @@ msgstr ""
 msgid "BBDB"
 msgstr "BBDB"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:302
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:304
 msgid "Convert mail text to _Unicode"
 msgstr "Muunna sähköpostin teksti _Unicode-muotoon"
 
@@ -15130,7 +15209,7 @@ msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:133
+#: ../plugins/calendar-http/calendar-http.c:135
 msgid "_URL:"
 msgstr "_URL:"
 
@@ -15154,15 +15233,20 @@ msgstr "Paikalliset kalenterit"
 msgid "Provides core functionality for local calendars."
 msgstr "Tarjoaa paikallisten kalenterien perustoiminnot."
 
-#: ../plugins/calendar-http/calendar-http.c:271
+#: ../plugins/calendar-http/calendar-http.c:273
 #: ../plugins/calendar-weather/calendar-weather.c:546
 msgid "_Refresh:"
 msgstr "_Virkistysväli:"
 
-#: ../plugins/calendar-http/calendar-http.c:339
+#: ../plugins/calendar-http/calendar-http.c:341
 msgid "_Secure connection"
 msgstr "_Salattu yhteys"
 
+#: ../plugins/calendar-http/calendar-http.c:406
+#, fuzzy
+msgid "Userna_me:"
+msgstr "Käyttäjät_unnus:"
+
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "HTTP Calendars"
 msgstr "HTTP-kalenterit"
@@ -15447,69 +15531,80 @@ msgid "Your password will expire in the next %d days"
 msgstr "Salasanasi vanhenee seuraavan %d päivän kuluessa"
 
 #. Custom
-#: ../plugins/exchange-operations/exchange-delegates-user.c:151
+#: ../plugins/exchange-operations/exchange-delegates-user.c:159
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
-#: ../widgets/table/e-table-header-item.c:1559
+#: ../widgets/table/e-table-header-item.c:1558
 msgid "Custom"
 msgstr "Oma näkymä"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:178
+#: ../plugins/exchange-operations/exchange-delegates-user.c:189
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Muokkaaja (kirjoita, luo, muokkaa)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:182
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Kirjoittaja (lue, luo)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:186
+#: ../plugins/exchange-operations/exchange-delegates-user.c:197
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Tarkastaja (vain luku)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:236
+#: ../plugins/exchange-operations/exchange-delegates-user.c:247
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Valtuutettujen oikeudet"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:247
+#: ../plugins/exchange-operations/exchange-delegates-user.c:258
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
 #, c-format
 msgid "Permissions for %s"
 msgstr "Oikeudet käyttäjälle %s"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:334
+#. To translators: This is a part of the message to be sent to the delegatee
+#. summarizing the permissions assigned to him.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
+#, fuzzy
 msgid ""
-"This message was sent automatically by Evolution \t\t\t\t\tto inform you "
-"that you have been designated as a \t\t\t\t\tdelegate. You can now send "
-"messages on my behalf.\t\t\t\t\t \n"
-"\n"
-"You have been given the following permissions \t\t\t\t\ton my folders:\n"
+"This message was sent automatically by Evolution to inform you that you have "
+"been designated as a delegate. You can now send messages on my behalf."
 msgstr ""
 "Tämä viesti lähetettiin automaattisesti Evolutionista \t\t\t\t\t kertomaan, "
-"että sinut on merkitty \t\t\t\t\tvaltuutetuksi. Voit nyt lähettää "
-"viestejä puolestani.\t\t\t\t\t \n"
+"että sinut on merkitty \t\t\t\t\tvaltuutetuksi. Voit nyt lähettää viestejä "
+"puolestani.\t\t\t\t\t \n"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:351
-msgid ""
-"\n"
-"You are also permitted \t\t\t\t\t\t\tto see my private items."
+#. To translators: Another chunk of the same message.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+msgid "You have been given the following permissions on my folders:"
+msgstr ""
+
+#. To translators: This message is included if the delegatee has been given access
+#. to the private items.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+#, fuzzy
+msgid "You are also permitted to see my private items."
 msgstr ""
 "\n"
 "Sinulla on myös lupa \t\t\t\t\t\t\tkatsoa yksityisiä kohtiani."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:355
-msgid ""
-"\n"
-"However you are not permitted\t\t\t\t\t\t\t to see my private items."
+#. To translators: This message is included if the delegatee has not been given access
+#. to the private items.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:378
+#, fuzzy
+msgid "However you are not permitted to see my private items."
 msgstr ""
 "\n"
 "Sinulla ei kuitenkaan ole lupaa\t\t\t\t\t\t\t katsoa yksityisiä kohtiani."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:387
-#, c-format
-msgid "You have been designated \t\t\t\t\t\tas a delegate for %s"
+#: ../plugins/exchange-operations/exchange-delegates-user.c:410
+#, fuzzy, c-format
+msgid "You have been designated as a delegate for %s"
 msgstr "Sinut on nimetty \t\t\t\t\t\tkäyttäjän %s valtuutetuksi"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:421
@@ -16187,6 +16282,36 @@ msgstr "Tilaa muiden käyttäjien tehtäviä"
 msgid "Check folder permissions"
 msgstr "Tarkista kansion oikeudet"
 
+#: ../plugins/face/face.c:58
+msgid "Select a (48*48) png of size < 700bytes"
+msgstr ""
+
+#: ../plugins/face/face.c:68
+#, fuzzy
+msgid "PNG files"
+msgstr "Kaikki tiedostot"
+
+#: ../plugins/face/face.c:73
+msgid "Select a (48*48) png of size < 720bytes"
+msgstr ""
+
+#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#, fuzzy
+msgid "_Face"
+msgstr "Ranska"
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid ""
+"Attach Face header to outgoing mails. First time the user needs to configure "
+"a 48*48 png image. It is base64 encoded and stored in ~/.evolution/faces "
+"This will be used in mails that are sent further."
+msgstr ""
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#, fuzzy
+msgid "Face"
+msgstr "Ranska"
+
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
@@ -16250,15 +16375,16 @@ msgstr "Asenna jaettu kansio"
 msgid "Shared Folder Installation"
 msgstr "Jaetun kansion asennus"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:77
+#: ../plugins/groupwise-features/junk-mail-settings.c:78
 msgid "Junk Settings"
 msgstr "Roskapostin asetukset"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:90
-msgid "<b>Junk Mail Settings</b>"
-msgstr "<b>Roskapostin asetukset</b>"
+#: ../plugins/groupwise-features/junk-mail-settings.c:91
+#: ../plugins/groupwise-features/junk-settings.glade.h:3
+msgid "Junk Mail Settings"
+msgstr "Roskapostin asetukset"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:112
+#: ../plugins/groupwise-features/junk-mail-settings.c:115
 msgid "Junk Mail Settings..."
 msgstr "Roskapostin asetukset..."
 
@@ -16270,10 +16396,6 @@ msgstr "<b>Roskapostilista:</b>"
 msgid "Email:"
 msgstr "Sähköposti:"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
-msgid "Junk Mail Settings"
-msgstr "Roskapostin asetukset"
-
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "_Disable"
@@ -16322,7 +16444,7 @@ msgid "<b>Users:</b>"
 msgstr "<b>Käyttäjät:</b>"
 
 #: ../plugins/groupwise-features/properties.glade.h:3
-#: ../widgets/table/e-table-click-to-add.c:509
+#: ../widgets/table/e-table-click-to-add.c:507
 msgid "Message"
 msgstr "Viesti"
 
@@ -16422,17 +16544,17 @@ msgstr "%sSyötä salasana palvelulle %s (käyttäjä %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:516
+#: ../plugins/groupwise-features/proxy-login.c:521
 msgid "_Proxy Login..."
 msgstr "Välimuistin kirjautuminen..."
 
-#: ../plugins/groupwise-features/proxy.c:697
+#: ../plugins/groupwise-features/proxy.c:701
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 "Välimuistin välilehti on käytettävissä vain jos tili on yhteydellisessä "
 "tilassa."
 
-#: ../plugins/groupwise-features/proxy.c:702
+#: ../plugins/groupwise-features/proxy.c:706
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Välimuisti on käytettävissä vain jos tili on käytössä."
 
@@ -16461,56 +16583,58 @@ msgstr "Lisää "
 msgid "Modify"
 msgstr "Muokkaa"
 
-#: ../plugins/groupwise-features/status-track.c:103
+#: ../plugins/groupwise-features/status-track.c:105
 msgid "Message Status"
 msgstr "Viestin tila"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:117
-msgid "<b>Subject</b> :"
-msgstr "<b>Aihe/</b> :"
+#: ../plugins/groupwise-features/status-track.c:119
+#, fuzzy
+msgid "Subject:"
+msgstr "_Aihe:"
 
-#: ../plugins/groupwise-features/status-track.c:129
-msgid "<b>From</b> :"
-msgstr "<b>Lähettäjä</b> :"
+#: ../plugins/groupwise-features/status-track.c:133
+msgid "From:"
+msgstr "Lähettäjä:"
 
-#: ../plugins/groupwise-features/status-track.c:142
-msgid "<b>Creation date</b> :"
+#: ../plugins/groupwise-features/status-track.c:148
+#, fuzzy
+msgid "Creation date:"
 msgstr "<b>Luontipäivä</b> :"
 
-#: ../plugins/groupwise-features/status-track.c:178
+#: ../plugins/groupwise-features/status-track.c:186
 msgid "Recipient: "
 msgstr "Vastaanottaja: "
 
-#: ../plugins/groupwise-features/status-track.c:185
+#: ../plugins/groupwise-features/status-track.c:193
 msgid "Delivered: "
 msgstr "Toimitettu: "
 
-#: ../plugins/groupwise-features/status-track.c:191
+#: ../plugins/groupwise-features/status-track.c:199
 msgid "Opened: "
 msgstr "Avattu: "
 
-#: ../plugins/groupwise-features/status-track.c:196
+#: ../plugins/groupwise-features/status-track.c:204
 msgid "Accepted: "
 msgstr "Hyväksytty: "
 
-#: ../plugins/groupwise-features/status-track.c:201
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Deleted: "
 msgstr "Poistettu: "
 
-#: ../plugins/groupwise-features/status-track.c:206
+#: ../plugins/groupwise-features/status-track.c:214
 msgid "Declined: "
 msgstr "Hylätty: "
 
-#: ../plugins/groupwise-features/status-track.c:211
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Completed: "
 msgstr "Valmistunut: "
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Un-delivered: "
 msgstr "Toimitettamaton: "
 
-#: ../plugins/groupwise-features/status-track.c:241
+#: ../plugins/groupwise-features/status-track.c:249
 msgid "Track Message Status..."
 msgstr "Seuraa viestin tilaa..."
 
@@ -16526,11 +16650,11 @@ msgstr "Hula-tilin asetukset"
 msgid "Custom Header"
 msgstr "Oma otsake"
 
-#: ../plugins/imap-features/imap-headers.c:256
+#: ../plugins/imap-features/imap-headers.c:259
 msgid "Custom Headers"
 msgstr "Omat otsakkeet"
 
-#: ../plugins/imap-features/imap-headers.c:266
+#: ../plugins/imap-features/imap-headers.c:269
 msgid "IMAP Headers"
 msgstr "IMAP-otsakkeet"
 
@@ -16618,10 +16742,23 @@ msgstr "Tuo kalenteriin"
 msgid "Imports ICS attachments to calendar."
 msgstr "Tuo ICS-liitteitä kalenteriin."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:64
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:33
+msgid "Hardware Abstraction Layer not loaded"
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+msgid ""
+"The \"hald\" service is required but not currently running. Please enable "
+"the service and rerun this program, or contact your system administrator."
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:66
+msgid "Search for an iPod failed"
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:67
+#, fuzzy
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Search for an iPod failed</span>\n"
-"\n"
 "Evolution could not find an iPod to synchronize with. Either the iPod is not "
 "connected to the system or it is not powered on."
 msgstr ""
@@ -16740,11 +16877,13 @@ msgstr "Läsnäolijaa ei voi päivittää. %s"
 msgid "Attendee status updated"
 msgstr "Läsnäolon tila päivitetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1351
+#: ../plugins/itip-formatter/itip-formatter.c:1345
+#: ../plugins/itip-formatter/itip-formatter.c:1360
 msgid "The calendar attached is not valid"
 msgstr "Liitetty kalenteri ei ole kelvollinen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1352
+#: ../plugins/itip-formatter/itip-formatter.c:1346
+#: ../plugins/itip-formatter/itip-formatter.c:1361
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -16752,15 +16891,15 @@ msgstr ""
 "Viesti väittää sisältävänsä kalenterin, mutta kalenteri ei ole kelvollinen "
 "iCalendar-tiedosto."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1387
-#: ../plugins/itip-formatter/itip-formatter.c:1405
-#: ../plugins/itip-formatter/itip-formatter.c:1486
+#: ../plugins/itip-formatter/itip-formatter.c:1396
+#: ../plugins/itip-formatter/itip-formatter.c:1414
+#: ../plugins/itip-formatter/itip-formatter.c:1495
 msgid "The item in the calendar is not valid"
 msgstr "Kalenterin sisältö ei ole kelvollinen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1388
-#: ../plugins/itip-formatter/itip-formatter.c:1406
-#: ../plugins/itip-formatter/itip-formatter.c:1487
+#: ../plugins/itip-formatter/itip-formatter.c:1397
+#: ../plugins/itip-formatter/itip-formatter.c:1415
+#: ../plugins/itip-formatter/itip-formatter.c:1496
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16768,11 +16907,11 @@ msgstr ""
 "Viesti sisältää kalenterin, mutta kalenterissa ei ole tapahtumia, tehtäviä "
 "tai vapaa/varattu-tietoja."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1426
 msgid "The calendar attached contains multiple items"
 msgstr "Liitetyssä kalenterissa on useita kohtia"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1427
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16782,17 +16921,17 @@ msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2244
+#: ../plugins/itip-formatter/itip-formatter.c:2253
 msgid "_Delete message after acting"
 msgstr "_Poista viesti, kun toimenpide on suoritettu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2254
-#: ../plugins/itip-formatter/itip-formatter.c:2286
+#: ../plugins/itip-formatter/itip-formatter.c:2263
+#: ../plugins/itip-formatter/itip-formatter.c:2295
 msgid "Conflict Search"
 msgstr "Ristiriitaisuuksien haku"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2269
+#: ../plugins/itip-formatter/itip-formatter.c:2278
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Valitse kalenterit, joista etsitään päällekkäisiä kokouksia"
 
@@ -17095,8 +17234,9 @@ msgstr ""
 "<b>%s</b> toivoo saavansa viimeisimmät tiedot seuraavista työtehtävistä:"
 
 #: ../plugins/itip-formatter/itip-view.c:474
-#, c-format
-msgid "<b>%s</b> through has sent back the following assigned task response:"
+#, fuzzy, c-format
+msgid ""
+"<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> lähetti takaisin seuraavan annetun tehtävän vastauksen:"
 
 #: ../plugins/itip-formatter/itip-view.c:476
@@ -17310,14 +17450,11 @@ msgid "When the new-mail status icon is visible, make it blink."
 msgstr "Laita uusien viestien tilakuvake vilkkumaan, kun on näkyvissä."
 
 #: ../plugins/mail-notification/mail-notification.c:132
-#, c-format
+#, fuzzy, c-format
 msgid "You have received %d new message in %s."
-msgstr "%d uusi viesti kansiossa %s."
-
-#: ../plugins/mail-notification/mail-notification.c:132
-#, c-format
-msgid "You have received %d new messages in %s."
-msgstr "%d uutta viesti' kansiossa %s."
+msgid_plural "You have received %d new messages in %s."
+msgstr[0] "%d uusi viesti kansiossa %s."
+msgstr[1] "%d uusi viesti kansiossa %s."
 
 #: ../plugins/mail-notification/mail-notification.c:153
 msgid "New email"
@@ -17328,12 +17465,13 @@ msgid "Mail Notification"
 msgstr "Huomautus sähköpostista"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+#, fuzzy
 msgid ""
 "Notifies the user with tray icon and a notify message whenever a new message "
-"is arrived."
+"has arrived."
 msgstr ""
-"Huomauttaa käyttäjää ilmoitusalueen kuvakkeella ja huomautusviestillä, "
-"kun uusia viestejä saapuu."
+"Huomauttaa käyttäjää ilmoitusalueen kuvakkeella ja huomautusviestillä, kun "
+"uusia viestejä saapuu."
 
 #: ../plugins/mail-remote/client.c:30
 #, c-format
@@ -17618,7 +17756,7 @@ msgstr "Liitännäinen, jolla voidaan hallita muiden liitännäistä käyttöä.
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:202
+#: ../plugins/plugin-manager/plugin-manager.c:223
 msgid "Plugin Manager"
 msgstr "Liitännäisten hallinta"
 
@@ -17630,23 +17768,28 @@ msgstr "Käytä ja poista käytöstä liitännäsiä"
 msgid "_Plugins"
 msgstr "_Liitännäiset"
 
-#: ../plugins/plugin-manager/plugin-manager.c:53
+#: ../plugins/plugin-manager/plugin-manager.c:55
 msgid "Author(s)"
 msgstr "Kirjoittaja(t)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:54
+#: ../plugins/plugin-manager/plugin-manager.c:56
 #: ../widgets/table/e-table-config-no-group.glade.h:6
 #: ../widgets/table/e-table-config.glade.h:5
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../plugins/plugin-manager/plugin-manager.c:215
+#: ../plugins/plugin-manager/plugin-manager.c:226
+#, fuzzy
+msgid "Configure"
+msgstr "Jatka"
+
+#: ../plugins/plugin-manager/plugin-manager.c:238
 msgid "Note: Some changes will not take effect until restart"
 msgstr ""
 "Huomio: jotkut muutokset eivät astu voimaan ennen uudelleenkäynnistystä"
 
-#: ../plugins/plugin-manager/plugin-manager.c:268
-#: ../plugins/plugin-manager/plugin-manager.c:327
+#: ../plugins/plugin-manager/plugin-manager.c:291
+#: ../plugins/plugin-manager/plugin-manager.c:350
 msgid "Plugin"
 msgstr "Liitännäinen"
 
@@ -18062,9 +18205,19 @@ msgstr "Säikeistä viestit aiheen perusteella"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
 #: ../plugins/subject-thread/subject-thread.c:54
-msgid "Fall back to threading messages by sub_ject"
+#, fuzzy
+msgid "F_all back to threading messages by subject"
 msgstr "Palaa viestien säikeistämiseen _aiheen perusteella"
 
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
+msgid "A simple plugin which uses ytnef to decode tnef attachments."
+msgstr ""
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+#, fuzzy
+msgid "TNEF Attachment decoder"
+msgstr "Ei liitteitä"
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Evolution-kuori"
@@ -18368,7 +18521,7 @@ msgstr ""
 "Evolution on yhteydettömässä tilassa. Napsauta tästä siirtyäksesi "
 "yhteydelliseen tilaan."
 
-#: ../shell/e-shell-window.c:820
+#: ../shell/e-shell-window.c:823
 #, c-format
 msgid "Switch to %s"
 msgstr "Avaa %s"
@@ -19283,7 +19436,7 @@ msgstr "Tallenna valitut yhteystiedot VCardina."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Tallenna yhteytiedot valitussa kansiossa VCardina"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2715
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2714
 msgid "Select All"
 msgstr "Valitse kaikki"
 
@@ -21075,19 +21228,19 @@ msgstr ""
 "aikavyöhyke.\n"
 "Loitonna kartalla oikealla hiiren napilla."
 
-#: ../widgets/menus/gal-define-views-dialog.c:84
-#: ../widgets/menus/gal-define-views-model.c:188
+#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-model.c:186
 msgid "Collection"
 msgstr "Kokoelma"
 
-#: ../widgets/menus/gal-define-views-dialog.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:360
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Määrittele näkymät - %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:374
-#: ../widgets/menus/gal-define-views-dialog.c:376
+#: ../widgets/menus/gal-define-views-dialog.c:368
+#: ../widgets/menus/gal-define-views-dialog.c:370
 msgid "Define Views"
 msgstr "Määrittele näkymät"
 
@@ -21096,18 +21249,18 @@ msgstr "Määrittele näkymät"
 msgid "Define Views for \"%s\""
 msgstr "Määrittele %s näkymät"
 
-#: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1912
-#: ../widgets/table/e-table-scrolled.c:222
-#: ../widgets/table/e-table-scrolled.c:223
+#: ../widgets/menus/gal-view-factory-etable.c:37
+#: ../widgets/table/e-table-header-item.c:1910
+#: ../widgets/table/e-table-scrolled.c:216
+#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "Taulu"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:179
 msgid "Instance"
 msgstr "Tapahtumiskerta"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:229
 msgid "Save Current View"
 msgstr "Tallenna nykyinen näkymä"
 
@@ -21120,16 +21273,16 @@ msgid "_Replace existing view"
 msgstr "_Korvaa olemassaoleva näkymä"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-instance.c:582
 #: ../widgets/menus/gal-view-menus.c:354
 msgid "Custom View"
 msgstr "Oma näkymä"
 
-#: ../widgets/menus/gal-view-instance.c:588
+#: ../widgets/menus/gal-view-instance.c:583
 msgid "Save Custom View"
 msgstr "Tallenna oma näkymä"
 
-#: ../widgets/menus/gal-view-instance.c:592
+#: ../widgets/menus/gal-view-instance.c:587
 #: ../widgets/menus/gal-view-menus.c:378
 msgid "Define Views..."
 msgstr "Määrittele näkymät..."
@@ -21159,11 +21312,11 @@ msgstr "Tallenna nykyinen muokattu näkymä"
 msgid "Create or edit views"
 msgstr "Luo tai muokkaa näkymiä"
 
-#: ../widgets/menus/gal-view-new-dialog.c:80
+#: ../widgets/menus/gal-view-new-dialog.c:72
 msgid "Factory"
 msgstr "Tehdas"
 
-#: ../widgets/menus/gal-view-new-dialog.c:115
+#: ../widgets/menus/gal-view-new-dialog.c:107
 msgid "Define New View"
 msgstr "Määrittele uusi näkymä"
 
@@ -21179,7 +21332,7 @@ msgstr "Näkymän tyyppi"
 msgid "Type of view:"
 msgstr "Näkymän tyyppi:"
 
-#: ../widgets/misc/e-attachment-bar.c:1019
+#: ../widgets/misc/e-attachment-bar.c:1028
 msgid "Attachment Bar"
 msgstr "Liitepalkki"
 
@@ -21226,66 +21379,66 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "Kuukausikalenteri"
 
-#: ../widgets/misc/e-canvas-background.c:457
-#: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1235
-#: ../widgets/text/e-entry.c:1236 ../widgets/text/e-text.c:3565
-#: ../widgets/text/e-text.c:3566
+#: ../widgets/misc/e-canvas-background.c:453
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-entry.c:1230
+#: ../widgets/text/e-entry.c:1231 ../widgets/text/e-text.c:3562
+#: ../widgets/text/e-text.c:3563
 msgid "Fill color"
 msgstr "Täytön väri"
 
-#: ../widgets/misc/e-canvas-background.c:464
-#: ../widgets/misc/e-canvas-background.c:465
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-entry.c:1242
-#: ../widgets/text/e-entry.c:1243 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3572
-#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3580
-#: ../widgets/text/e-text.c:3581
+#: ../widgets/misc/e-canvas-background.c:460
+#: ../widgets/misc/e-canvas-background.c:461
+#: ../widgets/misc/e-canvas-background.c:467
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-entry.c:1237
+#: ../widgets/text/e-entry.c:1238 ../widgets/text/e-entry.c:1244
+#: ../widgets/text/e-entry.c:1245 ../widgets/text/e-text.c:3569
+#: ../widgets/text/e-text.c:3570 ../widgets/text/e-text.c:3577
+#: ../widgets/text/e-text.c:3578
 msgid "GDK fill color"
 msgstr "GDK:n täyttöväri"
 
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1256
-#: ../widgets/text/e-entry.c:1257 ../widgets/text/e-text.c:3587
-#: ../widgets/text/e-text.c:3588
+#: ../widgets/misc/e-canvas-background.c:474
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-entry.c:1251
+#: ../widgets/text/e-entry.c:1252 ../widgets/text/e-text.c:3584
+#: ../widgets/text/e-text.c:3585
 msgid "Fill stipple"
 msgstr "Täytön kuviopeite"
 
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486
+#: ../widgets/misc/e-canvas-background.c:481
+#: ../widgets/misc/e-canvas-background.c:482
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493
+#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:489
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
+#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:496
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
+#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:503
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1429
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3017
+#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:635
+#: ../widgets/table/e-table-item.c:3015
 msgid "Minimum width"
 msgstr "Minimileveys"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1430
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3018
+#: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-leaf.c:636
+#: ../widgets/table/e-table-item.c:3016
 msgid "Minimum Width"
 msgstr "Minimileveys"
 
-#: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
+#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
 #: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr "Välistys"
@@ -21472,11 +21625,11 @@ msgstr "Merkintä-elementti"
 msgid "A widget to display in place of the usual expander label"
 msgstr "Tavallisen laajennin-otsikin tilalla näytettävä elementti"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3359
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3354
 msgid "Expander Size"
 msgstr "Laajentimen koko"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3360
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3355
 msgid "Size of the expander arrow"
 msgstr "Laajennusnuolen koko"
 
@@ -21563,15 +21716,15 @@ msgstr "Synkronisoi yksityiset tietueet:"
 msgid "Sync Categories:"
 msgstr "Synkronointiryhmät:"
 
-#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
+#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
 msgid "Empty message"
 msgstr "Tyhjä viesti"
 
-#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
+#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
 msgid "Reflow model"
 msgstr "Uudelleenvirtauksen malli"
 
-#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
+#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
 msgid "Column width"
 msgstr "Sarakkeen leveys"
 
@@ -21591,9 +21744,9 @@ msgstr "_Tyhjennä"
 msgid "Item ID"
 msgstr "Kohteen ID"
 
-#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1221
-#: ../widgets/text/e-entry.c:1222 ../widgets/text/e-text.c:3487
-#: ../widgets/text/e-text.c:3488
+#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1216
+#: ../widgets/text/e-entry.c:1217 ../widgets/text/e-text.c:3484
+#: ../widgets/text/e-text.c:3485
 msgid "Text"
 msgstr "Teksti"
 
@@ -21615,25 +21768,25 @@ msgstr "_Etsi: "
 msgid " i_n "
 msgstr " lä_hteestä "
 
-#: ../widgets/misc/e-selection-model-array.c:547
-#: ../widgets/table/e-tree-selection-model.c:811
+#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "Kohdistimen rivi"
 
-#: ../widgets/misc/e-selection-model-array.c:554
-#: ../widgets/table/e-tree-selection-model.c:818
+#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "Kohdistimen sarake"
 
-#: ../widgets/misc/e-selection-model.c:214
+#: ../widgets/misc/e-selection-model.c:210
 msgid "Sorter"
 msgstr "Järjestäjä"
 
-#: ../widgets/misc/e-selection-model.c:221
+#: ../widgets/misc/e-selection-model.c:217
 msgid "Selection Mode"
 msgstr "Valintatila"
 
-#: ../widgets/misc/e-selection-model.c:229
+#: ../widgets/misc/e-selection-model.c:225
 msgid "Cursor Mode"
 msgstr "Kohdistintila"
 
@@ -21802,43 +21955,43 @@ msgstr "Valittavat _luokat:"
 msgid "categories"
 msgstr "luokat"
 
-#: ../widgets/table/e-cell-combo.c:177
+#: ../widgets/table/e-cell-combo.c:169
 msgid "popup list"
 msgstr "ponnahduslista"
 
-#: ../widgets/table/e-cell-date.c:64
+#: ../widgets/table/e-cell-date.c:62
 msgid "%l:%M %p"
 msgstr "%l.%M %p"
 
-#: ../widgets/table/e-cell-pixbuf.c:387
+#: ../widgets/table/e-cell-pixbuf.c:383
 msgid "Selected Column"
 msgstr "Valittu sarake"
 
-#: ../widgets/table/e-cell-pixbuf.c:394
+#: ../widgets/table/e-cell-pixbuf.c:390
 msgid "Focused Column"
 msgstr "Kohdistettu sarake"
 
-#: ../widgets/table/e-cell-pixbuf.c:401
+#: ../widgets/table/e-cell-pixbuf.c:397
 msgid "Unselected Column"
 msgstr "Valitsematon sarake"
 
-#: ../widgets/table/e-cell-text.c:1802
+#: ../widgets/table/e-cell-text.c:1798
 msgid "Strikeout Column"
 msgstr "Yliviivattu sarake"
 
-#: ../widgets/table/e-cell-text.c:1809
+#: ../widgets/table/e-cell-text.c:1805
 msgid "Underline Column"
 msgstr "Alleviivaa sarake"
 
-#: ../widgets/table/e-cell-text.c:1816
+#: ../widgets/table/e-cell-text.c:1812
 msgid "Bold Column"
 msgstr "Vahva sarake"
 
-#: ../widgets/table/e-cell-text.c:1823
+#: ../widgets/table/e-cell-text.c:1819
 msgid "Color Column"
 msgstr "Värillinen sarake"
 
-#: ../widgets/table/e-cell-text.c:1837
+#: ../widgets/table/e-cell-text.c:1833
 msgid "BG Color Column"
 msgstr "Taustan värinen sarake"
 
@@ -21853,7 +22006,7 @@ msgstr "Valittavat kentät:"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:3
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1580
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Ascending"
 msgstr "Nouseva"
 
@@ -21864,7 +22017,7 @@ msgstr "Tyhjennä merkki"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:5
 #: ../widgets/table/e-table-config.glade.h:4
-#: ../widgets/table/e-table-header-item.c:1580
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Descending"
 msgstr "Laskeva"
 
@@ -21888,7 +22041,7 @@ msgid "Sh_ow these fields in order:"
 msgstr "_Näytä nämä kentät järjestyksessä:"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:12
-#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.c:641
 #: ../widgets/table/e-table-config.glade.h:10
 msgid "Show Fields"
 msgstr "Näytä kentät"
@@ -21927,27 +22080,27 @@ msgstr "_Näytettävät kentät..."
 msgid "_Sort..."
 msgstr "_Järjestä..."
 
-#: ../widgets/table/e-table-config.c:154
+#: ../widgets/table/e-table-config.c:152
 msgid "State"
 msgstr "Tila"
 
-#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(nouseva)"
 
-#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(laskeva)"
 
-#: ../widgets/table/e-table-config.c:394
+#: ../widgets/table/e-table-config.c:392
 msgid "Not sorted"
 msgstr "Ei järjestetty"
 
-#: ../widgets/table/e-table-config.c:435
+#: ../widgets/table/e-table-config.c:433
 msgid "No grouping"
 msgstr "Ei ryhmitystä"
 
-#: ../widgets/table/e-table-config.c:664
+#: ../widgets/table/e-table-config.c:662
 msgid "Available Fields"
 msgstr "Valittavat kentät"
 
@@ -21959,21 +22112,21 @@ msgstr "_Ryhmittele..."
 msgid "_Show these fields in order:"
 msgstr "_Näytä kentät järjestyksessä:"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:77
-#: ../widgets/table/e-table-field-chooser-item.c:637
-#: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1877
+#: ../widgets/table/e-table-field-chooser-dialog.c:67
+#: ../widgets/table/e-table-field-chooser-item.c:636
+#: ../widgets/table/e-table-field-chooser.c:67
+#: ../widgets/table/e-table-header-item.c:1875
 msgid "DnD code"
 msgstr "DnD-koodi"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:84
-#: ../widgets/table/e-table-field-chooser-item.c:644
-#: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1891
+#: ../widgets/table/e-table-field-chooser-dialog.c:74
+#: ../widgets/table/e-table-field-chooser-item.c:643
+#: ../widgets/table/e-table-field-chooser.c:74
+#: ../widgets/table/e-table-header-item.c:1889
 msgid "Full Header"
 msgstr "Täysi otsake"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:126
+#: ../widgets/table/e-table-field-chooser-dialog.c:116
 msgid "Add a column..."
 msgstr "Lisää sarake..."
 
@@ -22003,304 +22156,331 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d kohta)"
 msgstr[1] "%s (%d kohtaa)"
 
+#: ../widgets/table/e-table-group-container.c:896
 #: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-container.c:898
+#: ../widgets/table/e-table-group-leaf.c:572
 #: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2975 ../widgets/table/e-table-item.c:2976
+#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
 msgid "Alternating Row Colors"
 msgstr "Vaihtelevat rivien värit"
 
+#: ../widgets/table/e-table-group-container.c:903
 #: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-container.c:905
+#: ../widgets/table/e-table-group-leaf.c:579
 #: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2982 ../widgets/table/e-table-item.c:2983
-#: ../widgets/table/e-tree.c:3312 ../widgets/table/e-tree.c:3313
+#: ../widgets/table/e-table-item.c:2980 ../widgets/table/e-table-item.c:2981
+#: ../widgets/table/e-tree.c:3307 ../widgets/table/e-tree.c:3308
 msgid "Horizontal Draw Grid"
 msgstr "Vaakasuuntainen piirtoristikko"
 
+#: ../widgets/table/e-table-group-container.c:910
 #: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-container.c:912
+#: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2989 ../widgets/table/e-table-item.c:2990
-#: ../widgets/table/e-tree.c:3318 ../widgets/table/e-tree.c:3319
+#: ../widgets/table/e-table-item.c:2987 ../widgets/table/e-table-item.c:2988
+#: ../widgets/table/e-tree.c:3313 ../widgets/table/e-tree.c:3314
 msgid "Vertical Draw Grid"
 msgstr "Pystysuuntainen piirtoristikko"
 
+#: ../widgets/table/e-table-group-container.c:917
 #: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-container.c:919
+#: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2996 ../widgets/table/e-table-item.c:2997
-#: ../widgets/table/e-tree.c:3324 ../widgets/table/e-tree.c:3325
+#: ../widgets/table/e-table-item.c:2994 ../widgets/table/e-table-item.c:2995
+#: ../widgets/table/e-tree.c:3319 ../widgets/table/e-tree.c:3320
 msgid "Draw focus"
 msgstr "Piirron kohdistin"
 
+#: ../widgets/table/e-table-group-container.c:924
 #: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-container.c:926
+#: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:3003 ../widgets/table/e-table-item.c:3004
+#: ../widgets/table/e-table-item.c:3001 ../widgets/table/e-table-item.c:3002
 msgid "Cursor mode"
 msgstr "Kursorin tila"
 
+#: ../widgets/table/e-table-group-container.c:931
 #: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
+#: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2968 ../widgets/table/e-table-item.c:2969
+#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
 msgid "Selection model"
 msgstr "Valintamalli"
 
+#: ../widgets/table/e-table-group-container.c:938
 #: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
+#: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:3010 ../widgets/table/e-table-item.c:3011
-#: ../widgets/table/e-table.c:3312 ../widgets/table/e-tree.c:3306
-#: ../widgets/table/e-tree.c:3307
+#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3301
+#: ../widgets/table/e-tree.c:3302
 msgid "Length Threshold"
 msgstr "Pituuden raja-arvo"
 
+#: ../widgets/table/e-table-group-container.c:945
 #: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
+#: ../widgets/table/e-table-group-leaf.c:649
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3044 ../widgets/table/e-table-item.c:3045
-#: ../widgets/table/e-table.c:3319 ../widgets/table/e-tree.c:3338
-#: ../widgets/table/e-tree.c:3339
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3333
+#: ../widgets/table/e-tree.c:3334
 msgid "Uniform row height"
 msgstr "Yhtenäinen rivinkorkeus"
 
+#: ../widgets/table/e-table-group-container.c:952
 #: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
+#: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-group-leaf.c:644
 msgid "Frozen"
 msgstr "Jäädytetty"
 
-#: ../widgets/table/e-table-header-item.c:1457
+#: ../widgets/table/e-table-header-item.c:1456
 msgid "Customize Current View"
 msgstr "Muokkaa nykyistä näkymää"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Sort _Ascending"
 msgstr "järjestä _nousevasti"
 
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Sort _Descending"
 msgstr "Järjestä _laskevasti"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "_Unsort"
 msgstr "Poista _järjestys"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Group By This _Field"
 msgstr "Ryhmittele tämän _kentän mukaan"
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Group By _Box"
 msgstr "Ryhmittele _laatikoittain"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "Remove This _Column"
 msgstr "Poista tämä sa_rake"
 
-#: ../widgets/table/e-table-header-item.c:1485
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "Add a C_olumn..."
 msgstr "Lisää sarake..."
 
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "A_lignment"
 msgstr "_Tasaus"
 
-#: ../widgets/table/e-table-header-item.c:1488
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "B_est Fit"
 msgstr "_Paras sovitus"
 
-#: ../widgets/table/e-table-header-item.c:1489
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Format Column_s..."
 msgstr "Muotoile _sarakkeet..."
 
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Custo_mize Current View..."
 msgstr "_Mukauta nykyistä näkymää..."
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1540
 msgid "Sort By"
 msgstr "Järjestä kentän mukaan"
 
-#: ../widgets/table/e-table-header-item.c:1884
+#: ../widgets/table/e-table-header-item.c:1882
 msgid "Font Description"
 msgstr "Kirjasimen kuvaus"
 
-#: ../widgets/table/e-table-header-item.c:1905
-#: ../widgets/table/e-table-sorter.c:175
+#: ../widgets/table/e-table-header-item.c:1903
+#: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "Tietoja järjestyksestä"
 
-#: ../widgets/table/e-table-header-item.c:1919
-#: ../widgets/table/e-tree-scrolled.c:231
-#: ../widgets/table/e-tree-scrolled.c:232
+#: ../widgets/table/e-table-header-item.c:1917
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "Puu"
 
-#: ../widgets/table/e-table-item.c:2954 ../widgets/table/e-table-item.c:2955
+#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
 msgid "Table header"
 msgstr "Taulukon otsikko"
 
-#: ../widgets/table/e-table-item.c:2961 ../widgets/table/e-table-item.c:2962
+#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
 msgid "Table model"
 msgstr "Taulumalli"
 
-#: ../widgets/table/e-table-item.c:3037 ../widgets/table/e-table-item.c:3038
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
 msgid "Cursor row"
 msgstr "Kohdistimen rivi"
 
-#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3345
-#: ../widgets/table/e-tree.c:3346
+#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3340
+#: ../widgets/table/e-tree.c:3341
 msgid "Always search"
 msgstr "Hae aina"
 
-#: ../widgets/table/e-table.c:3333
+#: ../widgets/table/e-table.c:3328
 msgid "Use click to add"
 msgstr "Lisää napsauttamalla"
 
-#: ../widgets/table/e-tree.c:3331 ../widgets/table/e-tree.c:3332
+#: ../widgets/table/e-tree.c:3326 ../widgets/table/e-tree.c:3327
 msgid "ETree table adapter"
 msgstr "ETree-taulukon adapteri"
 
-#: ../widgets/table/e-tree.c:3352
+#: ../widgets/table/e-tree.c:3347
 msgid "Retro Look"
 msgstr "Retro-ulkoasu"
 
-#: ../widgets/table/e-tree.c:3353
+#: ../widgets/table/e-tree.c:3348
 msgid "Draw lines and +/- expanders."
 msgstr "Piirrä viivat ja +/- laajentimet."
 
-#: ../widgets/text/e-entry.c:1214 ../widgets/text/e-entry.c:1215
-#: ../widgets/text/e-text.c:3480 ../widgets/text/e-text.c:3481
+#: ../widgets/text/e-entry.c:1209 ../widgets/text/e-entry.c:1210
+#: ../widgets/text/e-text.c:3477 ../widgets/text/e-text.c:3478
 msgid "Event Processor"
 msgstr "Tapahtumaprosessori"
 
-#: ../widgets/text/e-entry.c:1228 ../widgets/text/e-entry.c:1229
-#: ../widgets/text/e-text.c:3516 ../widgets/text/e-text.c:3517
+#: ../widgets/text/e-entry.c:1223 ../widgets/text/e-entry.c:1224
+#: ../widgets/text/e-text.c:3513 ../widgets/text/e-text.c:3514
 msgid "Justification"
 msgstr "Asemointi"
 
-#: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
-#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
+#: ../widgets/text/e-entry.c:1265 ../widgets/text/e-entry.c:1266
+#: ../widgets/text/e-text.c:3613 ../widgets/text/e-text.c:3614
 msgid "Use ellipsis"
 msgstr "Käytä ellipsejä"
 
-#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
+#: ../widgets/text/e-entry.c:1272 ../widgets/text/e-entry.c:1273
+#: ../widgets/text/e-text.c:3620 ../widgets/text/e-text.c:3621
 msgid "Ellipsis"
 msgstr "Ellipsit"
 
-#: ../widgets/text/e-entry.c:1284 ../widgets/text/e-entry.c:1285
-#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
+#: ../widgets/text/e-entry.c:1279 ../widgets/text/e-entry.c:1280
+#: ../widgets/text/e-text.c:3627 ../widgets/text/e-text.c:3628
 msgid "Line wrap"
 msgstr "Rivitys"
 
-#: ../widgets/text/e-entry.c:1291 ../widgets/text/e-entry.c:1292
-#: ../widgets/text/e-text.c:3637 ../widgets/text/e-text.c:3638
+#: ../widgets/text/e-entry.c:1286 ../widgets/text/e-entry.c:1287
+#: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
 msgid "Break characters"
 msgstr "Katkaisevat merkit"
 
-#: ../widgets/text/e-entry.c:1298 ../widgets/text/e-entry.c:1299
-#: ../widgets/text/e-text.c:3644 ../widgets/text/e-text.c:3645
+#: ../widgets/text/e-entry.c:1293 ../widgets/text/e-entry.c:1294
+#: ../widgets/text/e-text.c:3641 ../widgets/text/e-text.c:3642
 msgid "Max lines"
 msgstr "Rivejä enintään"
 
-#: ../widgets/text/e-entry.c:1305 ../widgets/text/e-entry.c:1306
-#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-entry.c:1300 ../widgets/text/e-entry.c:1301
+#: ../widgets/text/e-text.c:3670 ../widgets/text/e-text.c:3671
 msgid "Allow newlines"
 msgstr "Salli rivinvaihdot"
 
-#: ../widgets/text/e-entry.c:1312 ../widgets/text/e-entry.c:1313
-#: ../widgets/text/e-text.c:3666 ../widgets/text/e-text.c:3667
+#: ../widgets/text/e-entry.c:1307 ../widgets/text/e-entry.c:1308
+#: ../widgets/text/e-text.c:3663 ../widgets/text/e-text.c:3664
 msgid "Draw borders"
 msgstr "Piirrä reunat"
 
-#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681
+#: ../widgets/text/e-entry.c:1314 ../widgets/text/e-entry.c:1315
+#: ../widgets/text/e-text.c:3677 ../widgets/text/e-text.c:3678
 msgid "Draw background"
 msgstr "Piirrä tausta"
 
-#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3687 ../widgets/text/e-text.c:3688
+#: ../widgets/text/e-entry.c:1321 ../widgets/text/e-entry.c:1322
+#: ../widgets/text/e-text.c:3684 ../widgets/text/e-text.c:3685
 msgid "Draw button"
 msgstr "Piirrä nappi"
 
-#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
+#: ../widgets/text/e-entry.c:1328 ../widgets/text/e-entry.c:1329
+#: ../widgets/text/e-text.c:3691 ../widgets/text/e-text.c:3692
 msgid "Cursor position"
 msgstr "Kohdistimen sijainti"
 
-#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
+#: ../widgets/text/e-entry.c:1335 ../widgets/text/e-entry.c:1336
 msgid "Emulate label resize"
 msgstr "Emuloi otsikon koon muutosta"
 
-#: ../widgets/text/e-text.c:2727
+#: ../widgets/text/e-text.c:2726
 msgid "Input Methods"
 msgstr "Syötemenetelmät"
 
-#: ../widgets/text/e-text.c:3494 ../widgets/text/e-text.c:3495
+#: ../widgets/text/e-text.c:3491 ../widgets/text/e-text.c:3492
 msgid "Bold"
 msgstr "Vahva"
 
-#: ../widgets/text/e-text.c:3501 ../widgets/text/e-text.c:3502
+#: ../widgets/text/e-text.c:3498 ../widgets/text/e-text.c:3499
 msgid "Strikeout"
 msgstr "Yliviivattu"
 
-#: ../widgets/text/e-text.c:3508 ../widgets/text/e-text.c:3509
+#: ../widgets/text/e-text.c:3505 ../widgets/text/e-text.c:3506
 msgid "Anchor"
 msgstr "Ankkuri"
 
-#: ../widgets/text/e-text.c:3523 ../widgets/text/e-text.c:3524
+#: ../widgets/text/e-text.c:3520 ../widgets/text/e-text.c:3521
 msgid "Clip Width"
 msgstr "Leikkeen leveys"
 
-#: ../widgets/text/e-text.c:3530 ../widgets/text/e-text.c:3531
+#: ../widgets/text/e-text.c:3527 ../widgets/text/e-text.c:3528
 msgid "Clip Height"
 msgstr "Leikkeen korkeus"
 
-#: ../widgets/text/e-text.c:3537 ../widgets/text/e-text.c:3538
+#: ../widgets/text/e-text.c:3534 ../widgets/text/e-text.c:3535
 msgid "Clip"
 msgstr "Leike"
 
-#: ../widgets/text/e-text.c:3544 ../widgets/text/e-text.c:3545
+#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
 msgid "Fill clip rectangle"
 msgstr "Täytä leikkauksen suorakulmio"
 
-#: ../widgets/text/e-text.c:3551 ../widgets/text/e-text.c:3552
+#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
 msgid "X Offset"
 msgstr "X-offset"
 
-#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
+#: ../widgets/text/e-text.c:3555 ../widgets/text/e-text.c:3556
 msgid "Y Offset"
 msgstr "Y-offset"
 
-#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
+#: ../widgets/text/e-text.c:3591 ../widgets/text/e-text.c:3592
 msgid "Text width"
 msgstr "Tekstin leveys"
 
-#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
+#: ../widgets/text/e-text.c:3598 ../widgets/text/e-text.c:3599
 msgid "Text height"
 msgstr "Tekstin korkeus"
 
-#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
+#: ../widgets/text/e-text.c:3698 ../widgets/text/e-text.c:3699
 msgid "IM Context"
 msgstr "IM-konteksti"
 
-#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
+#: ../widgets/text/e-text.c:3705 ../widgets/text/e-text.c:3706
 msgid "Handle Popup"
 msgstr "Kahvan ponnahdusikkuna"
 
+#~ msgid "<b>Then</b>"
+#~ msgstr "<b>Silloin</b>"
+
+#~ msgid "Mark as _Read"
+#~ msgstr "Merkitse _luetuksi"
+
+#~ msgid "_Do not Mark as Read"
+#~ msgstr "Älä merkitse _luetuksi"
+
+#~ msgid "<b>Junk Mail Settings</b>"
+#~ msgstr "<b>Roskapostin asetukset</b>"
+
+#~ msgid "<b>Subject</b> :"
+#~ msgstr "<b>Aihe/</b> :"
+
+#~ msgid "<b>From</b> :"
+#~ msgstr "<b>Lähettäjä</b> :"
+
+#~ msgid "You have received %d new messages in %s."
+#~ msgstr "%d uutta viesti' kansiossa %s."
+
+#~ msgid "Select Drafts Folder"
+#~ msgstr "Valitse luonnosten kansio"
+
+#~ msgid "Select Sent Folder"
+#~ msgstr "Valitse lähetettyjen kansio"
+
 #~ msgid "_Address: "
 #~ msgstr "_Osoite: "
 
@@ -22760,9 +22940,6 @@ msgstr "Kahvan ponnahdusikkuna"
 #~ msgid "Dele_gatees"
 #~ msgstr "_Valtuutetut"
 
-#~ msgid "From:"
-#~ msgstr "Lähettäjä:"
-
 #~ msgid "Properties..."
 #~ msgstr "Ominaisuudet..."