Updated Finnish translation

svn path=/trunk/; revision=30962
author: Ilkka Tuohela <ituohela@src.gnome.org> 2005-12-27 14:05:40 +0800
committer: Ilkka Tuohela <ituohela@src.gnome.org> 2005-12-27 14:05:40 +0800
commit: 270c3240c4e083862711da9d0885d26cb808a03b (patch)
tree: 006e808e7f6153187d0ce30ff910a8e7ba67048c
parent: e95b0d8edfee6a5cd259d0c42f4e57177b036f90 (diff)
download: gsoc2013-evolution-270c3240c4e083862711da9d0885d26cb808a03b.tar
gsoc2013-evolution-270c3240c4e083862711da9d0885d26cb808a03b.tar.gz
gsoc2013-evolution-270c3240c4e083862711da9d0885d26cb808a03b.tar.bz2
gsoc2013-evolution-270c3240c4e083862711da9d0885d26cb808a03b.tar.lz
gsoc2013-evolution-270c3240c4e083862711da9d0885d26cb808a03b.tar.xz
gsoc2013-evolution-270c3240c4e083862711da9d0885d26cb808a03b.tar.zst
gsoc2013-evolution-270c3240c4e083862711da9d0885d26cb808a03b.zip
2 files changed, 1653 insertions, 1434 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index bb77901ae5..26d417bed4 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-27  Ilkka Tuohela  <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
 2005-12-26  Adam Weinberger  <adamw@gnome.org>
 
 	* en_CA.po: Updated Canadian English translation.
diff --git a/po/fi.po b/po/fi.po
index dc8bf895a2..67283caa96 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-15 19:01+0200\n"
-"PO-Revision-Date: 2005-12-15 20:58+0200\n"
+"POT-Creation-Date: 2005-12-27 07:31+0200\n"
+"PO-Revision-Date: 2005-12-27 08:04+0200\n"
 "Last-Translator: Ilkka Tuohela <hile@iki.fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -24,12 +24,12 @@ msgid "evolution addressbook"
 msgstr "Evolutionin osoitekirja"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "New Contact"
 msgstr "Uusi yhteystieto"
 
 #: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../addressbook/gui/component/addressbook-component.c:234
 msgid "New Contact List"
 msgstr "Uusi yhteystietoluettelo"
 
@@ -192,7 +192,7 @@ msgstr "%d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:247
 #: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:738
+#: ../calendar/importers/icalendar-importer.c:772
 msgid "Gnome Calendar"
 msgstr "Gnome alenteri"
 
@@ -394,7 +394,6 @@ msgid "Server Version"
 msgstr "Palvelimen versio"
 
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../calendar/calendar.error.xml.h:44
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "Jotkut ominaisuudet eivät välttämättä toimi oikein palvelimesi nykyisen "
@@ -469,7 +468,6 @@ msgstr ""
 "poistaa lähdeosoitekirjasta. Haluatko sen sijaan tallentaa kopion?"
 
 #: ../addressbook/addressbook.error.xml.h:30
-#: ../calendar/calendar.error.xml.h:61
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -493,7 +491,7 @@ msgstr ""
 "Yhteystietoja {0} ei voida käyttää ennen kuin Evolution käynnistetään "
 "uudestaan."
 
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:495
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
@@ -546,7 +544,7 @@ 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:1186
-#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
+#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:393
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
@@ -584,13 +582,13 @@ msgstr "Hallitse S/Mime varmenteitasi"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:137
-#: ../addressbook/gui/component/addressbook-migrate.c:502
+#: ../addressbook/gui/component/addressbook-component.c:141
+#: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../calendar/gui/calendar-component.c:208
-#: ../calendar/gui/memos-component.c:192 ../calendar/gui/migration.c:462
-#: ../calendar/gui/migration.c:555 ../calendar/gui/migration.c:1057
-#: ../calendar/gui/tasks-component.c:188 ../mail/em-folder-tree-model.c:197
-#: ../mail/em-folder-tree-model.c:199 ../mail/mail-component.c:292
+#: ../calendar/gui/memos-component.c:193 ../calendar/gui/migration.c:467
+#: ../calendar/gui/migration.c:560 ../calendar/gui/migration.c:1061
+#: ../calendar/gui/tasks-component.c:189 ../mail/em-folder-tree-model.c:198
+#: ../mail/em-folder-tree-model.c:200 ../mail/mail-component.c:298
 #: ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "Tällä tietokoneella"
@@ -600,54 +598,54 @@ msgstr "Tällä tietokoneella"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:145
-#: ../addressbook/gui/component/addressbook-migrate.c:510
+#: ../addressbook/gui/component/addressbook-component.c:149
+#: ../addressbook/gui/component/addressbook-migrate.c:515
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../calendar/gui/calendar-component.c:216
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:470
-#: ../calendar/gui/migration.c:563 ../calendar/gui/migration.c:1065
-#: ../calendar/gui/tasks-component.c:196 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1043 ../mail/mail-config.c:78
+#: ../calendar/gui/memos-component.c:201 ../calendar/gui/migration.c:475
+#: ../calendar/gui/migration.c:568 ../calendar/gui/migration.c:1069
+#: ../calendar/gui/tasks-component.c:197 ../filter/filter-label.c:123
+#: ../mail/em-migrate.c:1053 ../mail/mail-config.c:86
 #: ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:155
-#: ../addressbook/gui/component/addressbook-migrate.c:520
+#: ../addressbook/gui/component/addressbook-component.c:159
+#: ../addressbook/gui/component/addressbook-migrate.c:525
 msgid "On LDAP Servers"
 msgstr "LDAP-palvelimilla"
 
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../addressbook/gui/component/addressbook-component.c:227
 msgid "_Contact"
 msgstr "_Yhteystieto"
 
-#: ../addressbook/gui/component/addressbook-component.c:227
+#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "Create a new contact"
 msgstr "Luo uusi yhteystieto"
 
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../addressbook/gui/component/addressbook-component.c:235
 msgid "Contact _List"
 msgstr "_Yhteystietoluettelo"
 
-#: ../addressbook/gui/component/addressbook-component.c:235
+#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "Create a new contact list"
 msgstr "Luo uusi yhteystietoluettelo"
 
-#: ../addressbook/gui/component/addressbook-component.c:241
+#: ../addressbook/gui/component/addressbook-component.c:242
 #: ../addressbook/gui/component/addressbook-config.c:1202
 msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
-#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-component.c:243
 msgid "Address _Book"
 msgstr "_Osoitekirja"
 
-#: ../addressbook/gui/component/addressbook-component.c:243
+#: ../addressbook/gui/component/addressbook-component.c:244
 msgid "Create a new address book"
 msgstr "Luo uusi osoitekirja"
 
-#: ../addressbook/gui/component/addressbook-component.c:385
+#: ../addressbook/gui/component/addressbook-component.c:386
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Osoitekirjan asetusten tai kansioiden päivitys epäonnistui."
 
@@ -667,7 +665,7 @@ msgstr "Kopioi kirjan sisältö paikallisesti yhteydettömään käyttöön"
 
 #: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 #: ../calendar/gui/dialogs/calendar-setup.c:390
@@ -677,7 +675,7 @@ msgid "General"
 msgstr "Yleiset"
 
 #: ../addressbook/gui/component/addressbook-config.c:982
-#: ../mail/importers/pine-importer.c:393
+#: ../mail/importers/pine-importer.c:392
 msgid "Addressbook"
 msgstr "Osoitekirja"
 
@@ -708,26 +706,26 @@ msgstr "Haetaan"
 msgid "Address Book Properties"
 msgstr "Osoitekirjan ominaisuudet"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:72
-#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1190
+#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../calendar/gui/migration.c:147 ../mail/em-migrate.c:1200
 msgid "Migrating..."
 msgstr "Siirretään..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:124
-#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1231
+#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../calendar/gui/migration.c:194 ../mail/em-migrate.c:1241
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Siirretään  '%s'"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:648
+#: ../addressbook/gui/component/addressbook-migrate.c:653
 msgid "LDAP Servers"
 msgstr "LDAP-palvelimet"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:763
+#: ../addressbook/gui/component/addressbook-migrate.c:768
 msgid "Autocompletion Settings"
 msgstr "Automaattisen täydennyksen asetukset"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1134
+#: ../addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -739,7 +737,7 @@ msgstr ""
 "\n"
 "Odota kärsivällisesti, kun Evolution siirtää kansioitasi..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1148
+#: ../addressbook/gui/component/addressbook-migrate.c:1157
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -749,7 +747,7 @@ msgstr ""
 "\n"
 "Odota kärsivällisesti, kun Evolution muuntaa kansioitasi..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1166
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -759,7 +757,7 @@ msgstr ""
 "\n"
 "Odota kärsivällisesti kun Evolution muuntaa kansioitasi..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1167
+#: ../addressbook/gui/component/addressbook-migrate.c:1176
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -777,18 +775,18 @@ msgstr "_Uusi osoitekirja"
 #: ../addressbook/gui/component/addressbook-view.c:770
 #: ../addressbook/gui/widgets/e-addressbook-view.c:966
 #: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/e-calendar-table.c:1194
-#: ../calendar/gui/e-calendar-view.c:1583 ../calendar/gui/e-memo-table.c:869
-#: ../calendar/gui/tasks-component.c:441 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1050 ../ui/evolution-addressbook.xml.h:34
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
+#: ../calendar/gui/e-calendar-table.c:1196
+#: ../calendar/gui/e-calendar-view.c:1573 ../calendar/gui/e-memo-table.c:871
+#: ../calendar/gui/tasks-component.c:442 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:34
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-mail-list.xml.h:27
 #: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Poista"
 
 #: ../addressbook/gui/component/addressbook-view.c:772
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/tasks-component.c:442
+#: ../calendar/gui/tasks-component.c:443
 msgid "_Properties..."
 msgstr "_Ominaisuudet..."
 
@@ -910,7 +908,7 @@ msgid "Add Address Book"
 msgstr "Lisää osoitekirja"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
+#: ../mail/em-account-editor.c:304 ../mail/em-account-editor.c:767
 msgid "Always"
 msgstr "Aina"
 
@@ -946,7 +944,7 @@ msgid "Lo_gin:"
 msgstr "_Kirjautuminen:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
+#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:766
 msgid "Never"
 msgstr "Ei koskaan"
 
@@ -976,9 +974,8 @@ msgid ""
 "search. If this is not modified, by  default search will be performed on "
 "objectclass of the type \"person\"."
 msgstr ""
-"Haun suodatin on haettavien kohteiden tyyppi suoritettaessa hakua. "
-"Jos asetusta ei muuteta, haetaan oletuksena \"person\"-tyypin "
-"kohderyhmästä."
+"Haun suodatin on haettavien kohteiden tyyppi suoritettaessa hakua. Jos "
+"asetusta ei muuteta, haetaan oletuksena \"person\"-tyypin kohderyhmästä."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
@@ -1091,7 +1088,7 @@ msgid "Using email address"
 msgstr "Käytetään sähköpostiosoitetta"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:45
-#: ../mail/em-account-editor.c:301
+#: ../mail/em-account-editor.c:303
 msgid "Whenever Possible"
 msgstr "Milloin mahdollista"
 
@@ -1120,6 +1117,7 @@ msgid "_Name:"
 msgstr "_Nimi:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_Port:"
 msgstr "_Portti:"
 
@@ -1129,6 +1127,7 @@ msgstr "_Hakualue:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../mail/mail-config.glade.h:171
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Palvelin: "
 
@@ -1152,7 +1151,7 @@ msgstr "kortteja"
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:111
 #: ../calendar/gui/misc.c:113 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:1951
+#: ../mail/em-account-editor.c:1987
 #: ../plugins/calendar-http/calendar-http.c:263
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
@@ -1164,7 +1163,6 @@ msgstr "minuutti"
 #: ../addressbook/gui/contact-editor/im.glade.h:1
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:1
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:1
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
@@ -1277,8 +1275,8 @@ msgstr "Puhelin"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:202
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
-#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:153
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1052
+#: ../mail/mail-config.c:85 ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Työ"
 
@@ -1305,7 +1303,7 @@ msgid "_Calendar:"
 msgstr "_Kalenteri:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../ui/evolution-event-editor.xml.h:26 ../ui/evolution-task-editor.xml.h:18
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "_Ryhmät"
 
@@ -1411,7 +1409,7 @@ msgstr "Osoite"
 #: ../addressbook/gui/widgets/e-minicard-view.c:520
 #: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1768 ../widgets/text/e-entry.c:1312
+#: ../widgets/table/e-cell-text.c:1770 ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3584
 #: ../widgets/text/e-text.c:3585
 msgid "Editable"
@@ -2389,7 +2387,7 @@ msgstr "Zimbabwe"
 #: ../plugins/exchange-operations/exchange-delegates.c:936
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:717
 #: ../plugins/plugin-manager/plugin-manager.c:44
-#: ../plugins/save-attachments/save-attachments.c:362
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Nimi"
@@ -2419,8 +2417,8 @@ msgid "Service"
 msgstr "Palvelu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:594
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../plugins/publish-calendar/publish-calendar.c:455
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Sijainti"
@@ -2809,13 +2807,13 @@ msgid "Email begins with"
 msgstr "Sähköposti alkaa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:172
-#: ../calendar/gui/cal-search-bar.c:53
+#: ../calendar/gui/cal-search-bar.c:50
 msgid "Category is"
 msgstr "Luokka on"
 
 #. We attach subitems below
 #: ../addressbook/gui/widgets/e-addressbook-view.c:173
-#: ../calendar/gui/cal-search-bar.c:48
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Any field contains"
 msgstr "Mikä tahansa kenttä sisältää"
 
@@ -2848,9 +2846,9 @@ msgid "Save as VCard..."
 msgstr "Tallenna VCardina..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:944
-#: ../calendar/gui/dialogs/comp-editor.c:1055
-#: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1563 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/dialogs/comp-editor.c:1069
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1553 ../calendar/gui/e-memo-table.c:854
 #: ../ui/evolution-addressbook.xml.h:38
 msgid "_Open"
 msgstr "_Avaa"
@@ -2907,14 +2905,14 @@ msgstr "_Leikkaa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:964
 #: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/dialogs/comp-editor.c:432
-#: ../calendar/gui/e-calendar-table.c:1182
-#: ../calendar/gui/e-calendar-view.c:1570 ../calendar/gui/e-memo-table.c:860
-#: ../calendar/gui/tasks-component.c:440 ../composer/e-msg-composer.c:3075
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1036
-#: ../mail/message-list.c:1718 ../ui/evolution-addressbook.xml.h:32
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
+#: ../calendar/gui/dialogs/comp-editor.c:433
+#: ../calendar/gui/e-calendar-table.c:1184
+#: ../calendar/gui/e-calendar-view.c:1560 ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/tasks-component.c:441 ../composer/e-msg-composer.c:3074
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1716 ../ui/evolution-addressbook.xml.h:32
+#: ../ui/evolution-calendar.xml.h:38 ../ui/evolution-composer-entries.xml.h:7
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:105
 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopioi"
@@ -3337,10 +3335,10 @@ msgstr "Protokolla ei ole tuettu"
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:61
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:232
-#: ../calendar/gui/e-cal-model-tasks.c:348
-#: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2375
+#: ../calendar/gui/e-cal-component-preview.c:234
+#: ../calendar/gui/e-cal-model-tasks.c:349
+#: ../calendar/gui/e-cal-model-tasks.c:662
+#: ../calendar/gui/e-calendar-table.c:464 ../calendar/gui/print.c:2375
 msgid "Cancelled"
 msgstr "Peruutettu"
 
@@ -3642,9 +3640,9 @@ msgid "GTK Tree View"
 msgstr "GTK puunäkymä"
 
 #: ../addressbook/importers/evolution-ldif-importer.c:583
-#: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:311
-#: ../calendar/importers/icalendar-importer.c:643 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-vcard-importer.c:250
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
 msgid "Importing ..."
 msgstr "Tuodaan..."
 
@@ -3656,11 +3654,11 @@ msgstr "LDAP-tiedostonvaihtomuoto (.ldif)"
 msgid "Evolution LDIF importer"
 msgstr "Evolutionin LDIF-tuoja"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:536
+#: ../addressbook/importers/evolution-vcard-importer.c:554
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:537
+#: ../addressbook/importers/evolution-vcard-importer.c:555
 msgid "Evolution VCard Importer"
 msgstr "Evolutionin VCard-tuoja"
 
@@ -3669,12 +3667,12 @@ msgstr "Evolutionin VCard-tuoja"
 msgid "Print envelope"
 msgstr "Tulosta kirjekuori"
 
-#: ../addressbook/printing/e-contact-print.c:1027
+#: ../addressbook/printing/e-contact-print.c:1033
 msgid "Print contacts"
 msgstr "Tulosta yhteystiedot"
 
-#: ../addressbook/printing/e-contact-print.c:1118
-#: ../addressbook/printing/e-contact-print.c:1146
+#: ../addressbook/printing/e-contact-print.c:1124
+#: ../addressbook/printing/e-contact-print.c:1152
 msgid "Print contact"
 msgstr "Tulosta yhteystieto"
 
@@ -3777,7 +3775,7 @@ msgid "Options"
 msgstr "Asetukset"
 
 #: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:118
+#: ../e-util/eggtrayicon.c:120
 msgid "Orientation"
 msgstr "Suunta"
 
@@ -3827,7 +3825,7 @@ msgstr "Varjostus"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:941
+#: ../plugins/exchange-operations/exchange-account-setup.c:949
 #: ../plugins/exchange-operations/exchange-calendar.c:224
 #: ../plugins/exchange-operations/exchange-contacts.c:197
 msgid "Size:"
@@ -3879,17 +3877,17 @@ msgstr "Yhteystiedon tulostustesti"
 msgid "This should test the contact print code"
 msgstr "Tämän pitäisi testata yhteystiedon tulostuksen koodia"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:664
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:700
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "Tiedostoa ei voida avata"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
 msgid "Couldn't get list of addressbooks"
 msgstr "Listaa osoitekirjoista ei löytynyt"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 msgid "failed to open book"
 msgstr "Kirjaa ei voitu avata"
 
@@ -3964,37 +3962,21 @@ msgstr "Tiedostonimeä ei annettu."
 
 #: ../calendar/calendar.error.xml.h:1
 msgid ""
-" There are few attachments getting downloaded. Saving the appointment will "
-"cause the appointment to be saved without those pending attachments "
-msgstr ""
-" Joidenkin liitteiden lataus on vielä kesken. Tapaamisen tallentaminen nyt "
-"aiheuttaa tapaamisen tallentamisen ilman näitä keskeneräisiä liitteitä "
-
-#: ../calendar/calendar.error.xml.h:2
-msgid ""
-" There are few attachments getting downloaded. Saving the task will cause "
-"the task to be saved without those pending attachments "
-msgstr ""
-" Joidenkin liitteiden lataus on vielä kesken. Tehtävän tallentaminen nyt "
-"aiheuttaa tehtävän tallentamisen ilman näitä keskeneräisiä liitteitä "
-
-#: ../calendar/calendar.error.xml.h:3
-msgid ""
-"Adding a meaningful Summary to your appointment will give your recipients an "
+"Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
 msgstr ""
 "Merkityksellisen yhteenvedon lisääminen viesteihisi helpottaa vastaanottajaa "
-"ymmärtämään mistä viestissä on kyse."
+"ymmärtämään, mistä viestissä on kyse."
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:2
 msgid ""
-"Adding a meaningful Summary to your task will give your recipients an idea "
+"Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
 msgstr ""
 "Merkityksellisen yhteenvedon lisääminen tehtävään helpottaa vastaanottajaa "
-"ymmärtämään tehtävässä on kyse."
+"ymmärtämään, mistä tehtävässä on kyse."
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:3
 msgid ""
 "All information in these journal entries will be deleted and can not be "
 "restored."
@@ -4002,147 +3984,147 @@ msgstr ""
 "Kaikki tiedot näissä journalin kohdissa poistetaan eikä niitä voida "
 "palauttaa."
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:4
 msgid ""
 "All information in this journal will be deleted and can not be restored."
 msgstr "Kaikki tiedot tässä journalissa poistetaan eikä niitä voida palauttaa."
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:5
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
 msgstr ""
 "Kaikki tiedot näistä tapaamisista poistetaan eikä niitä voida palauttaa."
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:6
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "Kaikki tiedot näistä tehtävistä poistetaan eikä niitä voida palauttaa."
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:7
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "Kaikki tiedot tästä tapaamisesta poistetaan eikä niitä voida palauttaa."
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:8
 msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
 msgstr ""
 "Kaikki tiedot tästä journalin kohdasta poistetaan eikä niitä voida palauttaa."
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr "Kaikki tiedot tästä kokouksesta poistetaan eikä niitä voida palauttaa."
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "Kaikki tiedot tästä tehtävästä poistetaan eikä niitä voida palauttaa."
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:11
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Haluatko varmasti poistaa tehtävän '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:12
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Haluatko varmasti poistaa tapaamisen nimeltään '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:13
 msgid "Are you sure you want to delete the journal entry '{0}'?"
 msgstr "Haluatko varmasti poistaa journalin '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:14
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Haluatko varmasti poistaa nämä {0} tapaamista?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete these {0} journal entries?"
 msgstr "Haluatko varmasti poistaa nämä {0} journalia?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Haluatko varmasti poistaa nämä {0} tehtävää?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Haluatko varmasti poistaa tämän tapaamisen?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "Haluatko varmasti poistaa tämän päiväkirjamerkinnän?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Haluatko varmasti poistaa tämän tapaamisen?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete this task?"
 msgstr "haluatko varmasti poistaa tämän tehtävän?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Haluatko varmasti lähettää ilman tapaamisen ilman yhteenvetoa?"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Haluatko varmasti lähettää tehtävän ilman yhteenvetoa?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:23
 msgid "Delete calendar '{0}'?"
 msgstr "Poista kalenteri '{0}'"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:24
 msgid "Delete memo list '{0}'?"
 msgstr "Poistetaanko muistilappulista '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:25
 msgid "Delete task list '{0}'?"
 msgstr "Poista tehtävälista '{0}'"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:26
 msgid "Don't Send"
 msgstr "Älä lähetä"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:27
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Tietojen haku kesken. Haluatko varmasti tallentaa tämän tapaamisen?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:28
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Tietojen haku on kesken. Haluatko tallentaa tehtävän?"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:29
 msgid "Editor could not be loaded."
 msgstr "Muokkainta ei voitu avata."
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:30
 msgid ""
 "Email invitations will be sent to all participants and allow them to RSVP."
 msgstr ""
 "Kutsu lähetetään sähköpostilla kaikille osanottajille ja he voivat kuitata "
 "osanottonsa."
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:31
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr ""
 "Kutsu lähetetään kaikille osanottajille ja he voivat hyväksyä tämän tehtävän."
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:32
 msgid "Error loading calendar"
 msgstr "Virhe ladattaessa kalenteria"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:33
 msgid "Error loading memo list"
 msgstr "Virhe ladattaessa muistilappulistaa"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:34
 msgid "Error loading task list"
 msgstr "Virhe ladattaessa tehtävälistaa"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:35
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the journal has been deleted."
@@ -4150,7 +4132,7 @@ msgstr ""
 "Jos et lähetä perumisilmoitusta, eivät muut osanottajat ehkä tiedä että "
 "journal on peruttu."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:36
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4158,7 +4140,7 @@ msgstr ""
 "Jos et lähetä perumisilmoitusta, eivät muut osanottajat ehkä tiedä että "
 "kokous on peruttu."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the task has been deleted."
@@ -4166,17 +4148,17 @@ msgstr ""
 "Jos et lähetä perumisilmoitusta, eivät muut osanottajat ehkä tiedä että "
 "kokous on peruttu."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:38
 #: ../ui/evolution-message-composer.xml.h:28
 msgid "Send"
 msgstr "Lähetä"
 
 # calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16 #: calendar/calendar-errors.xml.h:26
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:39
 msgid "Send Notice"
 msgstr "Lähetä huomautus"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4184,7 +4166,7 @@ msgstr ""
 "Päivitettyjen tietojen lähettäminen antaa muille mahdollisuuden pitää "
 "kalenterinsa ajan tasalla."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:41
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4192,6 +4174,26 @@ msgstr ""
 "Päivitettyjen tehtävätietojen lähettäminen antaa muille mahdollisuuden pitää "
 "tehtävälistansa ajan tasalla."
 
+#: ../calendar/calendar.error.xml.h:42
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr ""
+" Joidenkin liitteiden lataus on vielä kesken. Tapaamisen tallentaminen nyt "
+"aiheuttaa tapaamisen tallentamisen ilman näitä hakemattomia liitteitä."
+
+#: ../calendar/calendar.error.xml.h:43
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr ""
+" Joidenkin liitteiden lataus on vielä kesken. Tehtävän tallentaminen nyt "
+"aiheuttaa tehtävän tallentamisen ilman näitä hakemattomia liitteitä."
+
+#: ../calendar/calendar.error.xml.h:44
+msgid "Some features may not work properly with your current server."
+msgstr "Jotkut toiminnot eivät välttämättä toimi oikein nykyisellä palvelimella."
+
 #: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolutionin kalenteri sulkeutui odottamatta."
@@ -4201,8 +4203,8 @@ msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolutionin tehtäväkomponentti on sulkeutunut odottamatta."
 
 #: ../calendar/calendar.error.xml.h:47
-msgid "The calendar is not marked for offline usage"
-msgstr "Kalenteri ei ole merkitty käytettäväksi yhteydettömässä tilassa"
+msgid "The calendar is not marked for offline usage."
+msgstr "Kalenteri ei ole merkitty käytettäväksi yhteydettömässä tilassa."
 
 #: ../calendar/calendar.error.xml.h:48
 msgid "The memo list is not marked for offline usage"
@@ -4210,8 +4212,8 @@ msgstr ""
 "Muistilappulistaa ei ole merkitty käytettäväksi yhteydettömässä tilassa"
 
 #: ../calendar/calendar.error.xml.h:49
-msgid "The task list is not marked for offline usage"
-msgstr "Tehtävälista ei ole merkitty käytettäväksi yhteydettömässä tilassa"
+msgid "The task list is not marked for offline usage."
+msgstr "Tehtävälista ei ole merkitty käytettäväksi yhteydettömässä tilassa."
 
 #: ../calendar/calendar.error.xml.h:50
 msgid "This calendar will be removed permanently."
@@ -4257,6 +4259,16 @@ msgstr "Haluatko lähettää päivitetyt kokouksen tiedot osanottajille?"
 msgid "Would you like to send updated task information to participants?"
 msgstr "Halutako lähettää päivitetyn tehtävätiedon osanottajille?"
 
+#: ../calendar/calendar.error.xml.h:61
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+"Olet ottamassa yhteyttä tukemattomaan GroupWise-palvelimen versioon ja voit "
+"kohdata ongelmia Evolutionin käytössä. Parhaiden tulosten saamiseksi tulisi "
+"palvelin päivittää tuettuun versioon."
+
 #: ../calendar/calendar.error.xml.h:62
 msgid "You have changed this appointment, but not yet saved them."
 msgstr "Olet muuttanut tätä tapaamista, mutta et ole vielä tallentanut sitä."
@@ -4306,12 +4318,12 @@ msgstr "{0}."
 msgid "Enter password"
 msgstr "Syötä salasana"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:248
+#: ../calendar/conduits/calendar/calendar-conduit.c:255
 msgid "Split Multi-Day Events:"
 msgstr "Jaa usean päivän tapahtumat:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1425
-#: ../calendar/conduits/calendar/calendar-conduit.c:1426
+#: ../calendar/conduits/calendar/calendar-conduit.c:1432
+#: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
 #: ../calendar/conduits/todo/todo-conduit.c:1032
@@ -4319,8 +4331,8 @@ msgstr "Jaa usean päivän tapahtumat:"
 msgid "Could not start evolution-data-server"
 msgstr "Evolutionin tietopalvelimen käynnistys epäonnistui"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1522
-#: ../calendar/conduits/calendar/calendar-conduit.c:1525
+#: ../calendar/conduits/calendar/calendar-conduit.c:1529
+#: ../calendar/conduits/calendar/calendar-conduit.c:1532
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilotin kalenterin ohjelmalohkoa ei voitu lukea"
 
@@ -4354,7 +4366,7 @@ 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:1309
+#: ../calendar/gui/calendar-component.c:1290
 msgid "Calendars"
 msgstr "Kalenterit"
 
@@ -4395,17 +4407,17 @@ msgid "Memo_s"
 msgstr "Mui_stilaput"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memos.c:1092 ../calendar/gui/memos-component.c:528
-#: ../calendar/gui/memos-component.c:998 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memos.c:1092 ../calendar/gui/memos-component.c:529
+#: ../calendar/gui/memos-component.c:999 ../calendar/gui/memos-control.c:340
 msgid "Memos"
 msgstr "Muistilaput"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
 #: ../calendar/gui/e-tasks.c:1334 ../calendar/gui/print.c:1831
-#: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:472
-#: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:707
+#: ../calendar/gui/tasks-component.c:520
+#: ../calendar/gui/tasks-component.c:1014 ../calendar/gui/tasks-control.c:472
+#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:741
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
@@ -4454,9 +4466,9 @@ msgstr "Tapaamiset"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1419
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1425
-#: ../calendar/gui/e-itip-control.c:1117
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1503
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1509
+#: ../calendar/gui/e-itip-control.c:1119
 #: ../plugins/itip-formatter/itip-view.c:883
 msgid "Location:"
 msgstr "Sijainti:"
@@ -4466,17 +4478,18 @@ msgid "Snooze _time:"
 msgstr "Torkkumisaika:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:6
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:13
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:41
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:45
 #: ../ui/evolution-signature-editor.xml.h:23
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:37
 msgid "_Edit"
 msgstr "_Muokkaa"
 
@@ -4488,48 +4501,48 @@ msgstr "_Torku"
 msgid "location of appointment"
 msgstr "tapaamisen sijainti"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1097
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1127
 msgid "<b>Calendars</b>"
 msgstr "<b>Kalenterit</b>"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1163
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1193
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1176
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1206
 msgid "_Configure Alarms"
 msgstr "_Määrittele hälytyksiä"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1178 ../ui/evolution.xml.h:44
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1208 ../ui/evolution.xml.h:45
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1284
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1401
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1356
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
 msgid "No summary available."
 msgstr "Ei yhteenvetoa saatavilla"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1293
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1295
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1365
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1367
 msgid "No description available."
 msgstr "Ei kuvausta saatavilla"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1303
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1375
 msgid "No location information available."
 msgstr "Ei sijaintitietoja saatavilla"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1339
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1414
 #, c-format
 msgid "You have %d alarms"
 msgstr "Sinulla on %d hälytystä"
 
 #. FIXME
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1502
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1586
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1506
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1590
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4541,7 +4554,7 @@ msgstr ""
 "lähettämään sähköpostia. Evolution näyttää sen sijaan\n"
 "tavallisen huomautusikkunan."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1532
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1616
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4558,15 +4571,15 @@ msgstr ""
 "\n"
 "Haluatko varmasti suorittaa tämän ohjelman?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1546
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1630
 msgid "Do not ask me about this program again."
 msgstr "Älä kysy tästä ohjelmasta enää uudelleen"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:155
+#: ../calendar/gui/alarm-notify/notify-main.c:140
 msgid "Could not initialize Bonobo"
 msgstr "Bonobon alustus ei onnistunut"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:166
+#: ../calendar/gui/alarm-notify/notify-main.c:153
 msgid "Could not create the alarm notify service factory"
 msgstr "Hälytyksien ja huomautusten palvelun tehdasta ei voitu luoda"
 
@@ -4757,8 +4770,8 @@ msgid "Month view vertical pane position"
 msgstr "Kuukausinäkymän pystypaneelin sijainti"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
-msgid "Number of units for determining for a default reminder."
-msgstr "Kuinka monta yksikköä määrittävät oletusmuistutuksen."
+msgid "Number of units for determining a default reminder."
+msgstr "Kuinka monta yksikköä määrittelee oletusmuistutuksen."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
@@ -5012,11 +5025,11 @@ msgstr "Työpäivän alkamistunti"
 msgid "Workday start minute"
 msgstr "Työpäivän alkamisminuutti"
 
-#: ../calendar/gui/cal-search-bar.c:49
+#: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
 msgstr "Yhteenveto sisältää"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:49
 msgid "Description contains"
 msgstr "Kuvaus sisältää"
 
@@ -5032,14 +5045,14 @@ msgstr "Sijainti sisältää"
 msgid "Unmatched"
 msgstr "Täsmäämättömät"
 
-#: ../calendar/gui/calendar-commands.c:120 ../calendar/gui/print.c:2512
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2512
 #: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:19
 #: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:11
 #: ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Tulosta"
 
-#: ../calendar/gui/calendar-commands.c:120
+#: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:708
 #: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/gnome-cal.c:2117
@@ -5048,10 +5061,11 @@ msgstr "Tulosta"
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
 #: ../plugins/hula-account-setup/camel-hula-listener.c:374
 #: ../plugins/hula-account-setup/camel-hula-listener.c:403
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Kalenteri"
 
-#: ../calendar/gui/calendar-commands.c:355
+#: ../calendar/gui/calendar-commands.c:348
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5060,11 +5074,11 @@ msgstr ""
 "Tämä toimenpide poistaa kaikki tapahtumat, jotka ovat vanhempia kuin valittu "
 "aika. Jos jatkat, et voi palauttaa näitätapahtumia."
 
-#: ../calendar/gui/calendar-commands.c:361
+#: ../calendar/gui/calendar-commands.c:354
 msgid "Purge events older than"
 msgstr "Poista vanhemmat tapahtumat kuin"
 
-#: ../calendar/gui/calendar-commands.c:366
+#: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
@@ -5078,13 +5092,13 @@ msgstr "päivä"
 #. Create the Webcal source group
 #. Create the LDAP source group
 #: ../calendar/gui/calendar-component.c:234
-#: ../calendar/gui/memos-component.c:219 ../calendar/gui/migration.c:489
-#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1084
-#: ../calendar/gui/tasks-component.c:215
+#: ../calendar/gui/memos-component.c:220 ../calendar/gui/migration.c:494
+#: ../calendar/gui/migration.c:587 ../calendar/gui/migration.c:1088
+#: ../calendar/gui/tasks-component.c:216
 msgid "On The Web"
 msgstr "Verkossa"
 
-#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:391
+#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:396
 msgid "Birthdays & Anniversaries"
 msgstr "Syntymä- ja vuosipäivät"
 
@@ -5098,70 +5112,70 @@ msgstr "Sää"
 msgid "_New Calendar"
 msgstr "_Uusi kalenteri"
 
-#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:839
 msgid "Failed upgrading calendars."
 msgstr "Kalenterien päivitys epäonnistui."
 
-#: ../calendar/gui/calendar-component.c:1157
+#: ../calendar/gui/calendar-component.c:1138
 #, 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:1170
+#: ../calendar/gui/calendar-component.c:1151
 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:1284
+#: ../calendar/gui/calendar-component.c:1265
 msgid "Calendar Source Selector"
 msgstr "Kalenterilähteen valinta"
 
-#: ../calendar/gui/calendar-component.c:1475
+#: ../calendar/gui/calendar-component.c:1456
 msgid "New appointment"
 msgstr "Uusi tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1457
 msgid "_Appointment"
 msgstr "_Tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1458
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1483
+#: ../calendar/gui/calendar-component.c:1464
 msgid "New meeting"
 msgstr "Uusi tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1465
 msgid "M_eeting"
 msgstr "_Kokous"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1466
 msgid "Create a new meeting request"
 msgstr "Luo uusi kokouskutsu"
 
-#: ../calendar/gui/calendar-component.c:1491
+#: ../calendar/gui/calendar-component.c:1472
 msgid "New all day appointment"
 msgstr "Uusi koko päivän tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1492
+#: ../calendar/gui/calendar-component.c:1473
 msgid "All Day A_ppointment"
 msgstr "Koko _päivän tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1493
+#: ../calendar/gui/calendar-component.c:1474
 msgid "Create a new all-day appointment"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1499
+#: ../calendar/gui/calendar-component.c:1480
 msgid "New calendar"
 msgstr "Uusi kalenteri"
 
-#: ../calendar/gui/calendar-component.c:1500
+#: ../calendar/gui/calendar-component.c:1481
 #: ../calendar/gui/dialogs/event-page.c:870
 msgid "Cale_ndar"
 msgstr "_Kalenteri"
 
-#: ../calendar/gui/calendar-component.c:1501
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Create a new calendar"
 msgstr "Luo uusi kalenteri"
 
@@ -5193,7 +5207,7 @@ msgstr "Menetelmä ei ollut tuettu avattaessa kalenteria"
 msgid "Permission denied to open the calendar"
 msgstr "Kalenterin avaamiseen ei ollut tarvittavia oikeuksia"
 
-#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1267
+#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1279
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
@@ -5320,70 +5334,6 @@ msgstr "_Lisää"
 msgid "Alarms"
 msgstr "Hälytykset"
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:110
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:106
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fK"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:113
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:109
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fM"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:116
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:112
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fG"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:311
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2599
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:138
-#: ../mail/em-utils.c:483 ../mail/em-utils.c:520
-#: ../widgets/misc/e-attachment-bar.c:341
-msgid "attachment"
-msgstr "liite"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1056
-#: ../calendar/gui/dialogs/event-page.c:1861
-#: ../calendar/gui/dialogs/meeting-page.c:909
-#: ../calendar/gui/dialogs/task-page.c:1183
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3571
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:14
-#: ../widgets/table/e-table-config.glade.h:18
-msgid "_Remove"
-msgstr "_Poista"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1057
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3572 ../mail/em-folder-tree.c:2058
-#: ../ui/evolution-mail-list.xml.h:29
-msgid "_Properties"
-msgstr "_Ominaisuudet..."
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1059
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3574
-msgid "_Add attachment..."
-msgstr "_Lisää liite..."
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:736
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:994
-msgid "Attachment Bar"
-msgstr "Liitepalkki"
-
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:6
@@ -5398,29 +5348,6 @@ msgstr "Ehdota liitteen automaattista näyttämistä"
 msgid "Attach file(s)"
 msgstr "Liitä tiedosto(t)"
 
-#: ../calendar/gui/dialogs/cal-attachment.c:211
-#: ../calendar/gui/dialogs/cal-attachment.c:227
-#: ../calendar/gui/dialogs/cal-attachment.c:320
-#: ../calendar/gui/dialogs/cal-attachment.c:336
-#: ../composer/e-msg-composer-attachment.c:188
-#: ../composer/e-msg-composer-attachment.c:204
-#: ../composer/e-msg-composer-attachment.c:298
-#: ../composer/e-msg-composer-attachment.c:314
-#: ../widgets/misc/e-attachment.c:221 ../widgets/misc/e-attachment.c:237
-#: ../widgets/misc/e-attachment.c:425 ../widgets/misc/e-attachment.c:441
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Tiedoston %s liittäminen epäonnistui: %s"
-
-#: ../calendar/gui/dialogs/cal-attachment.c:219
-#: ../calendar/gui/dialogs/cal-attachment.c:328
-#: ../composer/e-msg-composer-attachment.c:196
-#: ../composer/e-msg-composer-attachment.c:306
-#: ../widgets/misc/e-attachment.c:229 ../widgets/misc/e-attachment.c:433
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Tiedoston %s liittäminen epäonnistui: epätavallinen tiedosto"
-
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
 #: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../widgets/misc/e-attachment.glade.h:2
@@ -5428,8 +5355,8 @@ msgid "Attachment Properties"
 msgstr "Liitteen ominaisuudet"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1163
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1165
 #: ../calendar/gui/e-itip-control.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
@@ -5448,298 +5375,258 @@ msgstr "Tiedostonimi:"
 msgid "MIME type:"
 msgstr "MIME-tyyppi:"
 
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:583
-#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:930
-#: ../plugins/plugin-manager/plugin-manager.c:213
-msgid "Enabled"
-msgstr "Käytä"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:740
-msgid "Are you sure you want to remove this URL?"
-msgstr "Haluatko varmasti poistaa tämän URLin?"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:743
-msgid "Remove"
-msgstr "Poista"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:748
-msgid "Don't Remove"
-msgstr "Älä poista"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:797
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:830
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:863
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:406
-msgid "Disable"
-msgstr "Älä käytä"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:797
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:830
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:408
-msgid "Enable"
-msgstr "Käytä"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "05 minutes"
-msgstr "05 minuuttia"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "10 minutes"
-msgstr "10 minuuttia"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 minuuttia"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "30 minutes"
-msgstr "30 minuuttia"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid ""
+"60 minutes\n"
+"30 minutes\n"
+"15 minutes\n"
+"10 minutes\n"
+"05 minutes"
+msgstr ""
+"60 minuuttia\n"
+"30 minuuttia\n"
+"15 minuuttia\n"
+"10 minuuttia\n"
+"5 minuuttia"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "60 minutes"
-msgstr "60 minuuttia"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "<b>Alerts</b>"
-msgstr "<b>Hälytykset</b>"
+msgid "<b>Publishing</b>"
+msgstr "<b>Julkaiseminen</b>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "<b>Default Free/Busy Server</b>"
-msgstr "<b>Vapaa/Varattu kalenterin oletuspalvelin</b>"
+#, no-c-format
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr ""
+"<i>%u ja %d korvataan käyttäjällä ja aluenimellä sähköpostiosoitteesta.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "<b>General</b>"
-msgstr "<b>Yleistä</b>"
+#: ../mail/mail-config.glade.h:9
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr "<span weight=\"bold\">Hälytykset</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "<b>Publishing</b>"
-msgstr "<b>Julkaiseminen</b>"
+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:11
-msgid "<b>Task List</b>"
-msgstr "<b>Tehtävälista</b>"
+#: ../mail/mail-config.glade.h:18
+#: ../plugins/itip-formatter/itip-formatter.c:1977
+#: ../plugins/publish-calendar/publish-calendar.glade.h:1
+msgid "<span weight=\"bold\">General</span>"
+msgstr "<span weight=\"bold\">Yleistä</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<b>Time</b>"
-msgstr "<b>Aika</b>"
+msgid "<span weight=\"bold\">Task List</span>"
+msgstr "<span weight=\"bold\">Tehtävälista</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "<b>Work Week</b>"
-msgstr "<b>Työviikko</b>"
+msgid "<span weight=\"bold\">Time</span>"
+msgstr "<span weight=\"bold\">Aika</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr ""
-"<i>%u ja %d korvataan käyttäjällä ja aluenimellä sähköpostiosoitteesta.</i>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Calendar and Tasks Settings"
-msgstr "Kalenterin ja tehtävien asetukset"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Color for overdue tasks"
-msgstr "Eräpäivän ylittäneiden tehtävien väri"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Color for tasks due today"
-msgstr "Tänään erääntyvien tehtävien väri"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "<span weight=\"bold\">Work Week</span>"
+msgstr "<span weight=\"bold\">Työviikko</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Day _ends:"
 msgstr "Päivä _päättyy:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Days"
-msgstr "Päivää"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Display"
 msgstr "Näytä"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: ../mail/mail-config.glade.h:74
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "Kä_ytä"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/event-editor.c:555
-#: ../ui/evolution-event-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:7
 msgid "Free/Busy"
 msgstr "Vapaa/Varattu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Friday"
 msgstr "Perjantai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Hours"
-msgstr "Tuntia"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Minutes"
-msgstr "Minuutti"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+msgid ""
+"Minutes\n"
+"Hours\n"
+"Days"
+msgstr ""
+"minuuttia\n"
+"tuntia\n"
+"päivää"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Monday"
 msgstr "Maanantai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday"
+msgstr ""
+"maanantai\n"
+"tiistai\n"
+"keskiviikko\n"
+"torstai\n"
+"perjantai\n"
+"lauantai\n"
+"sunnuntai"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Publishing Table"
 msgstr "Julkaisemistaulu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "S_un"
 msgstr "_Su"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: ../calendar/gui/dialogs/recurrence-page.c:1051
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "Näytä muistutus"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Show week _numbers in date navigator"
 msgstr "Näytä _viikkonumerot"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1052
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "T_asks due today:"
 msgstr "_Tänään erääntyvät tehtävät:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_hu"
 msgstr "_To"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Template:"
 msgstr "Pohja:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "Torstai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 #: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "Time _zone:"
 msgstr "Aikavyöhyke: "
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time format:"
 msgstr "Ajan muoto:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "Tiistai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "W_eek starts:"
 msgstr "Viikko _alkaa:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Work days:"
 msgstr "Työpäivät:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_12 hour (AM/PM)"
 msgstr "_12 tuntia (am/pm)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_24 hour"
 msgstr "_24 tuntia"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Add URL"
 msgstr "_Lisää URL"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pyydä _vahvistusta poistettaessa"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
 msgstr "_Tiivistä viikonloput kuukausinäkymässä"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "_Päivä alkaa:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Fri"
 msgstr "_Pe"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Hide completed tasks after"
 msgstr "Piilota _poistetut viestit kun on kulunut"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Mon"
 msgstr "_Ma"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Overdue tasks:"
 msgstr "_Eräpäivän ylittäneet tehtävät:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Sat"
 msgstr "_La"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "_Show appointment end times in week and month views"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+msgid "_Show appointment end times in week and month view"
 msgstr "_Näytä tapaamisten loppumisajat viikko- ja kuukausinäkymissä"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Time divisions:"
 msgstr "_Aikajaot:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Tue"
 msgstr "_Ti"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Wed"
 msgstr "_Ke"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "before every appointment"
 msgstr "_Ennen joka tapaamista"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "option menu to choose reminder units"
-msgstr "vaihtoehtovalikko josta valitaan muistutuksen yksikkö"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "option menu to choose time units"
-msgstr "vaihtoehtovalikko josta valitaan ajan yksiköt"
-
 #: ../calendar/gui/dialogs/calendar-setup.c:287
 msgid "Copy calendar contents locally for offline operation"
 msgstr "Kopioi kansion sisältö paikallisesti yhteydettömään käyttöön"
@@ -5778,7 +5665,7 @@ msgid "Task List Properties"
 msgstr "Tehtävälistan ominaisuudet"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:594
-#: ../calendar/gui/memos-component.c:448
+#: ../calendar/gui/memos-component.c:449
 msgid "New Memo List"
 msgstr "Uusi muistilappulista"
 
@@ -5889,103 +5776,135 @@ msgstr "(erääntyy "
 msgid "Due "
 msgstr "Erääntyy "
 
-#: ../calendar/gui/dialogs/comp-editor.c:194 ../composer/e-msg-composer.c:2826
+#: ../calendar/gui/dialogs/comp-editor.c:195 ../composer/e-msg-composer.c:2825
 #, c-format
 msgid "Attached message - %s"
 msgstr "Liitetty viesti - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:199
-#: ../calendar/gui/dialogs/comp-editor.c:369 ../composer/e-msg-composer.c:2831
-#: ../composer/e-msg-composer.c:3010
+#: ../calendar/gui/dialogs/comp-editor.c:200
+#: ../calendar/gui/dialogs/comp-editor.c:370 ../composer/e-msg-composer.c:2830
+#: ../composer/e-msg-composer.c:3009
 #, 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:433 ../composer/e-msg-composer.c:3076
+#: ../calendar/gui/dialogs/comp-editor.c:434 ../composer/e-msg-composer.c:3075
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:932 ../mail/message-list.c:1719
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1717
 msgid "_Move"
 msgstr "_Siirrä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:435 ../composer/e-msg-composer.c:3078
-#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1721
+#: ../calendar/gui/dialogs/comp-editor.c:436 ../composer/e-msg-composer.c:3077
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1719
 msgid "Cancel _Drag"
 msgstr "Peruuta _raahaus"
 
-#: ../calendar/gui/dialogs/comp-editor.c:778
+#: ../calendar/gui/dialogs/comp-editor.c:782
 msgid "Could not update object"
 msgstr "Kohdetta ei voitu päivittää"
 
-#: ../calendar/gui/dialogs/comp-editor.c:914 ../composer/e-msg-composer.c:2469
+#: ../calendar/gui/dialogs/comp-editor.c:928 ../composer/e-msg-composer.c:2468
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> liite"
 msgstr[1] "<b>%d</b> liitettä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:944
+#: ../calendar/gui/dialogs/comp-editor.c:958
 msgid "Hide Attachment _Bar"
 msgstr "Piilota _liitepalkki"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:961
+#: ../calendar/gui/dialogs/comp-editor.c:1401
 msgid "Show Attachment _Bar"
 msgstr "Näytä _liitepalkki"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1070
+#: ../calendar/gui/dialogs/event-page.c:1861
+#: ../calendar/gui/dialogs/meeting-page.c:909
+#: ../calendar/gui/dialogs/task-page.c:1183
+#: ../composer/e-msg-composer-attachment-bar.c:470
+#: ../composer/e-msg-composer.c:3573
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:18
+msgid "_Remove"
+msgstr "_Poista"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1071
+#: ../composer/e-msg-composer-attachment-bar.c:471
+#: ../composer/e-msg-composer.c:3574 ../mail/em-folder-tree.c:2058
+#: ../ui/evolution-mail-list.xml.h:29
+msgid "_Properties"
+msgstr "_Ominaisuudet..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../composer/e-msg-composer-attachment-bar.c:473
+#: ../composer/e-msg-composer.c:3576
+msgid "_Add attachment..."
+msgstr "_Lisää liite..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1425
 msgid "Attachment Button: Press space key to toggle attachment bar"
 msgstr "Liitepainike: Näytä ja piilota liitepalkki välilyönnillä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2023
-#: ../calendar/gui/dialogs/comp-editor.c:2066
+#: ../calendar/gui/dialogs/comp-editor.c:2028
+#: ../calendar/gui/dialogs/comp-editor.c:2071
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2029
-#: ../calendar/gui/dialogs/comp-editor.c:2072
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/dialogs/comp-editor.c:2077
 #, c-format
 msgid "Meeting - %s"
 msgstr "Kokous - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2031
-#: ../calendar/gui/dialogs/comp-editor.c:2074
+#: ../calendar/gui/dialogs/comp-editor.c:2036
+#: ../calendar/gui/dialogs/comp-editor.c:2079
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2035
-#: ../calendar/gui/dialogs/comp-editor.c:2078
+#: ../calendar/gui/dialogs/comp-editor.c:2040
+#: ../calendar/gui/dialogs/comp-editor.c:2083
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tehtävänanto - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2037
-#: ../calendar/gui/dialogs/comp-editor.c:2080
+#: ../calendar/gui/dialogs/comp-editor.c:2042
+#: ../calendar/gui/dialogs/comp-editor.c:2085
 #, c-format
 msgid "Task - %s"
 msgstr "Tehtävä - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2040
-#: ../calendar/gui/dialogs/comp-editor.c:2083
+#: ../calendar/gui/dialogs/comp-editor.c:2045
+#: ../calendar/gui/dialogs/comp-editor.c:2088
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Päiväkirjamerkintä - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2051
-#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2056
+#: ../calendar/gui/dialogs/comp-editor.c:2098
 msgid "No summary"
 msgstr "Ei kuvausta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2692
-#: ../calendar/gui/dialogs/comp-editor.c:2725
-#: ../calendar/gui/dialogs/comp-editor.c:2749
+#: ../calendar/gui/dialogs/comp-editor.c:2608
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:155
+#: ../mail/em-utils.c:501 ../mail/em-utils.c:538
+#: ../widgets/misc/e-attachment-bar.c:341
+msgid "attachment"
+msgstr "liite"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2701
+#: ../calendar/gui/dialogs/comp-editor.c:2734
+#: ../calendar/gui/dialogs/comp-editor.c:2758
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Tähän kohtaan tehdyt muutokset voidaan hylätä, jos päivitys saapuu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2773
+#: ../calendar/gui/dialogs/comp-editor.c:2782
 msgid "Unable to use current version!"
 msgstr "Nykyistä versiota ei voida käyttää!"
 
@@ -6069,7 +5988,7 @@ msgid "Appoint_ment"
 msgstr "Tapaa_minen"
 
 #: ../calendar/gui/dialogs/event-editor.c:535
-#: ../ui/evolution-event-editor.xml.h:12
+#: ../ui/evolution-event-editor.xml.h:13
 msgid "Recurrence"
 msgstr "Toistuvuus"
 
@@ -6246,16 +6165,16 @@ msgstr "<b>Lähde:</b>"
 #. is not permitted.
 #: ../calendar/gui/dialogs/meeting-page.c:316
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1103 ../composer/e-msg-composer.c:2264
-#: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
-#: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
-#: ../mail/em-folder-view.c:1065 ../mail/em-junk-hook.c:78
+#: ../calendar/gui/e-cal-model-tasks.c:654
+#: ../calendar/gui/e-itip-control.c:1105 ../composer/e-msg-composer.c:2260
+#: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:691
+#: ../mail/em-account-editor.c:1356 ../mail/em-account-prefs.c:465
+#: ../mail/em-folder-view.c:1106 ../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.glade.h:7
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
 #: ../plugins/itip-formatter/itip-formatter.c:1627
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:474
 #: ../widgets/misc/e-dateedit.c:1513 ../widgets/misc/e-dateedit.c:1727
 msgid "None"
@@ -6296,15 +6215,16 @@ msgstr "Kieli"
 msgid "Member"
 msgstr "Jäsen"
 
+#. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../calendar/gui/e-meeting-list-view.c:502
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Kuittauspyyntö"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:512
+#: ../calendar/gui/e-meeting-list-view.c:513
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
@@ -6349,20 +6269,20 @@ msgid "Classi_fication:"
 msgstr "_Luokittelu:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:5
-#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:368
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:365
+#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:367
 msgid "Private"
 msgstr "Henkilökohtainen"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
+#: ../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
 msgid "Public"
 msgstr "Julkinen"
 
@@ -6412,21 +6332,22 @@ msgid "Task List Name"
 msgstr "Tehtävälistan nimi"
 
 #: ../calendar/gui/dialogs/recur-comp.c:52
-msgid "You are modifying a recurring event, what would you like to modify?"
-msgstr "Muokkaat toistuvaa tapahtumaa, mitä haluat muokata?"
+msgid "You are modifying a recurring event. What would you like to modify?"
+msgstr "Olet muokkaamassa toistuvaa tapahtumaa. Mitä haluat muokata?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
-msgid "You are delegating a recurring event, what would like to delegate?"
-msgstr "Olet delegoimassa toistuvaa tapahtumaa, mitä haluaisit delegoida?"
+msgid "You are delegating a recurring event. What would you like to delegate?"
+msgstr "Olet antamassa tehtäväksi toistuvaa tapahtumaa. Mitä haluat delegoida?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring task, what would you like to modify?"
-msgstr "Muokkaat toistuvaa tehtävää, mitä haluat muokata?"
+msgid "You are modifying a recurring task. What would you like to modify?"
+msgstr "Olet muokkaamassa toistuvaa tehtävää. Mitä haluat muokata?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
 msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
-msgstr "Muokkaat toistuvaa päiväkirjamerkintää, mitä haluat tehdä?"
+"You are modifying a recurring journal entry. What would you like to modify?"
+msgstr ""
+"Olet muokkaamassa toistuvaa päiväkirjamerkintää. Mitä haluat muokata?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
@@ -6550,48 +6471,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:229
-#: ../calendar/gui/e-cal-model-tasks.c:346
-#: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:895
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-cal-component-preview.c:231
+#: ../calendar/gui/e-cal-model-tasks.c:347
+#: ../calendar/gui/e-cal-model-tasks.c:660
+#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/e-itip-control.c:897
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
 #: ../calendar/gui/print.c:2372 ../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:248
-#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1018
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1016
 msgid "High"
 msgstr "Korkea"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:226
-#: ../calendar/gui/e-cal-model-tasks.c:344
-#: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2369
+#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-model-tasks.c:345
+#: ../calendar/gui/e-cal-model-tasks.c:658
+#: ../calendar/gui/e-cal-model-tasks.c:733
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2369
 msgid "In Progress"
 msgstr "Työn alla"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1016
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-calendar-table.c:390 ../mail/message-list.c:1014
 msgid "Low"
 msgstr "Matala"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:387
-#: ../mail/message-list.c:1017
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:389
+#: ../mail/message-list.c:1015
 msgid "Normal"
 msgstr "Tavallinen"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-cal-model-tasks.c:342
-#: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2366
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-model-tasks.c:343
+#: ../calendar/gui/e-cal-model-tasks.c:656
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2366
 msgid "Not Started"
 msgstr "Ei aloitettu"
 
@@ -6604,7 +6525,7 @@ msgid "Stat_us:"
 msgstr "_Tila:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:391
 msgid "Undefined"
 msgstr "Määrittelemätön"
 
@@ -6622,7 +6543,7 @@ msgid "_Web Page:"
 msgstr "_Kotisivun osoite:"
 
 #: ../calendar/gui/dialogs/task-editor.c:419
-#: ../calendar/gui/tasks-component.c:1172
+#: ../calendar/gui/tasks-component.c:1173
 msgid "_Task"
 msgstr "_Tehtävä"
 
@@ -6692,14 +6613,17 @@ msgid "_Manual"
 msgstr "_Manuaalinen"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
 msgid "_Password:"
 msgstr "_Salasana:"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Remember password"
 msgstr "_Muista salasana"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Username:"
 msgstr "Käyttäjät_unnus:"
 
@@ -6793,17 +6717,17 @@ msgid "%s for an unknown trigger type"
 msgstr "%s tuntemattomalle liipasintyypille"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2728
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2826
 #, c-format
 msgid "Click to open %s"
 msgstr "Napsauta avataksesi %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
+#: ../calendar/gui/e-cal-component-memo-preview.c:201
 msgid "Memo:"
 msgstr "Muistilappu:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:232
-#: ../calendar/gui/e-cal-component-preview.c:299
+#: ../calendar/gui/e-cal-component-memo-preview.c:234
+#: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "WWW-sivu:"
 
@@ -6811,31 +6735,31 @@ msgstr "WWW-sivu:"
 msgid "Untitled"
 msgstr "Nimetön"
 
-#: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1107
+#: ../calendar/gui/e-cal-component-preview.c:188
+#: ../calendar/gui/e-itip-control.c:1109
 #: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kuvaus:"
 
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-cal-component-preview.c:195
+#: ../calendar/gui/e-cal-component-preview.c:206
 msgid "Start Date:"
 msgstr "Alkamispäivä:"
 
-#: ../calendar/gui/e-cal-component-preview.c:215
+#: ../calendar/gui/e-cal-component-preview.c:217
 msgid "Due Date:"
 msgstr "Eräpäivä:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1131
-#: ../plugins/exchange-operations/exchange-account-setup.c:265
+#: ../calendar/gui/e-cal-component-preview.c:224
+#: ../calendar/gui/e-itip-control.c:1133
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:908
 msgid "Status:"
 msgstr "Tila:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:248
 msgid "Priority:"
 msgstr "Prioriteetti:"
 
@@ -6855,17 +6779,17 @@ msgid "Summary"
 msgstr "Kuvaus"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:438
+#: ../calendar/gui/e-calendar-table.c:440
 msgid "Free"
 msgstr "Vapaa"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:441
 #: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../calendar/gui/e-cal-model-tasks.c:607
+#: ../calendar/gui/e-cal-model-tasks.c:608
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6875,17 +6799,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model-tasks.c:1019 ../calendar/gui/e-cal-model.c:926
 #: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
-#: ../calendar/gui/e-meeting-store.c:808
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:809
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model-tasks.c:1019 ../calendar/gui/e-cal-model.c:926
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Ei"
@@ -6893,12 +6817,12 @@ msgstr "Ei"
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
 #: ../calendar/gui/e-cal-popup.c:106 ../calendar/gui/e-cal-popup.c:121
-#: ../calendar/gui/e-cal-popup.c:165 ../calendar/gui/e-itip-control.c:1148
-#: ../calendar/gui/e-itip-control.c:1289
+#: ../calendar/gui/e-cal-popup.c:165 ../calendar/gui/e-itip-control.c:1150
+#: ../calendar/gui/e-itip-control.c:1291
 #: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1283
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
+#: ../calendar/gui/e-meeting-store.c:225 ../mail/em-utils.c:1311
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1652
 #: ../plugins/plugin-manager/plugin-manager.c:72
@@ -6919,7 +6843,7 @@ msgstr "Annettu tehtäväksi"
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
-#: ../calendar/gui/e-cal-popup.c:187 ../mail/em-format-html-display.c:1812
+#: ../calendar/gui/e-cal-popup.c:187 ../mail/em-format-html-display.c:1842
 msgid "Select folder to save selected attachments..."
 msgstr "Valitse kansio, johon valitut liitteet tallennetaan..."
 
@@ -6928,9 +6852,9 @@ msgstr "Valitse kansio, johon valitut liitteet tallennetaan..."
 msgid "untitled_image.%s"
 msgstr "nimetön_kuva.%s"
 
-#: ../calendar/gui/e-cal-popup.c:270 ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1564 ../calendar/gui/e-memo-table.c:854
-#: ../mail/em-folder-view.c:1046 ../mail/em-popup.c:553 ../mail/em-popup.c:564
+#: ../calendar/gui/e-cal-popup.c:270 ../calendar/gui/e-calendar-table.c:1178
+#: ../calendar/gui/e-calendar-view.c:1554 ../calendar/gui/e-memo-table.c:856
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:553 ../mail/em-popup.c:564
 msgid "_Save As..."
 msgstr "Tallenna _nimellä..."
 
@@ -6948,123 +6872,123 @@ msgstr "Tallenna _valitut"
 msgid "Open in %s..."
 msgstr "Avaa ohjelmassa %s..."
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:419
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:420
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:525
+#: ../calendar/gui/e-calendar-table.c:527
 msgid "Task Table"
 msgstr "Tehtävätaulukko"
 
-#: ../calendar/gui/e-calendar-table.c:703
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:433
+#: ../calendar/gui/e-calendar-table.c:705
+#: ../calendar/gui/e-calendar-view.c:678 ../calendar/gui/e-memo-table.c:435
 msgid "Deleting selected objects"
 msgstr "Poistetaan valitut kohteet"
 
-#: ../calendar/gui/e-calendar-table.c:882
-#: ../calendar/gui/e-calendar-view.c:805 ../calendar/gui/e-memo-table.c:610
+#: ../calendar/gui/e-calendar-table.c:884
+#: ../calendar/gui/e-calendar-view.c:806 ../calendar/gui/e-memo-table.c:612
 msgid "Updating objects"
 msgstr "Päivitetään olioita"
 
-#: ../calendar/gui/e-calendar-table.c:1032
-#: ../calendar/gui/e-calendar-view.c:1140 ../calendar/gui/e-memo-table.c:742
-#: ../composer/e-msg-composer.c:1346
+#: ../calendar/gui/e-calendar-table.c:1034
+#: ../calendar/gui/e-calendar-view.c:1141 ../calendar/gui/e-memo-table.c:744
+#: ../composer/e-msg-composer.c:1339
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
-#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1177 ../calendar/gui/e-memo-table.c:855
 msgid "Open _Web Page"
 msgstr "_Avaa www-sivu"
 
-#: ../calendar/gui/e-calendar-table.c:1177
-#: ../calendar/gui/e-calendar-view.c:1544
-#: ../calendar/gui/e-calendar-view.c:1565 ../calendar/gui/e-memo-table.c:855
-#: ../mail/em-folder-view.c:1047
+#: ../calendar/gui/e-calendar-table.c:1179
+#: ../calendar/gui/e-calendar-view.c:1539
+#: ../calendar/gui/e-calendar-view.c:1555 ../calendar/gui/e-memo-table.c:857
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:122 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "T_ulosta..."
 
-#: ../calendar/gui/e-calendar-table.c:1181
-#: ../calendar/gui/e-calendar-view.c:1569 ../calendar/gui/e-memo-table.c:859
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1559 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:1 ../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:1183
-#: ../calendar/gui/e-calendar-view.c:1547
-#: ../calendar/gui/e-calendar-view.c:1571 ../calendar/gui/e-memo-table.c:861
-#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-calendar.xml.h:43
+#: ../calendar/gui/e-calendar-table.c:1185
+#: ../calendar/gui/e-calendar-view.c:1542
+#: ../calendar/gui/e-calendar-view.c:1561 ../calendar/gui/e-memo-table.c:863
+#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-calendar.xml.h:42
 #: ../ui/evolution-composer-entries.xml.h:9 ../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:1187 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1189 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Anna tehtäväksi"
 
-#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
+#: ../calendar/gui/e-calendar-table.c:1190 ../calendar/gui/e-memo-table.c:867
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Välitä iCalendar-muodossa"
 
-#: ../calendar/gui/e-calendar-table.c:1189
+#: ../calendar/gui/e-calendar-table.c:1191
 msgid "_Mark as Complete"
 msgstr "_Merkitse valmiiksi"
 
-#: ../calendar/gui/e-calendar-table.c:1190
+#: ../calendar/gui/e-calendar-table.c:1192
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merkitse valitut tehtävät valmiiksi"
 
-#: ../calendar/gui/e-calendar-table.c:1195
+#: ../calendar/gui/e-calendar-table.c:1197
 msgid "_Delete Selected Tasks"
 msgstr "_Poista valitut tehtävät"
 
-#: ../calendar/gui/e-calendar-table.c:1428
+#: ../calendar/gui/e-calendar-table.c:1430
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Lisää tehtävä näpäyttämällä tästä"
@@ -7099,92 +7023,90 @@ msgstr "Aloituspäivä"
 msgid "Task sort"
 msgstr "Tehtävän tyyppi"
 
-#: ../calendar/gui/e-calendar-view.c:1266
+#: ../calendar/gui/e-calendar-view.c:1267
 msgid "Moving items"
 msgstr "Siirretään kohteita"
 
-#: ../calendar/gui/e-calendar-view.c:1268
+#: ../calendar/gui/e-calendar-view.c:1269
 msgid "Copying items"
 msgstr "Kopioidaan kohteita"
 
-#: ../calendar/gui/e-calendar-view.c:1538
+#: ../calendar/gui/e-calendar-view.c:1533
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: ../calendar/gui/e-calendar-view.c:1539
+#: ../calendar/gui/e-calendar-view.c:1534
 msgid "New All Day _Event"
 msgstr "Uusi koko pä_ivän tapahtuma"
 
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1535
 msgid "New _Meeting"
 msgstr "Uusi _kokous"
 
-#: ../calendar/gui/e-calendar-view.c:1541
+#: ../calendar/gui/e-calendar-view.c:1536
 msgid "New _Task"
 msgstr "Uusi _tehtävä"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1551
+#: ../calendar/gui/e-calendar-view.c:1546
 #: ../widgets/menus/gal-view-menus.c:291
 msgid "_Current View"
 msgstr "_Nykyinen näkymä"
 
-#: ../calendar/gui/e-calendar-view.c:1553
+#: ../calendar/gui/e-calendar-view.c:1548
 msgid "Select T_oday"
 msgstr "Valitse _tämä päivä"
 
-#: ../calendar/gui/e-calendar-view.c:1554
+#: ../calendar/gui/e-calendar-view.c:1549
 msgid "_Select Date..."
 msgstr "_Valitse päiväys..."
 
-#. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1559 ../ui/evolution-calendar.xml.h:45
-msgid "_Publish Free/Busy Information"
-msgstr "_Julkaise vapaa/varattu-tietoja"
-
-#: ../calendar/gui/e-calendar-view.c:1575
+#: ../calendar/gui/e-calendar-view.c:1565
 msgid "Cop_y to Calendar..."
 msgstr "_Kopioi kalenteriin..."
 
-#: ../calendar/gui/e-calendar-view.c:1576
+#: ../calendar/gui/e-calendar-view.c:1566
 msgid "Mo_ve to Calendar..."
 msgstr "_Siirrä kalenteriin..."
 
-#: ../calendar/gui/e-calendar-view.c:1577
+#: ../calendar/gui/e-calendar-view.c:1567
 msgid "_Delegate Meeting..."
 msgstr "_Delegoi kokous..."
 
-#: ../calendar/gui/e-calendar-view.c:1578
+#: ../calendar/gui/e-calendar-view.c:1568
 msgid "_Schedule Meeting..."
 msgstr "_Järjestä kokous..."
 
-#: ../calendar/gui/e-calendar-view.c:1579
+#: ../calendar/gui/e-calendar-view.c:1569
 msgid "_Forward as iCalendar..."
 msgstr "_Välitä iCalendar-muodossa..."
 
-#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1574
 msgid "Make this Occurrence _Movable"
 msgstr "Muuta tämä kerta _siirrettäväksi"
 
-#: ../calendar/gui/e-calendar-view.c:1585
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "Delete this _Occurrence"
 msgstr "Poista tämä _tapahtumakerta"
 
-#: ../calendar/gui/e-calendar-view.c:1586
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "Delete _All Occurrences"
 msgstr "Poista _kaikki tapahtumakerrat"
 
-#: ../calendar/gui/e-calendar-view.c:1960
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-view.c:1951
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Järjestäjä: %s <%s>"
 
-#: ../calendar/gui/e-calendar-view.c:1973 ../calendar/gui/print.c:2339
+#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#: ../calendar/gui/e-calendar-view.c:1965 ../calendar/gui/print.c:2339
 #, c-format
 msgid "Location: %s"
 msgstr "Sijainti: %s"
 
-#: ../calendar/gui/e-calendar-view.c:2003
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../calendar/gui/e-calendar-view.c:1996
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aika: %s %s"
@@ -7238,94 +7160,94 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:762
 msgid "Yes. (Complex Recurrence)"
 msgstr "Kyllä (monimutkainen toistuvuus)"
 
-#: ../calendar/gui/e-itip-control.c:771
+#: ../calendar/gui/e-itip-control.c:773
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Joka päivä"
 msgstr[1] "Joka %d:s päivä"
 
-#: ../calendar/gui/e-itip-control.c:776
+#: ../calendar/gui/e-itip-control.c:778
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Joka kerta"
 msgstr[1] "Joka %d:s kerta"
 
-#: ../calendar/gui/e-itip-control.c:778
+#: ../calendar/gui/e-itip-control.c:780
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Joka viikko "
 msgstr[1] "Joka %d:s viikko "
 
-#: ../calendar/gui/e-itip-control.c:786
+#: ../calendar/gui/e-itip-control.c:788
 msgid " and "
 msgstr " ja "
 
-#: ../calendar/gui/e-itip-control.c:793
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "The %s day of "
 msgstr "%s:s päivä"
 
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:808
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s"
 
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:815
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "kerran kuussa"
 msgstr[1] "kerran %d:s kuu"
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:819
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Joka vuosi"
 msgstr[1] "Joka %d:s vuosi"
 
-#: ../calendar/gui/e-itip-control.c:828
+#: ../calendar/gui/e-itip-control.c:830
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " %d kerran"
 msgstr[1] " %d kertaa"
 
-#: ../calendar/gui/e-itip-control.c:837
+#: ../calendar/gui/e-itip-control.c:839
 msgid ", ending on "
 msgstr ", päättyen"
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:863
 msgid "Starts"
 msgstr "Alkaa"
 
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:876
 msgid "Ends"
 msgstr "Päättyy"
 
-#: ../calendar/gui/e-itip-control.c:908
+#: ../calendar/gui/e-itip-control.c:910
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "Erääntyy "
 
-#: ../calendar/gui/e-itip-control.c:948 ../calendar/gui/e-itip-control.c:1005
+#: ../calendar/gui/e-itip-control.c:950 ../calendar/gui/e-itip-control.c:1007
 msgid "iCalendar Information"
 msgstr "iCalendarin tiedot"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:965
+#: ../calendar/gui/e-itip-control.c:967
 msgid "iCalendar Error"
 msgstr "iCalendarin virhe"
 
-#: ../calendar/gui/e-itip-control.c:1037 ../calendar/gui/e-itip-control.c:1053
-#: ../calendar/gui/e-itip-control.c:1064 ../calendar/gui/e-itip-control.c:1081
+#: ../calendar/gui/e-itip-control.c:1039 ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:1066 ../calendar/gui/e-itip-control.c:1083
 #: ../plugins/itip-formatter/itip-view.c:337
 #: ../plugins/itip-formatter/itip-view.c:338
 #: ../plugins/itip-formatter/itip-view.c:405
@@ -7334,299 +7256,299 @@ msgid "An unknown person"
 msgstr "Tuntematon henkilö"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1088
+#: ../calendar/gui/e-itip-control.c:1090
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Tarkista seuraavat tiedot ja valitse toimenpide allaolevasta valikosta"
 
-#: ../calendar/gui/e-itip-control.c:1136
+#: ../calendar/gui/e-itip-control.c:1138
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/itip-utils.c:546
 #: ../plugins/itip-formatter/itip-formatter.c:1640
 msgid "Accepted"
 msgstr "Hyväksytty"
 
-#: ../calendar/gui/e-itip-control.c:1140 ../calendar/gui/itip-utils.c:549
+#: ../calendar/gui/e-itip-control.c:1142 ../calendar/gui/itip-utils.c:549
 #: ../plugins/itip-formatter/itip-formatter.c:1643
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
 
-#: ../calendar/gui/e-itip-control.c:1144
+#: ../calendar/gui/e-itip-control.c:1146
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:552 ../calendar/gui/itip-utils.c:581
 #: ../plugins/itip-formatter/itip-formatter.c:1646
 msgid "Declined"
 msgstr "Hylätty"
 
-#: ../calendar/gui/e-itip-control.c:1228
+#: ../calendar/gui/e-itip-control.c:1230
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
 msgstr "Kokous on peruttu, mutta sitä ei voitu löytää kalentereistasi"
 
-#: ../calendar/gui/e-itip-control.c:1230
+#: ../calendar/gui/e-itip-control.c:1232
 msgid ""
 "The task has been cancelled, however it could not be found in your task lists"
 msgstr "Tehtävä on peruttu, mutta sitä ei voitu löytää tehtävälistoiltasi"
 
-#: ../calendar/gui/e-itip-control.c:1309
+#: ../calendar/gui/e-itip-control.c:1311
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> on julkaissut tapaamistietonsa."
 
-#: ../calendar/gui/e-itip-control.c:1310
+#: ../calendar/gui/e-itip-control.c:1312
 msgid "Meeting Information"
 msgstr "Kokouksen tiedot"
 
-#: ../calendar/gui/e-itip-control.c:1316
+#: ../calendar/gui/e-itip-control.c:1318
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> pyytää %s läsnäoloa tapaamisessa."
 
-#: ../calendar/gui/e-itip-control.c:1318
+#: ../calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> pyytää läsnäoloasi kokouksessa."
 
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1321
 msgid "Meeting Proposal"
 msgstr "Kokousehdotus"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1325
+#: ../calendar/gui/e-itip-control.c:1327
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> toivoo pääsyä olemassaolevaan kokoukseen."
 
-#: ../calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1328
 msgid "Meeting Update"
 msgstr "Kokouksen päivitys"
 
-#: ../calendar/gui/e-itip-control.c:1330
+#: ../calendar/gui/e-itip-control.c:1332
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> toivoo saavansa viimeisimmät tapaamistiedot."
 
-#: ../calendar/gui/e-itip-control.c:1331
+#: ../calendar/gui/e-itip-control.c:1333
 msgid "Meeting Update Request"
 msgstr "Kokouksen päivtyspyyntö"
 
-#: ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-itip-control.c:1340
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> on vastannut tapaamispyyntöön."
 
-#: ../calendar/gui/e-itip-control.c:1339
+#: ../calendar/gui/e-itip-control.c:1341
 msgid "Meeting Reply"
 msgstr "Kokouspyynnön vastaus"
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1348
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> on peruuttanut tapaamisen."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1349
 msgid "Meeting Cancellation"
 msgstr "Kokouksen peruminen"
 
-#: ../calendar/gui/e-itip-control.c:1357 ../calendar/gui/e-itip-control.c:1434
-#: ../calendar/gui/e-itip-control.c:1474
+#: ../calendar/gui/e-itip-control.c:1359 ../calendar/gui/e-itip-control.c:1436
+#: ../calendar/gui/e-itip-control.c:1476
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> lähetti järjettömän viestin."
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1360
 msgid "Bad Meeting Message"
 msgstr "Huono tapaaminen-sanoma"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> on julkaissut tehtävätietonsa."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Tehtävän tiedot"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> pyytää %s tekemään työtehtävän."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1397
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> pyytää sinua suorittamaan tehtävän."
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1398
 msgid "Task Proposal"
 msgstr "Tehtäväehdotus"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1402
+#: ../calendar/gui/e-itip-control.c:1404
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> toivoo lisäystään olemassaolevaan tehtävään"
 
-#: ../calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1405
 msgid "Task Update"
 msgstr "Tehtävän päivitys"
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1409
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> toivoo saavansa viimeisimmät työtehtävätiedot."
 
-#: ../calendar/gui/e-itip-control.c:1408
+#: ../calendar/gui/e-itip-control.c:1410
 msgid "Task Update Request"
 msgstr "Tehtävän päivityspyyntö"
 
-#: ../calendar/gui/e-itip-control.c:1415
+#: ../calendar/gui/e-itip-control.c:1417
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> on vastannut työtehtävän antoon."
 
-#: ../calendar/gui/e-itip-control.c:1416
+#: ../calendar/gui/e-itip-control.c:1418
 msgid "Task Reply"
 msgstr "Vastaus tehtävään"
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1425
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> perui tehtävän."
 
-#: ../calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1426
 msgid "Task Cancellation"
 msgstr "Tehtävän peruminen"
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1437
 msgid "Bad Task Message"
 msgstr "Huono tehtävä-sanoma"
 
-#: ../calendar/gui/e-itip-control.c:1459
+#: ../calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> on julkaissut vapaa/varattu-tietonsa."
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Free/Busy Information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1466
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pyytää sinun vapaa/varattu -tietoja."
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1467
 msgid "Free/Busy Request"
 msgstr "Vapaa/varattu-tiedustulu"
 
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1471
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> on vastannut vapaa/varattu -kyselyyn."
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1472
 msgid "Free/Busy Reply"
 msgstr "Vapaa/varattu-vastaus"
 
-#: ../calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1477
 msgid "Bad Free/Busy Message"
 msgstr "Huono vapaa/kiireinen -viesti"
 
-#: ../calendar/gui/e-itip-control.c:1550
+#: ../calendar/gui/e-itip-control.c:1552
 msgid "The message does not appear to be properly formed"
 msgstr "Viesti ei näytä olevan kunnolla muotoiltu."
 
-#: ../calendar/gui/e-itip-control.c:1609
+#: ../calendar/gui/e-itip-control.c:1611
 msgid "The message contains only unsupported requests."
 msgstr "Viesti sisältää vain pyyntöjä, jotka eivät ole tuettu."
 
-#: ../calendar/gui/e-itip-control.c:1642
+#: ../calendar/gui/e-itip-control.c:1644
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Liite ei sisällä kelvollista kalenteriviestiä"
 
-#: ../calendar/gui/e-itip-control.c:1674
+#: ../calendar/gui/e-itip-control.c:1676
 msgid "The attachment has no viewable calendar items"
 msgstr "Liitteessä ei ole näytettäviä kalenteriviestejä"
 
-#: ../calendar/gui/e-itip-control.c:1908
+#: ../calendar/gui/e-itip-control.c:1910
 msgid "Update complete\n"
 msgstr "Päivitys valmis\n"
 
-#: ../calendar/gui/e-itip-control.c:1936
+#: ../calendar/gui/e-itip-control.c:1938
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Kohde on virheellinen eikä sitä voida päivittää\n"
 
-#: ../calendar/gui/e-itip-control.c:1946
+#: ../calendar/gui/e-itip-control.c:1948
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Vastaus ei ole tämänhetkiseltä läsnäolijalta. Lisää läsnäolijaksi?"
 
-#: ../calendar/gui/e-itip-control.c:1958
+#: ../calendar/gui/e-itip-control.c:1960
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Läsnäolon tilaa ei voitu päivittää virheellisen tilan takia\n"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1977
 msgid "Attendee status updated\n"
 msgstr "Läsnäolon tila päivitetty\n"
 
-#: ../calendar/gui/e-itip-control.c:1978
+#: ../calendar/gui/e-itip-control.c:1980
 #: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Läsnäolon tilaa ei voida päivittää, koska kohdetta ei enää ole olemassa"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2010
 msgid "Removal Complete"
 msgstr "Poisto valmis"
 
-#: ../calendar/gui/e-itip-control.c:2031 ../calendar/gui/e-itip-control.c:2079
+#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2081
 msgid "Item sent!\n"
 msgstr "Lähetetty\n"
 
-#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2083
+#: ../calendar/gui/e-itip-control.c:2035 ../calendar/gui/e-itip-control.c:2085
 msgid "The item could not be sent!\n"
 msgstr "Kohdetta ei voitu lähettää!\n"
 
-#: ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2165
 msgid "Choose an action:"
 msgstr "Valitse toiminto:"
 
-#: ../calendar/gui/e-itip-control.c:2234
+#: ../calendar/gui/e-itip-control.c:2237
 msgid "Update"
 msgstr "Päivitä"
 
-#: ../calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2265
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Hyväksy"
 
-#: ../calendar/gui/e-itip-control.c:2263
+#: ../calendar/gui/e-itip-control.c:2266
 msgid "Tentatively accept"
 msgstr "Hyväksy alustavasti"
 
-#: ../calendar/gui/e-itip-control.c:2264
+#: ../calendar/gui/e-itip-control.c:2267
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Hylkää"
 
-#: ../calendar/gui/e-itip-control.c:2293
+#: ../calendar/gui/e-itip-control.c:2296
 msgid "Send Free/Busy Information"
 msgstr "Lähetä vapaa/varattu-tiedot"
 
-#: ../calendar/gui/e-itip-control.c:2321
+#: ../calendar/gui/e-itip-control.c:2324
 msgid "Update respondent status"
 msgstr "Päivitä vastaajan tila"
 
-#: ../calendar/gui/e-itip-control.c:2349
+#: ../calendar/gui/e-itip-control.c:2352
 msgid "Send Latest Information"
 msgstr "Lähetä viimeisimmät tiedot"
 
-#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:569
+#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:569
 #: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
@@ -7687,63 +7609,63 @@ msgid "Resources"
 msgstr "Resurssit"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:802
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
+#: ../calendar/gui/e-meeting-store.c:803
 msgid "Individual"
 msgstr "Henkilö"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Ryhmä"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Resource"
 msgstr "Resurssi"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 msgid "Room"
 msgstr "Huone"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
 msgid "Chair"
 msgstr "Puheenjohtaja"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:805
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
+#: ../calendar/gui/e-meeting-store.c:806
 msgid "Required Participant"
 msgstr "Vaadittu läsnäolija"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Optional Participant"
 msgstr "Vapaaehoinen läsnäolija"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 msgid "Non-Participant"
 msgstr "Ei läsnä"
 
 #: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-store.c:815
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:816
 msgid "Needs Action"
 msgstr "Vaatii toimenpiteitä"
 
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "Tentative"
 msgstr "Alustava"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 #: ../calendar/gui/itip-utils.c:555
 #: ../plugins/itip-formatter/itip-formatter.c:1649
 msgid "Delegated"
@@ -7754,7 +7676,7 @@ msgstr "Valtuutettu"
 msgid "Attendee                          "
 msgstr "Osallistuja                       "
 
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 msgid "In Process"
 msgstr "Työn alla"
 
@@ -7847,15 +7769,15 @@ msgstr "_Alkamisaika:"
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
-#: ../calendar/gui/e-memo-table.c:274
+#: ../calendar/gui/e-memo-table.c:276
 msgid "Memo Table"
 msgstr "Muistilapputaulu"
 
-#: ../calendar/gui/e-memo-table.c:870
+#: ../calendar/gui/e-memo-table.c:872
 msgid "_Delete Selected Memos"
 msgstr "_Poista valitut muistilaput"
 
-#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:995 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Lisää muistilappu näpäyttämällä tästä"
 
@@ -8064,77 +7986,77 @@ msgstr "iCalendarin tiedot"
 msgid "You must be an attendee of the event."
 msgstr "Sinun täytyy osallistua tapahtumaan."
 
-#: ../calendar/gui/memos-component.c:449 ../ui/evolution-addressbook.xml.h:3
+#: ../calendar/gui/memos-component.c:450 ../ui/evolution-addressbook.xml.h:3
 #: ../ui/evolution-memos.xml.h:2 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopioi"
 
-#: ../calendar/gui/memos-component.c:450 ../mail/em-filter-i18n.h:11
+#: ../calendar/gui/memos-component.c:451 ../mail/em-filter-i18n.h:11
 #: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Poista"
 
-#: ../calendar/gui/memos-component.c:451
+#: ../calendar/gui/memos-component.c:452
 msgid "Properties..."
 msgstr "Ominaisuudet..."
 
-#: ../calendar/gui/memos-component.c:524
+#: ../calendar/gui/memos-component.c:525
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d muistilappu"
 msgstr[1] "%d muistilappua"
 
-#: ../calendar/gui/memos-component.c:526 ../calendar/gui/tasks-component.c:517
-#: ../mail/mail-component.c:548
+#: ../calendar/gui/memos-component.c:527 ../calendar/gui/tasks-component.c:518
+#: ../mail/mail-component.c:559
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d valittu"
 msgstr[1] ", %d valittua"
 
-#: ../calendar/gui/memos-component.c:573
+#: ../calendar/gui/memos-component.c:574
 msgid "Failed upgrading memos."
 msgstr "Muistilappujen päivitys epäonnistui."
 
-#: ../calendar/gui/memos-component.c:869
+#: ../calendar/gui/memos-component.c:870
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "Muistilappulistaa '%s' ei voitu avata uusien tapahtumien ja kokousten "
 "lisäämistä varten"
 
-#: ../calendar/gui/memos-component.c:882
+#: ../calendar/gui/memos-component.c:883
 msgid "There is no calendar available for creating memos"
 msgstr "Muistilappujen luomiseen tarvittavaa kalenteria ei ole saatavilla"
 
-#: ../calendar/gui/memos-component.c:973
+#: ../calendar/gui/memos-component.c:974
 msgid "Memo Source Selector"
 msgstr "Muistilappujen lähteen valinta"
 
-#: ../calendar/gui/memos-component.c:1156
+#: ../calendar/gui/memos-component.c:1157
 msgid "New memo"
 msgstr "Uusi muistilappu"
 
-#: ../calendar/gui/memos-component.c:1157
+#: ../calendar/gui/memos-component.c:1158
 msgid "_Memo"
 msgstr "_Muistilappu"
 
-#: ../calendar/gui/memos-component.c:1158
+#: ../calendar/gui/memos-component.c:1159
 msgid "Create a new memo"
 msgstr "Luo uusi muistilappu"
 
-#: ../calendar/gui/memos-component.c:1164
+#: ../calendar/gui/memos-component.c:1165
 msgid "New memo list"
 msgstr "Uusi muistilappulista"
 
-#: ../calendar/gui/memos-component.c:1165
+#: ../calendar/gui/memos-component.c:1166
 msgid "Memo l_ist"
 msgstr "Muistilappul_ista"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1167
 msgid "Create a new memo list"
 msgstr "Luo uusi muistilappulista"
 
@@ -8142,7 +8064,7 @@ msgstr "Luo uusi muistilappulista"
 msgid "Print Memos"
 msgstr "Tulosta muistilaput"
 
-#: ../calendar/gui/migration.c:151
+#: ../calendar/gui/migration.c:156
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8154,7 +8076,7 @@ msgstr ""
 "\n"
 "Odota kärsivällisesti, kun Evolution konvertoi kansioitas..."
 
-#: ../calendar/gui/migration.c:155
+#: ../calendar/gui/migration.c:160
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8167,19 +8089,19 @@ msgstr ""
 "Odota kärsivällisesti, kun Evolution konvertoi kansioitasi..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
+#: ../calendar/gui/migration.c:753 ../calendar/gui/migration.c:919
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 "Vanhojen asetusten siirto ei onnistunut tiedostosta evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:777
+#: ../calendar/gui/migration.c:782
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Kalenterin '%s' muunnos epäonnistui"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:944
+#: ../calendar/gui/migration.c:948
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Tehtävien '%s' muunnos epäonnistui"
@@ -8420,65 +8342,65 @@ msgstr "Tulostuksen esikatselu"
 msgid "Print Item"
 msgstr "Tulosta kohta"
 
-#: ../calendar/gui/tasks-component.c:439
+#: ../calendar/gui/tasks-component.c:440
 msgid "_New Task List"
 msgstr "_Uusi tehtävälista"
 
-#: ../calendar/gui/tasks-component.c:515
+#: ../calendar/gui/tasks-component.c:516
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tehtävä"
 msgstr[1] "%d tehtävää"
 
-#: ../calendar/gui/tasks-component.c:564
+#: ../calendar/gui/tasks-component.c:565
 msgid "Failed upgrading tasks."
 msgstr "Tehtävälistan päivitys epäonnistui."
 
-#: ../calendar/gui/tasks-component.c:875
+#: ../calendar/gui/tasks-component.c:876
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Tehtävälistaa '%s' ei voitu avata uusien tehtävien ja tapaamisten tekemistä "
 "varten"
 
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:889
 msgid "There is no calendar available for creating tasks"
 msgstr "Tehtävien luomiseen tarvittavaa kalenteria ei ole saatavilla"
 
-#: ../calendar/gui/tasks-component.c:988
+#: ../calendar/gui/tasks-component.c:989
 msgid "Task Source Selector"
 msgstr "Tehtävien lähteen valinta"
 
-#: ../calendar/gui/tasks-component.c:1171
+#: ../calendar/gui/tasks-component.c:1172
 msgid "New task"
 msgstr "Uusi tehtävä"
 
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/tasks-component.c:1174
 msgid "Create a new task"
 msgstr "Luo uusi tehtävä"
 
-#: ../calendar/gui/tasks-component.c:1179
+#: ../calendar/gui/tasks-component.c:1180
 msgid "New assigned task"
 msgstr "Uusi tehtäväksianto"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1181
 msgid "Assigne_d Task"
 msgstr "Tehtäväksi_anto"
 
-#: ../calendar/gui/tasks-component.c:1181
+#: ../calendar/gui/tasks-component.c:1182
 msgid "Create a new assigned task"
 msgstr "Luo uusi tehtäväksianto"
 
-#: ../calendar/gui/tasks-component.c:1187
+#: ../calendar/gui/tasks-component.c:1188
 msgid "New task list"
 msgstr "Uusi tehtävälista"
 
-#: ../calendar/gui/tasks-component.c:1188
+#: ../calendar/gui/tasks-component.c:1189
 msgid "Task l_ist"
 msgstr "_Tehtävälista"
 
-#: ../calendar/gui/tasks-component.c:1189
+#: ../calendar/gui/tasks-component.c:1190
 msgid "Create a new task list"
 msgstr "Luo uusi tehtävälista"
 
@@ -8507,40 +8429,40 @@ msgstr "Tulosta tehtävät"
 msgid "SMTWTFS"
 msgstr "SMTKTPL"
 
-#: ../calendar/importers/icalendar-importer.c:78
+#: ../calendar/importers/icalendar-importer.c:79
 msgid "Appointments and Meetings"
 msgstr "Tapaamiset ja kokoukset"
 
-#: ../calendar/importers/icalendar-importer.c:336
-#: ../calendar/importers/icalendar-importer.c:586
+#: ../calendar/importers/icalendar-importer.c:337
+#: ../calendar/importers/icalendar-importer.c:620
 msgid "Opening calendar"
 msgstr "Avataan kalenteria"
 
-#: ../calendar/importers/icalendar-importer.c:429
+#: ../calendar/importers/icalendar-importer.c:444
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar tiedostot (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:430
+#: ../calendar/importers/icalendar-importer.c:445
 msgid "Evolution iCalendar importer"
 msgstr "Evolutionin iCalendar-tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:494
+#: ../calendar/importers/icalendar-importer.c:521
 msgid "Reminder!!"
 msgstr "Muistutus!"
 
-#: ../calendar/importers/icalendar-importer.c:539
+#: ../calendar/importers/icalendar-importer.c:573
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar tiedostot (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:540
+#: ../calendar/importers/icalendar-importer.c:574
 msgid "Evolution vCalendar importer"
 msgstr "Evolutionin vCalendar-tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:702
+#: ../calendar/importers/icalendar-importer.c:736
 msgid "Calendar Events"
 msgstr "Kalenteritapahtumat"
 
-#: ../calendar/importers/icalendar-importer.c:739
+#: ../calendar/importers/icalendar-importer.c:773
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution kalenterin älykäs tuoja"
 
@@ -10074,6 +9996,46 @@ msgstr "Tyyni_Valtameri/Wallis"
 msgid "Pacific/Yap"
 msgstr "Tyyni_Valtameri/Yap"
 
+#: ../composer/e-msg-composer-attachment-bar.c:105
+#: ../widgets/misc/e-attachment-bar.c:106
+#, c-format
+msgid "%.0fK"
+msgstr "%.0fK"
+
+#: ../composer/e-msg-composer-attachment-bar.c:108
+#: ../widgets/misc/e-attachment-bar.c:109
+#, c-format
+msgid "%.0fM"
+msgstr "%.0fM"
+
+#: ../composer/e-msg-composer-attachment-bar.c:111
+#: ../widgets/misc/e-attachment-bar.c:112
+#, c-format
+msgid "%.0fG"
+msgstr "%.0fG"
+
+#: ../composer/e-msg-composer-attachment-bar.c:740
+#: ../widgets/misc/e-attachment-bar.c:994
+msgid "Attachment Bar"
+msgstr "Liitepalkki"
+
+#: ../composer/e-msg-composer-attachment.c:187
+#: ../composer/e-msg-composer-attachment.c:203
+#: ../composer/e-msg-composer-attachment.c:297
+#: ../composer/e-msg-composer-attachment.c:313
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:442 ../widgets/misc/e-attachment.c:458
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "Tiedoston %s liittäminen epäonnistui: %s"
+
+#: ../composer/e-msg-composer-attachment.c:195
+#: ../composer/e-msg-composer-attachment.c:305
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:450
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "Tiedoston %s liittäminen epäonnistui: epätavallinen tiedosto"
+
 #: ../composer/e-msg-composer-hdrs.c:558
 msgid "Posting destination"
 msgstr "Postituksen kohde"
@@ -10162,14 +10124,14 @@ msgstr "Lii_tä"
 msgid "Insert Attachment"
 msgstr "Lisää liite"
 
-#: ../composer/e-msg-composer.c:837
+#: ../composer/e-msg-composer.c:830
 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:844
+#: ../composer/e-msg-composer.c:837
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10177,47 +10139,47 @@ msgstr ""
 "Lähtevää viestiä ei voida salata: Salausvarmennetta ei ole asetettu tälle "
 "tilille"
 
-#: ../composer/e-msg-composer.c:1327 ../composer/e-msg-composer.c:1361
+#: ../composer/e-msg-composer.c:1320 ../composer/e-msg-composer.c:1354
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Tuntematon syy"
 
-#: ../composer/e-msg-composer.c:1399
+#: ../composer/e-msg-composer.c:1392
 msgid "Could not open file"
 msgstr "Tiedostoa ei voitu avata"
 
-#: ../composer/e-msg-composer.c:1407
+#: ../composer/e-msg-composer.c:1400
 msgid "Unable to retrieve message from editor"
 msgstr "Viestiä ei voida hakea muokkaimelta"
 
-#: ../composer/e-msg-composer.c:1682
+#: ../composer/e-msg-composer.c:1678
 msgid "Untitled Message"
 msgstr "Nimeämätön viesti"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1717
+#: ../composer/e-msg-composer.c:1713
 msgid "Open File"
 msgstr "Avaa tiedosto"
 
-#: ../composer/e-msg-composer.c:2144 ../mail/em-account-editor.c:588
-#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
+#: ../composer/e-msg-composer.c:2140 ../mail/em-account-editor.c:596
+#: ../mail/em-account-editor.c:641 ../mail/em-account-editor.c:708
 msgid "Autogenerated"
 msgstr "Automaattisesti luotu"
 
-#: ../composer/e-msg-composer.c:2247
+#: ../composer/e-msg-composer.c:2243
 msgid "Si_gnature:"
 msgstr "_Allekirjoitus:"
 
-#: ../composer/e-msg-composer.c:2498 ../composer/e-msg-composer.c:3699
-#: ../composer/e-msg-composer.c:3702
+#: ../composer/e-msg-composer.c:2497 ../composer/e-msg-composer.c:3701
+#: ../composer/e-msg-composer.c:3704
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: ../composer/e-msg-composer.c:3817
+#: ../composer/e-msg-composer.c:3819
 msgid "_Attachment Bar"
 msgstr "Liitep_alkki"
 
-#: ../composer/e-msg-composer.c:4909
+#: ../composer/e-msg-composer.c:4911
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10366,7 +10328,7 @@ msgstr "_Tallenna viesti"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:509
+#: ../shell/main.c:514
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10517,7 +10479,7 @@ msgid "Evolution Query"
 msgstr "Evolutionin kysely"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:438
+#: ../e-util/e-error.c:442
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -10545,7 +10507,7 @@ msgstr "Tiedosto &quot;{0}&quot;on jo olemassa."
 msgid "_Overwrite"
 msgstr "_Ylikirjoita"
 
-#: ../e-util/eggtrayicon.c:119
+#: ../e-util/eggtrayicon.c:121
 msgid "The orientation of the tray."
 msgstr "Hyllyn suunta."
 
@@ -10615,25 +10577,25 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Valitse aika johon verrataan"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Valitse tiedosto"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1041 ../mail/mail-config.c:76
+#: ../mail/em-migrate.c:1051 ../mail/mail-config.c:84
 #: ../mail/mail-config.glade.h:91
 msgid "Important"
 msgstr "Tärkeä"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1044
-#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1054
+#: ../mail/mail-config.c:87 ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "Tehtävää"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1045
-#: ../mail/mail-config.c:80 ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.c:88 ../mail/mail-config.glade.h:95
 msgid "Later"
 msgstr "Myöhemmin"
 
@@ -10642,24 +10604,24 @@ msgid "Test"
 msgstr "Testi"
 
 #: ../filter/filter-rule.c:791
-msgid "_Rule name:"
-msgstr "_Säännön nimi:"
+msgid "_Search name:"
+msgstr "_Haun nimi::"
 
 #: ../filter/filter-rule.c:819
-msgid "If"
-msgstr "Jos"
+msgid "Find items that meet the following criteria"
+msgstr "Etsi kohdat, jotka vastaavat seuraavaa ehtoa"
 
 #: ../filter/filter-rule.c:858
-msgid "if all criteria are met"
-msgstr "kaikki ehdot täytetään"
+msgid "If all criteria are met"
+msgstr "jos kaikki ehdot täytetään"
 
 #: ../filter/filter-rule.c:858
-msgid "if any criteria are met"
+msgid "If any criteria are met"
 msgstr "jos joku ehdoista täyttyy"
 
 #: ../filter/filter-rule.c:860
-msgid "Execute actions"
-msgstr "Suorita toiminnot"
+msgid "Find items:"
+msgstr "Etsi kohteita:"
 
 #: ../filter/filter-rule.c:881
 msgid "All related"
@@ -10678,11 +10640,11 @@ msgid "Include threads"
 msgstr "Ota myös säikeet mukaan"
 
 #: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:330
+#: ../mail/em-utils.c:348
 msgid "Incoming"
 msgstr "Tulevat"
 
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:331
+#: ../filter/filter-rule.c:978 ../mail/em-utils.c:349
 msgid "Outgoing"
 msgstr "Lähtevät"
 
@@ -10791,15 +10753,15 @@ msgstr "määrittelemäsi aika"
 msgid "years"
 msgstr "vuotta"
 
-#: ../filter/rule-editor.c:290
+#: ../filter/rule-editor.c:292
 msgid "Add Rule"
 msgstr "Lisää sääntö"
 
-#: ../filter/rule-editor.c:366
+#: ../filter/rule-editor.c:368
 msgid "Edit Rule"
 msgstr "Muokkaa sääntöä"
 
-#: ../filter/rule-editor.c:698
+#: ../filter/rule-editor.c:735
 msgid "Rule name"
 msgstr "Säännön nimi"
 
@@ -10847,11 +10809,11 @@ msgstr "Evolution sähköpostin muokkaimen asetukset"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution sähköpostin asetukset"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:495
-#: ../mail/importers/elm-importer.c:342
-#: ../mail/importers/netscape-importer.c:1902
-#: ../mail/importers/pine-importer.c:388 ../mail/mail-component.c:561
-#: ../mail/mail-component.c:648
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
+#: ../mail/importers/elm-importer.c:341
+#: ../mail/importers/netscape-importer.c:1903
+#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:577
+#: ../mail/mail-component.c:578 ../mail/mail-component.c:663
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Sähköposti"
@@ -10869,12 +10831,12 @@ msgstr "Sähköpostin asetukset"
 msgid "_Mail"
 msgstr "_Sähköposti"
 
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:395
 #, c-format
 msgid "%s License Agreement"
 msgstr "Lisenssisopimus ohjelmalle %s"
 
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:402
 #, c-format
 msgid ""
 "\n"
@@ -10887,77 +10849,94 @@ msgstr ""
 "ohjelmalle %s\n"
 "ja ruksita laatikko, jos hyväksyt lisenssin\n"
 
-#: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:495
+#: ../mail/em-account-editor.c:472 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "Valitse kansio"
 
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:768
 msgid "Ask for each message"
 msgstr "Kysy jokaisen viestin osalta"
 
-#: ../mail/em-account-editor.c:1724 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1747 ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "Omat tiedot"
 
-#: ../mail/em-account-editor.c:1760 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1796 ../mail/mail-config.glade.h:117
 msgid "Receiving Email"
 msgstr "Vastaanotto"
 
-#: ../mail/em-account-editor.c:1943
+#: ../mail/em-account-editor.c:1979
 msgid "Automatically check for _new mail every"
 msgstr "T_arkista onko uutta postia joka"
 
-#: ../mail/em-account-editor.c:2111 ../mail/mail-config.glade.h:128
+#: ../mail/em-account-editor.c:2160 ../mail/mail-config.glade.h:129
 msgid "Sending Email"
 msgstr "Lähetys"
 
-#: ../mail/em-account-editor.c:2165 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2219 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Oletusasetukset"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2226 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:313
+#: ../mail/em-account-editor.c:2285 ../mail/mail-config.glade.h:122
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Turvallisuus"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2263 ../mail/em-account-editor.c:2337
+#: ../mail/em-account-editor.c:2322 ../mail/em-account-editor.c:2412
 msgid "Receiving Options"
 msgstr "Vastaanoton asetukset"
 
-#: ../mail/em-account-editor.c:2264 ../mail/em-account-editor.c:2338
+#: ../mail/em-account-editor.c:2323 ../mail/em-account-editor.c:2413
 msgid "Checking for New Mail"
 msgstr "Uusien viestien haku"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2737 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Tilimuokkain"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2737 ../mail/mail-config.glade.h:80
 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:407
+msgid "Disable"
+msgstr "Älä käytä"
+
+#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
+#: ../mail/em-account-prefs.c:409
+msgid "Enable"
+msgstr "Käytä"
+
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:455
+#: ../mail/em-account-prefs.c:456
 msgid "[Default]"
 msgstr "[Oletus]"
 
-#: ../mail/em-account-prefs.c:510
+#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
+#: ../mail/em-account-prefs.c:505 ../mail/em-composer-prefs.c:930
+#: ../plugins/plugin-manager/plugin-manager.c:213
+#: ../plugins/publish-calendar/publish-calendar.c:451
+msgid "Enabled"
+msgstr "Käytä"
+
+#: ../mail/em-account-prefs.c:511
 msgid "Account name"
 msgstr "Tilin nimi"
 
-#: ../mail/em-account-prefs.c:512
+#: ../mail/em-account-prefs.c:513
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: ../mail/em-account-prefs.c:517
+#: ../mail/em-account-prefs.c:518
 msgid "Mail Accounts Table"
 msgstr "Sähköpostitilit"
 
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:958
+#: ../mail/mail-config.c:966
 msgid "Unnamed"
 msgstr "Nimeämätön"
 
@@ -10992,7 +10971,7 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kello ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} kirjoitti:"
 
-#: ../mail/em-filter-editor.c:147
+#: ../mail/em-filter-editor.c:155
 msgid "_Filter Rules"
 msgstr "_Suodatinsäännöt"
 
@@ -11009,7 +10988,7 @@ msgstr "Aseta väri"
 msgid "Assign Score"
 msgstr "Aseta pistemäärä"
 
-#: ../mail/em-filter-i18n.h:5 ../ui/evolution-editor.xml.h:1
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Liitteet"
 
@@ -11130,7 +11109,7 @@ msgstr "Roskaposti"
 msgid "Junk Test"
 msgstr "Roskapostitesti"
 
-#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1064
+#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1105
 #: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Luokittelu"
@@ -11171,7 +11150,7 @@ msgstr "Välitä putkessa ohjelmalle"
 msgid "Play Sound"
 msgstr "Soita ääni"
 
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:80
+#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
 msgid "Read"
 msgstr "Lue"
 
@@ -11239,10 +11218,10 @@ msgstr "alkaa"
 msgid "Stop Processing"
 msgstr "Pysäytä käsittely"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1572
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1582
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
-#: ../mail/message-tag-followup.c:330
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
+#: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1131
 msgid "Subject"
@@ -11257,7 +11236,7 @@ msgstr "Poista tilan asetus"
 msgid "<b>Then</b>"
 msgstr "<b>Silloin</b>"
 
-#: ../mail/em-folder-browser.c:134
+#: ../mail/em-folder-browser.c:143
 msgid "C_reate Search Folder From Search..."
 msgstr "Luo _hakunäkymä haun perusteella..."
 
@@ -11291,34 +11270,34 @@ msgstr "Luo"
 msgid "Folder _name:"
 msgstr "Kansion _nimi:"
 
-#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
-#: ../mail/mail-vfolder.c:937 ../mail/mail-vfolder.c:1007
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-folder-tree-model.c:204
+#: ../mail/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "Hakunäkymät"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:208 ../mail/em-folder-tree-model.c:210
 msgid "UNMATCHED"
 msgstr "EI VASTAAVAA"
 
-#: ../mail/em-folder-tree-model.c:469 ../mail/mail-component.c:144
+#: ../mail/em-folder-tree-model.c:483 ../mail/mail-component.c:150
 msgid "Drafts"
 msgstr "Luonnokset"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:472 ../mail/mail-component.c:143
+#: ../mail/em-folder-tree-model.c:486 ../mail/mail-component.c:149
 msgid "Inbox"
 msgstr "Saapuneet"
 
-#: ../mail/em-folder-tree-model.c:475 ../mail/mail-component.c:145
+#: ../mail/em-folder-tree-model.c:489 ../mail/mail-component.c:151
 msgid "Outbox"
 msgstr "Lähtevät"
 
-#: ../mail/em-folder-tree-model.c:477 ../mail/mail-component.c:146
+#: ../mail/em-folder-tree-model.c:491 ../mail/mail-component.c:152
 msgid "Sent"
 msgstr "Lähetetyt"
 
-#: ../mail/em-folder-tree-model.c:499 ../mail/em-folder-tree-model.c:803
+#: ../mail/em-folder-tree-model.c:513 ../mail/em-folder-tree-model.c:817
 msgid "Loading..."
 msgstr "Ladataan..."
 
@@ -11336,12 +11315,12 @@ msgstr "Siirretään kansiota %s"
 msgid "Copying folder %s"
 msgstr "Kopioidaan kansiota %s"
 
-#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1623
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1621
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Siirretään viestejä kansioon %s"
 
-#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1625
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1623
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejä kansioon %s"
@@ -11350,15 +11329,15 @@ msgstr "Kopioidaan viestejä kansioon %s"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Viestiä ei voida tiputtaa ylätason taltioon"
 
-#: ../mail/em-folder-tree.c:977
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:106
 msgid "_Copy to Folder"
 msgstr "_Kopioi kansioon"
 
-#: ../mail/em-folder-tree.c:978
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Siirrä kansioon"
 
-#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1057
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Etsitään kansioita kohteessa \"%s\""
@@ -11401,13 +11380,13 @@ msgstr "_Tyhjennä roskakori"
 msgid "Copying `%s' to `%s'"
 msgstr "Kopioidaan %s paikkaan %s"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:932
-#: ../mail/em-folder-view.c:947 ../mail/importers/evolution-mbox-importer.c:85
-#: ../mail/importers/evolution-outlook-importer.c:134
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:947
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "_Kopioi"
 
@@ -11442,155 +11421,155 @@ msgstr "Luo uusi kansio"
 msgid "Specify where to create the folder:"
 msgstr "Määrittele mihin kansio luodaan:"
 
-#: ../mail/em-folder-view.c:1040
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../mail/em-folder-view.c:1082 ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: ../mail/em-folder-view.c:1042 ../mail/em-popup.c:560 ../mail/em-popup.c:571
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:560 ../mail/em-popup.c:571
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: ../mail/em-folder-view.c:1045 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:108
 msgid "_Edit as New Message..."
 msgstr "_Muokkaa uutena viestinä..."
 
-#: ../mail/em-folder-view.c:1051
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "_Palauta"
 
-#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:37
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../mail/em-folder-view.c:1093 ../ui/evolution-addressbook.xml.h:37
 msgid "_Move to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: ../mail/em-folder-view.c:1053 ../ui/evolution-addressbook.xml.h:33
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-view.c:1094 ../ui/evolution-addressbook.xml.h:33
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ../mail/em-folder-view.c:1056
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: ../mail/em-folder-view.c:1057
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ../mail/em-folder-view.c:1058
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Merkitse _tärkeäksi"
 
-#: ../mail/em-folder-view.c:1059
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "Merkitse yhden_tekeväksi"
 
-#: ../mail/em-folder-view.c:1060
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Luokittele _roskapostiksi"
 
-#: ../mail/em-folder-view.c:1061
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Luokittele _ei-roskapostiksi"
 
-#: ../mail/em-folder-view.c:1062
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "_Merkitse _edelleen lähetettäväksi..."
 
-#: ../mail/em-folder-view.c:1070
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: ../mail/em-folder-view.c:1071
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "_Poista merkki"
 
-#: ../mail/em-folder-view.c:1074
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "_Luo viestistä sääntö"
 
-#: ../mail/em-folder-view.c:1075
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Hakunäkymä _aiheen perusteella"
 
-#: ../mail/em-folder-view.c:1076
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Hakunäkymä _lähettäjän perusteella"
 
-#: ../mail/em-folder-view.c:1077
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Hakunäkymä _vastaanottajien perusteella"
 
-#: ../mail/em-folder-view.c:1078
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Hakunäkymä _listan perusteella"
 
-#: ../mail/em-folder-view.c:1082
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: ../mail/em-folder-view.c:1083
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Suodata _lähettäjän mukaan"
 
-#: ../mail/em-folder-view.c:1084
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: ../mail/em-folder-view.c:1085
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1923 ../mail/em-folder-view.c:1967
+#: ../mail/em-folder-view.c:1974 ../mail/em-folder-view.c:2018
 msgid "Default"
 msgstr "Oletukset"
 
-#: ../mail/em-folder-view.c:2066
+#: ../mail/em-folder-view.c:2117
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: ../mail/em-folder-view.c:2222
+#: ../mail/em-folder-view.c:2273
 msgid "Unable to retrieve message"
 msgstr "Viestiä ei voida hakea"
 
-#: ../mail/em-folder-view.c:2415
+#: ../mail/em-folder-view.c:2466
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: ../mail/em-folder-view.c:2417
+#: ../mail/em-folder-view.c:2468
 msgid "Create _Search Folder"
 msgstr "Luo uusi hakunäkymä"
 
-#: ../mail/em-folder-view.c:2418
+#: ../mail/em-folder-view.c:2469
 msgid "_From this Address"
 msgstr "_Tästä osoitteesta"
 
-#: ../mail/em-folder-view.c:2419
+#: ../mail/em-folder-view.c:2470
 msgid "_To this Address"
 msgstr "_Osoitteeseen:"
 
-#: ../mail/em-folder-view.c:2723
+#: ../mail/em-folder-view.c:2821
 #, c-format
 msgid "Click to mail %s"
 msgstr "Napsauta lähettääksesi %s"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:461
+#: ../mail/em-format-html-display.c:472
 #, c-format
 msgid "Matches: %d"
 msgstr "Osumia: %d"
 
-#: ../mail/em-format-html-display.c:712 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:729 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Allekirjoittamaton"
 
-#: ../mail/em-format-html-display.c:712
+#: ../mail/em-format-html-display.c:729
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11598,11 +11577,11 @@ msgstr ""
 "Viesti ei ole allekirjoitettu. Ei ole varmaa, että viestin lähettäjä on "
 "varmasti se, jolta viesti näyttää olevan."
 
-#: ../mail/em-format-html-display.c:713 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:730 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Hyväksytty allekirjoitus"
 
-#: ../mail/em-format-html-display.c:713
+#: ../mail/em-format-html-display.c:730
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11610,11 +11589,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu ja varmennettu. Viesti on "
 "hyvintodennäköisesti aito."
 
-#: ../mail/em-format-html-display.c:714 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:731 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Hylätty allekirjoitus"
 
-#: ../mail/em-format-html-display.c:714
+#: ../mail/em-format-html-display.c:731
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11622,11 +11601,11 @@ msgstr ""
 "Tämän viestin allekirjoitusta ei voida tarkistaa, se on ehkä muuttunut "
 "siirron aikana."
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:732
 msgid "Valid signature, cannot verify sender"
 msgstr "Allekirjoitus on kelvollinen, mutta lähettäjää ei voida varmistaa"
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:732
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11634,11 +11613,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lähettäjää ei voida varmistaa."
 
-#: ../mail/em-format-html-display.c:721 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:738 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Salaamaton"
 
-#: ../mail/em-format-html-display.c:721
+#: ../mail/em-format-html-display.c:738
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -11646,11 +11625,11 @@ msgstr ""
 "Viesti ei ole salattu. Viestin sisältöä voidaan tutkia sen kulkiessa "
 "Internetin läpi."
 
-#: ../mail/em-format-html-display.c:722 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:739 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Heikosti salattu"
 
-#: ../mail/em-format-html-display.c:722
+#: ../mail/em-format-html-display.c:739
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
@@ -11660,11 +11639,11 @@ msgstr ""
 "mahdotonta, että ulkopuolinen pystyy purkamaan ja katsomaanviestin sisällön "
 "käytännöllisen lyhyessä ajassa."
 
-#: ../mail/em-format-html-display.c:723 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:740 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Salattu"
 
-#: ../mail/em-format-html-display.c:723
+#: ../mail/em-format-html-display.c:740
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11672,11 +11651,11 @@ msgstr ""
 "Viesti on salattu. Ulkopuolisen on vaikea avata viestin sisältö "
 "luettavakseen."
 
-#: ../mail/em-format-html-display.c:724 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:741 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Salattu vahvalla algoritmilla"
 
-#: ../mail/em-format-html-display.c:724
+#: ../mail/em-format-html-display.c:741
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11686,67 +11665,71 @@ msgstr ""
 "vaikea purkaa salausta ja nähdä tämän viestin sisältön missään "
 "käytännöllisessä ajassa."
 
-#: ../mail/em-format-html-display.c:825 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:842 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Näytä varmenne"
 
-#: ../mail/em-format-html-display.c:840
+#: ../mail/em-format-html-display.c:857
 msgid "This certificate is not viewable"
 msgstr "Tätä varmennetta ei voida näyttää"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1145
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Valmistui %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1130
+#: ../mail/em-format-html-display.c:1153
 msgid "Overdue:"
 msgstr "Eräpäivä ylitetty:"
 
-#: ../mail/em-format-html-display.c:1133
+#: ../mail/em-format-html-display.c:1156
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "kirjoittanut %d %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1193
+#: ../mail/em-format-html-display.c:1216
 msgid "_View Inline"
 msgstr "Näytä _sisäkkäisesti"
 
-#: ../mail/em-format-html-display.c:1194
+#: ../mail/em-format-html-display.c:1217
 msgid "_Hide"
 msgstr "_Piilota"
 
-#: ../mail/em-format-html-display.c:1195
+#: ../mail/em-format-html-display.c:1218
 msgid "_Fit to Width"
 msgstr "Sovita _leveyteen"
 
-#: ../mail/em-format-html-display.c:1196
+#: ../mail/em-format-html-display.c:1219
 msgid "Show _Original Size"
 msgstr "Näytä alkuperäinen k_oko"
 
-#: ../mail/em-format-html-display.c:1566
+#: ../mail/em-format-html-display.c:1596
 msgid "Attachment Button"
 msgstr "Liitepainike"
 
-#: ../mail/em-format-html-display.c:1773
+#: ../mail/em-format-html-display.c:1803
 msgid "Select folder to save all attachments..."
 msgstr "Valitse kansio, johon kaikki liitteet tallennetaan..."
 
-#: ../mail/em-format-html-display.c:1820
+#: ../mail/em-format-html-display.c:1850
 msgid "Save Selected..."
 msgstr "Tallenna valitut..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1887
+#: ../mail/em-format-html-display.c:1917
 #, c-format
 msgid "%d attachment"
 msgid_plural "%d attachments"
 msgstr[0] "%d liite"
 msgstr[1] "%d liitettä"
 
-#: ../mail/em-format-html-display.c:1951
+#: ../mail/em-format-html-display.c:1980
+msgid "Toggle Attachment Bar"
+msgstr "Näytä tai piilota liitepalkki"
+
+#: ../mail/em-format-html-display.c:1982
 msgid "No Attachment"
 msgstr "Ei liitteitä"
 
-#: ../mail/em-format-html-display.c:1954
+#: ../mail/em-format-html-display.c:1985
 msgid "Save All"
 msgstr "Tallenna kaikki"
 
@@ -11755,100 +11738,100 @@ msgstr "Tallenna kaikki"
 msgid "Page %d of %d"
 msgstr "Sivu  %d / %d"
 
-#: ../mail/em-format-html.c:473 ../mail/em-format-html.c:475
+#: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Haetaan %s"
 
-#: ../mail/em-format-html.c:600
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "Allekirjoitus on kelvollinen, mutta lähettäjää ei voida varmistaa"
 
-#: ../mail/em-format-html.c:870
+#: ../mail/em-format-html.c:880
 msgid "Malformed external-body part."
 msgstr "Väärin muotoilut rungon ulkopuolinen viestin osa."
 
-#: ../mail/em-format-html.c:900
+#: ../mail/em-format-html.c:910
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Osoitin FTP-palvelimelle (%s)"
 
-#: ../mail/em-format-html.c:911
+#: ../mail/em-format-html.c:921
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Osoitin paikalliseen tiedostoon (%s) palvelimella \"%s\""
 
-#: ../mail/em-format-html.c:913
+#: ../mail/em-format-html.c:923
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Osoitin paikalliseen tiedostoon (%s)"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:944
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Osoitin muulla palvelimella olevaan tietoon (%s)"
 
-#: ../mail/em-format-html.c:945
+#: ../mail/em-format-html.c:955
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 "Osoitin tuntemattomaan muulla palvelimella olevaan tietoon (tyyppiä \"%s\")"
 
-#: ../mail/em-format-html.c:1171
+#: ../mail/em-format-html.c:1181
 msgid "Formatting message"
 msgstr "Muotoillaan viestiä"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:83
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "Lähettäjä"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:84
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Vastausosoite"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:85
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
 #: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Kopiot"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "Piilokopiot"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:992
+#: ../mail/em-format-html.c:1586 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1000
 msgid "Mailer"
 msgstr "Postittaja"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1603
+#: ../mail/em-format-html.c:1613
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1606
+#: ../mail/em-format-html.c:1616
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1616 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:89
+#: ../mail/em-format-html.c:1626 ../mail/em-format-quote.c:329
+#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Päiväys"
 
-#: ../mail/em-format-html.c:1639 ../mail/em-format.c:851
-#: ../mail/em-mailer-prefs.c:90
+#: ../mail/em-format-html.c:1649 ../mail/em-format.c:851
+#: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "Uutisryhmät"
 
@@ -11881,23 +11864,23 @@ msgstr "Virhe tarkistettaessa allekirjoitusta"
 msgid "Unknown error verifying signature"
 msgstr "Tuntematon virhe tarkistettaessa allekirjoitusta"
 
-#: ../mail/em-mailer-prefs.c:101
+#: ../mail/em-mailer-prefs.c:103
 msgid "Every time"
 msgstr "Joka kerta"
 
-#: ../mail/em-mailer-prefs.c:102
+#: ../mail/em-mailer-prefs.c:104
 msgid "Once per day"
 msgstr "Kerran päivässä"
 
-#: ../mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:105
 msgid "Once per week"
 msgstr "Kerran viikossa"
 
-#: ../mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:106
 msgid "Once per month"
 msgstr "Kerran kuussa"
 
-#: ../mail/em-migrate.c:1198
+#: ../mail/em-migrate.c:1208
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -11909,47 +11892,47 @@ msgstr ""
 "\n"
 "Odota kärsivällisesti, että Evolution muuntaa kansioitasi..."
 
-#: ../mail/em-migrate.c:1632
+#: ../mail/em-migrate.c:1647
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Kansiota '%s' ei voida luoda: %s"
 
-#: ../mail/em-migrate.c:1658
+#: ../mail/em-migrate.c:1673
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Kansiota %s ei voitu kopioidaan kohtaan %s: %s"
 
-#: ../mail/em-migrate.c:1843
+#: ../mail/em-migrate.c:1858
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Sähköpostin läpikäynti kohteesta '%s' epäonnistui: %s"
 
-#: ../mail/em-migrate.c:2047
+#: ../mail/em-migrate.c:2062
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Vanhaa POP keep-on-server tietoa '%s' ei voitu avata: %s"
 
-#: ../mail/em-migrate.c:2061
+#: ../mail/em-migrate.c:2076
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "POP3 keep-on-server tietojen hakemistoa '%s' ei voitu luoda: %s"
 
-#: ../mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:2105
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 keep-on-server tietoa `%s' ei voitu kopioida: %s"
 
-#: ../mail/em-migrate.c:2561 ../mail/em-migrate.c:2573
+#: ../mail/em-migrate.c:2576 ../mail/em-migrate.c:2588
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Paikallista sähköpostitilaa '%s' ei voitu luoda: %s"
 
-#: ../mail/em-migrate.c:2693
+#: ../mail/em-migrate.c:2711
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Paikallisia sähköpostikansioita ei voitu luoda paikkaan '%s': %s"
 
-#: ../mail/em-migrate.c:2711
+#: ../mail/em-migrate.c:2730
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -11962,6 +11945,7 @@ msgid "_Reply to sender"
 msgstr "_Vastaa lähettäjälle"
 
 #: ../mail/em-popup.c:557 ../mail/em-popup.c:568
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
@@ -11977,58 +11961,58 @@ msgstr "Lähetä uusi _viesti..."
 msgid "_Add to Addressbook"
 msgstr "_Lisää osoitekirjaan"
 
-#: ../mail/em-subscribe-editor.c:614
+#: ../mail/em-subscribe-editor.c:615
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Tämä varasto ei tue tilaamista tai tilaukset eivät ole käytössä."
 
-#: ../mail/em-subscribe-editor.c:643
+#: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
 msgstr "Tilattu"
 
-#: ../mail/em-subscribe-editor.c:647
+#: ../mail/em-subscribe-editor.c:648
 msgid "Folder"
 msgstr "Kansio"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:862
+#: ../mail/em-subscribe-editor.c:869
 msgid "Please select a server."
 msgstr "Valitse palvelin."
 
-#: ../mail/em-subscribe-editor.c:883
+#: ../mail/em-subscribe-editor.c:890
 msgid "No server has been selected"
 msgstr "Ei palvelinta valittuna"
 
-#: ../mail/em-utils.c:106
+#: ../mail/em-utils.c:123
 msgid "Don't show this message again."
 msgstr "Älä näytä tätä viestiä uudelleen."
 
-#: ../mail/em-utils.c:338
+#: ../mail/em-utils.c:356
 msgid "Filters"
 msgstr "Suodattimet"
 
-#: ../mail/em-utils.c:481 ../mail/em-utils.c:518
+#: ../mail/em-utils.c:499 ../mail/em-utils.c:536
 msgid "message"
 msgstr "viesti"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:671
 msgid "Save Message..."
 msgstr "Tallenna viesti..."
 
-#: ../mail/em-utils.c:702
+#: ../mail/em-utils.c:720
 msgid "Add address"
 msgstr "Lisää osoite"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1181
+#: ../mail/em-utils.c:1204
 #, c-format
 msgid "Messages from %s"
 msgstr "Viestit %s:ltä"
 
-#: ../mail/em-vfolder-editor.c:104
+#: ../mail/em-vfolder-editor.c:112
 msgid "Search _Folders"
 msgstr "_Hakunäkymät"
 
-#: ../mail/em-vfolder-rule.c:575
+#: ../mail/em-vfolder-rule.c:576
 msgid "Search Folder source"
 msgstr "Hakunäkymän lähde"
 
@@ -12504,70 +12488,70 @@ msgstr ""
 "Palataanko viestien säikeistämiseen otsikon perusteella, jos otsakkeet eivät "
 "sisällä In-Reply-To tai References-otsakkeita."
 
-#: ../mail/importers/elm-importer.c:193
+#: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "Tuodaan tietoja Elmistä"
 
-#: ../mail/importers/elm-importer.c:382
+#: ../mail/importers/elm-importer.c:381
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm-tuoja"
 
-#: ../mail/importers/elm-importer.c:383
+#: ../mail/importers/elm-importer.c:382
 msgid "Import mail from Elm."
 msgstr "Tuodaan sähköpostit Elmistä."
 
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../mail/importers/evolution-outlook-importer.c:131
+#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-outlook-importer.c:136
 msgid "Destination folder:"
 msgstr "Kohdekansio:"
 
-#: ../mail/importers/evolution-mbox-importer.c:85
-#: ../mail/importers/evolution-outlook-importer.c:134
+#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder to import into"
 msgstr "Valitse kansio, johon tuodaan"
 
-#: ../mail/importers/evolution-mbox-importer.c:216
+#: ../mail/importers/evolution-mbox-importer.c:223
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:217
+#: ../mail/importers/evolution-mbox-importer.c:224
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Berkeley Mailbox-muotoisten kansioiden tuoja"
 
-#: ../mail/importers/evolution-outlook-importer.c:257
-#: ../mail/importers/mail-importer.c:230 ../shell/e-shell-importer.c:516
+#: ../mail/importers/evolution-outlook-importer.c:262
+#: ../mail/importers/mail-importer.c:234 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Tuodaan '%s'"
 
-#: ../mail/importers/evolution-outlook-importer.c:259
-#: ../mail/importers/netscape-importer.c:1251
+#: ../mail/importers/evolution-outlook-importer.c:264
+#: ../mail/importers/netscape-importer.c:1252
 msgid "Importing..."
 msgstr "Tuodaan..."
 
-#: ../mail/importers/evolution-outlook-importer.c:261
-#: ../mail/importers/netscape-importer.c:1253
+#: ../mail/importers/evolution-outlook-importer.c:266
+#: ../mail/importers/netscape-importer.c:1254
 #: ../plugins/startup-wizard/startup-wizard.c:236
-#: ../shell/e-shell-importer.c:523
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Odota, ole hyvä"
 
-#: ../mail/importers/evolution-outlook-importer.c:305
-#: ../mail/importers/mail-importer.c:144
+#: ../mail/importers/evolution-outlook-importer.c:310
+#: ../mail/importers/mail-importer.c:148
 msgid "Importing mailbox"
 msgstr "Tuodaan kansiota"
 
-#: ../mail/importers/mail-importer.c:373
+#: ../mail/importers/mail-importer.c:377
 #, c-format
 msgid "Scanning %s"
 msgstr "Tutkitaan %s"
 
-#: ../mail/importers/netscape-importer.c:73
+#: ../mail/importers/netscape-importer.c:74
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioriteettien suodatin \"%s\""
 
-#: ../mail/importers/netscape-importer.c:662
+#: ../mail/importers/netscape-importer.c:663
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -12593,7 +12577,7 @@ msgstr ""
 "prioriteettien sijasta. Tarkista tuodut suodattimen ja varmista,\n"
 "että kaikki toimii vielä kuten oli tarkoitus."
 
-#: ../mail/importers/netscape-importer.c:686
+#: ../mail/importers/netscape-importer.c:687
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -12605,7 +12589,7 @@ msgstr ""
 "ominaisuuksia, joita Evolution ei tue.\n"
 "Nämä suodattimet poistetaan."
 
-#: ../mail/importers/netscape-importer.c:703
+#: ../mail/importers/netscape-importer.c:704
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -12619,23 +12603,23 @@ msgstr ""
 "on muutettu tarkistamaan, sisältyykö annettu merkkijono\n"
 "viestin runkoon."
 
-#: ../mail/importers/netscape-importer.c:1250
+#: ../mail/importers/netscape-importer.c:1251
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution tuo vanhoja tietojasi Netscapesta"
 
-#: ../mail/importers/netscape-importer.c:1707
+#: ../mail/importers/netscape-importer.c:1708
 msgid "Importing Netscape data"
 msgstr "Tuodaan tietoja Netscapesta"
 
-#: ../mail/importers/netscape-importer.c:1907
+#: ../mail/importers/netscape-importer.c:1908
 msgid "Settings"
 msgstr "Asetukset"
 
-#: ../mail/importers/netscape-importer.c:1912
+#: ../mail/importers/netscape-importer.c:1913
 msgid "Mail Filters"
 msgstr "Suodattimet"
 
-#: ../mail/importers/netscape-importer.c:1933
+#: ../mail/importers/netscape-importer.c:1934
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -12643,116 +12627,116 @@ msgstr ""
 "Evolution löysi Netscapen sähköpostitiedostoja.\n"
 "Haluatko tuoda nämä Evolutioniin?"
 
-#: ../mail/importers/pine-importer.c:230
+#: ../mail/importers/pine-importer.c:229
 msgid "Importing Pine data"
 msgstr "Tuodaan tietoja Pinestä"
 
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:433
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine-tuoja"
 
-#: ../mail/importers/pine-importer.c:435
+#: ../mail/importers/pine-importer.c:434
 msgid "Import mail from Pine."
 msgstr "Tuo sähköpostit Pinestä."
 
-#: ../mail/mail-autofilter.c:78
+#: ../mail/mail-autofilter.c:79
 #, c-format
 msgid "Mail to %s"
 msgstr "Viesti %s:lle"
 
-#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
+#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
 #, c-format
 msgid "Mail from %s"
 msgstr "Viesti %s:ltä"
 
-#: ../mail/mail-autofilter.c:265
+#: ../mail/mail-autofilter.c:266
 #, c-format
 msgid "Subject is %s"
 msgstr "Aihe on %s"
 
-#: ../mail/mail-autofilter.c:300
+#: ../mail/mail-autofilter.c:301
 #, c-format
 msgid "%s mailing list"
 msgstr "%s postilista"
 
-#: ../mail/mail-autofilter.c:369
+#: ../mail/mail-autofilter.c:372
 msgid "Add Filter Rule"
 msgstr "Lisää suodatussääntö"
 
-#: ../mail/mail-component.c:509
+#: ../mail/mail-component.c:520
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d poistettu"
 msgstr[1] "%d poistettu"
 
-#: ../mail/mail-component.c:511
+#: ../mail/mail-component.c:522
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d roskaposti"
 msgstr[1] "%d roskapostia"
 
-#: ../mail/mail-component.c:534
+#: ../mail/mail-component.c:545
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d luonnos"
 msgstr[1] "%d luonnosta"
 
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:547
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d lähetetty"
 msgstr[1] "%d lähetettyä"
 
-#: ../mail/mail-component.c:538
+#: ../mail/mail-component.c:549
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d lähettämätön"
 msgstr[1] "%d lähettämätöntä"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:553
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d viesti"
 msgstr[1] "%d viestiä"
 
-#: ../mail/mail-component.c:544
+#: ../mail/mail-component.c:555
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] "%d lukematon"
 msgstr[1] "%d lukematonta"
 
-#: ../mail/mail-component.c:765
+#: ../mail/mail-component.c:778
 msgid "New Mail Message"
 msgstr "Uusi viesti"
 
-#: ../mail/mail-component.c:766
+#: ../mail/mail-component.c:779
 msgid "_Mail Message"
 msgstr "_Viesti"
 
-#: ../mail/mail-component.c:767
+#: ../mail/mail-component.c:780
 msgid "Compose a new mail message"
 msgstr "Kirjoita uusi viesti"
 
-#: ../mail/mail-component.c:773
+#: ../mail/mail-component.c:786
 msgid "New Mail Folder"
 msgstr "Uusi sähköpostikansio"
 
-#: ../mail/mail-component.c:774
+#: ../mail/mail-component.c:787
 msgid "Mail _Folder"
 msgstr "Sähköpostikansio"
 
-#: ../mail/mail-component.c:775
+#: ../mail/mail-component.c:788
 msgid "Create a new mail folder"
 msgstr "Luo uusi sähköpostikansio"
 
-#: ../mail/mail-component.c:919
+#: ../mail/mail-component.c:932
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Sähköpostin asetusten tai kansioiden päivitys epäonnistui."
 
@@ -12771,8 +12755,8 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL ei ole tuettu tässä Evolutionin käännöksessä</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>S_ignatures</b>"
-msgstr "<b>Allekirjoitukset</b>"
+msgid "<b>Sig_natures</b>"
+msgstr "<b>Alle_kirjoitukset</b>"
 
 #: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
@@ -12786,10 +12770,6 @@ msgstr "<small>Tämä tekee suodattimesta luotettavan mutta hitaamman</small>"
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Tilin tiedot</span>"
 
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr "<span weight=\"bold\">Hälytykset</span>"
-
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Tunnistustapa</span>"
@@ -12822,11 +12802,6 @@ msgstr "<span weight=\"bold\">_Näytettävät otsakkeet</span>"
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Suodattimen asetukset</span>"
 
-#: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1977
-msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">Yleistä</span>"
-
 #: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Merkinnät ja värit</span>"
@@ -12852,6 +12827,7 @@ msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Huomautus uusista viesteistä</span>"
 
 #: ../mail/mail-config.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Valinnaiset tiedot</span>"
 
@@ -12932,8 +12908,8 @@ msgid "Attachment"
 msgstr "Liite"
 
 #: ../mail/mail-config.glade.h:46
-msgid "Automatically _insert smiley images"
-msgstr "_Lisää hymiöt kuvina automaattisesti"
+msgid "Automatically insert _smiley images"
+msgstr "Lisää _hymiöt kuvina automaattisesti"
 
 #: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
@@ -12956,8 +12932,8 @@ msgid "Ch_eck for Supported Types "
 msgstr "Tar_kista tuetut tyypit"
 
 #: ../mail/mail-config.glade.h:52
-msgid "Check _incoming mail for junk"
-msgstr "Etsi roskapostia _saapuvista sähköposteista"
+msgid "Check in_coming mail for junk"
+msgstr "Etsi _saapuvasta sähköpostista roskapostia"
 
 #: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
@@ -13048,21 +13024,21 @@ msgid "Encrypt out_going messages (by default)"
 msgstr "Salaa lähtevät viestit oletuksena"
 
 #: ../mail/mail-config.glade.h:81
-msgid "Execute Command..."
-msgstr "Suorita komento..."
-
-#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "_Tasalevyinen:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "Kirjasimen ominaisuudet"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "Muotoile viestit HTML:nä"
 
+#: ../mail/mail-config.glade.h:84
+msgid "Full Nam_e:"
+msgstr "_Koko nimi:"
+
 #: ../mail/mail-config.glade.h:86
 msgid "HTML Mail"
 msgstr "HTML-viesti"
@@ -13207,58 +13183,62 @@ msgid "Select HTML variable width font for printing"
 msgstr "Valitse HTML-viestin vaihtuvalevyinen kirjasin tulostusta varten"
 
 #: ../mail/mail-config.glade.h:127
+msgid "Select sound file"
+msgstr "Valitse äänitiedosto"
+
+#: ../mail/mail-config.glade.h:128
 msgid "Send message receipts:"
 msgstr "Lähetä viestin kuittaus:"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "Sending Mail"
 msgstr "Lähtevä posti"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "Sent _Messages Folder:"
 msgstr "Lähetettyjen _viestien kansio:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Ser_ver requires authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Server _Type: "
 msgstr "Palvelintyyppi: "
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Sig_ning certificate:"
 msgstr "_Allekirjoitusvarmenne:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Signat_ure:"
 msgstr "_Allekirjoitus:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signatures"
 msgstr "Allekirjoitukset"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures Table"
 msgstr "Allekirjoitusten taulu"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Specify _filename:"
 msgstr "Anna _tiedostonimi:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Spell Checking"
 msgstr "Oikoluku"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "T_erminal Font:"
 msgstr "_Päätekirjaisin:"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "_Tyyppi:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -13266,7 +13246,7 @@ msgstr ""
 "Lista käytettävissä olevista kielistä riippuu ainoastaan siitä, mille "
 "kielille sinulla on sanastoja asennettuna."
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13276,7 +13256,7 @@ msgstr ""
 "Nimi jonka valitset on käytössä ainoastaan tässä listassa\n"
 "näytettäessä."
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:147
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13284,15 +13264,15 @@ msgstr ""
 "Anna nimi jolla haluaisit kutsua tätä sähköpostitiliä.\n"
 "Esimerkiksi \"Työ\" tai \"Henkilökohtaista\""
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "Käyttäjät_unnus:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "_Vaihtuva leveys:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13302,30 +13282,26 @@ msgstr ""
 "\n"
 "Valitse \"Eteenpäin\" aloittaaksesi."
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "_Add Signature"
 msgstr "_Lisää allekirjoitus:"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
 msgid "_Always load images from the Internet"
 msgstr "Lataa _aina kuvat verkosta"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Älä huomauta uuden sähköpostin saapumisesta"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid "_Don't sign meeting requests (for Outlook compatibility)"
 msgstr "_Älä allekirjoita kokouskutsuja (Outlook yhteensopivuus)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
 msgstr "_Välitä tyyli:"
 
-#: ../mail/mail-config.glade.h:160
-msgid "_Full Name:"
-msgstr "_Koko nimi:"
-
 #: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
 msgstr "_Hae viestin kuvat, jos yhteystieto on osoitekirjassa"
@@ -13397,7 +13373,7 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Salaus</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
-msgid "Case _Sensitive"
+msgid "Case _sensitive"
 msgstr "Kirjain_koolla on merkitystä"
 
 #: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
@@ -13412,7 +13388,7 @@ msgstr "Et_si:"
 msgid "Find in Message"
 msgstr "Hae viestistä"
 
-#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:295
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
 #: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Merkitse edelleenlähetettäväksi"
@@ -13486,26 +13462,26 @@ msgstr "kaikki paikalliset ja aktiiviset etäkansiot"
 msgid "with all local folders"
 msgstr "kaikki paikalliset kansiot"
 
-#: ../mail/mail-folder-cache.c:855
+#: ../mail/mail-folder-cache.c:860
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingataan %s"
 
-#: ../mail/mail-ops.c:102
+#: ../mail/mail-ops.c:103
 msgid "Filtering Folder"
 msgstr "Suodatetaan kansiota"
 
-#: ../mail/mail-ops.c:263
+#: ../mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Haetaan viestejä"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:563
+#: ../mail/mail-ops.c:564
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Virhe käytettäessä lähtevän postin suodattimia: %s"
 
-#: ../mail/mail-ops.c:575 ../mail/mail-ops.c:604
+#: ../mail/mail-ops.c:576 ../mail/mail-ops.c:605
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13514,114 +13490,114 @@ msgstr ""
 "Lisäys '%s':ään epäonnnistui: %s\n"
 "Lisätään paikalliseen 'Lähetetyt' kansioon."
 
-#: ../mail/mail-ops.c:621
+#: ../mail/mail-ops.c:622
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Viestin lisäys paikalliseen 'Lähetetyt'-kansioon epäonnistui: %s"
 
-#: ../mail/mail-ops.c:733
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Lähetetään viestiä %d / %d"
 
-#: ../mail/mail-ops.c:758
+#: ../mail/mail-ops.c:759
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%d viestin %d:stä epäonnistui"
 
-#: ../mail/mail-ops.c:760 ../mail/mail-send-recv.c:613
+#: ../mail/mail-ops.c:761 ../mail/mail-send-recv.c:613
 msgid "Cancelled."
 msgstr "Peruutettu."
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:763
 msgid "Complete."
 msgstr "Valmis."
 
-#: ../mail/mail-ops.c:859
+#: ../mail/mail-ops.c:860
 msgid "Saving message to folder"
 msgstr "Tallennetaan viestiä kansioon"
 
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:945
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Siirretään viestejä kohteeseen %s"
 
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:945
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopioidaan viestejä kohteeseen %s"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1168
 msgid "Forwarded messages"
 msgstr "Välitetyt viestit"
 
-#: ../mail/mail-ops.c:1210
+#: ../mail/mail-ops.c:1211
 #, c-format
 msgid "Opening folder %s"
 msgstr "Avataan kansiota %s"
 
-#: ../mail/mail-ops.c:1282
+#: ../mail/mail-ops.c:1283
 #, c-format
 msgid "Opening store %s"
 msgstr "Avataan tallennustilaa %s"
 
-#: ../mail/mail-ops.c:1360
+#: ../mail/mail-ops.c:1361
 #, c-format
 msgid "Removing folder %s"
 msgstr "Poistetaan kansiota %s"
 
-#: ../mail/mail-ops.c:1454
+#: ../mail/mail-ops.c:1455
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Tallennetaan kansiota %s"
 
-#: ../mail/mail-ops.c:1519
+#: ../mail/mail-ops.c:1520
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Siivotaan ja tallennetaan tiliä '%s'"
 
-#: ../mail/mail-ops.c:1520
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Tallennetaan tiliä %s"
 
-#: ../mail/mail-ops.c:1575
+#: ../mail/mail-ops.c:1576
 msgid "Refreshing folder"
 msgstr "Virkistetään kansiota"
 
-#: ../mail/mail-ops.c:1611 ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1612 ../mail/mail-ops.c:1663
 msgid "Expunging folder"
 msgstr "Poistetaan poistettuja kansiosta"
 
-#: ../mail/mail-ops.c:1659
+#: ../mail/mail-ops.c:1660
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tyhjennetään roskakoria '%s'"
 
-#: ../mail/mail-ops.c:1660
+#: ../mail/mail-ops.c:1661
 msgid "Local Folders"
 msgstr "Paikalliset kansiot"
 
-#: ../mail/mail-ops.c:1743
+#: ../mail/mail-ops.c:1744
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viestiä %s"
 
-#: ../mail/mail-ops.c:1853
+#: ../mail/mail-ops.c:1854
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Haetaan %d viesti"
 msgstr[1] "Haetaan %d viestiä"
 
-#: ../mail/mail-ops.c:1939
+#: ../mail/mail-ops.c:1940
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Tallenetaan %d viesti"
 msgstr[1] "Tallennetaan %d viestiä"
 
-#: ../mail/mail-ops.c:1989
+#: ../mail/mail-ops.c:1990
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13630,7 +13606,7 @@ msgstr ""
 "Tulostiedoston luonti epäonnistui: %s\n"
 "%s"
 
-#: ../mail/mail-ops.c:2017
+#: ../mail/mail-ops.c:2018
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13639,11 +13615,11 @@ msgstr ""
 "Virhe tallennettaessa viestejä: %s:\n"
 "%s"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2089
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: ../mail/mail-ops.c:2100
+#: ../mail/mail-ops.c:2101
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13652,22 +13628,22 @@ msgstr ""
 "Tulostiedostoa ei voida luoda: %s:\n"
 "%s"
 
-#: ../mail/mail-ops.c:2110
+#: ../mail/mail-ops.c:2111
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Tietoa ei voitu kirjoittaa: %s"
 
-#: ../mail/mail-ops.c:2260
+#: ../mail/mail-ops.c:2261
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Yhteyttä %s katkaistaan"
 
-#: ../mail/mail-ops.c:2260
+#: ../mail/mail-ops.c:2261
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Otetaan uudelleen yhteyttää %s"
 
-#: ../mail/mail-ops.c:2376
+#: ../mail/mail-ops.c:2377
 msgid "Checking Service"
 msgstr "Tarkistetaan palvelua"
 
@@ -13710,53 +13686,53 @@ msgstr "Odotetaan..."
 msgid "Checking for new mail"
 msgstr "Tarkistetaan onko uusia viestejä"
 
-#: ../mail/mail-session.c:207
-#: ../plugins/exchange-operations/exchange-config-listener.c:601
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:604
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Anna salasana tunnukselle %s"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: ../mail/mail-session.c:244
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "Käyttäjä keskeytti toimenpiteen"
 
-#: ../mail/mail-signature-editor.c:381
+#: ../mail/mail-signature-editor.c:384
 msgid "Edit signature"
 msgstr "Muokkaa allekirjoitusta"
 
-#: ../mail/mail-signature-editor.c:423
+#: ../mail/mail-signature-editor.c:431
 msgid "Enter a name for this signature."
 msgstr "Anna allekirjoitukselle nimi"
 
-#: ../mail/mail-signature-editor.c:426
+#: ../mail/mail-signature-editor.c:434
 #: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../mail/mail-tools.c:115
+#: ../mail/mail-tools.c:120
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Saapuvien kansiota '%s' ei voitu luoda: %s"
 
-#: ../mail/mail-tools.c:143
+#: ../mail/mail-tools.c:150
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Yritettiin 'movemail':ia lähteelle '%s', joka ei ole tyyppiä mbox"
 
-#: ../mail/mail-tools.c:249
+#: ../mail/mail-tools.c:256
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Välitetty viesti - %s"
 
-#: ../mail/mail-tools.c:251
+#: ../mail/mail-tools.c:258
 msgid "Forwarded message"
 msgstr "Välitetty viesti"
 
-#: ../mail/mail-tools.c:291
+#: ../mail/mail-tools.c:298
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Virheellinen kansio: ' %s'"
@@ -13776,11 +13752,11 @@ msgstr "Päivitetään hakunäkymää \"%s:%s\""
 msgid "Updating Search Folders for '%s'"
 msgstr "Päivitetään hakunäkymää \"%s\""
 
-#: ../mail/mail-vfolder.c:1046
+#: ../mail/mail-vfolder.c:1050
 msgid "Edit Search Folder"
 msgstr "Muokkaa hakunäkymää"
 
-#: ../mail/mail-vfolder.c:1130
+#: ../mail/mail-vfolder.c:1134
 msgid "New Search Folder"
 msgstr "Uusi hakunäkymä"
 
@@ -14246,8 +14222,8 @@ msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr ""
-"Viestiä ei voida lähettää, koska viestin lähetykseen valitsemasi tili ei "
-"ole käytössä"
+"Viestiä ei voida lähettää, koska viestin lähetykseen valitsemasi tili ei ole "
+"käytössä"
 
 #: ../mail/mail.error.xml.h:106
 msgid ""
@@ -14348,74 +14324,74 @@ msgstr "_Poista pysyvästi"
 msgid "_Open Messages"
 msgstr "_Avaa viestit"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:1004
 msgid "Unseen"
 msgstr "Nähty"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:1005
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:1006
 msgid "Answered"
 msgstr "Vastattu"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:1007
 msgid "Multiple Unseen Messages"
 msgstr "Useita lukemattomia viestejä"
 
-#: ../mail/message-list.c:1010
+#: ../mail/message-list.c:1008
 msgid "Multiple Messages"
 msgstr "Useita viestejä"
 
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1012
 msgid "Lowest"
 msgstr "Matalin"
 
-#: ../mail/message-list.c:1015
+#: ../mail/message-list.c:1013
 msgid "Lower"
 msgstr "Matalampi"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1017
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1018
 msgid "Highest"
 msgstr "Korkein"
 
-#: ../mail/message-list.c:1348 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1346 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1355 ../plugins/itip-formatter/itip-view.c:197
+#: ../mail/message-list.c:1353 ../plugins/itip-formatter/itip-view.c:197
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Tänään %l:%M %p"
 
-#: ../mail/message-list.c:1364 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1362 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l:%M %p"
 
-#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1382 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1386 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2052
+#: ../mail/message-list.c:2055
 msgid "Message List"
 msgstr "_Viestilista"
 
-#: ../mail/message-list.c:3397
+#: ../mail/message-list.c:3400
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
@@ -14444,42 +14420,43 @@ msgid "Received"
 msgstr "Otettu vastaan"
 
 #: ../mail/message-list.etspec.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Koko"
 
-#: ../mail/message-tag-followup.c:74
+#: ../mail/message-tag-followup.c:75
 msgid "Call"
 msgstr "Soita"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:76
 msgid "Do Not Forward"
 msgstr "Älä välitä"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:77
 msgid "Follow-Up"
 msgstr "Lähetä edelleen"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:78
 msgid "For Your Information"
 msgstr "Tiedoksesi"
 
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Välitä"
 
-#: ../mail/message-tag-followup.c:79
+#: ../mail/message-tag-followup.c:80
 msgid "No Response Necessary"
 msgstr "Vastaus ei välttämätön"
 
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply"
 msgstr "Vastaa"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:82
+#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
-#: ../mail/message-tag-followup.c:83
+#: ../mail/message-tag-followup.c:84
 msgid "Review"
 msgstr "Arvio"
 
@@ -14507,6 +14484,14 @@ msgstr "Otsikko sisältää"
 msgid "Subject or Sender contains"
 msgstr "Aihe tai lähettäjä sisältää"
 
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+msgid "Local Address Books"
+msgstr "Paikalliset osoitekirjat"
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Provides core functionality for local address books."
+msgstr "Tarjoaa paikallisten osoitekirjojen perustoiminnot."
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
@@ -14731,6 +14716,18 @@ msgstr "Haluatko käyttää Evolutionia oletuksena sähköpostin käsittelyyn?"
 msgid "Mark as default folder"
 msgstr "Merkitse oletuskansioksi"
 
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+msgid "Default Sources"
+msgstr "Oletuslähteet"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+msgid ""
+"Provides functionallity for marking a calendar or addressbook as the default "
+"one."
+msgstr ""
+"Tarjoaa toiminallisuuden kalenterien tai osoitekirjojen merkitsemiseksi "
+"oletusvalinnaksi"
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "Avaa muiden käyttäjien kansioita"
@@ -14770,11 +14767,11 @@ msgid ""
 msgstr ""
 "Yhdistä Exchange-palvelimelle käyttäen tavallista selväkielistä salasanaa."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:253
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "Poissa konttorilta"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:260
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -14782,66 +14779,67 @@ msgstr ""
 "Alla määritelty viesti lähetään automaattisesti jokaiselle \n"
 "henkilölle, joka lähettää sähköpostia sinulle kun et ole tavoitettavissa."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "En ole tavoitettavissa"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:273
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "Olen tavoitettavissa"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:324
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "Syötä Exchange-tilin salasana"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "Vaihda salasana"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:331
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Muokkaa Exchange-tilin valtuutusasetuksia"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assitant"
 msgstr "Delegoinnin apulainen"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "Sekalaiset"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:355
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "Näytä kaikkien Exchange-kansioiden koko"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "Kansioiden koko"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchangen asetukset"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:613
+#: ../plugins/exchange-operations/exchange-account-setup.c:619
 msgid "_OWA Url:"
 msgstr "_OWA Url:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:638
+#: ../plugins/exchange-operations/exchange-account-setup.c:645
 msgid "A_uthenticate"
 msgstr "K_irjautuminen"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:825
+#: ../plugins/exchange-operations/exchange-account-setup.c:833
 msgid "Authentication Type"
 msgstr "Kirjautumisen tyyppi"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:839
+#: ../plugins/exchange-operations/exchange-account-setup.c:847
 msgid "Ch_eck for Supported Types"
 msgstr "Tar_kista tuetut tyypit"
 
@@ -14891,6 +14889,11 @@ msgid "Custom"
 msgstr "Oma näkymä"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:191
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+msgid "Delegate Permissions"
+msgstr "Valtuutettujen oikeudet"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:202
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
 #, c-format
 msgid "Permissions for %s"
@@ -14940,35 +14943,33 @@ msgstr "Virhe luettaessa listaa valtuutetuista."
 msgid "Author (read, create)"
 msgstr "Kirjoittaja (lue, luo)"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
+#. Translators: This is used for permissions for <user> for the folder Calendar.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
 msgid "C_alendar:"
 msgstr "K_alenteri:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#. Translators: This is used for permissions for <user> for the folder Contacts.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Co_ntacts:"
 msgstr "Y_hteystiedot: "
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-msgid "Delegate Permissions"
-msgstr "Valtuutettujen oikeudet"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
 msgid "Delegates"
 msgstr "Valtuutetut"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Muokkaaja (kirjoita, luo, muokkaa)"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 msgid "Permissions for"
 msgstr "Oikeudet kohteelle"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Tarkastaja (vain luku)"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
 msgid ""
 "These users will be able to send mail on your behalf\n"
 "and access your folders with the permissions you give them."
@@ -14976,15 +14977,17 @@ msgstr ""
 "Nämä käyttäjät voivat lähettää puolestasi sähköpostia ja\n"
 "lukea kansioitasi niillä oikeuksilla, jotka heille myönnät."
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
 msgid "_Delegate can see private items"
 msgstr "_Valtuutettu voi nähdä yksityisiä kohteita"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
+#. Translators: This is used for permissions for <user> for the folder Inbox.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
 msgid "_Inbox:"
 msgstr "_Saapuneet:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#. Translators: This is used for permissions for <user> for the folder Tasks.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:19
 msgid "_Tasks:"
 msgstr "_Tehtävät:"
 
@@ -15001,9 +15004,10 @@ msgstr "Kansion nimi"
 msgid "Folder Size"
 msgstr "Kansion koko"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:180
-msgid "Subscribe to Other User's"
-msgstr "Tilaa muilta käyttäjiltä"
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:181
+#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
+msgid "Subscribe to Other User's Folder"
+msgstr "Tilaa muiden käyttäjien kansioita"
 
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
@@ -15111,6 +15115,18 @@ msgstr "Tilaa muiden käyttäjien yhteystietoja"
 msgid "Subscribe to Other User's Calendar"
 msgstr "Tilaa toisen käyttäjän kalenteri"
 
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
+msgid ""
+"A plugin that handles a collection of Exchange account specific operations "
+"and features."
+msgstr ""
+"Liitännäinen, jolla voidaa hallita tietyjä Exchange-tiliin liittyviä "
+"toimintoja ja ominaisuuksia."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
+msgid "Exchange Operations"
+msgstr "Exchange-toiminnot"
+
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot change password due to configuration problems."
 msgstr "Salasanaa ei voitu vaihtaa asetusongelmien takia."
@@ -15237,7 +15253,7 @@ msgid "Folder offline"
 msgstr "Kansio on yhteydettömässä tilassa"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1277
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
@@ -15420,10 +15436,6 @@ msgstr "Tilaa muiden käyttäjien tehtäviä"
 msgid "Check folder permissions"
 msgstr "Tarkista kansion oikeudet"
 
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
-msgid "Subscribe to Other User's Folder"
-msgstr "Tilaa muiden käyttäjien kansioita"
-
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
@@ -15488,7 +15500,7 @@ msgid "Add Send Options to groupwise messages"
 msgstr "Lisää lähetysoptioita groupwise-viesteihin"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:8
+#: ../ui/evolution-event-editor.xml.h:14 ../ui/evolution-task-editor.xml.h:8
 #: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "Lähetyksen asetukset"
@@ -15579,7 +15591,7 @@ msgid "Subscribe to my _notifications"
 msgstr "Tilaa h_uomautukseni"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_Lue"
 
@@ -15592,6 +15604,7 @@ msgid "Proxy"
 msgstr "Välimuisti"
 
 #: ../plugins/groupwise-features/proxy-listing.glade.h:2
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 #: ../smime/gui/smime-ui.glade.h:49
 #: ../widgets/table/e-table-config-no-group.glade.h:20
 #: ../widgets/table/e-table-config.glade.h:21
@@ -15606,25 +15619,25 @@ msgstr "<b>Tilin nimi</b>"
 msgid "Proxy Login"
 msgstr "Välimuistiin kirjautuminen"
 
-#: ../plugins/groupwise-features/proxy-login.c:219
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:501
+#: ../plugins/groupwise-features/proxy-login.c:220
+#: ../plugins/groupwise-features/proxy-login.c:263
+#: ../plugins/groupwise-features/proxy.c:502
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSyötä salasana palvelulle %s (käyttäjä %s)"
 
-#: ../plugins/groupwise-features/proxy-login.c:497
+#: ../plugins/groupwise-features/proxy-login.c:505
 msgid "_Proxy Login..."
 msgstr "Välimuistin kirjautuminen..."
 
-#: ../plugins/groupwise-features/proxy.c:691
+#: ../plugins/groupwise-features/proxy.c:698
 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:696
+#: ../plugins/groupwise-features/proxy.c:703
 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ä."
 
@@ -15826,7 +15839,7 @@ msgid "Conflict Search Table"
 msgstr "Ristiriitaisuuksien hakutaulukko"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:183 ../ui/evolution-calendar.xml.h:34
+#: ../plugins/itip-formatter/itip-view.c:183 ../ui/evolution-calendar.xml.h:33
 #: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:466
 msgid "Today"
 msgstr "Tänään"
@@ -16385,6 +16398,18 @@ msgstr "Tilaa viestin sisältämä postituslista"
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "Peru viestin sisältämän postituslistan tilaus"
 
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
+msgid "Mark All Read"
+msgstr "Merkitse kaikki _luetuksi"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
+msgid "Mark me_ssages as read"
+msgstr "Merkitse vie_stit luetuiksi"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
+msgid "Used for marking all the messages under a folder as read"
+msgstr "Käytetään merkitsemään kaikki kansion viestit luetuiksi"
+
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
 msgid "Mark calendar offline"
 msgstr "Merkitse kalenteri yhteydettömään käyttöön"
@@ -16522,6 +16547,98 @@ msgstr "Tulostuksen esikatselu"
 msgid "Prints the message"
 msgstr "Tulostaa viestin"
 
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
+msgid "Evolution Profiler"
+msgstr "Evolutionin profiloija"
+
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
+msgid "Writes a log of profiling data events."
+msgstr "Kirjoittaa lokia profilointitiedon tapahtumista."
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+msgid "Allows calendars to be published to the web"
+msgstr "Mahdollistaa kalenterien julkaisemisen verkossa"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+msgid "Calendar Publishing"
+msgstr "Kalenterien julkaisu"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Locations"
+msgstr "Sijainnit"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
+msgid "_Publish Calendar Information"
+msgstr "Julkaise kalenteritietoja"
+
+#: ../plugins/publish-calendar/publish-calendar.c:371
+msgid "Are you sure you want to remove this URL?"
+msgstr "Haluatko varmasti poistaa tämän URLin?"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:2
+msgid "<span weight=\"bold\">Location</span>"
+msgstr "<span weight=\"bold\">Sijainti</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:4
+msgid "<span weight=\"bold\">Sources</span>"
+msgstr "<span weight=\"bold\">Lähteet</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:6
+msgid ""
+"Daily\n"
+"Weekly\n"
+"Manual (via Actions menu)"
+msgstr ""
+"Päivittäin\n"
+"Viikoittain\n"
+"Käsin (toimintovalikosta)"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+msgid "Publishing Location"
+msgstr "Julkaisupaikka"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+msgid "Publishing _Frequency:"
+msgstr "Julkaisutiheys:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+msgid ""
+"SSH\n"
+"Public FTP\n"
+"FTP (with login)\n"
+"Windows share\n"
+"WebDAV (HTTP)\n"
+"Secure WebDAV (HTTPS)\n"
+"Custom Location"
+msgstr ""
+"SSH\n"
+"Julkinen FTP\n"
+"FTP (vaatii kirjautumisen)\n"
+"Windows-jako\n"
+"WebDAV (HTTP)\n"
+"Suojattu WebDAV (HTTPS)\n"
+"Oma sijainti"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:19
+msgid "Service _type:"
+msgstr "Palvelun _tyyppi:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+msgid "_File:"
+msgstr "_Tiedosto:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+msgid "_Publish as:"
+msgstr "_Julkaise muodossa:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"iCal\n"
+"Free/Busy"
+msgstr ""
+"iCal\n"
+"Vapaa/Varattu"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:99
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (sisäänrakennettu)"
@@ -16551,15 +16668,15 @@ msgstr "Tallenna liitteet ..."
 msgid "Save all attachments"
 msgstr "Tallenna kaikki liitteet"
 
-#: ../plugins/save-attachments/save-attachments.c:331
+#: ../plugins/save-attachments/save-attachments.c:338
 msgid "Select save base name"
 msgstr "Valitse tallennuspaikan nimi"
 
-#: ../plugins/save-attachments/save-attachments.c:351
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "MIME-tyyppi"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:366
 #: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:18
 msgid "Save"
 msgstr "Tallenna"
@@ -16691,6 +16808,10 @@ msgid "_Show only this Task List"
 msgstr "Näytä vain _tämä tehtävälista"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
+msgid "A plugin that handles the Startup wizard."
+msgstr "Käynnistysapulaisen toteuttava liitännäinen."
+
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
 msgid "Startup wizard"
 msgstr "Käynnistysapulainen"
 
@@ -16715,18 +16836,18 @@ msgstr ""
 "Valitse \"Jatka\" jatkaaksesi. "
 
 #: ../plugins/startup-wizard/startup-wizard.c:140
-#: ../shell/e-shell-importer.c:145
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Valitse tieto jota haluaisit tuoda:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:154
-#: ../shell/e-shell-importer.c:398
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "Ohjelmasta %s:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:509
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Tuodaan tietoja."
 
@@ -16806,7 +16927,7 @@ msgstr "Tulostimen asetukset"
 msgid "Skip development warning dialog"
 msgstr "Hypätäänkö kehitysversiovaroituksen yli"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:468
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:473
 msgid "Start in offline mode"
 msgstr "Aloita yhteydettömässä tilassa"
 
@@ -16893,11 +17014,11 @@ msgstr ""
 msgid "(Untitled)"
 msgstr "(Nimetön)"
 
-#: ../shell/e-shell-importer.c:133
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Valitse suoritettavan tuojan tyyppi:"
 
-#: ../shell/e-shell-importer.c:136
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -16911,11 +17032,11 @@ msgstr ""
 "Voit valita myös \"Automaattisen\" jos et tiedä tiedoston muotoa, ja "
 "Evolution yrittää päätellä sen."
 
-#: ../shell/e-shell-importer.c:142
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Valitse tämän tuonnin kohde"
 
-#: ../shell/e-shell-importer.c:148
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -16927,27 +17048,27 @@ msgstr ""
 "tuoda Evolutioniin, ei löytynyt. Jos haluat yrittää uudestaan, valitse\n"
 "\"Takaisin\".\n"
 
-#: ../shell/e-shell-importer.c:283
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "_Tiedostonimi:"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "Tiedoston _tyyppi:"
 
-#: ../shell/e-shell-importer.c:336
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Tuodaan tietoja ja asetuksia _vanhemmista ohjelmista"
 
-#: ../shell/e-shell-importer.c:339
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Tuo _yksi tiedosto"
 
-#: ../shell/e-shell-importer.c:698
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Tuo"
 
@@ -17008,61 +17129,61 @@ msgstr ""
 msgid "Groupware Suite"
 msgstr "Ryhmätyöohjelmisto"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:778
 msgid "_Work Online"
 msgstr "_Yhtedellinen tila"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:52
+#: ../shell/e-shell-window-commands.c:791 ../ui/evolution.xml.h:52
 msgid "_Work Offline"
 msgstr "_Yhteydetön tila"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:804
 msgid "Work Offline"
 msgstr "Valitse yhteydetön tila"
 
-#: ../shell/e-shell-window.c:343
+#: ../shell/e-shell-window.c:370
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution on nyt yhteydellisessä tilassa. Paina tästä siirtyäksesi "
 "yhteydettömään tilaan."
 
-#: ../shell/e-shell-window.c:351
+#: ../shell/e-shell-window.c:378
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution siirtyy yhteydettömään tilaan."
 
-#: ../shell/e-shell-window.c:358
+#: ../shell/e-shell-window.c:385
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution on yhteydettömässä tilassa. Paina tästä siirtyäksesi "
 "yhteydelliseen tilaan."
 
-#: ../shell/e-shell-window.c:735
+#: ../shell/e-shell-window.c:775
 #, c-format
 msgid "Switch to %s"
 msgstr "Avaa %s"
 
-#: ../shell/e-shell.c:623
+#: ../shell/e-shell.c:633
 msgid "Uknown system error."
 msgstr "Tuntematon järjestelmävirhe."
 
-#: ../shell/e-shell.c:825 ../shell/e-shell.c:826
+#: ../shell/e-shell.c:831 ../shell/e-shell.c:832
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1269 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1259
+#: ../shell/e-shell.c:1271
 msgid "Invalid arguments"
 msgstr "Virheelisiä argumentteja"
 
-#: ../shell/e-shell.c:1261
+#: ../shell/e-shell.c:1273
 msgid "Cannot register on OAF"
 msgstr "OAF:ia ei voidaan rekisteröidä"
 
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1275
 msgid "Configuration Database not found"
 msgstr "Asetustietokantaa ei löytynyt"
 
@@ -17169,31 +17290,31 @@ msgstr ""
 msgid "Don't tell me again"
 msgstr "Älä kerro enää uudelleen"
 
-#: ../shell/main.c:466
+#: ../shell/main.c:471
 msgid "Start Evolution activating the specified component"
 msgstr "Käynnistä Evolution aktivoimalla määritelty komponentti"
 
-#: ../shell/main.c:470
+#: ../shell/main.c:475
 msgid "Start in online mode"
 msgstr "Aloita yhteydellisessä tilassa"
 
-#: ../shell/main.c:473
+#: ../shell/main.c:478
 msgid "Forcibly shut down all Evolution components"
 msgstr "Sulje kaikki Evolutionin osat väkisin"
 
-#: ../shell/main.c:477
+#: ../shell/main.c:482
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Uudelleentuo tiedot väkisin Evolution 1.4:stä"
 
-#: ../shell/main.c:480
+#: ../shell/main.c:485
 msgid "Send the debugging output of all components to a file."
 msgstr "Lähetä testitulosteet kaikista komponenteista tiedostoon."
 
-#: ../shell/main.c:482
+#: ../shell/main.c:487
 msgid "Disable loading of any plugins."
 msgstr "Älä lataa mitään liitännäisiä."
 
-#: ../shell/main.c:513
+#: ../shell/main.c:518
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17221,10 +17342,10 @@ msgstr "Evolution ei käynnisty."
 #: ../shell/shell.error.xml.h:5
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed. "
+"reprompted next time they are needed."
 msgstr ""
 "Salasanojen unohtaminen tyhjentää kaikki tallennetut salasanat. Salasanaa "
-"kysytään uudestaan kun sitä seuraavan kerran tarvitaan."
+"kysytään uudestaan, kun sitä seuraavan kerran tarvitaan."
 
 #: ../shell/shell.error.xml.h:7
 msgid "Insufficient disk space for upgrade."
@@ -17327,7 +17448,7 @@ msgid ""
 msgstr ""
 "Jos päätät jatkaa, et ehkä pääse käsiksi joihinkin vanhoista tiedosistasi.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -17338,7 +17459,7 @@ msgstr ""
 "\n"
 "Muokkaa luotettavuusasetuksia:"
 
-#: ../smime/gui/cert-trust-dialog.c:145
+#: ../smime/gui/cert-trust-dialog.c:153
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -17347,7 +17468,7 @@ msgstr ""
 "Koska luotat varmenneviranomaista, joka myönsi tämän varmenteen, luotat myös "
 "tämän varmenteen oikeellisuuteen, jollei tässä muuten mainita"
 
-#: ../smime/gui/cert-trust-dialog.c:149
+#: ../smime/gui/cert-trust-dialog.c:157
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -17356,40 +17477,40 @@ msgstr ""
 "Koska et luota varmenneviranomaiseen, joka myönsi tämän varmenteen, et "
 "automaattisesti luota tähän varmenteeseen, jollei tässä muuten mainita"
 
-#: ../smime/gui/certificate-manager.c:134
-#: ../smime/gui/certificate-manager.c:142
-#: ../smime/gui/certificate-manager.c:377
-#: ../smime/gui/certificate-manager.c:385
-#: ../smime/gui/certificate-manager.c:597
-#: ../smime/gui/certificate-manager.c:605
+#: ../smime/gui/certificate-manager.c:136
+#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:379
+#: ../smime/gui/certificate-manager.c:387
+#: ../smime/gui/certificate-manager.c:599
+#: ../smime/gui/certificate-manager.c:607
 msgid "Select a certificate to import..."
 msgstr "Valitse tuotava varmenne..."
 
-#: ../smime/gui/certificate-manager.c:265
-#: ../smime/gui/certificate-manager.c:474
-#: ../smime/gui/certificate-manager.c:692
+#: ../smime/gui/certificate-manager.c:267
+#: ../smime/gui/certificate-manager.c:476
+#: ../smime/gui/certificate-manager.c:694
 msgid "Certificate Name"
 msgstr "Varmenteen nimi"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:492
+#: ../smime/gui/certificate-manager.c:276
+#: ../smime/gui/certificate-manager.c:494
 msgid "Purposes"
 msgstr "Tarkoitukset"
 
-#: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Sarjanumero"
 
-#: ../smime/gui/certificate-manager.c:291
+#: ../smime/gui/certificate-manager.c:293
 msgid "Expires"
 msgstr "Vanhenee"
 
-#: ../smime/gui/certificate-manager.c:483
+#: ../smime/gui/certificate-manager.c:485
 msgid "E-Mail Address"
 msgstr "Sähköpostiosoite"
 
-#: ../smime/gui/certificate-viewer.c:334
+#: ../smime/gui/certificate-viewer.c:342
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Varmenteen katselin: %s"
@@ -17409,7 +17530,7 @@ msgid "Enter new password"
 msgstr "Syötä uusi salasana"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:119
+#: ../smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -17418,7 +17539,7 @@ msgstr ""
 "Myönnetty:\n"
 "  Käyttöön: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:120
+#: ../smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -17427,7 +17548,7 @@ msgstr ""
 "Myöntäjä:\n"
 " Käyttö: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:174
 msgid "Select certificate"
 msgstr "Valitse varmenne"
 
@@ -17615,7 +17736,7 @@ msgid "_Edit CA Trust"
 msgstr "_Muokkaa CA:n luottamusta"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:651
+#: ../smime/lib/e-cert-db.c:654
 msgid "Certificate already exists"
 msgstr "Varmenne on jo olemassa"
 
@@ -17822,15 +17943,15 @@ msgstr "Kohteen yksilöllinen tunniste"
 msgid "Certificate Signature Value"
 msgstr "Varmenteen allekirjoituksen arvo"
 
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS 12 tiedoston salasana"
 
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr "Syötä salasana PKCS12 tiedostolle:"
 
-#: ../smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr "Tuotu varmenne"
 
@@ -17969,7 +18090,7 @@ msgstr "Pysäytä lataaminen"
 msgid "View the current contact"
 msgstr "Katsele nykyistä yhteystietoa"
 
-#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:37
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "T_oiminnot"
@@ -18042,67 +18163,63 @@ msgstr "Edellinen"
 msgid "Print this calendar"
 msgstr "Tulosta tämä kalenteri"
 
-#: ../ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy information for this calendar"
-msgstr "Julkaise vapaa/varattu-tietoja tästä kalenterista"
-
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:22 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "Tyhjennä"
 
-#: ../ui/evolution-calendar.xml.h:24
+#: ../ui/evolution-calendar.xml.h:23
 msgid "Purge old appointments and meetings"
 msgstr "Poista vanhat tapaamiset ja kokoukset"
 
-#: ../ui/evolution-calendar.xml.h:25
+#: ../ui/evolution-calendar.xml.h:24
 msgid "Select _Date"
 msgstr "Valitse _päivä"
 
-#: ../ui/evolution-calendar.xml.h:26
+#: ../ui/evolution-calendar.xml.h:25
 msgid "Select _Today"
 msgstr "Valitse _tämä päivä"
 
-#: ../ui/evolution-calendar.xml.h:27
+#: ../ui/evolution-calendar.xml.h:26
 msgid "Select a specific date"
 msgstr "Valitse tietty päivä"
 
-#: ../ui/evolution-calendar.xml.h:28
+#: ../ui/evolution-calendar.xml.h:27
 msgid "Select today"
 msgstr "Valitse tämä päivä"
 
-#: ../ui/evolution-calendar.xml.h:29
+#: ../ui/evolution-calendar.xml.h:28
 msgid "Show as list"
 msgstr "Näytä listana"
 
-#: ../ui/evolution-calendar.xml.h:30
+#: ../ui/evolution-calendar.xml.h:29
 msgid "Show one day"
 msgstr "Näytä yksi päivä"
 
-#: ../ui/evolution-calendar.xml.h:31
+#: ../ui/evolution-calendar.xml.h:30
 msgid "Show one month"
 msgstr "Näytä yksi kuukausi"
 
-#: ../ui/evolution-calendar.xml.h:32
+#: ../ui/evolution-calendar.xml.h:31
 msgid "Show one week"
 msgstr "Näytä yksi viikko"
 
-#: ../ui/evolution-calendar.xml.h:33
+#: ../ui/evolution-calendar.xml.h:32
 msgid "Show the working week"
 msgstr "Näytä työviikko"
 
-#: ../ui/evolution-calendar.xml.h:35
+#: ../ui/evolution-calendar.xml.h:34
 msgid "View the current appointment"
 msgstr "Näytä valittu tapaaminen"
 
-#: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:35
 msgid "Week"
 msgstr "Viikko"
 
-#: ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:36
 msgid "Work Week"
 msgstr "Työviikko"
 
-#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:41
 msgid "_Open Appointment"
 msgstr "_Avaa tapaaminen"
 
@@ -18127,6 +18244,10 @@ msgstr "Valitse _kaikki"
 msgid "Select all text"
 msgstr "Valitse kaikki teksti"
 
+#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
+msgid "Attach"
+msgstr "Liitä tiedosto"
+
 #: ../ui/evolution-editor.xml.h:2
 msgid "Click here to attach a file"
 msgstr "Liitä tiedosta napsauttamalla tästä"
@@ -18154,9 +18275,9 @@ msgstr "Näytä ohje, jos sellainen löytyy, napsauttamalla tästä"
 msgid "Close"
 msgstr "Sulje"
 
-#: ../ui/evolution-editor.xml.h:14
-msgid "_Attachments"
-msgstr "_Liitteet"
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:40
+msgid "_Attachment..."
+msgstr "_Liite..."
 
 #: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:43 ../ui/evolution-subscribe.xml.h:9
@@ -18166,11 +18287,11 @@ msgstr "_Sulje"
 #: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:37
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:38
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:38
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:39
 msgid "_Help"
 msgstr "O_hje"
 
@@ -18199,95 +18320,100 @@ msgstr "Luokittele yksityiseksi"
 msgid "Classify as public"
 msgstr "Luokittele julkiseksi"
 
-#: ../ui/evolution-event-editor.xml.h:7 ../ui/evolution-task-editor.xml.h:5
+#: ../ui/evolution-event-editor.xml.h:6
+msgid "Click here to set or unset alarms for this event"
+msgstr "Napsauta tästä, jos haluat asettaa tai poistaa tämän tehtävän "
+"hälytyksiä"
+
+#: ../ui/evolution-event-editor.xml.h:8 ../ui/evolution-task-editor.xml.h:5
 msgid "Insert advanced send options"
 msgstr "Lisää erityisiä lähetysvaihtoehtoja"
 
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../ui/evolution-event-editor.xml.h:9
 msgid "Make this a recurring event"
 msgstr "Muuta tämä tapahtuma toistuvaksi"
 
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:10 ../ui/evolution-task-editor.xml.h:6
 msgid "Pu_blic"
 msgstr "J_ulkinen"
 
-#: ../ui/evolution-event-editor.xml.h:10
+#: ../ui/evolution-event-editor.xml.h:11
 msgid "Query free / busy information for the attendees"
 msgstr "Kysy vapaa/varattu-tietoja osanottajilta"
 
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-task-editor.xml.h:7
+#: ../ui/evolution-event-editor.xml.h:12 ../ui/evolution-task-editor.xml.h:7
 msgid "R_ole Field"
 msgstr "R_oolikenttä"
 
-#: ../ui/evolution-event-editor.xml.h:14 ../ui/evolution-task-editor.xml.h:9
+#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:9
 msgid "Show Time _Zone"
 msgstr "Näytä Aikavyöhyke"
 
-#: ../ui/evolution-event-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:16
 msgid "Show time as b_usy"
 msgstr "Näytä aika _varattuna"
 
-#: ../ui/evolution-event-editor.xml.h:16 ../ui/evolution-task-editor.xml.h:12
+#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:12
 msgid "Toggles whether the Attendee Type field is displayed"
 msgstr "Määrittää näytetäänkö läsnäolijakenttä"
 
-#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:13
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:13
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Määrittää näytetäänkö RSVP-kenttä"
 
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:14
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:14
 msgid "Toggles whether the Role field is displayed"
 msgstr "Määrittää näytetäänkö roolikenttä"
 
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:15
 msgid "Toggles whether the Status field is displayed"
 msgstr "Määrittää näytetäänkö tilakenttä"
 
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:16
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:16
 msgid "Toggles whether the time zone is displayed"
 msgstr "Määrittää näytetäänkö aihavyöhykekenttä"
 
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:17
+#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:17
 msgid "Toggles whether to display categories"
 msgstr "Määrittää näytetäänkö luokat"
 
-#: ../ui/evolution-event-editor.xml.h:22
+#: ../ui/evolution-event-editor.xml.h:23
 msgid "Toggles whether to have All day Event"
 msgstr "Määrittää onko tämä koko päivän tapahtuma"
 
-#: ../ui/evolution-event-editor.xml.h:23
+#: ../ui/evolution-event-editor.xml.h:24
 msgid "Toggles whether to show time as busy"
 msgstr "Määrittää näytetäänkö aika varattuna"
 
-#: ../ui/evolution-event-editor.xml.h:24
+#: ../ui/evolution-event-editor.xml.h:25
 msgid "_Alarms"
 msgstr "_Hälytykset"
 
-#: ../ui/evolution-event-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:26
 msgid "_All day Event"
 msgstr "_Koko päivän tapahtuma"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-task-editor.xml.h:19
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
 msgstr "Lu_okittelu"
 
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-task-editor.xml.h:20
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-task-editor.xml.h:20
 msgid "_Confidential"
 msgstr "_Luottamuksellinen"
 
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-task-editor.xml.h:21
+#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-task-editor.xml.h:21
 msgid "_Private"
 msgstr "_Yksityinen"
 
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-task-editor.xml.h:22
+#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:22
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:24
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:24
 msgid "_Status Field"
 msgstr "_Tilakenttä"
 
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:25
 msgid "_Type Field"
 msgstr "T_yyppikenttä"
 
@@ -18472,7 +18598,7 @@ msgstr "Piilota valitut viestit väliaikaisesti"
 msgid "Threaded Message list"
 msgstr "Säikeistetty viesti-ikkuna"
 
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:117
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Viesti"
@@ -18503,8 +18629,8 @@ msgid "Check for _Junk"
 msgstr "Etsi _roskapostia"
 
 #: ../ui/evolution-mail-message.xml.h:8
-msgid "Compose _New Message..."
-msgstr "Kirjoita _uusi viesti..."
+msgid "Compose _New Message"
+msgstr "Kirjoita _uusi viesti"
 
 #: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to all of the recipients of the selected message"
@@ -18719,12 +18845,12 @@ msgid "P_revious Unread Message"
 msgstr "_Edellinen lukematon viesti"
 
 #: ../ui/evolution-mail-message.xml.h:69
-msgid "Pos_t New Message to Folder..."
-msgstr "Pos_tita uusi viesti kansioon..."
+msgid "Pos_t New Message to Folder"
+msgstr "Pos_tita uusi viesti kansioon"
 
 #: ../ui/evolution-mail-message.xml.h:70
-msgid "Post a Repl_y..."
-msgstr "Postita _vastaus..."
+msgid "Post a Repl_y"
+msgstr "Postita _vastaus"
 
 #: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a message to a Public folder"
@@ -18747,21 +18873,13 @@ msgid "Print this message"
 msgstr "Tulosta tämä viesti"
 
 #: ../ui/evolution-mail-message.xml.h:79
-msgid "Re_direct..."
-msgstr "_Uudelleenohjaa..."
+msgid "Re_direct"
+msgstr "_Uudelleenohjaa"
 
 #: ../ui/evolution-mail-message.xml.h:80
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Uudelleenohjaa (siirrä) valitut viestit jollekulle"
 
-#: ../ui/evolution-mail-message.xml.h:83
-msgid "Reply to _All..."
-msgstr "Vastaa k_aikille..."
-
-#: ../ui/evolution-mail-message.xml.h:84
-msgid "Reply to _List..."
-msgstr "Vastaa _listalle..."
-
 #: ../ui/evolution-mail-message.xml.h:85
 msgid "Reset the text to its original size"
 msgstr "Palauta teksti alkuperäisen kokoiseksi"
@@ -18838,79 +18956,79 @@ msgstr "_Liitetty"
 msgid "_Caret Mode"
 msgstr "Kohdistin_tila"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:104
+msgid "_Clear Flag"
+msgstr "_Poista merkki"
+
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Delete Message"
 msgstr "Poista _viesti"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Find in Message..."
 msgstr "Etsi viestistä..."
 
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Forward..."
-msgstr "_Välitä edelleen..."
-
 #: ../ui/evolution-mail-message.xml.h:110
+msgid "_Flag Completed"
+msgstr "_Merkitse valmiiksi"
+
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Siirry"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Important"
 msgstr "_Tärkeä"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Inline"
 msgstr "S_isäkkäisesti"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Junk"
 msgstr "_Roskapostia"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Load Images"
 msgstr "_Lataa kuvat"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
 msgstr "_Seuraava viesti"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Normal Size"
 msgstr "_Normaali koko"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Not Junk"
 msgstr "_Ei roskapostia"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Open in New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
 msgstr "_Edellinen viesti"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
 msgstr "_Lainattuna"
 
-#: ../ui/evolution-mail-message.xml.h:125
-msgid "_Reply to Sender..."
-msgstr "_Vastaa lähettäjälle..."
-
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "_Tallenna viesti..."
 
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "_Palauta viesti"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "l_ukematon"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom In"
 msgstr "Lä_hennä"
 
@@ -18954,10 +19072,6 @@ msgstr "Näytä valittu muistilappu"
 msgid "_Open Memo"
 msgstr "_Avaa muistilappu"
 
-#: ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Liitä tiedosto"
-
 #: ../ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Liitä tiedosto viestiin"
@@ -19102,10 +19216,6 @@ msgstr "Määrittää näytetäänkö Vastausosoite-kenttä"
 msgid "Toggles whether the To field is displayed"
 msgstr "Määrittää näytetäänkö Vastaanottaja-kenttä"
 
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "_Attachment..."
-msgstr "_Liite..."
-
 #: ../ui/evolution-message-composer.xml.h:41
 msgid "_Bcc Field"
 msgstr "_BCC-kenttä"
@@ -19335,18 +19445,22 @@ msgid "Send / Receive"
 msgstr "Lähetä / Vastaanota"
 
 #: ../ui/evolution.xml.h:20
+msgid "Send / _Receive"
+msgstr "Lähetä ja _vastaanota"
+
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Lähetä jonossa olevat viestit ja hae uudet viestit"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Muokkaa Pilotin asetuksia"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:23
 msgid "Show information about Evolution"
 msgstr "Näytä tietoja Evolutionista"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Lähetä vikailmoitus"
 
@@ -19354,62 +19468,58 @@ msgstr "Lähetä vikailmoitus"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:29
 msgid "Submit _Bug Report"
 msgstr "Lähetä _vikailmoitus"
 
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:30
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Lähetä vikailmoitus käyttäen Bug Buddyä"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:31
 msgid "Toggle whether we are working offline."
 msgstr "Määritä, työskennelläänkö poissa linjoilta."
 
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:32
 msgid "Tool_bar"
 msgstr "_Työkalupalkki"
 
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:33
 msgid "Tool_bar style"
 msgstr "_Työkalupalkin tyyli"
 
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:34
 msgid "View/Hide the Status Bar"
 msgstr "Näytä/piilota tilarivi"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:35
 msgid "_About Evolution..."
 msgstr "_Tietoja Evolutionista"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:36
 msgid "_Close Window"
 msgstr "_Sulje ikkuna"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:40
 msgid "_Hide buttons"
 msgstr "_Piilota napit"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Icons only"
 msgstr "Vain _kuvakkeina"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:42
 msgid "_Import..."
 msgstr "_Tuo..."
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:43
 msgid "_New"
 msgstr "_Uusi"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Quick Reference"
 msgstr "_Pikaopas"
 
-#: ../ui/evolution.xml.h:45
-msgid "_Send / Receive"
-msgstr "_Lähetä / Vastaanota"
-
 #: ../ui/evolution.xml.h:46
 msgid "_Switcher Appearance"
 msgstr "Valit_simen tyyli"
@@ -19498,8 +19608,8 @@ msgstr "_Eräpäivän kanssa"
 msgid "With _Status"
 msgstr "_Tilan kanssa"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:195
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:637
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -19578,16 +19688,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:585
+#: ../widgets/menus/gal-view-instance.c:586
 #: ../widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "Oma näkymä"
 
-#: ../widgets/menus/gal-view-instance.c:586
+#: ../widgets/menus/gal-view-instance.c:587
 msgid "Save Custom View"
 msgstr "Tallenna oma näkymä"
 
-#: ../widgets/menus/gal-view-instance.c:590
+#: ../widgets/menus/gal-view-instance.c:591
 #: ../widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
 msgstr "Määrittele näkymät..."
@@ -19895,8 +20005,8 @@ msgid "_Searches"
 msgstr "_Haut"
 
 #: ../widgets/misc/e-filter-bar.c:203
-msgid "Search Editor"
-msgstr "Haun muokkain"
+msgid "Searches"
+msgstr "Haut"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:226
@@ -19919,11 +20029,11 @@ msgstr "_Oma haku..."
 msgid "Choose Image"
 msgstr "Valitse kuva"
 
-#: ../widgets/misc/e-map.c:647
+#: ../widgets/misc/e-map.c:651
 msgid "World Map"
 msgstr "Maailmankartta"
 
-#: ../widgets/misc/e-map.c:649
+#: ../widgets/misc/e-map.c:653
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
@@ -19957,41 +20067,41 @@ msgstr "Sarakkeen leveys"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:357
+#: ../widgets/misc/e-search-bar.c:372
 msgid "Search Text Entry"
 msgstr "Haettava teksti"
 
-#: ../widgets/misc/e-search-bar.c:576
+#: ../widgets/misc/e-search-bar.c:591
 msgid "_Search"
 msgstr "_Etsi"
 
-#: ../widgets/misc/e-search-bar.c:582
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Find Now"
 msgstr "_Etsi nyt"
 
-#: ../widgets/misc/e-search-bar.c:583 ../widgets/misc/e-search-bar.c:970
+#: ../widgets/misc/e-search-bar.c:598 ../widgets/misc/e-search-bar.c:985
 msgid "_Clear"
 msgstr "_Tyhjennä"
 
-#: ../widgets/misc/e-search-bar.c:674
+#: ../widgets/misc/e-search-bar.c:689
 msgid "Search Type"
 msgstr "Haun tyyppi"
 
-#: ../widgets/misc/e-search-bar.c:878
+#: ../widgets/misc/e-search-bar.c:893
 msgid "Item ID"
 msgstr "Kohteen ID"
 
-#: ../widgets/misc/e-search-bar.c:885
+#: ../widgets/misc/e-search-bar.c:900
 msgid "Subitem ID"
 msgstr "Alikohteen ID"
 
-#: ../widgets/misc/e-search-bar.c:892 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:907 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
 #: ../widgets/text/e-text.c:3463
 msgid "Text"
 msgstr "Teksti"
 
-#: ../widgets/misc/e-search-bar.c:972
+#: ../widgets/misc/e-search-bar.c:987
 msgid "Find _Now"
 msgstr "_Etsi nyt"
 
@@ -20017,7 +20127,7 @@ msgstr "Valintatila"
 msgid "Cursor Mode"
 msgstr "Kohdistintila"
 
-#: ../widgets/misc/e-send-options.c:521
+#: ../widgets/misc/e-send-options.c:524
 msgid "When de_leted:"
 msgstr "Milloin _poistettu:"
 
@@ -20193,23 +20303,23 @@ msgstr "Kohdistettu sarake"
 msgid "Unselected Column"
 msgstr "Valitsematon sarake"
 
-#: ../widgets/table/e-cell-text.c:1740
+#: ../widgets/table/e-cell-text.c:1742
 msgid "Strikeout Column"
 msgstr "Yliviivattu sarake"
 
-#: ../widgets/table/e-cell-text.c:1747
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Underline Column"
 msgstr "Alleviivaa sarake"
 
-#: ../widgets/table/e-cell-text.c:1754
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Bold Column"
 msgstr "Vahva sarake"
 
-#: ../widgets/table/e-cell-text.c:1761
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Color Column"
 msgstr "Värillinen sarake"
 
-#: ../widgets/table/e-cell-text.c:1775
+#: ../widgets/table/e-cell-text.c:1777
 msgid "BG Color Column"
 msgstr "Taustan värinen sarake"
 
@@ -20532,8 +20642,9 @@ msgstr "Taulumalli"
 msgid "Cursor row"
 msgstr "Kohdistimen rivi"
 
-#: ../widgets/table/e-table.c:3330
-msgid "Always Search"
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3304
+#: ../widgets/table/e-tree.c:3305
+msgid "Always search"
 msgstr "Hae aina"
 
 #: ../widgets/table/e-table.c:3337
@@ -20544,10 +20655,6 @@ msgstr "Lisää näpäyttämälllä"
 msgid "ETree table adapter"
 msgstr "ETree-taulukon adapteri"
 
-#: ../widgets/table/e-tree.c:3304 ../widgets/table/e-tree.c:3305
-msgid "Always search"
-msgstr "Hae aina"
-
 #: ../widgets/table/e-tree.c:3311
 msgid "Retro Look"
 msgstr "Retro-ulkoasu"
@@ -20696,6 +20803,114 @@ msgstr "IM-konteksti"
 msgid "Handle Popup"
 msgstr "Kahvan ponnahdusikkuna"
 
+#~ msgid "Remove"
+#~ msgstr "Poista"
+
+#~ msgid "Don't Remove"
+#~ msgstr "Älä poista"
+
+#~ msgid "05 minutes"
+#~ msgstr "05 minuuttia"
+
+#~ msgid "10 minutes"
+#~ msgstr "10 minuuttia"
+
+#~ msgid "15 minutes"
+#~ msgstr "15 minuuttia"
+
+#~ msgid "30 minutes"
+#~ msgstr "30 minuuttia"
+
+#~ msgid "60 minutes"
+#~ msgstr "60 minuuttia"
+
+#~ msgid "<b>Alerts</b>"
+#~ msgstr "<b>Hälytykset</b>"
+
+#~ msgid "<b>Default Free/Busy Server</b>"
+#~ msgstr "<b>Vapaa/Varattu kalenterin oletuspalvelin</b>"
+
+#~ msgid "<b>General</b>"
+#~ msgstr "<b>Yleistä</b>"
+
+#~ msgid "<b>Task List</b>"
+#~ msgstr "<b>Tehtävälista</b>"
+
+#~ msgid "<b>Time</b>"
+#~ msgstr "<b>Aika</b>"
+
+#~ msgid "<b>Work Week</b>"
+#~ msgstr "<b>Työviikko</b>"
+
+#~ msgid "Calendar and Tasks Settings"
+#~ msgstr "Kalenterin ja tehtävien asetukset"
+
+#~ msgid "Color for overdue tasks"
+#~ msgstr "Eräpäivän ylittäneiden tehtävien väri"
+
+#~ msgid "Color for tasks due today"
+#~ msgstr "Tänään erääntyvien tehtävien väri"
+
+#~ msgid "Days"
+#~ msgstr "Päivää"
+
+#~ msgid "Hours"
+#~ msgstr "Tuntia"
+
+#~ msgid "Minutes"
+#~ msgstr "Minuutti"
+
+#~ msgid "option menu to choose reminder units"
+#~ msgstr "vaihtoehtovalikko josta valitaan muistutuksen yksikkö"
+
+#~ msgid "option menu to choose time units"
+#~ msgstr "vaihtoehtovalikko josta valitaan ajan yksiköt"
+
+#~ msgid "_Publish Free/Busy Information"
+#~ msgstr "_Julkaise vapaa/varattu-tietoja"
+
+#~ msgid "_Rule name:"
+#~ msgstr "_Säännön nimi:"
+
+#~ msgid "If"
+#~ msgstr "Jos"
+
+#~ msgid "Execute actions"
+#~ msgstr "Suorita toiminnot"
+
+#~ msgid "Execute Command..."
+#~ msgstr "Suorita komento..."
+
+#~ msgid "Subscribe to Other User's"
+#~ msgstr "Tilaa muilta käyttäjiltä"
+
+#~ msgid "Publish Free/Busy information for this calendar"
+#~ msgstr "Julkaise vapaa/varattu-tietoja tästä kalenterista"
+
+#~ msgid "_Attachments"
+#~ msgstr "_Liitteet"
+
+#~ msgid "Reply to _All..."
+#~ msgstr "Vastaa k_aikille..."
+
+#~ msgid "Reply to _List..."
+#~ msgstr "Vastaa _listalle..."
+
+#~ msgid "_Forward..."
+#~ msgstr "_Välitä edelleen..."
+
+#~ msgid "_Reply to Sender..."
+#~ msgstr "_Vastaa lähettäjälle..."
+
+#~ msgid "_Send / Receive"
+#~ msgstr "_Lähetä / Vastaanota"
+
+#~ msgid "Search Editor"
+#~ msgstr "Haun muokkain"
+
+#~ msgid "Always Search"
+#~ msgstr "Hae aina"
+
 #~ msgid "Dismiss"
 #~ msgstr "Hylkää"
author	Ilkka Tuohela <ituohela@src.gnome.org>	2005-12-27 14:05:40 +0800
committer	Ilkka Tuohela <ituohela@src.gnome.org>	2005-12-27 14:05:40 +0800
commit	270c3240c4e083862711da9d0885d26cb808a03b (patch)
tree	006e808e7f6153187d0ce30ff910a8e7ba67048c
parent	e95b0d8edfee6a5cd259d0c42f4e57177b036f90 (diff)
download	gsoc2013-evolution-270c3240c4e083862711da9d0885d26cb808a03b.tar gsoc2013-evolution-270c3240c4e083862711da9d0885d26cb808a03b.tar.gz gsoc2013-evolution-270c3240c4e083862711da9d0885d26cb808a03b.tar.bz2 gsoc2013-evolution-270c3240c4e083862711da9d0885d26cb808a03b.tar.lz gsoc2013-evolution-270c3240c4e083862711da9d0885d26cb808a03b.tar.xz gsoc2013-evolution-270c3240c4e083862711da9d0885d26cb808a03b.tar.zst gsoc2013-evolution-270c3240c4e083862711da9d0885d26cb808a03b.zip