Finnish translation update by Jiri Grönroos

author: Ville-Pekka Vainio <vpvainio@iki.fi> 2014-03-17 05:31:35 +0800
committer: Ville-Pekka Vainio <vpvainio@iki.fi> 2014-03-17 05:31:35 +0800
commit: 28bed602297d0c62a7012f6707caa74ba3b301d9 (patch)
tree: 2007f9b58ee925db1ad96ca03e89994f97cb40ff
parent: 8bc198a393fcdbd0aba31ece6671189637932064 (diff)
download: gsoc2013-evolution-28bed602297d0c62a7012f6707caa74ba3b301d9.tar
gsoc2013-evolution-28bed602297d0c62a7012f6707caa74ba3b301d9.tar.gz
gsoc2013-evolution-28bed602297d0c62a7012f6707caa74ba3b301d9.tar.bz2
gsoc2013-evolution-28bed602297d0c62a7012f6707caa74ba3b301d9.tar.lz
gsoc2013-evolution-28bed602297d0c62a7012f6707caa74ba3b301d9.tar.xz
gsoc2013-evolution-28bed602297d0c62a7012f6707caa74ba3b301d9.tar.zst
gsoc2013-evolution-28bed602297d0c62a7012f6707caa74ba3b301d9.zip
1 files changed, 4828 insertions, 4433 deletions
diff --git a/po/fi.po b/po/fi.po
index 9345b409c1..526295da77 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -11,16 +11,16 @@
 # Gnome 2012-03 Finnish translation sprint participants:
 # Niklas Laxström
 # Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>, 2010.
-# Jiri Grönroos <jiri.gronroos+l10n@iki.fi>, 2012, 2013.
+# Jiri Grönroos <jiri.gronroos+l10n@iki.fi>, 2012, 2013, 2014.
 #
-#: ../shell/main.c:557
+#: ../shell/main.c:554
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2013-09-07 23:08+0000\n"
-"PO-Revision-Date: 2013-09-08 12:00+0300\n"
+"POT-Creation-Date: 2014-03-16 17:27+0000\n"
+"PO-Revision-Date: 2014-03-16 22:55+0200\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
 "Language-Team: suomi <gnome-fi-laatu@lists.sourceforge.net>\n"
 "Language: fi\n"
@@ -123,8 +123,9 @@ msgid "Category editor not available."
 msgstr "Luokkien muokkain ei ole käytettävissä."
 
 #: ../addressbook/addressbook.error.xml.h:18
-msgid "Unable to open address book"
-msgstr "Osoitekirjaa ei voi avata"
+#| msgid "Unable to open address book"
+msgid "Unable to open address book '{0}'"
+msgstr "Osoitekirjan '{0}' avaaminen epäonnistui"
 
 #: ../addressbook/addressbook.error.xml.h:19
 msgid "Unable to perform search."
@@ -196,7 +197,21 @@ msgstr ""
 "samalla osoitteella?"
 
 #: ../addressbook/addressbook.error.xml.h:33
-#: ../e-util/e-name-selector-dialog.c:997 ../mail/em-vfolder-editor-rule.c:397
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
+#: ../addressbook/gui/widgets/eab-contact-merging.c:626
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:19
+#: ../calendar/gui/dialogs/task-page.ui.h:30 ../e-util/filter.ui.h:16
+#: ../e-util/e-mail-signature-manager.c:327
+#: ../e-util/e-name-selector-dialog.c:995 ../mail/e-mail-account-manager.c:719
+#: ../mail/e-mail-label-manager.c:373 ../mail/em-vfolder-editor-rule.c:392
+#: ../mail/em-vfolder-editor-rule.c:622 ../mail/mail-config.ui.h:51
+#: ../modules/mail/em-composer-prefs.c:443
+#: ../plugins/attachment-reminder/attachment-reminder.c:557
+#: ../plugins/email-custom-header/email-custom-header.c:838
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+#: ../plugins/templates/templates.c:453
 msgid "_Add"
 msgstr "_Lisää"
 
@@ -234,7 +249,7 @@ msgstr ""
 "lisätä sen silti?"
 
 #: ../addressbook/addressbook.error.xml.h:40
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1251
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1250
 msgid "Failed to delete contact"
 msgstr "Yhteystiedon poisto epäonnistui"
 
@@ -256,10 +271,21 @@ msgstr ""
 "\"{0}\" on vain luettavissa oleva osoitekirja eikä sitä voi muokata. Valitse "
 "yhteystietonäkymän sivupalkista toinen osoitekirja."
 
+#: ../addressbook/addressbook.error.xml.h:45
+msgid "Cannot save a contact, address book is still opening"
+msgstr ""
+
+#. For Translators: {0} is the name of the address book source
+#: ../addressbook/addressbook.error.xml.h:47
+msgid ""
+"Cannot save a contact to the address book '{0}', because it is still "
+"opening. Either wait till it's opened, or select a different address book."
+msgstr ""
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:650
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:672
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2958
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:734
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:756
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3037
 msgid "Contact Editor"
 msgstr "Yhteystietojen muokkain"
 
@@ -296,11 +322,10 @@ msgid "_Wants to receive HTML mail"
 msgstr "Haluaa sähköpostit _HTML-muodossa"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:409
+#: ../addressbook/gui/widgets/eab-contact-merging.c:408
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:590
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:942
-#: ../smime/lib/e-asn1-object.c:395
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:980
 msgid "Email"
 msgstr "Sähköposti"
 
@@ -313,7 +338,7 @@ msgid "Instant Messaging"
 msgstr "Pikaviestintä"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/importers/evolution-vcard-importer.c:1003
+#: ../addressbook/importers/evolution-vcard-importer.c:971
 msgid "Contact"
 msgstr "Yhteystieto"
 
@@ -323,8 +348,8 @@ msgstr "K_otisivu:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 #: ../calendar/gui/dialogs/event-page.c:709
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../modules/itip-formatter/itip-view.c:1877
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+#: ../modules/itip-formatter/itip-view.c:1891
 msgid "_Calendar:"
 msgstr "_Kalenteri:"
 
@@ -341,7 +366,7 @@ msgid "Home Page:"
 msgstr "Kotisivu:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../modules/cal-config-google/evolution-cal-config-google.c:97
+#: ../modules/cal-config-google/evolution-cal-config-google.c:96
 msgid "Calendar:"
 msgstr "Kalenteri:"
 
@@ -375,7 +400,6 @@ msgid "_Profession:"
 msgstr "_Ammatti:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#| msgid "_Title:"
 msgctxt "Job"
 msgid "_Title:"
 msgstr "_Titteli:"
@@ -389,21 +413,21 @@ msgid "_Department:"
 msgstr "_Osasto:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+msgid "_Office:"
+msgstr "_Toimisto:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Manager:"
 msgstr "_Esimies:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Assistant:"
 msgstr "_Apulainen:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "Job"
 msgstr "Työ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-msgid "_Office:"
-msgstr "_Toimisto:"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Spouse:"
 msgstr "_Puoliso:"
@@ -417,8 +441,8 @@ msgid "_Anniversary:"
 msgstr "_Vuosipäivä:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:685
-#: ../calendar/gui/e-calendar-view.c:2278
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:692
+#: ../calendar/gui/e-calendar-view.c:2288
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
@@ -428,8 +452,8 @@ msgstr "Vuosipäivä"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
-#: ../calendar/gui/e-calendar-view.c:2277 ../shell/main.c:128
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:691
+#: ../calendar/gui/e-calendar-view.c:2287 ../shell/main.c:127
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
@@ -466,27 +490,28 @@ msgid "_Address:"
 msgstr "_Osoite:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/e-contact-map.c:306
-#: ../addressbook/gui/widgets/eab-contact-display.c:357
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/widgets/e-contact-map.c:371
+#: ../addressbook/gui/widgets/eab-contact-display.c:356
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
 msgid "Home"
 msgstr "Koti"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/e-contact-map.c:314
-#: ../addressbook/gui/widgets/eab-contact-display.c:354
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/e-contact-map.c:384
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:79
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
 msgid "Work"
 msgstr "Työ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:368
-#: ../calendar/gui/e-cal-model.c:3963
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:367
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:726
+#: ../calendar/gui/e-cal-model.c:3957
 msgid "Other"
 msgstr "Muut"
 
@@ -498,79 +523,170 @@ msgstr "Postitusosoite"
 msgid "Notes"
 msgstr "Muistilaput"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:593
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
+#: ../calendar/gui/dialogs/comp-editor.c:1250
+#: ../calendar/gui/dialogs/comp-editor.c:1336 ../e-util/e-send-options.ui.h:41
+#: ../e-util/e-preferences-window.c:379
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
+#: ../shell/e-shell-window-actions.c:1086
+msgid "_Help"
+msgstr "O_hje"
+
+#. This is only shown if the EActivity has a GCancellable.
+#. no flags
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3575
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
+#: ../addressbook/gui/widgets/eab-contact-merging.c:362
+#: ../addressbook/gui/widgets/eab-contact-merging.c:621
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../addressbook/gui/widgets/eab-gui-util.c:318
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:15
+#: ../calendar/gui/dialogs/recurrence-page.c:2322
+#: ../composer/e-composer-actions.c:204 ../e-util/e-send-options.ui.h:42
+#: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
+#: ../e-util/e-activity-bar.c:299 ../e-util/e-attachment-dialog.c:311
+#: ../e-util/e-attachment-store.c:464 ../e-util/e-attachment-store.c:545
+#: ../e-util/e-attachment-view.c:370 ../e-util/e-categories-dialog.c:82
+#: ../e-util/e-category-editor.c:138 ../e-util/e-category-editor.c:208
+#: ../e-util/e-charset-combo-box.c:101 ../e-util/e-filter-datespec.c:291
+#: ../e-util/e-mail-signature-script-dialog.c:366 ../e-util/e-passwords.c:468
+#: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
+#: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:776
+#: ../e-util/e-source-config-dialog.c:375
+#: ../e-util/e-source-selector-dialog.c:348 ../e-util/e-table-config.c:548
+#: ../e-util/e-web-view.c:3092 ../e-util/evolution-source-viewer.c:832
+#: ../e-util/gal-view-instance-save-as-dialog.c:269
+#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-label-dialog.c:196
+#: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:278
+#: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:635
+#: ../mail/mail-send-recv.c:717 ../mail/mail-vfolder-ui.c:148
+#: ../mail/mail-vfolder-ui.c:270
+#: ../modules/backup-restore/evolution-backup-tool.c:949
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:278
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:188
+#: ../modules/calendar/e-cal-attachment-handler.c:317
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
+#: ../plugins/face/face.c:291 ../plugins/mail-to-task/mail-to-task.c:593
+#: ../plugins/publish-calendar/publish-calendar.c:806
+#: ../plugins/publish-calendar/url-editor-dialog.c:421
+#: ../plugins/save-calendar/save-calendar.c:189 ../shell/e-shell-content.c:659
+#: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:70
+#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:623
+#: ../smime/gui/e-cert-selector.c:232 ../smime/gui/smime-ui.ui.h:23
+#| msgid "Cancel"
+msgid "_Cancel"
+msgstr "_Peru"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
+#: ../addressbook/gui/widgets/eab-contact-merging.c:624
+#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/gui/dialogs/comp-editor.c:1278
+#: ../composer/e-composer-actions.c:205 ../composer/e-composer-actions.c:296
+#: ../e-util/e-attachment-store.c:546
+#: ../e-util/e-mail-signature-script-dialog.c:370 ../e-util/e-web-view.c:3093
+#: ../e-util/gal-view-instance-save-as-dialog.c:270
+#: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:135
+msgid "_Save"
+msgstr "_Tallenna"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:602
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:604
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:605
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:597
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:603
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:595
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:594
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:606
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:607
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
+#: ../calendar/gui/dialogs/comp-editor.c:1301 ../e-util/e-focus-tracker.c:121
+msgid "Undo"
+msgstr "Kumoa"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
+#: ../calendar/gui/dialogs/comp-editor.c:1308 ../e-util/e-focus-tracker.c:137
+msgid "Redo"
+msgstr "Tee uudelleen"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
 #: ../addressbook/gui/widgets/eab-gui-util.c:503
 msgid "Error adding contact"
 msgstr "Virhe lisättäessä yhteystietoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:330
 msgid "Error modifying contact"
 msgstr "Virhe muokattaessa yhteystietoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:350
 msgid "Error removing contact"
 msgstr "Virhe poistettaessa yhteystietoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:666
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2952
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:750
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3031
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Yhteystietojen muokkain - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3485
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3572
 msgid "Please select an image for this contact"
 msgstr "Valitse kuva tälle henkilölle"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3486
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3576
+#: ../e-util/e-category-editor.c:146 ../plugins/face/face.c:292
+#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:624
+#| msgid "Open"
+msgid "_Open"
+msgstr "_Avaa"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3577
 msgid "_No image"
 msgstr "_Ei kuvaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3827
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3926
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -578,48 +694,77 @@ msgstr ""
 "Yhteystieto on virheellinen:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3833
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3932
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' sisältää virheellisen muotoilun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3841
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3940
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "'%s' ei voi olla tuleva päivä"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3849
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3948
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' sisältää virheellisen muotoilun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3862
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3876
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3961
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3975
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' on tyhjä"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3990
 msgid "Invalid contact."
 msgstr "Virheellinen yhteystieto."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:224
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:456
+#: ../addressbook/gui/contact-editor/fullname.ui.h:13
+#: ../addressbook/gui/widgets/eab-gui-util.c:319
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
+#: ../calendar/gui/dialogs/recurrence-page.c:2323
+#: ../e-util/e-send-options.ui.h:43 ../e-util/e-table-config.ui.h:3
+#: ../e-util/e-timezone-dialog.ui.h:3 ../e-util/e-attachment-dialog.c:313
+#: ../e-util/e-categories-dialog.c:83 ../e-util/e-category-editor.c:209
+#: ../e-util/e-charset-combo-box.c:102 ../e-util/e-filter-datespec.c:292
+#: ../e-util/e-passwords.c:469 ../e-util/e-rule-context.c:816
+#: ../e-util/e-rule-editor.c:181 ../e-util/e-rule-editor.c:283
+#: ../e-util/e-rule-editor.c:777 ../e-util/e-source-config-dialog.c:376
+#: ../e-util/e-source-selector-dialog.c:349 ../e-util/e-table-config.c:549
+#: ../mail/e-mail-config-window.c:332 ../mail/e-mail-tag-editor.c:243
+#: ../mail/em-folder-selector.c:279 ../mail/mail-config.ui.h:3
+#: ../mail/mail-dialogs.ui.h:26 ../mail/mail-vfolder-ui.c:149
+#: ../mail/mail-vfolder-ui.c:271
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
+#: ../plugins/publish-calendar/url-editor-dialog.c:422
+#: ../shell/e-shell-content.c:661 ../shell/e-shell-content.c:767
+#: ../shell/main.c:167 ../smime/gui/e-cert-selector.c:233
+#: ../smime/gui/smime-ui.ui.h:24
+#| msgid "OK"
+msgid "_OK"
+msgstr "_OK"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:451
 msgid "Contact Quick-Add"
 msgstr "Yhteystiedon pikalisäys"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
 msgid "_Edit Full"
 msgstr "Muokkaa _kaikkia tietoja"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:508
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:507
 msgid "_Full name"
 msgstr "_Koko nimi"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:521
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:520
 msgid "E_mail"
 msgstr "Sähkö_posti"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:534
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:533
 msgid "_Select Address Book"
 msgstr "_Valitse osoitekirja"
 
@@ -672,30 +817,29 @@ msgstr "Esq."
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:13
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_First:"
 msgstr "_Etunimi:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:14
-#| msgid "_Title:"
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
 msgctxt "FullName"
 msgid "_Title:"
 msgstr "_Titteli:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:15
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Middle:"
 msgstr "_Toinen nimi:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:16
+#: ../addressbook/gui/contact-editor/fullname.ui.h:18
 msgid "_Last:"
 msgstr "_Sukunimi:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:17
+#: ../addressbook/gui/contact-editor/fullname.ui.h:19
 msgid "_Suffix:"
 msgstr "_Pääte:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:818
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:817
 msgid "Contact List Editor"
 msgstr "Yhteystietolistojen muokkain"
 
@@ -719,183 +863,244 @@ msgstr "_Piilota osoitteet lähetettäessä sähköpostia tälle listalle"
 msgid "Add an email to the List"
 msgstr "Lisää sähköpostiosoite luetteloon"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
-#| msgid "Copy the email address to the clipboard"
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
 msgid "Remove an email address from the List"
 msgstr "Poista sähköpostiosoite luettelosta"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:21
+#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/filter.ui.h:18
+#: ../e-util/e-attachment-view.c:424 ../e-util/e-filter-rule.c:224
+#: ../e-util/e-mail-signature-manager.c:367
+#: ../e-util/e-name-selector-dialog.c:999 ../mail/e-mail-label-manager.c:391
+#: ../mail/em-filter-rule.c:440 ../mail/em-vfolder-editor-rule.c:627
+#: ../mail/mail-config.ui.h:52
+#: ../plugins/attachment-reminder/attachment-reminder.c:567
+#: ../plugins/email-custom-header/email-custom-header.c:848
+#: ../plugins/publish-calendar/publish-calendar.c:807
+#: ../plugins/publish-calendar/publish-calendar.ui.h:34
+#: ../plugins/templates/templates.c:463
+msgid "_Remove"
+msgstr "_Poista"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
 msgid "Insert email addresses from Address Book"
 msgstr "Lisää sähköpostiosoitteita osoitekirjasta"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:12
 msgid "_Select..."
 msgstr "_Valitse..."
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:941
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:13
+#: ../e-util/filter.ui.h:19
+msgid "_Top"
+msgstr "Ylimm_äiseksi"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
+#: ../e-util/filter.ui.h:20
+#| msgid "_Update"
+msgid "_Up"
+msgstr "_Ylös"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
+#: ../e-util/filter.ui.h:21
+#| msgid "Move _Down"
+msgid "_Down"
+msgstr "_Alas"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
+#: ../e-util/filter.ui.h:22
+msgid "_Bottom"
+msgstr "Ali_mmaiseksi"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:942
 msgid "Contact List Members"
 msgstr "Ota yhteyttä listan jäseniin"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1475
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1486
 msgid "_Members"
 msgstr "_Jäsenet"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1597
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1626
 msgid "Error adding list"
 msgstr "Virhe lisättäessä listalle"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1617
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1646
 msgid "Error modifying list"
 msgstr "Virhe muokattaessa listaa"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1637
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1666
 msgid "Error removing list"
 msgstr "Virhe poistettaessa listaa"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
+#: ../addressbook/gui/widgets/eab-contact-merging.c:243
+#: ../calendar/gui/tasktypes.xml.h:14
+msgid "Cancelled"
+msgstr "Peruttu"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:345
+msgid "Merge Contact"
+msgstr "Yhdistä yhteystieto"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:363
+#: ../addressbook/gui/widgets/eab-contact-merging.c:627
+msgid "_Merge"
+msgstr "_Yhdistä"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:616
 msgid "Duplicate Contact Detected"
 msgstr "Päällekkäisiä yhteystietoja havaittu"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
+#: ../addressbook/gui/widgets/eab-contact-merging.c:674
+#, fuzzy
+#| msgid ""
+#| "The name or email of this contact already exists in this folder. Would "
+#| "you like to save the changes anyway?"
 msgid ""
-"The name or email of this contact already exists in this folder. Would you "
-"like to save the changes anyway?"
+"The name or email address of this contact already exists\n"
+"in this folder. Would you like to save the changes anyway?"
 msgstr ""
 "Yhteystiedon nimi tai sähköpostiosoite on ja tässä kansioissa. Haluatko "
 "tallentaa muutokset joka tapauksessa?"
 
-#. Translators: Heading of the contact which has same name or email address in this folder already.
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
-msgid "Conflicting Contact:"
-msgstr "Ristiriitainen yhteystieto:"
-
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
-msgid "Changed Contact:"
-msgstr "Muutettu yhteystieto:"
-
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-#: ../addressbook/gui/merging/eab-contact-merging.c:364
-msgid "_Merge"
-msgstr "_Yhdistä"
-
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
+#: ../addressbook/gui/widgets/eab-contact-merging.c:677
+#, fuzzy
+#| msgid ""
+#| "The name or email address of this contact already exists\n"
+#| "in this folder.  Would you like to add it anyway?"
 msgid ""
 "The name or email address of this contact already exists\n"
-"in this folder.  Would you like to add it anyway?"
+"in this folder. Would you like to add it anyway?"
 msgstr ""
 "Yhteystiedon nimi tai sähköpostiosoite on ja tässä kansioissa.\n"
 "Haluatko lisätä joka tapauksessa?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:5
-msgid "Original Contact:"
-msgstr "Alkuperäinen yhteystieto:"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:692
+msgid "Changed Contact:"
+msgstr "Muutettu yhteystieto:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/widgets/eab-contact-merging.c:694
 msgid "New Contact:"
 msgstr "Uusi yhteystieto:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:244
-#: ../calendar/gui/tasktypes.xml.h:14
-msgid "Cancelled"
-msgstr "Peruttu"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:733
+msgid "Conflicting Contact:"
+msgstr "Ristiriitainen yhteystieto:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:346
-msgid "Merge Contact"
-msgstr "Yhdistä yhteystieto"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:735
+#, fuzzy
+#| msgid "Contact: "
+msgid "Old Contact:"
+msgstr "Yhteystiedot: "
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1154
+#: ../modules/addressbook/e-book-shell-view-actions.c:1150
 msgid "Name contains"
 msgstr "Nimi sisältää"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1147
+#: ../modules/addressbook/e-book-shell-view-actions.c:1143
 msgid "Email begins with"
 msgstr "Sähköposti alkaa"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1140
-#: ../modules/calendar/e-cal-shell-view-actions.c:1771
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/addressbook/e-book-shell-view-actions.c:1136
+#: ../modules/calendar/e-cal-shell-view-actions.c:1770
+#: ../modules/calendar/e-memo-shell-view-actions.c:790
+#: ../modules/calendar/e-task-shell-view-actions.c:989
 msgid "Any field contains"
 msgstr "Mikä tahansa kenttä sisältää"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "Ei yhteystietoja"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:167
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d yhteystieto"
 msgstr[1] "%d yhteystietoa"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:373
+#: ../addressbook/gui/widgets/e-addressbook-model.c:372
 msgid "Error getting book view"
 msgstr "Virhe ladattaessa kirjanäkymää"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:820
+#: ../addressbook/gui/widgets/e-addressbook-model.c:819
 msgid "Search Interrupted"
 msgstr "Haku keskeytettiin"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:204
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:203
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:649
+#: ../addressbook/gui/widgets/e-addressbook-view.c:648
 msgid "Cut selected contacts to the clipboard"
 msgstr "Leikkaa valitut yhteystiedot leikepöydälle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:655
+#: ../addressbook/gui/widgets/e-addressbook-view.c:654
 msgid "Copy selected contacts to the clipboard"
 msgstr "Kopioi valitut yhteystiedot leikepöydälle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:661
+#: ../addressbook/gui/widgets/e-addressbook-view.c:660
 msgid "Paste contacts from the clipboard"
 msgstr "Liitä yhteystietoja leikepöydältä"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:667
-#: ../modules/addressbook/e-book-shell-view-actions.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:666
+#: ../modules/addressbook/e-book-shell-view-actions.c:950
 msgid "Delete selected contacts"
 msgstr "Poista valitut yhteystiedot"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:673
+#: ../addressbook/gui/widgets/e-addressbook-view.c:672
 msgid "Select all visible contacts"
 msgstr "Valitse kaikki näkyvät yhteystiedot"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Haluatko varmasti poistaa nämä yhteystietolistat?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Haluatko varmasti poistaa tämän yhteystietolistan?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1307
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Haluatko varmasti poistaa tämän yhteystietolistan (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Haluatko varmasti poistaa nämä yhteystiedot?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
 msgid "Are you sure you want to delete this contact?"
 msgstr "Haluatko varmasti poistaa tämän yhteystiedon?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1321
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Haluatko varmasti poistaa tämän yhteystiedon (%s)?"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1331
+#: ../calendar/gui/dialogs/comp-editor.c:1243
+#: ../e-util/e-categories-editor.c:282 ../e-util/e-focus-tracker.c:740
+#: ../e-util/evolution-source-viewer.c:803
+#: ../mail/e-mail-account-manager.c:737
+#: ../modules/addressbook/e-book-shell-view-actions.c:1022
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
+#: ../modules/calendar/e-memo-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:844
+#: ../modules/mail/e-mail-shell-view-actions.c:1561
+#: ../shell/e-shell-window-actions.c:944 ../smime/gui/smime-ui.ui.h:10
+msgid "_Delete"
+msgstr "_Poista"
+
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1476
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -910,11 +1115,11 @@ msgstr[1] ""
 "%d yhteystiedon avaaminen avaa myös %d uutta ikkunaa.\n"
 "Haluatko varmasti näyttää nämä kaikki yhteystiedot?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
 msgid "_Don't Display"
 msgstr "Ä_lä näytä"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1486
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
 msgid "Display _All Contacts"
 msgstr "Näytä k_aikki yhteystiedot"
 
@@ -931,7 +1136,7 @@ msgid "Family Name"
 msgstr "Sukunimi"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:592
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
@@ -988,7 +1193,7 @@ msgid "ISDN Phone"
 msgstr "ISDN-numero"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:682
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:689
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
@@ -1027,7 +1232,7 @@ msgid "TTYTDD"
 msgstr "TTYTTD"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:645
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
 msgid "Company"
 msgstr "Yritys"
 
@@ -1036,6 +1241,7 @@ msgid "Unit"
 msgstr "Yksikkö"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
 msgid "Office"
 msgstr "Asema"
 
@@ -1050,12 +1256,12 @@ msgid "Role"
 msgstr "Rooli"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:649
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
 msgid "Manager"
 msgstr "Johtaja"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:650
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:657
 msgid "Assistant"
 msgstr "Apulainen"
 
@@ -1071,25 +1277,44 @@ msgstr "Päiväkirja"
 #: ../calendar/gui/dialogs/event-page.ui.h:20
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:6
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../e-util/e-categories-dialog.c:89
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../e-util/e-categories-dialog.c:87
 msgid "Categories"
 msgstr "Ryhmät"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:693
 msgid "Spouse"
 msgstr "Puoliso"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:718
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:748
 msgid "Note"
 msgstr "Huomautus"
 
-#: ../addressbook/gui/widgets/e-contact-map-window.c:363
+#: ../addressbook/gui/widgets/e-contact-map-window.c:375
 msgid "Contacts Map"
 msgstr "Yhteystietokartta"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#. Zoom-in button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:410
+#| msgid "_Zoom In"
+msgid "Zoom _In"
+msgstr "Lä_hennä"
+
+#. Zoom-out button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:418
+#: ../mail/e-mail-reader.c:2226
+msgid "Zoom _Out"
+msgstr "L_oitonna"
+
+#. Search button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:448
+#: ../shell/e-shell-window-actions.c:1021
+#| msgid "_Find Now"
+msgid "_Find"
+msgstr "_Etsi"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -1099,7 +1324,7 @@ msgstr ""
 "\n"
 "Etsitään yhteystietoja..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:194
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1113,7 +1338,7 @@ msgstr ""
 "\n"
 "tai luo uusi yhteystieto kaksoisnapsautuksella."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:197
+#: ../addressbook/gui/widgets/e-minicard-view.c:196
 msgid ""
 "\n"
 "\n"
@@ -1127,7 +1352,7 @@ msgstr ""
 "\n"
 "Luo uusi yhteystieto kaksoisnapsautuksella."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:201
+#: ../addressbook/gui/widgets/e-minicard-view.c:200
 msgid ""
 "\n"
 "\n"
@@ -1137,7 +1362,7 @@ msgstr ""
 "\n"
 "Etsi yhteystietoja."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:203
+#: ../addressbook/gui/widgets/e-minicard-view.c:202
 msgid ""
 "\n"
 "\n"
@@ -1147,164 +1372,165 @@ msgstr ""
 "\n"
 "Näkymässä ei ole mitään näytettävää."
 
-#: ../addressbook/gui/widgets/e-minicard.c:93
+#: ../addressbook/gui/widgets/e-minicard.c:92
 msgid "Work Email"
 msgstr "Työsähköposti"
 
-#: ../addressbook/gui/widgets/e-minicard.c:94
+#: ../addressbook/gui/widgets/e-minicard.c:93
 msgid "Home Email"
 msgstr "Henkilökohtainen sähköposti"
 
-#: ../addressbook/gui/widgets/e-minicard.c:95
-#: ../addressbook/gui/widgets/e-minicard.c:828
+#: ../addressbook/gui/widgets/e-minicard.c:94
+#: ../addressbook/gui/widgets/e-minicard.c:827
 msgid "Other Email"
 msgstr "Muu sähköposti"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:194
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
+#: ../addressbook/gui/widgets/ea-minicard-view.c:193
 msgid "evolution address book"
 msgstr "evolutionin osoitekirja"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+#: ../addressbook/gui/widgets/ea-minicard-view.c:35
 msgid "New Contact"
 msgstr "Uusi yhteystieto"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:37
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
 msgid "New Contact List"
 msgstr "Uusi yhteystietoluettelo"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:177
+#: ../addressbook/gui/widgets/ea-minicard-view.c:176
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "Valitussa osoitekirjassa %s on %d kortti"
 msgstr[1] "Valitussa osoitekirjassa %s on %d korttia"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:34
+#: ../addressbook/gui/widgets/ea-minicard.c:33
 msgid "Open"
 msgstr "Avaa"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:160
+#: ../addressbook/gui/widgets/ea-minicard.c:159
 msgid "Contact List: "
 msgstr "Yhteystietoluettelo: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:161
+#: ../addressbook/gui/widgets/ea-minicard.c:160
 msgid "Contact: "
 msgstr "Yhteystiedot: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:188
+#: ../addressbook/gui/widgets/ea-minicard.c:187
 msgid "evolution minicard"
 msgstr "Evolutionin minikortti"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:150
+#: ../addressbook/gui/widgets/eab-contact-display.c:149
 msgid "Copy _Email Address"
 msgstr "Kopioi _sähköpostiosoite"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:152
-#: ../e-util/e-web-view-gtkhtml.c:428 ../e-util/e-web-view.c:307
+#: ../addressbook/gui/widgets/eab-contact-display.c:151
+#: ../e-util/e-web-view-gtkhtml.c:427 ../e-util/e-web-view.c:304
 msgid "Copy the email address to the clipboard"
 msgstr "Kopioi sähköpostiosoite leikepöydälle"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:157
-#: ../e-util/e-web-view-gtkhtml.c:433 ../e-util/e-web-view.c:312
+#: ../addressbook/gui/widgets/eab-contact-display.c:156
+#: ../e-util/e-web-view-gtkhtml.c:432 ../e-util/e-web-view.c:309
 msgid "_Send New Message To..."
 msgstr "Lähetä uusi _viesti..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:159
-#: ../e-util/e-web-view-gtkhtml.c:435 ../e-util/e-web-view.c:314
+#: ../addressbook/gui/widgets/eab-contact-display.c:158
+#: ../e-util/e-web-view-gtkhtml.c:434 ../e-util/e-web-view.c:311
 msgid "Send a mail message to this address"
 msgstr "Lähetä sähköpostiviesti tähän osoitteeseen"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:291
-#: ../e-util/e-web-view-gtkhtml.c:970 ../e-util/e-web-view.c:934
+#: ../addressbook/gui/widgets/eab-contact-display.c:290
+#: ../e-util/e-web-view-gtkhtml.c:969 ../e-util/e-web-view.c:992
 #, c-format
 msgid "Click to mail %s"
 msgstr "Napsauta lähettääksesi %s"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:137
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:136
 msgid "Open map"
 msgstr "Avaa kartta"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:529
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:535
 msgid "List Members:"
 msgstr "Luettelon jäsenet:"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:646
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
 msgid "Department"
 msgstr "Osasto"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:647
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
 msgid "Profession"
 msgstr "Ammatti"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:648
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
 msgid "Position"
 msgstr "Asema"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:658
 msgid "Video Chat"
 msgstr "Videokeskustelu"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
-#: ../e-util/e-send-options.c:546
-#: ../modules/calendar/e-cal-shell-view-actions.c:216
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
-#: ../modules/calendar/e-cal-shell-view.c:591
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:659
+#: ../e-util/e-send-options.c:545
+#: ../modules/calendar/e-cal-shell-view-actions.c:215
+#: ../modules/calendar/e-cal-shell-view-actions.c:244
+#: ../modules/calendar/e-cal-shell-view.c:590
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Calendar"
 msgstr "Kalenteri"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
-#: ../calendar/gui/dialogs/event-editor.c:116
-#: ../calendar/gui/dialogs/event-editor.c:343
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:660
+#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:342
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Vapaa/Varattu"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:661
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:688
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:662
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:683
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:663
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:690
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:716
 msgid "Address"
 msgstr "Osoite"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:679
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
 msgid "Home Page"
 msgstr "Kotisivu"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:687
 msgid "Web Log"
 msgstr "Web-loki"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:696
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:906
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:944
 msgid "List Members"
 msgstr "Listan jäsenet"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:927
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:965
 msgid "Job Title"
 msgstr "Tehtävänimike"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:968
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1006
 msgid "Home page"
 msgstr "Kotisivu"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:978
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1016
 msgid "Blog"
 msgstr "Blogi"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:123
+#: ../addressbook/gui/widgets/eab-gui-util.c:121
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1314,7 +1540,7 @@ msgstr ""
 "verkottomaan käyttöön tai sitä ei ole vielä ladattu yhteydettömään tilaan. "
 "Nouda osoitekirjan sisältö ollessasi verkottomassa tilassa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:142
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1323,7 +1549,7 @@ msgstr ""
 "Tätä osoitekirjaa ei voitu avata. Tarkista että polku %s on olemassa ja että "
 "sinulla on oikeudet käyttää sitä."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:155
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1331,7 +1557,7 @@ msgstr ""
 "Tässä Evolutionin versiossa ei ole LDAP-tukea käytettävissä. Jos haluat LDAP-"
 "tuen evolutioniin, asenna versio joka on käännetty LDAP-tuen kanssa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1339,7 +1565,7 @@ msgstr ""
 "Tätä osoitekirjaa ei voitu avata. Osoitekirjan URI voi olla virheellinen tai "
 "palvelinta ei voi tavoittaa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:174
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid "Detailed error message:"
 msgstr "Yksityiskohtainen virheviesti:"
 
@@ -1416,119 +1642,119 @@ msgstr "Siirrä yhteystiedot"
 msgid "Copy contacts to"
 msgstr "Kopioi yhteystiedot"
 
-#: ../addressbook/importers/evolution-csv-importer.c:747
-#: ../addressbook/importers/evolution-ldif-importer.c:549
-#: ../addressbook/importers/evolution-vcard-importer.c:281
-#: ../calendar/importers/icalendar-importer.c:440
-#: ../calendar/importers/icalendar-importer.c:935
-#: ../calendar/importers/icalendar-importer.c:974 ../shell/shell.error.xml.h:1
+#: ../addressbook/importers/evolution-csv-importer.c:746
+#: ../addressbook/importers/evolution-ldif-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:249
+#: ../calendar/importers/icalendar-importer.c:439
+#: ../calendar/importers/icalendar-importer.c:934
+#: ../calendar/importers/icalendar-importer.c:973 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Tuodaan..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1082
+#: ../addressbook/importers/evolution-csv-importer.c:1081
 #, fuzzy
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlookin CSV tai Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1083
+#: ../addressbook/importers/evolution-csv-importer.c:1082
 #, fuzzy
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Outlookin CSV- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1091
+#: ../addressbook/importers/evolution-csv-importer.c:1090
 #, fuzzy
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozillan CVS tai Tab (.cvs, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1092
+#: ../addressbook/importers/evolution-csv-importer.c:1091
 #, fuzzy
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozillan CVS- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1100
+#: ../addressbook/importers/evolution-csv-importer.c:1099
 #, fuzzy
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolutionin CSV tai Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1101
+#: ../addressbook/importers/evolution-csv-importer.c:1100
 #, fuzzy
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolutionin CSV- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:807
+#: ../addressbook/importers/evolution-ldif-importer.c:806
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP-tiedostonvaihtomuoto (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:808
+#: ../addressbook/importers/evolution-ldif-importer.c:807
 msgid "Evolution LDIF importer"
 msgstr "Evolutionin LDIF-tuoja"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:666
+#: ../addressbook/importers/evolution-vcard-importer.c:634
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:667
+#: ../addressbook/importers/evolution-vcard-importer.c:635
 msgid "Evolution vCard Importer"
 msgstr "Evolutionin vCard-tuoja"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:764
+#: ../addressbook/printing/e-contact-print.c:763
 #, c-format
 msgid "Page %d"
 msgstr "Sivu %d"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "Specify the output file instead of standard output"
 msgstr "Määrittele tulostiedosto oletusulostulon sijaan"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "OUTPUTFILE"
 msgstr "TULOSTIEDOSTO"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid "List local address book folders"
 msgstr "Näytä paikalliset osoitekirjakansiot"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:66
+#: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "Show cards as vcard or csv file"
 msgstr "Nämä kortit vcard- tai cvs-tiedostoina"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:67
+#: ../addressbook/tools/evolution-addressbook-export.c:66
 msgid "[vcard|csv]"
 msgstr "[vcard|cvs]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:136
+#: ../addressbook/tools/evolution-addressbook-export.c:133
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Virhe komentoriviparametreissa, käytä optiota --help nähdäksesi käyttöohjeet."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:150
+#: ../addressbook/tools/evolution-addressbook-export.c:147
 msgid "Only support csv or vcard format."
 msgstr "Vain cvs ja vcard ovat tuettuja muotoja."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:181
+#: ../addressbook/tools/evolution-addressbook-export.c:178
 msgid "Unhandled error"
 msgstr "Käsittelemätön virhe"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:625
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:46
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:624
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
 msgid "Can not open file"
 msgstr "Tiedostoa ei voi avata"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:76
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:75
 #, fuzzy, c-format
 msgid "Failed to open client '%s': %s"
 msgstr "Kalenterin ”%s” lataus epäonnistui (%s)"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:106
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuutti"
 msgstr[1] "minuuttia"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:119
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:118
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "tunti"
@@ -1537,14 +1763,14 @@ msgstr[1] "tuntia"
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:132
-#: ../calendar/gui/dialogs/recurrence-page.c:1248
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/dialogs/recurrence-page.c:1249
 msgid "day"
 msgid_plural "days"
 msgstr[0] "päivä"
 msgstr[1] "päivä"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:329
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:343
 msgid "Start time"
 msgstr "Alkamisaika"
 
@@ -1560,85 +1786,119 @@ msgstr "Hylkää _kaikki"
 msgid "_Snooze"
 msgstr "_Torku"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:166
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1322
+#: ../calendar/gui/dialogs/event-page.ui.h:24
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+#: ../calendar/gui/dialogs/task-page.ui.h:32 ../e-util/filter.ui.h:17
+#: ../e-util/e-categories-editor.c:278
+#: ../e-util/e-mail-signature-manager.c:357
+#: ../mail/e-mail-account-manager.c:728 ../mail/e-mail-browser.c:170
+#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:56
+#: ../plugins/attachment-reminder/attachment-reminder.c:562
+#: ../plugins/email-custom-header/email-custom-header.c:843
+#: ../plugins/mail-to-task/mail-to-task.c:594
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1072
+#: ../smime/gui/smime-ui.ui.h:13
+msgid "_Edit"
+msgstr "_Muokkaa"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#| msgid "Print"
+msgid "_Print"
+msgstr "_Tulosta"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:165
 msgid "_Dismiss"
 msgstr "_Hylkää"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#: ../calendar/alarm-notify/alarm-queue.c:1823
-#: ../calendar/alarm-notify/alarm-queue.c:1833
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:190
-#: ../modules/itip-formatter/itip-view.c:1489
-#: ../modules/itip-formatter/itip-view.c:1600
+#: ../calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/alarm-notify/alarm-queue.c:1835
+#: ../calendar/alarm-notify/alarm-queue.c:1845
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:249
+#: ../modules/itip-formatter/itip-view.c:1503
+#: ../modules/itip-formatter/itip-view.c:1614
 msgid "Location:"
 msgstr "Sijainti:"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/alarm-notify/alarm-notify.ui.h:8
 msgid "location of appointment"
 msgstr "tapaamisen sijainti"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/alarm-notify/alarm-notify.ui.h:9
 msgid "Snooze _time:"
 msgstr "Torkkumis_aika:"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../e-util/filter.ui.h:8
-#: ../e-util/e-interval-chooser.c:143
-#: ../modules/calendar/e-cal-shell-view-actions.c:352
+#: ../e-util/e-interval-chooser.c:142
+#: ../modules/calendar/e-cal-shell-view-actions.c:351
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "days"
 msgstr "päivä"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/alarm-notify/alarm-notify.ui.h:11
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
-#: ../e-util/e-interval-chooser.c:141
+#: ../e-util/e-interval-chooser.c:140
 msgid "hours"
 msgstr "tuntia"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:10
+#: ../calendar/alarm-notify/alarm-notify.ui.h:12
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 #: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
-#: ../e-util/e-interval-chooser.c:139
-#: ../mail/e-mail-config-provider-page.c:527
+#: ../e-util/e-interval-chooser.c:138
+#: ../mail/e-mail-config-provider-page.c:526
 msgid "minutes"
 msgstr "minuutti"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1665
-#: ../calendar/alarm-notify/alarm-queue.c:1803
+#: ../calendar/alarm-notify/alarm-queue.c:1678
+#: ../calendar/alarm-notify/alarm-queue.c:1815
 msgid "No summary available."
 msgstr "Ei yhteenvetoa saatavilla."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1674
-#: ../calendar/alarm-notify/alarm-queue.c:1676
+#: ../calendar/alarm-notify/alarm-queue.c:1687
+#: ../calendar/alarm-notify/alarm-queue.c:1689
 msgid "No description available."
 msgstr "Ei kuvausta saatavilla."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1684
+#: ../calendar/alarm-notify/alarm-queue.c:1697
 msgid "No location information available."
 msgstr "Ei sijaintitietoja saatavilla."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1689
-#: ../calendar/alarm-notify/alarm-queue.c:1794
-#: ../calendar/alarm-notify/alarm-queue.c:2135
-#| msgid "Evolution Restore"
+#: ../calendar/alarm-notify/alarm-queue.c:1702
+#: ../calendar/alarm-notify/alarm-queue.c:1806
+#: ../calendar/alarm-notify/alarm-queue.c:2147
 msgid "Evolution Reminders"
 msgstr "Evolution-muistuttajat"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1733
+#: ../calendar/alarm-notify/alarm-queue.c:1746
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "Sinulla on %d muistutus"
 msgstr[1] "Sinulla on %d muistutusta"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1955
+#: ../calendar/alarm-notify/alarm-queue.c:1965
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1961
+#: ../calendar/alarm-notify/alarm-queue.c:1966 ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail.error.xml.h:139
+#: ../modules/mailto-handler/evolution-mailto-handler.c:114
+msgid "_No"
+msgstr "_Ei"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1967 ../mail/mail.error.xml.h:138
+#: ../modules/mailto-handler/evolution-mailto-handler.c:115
+msgid "_Yes"
+msgstr "_Kyllä"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1971
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1655,17 +1915,17 @@ msgstr ""
 "\n"
 "Haluatko varmasti suorittaa tämän ohjelman?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1976
+#: ../calendar/alarm-notify/alarm-queue.c:1986
 msgid "Do not ask me about this program again."
 msgstr "Älä kysy tästä ohjelmasta enää uudestaan."
 
-#: ../calendar/alarm-notify/util.c:44
+#: ../calendar/alarm-notify/util.c:43
 msgid "invalid time"
 msgstr "epäkelpo aika"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/alarm-notify/util.c:70 ../calendar/gui/e-alarm-list.c:370
-#: ../calendar/gui/misc.c:96
+#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:369
+#: ../calendar/gui/misc.c:103
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1673,8 +1933,8 @@ msgstr[0] "%d tunti"
 msgstr[1] "%d tuntia"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:376
-#: ../calendar/gui/misc.c:102
+#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:375
+#: ../calendar/gui/misc.c:109
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1684,8 +1944,8 @@ msgstr[1] "%d minuuttia"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:80 ../calendar/gui/e-alarm-list.c:382
-#: ../calendar/gui/misc.c:106
+#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:381
+#: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1713,7 +1973,7 @@ msgid "_Send Notice"
 msgstr "_Lähetä huomautus"
 
 #: ../calendar/calendar.error.xml.h:5
-#: ../calendar/gui/dialogs/delete-comp.c:193
+#: ../calendar/gui/dialogs/delete-comp.c:192
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Haluatko varmasti poistaa tämän tapaamisen?"
@@ -1732,7 +1992,7 @@ msgstr ""
 "tehtävä on peruttu."
 
 #: ../calendar/calendar.error.xml.h:9
-#: ../calendar/gui/dialogs/delete-comp.c:196
+#: ../calendar/gui/dialogs/delete-comp.c:195
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Haluatko varmasti poistaa tämän tehtävän?"
@@ -1754,7 +2014,7 @@ msgstr ""
 "muistilappu on poistettu."
 
 #: ../calendar/calendar.error.xml.h:13
-#: ../calendar/gui/dialogs/delete-comp.c:199
+#: ../calendar/gui/dialogs/delete-comp.c:198
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Haluatko varmasti poistaa tämän muistilapun?"
@@ -1911,10 +2171,6 @@ 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:47 ../composer/e-composer-actions.c:297
-msgid "_Save"
-msgstr "_Tallenna"
-
 #: ../calendar/calendar.error.xml.h:48
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Tietojen haku kesken. Haluatko varmasti tallentaa tämän tapaamisen?"
@@ -1968,14 +2224,10 @@ msgid "This memo list will be removed permanently."
 msgstr "Tämä muistilappulista poistetaan pysyvästi."
 
 #: ../calendar/calendar.error.xml.h:59
-#| msgid "Delete calendar '{0}'?"
 msgid "Delete remote calendar '{0}'?"
 msgstr "Poistetaanko etäkalenteri \"{0}\"?"
 
 #: ../calendar/calendar.error.xml.h:60
-#| msgid ""
-#| "This will permanently remove the calendar &quot;{0}&quot; from the "
-#| "server. Are you sure you want to proceed?"
 msgid ""
 "This will permanently remove the calendar '{0}' from the server. Are you "
 "sure you want to proceed?"
@@ -1984,14 +2236,10 @@ msgstr ""
 "jatkaa?"
 
 #: ../calendar/calendar.error.xml.h:62
-#| msgid "Delete task list '{0}'?"
 msgid "Delete remote task list '{0}'?"
 msgstr "Poistetaanko etätehtävälista \"{0}\"?"
 
 #: ../calendar/calendar.error.xml.h:63
-#| msgid ""
-#| "This will permanently remove the task list &quot;{0}&quot; from the "
-#| "server. Are you sure you want to proceed?"
 msgid ""
 "This will permanently remove the task list '{0}' from the server. Are you "
 "sure you want to proceed?"
@@ -2000,14 +2248,10 @@ msgstr ""
 "jatkaa?"
 
 #: ../calendar/calendar.error.xml.h:64
-#| msgid "Delete memo list '{0}'?"
 msgid "Delete remote memo list '{0}'?"
 msgstr "Poistetaanko etämuistiolista \"{0}\"?"
 
 #: ../calendar/calendar.error.xml.h:65
-#| msgid ""
-#| "This will permanently remove the memo list &quot;{0}&quot; from the "
-#| "server. Are you sure you want to proceed?"
 msgid ""
 "This will permanently remove the memo list '{0}' from the server. Are you "
 "sure you want to proceed?"
@@ -2045,7 +2289,6 @@ msgstr "Haluatko varmasti tallentaa muistion ilman yhteenvetoa?"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:72
-#| msgid "Error loading calendar"
 msgid "Error loading calendar '{0}'"
 msgstr "Virhe ladatessa kalenteria \"{0}\""
 
@@ -2143,7 +2386,6 @@ msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:99
-#| msgid "Found the appointment in the calendar '%s'"
 msgid "Copying an event into the calendar '{0}'"
 msgstr "Kopioidaan tapahtumaa kalenteriin '{0}'"
 
@@ -2163,7 +2405,6 @@ msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:105
-#| msgid "Found the appointment in the calendar '%s'"
 msgid "Moving an event into the calendar '{0}'"
 msgstr "Siirretään tapahtumaa kalenteriin '{0}'"
 
@@ -2185,24 +2426,24 @@ msgstr "Poistetaanko muistilappulista \"{0}\"?"
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:376
+#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:375
 msgid "Summary"
 msgstr "Kuvaus"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:11
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:55
 msgid "contains"
 msgstr "sisältää"
 
 #: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:17
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:56
 msgid "does not contain"
 msgstr "ei sisällä"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../e-util/e-table-config.ui.h:4 ../e-util/e-attachment-tree-view.c:528
-#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../e-util/e-table-config.ui.h:7 ../e-util/e-attachment-tree-view.c:527
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -2216,34 +2457,34 @@ msgid "Classification"
 msgstr "Luokittelu"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:75
 msgid "is"
 msgstr "on"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:40
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:73
 msgid "is not"
 msgstr "ei ole"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
-#: ../calendar/gui/e-cal-list-view.c:250 ../calendar/gui/e-cal-model.c:454
-#: ../calendar/gui/e-cal-model.c:461 ../calendar/gui/e-task-table.c:547
+#: ../calendar/gui/e-cal-list-view.c:249 ../calendar/gui/e-cal-model.c:453
+#: ../calendar/gui/e-cal-model.c:460 ../calendar/gui/e-task-table.c:546
 #: ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "Julkinen"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
-#: ../calendar/gui/e-cal-list-view.c:251 ../calendar/gui/e-cal-model.c:463
-#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/e-cal-list-view.c:250 ../calendar/gui/e-cal-model.c:462
+#: ../calendar/gui/e-task-table.c:547 ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "Henkilökohtainen"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
-#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:465
-#: ../calendar/gui/e-task-table.c:549 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.c:251 ../calendar/gui/e-cal-model.c:464
+#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:12
 #: ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Luottamuksellinen"
@@ -2261,37 +2502,37 @@ msgstr "Osanottaja"
 
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:897
+#: ../plugins/publish-calendar/publish-calendar.c:903
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:389
 msgid "Location"
 msgstr "Sijainti"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:328
+#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:326
 msgid "Category"
 msgstr "Luokka"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:54
-#: ../em-format/e-mail-formatter-print-headers.c:204
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
+#: ../em-format/e-mail-formatter-print-headers.c:203
 #: ../mail/em-filter-i18n.h:6
 msgid "Attachments"
 msgstr "Liitteet"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:27
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:18
 msgid "Exist"
 msgstr "On olemassa"
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:24
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:16
 msgid "Do Not Exist"
 msgstr "Ei ole olemassa"
 
 #: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:310
-#: ../calendar/gui/dialogs/event-editor.c:331
+#: ../calendar/gui/dialogs/event-editor.c:309
+#: ../calendar/gui/dialogs/event-editor.c:330
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:15
 msgid "Recurrence"
 msgstr "Toistuvuus"
@@ -2322,43 +2563,43 @@ msgstr "Yhteenveto sisältää"
 msgid "Description Contains"
 msgstr "Kuvaus sisältää"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:669
+#: ../calendar/gui/dialogs/alarm-dialog.c:668
 msgid "Edit Reminder"
 msgstr "Muokkaa muistutusta"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:897
-#: ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/dialogs/alarm-dialog.c:896
+#: ../calendar/gui/e-alarm-list.c:411
 msgid "Pop up an alert"
 msgstr "Ponnahdusikkuna hälytykselle"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:898
-#: ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/dialogs/alarm-dialog.c:897
+#: ../calendar/gui/e-alarm-list.c:407
 msgid "Play a sound"
 msgstr "Soita ääni"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:899
-#: ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/dialogs/alarm-dialog.c:898
+#: ../calendar/gui/e-alarm-list.c:419
 msgid "Run a program"
 msgstr "Suorita ohjelma"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:900
-#: ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/dialogs/alarm-dialog.c:899
+#: ../calendar/gui/e-alarm-list.c:415
 msgid "Send an email"
 msgstr "Lähetä sähköpostia"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:909
+#: ../calendar/gui/dialogs/alarm-dialog.c:908
 msgid "before"
 msgstr "ennen"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:910
+#: ../calendar/gui/dialogs/alarm-dialog.c:909
 msgid "after"
 msgstr "jälkeen"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:919
+#: ../calendar/gui/dialogs/alarm-dialog.c:918
 msgid "start of appointment"
 msgstr "tapaamisen alkua"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:920
+#: ../calendar/gui/dialogs/alarm-dialog.c:919
 msgid "end of appointment"
 msgstr "tapaamisen päättymistä"
 
@@ -2378,451 +2619,496 @@ msgstr "päivä(ä)"
 msgid "Add Reminder"
 msgstr "Lisää muistutus"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-#: ../calendar/gui/dialogs/event-editor.c:353
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
+#: ../calendar/gui/dialogs/event-editor.c:352
 msgid "Reminder"
 msgstr "Muistutus"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "Repeat"
 msgstr "Toista"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "_Repeat the reminder"
 msgstr "_Toista muistutus"
 
 #. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
 msgid "extra times every"
 msgstr "ylimääräistä kertaa joka"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13 ../mail/mail-config.ui.h:30
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:32
 msgid "Options"
 msgstr "Asetukset"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
 msgid "Custom _message"
 msgstr "Oma _viesti"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
 msgid "Mes_sage:"
 msgstr "_Viesti:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
 msgid "Custom reminder sound"
 msgstr "Oma _hälytysääni muistutukselle"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "_Sound:"
 msgstr "_Ääni:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "Select A File"
 msgstr "Valitse tiedosto"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "_Program:"
 msgstr "_Ohjelma:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
 msgid "_Arguments:"
 msgstr "_Argumentit:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "Send To:"
 msgstr "Lähetä:"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:240
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:239
 msgid "Action/Trigger"
 msgstr "Toimenpide/liipaisin"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
-#: ../calendar/gui/dialogs/event-page.ui.h:25
+#: ../calendar/gui/dialogs/event-page.ui.h:28
 #: ../modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Reminders"
 msgstr "Muistutukset"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-msgid "A_dd"
-msgstr "_Lisää"
-
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Tapahtuma on poistettu."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Tehtävä on poistettu."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
 msgstr "Muistilappu on poistettu."
 
-#: ../calendar/gui/dialogs/changed-comp.c:78
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s olet tehnyt muutoksia. Unohda nämä muutokset ja sulje muokkain?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:80
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Et ole tehnyt muutoksia, sulje muokkain?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:85
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Tapahtumaa on muutettu."
 
-#: ../calendar/gui/dialogs/changed-comp.c:89
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Tehtävää on muutettu."
 
-#: ../calendar/gui/dialogs/changed-comp.c:93
+#: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This memo has been changed."
 msgstr "Muistilappua on muutettu."
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s Olet tehnyt muutoksia. Unohda nämä muutokset ja päivitä muokkain?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:105
+#: ../calendar/gui/dialogs/changed-comp.c:104
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Et tehnyt muutoksia, suljetaanko muokkain?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:266
+#: ../calendar/gui/dialogs/comp-editor.c:271
 msgid "Could not save attachments"
 msgstr "Liitteitä ei voitu tallentaa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:626
 msgid "Could not update object"
 msgstr "Kohdetta ei voi päivittää"
 
-#: ../calendar/gui/dialogs/comp-editor.c:754
+#: ../calendar/gui/dialogs/comp-editor.c:760
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: ../calendar/gui/dialogs/comp-editor.c:761
+#: ../calendar/gui/dialogs/comp-editor.c:767
 #, c-format
 msgid "Meeting - %s"
 msgstr "Kokous - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:763
+#: ../calendar/gui/dialogs/comp-editor.c:769
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:769
+#: ../calendar/gui/dialogs/comp-editor.c:775
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tehtävänanto - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:771
+#: ../calendar/gui/dialogs/comp-editor.c:777
 #, c-format
 msgid "Task - %s"
 msgstr "Tehtävä - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:776
+#: ../calendar/gui/dialogs/comp-editor.c:782
 #, c-format
 msgid "Memo - %s"
 msgstr "Muistilappu - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:792
+#: ../calendar/gui/dialogs/comp-editor.c:798
 msgid "No Summary"
 msgstr "Ei yhteenvetoa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:913
+#: ../calendar/gui/dialogs/comp-editor.c:919
 msgid "Keep original item?"
 msgstr "Säilytetäänkö alkuperäinen?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1080
-#: ../calendar/gui/dialogs/comp-editor.c:1108
-#| msgid "Unable to connect to the GroupWise server."
+#: ../calendar/gui/dialogs/comp-editor.c:1082
+#: ../calendar/gui/dialogs/comp-editor.c:1110
 msgid "Unable to synchronize with the server"
 msgstr "Synkronointi palvelimen kanssa ei onnistu"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1222
+#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../calendar/gui/dialogs/event-editor.c:310
+#: ../calendar/gui/dialogs/event-page.ui.h:29
+#: ../composer/e-composer-actions.c:275
+#: ../e-util/e-mail-signature-editor.c:307
+#: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:388
+#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:126
+#: ../mail/em-folder-properties.c:418 ../mail/em-subscription-editor.c:1714
+#: ../modules/plugin-manager/evolution-plugin-manager.c:256
+#: ../shell/e-shell-window-actions.c:343 ../shell/e-shell-window-actions.c:909
+#: ../smime/gui/certificate-manager.c:1182
+msgid "_Close"
+msgstr "_Sulje"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1224
 msgid "Close the current window"
 msgstr "Sulje nykyinen ikkuna"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1229 ../e-util/e-focus-tracker.c:121
-#: ../e-util/e-focus-tracker.c:558 ../e-util/e-web-view-gtkhtml.c:455
-#: ../e-util/e-web-view-gtkhtml.c:1296 ../e-util/e-web-view.c:341
-#: ../e-util/e-web-view.c:1249 ../mail/e-mail-browser.c:136
-#: ../shell/e-shell-window-actions.c:888
+#. copy menu item
+#: ../calendar/gui/dialogs/comp-editor.c:1229 ../e-util/e-focus-tracker.c:730
+#: ../e-util/e-text.c:2085 ../e-util/e-web-view-gtkhtml.c:452
+#: ../e-util/e-web-view.c:336 ../mail/e-mail-browser.c:133
+#: ../shell/e-shell-window-actions.c:930
+#| msgid "_Copy..."
+msgid "_Copy"
+msgstr "_Kopioi"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1231 ../e-util/e-focus-tracker.c:174
+#: ../e-util/e-focus-tracker.c:230 ../e-util/e-focus-tracker.c:731
+#: ../e-util/e-web-view-gtkhtml.c:454 ../e-util/e-web-view-gtkhtml.c:1295
+#: ../e-util/e-web-view.c:338 ../e-util/e-web-view.c:1307
+#: ../mail/e-mail-browser.c:135 ../shell/e-shell-window-actions.c:932
 msgid "Copy the selection"
 msgstr "Kopioi valinta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-focus-tracker.c:114
-#: ../e-util/e-focus-tracker.c:553 ../e-util/e-web-view-gtkhtml.c:1290
-#: ../e-util/e-web-view.c:1243 ../mail/e-mail-browser.c:143
-#: ../shell/e-shell-window-actions.c:895
+#. cut menu item
+#: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-focus-tracker.c:725
+#: ../e-util/e-text.c:2071 ../mail/e-mail-browser.c:140
+#: ../shell/e-shell-window-actions.c:937
+msgid "Cu_t"
+msgstr "_Leikkaa"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1238 ../e-util/e-focus-tracker.c:167
+#: ../e-util/e-focus-tracker.c:223 ../e-util/e-focus-tracker.c:726
+#: ../e-util/e-web-view-gtkhtml.c:1289 ../e-util/e-web-view.c:1301
+#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:939
 msgid "Cut the selection"
 msgstr "Leikkaa valinta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1243 ../e-util/e-focus-tracker.c:135
-#: ../e-util/e-focus-tracker.c:568 ../shell/e-shell-window-actions.c:902
+#: ../calendar/gui/dialogs/comp-editor.c:1245 ../e-util/e-focus-tracker.c:188
+#: ../e-util/e-focus-tracker.c:244 ../e-util/e-focus-tracker.c:741
+#: ../shell/e-shell-window-actions.c:946
 msgid "Delete the selection"
 msgstr "Poista valinta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1250
+#: ../calendar/gui/dialogs/comp-editor.c:1252
 msgid "View help"
 msgstr "Näytä ohje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1257 ../e-util/e-focus-tracker.c:128
-#: ../e-util/e-focus-tracker.c:563 ../e-util/e-web-view-gtkhtml.c:1302
-#: ../e-util/e-web-view.c:1255 ../mail/e-mail-browser.c:150
-#: ../shell/e-shell-window-actions.c:923
+#. paste menu item
+#: ../calendar/gui/dialogs/comp-editor.c:1257 ../e-util/e-focus-tracker.c:735
+#: ../e-util/e-text.c:2097 ../mail/e-mail-browser.c:147
+#: ../shell/e-shell-window-actions.c:965
+#| msgid "_Pascal"
+msgid "_Paste"
+msgstr "_Liitä"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1259 ../e-util/e-focus-tracker.c:181
+#: ../e-util/e-focus-tracker.c:237 ../e-util/e-focus-tracker.c:736
+#: ../e-util/e-web-view-gtkhtml.c:1301 ../e-util/e-web-view.c:1313
+#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:967
 msgid "Paste the clipboard"
 msgstr "Liitä leikepöytä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1278
+#: ../calendar/gui/dialogs/comp-editor.c:1264
+#: ../composer/e-composer-actions.c:329 ../mail/e-mail-reader.c:2128
+#: ../modules/addressbook/e-book-shell-view-actions.c:1160
+#: ../modules/addressbook/e-book-shell-view-actions.c:1174
+msgid "_Print..."
+msgstr "T_ulosta..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1271 ../mail/e-mail-reader.c:2135
+#: ../modules/addressbook/e-book-shell-view-actions.c:1167
+#: ../modules/calendar/e-cal-shell-view-actions.c:1801
+#: ../modules/calendar/e-memo-shell-view-actions.c:821
+#: ../modules/calendar/e-task-shell-view-actions.c:1020
+#| msgid "Preview"
+msgid "Pre_view..."
+msgstr "E_sikatselu..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1280
 msgid "Save current changes"
 msgstr "Tallenna nykyiset muutokset"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
-#: ../e-util/e-mail-signature-editor.c:317
+#: ../calendar/gui/dialogs/comp-editor.c:1285
+#: ../e-util/e-mail-signature-editor.c:316
 msgid "Save and Close"
 msgstr "Tallenna ja sulje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1285
+#: ../calendar/gui/dialogs/comp-editor.c:1287
 msgid "Save current changes and close editor"
 msgstr "Tallenna nykyiset muutokset ja sulje muokkain"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292 ../e-util/e-focus-tracker.c:142
-#: ../e-util/e-focus-tracker.c:573 ../mail/e-mail-browser.c:157
-#: ../shell/e-shell-window-actions.c:1000
+#: ../calendar/gui/dialogs/comp-editor.c:1292 ../e-util/e-focus-tracker.c:745
+#: ../e-util/e-web-view-gtkhtml.c:462 ../e-util/e-web-view.c:346
+#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1042
+#| msgid "Select All"
+msgid "Select _All"
+msgstr "Valitse _kaikki"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1294 ../e-util/e-focus-tracker.c:195
+#: ../e-util/e-focus-tracker.c:251 ../e-util/e-focus-tracker.c:746
+#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1044
 msgid "Select all text"
 msgstr "Valitse kaikki teksti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1299
+#: ../calendar/gui/dialogs/comp-editor.c:1315
 msgid "_Classification"
 msgstr "Lu_okittelu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1306
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../e-util/filter.ui.h:16
-#: ../mail/e-mail-browser.c:171
-#: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1028
-msgid "_Edit"
-msgstr "_Muokkaa"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1313
-#: ../e-util/e-mail-signature-editor.c:322 ../mail/e-mail-browser.c:164
-#: ../shell/e-shell-window-actions.c:1035
+#: ../calendar/gui/dialogs/comp-editor.c:1329
+#: ../e-util/e-mail-signature-editor.c:321 ../mail/e-mail-browser.c:163
+#: ../shell/e-shell-window-actions.c:1079
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1320
-#: ../shell/e-shell-window-actions.c:1042
-msgid "_Help"
-msgstr "O_hje"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1327
+#: ../calendar/gui/dialogs/comp-editor.c:1343
 msgid "_Insert"
 msgstr "L_isää"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1334
-#: ../composer/e-composer-actions.c:320
+#: ../calendar/gui/dialogs/comp-editor.c:1350
+#: ../composer/e-composer-actions.c:319
 msgid "_Options"
 msgstr "_Asetukset"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1341 ../mail/e-mail-browser.c:178
-#: ../shell/e-shell-window-actions.c:1077 ../smime/gui/smime-ui.ui.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1357 ../mail/e-mail-browser.c:177
+#: ../shell/e-shell-window-actions.c:1121 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "_Näytä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1351
-#: ../composer/e-composer-actions.c:269
+#: ../calendar/gui/dialogs/comp-editor.c:1367
+#: ../composer/e-composer-actions.c:268
 msgid "_Attachment..."
 msgstr "_Liite..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
-#: ../composer/e-composer-actions.c:271 ../e-util/e-attachment-view.c:413
+#: ../calendar/gui/dialogs/comp-editor.c:1369
+#: ../composer/e-composer-actions.c:270 ../e-util/e-attachment-view.c:412
 msgid "Attach a file"
 msgstr "Liitä tiedosto viestiin"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1377
 msgid "_Categories"
 msgstr "_Luokat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1363
+#: ../calendar/gui/dialogs/comp-editor.c:1379
 msgid "Toggles whether to display categories"
 msgstr "Määrittää näytetäänkö luokat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1369
+#: ../calendar/gui/dialogs/comp-editor.c:1385
 msgid "Time _Zone"
 msgstr "_Aikavyöhyke"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1371
+#: ../calendar/gui/dialogs/comp-editor.c:1387
 msgid "Toggles whether the time zone is displayed"
 msgstr "Määrittää näytetäänkö aikavyöhykekenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1380
+#: ../calendar/gui/dialogs/comp-editor.c:1396
 msgid "Pu_blic"
 msgstr "J_ulkinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1382
+#: ../calendar/gui/dialogs/comp-editor.c:1398
 msgid "Classify as public"
 msgstr "Luokittele julkiseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1403
 msgid "_Private"
 msgstr "_Yksityinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1405
 msgid "Classify as private"
 msgstr "Luokittele yksityiseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1394
+#: ../calendar/gui/dialogs/comp-editor.c:1410
 msgid "_Confidential"
 msgstr "_Luottamuksellinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1412
 msgid "Classify as confidential"
 msgstr "Luokittele luottamukselliseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1404
+#: ../calendar/gui/dialogs/comp-editor.c:1420
 msgid "R_ole Field"
 msgstr "R_oolikenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1406
+#: ../calendar/gui/dialogs/comp-editor.c:1422
 msgid "Toggles whether the Role field is displayed"
 msgstr "Määrittää näytetäänkö roolikenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1428
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1414
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Määrittää näytetäänkö RSVP-kenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1436
 msgid "_Status Field"
 msgstr "_Tilakenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1438
 msgid "Toggles whether the Status field is displayed"
 msgstr "Määrittää näytetäänkö tilakenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1428
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "_Type Field"
 msgstr "T_yyppikenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1446
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Määrittää näytetäänkö läsnäolijan tyyppi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2211
-#: ../composer/e-composer-actions.c:488
+#: ../calendar/gui/dialogs/comp-editor.c:2233
+#: ../composer/e-composer-actions.c:487
 msgid "Attach"
 msgstr "Liitä tiedosto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2541
-#: ../calendar/gui/dialogs/comp-editor.c:2751
-#: ../calendar/gui/dialogs/comp-editor.c:3764
+#: ../calendar/gui/dialogs/comp-editor.c:2563
+#: ../calendar/gui/dialogs/comp-editor.c:2773
+#: ../calendar/gui/dialogs/comp-editor.c:3786
 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:3726
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
+#: ../calendar/gui/dialogs/comp-editor.c:3748
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:120
 msgid "attachment"
 msgstr "liite"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3796
+#: ../calendar/gui/dialogs/comp-editor.c:3818
 msgid "Unable to use current version!"
 msgstr "Nykyistä versiota ei voi käyttää!"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:441
+#: ../calendar/gui/dialogs/comp-editor-page.c:440
 #, c-format
 msgid "Validation error: %s"
 msgstr "Tarkistusvirhe: %s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:121
+#: ../calendar/gui/dialogs/copy-source-dialog.c:120
 msgid "Could not open destination"
 msgstr "Kohdetta ei voi avata"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:131
+#: ../calendar/gui/dialogs/copy-source-dialog.c:130
 msgid "Destination is read only"
 msgstr "Kohde on vain luettavissa"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:173
+#: ../calendar/gui/dialogs/copy-source-dialog.c:172
 msgid "Cannot create object"
 msgstr "Objektia ei voi luoda"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:204
+#: ../calendar/gui/dialogs/copy-source-dialog.c:203
 msgid "Could not open source"
 msgstr "Lähdettä ei voi avata"
 
-#: ../calendar/gui/dialogs/delete-comp.c:216
+#: ../calendar/gui/dialogs/delete-comp.c:215
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Poistetaanko tämä kohta kaikkien muiden vastaanottajien kansioista?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:219
+#: ../calendar/gui/dialogs/delete-comp.c:218
 msgid "_Retract comment"
 msgstr "_Poista kommentti"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:55
+#: ../calendar/gui/dialogs/delete-error.c:54
 #, c-format
 msgid "The event could not be deleted due to a dbus error: %s"
 msgstr "Tapahtumaa ei voi poistaa dbus-virheen takia: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:59
+#: ../calendar/gui/dialogs/delete-error.c:58
 #, c-format
 msgid "The task could not be deleted due to a dbus error: %s"
 msgstr "Tehtävää ei voi poistaa dbus-virheen takia: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:62
 #, c-format
 msgid "The memo could not be deleted due to a dbus error: %s"
 msgstr "Muistilappua ei voi poistaa dbus-virheen takia: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:67
+#: ../calendar/gui/dialogs/delete-error.c:66
 #, c-format
 msgid "The item could not be deleted due to a dbus error: %s"
 msgstr "Kohdetta ei voi poistaa dbus-virheen takia: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:73
 msgid "The event could not be deleted because permission was denied"
 msgstr "Tapahtumaa ei voi poistaa, koska oikeudet eivät riitä poistoon"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:76
 msgid "The task could not be deleted because permission was denied"
 msgstr "Tehtävää ei voi poistaa, koska oikeudet eivät riitä poistoon"
 
-#: ../calendar/gui/dialogs/delete-error.c:80
+#: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Muistilappua ei voi poistaa, koska oikeudet eivät riitä poistoon"
 
-#: ../calendar/gui/dialogs/delete-error.c:83
+#: ../calendar/gui/dialogs/delete-error.c:82
 msgid "The item could not be deleted because permission was denied"
 msgstr "Kohdetta ei voi poistaa, koska oikeudet eivät riitä poistoon"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:91
+#: ../calendar/gui/dialogs/delete-error.c:90
 #, c-format
 msgid "The event could not be deleted due to an error: %s"
 msgstr "Tapahtumaa ei voi poistaa virheen takia: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:94
 #, c-format
 msgid "The task could not be deleted due to an error: %s"
 msgstr "Tehtävää ei voi poistaa virheen takia: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:99
+#: ../calendar/gui/dialogs/delete-error.c:98
 #, c-format
 msgid "The memo could not be deleted due to an error: %s"
 msgstr "Muistilappua ei voi poistaa virheen takia: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:103
+#: ../calendar/gui/dialogs/delete-error.c:102
 #, c-format
 msgid "The item could not be deleted due to an error: %s"
 msgstr "Kohdetta ei voi poistaa virheen takia: %s"
@@ -2831,74 +3117,74 @@ msgstr "Kohdetta ei voi poistaa virheen takia: %s"
 msgid "Enter Delegate"
 msgstr "Syötä valtuutettu"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:4
 msgid "Delegate To:"
 msgstr "Valtuuta:"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:5
 msgid "Contacts..."
 msgstr "Yhteystiedot..."
 
-#: ../calendar/gui/dialogs/event-editor.c:205
+#: ../calendar/gui/dialogs/event-editor.c:204
 msgid "_Reminders"
 msgstr "_Muistutukset"
 
-#: ../calendar/gui/dialogs/event-editor.c:207
+#: ../calendar/gui/dialogs/event-editor.c:206
 msgid "Set or unset reminders for this event"
 msgstr "Aseta tai poista tähän tapahtumaan liittyviä muistutuksia"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:214
 msgid "Show Time as _Busy"
 msgstr "Näytä aika _varattuna"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/event-editor.c:216
 msgid "Toggles whether to show time as busy"
 msgstr "Määrittää näytetäänkö aika varattuna"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:225
 msgid "_Recurrence"
 msgstr "T_oistuvuus"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:227
 msgid "Make this a recurring event"
 msgstr "Muuta tämä tapahtuma toistuvaksi"
 
-#: ../calendar/gui/dialogs/event-editor.c:233 ../e-util/e-send-options.ui.h:14
+#: ../calendar/gui/dialogs/event-editor.c:232 ../e-util/e-send-options.ui.h:14
 msgid "Send Options"
 msgstr "Lähetysasetukset"
 
-#: ../calendar/gui/dialogs/event-editor.c:235
-#: ../calendar/gui/dialogs/task-editor.c:96
+#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/task-editor.c:95
 msgid "Insert advanced send options"
 msgstr "Lisää erityisiä lähetysvaihtoehtoja"
 
-#: ../calendar/gui/dialogs/event-editor.c:243
+#: ../calendar/gui/dialogs/event-editor.c:242
 msgid "All _Day Event"
 msgstr "Koko _päivän tapahtuma"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:244
 msgid "Toggles whether to have All Day Event"
 msgstr "Määrittää onko tämä koko päivän tapahtuma"
 
-#: ../calendar/gui/dialogs/event-editor.c:254
+#: ../calendar/gui/dialogs/event-editor.c:253
 msgid "_Free/Busy"
 msgstr "_Vapaa/Varattu"
 
-#: ../calendar/gui/dialogs/event-editor.c:256
+#: ../calendar/gui/dialogs/event-editor.c:255
 msgid "Query free / busy information for the attendees"
 msgstr "Kysy vapaa/varattu-tietoja osanottajilta"
 
-#: ../calendar/gui/dialogs/event-editor.c:307 ../calendar/gui/print.c:3505
+#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3496
 msgid "Appointment"
 msgstr "Tapaaminen"
 
-#: ../calendar/gui/dialogs/event-editor.c:377
-#: ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/dialogs/event-editor.c:376
+#: ../calendar/gui/dialogs/event-page.ui.h:27
+#: ../calendar/gui/e-meeting-list-view.c:164
 msgid "Attendees"
 msgstr "Osanottajat"
 
-#: ../calendar/gui/dialogs/event-editor.c:574
+#: ../calendar/gui/dialogs/event-editor.c:573
 msgid "Print this event"
 msgstr "Tulosta tämä tapahtuma"
 
@@ -2915,7 +3201,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Tapahtumaa ei voi muokata täysin, koska et ole sen järjestäjä"
 
 #: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3168
+#: ../calendar/gui/dialogs/event-page.c:3171
 msgid "This event has reminders"
 msgstr "Tapahtumaan liittyy muistutuksia"
 
@@ -2924,78 +3210,78 @@ msgstr "Tapahtumaan liittyy muistutuksia"
 msgid "Or_ganizer:"
 msgstr "_Järjestäjä:"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
+#: ../calendar/gui/dialogs/event-page.c:1302
 msgid "Event with no start date"
 msgstr "Tapahtuma ilman alkupäivämäärää"
 
-#: ../calendar/gui/dialogs/event-page.c:1306
+#: ../calendar/gui/dialogs/event-page.c:1305
 msgid "Event with no end date"
 msgstr "Tapahtuma ilman päättymispäivää"
 
-#: ../calendar/gui/dialogs/event-page.c:1479
-#: ../calendar/gui/dialogs/memo-page.c:726
-#: ../calendar/gui/dialogs/task-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1483
+#: ../calendar/gui/dialogs/memo-page.c:732
+#: ../calendar/gui/dialogs/task-page.c:1030
 msgid "Start date is wrong"
 msgstr "Aloituspäiväys on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1490
+#: ../calendar/gui/dialogs/event-page.c:1494
 msgid "End date is wrong"
 msgstr "Lopetuspäiväys on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1514
+#: ../calendar/gui/dialogs/event-page.c:1518
 msgid "Start time is wrong"
 msgstr "Alkamisaika on väärin"
 
-#: ../calendar/gui/dialogs/event-page.c:1522
+#: ../calendar/gui/dialogs/event-page.c:1526
 msgid "End time is wrong"
 msgstr "Lopetusaika on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1686
-#: ../calendar/gui/dialogs/memo-page.c:765
-#: ../calendar/gui/dialogs/task-page.c:1080
+#: ../calendar/gui/dialogs/event-page.c:1690
+#: ../calendar/gui/dialogs/memo-page.c:771
+#: ../calendar/gui/dialogs/task-page.c:1084
 msgid "An organizer is required."
 msgstr "Järjestäjä vaaditaan."
 
-#: ../calendar/gui/dialogs/event-page.c:1721
-#: ../calendar/gui/dialogs/task-page.c:1115
+#: ../calendar/gui/dialogs/event-page.c:1725
+#: ../calendar/gui/dialogs/task-page.c:1119
 msgid "At least one attendee is required."
 msgstr "Vähintään yksi läsnäolija vaaditaan."
 
-#: ../calendar/gui/dialogs/event-page.c:1927
+#: ../calendar/gui/dialogs/event-page.c:1931
 msgid "_Delegatees"
 msgstr "_Valtuutetut"
 
-#: ../calendar/gui/dialogs/event-page.c:1929
+#: ../calendar/gui/dialogs/event-page.c:1933
 msgid "Atte_ndees"
 msgstr "_Osanottajat"
 
-#: ../calendar/gui/dialogs/event-page.c:3448
+#: ../calendar/gui/dialogs/event-page.c:3451
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d päivä ennen tapaamista"
 msgstr[1] "%d päivää ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.c:3454
+#: ../calendar/gui/dialogs/event-page.c:3457
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d tunti ennen tapaamista"
 msgstr[1] "%d tuntia ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.c:3460
+#: ../calendar/gui/dialogs/event-page.c:3463
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuutti ennen tapaamista"
 msgstr[1] "%d minuuttia ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.c:3481
+#: ../calendar/gui/dialogs/event-page.c:3484
 msgid "Customize"
 msgstr "Muokkaa"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3488
+#: ../calendar/gui/dialogs/event-page.c:3491
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ei mitään"
@@ -3037,7 +3323,7 @@ msgstr "_Sijainti:"
 #: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 #: ../calendar/gui/dialogs/task-page.ui.h:29
-#: ../e-util/e-attachment-dialog.c:357
+#: ../e-util/e-attachment-dialog.c:356
 msgid "_Description:"
 msgstr "K_uvaus:"
 
@@ -3058,17 +3344,17 @@ msgstr "_Yhteenveto:"
 msgid "Event Description"
 msgstr "Tapahtuman kuvaus"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/task-page.ui.h:30
+#: ../calendar/gui/dialogs/event-page.ui.h:26
+#: ../calendar/gui/dialogs/task-page.ui.h:33
 #: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Atte_ndees..."
 msgstr "_Osanottajat..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:26
+#: ../calendar/gui/dialogs/event-page.ui.h:30
 msgid "_Reminder"
 msgstr "_Muistutus"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:27
+#: ../calendar/gui/dialogs/event-page.ui.h:31
 msgid "Custom Reminder:"
 msgstr "Omavalintainen muistutus:"
 
@@ -3125,43 +3411,43 @@ msgid "Select Date"
 msgstr "Valitse päivämäärä"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "Select _Today"
 msgstr "Valitse _tämä päivä"
 
-#: ../calendar/gui/dialogs/memo-editor.c:106 ../calendar/gui/print.c:3509
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3500
 msgid "Memo"
 msgstr "Muistilappu"
 
-#: ../calendar/gui/dialogs/memo-editor.c:156
+#: ../calendar/gui/dialogs/memo-editor.c:155
 msgid "Print this memo"
 msgstr "Tulosta tämä muistilappu"
 
-#: ../calendar/gui/dialogs/memo-page.c:421
+#: ../calendar/gui/dialogs/memo-page.c:424
 msgid "Memo's start date is in the past"
 msgstr "Muistilapun aloitusaika on mennyt"
 
-#: ../calendar/gui/dialogs/memo-page.c:457
+#: ../calendar/gui/dialogs/memo-page.c:460
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr ""
 "Muistilappua ei voi muokata, koska valittu muistilappuluettelo on vain "
 "lukutilassa"
 
-#: ../calendar/gui/dialogs/memo-page.c:461
+#: ../calendar/gui/dialogs/memo-page.c:464
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Muistilappua ei voi muokata täysin, koska et ole sen järjestäjä"
 
-#: ../calendar/gui/dialogs/memo-page.c:1160
-#: ../em-format/e-mail-formatter-utils.c:205
-#: ../em-format/e-mail-formatter-utils.c:229
-#: ../em-format/e-mail-part-headers.c:49 ../mail/em-filter-i18n.h:78
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:66
+#: ../calendar/gui/dialogs/memo-page.c:1166
+#: ../em-format/e-mail-formatter-utils.c:201
+#: ../em-format/e-mail-formatter-utils.c:218
+#: ../em-format/e-mail-part-headers.c:48 ../mail/em-filter-i18n.h:52
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:65
 msgid "To"
 msgstr "Vastaanottaja"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
 #: ../calendar/gui/dialogs/task-page.c:426
-#: ../calendar/gui/dialogs/task-page.ui.h:31
+#: ../calendar/gui/dialogs/task-page.ui.h:34
 msgid "_List:"
 msgstr "_Luettelo:"
 
@@ -3185,58 +3471,58 @@ msgstr "_Alkamispäivä:"
 msgid "Su_mmary:"
 msgstr "_Yhteenveto:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 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:55
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 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:59
+#: ../calendar/gui/dialogs/recur-comp.c:58
 #, c-format
 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:63
+#: ../calendar/gui/dialogs/recur-comp.c:62
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Olet muokkaamassa toistuvaa muistilappua. Mitä haluat muokata?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "Vain tätä kertaa"
 
-#: ../calendar/gui/dialogs/recur-comp.c:93
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "Tätä ja edellisiä kertoja"
 
-#: ../calendar/gui/dialogs/recur-comp.c:99
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "Tätä ja tulevia kertoja"
 
-#: ../calendar/gui/dialogs/recur-comp.c:104
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "Kaikki kerrat"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:575
+#: ../calendar/gui/dialogs/recurrence-page.c:574
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Tämä tapaaminen sisältää toistuvuuksia, joita Evolution ei voi muokata."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1000
+#: ../calendar/gui/dialogs/recurrence-page.c:1001
 msgid "Recurrence date is invalid"
 msgstr "Toistuvuuden päiväys on virheellinen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
 msgid "End time of the recurrence was before event's start"
 msgstr "Toistuvuuden päättymispäivä oli ennen tapahtuman alkua"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1073
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "on"
 msgstr "Käytössä"
 
@@ -3244,7 +3530,7 @@ msgstr "Käytössä"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1154
+#: ../calendar/gui/dialogs/recurrence-page.c:1155
 msgid "first"
 msgstr "ensimmäinen"
 
@@ -3253,7 +3539,7 @@ msgstr "ensimmäinen"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1160
+#: ../calendar/gui/dialogs/recurrence-page.c:1161
 msgid "second"
 msgstr "toinen"
 
@@ -3261,7 +3547,7 @@ msgstr "toinen"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1165
+#: ../calendar/gui/dialogs/recurrence-page.c:1166
 msgid "third"
 msgstr "kolmas"
 
@@ -3269,7 +3555,7 @@ msgstr "kolmas"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1170
+#: ../calendar/gui/dialogs/recurrence-page.c:1171
 msgid "fourth"
 msgstr "neljäs"
 
@@ -3277,7 +3563,7 @@ msgstr "neljäs"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1175
+#: ../calendar/gui/dialogs/recurrence-page.c:1176
 msgid "fifth"
 msgstr "viides"
 
@@ -3285,13 +3571,13 @@ msgstr "viides"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1180
+#: ../calendar/gui/dialogs/recurrence-page.c:1181
 msgid "last"
 msgstr "viimeinen"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1204
+#: ../calendar/gui/dialogs/recurrence-page.c:1205
 msgid "Other Date"
 msgstr "Toinen päiväys"
 
@@ -3299,7 +3585,7 @@ msgstr "Toinen päiväys"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1210
+#: ../calendar/gui/dialogs/recurrence-page.c:1211
 msgid "1st to 10th"
 msgstr "1. - 10."
 
@@ -3307,7 +3593,7 @@ msgstr "1. - 10."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1216
+#: ../calendar/gui/dialogs/recurrence-page.c:1217
 msgid "11th to 20th"
 msgstr "11. - 20."
 
@@ -3315,41 +3601,41 @@ msgstr "11. - 20."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1222
+#: ../calendar/gui/dialogs/recurrence-page.c:1223
 msgid "21st to 31st"
 msgstr "21. - 31."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1249
+#: ../calendar/gui/dialogs/recurrence-page.c:1250
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "Monday"
 msgstr "Maanantai"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1250
+#: ../calendar/gui/dialogs/recurrence-page.c:1251
 #: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Tuesday"
 msgstr "Tiistai"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1251
+#: ../calendar/gui/dialogs/recurrence-page.c:1252
 #: ../modules/calendar/e-calendar-preferences.ui.h:31
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1252
+#: ../calendar/gui/dialogs/recurrence-page.c:1253
 #: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Thursday"
 msgstr "Torstai"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1253
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
 #: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Friday"
 msgstr "Perjantai"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1254
+#: ../calendar/gui/dialogs/recurrence-page.c:1255
 #: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1255
+#: ../calendar/gui/dialogs/recurrence-page.c:1256
 #: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Sunday"
 msgstr "Sunnuntai"
@@ -3357,31 +3643,31 @@ msgstr "Sunnuntai"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1386
+#: ../calendar/gui/dialogs/recurrence-page.c:1387
 msgid "on the"
 msgstr "seuraavasti:"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1571
+#: ../calendar/gui/dialogs/recurrence-page.c:1572
 msgid "occurrences"
 msgstr "tapahtumiskertaa"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2341
+#: ../calendar/gui/dialogs/recurrence-page.c:2342
 msgid "Add exception"
 msgstr "Lisää poikkeus"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2384
 msgid "Could not get a selection to modify."
 msgstr "Valintaa ei voi hakea muokattavaksi."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2389
+#: ../calendar/gui/dialogs/recurrence-page.c:2390
 msgid "Modify exception"
 msgstr "Muokkaa poikkeusta"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2435
+#: ../calendar/gui/dialogs/recurrence-page.c:2436
 msgid "Could not get a selection to delete."
 msgstr "Valintaa ei voitu hakea poistettavaksi."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2576
+#: ../calendar/gui/dialogs/recurrence-page.c:2577
 msgid "Date/Time"
 msgstr "Päiväys/aika"
 
@@ -3439,31 +3725,31 @@ msgstr "Joka"
 msgid "Exceptions"
 msgstr "Poikkeukset"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:22
 msgid "Preview"
 msgstr "Esikatselu"
 
-#: ../calendar/gui/dialogs/send-comp.c:173
-#: ../calendar/gui/dialogs/send-comp.c:255
+#: ../calendar/gui/dialogs/send-comp.c:172
+#: ../calendar/gui/dialogs/send-comp.c:254
 #, fuzzy
 msgid "Send my reminders with this event"
 msgstr "Lähetä hälytys tälle tapahtumalle"
 
-#: ../calendar/gui/dialogs/send-comp.c:175
-#: ../calendar/gui/dialogs/send-comp.c:257
+#: ../calendar/gui/dialogs/send-comp.c:174
+#: ../calendar/gui/dialogs/send-comp.c:256
 msgid "Notify new attendees _only"
 msgstr "Muistuta uusia osallistuja _vain"
 
-#: ../calendar/gui/dialogs/task-editor.c:94
+#: ../calendar/gui/dialogs/task-editor.c:93
 msgid "_Send Options"
 msgstr "_Lähetysasetukset"
 
-#: ../calendar/gui/dialogs/task-editor.c:149 ../calendar/gui/print.c:3507
-#: ../e-util/e-send-options.c:553
+#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3498
+#: ../e-util/e-send-options.c:552
 msgid "Task"
 msgstr "Tehtävä"
 
-#: ../calendar/gui/dialogs/task-editor.c:286
+#: ../calendar/gui/dialogs/task-editor.c:285
 msgid "Print this task"
 msgstr "Tulosta tämä tehtävä"
 
@@ -3492,88 +3778,88 @@ msgid ""
 msgstr ""
 "Tehtävää ei voi muokata, koska valittu tehtävälista on vain luettavissa"
 
-#: ../calendar/gui/dialogs/task-page.c:1007
+#: ../calendar/gui/dialogs/task-page.c:1011
 msgid "Due date is wrong"
 msgstr "Eräpäivä on virheellinen"
 
-#: ../calendar/gui/dialogs/task-page.c:1175
-#: ../calendar/gui/dialogs/task-page.c:1200
+#: ../calendar/gui/dialogs/task-page.c:1179
+#: ../calendar/gui/dialogs/task-page.c:1204
 msgid "Completed date is wrong"
 msgstr "Valmistumispäivä on väärin"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:345
-#: ../calendar/gui/e-task-table.c:573 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:320
+#: ../calendar/gui/e-cal-component-preview.c:336
+#: ../calendar/gui/e-task-table.c:572 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:309
 msgid "High"
 msgstr "Korkea"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:347
-#: ../calendar/gui/e-cal-model.c:1666 ../calendar/gui/e-task-table.c:574
+#: ../calendar/gui/e-cal-component-preview.c:338
+#: ../calendar/gui/e-cal-model.c:1665 ../calendar/gui/e-task-table.c:573
 #: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:319
+#: ../mail/message-list.c:308
 msgid "Normal"
 msgstr "Tavallinen"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:349
-#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:318
+#: ../calendar/gui/e-cal-component-preview.c:340
+#: ../calendar/gui/e-task-table.c:574 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:307
 msgid "Low"
 msgstr "Matala"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:14
-#: ../calendar/gui/e-task-table.c:576 ../calendar/gui/tasktypes.xml.h:22
+#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:22
 #: ../e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "Määrittämätön"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:330
-#: ../calendar/gui/e-cal-model-tasks.c:311
-#: ../calendar/gui/e-cal-model-tasks.c:553 ../calendar/gui/e-task-table.c:214
-#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:656
-#: ../calendar/gui/print.c:3591 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-model-tasks.c:310
+#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:655
+#: ../calendar/gui/print.c:3582 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "Ei aloitettu"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:18
-#: ../calendar/gui/e-cal-component-preview.c:320
-#: ../calendar/gui/e-cal-model-tasks.c:313
-#: ../calendar/gui/e-cal-model-tasks.c:555
-#: ../calendar/gui/e-cal-model-tasks.c:633 ../calendar/gui/e-task-table.c:216
-#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:657
-#: ../calendar/gui/print.c:3594
+#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-model-tasks.c:312
+#: ../calendar/gui/e-cal-model-tasks.c:554
+#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:656
+#: ../calendar/gui/print.c:3585
 msgid "In Progress"
 msgstr "Työn alla"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:20
-#: ../calendar/gui/e-cal-component-preview.c:323
-#: ../calendar/gui/e-cal-model-tasks.c:315
-#: ../calendar/gui/e-cal-model-tasks.c:557
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
-#: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
-#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3597
+#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-cal-model-tasks.c:314
+#: ../calendar/gui/e-cal-model-tasks.c:556
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../calendar/gui/e-task-table.c:217 ../calendar/gui/e-task-table.c:232
+#: ../calendar/gui/e-task-table.c:657 ../calendar/gui/print.c:3588
 #: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Completed"
 msgstr "Valmis"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:22
-#: ../calendar/gui/e-cal-component-preview.c:326
-#: ../calendar/gui/e-cal-model-tasks.c:317
-#: ../calendar/gui/e-cal-model-tasks.c:559 ../calendar/gui/e-task-table.c:220
-#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:659
-#: ../calendar/gui/print.c:3600 ../mail/mail-send-recv.c:878
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-cal-model-tasks.c:316
+#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:219
+#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:658
+#: ../calendar/gui/print.c:3591 ../mail/mail-send-recv.c:855
 msgid "Canceled"
 msgstr "Peruutettu"
 
@@ -3585,85 +3871,80 @@ msgstr "_Eräpäivä:"
 msgid "Time zone:"
 msgstr "Aikavyöhyke:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:32
-#| msgid "Status:"
+#: ../calendar/gui/dialogs/task-page.ui.h:35
 msgid "_Status:"
 msgstr "_Tila:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:33
-#| msgid "_Date completed:"
+#: ../calendar/gui/dialogs/task-page.ui.h:36
 msgid "Date _completed:"
 msgstr "_Valmistumispäivä:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:34
-#| msgid "P_ercent complete:"
+#: ../calendar/gui/dialogs/task-page.ui.h:37
 msgid "_Percent complete:"
 msgstr "Pros_enttia valmiina:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:35
-#| msgid "Priority:"
+#: ../calendar/gui/dialogs/task-page.ui.h:38
 msgid "Priorit_y:"
 msgstr "_Prioriteetti:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:36
-#| msgid "_Classification:"
+#: ../calendar/gui/dialogs/task-page.ui.h:39
 msgid "C_lassification:"
 msgstr "Lu_okittelu:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:37
+#: ../calendar/gui/dialogs/task-page.ui.h:40
 msgid "_Web Page:"
 msgstr "_Kotisivun osoite:"
 
-#: ../calendar/gui/ea-cal-view.c:324
+#: ../calendar/gui/ea-cal-view.c:281
 msgid "New Appointment"
 msgstr "Uusi tapaaminen"
 
-#: ../calendar/gui/ea-cal-view.c:325
+#: ../calendar/gui/ea-cal-view.c:282
 msgid "New All Day Event"
 msgstr "Uusi koko päivän tapahtuma"
 
-#: ../calendar/gui/ea-cal-view.c:326
+#: ../calendar/gui/ea-cal-view.c:283
 msgid "New Meeting"
 msgstr "Uusi kokous"
 
-#: ../calendar/gui/ea-cal-view.c:327
+#: ../calendar/gui/ea-cal-view.c:284
 msgid "Go to Today"
 msgstr "Siirry tähän päivään"
 
-#: ../calendar/gui/ea-cal-view.c:328
+#: ../calendar/gui/ea-cal-view.c:285
 msgid "Go to Date"
 msgstr "Siirry päivään"
 
-#: ../calendar/gui/ea-cal-view-event.c:298
+#: ../calendar/gui/ea-cal-view-event.c:297
 msgid "It has reminders."
 msgstr "Sisältää muistutuksia."
 
-#: ../calendar/gui/ea-cal-view-event.c:301
+#: ../calendar/gui/ea-cal-view-event.c:300
 msgid "It has recurrences."
 msgstr "Sisältää toistuvuuksia."
 
-#: ../calendar/gui/ea-cal-view-event.c:304
+#: ../calendar/gui/ea-cal-view-event.c:303
 msgid "It is a meeting."
 msgstr "Sisältää kokouksen."
 
-#: ../calendar/gui/ea-cal-view-event.c:311
+#: ../calendar/gui/ea-cal-view-event.c:310
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalenteritapahtuma, yhteenveto aiheesta: %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:314
+#: ../calendar/gui/ea-cal-view-event.c:313
 msgid "Calendar Event: It has no summary."
 msgstr "Kalenteritapahtuma, ei yhteenvetoa."
 
-#: ../calendar/gui/ea-cal-view-event.c:337
+#: ../calendar/gui/ea-cal-view-event.c:336
 msgid "calendar view event"
 msgstr "kalenterinäkymän tapahtuma"
 
-#: ../calendar/gui/ea-cal-view-event.c:569
+#: ../calendar/gui/ea-cal-view-event.c:568
 msgid "Grab Focus"
 msgstr "Ota kohdistin"
 
-#: ../calendar/gui/ea-day-view.c:154 ../calendar/gui/ea-week-view.c:154
+#: ../calendar/gui/ea-day-view.c:111 ../calendar/gui/ea-week-view.c:110
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -3672,41 +3953,41 @@ msgstr[1] "%d tapahtumaa."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:161 ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-day-view.c:118 ../calendar/gui/ea-week-view.c:113
 msgid "It has no events."
 msgstr "Ei tapahtumia."
 
-#: ../calendar/gui/ea-day-view.c:169
+#: ../calendar/gui/ea-day-view.c:126
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Työviikon näkymä: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:176
+#: ../calendar/gui/ea-day-view.c:133
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Päivänäkymä: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:210
+#: ../calendar/gui/ea-day-view.c:167
 msgid "calendar view for a work week"
 msgstr "kalenterin näkymä työviikkoon"
 
-#: ../calendar/gui/ea-day-view.c:212
+#: ../calendar/gui/ea-day-view.c:169
 msgid "calendar view for one or more days"
 msgstr "Kalenterinäkymä yhdelle tai useammalle päivälle"
 
-#: ../calendar/gui/ea-day-view-main-item.c:327
-#: ../calendar/gui/ea-week-view-main-item.c:354
+#: ../calendar/gui/ea-day-view-main-item.c:266
+#: ../calendar/gui/ea-week-view-main-item.c:293
 msgid "a table to view and select the current time range"
 msgstr "taulukko, josta voi nähdä ja valita nykyisen aika-alueen"
 
-#: ../calendar/gui/ea-gnome-calendar.c:48
-#: ../calendar/gui/ea-gnome-calendar.c:56
-#: ../calendar/importers/icalendar-importer.c:1114
+#: ../calendar/gui/ea-gnome-calendar.c:47
+#: ../calendar/gui/ea-gnome-calendar.c:55
+#: ../calendar/importers/icalendar-importer.c:1107
 msgid "Gnome Calendar"
 msgstr "Gnome-kalenteri"
 
-#: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../modules/calendar/e-cal-shell-view-private.c:1225
+#: ../calendar/gui/ea-gnome-calendar.c:206
+#: ../modules/calendar/e-cal-shell-view-private.c:1190
 msgid "%A %d %b %Y"
 msgstr "%A %e. %Bta %Y"
 
@@ -3716,30 +3997,30 @@ msgstr "%A %e. %Bta %Y"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:208 ../calendar/gui/e-day-view.c:2793
-#: ../calendar/gui/e-day-view-top-item.c:859
-#: ../calendar/gui/e-week-view-main-item.c:219
-#: ../modules/calendar/e-cal-shell-view-private.c:1229
+#: ../calendar/gui/ea-gnome-calendar.c:210 ../calendar/gui/e-day-view.c:2796
+#: ../calendar/gui/e-day-view-top-item.c:858
+#: ../calendar/gui/e-week-view-main-item.c:218
+#: ../modules/calendar/e-cal-shell-view-private.c:1194
 msgid "%a %d %b"
 msgstr "%a %e. %bta"
 
-#: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../calendar/gui/ea-gnome-calendar.c:217
-#: ../calendar/gui/ea-gnome-calendar.c:220
-#: ../modules/calendar/e-cal-shell-view-private.c:1232
-#: ../modules/calendar/e-cal-shell-view-private.c:1238
-#: ../modules/calendar/e-cal-shell-view-private.c:1241
+#: ../calendar/gui/ea-gnome-calendar.c:213
+#: ../calendar/gui/ea-gnome-calendar.c:219
+#: ../calendar/gui/ea-gnome-calendar.c:222
+#: ../modules/calendar/e-cal-shell-view-private.c:1197
+#: ../modules/calendar/e-cal-shell-view-private.c:1203
+#: ../modules/calendar/e-cal-shell-view-private.c:1206
 msgid "%a %d %b %Y"
 msgstr "%a %e. %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:239
-#: ../calendar/gui/ea-gnome-calendar.c:247
-#: ../calendar/gui/ea-gnome-calendar.c:254
-#: ../calendar/gui/ea-gnome-calendar.c:257
-#: ../modules/calendar/e-cal-shell-view-private.c:1258
-#: ../modules/calendar/e-cal-shell-view-private.c:1269
-#: ../modules/calendar/e-cal-shell-view-private.c:1276
-#: ../modules/calendar/e-cal-shell-view-private.c:1279
+#: ../calendar/gui/ea-gnome-calendar.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:249
+#: ../calendar/gui/ea-gnome-calendar.c:256
+#: ../calendar/gui/ea-gnome-calendar.c:259
+#: ../modules/calendar/e-cal-shell-view-private.c:1223
+#: ../modules/calendar/e-cal-shell-view-private.c:1234
+#: ../modules/calendar/e-cal-shell-view-private.c:1241
+#: ../modules/calendar/e-cal-shell-view-private.c:1244
 msgid "%d %b %Y"
 msgstr "%e. %Bta %Y"
 
@@ -3748,23 +4029,23 @@ msgstr "%e. %Bta %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:244 ../calendar/gui/e-day-view.c:2809
-#: ../calendar/gui/e-day-view-top-item.c:863
-#: ../calendar/gui/e-week-view-main-item.c:233
-#: ../modules/calendar/e-cal-shell-view-private.c:1265
+#: ../calendar/gui/ea-gnome-calendar.c:246 ../calendar/gui/e-day-view.c:2812
+#: ../calendar/gui/e-day-view-top-item.c:862
+#: ../calendar/gui/e-week-view-main-item.c:232
+#: ../modules/calendar/e-cal-shell-view-private.c:1230
 msgid "%d %b"
 msgstr "%e. %b"
 
-#: ../calendar/gui/ea-jump-button.c:151
+#: ../calendar/gui/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "Hyppäyspainike"
 
-#: ../calendar/gui/ea-jump-button.c:160
+#: ../calendar/gui/ea-jump-button.c:159
 msgid "Click here, you can find more events."
 msgstr "Napsauta tästä, voit löytää lisää tapahtumia."
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:358
+#: ../calendar/gui/e-alarm-list.c:357 ../calendar/gui/misc.c:97
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3772,127 +4053,141 @@ msgstr[0] "%d päivä"
 msgstr[1] "%d päivää"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:364
+#: ../calendar/gui/e-alarm-list.c:363
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d viikko"
 msgstr[1] "%d viikkoa"
 
-#: ../calendar/gui/e-alarm-list.c:426
+#: ../calendar/gui/e-alarm-list.c:425
 msgid "Unknown action to be performed"
 msgstr "Tuntematon suoritettava tehtävä"
 
-#: ../calendar/gui/e-alarm-list.c:441
+#: ../calendar/gui/e-alarm-list.c:440
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s ennen tapaamisen alkua"
 
-#: ../calendar/gui/e-alarm-list.c:447
+#: ../calendar/gui/e-alarm-list.c:446
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s tapaamisen alun jälkeen"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:453
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s tapaamisen alussa"
 
-#: ../calendar/gui/e-alarm-list.c:466
+#: ../calendar/gui/e-alarm-list.c:465
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s ennen tapaamisen loppumista"
 
-#: ../calendar/gui/e-alarm-list.c:472
+#: ../calendar/gui/e-alarm-list.c:471
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s tapaamisen päättymisen jälkeen"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:479
+#: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s tapaamisen lopussa"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:503
+#: ../calendar/gui/e-alarm-list.c:502
 #, c-format
 msgid "%s at %s"
 msgstr "%s %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:511
+#: ../calendar/gui/e-alarm-list.c:510
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s tuntemattomalle liipaisintyypille"
 
-#: ../calendar/gui/ea-week-view.c:163
+#: ../calendar/gui/ea-week-view.c:119
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Kuukausinäkymä: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:168
+#: ../calendar/gui/ea-week-view.c:124
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Työviikko: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:202
+#: ../calendar/gui/ea-week-view.c:158
 msgid "calendar view for a month"
 msgstr "kalenterin kuukausinäkymä"
 
-#: ../calendar/gui/ea-week-view.c:204
+#: ../calendar/gui/ea-week-view.c:160
 msgid "calendar view for one or more weeks"
 msgstr "kalenterinäkymä yhdelle tai useammalle viikolle"
 
-#: ../calendar/gui/e-cal-component-preview.c:231 ../e-util/e-filter-rule.c:750
-#: ../mail/e-mail-config-page.c:126
+#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:757
+#: ../mail/e-mail-config-page.c:125
 msgid "Untitled"
 msgstr "Nimetön"
 
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:230
 msgid "Categories:"
 msgstr "Luokat:"
 
-#: ../calendar/gui/e-cal-component-preview.c:271
+#: ../calendar/gui/e-cal-component-preview.c:262
 msgid "Summary:"
 msgstr "Kuvaus:"
 
-#: ../calendar/gui/e-cal-component-preview.c:280
+#: ../calendar/gui/e-cal-component-preview.c:271
 msgid "Start Date:"
 msgstr "Alkamispäivä:"
 
-#: ../calendar/gui/e-cal-component-preview.c:292
+#: ../calendar/gui/e-cal-component-preview.c:283
 msgid "End Date:"
 msgstr "Päättymispäivä:"
 
-#: ../calendar/gui/e-cal-component-preview.c:304
+#: ../calendar/gui/e-cal-component-preview.c:295
 msgid "Due Date:"
 msgstr "Eräpäivä:"
 
-#: ../calendar/gui/e-cal-component-preview.c:316
-#: ../modules/itip-formatter/itip-view.c:1492
-#: ../modules/itip-formatter/itip-view.c:1609
+#: ../calendar/gui/e-cal-component-preview.c:307
+#: ../modules/itip-formatter/itip-view.c:1506
+#: ../modules/itip-formatter/itip-view.c:1623
 msgid "Status:"
 msgstr "Tila:"
 
-#: ../calendar/gui/e-cal-component-preview.c:343
+#: ../calendar/gui/e-cal-component-preview.c:334
 msgid "Priority:"
 msgstr "Prioriteetti:"
 
-#: ../calendar/gui/e-cal-component-preview.c:368
-#: ../mail/e-mail-config-service-page.c:672
+#: ../calendar/gui/e-cal-component-preview.c:359
+#: ../mail/e-mail-config-service-page.c:671
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: ../calendar/gui/e-cal-component-preview.c:399
+#: ../calendar/gui/e-cal-component-preview.c:390
 msgid "Web Page:"
 msgstr "WWW-sivu:"
 
+#: ../calendar/gui/e-calendar-selector.c:356
+#: ../modules/calendar/e-cal-shell-view-private.c:1096
+#, fuzzy, c-format
+#| msgid "Copying an event into the calendar '{0}'"
+msgid "Copying an event into the calendar %s"
+msgstr "Kopioidaan tapahtumaa kalenteriin '{0}'"
+
+#: ../calendar/gui/e-calendar-selector.c:357
+#: ../modules/calendar/e-cal-shell-view-private.c:1095
+#, fuzzy, c-format
+#| msgid "Moving an event into the calendar '{0}'"
+msgid "Moving an event into the calendar %s"
+msgstr "Siirretään tapahtumaa kalenteriin '{0}'"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:1
 msgid "Click to add a task"
 msgstr "Lisää tehtävä tästä"
@@ -3905,8 +4200,8 @@ msgstr "Aloituspäivä"
 #: ../calendar/gui/e-meeting-list-view.c:652
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../e-util/e-attachment-tree-view.c:586
-#: ../mail/e-mail-account-tree-view.c:159
+#: ../e-util/e-attachment-tree-view.c:585
+#: ../mail/e-mail-account-tree-view.c:158
 msgid "Type"
 msgstr "Tyyppi"
 
@@ -3914,7 +4209,7 @@ msgstr "Tyyppi"
 msgid "Completion date"
 msgstr "Valmistumispäivä"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:880
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:857
 msgid "Complete"
 msgstr "Valmis"
 
@@ -3929,17 +4224,17 @@ msgstr "% valmiina"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Priority"
 msgstr "Prioriteetti"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:4017
+#: ../calendar/gui/e-cal-model.c:4011
 #: ../calendar/gui/e-meeting-list-view.c:695
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:75
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:49
 #: ../mail/message-list.etspec.h:1
 msgid "Status"
 msgstr "Tila"
@@ -3947,7 +4242,7 @@ msgstr "Tila"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:380
 msgid "Created"
 msgstr "Luotu"
 
@@ -3957,37 +4252,37 @@ msgstr "Luotu"
 msgid "Last modified"
 msgstr "Viimeksi muokattu"
 
-#: ../calendar/gui/e-calendar-view.c:446
+#: ../calendar/gui/e-calendar-view.c:448
 msgid "Cut selected events to the clipboard"
 msgstr "Leikkaa valitut tapahtumat leikepöydälle"
 
-#: ../calendar/gui/e-calendar-view.c:452
+#: ../calendar/gui/e-calendar-view.c:454
 msgid "Copy selected events to the clipboard"
 msgstr "Kopioi valitut tapahtumat leikepöydälle"
 
-#: ../calendar/gui/e-calendar-view.c:458
+#: ../calendar/gui/e-calendar-view.c:460
 msgid "Paste events from the clipboard"
 msgstr "Liitä tapahtumat leikepöydältä"
 
-#: ../calendar/gui/e-calendar-view.c:464
+#: ../calendar/gui/e-calendar-view.c:466
 msgid "Delete selected events"
 msgstr "Poista valitut tapahtumat"
 
-#: ../calendar/gui/e-calendar-view.c:484 ../calendar/gui/e-memo-table.c:183
-#: ../calendar/gui/e-task-table.c:270
+#: ../calendar/gui/e-calendar-view.c:486 ../calendar/gui/e-memo-table.c:182
+#: ../calendar/gui/e-task-table.c:269
 msgid "Deleting selected objects"
 msgstr "Poistetaan valitut kohteet"
 
-#: ../calendar/gui/e-calendar-view.c:646 ../calendar/gui/e-memo-table.c:878
-#: ../calendar/gui/e-task-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:877
+#: ../calendar/gui/e-task-table.c:1175
 msgid "Updating objects"
 msgstr "Päivitetään olioita"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2084 ../calendar/gui/e-memo-table.c:553
-#: ../calendar/gui/e-task-table.c:840
+#: ../calendar/gui/e-calendar-view.c:2094 ../calendar/gui/e-memo-table.c:552
+#: ../calendar/gui/e-task-table.c:839
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Järjestäjä: %s <%s>"
@@ -3995,21 +4290,21 @@ msgstr "Järjestäjä: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:2088 ../calendar/gui/e-memo-table.c:558
-#: ../calendar/gui/e-task-table.c:844
+#: ../calendar/gui/e-calendar-view.c:2098 ../calendar/gui/e-memo-table.c:557
+#: ../calendar/gui/e-task-table.c:843
 #, c-format
 msgid "Organizer: %s"
 msgstr "Järjestäjä: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2104
-#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3545
+#: ../calendar/gui/e-calendar-view.c:2114
+#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3536
 #, c-format
 msgid "Location: %s"
 msgstr "Sijainti: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2135
+#: ../calendar/gui/e-calendar-view.c:2145
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aika: %s %s"
@@ -4023,81 +4318,81 @@ msgstr "Aloituspäivä"
 msgid "End Date"
 msgstr "Päättymispäivä"
 
-#: ../calendar/gui/e-cal-model.c:467 ../calendar/gui/e-meeting-list-view.c:185
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1251
-#: ../calendar/gui/print.c:1268 ../e-util/e-charset.c:52
-#: ../modules/itip-formatter/itip-view.c:3496
-#: ../modules/itip-formatter/itip-view.c:6080
-#: ../modules/plugin-manager/evolution-plugin-manager.c:100
+#: ../calendar/gui/e-cal-model.c:466 ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1250
+#: ../calendar/gui/print.c:1267 ../e-util/e-charset.c:51
+#: ../modules/itip-formatter/itip-view.c:3510
+#: ../modules/itip-formatter/itip-view.c:6097
+#: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../calendar/gui/e-cal-model.c:1668
+#: ../calendar/gui/e-cal-model.c:1667
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../calendar/gui/e-cal-model.c:1670
+#: ../calendar/gui/e-cal-model.c:1669
 msgid "Assigned"
 msgstr "Annettu tehtäväksi"
 
-#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1163
-#: ../calendar/gui/e-meeting-list-view.c:209
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
-#: ../calendar/gui/e-meeting-store.c:1024
+#: ../calendar/gui/e-cal-model.c:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-meeting-list-view.c:208
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:186
+#: ../calendar/gui/e-meeting-store.c:1023
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1163
-#: ../calendar/gui/e-meeting-list-view.c:210
-#: ../calendar/gui/e-meeting-store.c:189
+#: ../calendar/gui/e-cal-model.c:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-meeting-list-view.c:209
+#: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "Ei"
 
-#: ../calendar/gui/e-cal-model.c:3958
-#: ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
-#: ../modules/itip-formatter/itip-view.c:6068
+#: ../calendar/gui/e-cal-model.c:3952
+#: ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../modules/itip-formatter/itip-view.c:6085
 msgid "Accepted"
 msgstr "Hyväksytty"
 
-#: ../calendar/gui/e-cal-model.c:3959
-#: ../calendar/gui/e-meeting-list-view.c:222
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../modules/itip-formatter/itip-view.c:6074
+#: ../calendar/gui/e-cal-model.c:3953
+#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../modules/itip-formatter/itip-view.c:6091
 msgid "Declined"
 msgstr "Hylätty"
 
-#: ../calendar/gui/e-cal-model.c:3960
-#: ../calendar/gui/e-meeting-list-view.c:223
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-cal-model.c:3954
+#: ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
+#: ../calendar/gui/e-meeting-time-sel.c:527
 msgid "Tentative"
 msgstr "Alustava"
 
-#: ../calendar/gui/e-cal-model.c:3961
-#: ../calendar/gui/e-meeting-list-view.c:224
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../modules/itip-formatter/itip-view.c:6077
+#: ../calendar/gui/e-cal-model.c:3955
+#: ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
+#: ../modules/itip-formatter/itip-view.c:6094
 msgid "Delegated"
 msgstr "Valtuutettu"
 
-#: ../calendar/gui/e-cal-model.c:3962
+#: ../calendar/gui/e-cal-model.c:3956
 msgid "Needs action"
 msgstr "Vaatii toimenpiteitä"
 
-#: ../calendar/gui/e-cal-model-calendar.c:125
-#: ../calendar/gui/e-task-table.c:631
+#: ../calendar/gui/e-cal-model-calendar.c:124
+#: ../calendar/gui/e-task-table.c:630
 msgid "Free"
 msgstr "Vapaa"
 
-#: ../calendar/gui/e-cal-model-calendar.c:128
-#: ../calendar/gui/e-meeting-time-sel.c:527 ../calendar/gui/e-task-table.c:632
+#: ../calendar/gui/e-cal-model-calendar.c:127
+#: ../calendar/gui/e-meeting-time-sel.c:528 ../calendar/gui/e-task-table.c:631
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../calendar/gui/e-cal-model-tasks.c:499
+#: ../calendar/gui/e-cal-model-tasks.c:498
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4108,22 +4403,22 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:551
+#: ../calendar/gui/e-cal-model-tasks.c:550
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ei mitään"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:159
+#: ../calendar/gui/e-cell-date-edit-text.c:158
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:162
+#: ../calendar/gui/e-cell-date-edit-text.c:161
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I.%M.%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:170
+#: ../calendar/gui/e-cell-date-edit-text.c:169
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4133,16 +4428,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1983 ../calendar/gui/e-week-view.c:1554
-#: ../calendar/gui/print.c:1074 ../calendar/gui/print.c:1093
-#: ../calendar/gui/print.c:2637 ../calendar/gui/print.c:2657
+#: ../calendar/gui/e-day-view.c:1986 ../calendar/gui/e-week-view.c:1540
+#: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
+#: ../calendar/gui/print.c:2633 ../calendar/gui/print.c:2653
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1986 ../calendar/gui/e-week-view.c:1557
-#: ../calendar/gui/print.c:1079 ../calendar/gui/print.c:1095
-#: ../calendar/gui/print.c:2642 ../calendar/gui/print.c:2659
+#: ../calendar/gui/e-day-view.c:1989 ../calendar/gui/e-week-view.c:1543
+#: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
+#: ../calendar/gui/print.c:2638 ../calendar/gui/print.c:2655
 msgid "pm"
 msgstr "pm"
 
@@ -4152,13 +4447,13 @@ msgstr "pm"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:2776 ../calendar/gui/e-day-view-top-item.c:855
-#: ../calendar/gui/e-week-view-main-item.c:210 ../calendar/gui/print.c:2093
+#: ../calendar/gui/e-day-view.c:2779 ../calendar/gui/e-day-view-top-item.c:854
+#: ../calendar/gui/e-week-view-main-item.c:209 ../calendar/gui/print.c:2089
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:3433
+#: ../calendar/gui/e-day-view.c:3443
 #, c-format
 msgid "Week %d"
 msgstr "Viikko %d"
@@ -4169,97 +4464,97 @@ msgstr "Viikko %d"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:801
+#: ../calendar/gui/e-day-view-time-item.c:800
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minuutin välein"
 
-#: ../calendar/gui/e-day-view-time-item.c:826
+#: ../calendar/gui/e-day-view-time-item.c:825
 msgid "Show the second time zone"
 msgstr "Näytä toinen aikavyöhyke"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:843
-#: ../modules/calendar/e-calendar-preferences.c:306
-#: ../modules/calendar/e-calendar-preferences.c:358
+#: ../calendar/gui/e-day-view-time-item.c:842
+#: ../modules/calendar/e-calendar-preferences.c:305
+#: ../modules/calendar/e-calendar-preferences.c:357
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../calendar/gui/e-day-view-time-item.c:877
-#: ../calendar/gui/e-timezone-entry.c:324
-#: ../modules/calendar/e-calendar-preferences.c:389
+#: ../calendar/gui/e-day-view-time-item.c:876
+#: ../calendar/gui/e-timezone-entry.c:323
+#: ../modules/calendar/e-calendar-preferences.c:388
 msgid "Select..."
 msgstr "Valitse..."
 
-#: ../calendar/gui/e-meeting-list-view.c:64
+#: ../calendar/gui/e-meeting-list-view.c:63
 msgid "Chair Persons"
 msgstr "Toimi puheenjohtajana"
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Required Participants"
 msgstr "Vaaditut läsnäolijat"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Optional Participants"
 msgstr "Vapaaehtoiset läsnäolijat"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Resources"
 msgstr "Resurssit"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
-#: ../calendar/gui/e-meeting-store.c:1018 ../calendar/gui/print.c:1247
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:126
+#: ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1246
 msgid "Individual"
 msgstr "Henkilö"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
-#: ../calendar/gui/print.c:1248 ../e-util/e-table-config.ui.h:5
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
+#: ../calendar/gui/print.c:1247 ../e-util/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Ryhmä"
 
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/print.c:1249
+#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
+#: ../calendar/gui/print.c:1248
 msgid "Resource"
 msgstr "Resurssi"
 
-#: ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1250
+#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
+#: ../calendar/gui/print.c:1249
 msgid "Room"
 msgstr "Huone"
 
-#: ../calendar/gui/e-meeting-list-view.c:195
-#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/print.c:1264
+#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/print.c:1263
 msgid "Chair"
 msgstr "Puheenjohtaja"
 
-#: ../calendar/gui/e-meeting-list-view.c:196
-#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
-#: ../calendar/gui/e-meeting-store.c:1021 ../calendar/gui/print.c:1265
+#: ../calendar/gui/e-meeting-list-view.c:195
+#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1264
 msgid "Required Participant"
 msgstr "Vaadittu läsnäolija"
 
-#: ../calendar/gui/e-meeting-list-view.c:197
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/print.c:1266
+#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/print.c:1265
 msgid "Optional Participant"
 msgstr "Vapaaehtoinen läsnäolija"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/print.c:1267
+#: ../calendar/gui/e-meeting-list-view.c:197
+#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
+#: ../calendar/gui/print.c:1266
 msgid "Non-Participant"
 msgstr "Ei läsnä"
 
-#: ../calendar/gui/e-meeting-list-view.c:220
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../calendar/gui/e-meeting-store.c:1031
+#: ../calendar/gui/e-meeting-list-view.c:219
+#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:1030
 msgid "Needs Action"
 msgstr "Vaatii toimenpiteitä"
 
@@ -4272,89 +4567,88 @@ msgstr "Osallistuja                          "
 msgid "RSVP"
 msgstr "Kuittauspyyntö"
 
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
 msgid "In Process"
 msgstr "Työn alla"
 
-#: ../calendar/gui/e-meeting-store.c:1910
+#: ../calendar/gui/e-meeting-store.c:1909
 #, fuzzy, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr "Syötä salasana käyttäjälle %s palvelimeen %s"
 
-#: ../calendar/gui/e-meeting-store.c:1920
+#: ../calendar/gui/e-meeting-store.c:1919
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Epäonnistumisen syy: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1925
+#: ../calendar/gui/e-meeting-store.c:1924
 #: ../plugins/publish-calendar/publish-calendar.c:351
-#: ../smime/gui/component.c:64
+#: ../smime/gui/component.c:63
 msgid "Enter password"
 msgstr "Syötä salasana"
 
-#: ../calendar/gui/e-meeting-time-sel.c:528
+#: ../calendar/gui/e-meeting-time-sel.c:529
 msgid "Out of Office"
 msgstr "Poissa konttorilta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:530
+#: ../calendar/gui/e-meeting-time-sel.c:531
 msgid "No Information"
 msgstr "Ei tietoa"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:566
 msgid "O_ptions"
 msgstr "_Asetukset"
 
-#: ../calendar/gui/e-meeting-time-sel.c:590
+#: ../calendar/gui/e-meeting-time-sel.c:586
 msgid "Show _only working hours"
 msgstr "Näytä vain _työtunnit"
 
-#: ../calendar/gui/e-meeting-time-sel.c:603
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "Show _zoomed out"
 msgstr "Näytä _etäämpää"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "_Update free/busy"
 msgstr "_Päivitä vapaa/varattu"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:634
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:658
+#: ../calendar/gui/e-meeting-time-sel.c:654
 msgid "_Autopick"
 msgstr "_Automaattinen valinta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:675
+#: ../calendar/gui/e-meeting-time-sel.c:671
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:696
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid "_All people and resources"
 msgstr "_Kaikki henkilöt ja resurssit"
 
-#: ../calendar/gui/e-meeting-time-sel.c:707
+#: ../calendar/gui/e-meeting-time-sel.c:703
 msgid "All _people and one resource"
 msgstr "Kaikki _henkilöt ja yksi resurssi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:718
+#: ../calendar/gui/e-meeting-time-sel.c:714
 msgid "_Required people"
 msgstr "_Vaaditut henkilöt"
 
-#: ../calendar/gui/e-meeting-time-sel.c:728
+#: ../calendar/gui/e-meeting-time-sel.c:724
 msgid "Required people and _one resource"
 msgstr "Vaaditut henkilöt ja _yksi resurssi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:767
+#: ../calendar/gui/e-meeting-time-sel.c:763
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:796
+#: ../calendar/gui/e-meeting-time-sel.c:792
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
 #: ../calendar/gui/e-meeting-time-sel.c:2660
 #, c-format
-#| msgid "Location: %s"
 msgid ""
 "Summary: %s\n"
 "Location: %s"
@@ -4362,7 +4656,7 @@ msgstr ""
 "Yhteenveto: %s\n"
 "Sijainti: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3534
+#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3525
 #, c-format
 msgid "Summary: %s"
 msgstr "Yhteenveto: %s"
@@ -4391,46 +4685,46 @@ msgstr "Yhteinen nimi"
 msgid "Language"
 msgstr "Kieli"
 
-#: ../calendar/gui/e-memo-table.c:434
-#: ../modules/calendar/e-cal-shell-content.c:482
-#: ../modules/calendar/e-memo-shell-view-actions.c:212
-#: ../modules/calendar/e-memo-shell-view-actions.c:227
-#: ../modules/calendar/e-memo-shell-view.c:307
+#: ../calendar/gui/e-memo-table.c:433
+#: ../modules/calendar/e-cal-shell-content.c:481
+#: ../modules/calendar/e-memo-shell-view-actions.c:211
+#: ../modules/calendar/e-memo-shell-view-actions.c:226
+#: ../modules/calendar/e-memo-shell-view.c:306
 msgid "Memos"
 msgstr "Muistilaput"
 
-#: ../calendar/gui/e-memo-table.c:515 ../calendar/gui/e-task-table.c:803
+#: ../calendar/gui/e-memo-table.c:514 ../calendar/gui/e-task-table.c:802
 msgid "* No Summary *"
 msgstr "* Ei yhteenvetoa *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:602 ../calendar/gui/e-task-table.c:887
+#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:886
 msgid "Start: "
 msgstr "Alkaa: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:621 ../calendar/gui/e-task-table.c:905
+#: ../calendar/gui/e-memo-table.c:620 ../calendar/gui/e-task-table.c:904
 msgid "Due: "
 msgstr "Erääntyy: "
 
-#: ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-memo-table.c:741
 msgid "Cut selected memos to the clipboard"
 msgstr "Leikkaa valitut muistilaput leikepöydälle"
 
-#: ../calendar/gui/e-memo-table.c:748
+#: ../calendar/gui/e-memo-table.c:747
 msgid "Copy selected memos to the clipboard"
 msgstr "Kopioi valitut muistilaput leikepöydälle"
 
-#: ../calendar/gui/e-memo-table.c:754
+#: ../calendar/gui/e-memo-table.c:753
 msgid "Paste memos from the clipboard"
 msgstr "Liitä muistilaput leikepöydältä"
 
-#: ../calendar/gui/e-memo-table.c:760
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../calendar/gui/e-memo-table.c:759
+#: ../modules/calendar/e-memo-shell-view-actions.c:588
 msgid "Delete selected memos"
 msgstr "Poista valitut muistilaput"
 
-#: ../calendar/gui/e-memo-table.c:766
+#: ../calendar/gui/e-memo-table.c:765
 msgid "Select all visible memos"
 msgstr "Valitse kaikki näkyvissä olevat muistilaput"
 
@@ -4442,84 +4736,84 @@ msgstr "Lisää muistilappu tästä"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:604
+#: ../calendar/gui/e-task-table.c:603
 #, c-format
 msgid "%d%%"
 msgstr "%d %%"
 
-#: ../calendar/gui/e-task-table.c:721 ../calendar/gui/print.c:2418
-#: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:1078
+#: ../calendar/gui/e-task-table.c:720 ../calendar/gui/print.c:2414
+#: ../calendar/importers/icalendar-importer.c:78
+#: ../calendar/importers/icalendar-importer.c:1071
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:439
-#: ../modules/calendar/e-task-shell-view-actions.c:235
-#: ../modules/calendar/e-task-shell-view-actions.c:250
-#: ../modules/calendar/e-task-shell-view.c:462
+#: ../modules/calendar/e-cal-shell-content.c:438
+#: ../modules/calendar/e-task-shell-view-actions.c:234
+#: ../modules/calendar/e-task-shell-view-actions.c:249
+#: ../modules/calendar/e-task-shell-view.c:461
 msgid "Tasks"
 msgstr "Tehtävät"
 
-#: ../calendar/gui/e-task-table.c:1040
+#: ../calendar/gui/e-task-table.c:1039
 msgid "Cut selected tasks to the clipboard"
 msgstr "Leikkaa valitut tehtävät leikepöydälle"
 
-#: ../calendar/gui/e-task-table.c:1046
+#: ../calendar/gui/e-task-table.c:1045
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopioi valitut tehtävät leikepöydälle"
 
-#: ../calendar/gui/e-task-table.c:1052
+#: ../calendar/gui/e-task-table.c:1051
 msgid "Paste tasks from the clipboard"
 msgstr "Liitä tehtävät leikepöydältä"
 
-#: ../calendar/gui/e-task-table.c:1058
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../calendar/gui/e-task-table.c:1057
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "Delete selected tasks"
 msgstr "Poista valitut tehtävät"
 
-#: ../calendar/gui/e-task-table.c:1064
+#: ../calendar/gui/e-task-table.c:1063
 msgid "Select all visible tasks"
 msgstr "Valitse kaikki näkyvissä olevat tehtävät"
 
-#: ../calendar/gui/e-timezone-entry.c:335
+#: ../calendar/gui/e-timezone-entry.c:334
 msgid "Select Timezone"
 msgstr "Valitse aikavyöhyke"
 
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:227 ../calendar/gui/print.c:2072
+#: ../calendar/gui/e-week-view-main-item.c:226 ../calendar/gui/print.c:2068
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2369
+#: ../calendar/gui/gnome-cal.c:2371
 msgid "Purging"
 msgstr "Tyhjennetään"
 
-#: ../calendar/gui/itip-utils.c:646 ../calendar/gui/itip-utils.c:704
-#: ../calendar/gui/itip-utils.c:838
+#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
+#: ../calendar/gui/itip-utils.c:841
 msgid "An organizer must be set."
 msgstr "Järjestäjä tulee asettaa."
 
-#: ../calendar/gui/itip-utils.c:695
+#: ../calendar/gui/itip-utils.c:698
 msgid "At least one attendee is necessary"
 msgstr "Vähintään yksi läsnäolija on välttämätön"
 
-#: ../calendar/gui/itip-utils.c:926 ../calendar/gui/itip-utils.c:1087
+#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
 msgid "Event information"
 msgstr "Tapahtuman tiedot"
 
-#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
+#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
 msgid "Task information"
 msgstr "Tehtävän tiedot"
 
-#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
+#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1096
 msgid "Memo information"
 msgstr "Muistilapun tiedot"
 
-#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1111
+#: ../calendar/gui/itip-utils.c:938 ../calendar/gui/itip-utils.c:1114
 msgid "Free/Busy information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: ../calendar/gui/itip-utils.c:938
+#: ../calendar/gui/itip-utils.c:941
 msgid "Calendar information"
 msgstr "Kalenteritiedot"
 
@@ -4527,7 +4821,7 @@ msgstr "Kalenteritiedot"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:975
+#: ../calendar/gui/itip-utils.c:978
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Hyväksytty"
@@ -4536,7 +4830,7 @@ msgstr "Hyväksytty"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:982
+#: ../calendar/gui/itip-utils.c:985
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
@@ -4548,7 +4842,7 @@ msgstr "Alustavasti hyväksytty"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:989 ../calendar/gui/itip-utils.c:1037
+#: ../calendar/gui/itip-utils.c:992 ../calendar/gui/itip-utils.c:1040
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Hylätty"
@@ -4557,7 +4851,7 @@ msgstr "Hylätty"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:996
+#: ../calendar/gui/itip-utils.c:999
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Valtuutettu"
@@ -4565,7 +4859,7 @@ msgstr "Valtuutettu"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1009
+#: ../calendar/gui/itip-utils.c:1012
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Päivitetty"
@@ -4573,7 +4867,7 @@ msgstr "Päivitetty"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1016
+#: ../calendar/gui/itip-utils.c:1019
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Peru"
@@ -4581,7 +4875,7 @@ msgstr "Peru"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1023
+#: ../calendar/gui/itip-utils.c:1026
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Päivitä"
@@ -4589,156 +4883,155 @@ msgstr "Päivitä"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1030
+#: ../calendar/gui/itip-utils.c:1033
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Vastaehdotus"
 
-#: ../calendar/gui/itip-utils.c:1108
+#: ../calendar/gui/itip-utils.c:1111
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vapaa/varattu-tiedot (%s - %s)"
 
-#: ../calendar/gui/itip-utils.c:1116
+#: ../calendar/gui/itip-utils.c:1119
 msgid "iCalendar information"
 msgstr "iCalendarin tiedot"
 
-#: ../calendar/gui/itip-utils.c:1144
+#: ../calendar/gui/itip-utils.c:1147
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "Resurssia ei voida varata, uusi tehtävä on ristiriidassa aiemman kanssa."
 
-#: ../calendar/gui/itip-utils.c:1152
+#: ../calendar/gui/itip-utils.c:1155
 #, c-format
-#| msgid "Unable to book a resource, error: "
 msgid "Unable to book a resource, error: %s"
 msgstr "Resurssin varaaminen ei onnistu, virhe: %s"
 
-#: ../calendar/gui/itip-utils.c:1324
+#: ../calendar/gui/itip-utils.c:1327
 msgid "You must be an attendee of the event."
 msgstr "Sinun täytyy osallistua tapahtumaan."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:660
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:660
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:660
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:660
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:660
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:661
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:661
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:661
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:661
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:661
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:662
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:662
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:662
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:662
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:662
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "31st"
 msgstr "31."
 
@@ -4746,102 +5039,102 @@ msgstr "31."
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_BAD_WEEKDAY
 #. G_DATE_MONDAY
-#: ../calendar/gui/print.c:727
+#: ../calendar/gui/print.c:726
 msgid "Mo"
 msgstr "Ma"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:728
+#: ../calendar/gui/print.c:727
 msgid "Tu"
 msgstr "Ti"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:729
+#: ../calendar/gui/print.c:728
 msgid "We"
 msgstr "Ke"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:730
+#: ../calendar/gui/print.c:729
 msgid "Th"
 msgstr "To"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:731
+#: ../calendar/gui/print.c:730
 msgid "Fr"
 msgstr "Pe"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:732
+#: ../calendar/gui/print.c:731
 msgid "Sa"
 msgstr "La"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:733
+#: ../calendar/gui/print.c:732
 msgid "Su"
 msgstr "Su"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3328
+#: ../calendar/gui/print.c:3319
 msgid " to "
 msgstr " - "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3338
+#: ../calendar/gui/print.c:3329
 msgid " (Completed "
 msgstr " (Valmis "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3344
+#: ../calendar/gui/print.c:3335
 msgid "Completed "
 msgstr "Valmis "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3354
+#: ../calendar/gui/print.c:3345
 msgid " (Due "
 msgstr " (erääntyy "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3361
+#: ../calendar/gui/print.c:3352
 msgid "Due "
 msgstr "Erääntyy "
 
-#: ../calendar/gui/print.c:3564
+#: ../calendar/gui/print.c:3555
 msgid "Attendees: "
 msgstr "Osanottajat: "
 
-#: ../calendar/gui/print.c:3608
+#: ../calendar/gui/print.c:3599
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: ../calendar/gui/print.c:3624
+#: ../calendar/gui/print.c:3615
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteetti: %s"
 
-#: ../calendar/gui/print.c:3642
+#: ../calendar/gui/print.c:3633
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %i"
 
-#: ../calendar/gui/print.c:3656
+#: ../calendar/gui/print.c:3647
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3670
+#: ../calendar/gui/print.c:3661
 #, c-format
 msgid "Categories: %s"
 msgstr "Ryhmät: %s"
 
-#: ../calendar/gui/print.c:3681
+#: ../calendar/gui/print.c:3672
 msgid "Contacts: "
 msgstr "Yhteystiedot: "
 
@@ -4854,207 +5147,206 @@ msgstr "Kesken"
 msgid "% Completed"
 msgstr "% valmiina"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:38
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:69
 msgid "is greater than"
 msgstr "on suurempi kuin"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:39
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:70
 msgid "is less than"
 msgstr "on vähemmän kuin"
 
-#: ../calendar/importers/icalendar-importer.c:78
+#: ../calendar/importers/icalendar-importer.c:77
 msgid "Appointments and Meetings"
 msgstr "Tapaamiset ja kokoukset"
 
-#: ../calendar/importers/icalendar-importer.c:462
-#: ../calendar/importers/icalendar-importer.c:901
+#: ../calendar/importers/icalendar-importer.c:461
+#: ../calendar/importers/icalendar-importer.c:900
 msgid "Opening calendar"
 msgstr "Avataan kalenteria"
 
-#: ../calendar/importers/icalendar-importer.c:610
+#: ../calendar/importers/icalendar-importer.c:609
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar tiedostot (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:611
+#: ../calendar/importers/icalendar-importer.c:610
 msgid "Evolution iCalendar importer"
 msgstr "Evolutionin iCalendar-tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:703
+#: ../calendar/importers/icalendar-importer.c:702
 msgid "Reminder!"
 msgstr "Muistutus!"
 
-#: ../calendar/importers/icalendar-importer.c:787
+#: ../calendar/importers/icalendar-importer.c:786
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar-tiedostot (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:788
+#: ../calendar/importers/icalendar-importer.c:787
 msgid "Evolution vCalendar importer"
 msgstr "Evolutionin vCalendar-tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:1071
+#: ../calendar/importers/icalendar-importer.c:1064
 msgid "Calendar Events"
 msgstr "Kalenteritapahtumat"
 
-#: ../calendar/importers/icalendar-importer.c:1115
+#: ../calendar/importers/icalendar-importer.c:1108
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution-kalenterin älykäs tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:1186
-#: ../calendar/importers/icalendar-importer.c:1500
+#: ../calendar/importers/icalendar-importer.c:1179
+#: ../calendar/importers/icalendar-importer.c:1493
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Kokous"
 
-#: ../calendar/importers/icalendar-importer.c:1186
-#: ../calendar/importers/icalendar-importer.c:1500
+#: ../calendar/importers/icalendar-importer.c:1179
+#: ../calendar/importers/icalendar-importer.c:1493
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: ../calendar/importers/icalendar-importer.c:1189
-#: ../calendar/importers/icalendar-importer.c:1501
+#: ../calendar/importers/icalendar-importer.c:1182
+#: ../calendar/importers/icalendar-importer.c:1494
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Tehtävä"
 
-#: ../calendar/importers/icalendar-importer.c:1192
-#: ../calendar/importers/icalendar-importer.c:1502
+#: ../calendar/importers/icalendar-importer.c:1185
+#: ../calendar/importers/icalendar-importer.c:1495
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Muistilappu"
 
-#: ../calendar/importers/icalendar-importer.c:1201
+#: ../calendar/importers/icalendar-importer.c:1194
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "sisältää toistuvuuksia"
 
-#: ../calendar/importers/icalendar-importer.c:1206
+#: ../calendar/importers/icalendar-importer.c:1199
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "on instanssi"
 
-#: ../calendar/importers/icalendar-importer.c:1211
+#: ../calendar/importers/icalendar-importer.c:1204
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "sisältää muistutuksia"
 
-#: ../calendar/importers/icalendar-importer.c:1216
+#: ../calendar/importers/icalendar-importer.c:1209
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "sisältää liitteitä"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1229
+#: ../calendar/importers/icalendar-importer.c:1222
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Julkinen"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1232
+#: ../calendar/importers/icalendar-importer.c:1225
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Henkilökohtainen"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1235
+#: ../calendar/importers/icalendar-importer.c:1228
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1239
+#: ../calendar/importers/icalendar-importer.c:1232
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Luokittelu"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1244
-#: ../calendar/importers/icalendar-importer.c:1544
+#: ../calendar/importers/icalendar-importer.c:1237
+#: ../calendar/importers/icalendar-importer.c:1537
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Yhteenveto"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1250
+#: ../calendar/importers/icalendar-importer.c:1243
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Sijainti"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1258
-#: ../calendar/importers/icalendar-importer.c:1539
+#: ../calendar/importers/icalendar-importer.c:1251
+#: ../calendar/importers/icalendar-importer.c:1532
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Alkaa"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1269
+#: ../calendar/importers/icalendar-importer.c:1262
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Erääntyy"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1281
+#: ../calendar/importers/icalendar-importer.c:1274
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Päättyy"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1291
+#: ../calendar/importers/icalendar-importer.c:1284
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Ryhmät"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1315
+#: ../calendar/importers/icalendar-importer.c:1308
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Valmiina"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1323
+#: ../calendar/importers/icalendar-importer.c:1316
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1334
-#: ../calendar/importers/icalendar-importer.c:1337
+#: ../calendar/importers/icalendar-importer.c:1327
+#: ../calendar/importers/icalendar-importer.c:1330
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Järjestäjä"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1357
-#: ../calendar/importers/icalendar-importer.c:1360
+#: ../calendar/importers/icalendar-importer.c:1350
+#: ../calendar/importers/icalendar-importer.c:1353
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Osanottajat"
 
-#: ../calendar/importers/icalendar-importer.c:1374
+#: ../calendar/importers/icalendar-importer.c:1367
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../calendar/importers/icalendar-importer.c:1534
+#: ../calendar/importers/icalendar-importer.c:1527
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Tyyppi"
 
 #.
 #. *
-#. * This program is free software; you can redistribute it and/or
-#. * modify it under the terms of the GNU Lesser General Public
-#. * License as published by the Free Software Foundation; either
-#. * version 2 of the License, or (at your option) version 3.
+#. * This program is free software; you can redistribute it and/or modify it
+#. * under the terms of the GNU Lesser General Public License as published by
+#. * the Free Software Foundation.
 #. *
-#. * This program is distributed in the hope that it will be useful,
-#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
-#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#. * Lesser General Public License for more details.
+#. * This program is distributed in the hope that it will be useful, but
+#. * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#. * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#. * for more details.
 #. *
-#. * You should have received a copy of the GNU Lesser General Public
-#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
+#. * You should have received a copy of the GNU Lesser General Public License
+#. * along with this program; if not, see <http://www.gnu.org/licenses/>.
 #. *
 #. *
 #. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -5065,1688 +5357,1684 @@ msgstr "Tyyppi"
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:25
 msgid "Africa/Abidjan"
 msgstr "Afrikka/Abidjan"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:26
 msgid "Africa/Accra"
 msgstr "Afrikka/Accra"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:27
 msgid "Africa/Addis_Ababa"
 msgstr "Afrikka/Addis_Abeba"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:28
 msgid "Africa/Algiers"
 msgstr "Afrikka/Algeria"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:29
 msgid "Africa/Asmera"
 msgstr "Afrikka/Asmera"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:30
 msgid "Africa/Bamako"
 msgstr "Afrikka/Bamako"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:31
 msgid "Africa/Bangui"
 msgstr "Afrikka/Bangui"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:32
 msgid "Africa/Banjul"
 msgstr "Afrikka/Benjul"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:33
 msgid "Africa/Bissau"
 msgstr "Afrikka/Bissau"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:34
 msgid "Africa/Blantyre"
 msgstr "Afrikka/Blantyre"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:35
 msgid "Africa/Brazzaville"
 msgstr "Afrikka/Brazzaville"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:36
 msgid "Africa/Bujumbura"
 msgstr "Afrikka/Bujumbura"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:37
 msgid "Africa/Cairo"
 msgstr "Afrikka/Kairo"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:38
 msgid "Africa/Casablanca"
 msgstr "Afrikka/Casablanca"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:39
 msgid "Africa/Ceuta"
 msgstr "Afrikka/Ceuta"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:40
 msgid "Africa/Conakry"
 msgstr "Afrikka/Conakry"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:41
 msgid "Africa/Dakar"
 msgstr "Afrikka/Dakar"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:42
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrikka/Dar_es_Salaam"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:43
 msgid "Africa/Djibouti"
 msgstr "Afrikka/Djibouti"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:44
 msgid "Africa/Douala"
 msgstr "Afrikka/Douala"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:45
 msgid "Africa/El_Aaiun"
 msgstr "Afrikka/El_Aaium"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:46
 msgid "Africa/Freetown"
 msgstr "Afrikka/Freetown"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:47
 msgid "Africa/Gaborone"
 msgstr "Afrikka/Gaborne"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:48
 msgid "Africa/Harare"
 msgstr "Afrikka/Harare"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:49
 msgid "Africa/Johannesburg"
 msgstr "Afrikka/Johannesburg"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:50
 msgid "Africa/Kampala"
 msgstr "Afrikka/Kampala"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:51
 msgid "Africa/Khartoum"
 msgstr "Afrikka/Khartum"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:52
 msgid "Africa/Kigali"
 msgstr "Afrikka/Kigali"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:53
 msgid "Africa/Kinshasa"
 msgstr "Afrikka/Kinshasa"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:54
 msgid "Africa/Lagos"
 msgstr "Afrikka/Lagos"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:55
 msgid "Africa/Libreville"
 msgstr "Afrikka/Libreville"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:56
 msgid "Africa/Lome"
 msgstr "Afrikka/Lome"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:57
 msgid "Africa/Luanda"
 msgstr "Afrikka/Luanda"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:58
 msgid "Africa/Lubumbashi"
 msgstr "Afrikka/Lubumbashi"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:59
 msgid "Africa/Lusaka"
 msgstr "Afrikka/Lusaka"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:60
 msgid "Africa/Malabo"
 msgstr "Afrikka/Malabo"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:61
 msgid "Africa/Maputo"
 msgstr "Afrikka/Maputo"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:62
 msgid "Africa/Maseru"
 msgstr "Afrikka/Maseru"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:63
 msgid "Africa/Mbabane"
 msgstr "Afrikka/Mbabane"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:64
 msgid "Africa/Mogadishu"
 msgstr "Afrikka/Mogadishu"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:65
 msgid "Africa/Monrovia"
 msgstr "Afrikka/Monrovia"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:66
 msgid "Africa/Nairobi"
 msgstr "Afrikka/Nairobi"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:67
 msgid "Africa/Ndjamena"
 msgstr "Afrikka/Ndjamena"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:68
 msgid "Africa/Niamey"
 msgstr "Afrikka/Niamey"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:69
 msgid "Africa/Nouakchott"
 msgstr "Afrikka/Nouakchott"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:70
 msgid "Africa/Ouagadougou"
 msgstr "Afrikka/Ouagadougou"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:71
 msgid "Africa/Porto-Novo"
 msgstr "Afrikka/Porto-Novo"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:72
 msgid "Africa/Sao_Tome"
 msgstr "Afrikka/Sao_Tome"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:73
 msgid "Africa/Timbuktu"
 msgstr "Afrikka/Timbuktu"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:74
 msgid "Africa/Tripoli"
 msgstr "Afrikka/Tripoli"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:75
 msgid "Africa/Tunis"
 msgstr "Afrikka/Tunis"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:76
 msgid "Africa/Windhoek"
 msgstr "Afrikka/Windhoek"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:77
 msgid "America/Adak"
 msgstr "Amerikka/Adak"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:78
 msgid "America/Anchorage"
 msgstr "Amerikka/Anchorage"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:79
 msgid "America/Anguilla"
 msgstr "Amerikka/Anguilla"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:80
 msgid "America/Antigua"
 msgstr "Amerikka/Antigua"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:81
 msgid "America/Araguaina"
 msgstr "Amerikka/Nicaragua"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:82
 msgid "America/Aruba"
 msgstr "Amerikka/Aruba"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:83
 msgid "America/Asuncion"
 msgstr "Amerikka/Asuncion"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:84
 msgid "America/Barbados"
 msgstr "Amerikka/Barbados"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:85
 msgid "America/Belem"
 msgstr "Amerikka/Belem"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:86
 msgid "America/Belize"
 msgstr "Amerikka/Belize"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:87
 msgid "America/Boa_Vista"
 msgstr "Amerikka/Boa_Vista"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:88
 msgid "America/Bogota"
 msgstr "Amerikka/Bogota"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:89
 msgid "America/Boise"
 msgstr "Amerikka/Boise"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:90
 msgid "America/Buenos_Aires"
 msgstr "Amerikka/Buenos_Aires"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:91
 msgid "America/Cambridge_Bay"
 msgstr "Amerikka/Cambridge_Bay"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:92
 msgid "America/Cancun"
 msgstr "Amerikka/Cancun"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:93
 msgid "America/Caracas"
 msgstr "Amerikka/Caracas"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:94
 msgid "America/Catamarca"
 msgstr "Amerikka/Catamarca"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:95
 msgid "America/Cayenne"
 msgstr "Amerikka/Cayenne"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:96
 msgid "America/Cayman"
 msgstr "Amerikka/Cayman"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:97
 msgid "America/Chicago"
 msgstr "Amerikka/Chicago"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:98
 msgid "America/Chihuahua"
 msgstr "Amerikka/Chihuahua"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:99
 msgid "America/Cordoba"
 msgstr "Amerikka/Cordoba"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:100
 msgid "America/Costa_Rica"
 msgstr "Amerikka/Costa_Rica"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:101
 msgid "America/Cuiaba"
 msgstr "Amerikka/Cuiaba"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:102
 msgid "America/Curacao"
 msgstr "Amerikka/Curacao"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:103
 msgid "America/Danmarkshavn"
 msgstr "Amerikka/Danmarkshavn"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:104
 msgid "America/Dawson"
 msgstr "Amerikka/Dawson"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:105
 msgid "America/Dawson_Creek"
 msgstr "Amerikka/Dawson_Creek"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:106
 msgid "America/Denver"
 msgstr "Amerikka/Denver"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:107
 msgid "America/Detroit"
 msgstr "Amerikka/Detroit"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:108
 msgid "America/Dominica"
 msgstr "Amerikka/Dominica"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:109
 msgid "America/Edmonton"
 msgstr "Amerikka/Edmonton"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:110
 msgid "America/Eirunepe"
 msgstr "Amerikka/Eirunepe"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:111
 msgid "America/El_Salvador"
 msgstr "Amerikka/El_Salvador"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:112
 msgid "America/Fortaleza"
 msgstr "Amerikka/Fortaleza"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:113
 msgid "America/Glace_Bay"
 msgstr "Amerikka/Glace_Bay"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:114
 msgid "America/Godthab"
 msgstr "Amerikka/Godthab"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:115
 msgid "America/Goose_Bay"
 msgstr "Amerikka/Goose_Bay"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:116
 msgid "America/Grand_Turk"
 msgstr "Amerikka/Grand_Turk"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:117
 msgid "America/Grenada"
 msgstr "Amerikka/Grenada"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:118
 msgid "America/Guadeloupe"
 msgstr "Amerikka/Guadeloupe"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:119
 msgid "America/Guatemala"
 msgstr "Amerikka/Guatemala"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:120
 msgid "America/Guayaquil"
 msgstr "Amerikka/Guayaquil"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:121
 msgid "America/Guyana"
 msgstr "Amerikka/Guyana"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:122
 msgid "America/Halifax"
 msgstr "Amerikka/Halifax"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:123
 msgid "America/Havana"
 msgstr "Amerikka/Havana"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:124
 msgid "America/Hermosillo"
 msgstr "Amerikka/Hermosillo"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:125
 msgid "America/Indiana/Indianapolis"
 msgstr "Amerikka/Indiana/Indianapolis"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Knox"
 msgstr "Amerikka/Indiana/Knox"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Marengo"
 msgstr "Amerikka/Indiana/Marengo"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Vevay"
 msgstr "Amerikka/Indiana/Vevay"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:129
 msgid "America/Indianapolis"
 msgstr "Amerikka/Indianapolis"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:130
 msgid "America/Inuvik"
 msgstr "Amerikka/Inuvik"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:131
 msgid "America/Iqaluit"
 msgstr "Amerikka/Iqaluit"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:132
 msgid "America/Jamaica"
 msgstr "Amerikka/Jamaika"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:133
 msgid "America/Jujuy"
 msgstr "Amerikka/Jujuy"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:134
 msgid "America/Juneau"
 msgstr "Amerikka/Juneau"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:135
 msgid "America/Kentucky/Louisville"
 msgstr "Amerikka/Kentucky/Louisville"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Monticello"
 msgstr "Amerikka/Kentucky/Monticello"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:137
 msgid "America/La_Paz"
 msgstr "Amerikka/La_Paz"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:138
 msgid "America/Lima"
 msgstr "Amerikka/Lima"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:139
 msgid "America/Los_Angeles"
 msgstr "Amerikka/Los_Angeles"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:140
 msgid "America/Louisville"
 msgstr "Amerikka/Louisville"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:141
 msgid "America/Maceio"
 msgstr "Amerikka/Maceio"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:142
 msgid "America/Managua"
 msgstr "Amerikka/Managua"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:143
 msgid "America/Manaus"
 msgstr "Amerikka/Manaus"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:144
 msgid "America/Martinique"
 msgstr "Amerikka/Martinique"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:145
 msgid "America/Mazatlan"
 msgstr "Amerikka/Mazatlan"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:146
 msgid "America/Mendoza"
 msgstr "Amerikka/Mendoza"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:147
 msgid "America/Menominee"
 msgstr "Amerikka/Menominee"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:148
 msgid "America/Merida"
 msgstr "Amerikka/Merida"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:149
 msgid "America/Mexico_City"
 msgstr "Amerikka/Mexico_City"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:150
 msgid "America/Miquelon"
 msgstr "Amerikka/Miquelon"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:151
 msgid "America/Monterrey"
 msgstr "Amerikka/Monterrey"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:152
 msgid "America/Montevideo"
 msgstr "Amerikka/Montevideo"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:153
 msgid "America/Montreal"
 msgstr "Amerikka/Montreal"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:154
 msgid "America/Montserrat"
 msgstr "Amerikka/Montserrat"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:155
 msgid "America/Nassau"
 msgstr "Amerikka/Nassau"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:156
 msgid "America/New_York"
 msgstr "Amerikka/New_York"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:157
 msgid "America/Nipigon"
 msgstr "Amerikka/Nipigon"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:158
 msgid "America/Nome"
 msgstr "Amerikka/Nome"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:159
 msgid "America/Noronha"
 msgstr "Amerikka/Noronha"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:160
 msgid "America/North_Dakota/Center"
 msgstr "Amerikka/North_Dakota/Center"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:161
 msgid "America/Panama"
 msgstr "Amerikka/Panama"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:162
 msgid "America/Pangnirtung"
 msgstr "Amerikka/Pangnirtung"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:163
 msgid "America/Paramaribo"
 msgstr "Amerikka/Paramaribo"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:164
 msgid "America/Phoenix"
 msgstr "Amerikka/Phoenix"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:165
 msgid "America/Port-au-Prince"
 msgstr "Amerikka/Port-au-Prince"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:166
 msgid "America/Port_of_Spain"
 msgstr "Amerikka/Port_of_Spain"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:167
 msgid "America/Porto_Velho"
 msgstr "Amerikka/Porto_Velho"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:168
 msgid "America/Puerto_Rico"
 msgstr "Amerikka/Puerto_Rico"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:169
 msgid "America/Rainy_River"
 msgstr "Amerikka/Rainy_River"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:170
 msgid "America/Rankin_Inlet"
 msgstr "Amerikka/Rankin_Inlet"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:171
 msgid "America/Recife"
 msgstr "Amerikka/Recife"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:172
 msgid "America/Regina"
 msgstr "Amerikka/Regina"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:173
 msgid "America/Rio_Branco"
 msgstr "Amerikka/Rio_Branco"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:174
 msgid "America/Rosario"
 msgstr "Amerikka/Rosario"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:175
 msgid "America/Santiago"
 msgstr "Amerikka/Santiago"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:176
 msgid "America/Santo_Domingo"
 msgstr "Amerikka/Santo_Domingo"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:177
 msgid "America/Sao_Paulo"
 msgstr "Amerikka/Sao_Paulo"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:178
 msgid "America/Scoresbysund"
 msgstr "Amerikka/Scoresbysund"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:179
 msgid "America/Shiprock"
 msgstr "Amerikka/Shiprock"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:180
 msgid "America/St_Johns"
 msgstr "Amerikka/St_Johns"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:181
 msgid "America/St_Kitts"
 msgstr "Amerikka/St_Kitts"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:182
 msgid "America/St_Lucia"
 msgstr "Amerikka/St_Lucia"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:183
 msgid "America/St_Thomas"
 msgstr "Amerikka/St_Thomas"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:184
 msgid "America/St_Vincent"
 msgstr "Amerikka/St_Vincent"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:185
 msgid "America/Swift_Current"
 msgstr "Amerikka/Swift_Current"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:186
 msgid "America/Tegucigalpa"
 msgstr "Amerikka/Tegucigalpa"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:187
 msgid "America/Thule"
 msgstr "Amerikka/Thule"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:188
 msgid "America/Thunder_Bay"
 msgstr "Amerikka/Thunder_Bay"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:189
 msgid "America/Tijuana"
 msgstr "Amerikka/Tijuana"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:190
 msgid "America/Tortola"
 msgstr "Amerikka/Tortola"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:191
 msgid "America/Vancouver"
 msgstr "Amerikka/Vancouver"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:192
 msgid "America/Whitehorse"
 msgstr "Amerikka/Whitehorse"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:193
 msgid "America/Winnipeg"
 msgstr "Amerikka/Winnipeg"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:194
 msgid "America/Yakutat"
 msgstr "Amerikka/Yakutat"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:195
 msgid "America/Yellowknife"
 msgstr "Amerikka/Yellowknife"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:196
 msgid "Antarctica/Casey"
 msgstr "Etelämanner/Casey"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:197
 msgid "Antarctica/Davis"
 msgstr "Etelämanner/Davis"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:198
 msgid "Antarctica/DumontDUrville"
 msgstr "Etelämanner/DumontDUrville"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:199
 msgid "Antarctica/Mawson"
 msgstr "Etelämanner/Mawson"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:200
 msgid "Antarctica/McMurdo"
 msgstr "Etelämanner/McMurdo"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:201
 msgid "Antarctica/Palmer"
 msgstr "Etelämanner/Palmer"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:202
 msgid "Antarctica/South_Pole"
 msgstr "Etelämanner/South_Pole"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:203
 msgid "Antarctica/Syowa"
 msgstr "Etelämanner/Syowa"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:204
 msgid "Antarctica/Vostok"
 msgstr "Etelämanner/Vostok"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:205
 msgid "Arctic/Longyearbyen"
 msgstr "Arctic/Longyearbyen"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:206
 msgid "Asia/Aden"
 msgstr "Aasia/Aden"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:207
 msgid "Asia/Almaty"
 msgstr "Aasia/Almaty"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:208
 msgid "Asia/Amman"
 msgstr "Aasia/Amman"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:209
 msgid "Asia/Anadyr"
 msgstr "Aasia/Anadyr"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:210
 msgid "Asia/Aqtau"
 msgstr "Aasia/Aqtau"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtobe"
 msgstr "Aasia/Aqtobe"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:212
 msgid "Asia/Ashgabat"
 msgstr "Aasia/Ashgabat"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:213
 msgid "Asia/Baghdad"
 msgstr "Aasia/Bagdad"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:214
 msgid "Asia/Bahrain"
 msgstr "Aasia/Bahrain"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:215
 msgid "Asia/Baku"
 msgstr "Aasia/Baku"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:216
 msgid "Asia/Bangkok"
 msgstr "Aasia/Bangkok"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:217
 msgid "Asia/Beirut"
 msgstr "Aasia/Beirut"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:218
 msgid "Asia/Bishkek"
 msgstr "Aasia/Bishkek"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:219
 msgid "Asia/Brunei"
 msgstr "Aasia/Brunei"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:220
 msgid "Asia/Calcutta"
 msgstr "Aasia/Kalkutta"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:221
 msgid "Asia/Choibalsan"
 msgstr "Aasia/Choibalsan"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:222
 msgid "Asia/Chongqing"
 msgstr "Aasia/Chongqing"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:223
 msgid "Asia/Colombo"
 msgstr "Aasia/Colombo"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:224
 msgid "Asia/Damascus"
 msgstr "Aasia/Damaskos"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:225
 msgid "Asia/Dhaka"
 msgstr "Aasia/Dhaka"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:226
 msgid "Asia/Dili"
 msgstr "Aasia/Dili"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:227
 msgid "Asia/Dubai"
 msgstr "Aasia/Dubai"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:228
 msgid "Asia/Dushanbe"
 msgstr "Aasia/Dushanbe"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:229
 msgid "Asia/Gaza"
 msgstr "Aasia/Gaza"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:230
 msgid "Asia/Harbin"
 msgstr "Aasia/Harbin"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:231
 msgid "Asia/Hong_Kong"
 msgstr "Aasia/Hong_Kong"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:232
 msgid "Asia/Hovd"
 msgstr "Aasia/Hovd"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:233
 msgid "Asia/Irkutsk"
 msgstr "Aasia/Irkutsk"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:234
 msgid "Asia/Istanbul"
 msgstr "Aasia/Istanbul"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:235
 msgid "Asia/Jakarta"
 msgstr "Aasia/Jakarta"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:236
 msgid "Asia/Jayapura"
 msgstr "Aasia/Jayapura"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:237
 msgid "Asia/Jerusalem"
 msgstr "Aasia/Jerusalem"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:238
 msgid "Asia/Kabul"
 msgstr "Aasia/Kabul"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:239
 msgid "Asia/Kamchatka"
 msgstr "Aasia/Kamchatka"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:240
 msgid "Asia/Karachi"
 msgstr "Aasia/Karachi"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:241
 msgid "Asia/Kashgar"
 msgstr "Aasia/Kashgar"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:242
 msgid "Asia/Katmandu"
 msgstr "Aasia/Katmandu"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:243
 msgid "Asia/Krasnoyarsk"
 msgstr "Aasia/Krasnoyarsk"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:244
 msgid "Asia/Kuala_Lumpur"
 msgstr "Aasia/Kuala_Lumpur"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:245
 msgid "Asia/Kuching"
 msgstr "Aasia/Kuching"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:246
 msgid "Asia/Kuwait"
 msgstr "Aasia/Kuwait"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:247
 msgid "Asia/Macao"
 msgstr "Aasia/Macao"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:248
 msgid "Asia/Macau"
 msgstr "Aasia/Macau"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:249
 msgid "Asia/Magadan"
 msgstr "Aasia/Magadan"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:250
 msgid "Asia/Makassar"
 msgstr "Aasia/Makassar"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:251
 msgid "Asia/Manila"
 msgstr "Aasia/Manila"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:252
 msgid "Asia/Muscat"
 msgstr "Aasia/Muscat"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:253
 msgid "Asia/Nicosia"
 msgstr "Aasia/Nicosia"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:254
 msgid "Asia/Novosibirsk"
 msgstr "Aasia/Novosibirsk"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:255
 msgid "Asia/Omsk"
 msgstr "Aasia/Omsk"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:256
 msgid "Asia/Oral"
 msgstr "Aasia/Oral"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:257
 msgid "Asia/Phnom_Penh"
 msgstr "Aasia/Phnom_Penh"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:258
 msgid "Asia/Pontianak"
 msgstr "Aasia/Pontianak"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:259
 msgid "Asia/Pyongyang"
 msgstr "Aasia/Pyongyang"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:260
 msgid "Asia/Qatar"
 msgstr "Aasia/Qatar"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:261
 msgid "Asia/Qyzylorda"
 msgstr "Aasia/Qyzylorda"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:262
 msgid "Asia/Rangoon"
 msgstr "Aasia/Rangoon"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:263
 msgid "Asia/Riyadh"
 msgstr "Aasia/Riyadh"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:264
 msgid "Asia/Saigon"
 msgstr "Aasia/Saigon"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:265
 msgid "Asia/Sakhalin"
 msgstr "Aasia/Sakhalin"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:266
 msgid "Asia/Samarkand"
 msgstr "Aasia/Samarkand"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:267
 msgid "Asia/Seoul"
 msgstr "Aasia/Seoul"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:268
 msgid "Asia/Shanghai"
 msgstr "Aasia/Shanghai"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:269
 msgid "Asia/Singapore"
 msgstr "Aasia/Singapore"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:270
 msgid "Asia/Taipei"
 msgstr "Aasia/Taipei"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:271
 msgid "Asia/Tashkent"
 msgstr "Aasia/Tashkent"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:272
 msgid "Asia/Tbilisi"
 msgstr "Aasia/Tbilisi"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:273
 msgid "Asia/Tehran"
 msgstr "Aasia/Teheran"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:274
 msgid "Asia/Thimphu"
 msgstr "Aasia/Thimphu"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:275
 msgid "Asia/Tokyo"
 msgstr "Aasia/Tokio"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:276
 msgid "Asia/Ujung_Pandang"
 msgstr "Aasia/Ujung_Pandang"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:277
 msgid "Asia/Ulaanbaatar"
 msgstr "Aasia/Ulaanbaatar"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:278
 msgid "Asia/Urumqi"
 msgstr "Aasia/Urumqi"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:279
 msgid "Asia/Vientiane"
 msgstr "Aasia/Vientiane"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:280
 msgid "Asia/Vladivostok"
 msgstr "Aasia/Vladivostok"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:281
 msgid "Asia/Yakutsk"
 msgstr "Aasia/Yakutsk"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:282
 msgid "Asia/Yekaterinburg"
 msgstr "Aasia/Yekaterinburg"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:283
 msgid "Asia/Yerevan"
 msgstr "Aasia/Jerevan"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:284
 msgid "Atlantic/Azores"
 msgstr "Atlantin_Valtameri/Azores"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:285
 msgid "Atlantic/Bermuda"
 msgstr "Atlantin_Valtameri/Bermuda"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:286
 msgid "Atlantic/Canary"
 msgstr "Atlantin_Valtameri/Canary"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:287
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantin_Valtameri/Kap_Verde"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:288
 msgid "Atlantic/Faeroe"
 msgstr "Atlantin_Valtameri/Faeroe"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:289
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantin_Valtameri/Jan_Mayen"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:290
 msgid "Atlantic/Madeira"
 msgstr "Atlantin_Valtameri/Madeira"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:291
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantin_Valtameri/Reykjavik"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:292
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantin_Valtameri/Etelä-Georgia"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:293
 msgid "Atlantic/St_Helena"
 msgstr "Atlantin_Valtameri/Saint_Helena"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:294
 msgid "Atlantic/Stanley"
 msgstr "Atlantin_Valtameri/Stanley"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:295
 msgid "Australia/Adelaide"
 msgstr "Australia/Adelaide"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:296
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:297
 msgid "Australia/Broken_Hill"
 msgstr "Australia/Broken_Hill"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:298
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:299
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:300
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:301
 msgid "Australia/Lord_Howe"
 msgstr "Australia/Lord_Howe"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:302
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:303
 msgid "Australia/Perth"
 msgstr "Australia/Perth"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:304
 msgid "Australia/Sydney"
 msgstr "Australia/Sydney"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:305
 msgid "Europe/Amsterdam"
 msgstr "Eurooppa/Amsterdam"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:306
 msgid "Europe/Andorra"
 msgstr "Eurooppa/Andorra"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:307
 msgid "Europe/Athens"
 msgstr "Eurooppa/Ateena"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:308
 msgid "Europe/Belfast"
 msgstr "Eurooppa/Belfast"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:309
 msgid "Europe/Belgrade"
 msgstr "Eurooppa/Belgrad"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:310
 msgid "Europe/Berlin"
 msgstr "Eurooppa/Berliini"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:311
 msgid "Europe/Bratislava"
 msgstr "Eurooppa/Bratislava"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:312
 msgid "Europe/Brussels"
 msgstr "Eurooppa/Bryssel"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:313
 msgid "Europe/Bucharest"
 msgstr "Eurooppa/Bukarest"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:314
 msgid "Europe/Budapest"
 msgstr "Eurooppa/Budapest"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:315
 msgid "Europe/Chisinau"
 msgstr "Eurooppa/Chisinau"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:316
 msgid "Europe/Copenhagen"
 msgstr "Eurooppa/Kööpenhamina"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:317
 msgid "Europe/Dublin"
 msgstr "Eurooppa/Dublin"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:318
 msgid "Europe/Gibraltar"
 msgstr "Eurooppa/Gibraltar"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:319
 msgid "Europe/Helsinki"
 msgstr "Eurooppa/Helsinki"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:320
 msgid "Europe/Istanbul"
 msgstr "Eurooppa/Istanbul"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:321
 msgid "Europe/Kaliningrad"
 msgstr "Eurooppa/Kaliningrad"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:322
 msgid "Europe/Kiev"
 msgstr "Eurooppa/Kiev"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:323
 msgid "Europe/Lisbon"
 msgstr "Eurooppa/Lissabon"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:324
 msgid "Europe/Ljubljana"
 msgstr "Eurooppa/Ljubljana"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:325
 msgid "Europe/London"
 msgstr "Eurooppa/London"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:326
 msgid "Europe/Luxembourg"
 msgstr "Eurooppa/Luxemburg"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:327
 msgid "Europe/Madrid"
 msgstr "Eurooppa/Madrid"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:328
 msgid "Europe/Malta"
 msgstr "Eurooppa/Malta"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:329
 msgid "Europe/Minsk"
 msgstr "Eurooppa/Minsk"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:330
 msgid "Europe/Monaco"
 msgstr "Eurooppa/Monaco"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:331
 msgid "Europe/Moscow"
 msgstr "Eurooppa/Moskova"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:332
 msgid "Europe/Nicosia"
 msgstr "Eurooppa/Nicosia"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:333
 msgid "Europe/Oslo"
 msgstr "Eurooppa/Oslo"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:334
 msgid "Europe/Paris"
 msgstr "Eurooppa/Pariisi"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:335
 msgid "Europe/Prague"
 msgstr "Eurooppa/Praha"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:336
 msgid "Europe/Riga"
 msgstr "Eurooppa/Riika"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:337
 msgid "Europe/Rome"
 msgstr "Eurooppa/Rooma"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:338
 msgid "Europe/Samara"
 msgstr "Eurooppa/Samara"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:339
 msgid "Europe/San_Marino"
 msgstr "Eurooppa/San_Marino"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:340
 msgid "Europe/Sarajevo"
 msgstr "Eurooppa/Sarajevo"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:341
 msgid "Europe/Simferopol"
 msgstr "Eurooppa/Simferopol"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:342
 msgid "Europe/Skopje"
 msgstr "Eurooppa/Skopje"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:343
 msgid "Europe/Sofia"
 msgstr "Eurooppa/Sofia"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:344
 msgid "Europe/Stockholm"
 msgstr "Eurooppa/Tukholma"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:345
 msgid "Europe/Tallinn"
 msgstr "Eurooppa/Tallinna"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:346
 msgid "Europe/Tirane"
 msgstr "Eurooppa/Tirane"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:347
 msgid "Europe/Uzhgorod"
 msgstr "Eurooppa/Uzhgorod"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:348
 msgid "Europe/Vaduz"
 msgstr "Eurooppa/Vaduz"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:349
 msgid "Europe/Vatican"
 msgstr "Eurooppa/Vatikaani"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:350
 msgid "Europe/Vienna"
 msgstr "Eurooppa/Wien"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:351
 msgid "Europe/Vilnius"
 msgstr "Eurooppa/Vilna"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:352
 msgid "Europe/Warsaw"
 msgstr "Eurooppa/Varsova"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:353
 msgid "Europe/Zagreb"
 msgstr "Eurooppa/Zagreb"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:354
 msgid "Europe/Zaporozhye"
 msgstr "Eurooppa/Zaporozhye"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:355
 msgid "Europe/Zurich"
 msgstr "Eurooppa/Zürich"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:356
 msgid "Indian/Antananarivo"
 msgstr "Intian_Valtameri/Antananarivo"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:357
 msgid "Indian/Chagos"
 msgstr "Intian_Valtameri/Chagos"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:358
 msgid "Indian/Christmas"
 msgstr "Intian_Valtameri/Joulusaaret"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:359
 msgid "Indian/Cocos"
 msgstr "Intian_Valtameri/Kookossaraet"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:360
 msgid "Indian/Comoro"
 msgstr "Intian_Valtameri/Comoro"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:361
 msgid "Indian/Kerguelen"
 msgstr "Intian_Valtameri/Kerguelen"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:362
 msgid "Indian/Mahe"
 msgstr "Intian_Valtameri/Mahe"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:363
 msgid "Indian/Maldives"
 msgstr "Intian_Valtameri/Malediivit"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:364
 msgid "Indian/Mauritius"
 msgstr "Intian_Valtameri/Mauritius"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:365
 msgid "Indian/Mayotte"
 msgstr "Intian_Valtameri/Mayotte"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:366
 msgid "Indian/Reunion"
 msgstr "Intian_Valtameri/Reunion"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:367
 msgid "Pacific/Apia"
 msgstr "Tyyni_Valtameri/Apia"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:368
 msgid "Pacific/Auckland"
 msgstr "Tyyni_Valtameri/Auckland"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:369
 msgid "Pacific/Chatham"
 msgstr "Tyyni_Valtameri/Chatham"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:370
 msgid "Pacific/Easter"
 msgstr "Tyyni_Valtameri/Easter"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:371
 msgid "Pacific/Efate"
 msgstr "Tyyni_Valtameri/Efate"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:372
 msgid "Pacific/Enderbury"
 msgstr "Tyyni_Valtameri/Enderbury"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:373
 msgid "Pacific/Fakaofo"
 msgstr "Tyyni_Valtameri/Fakaofo"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:374
 msgid "Pacific/Fiji"
 msgstr "Tyyni_Valtameri/Fiji"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:375
 msgid "Pacific/Funafuti"
 msgstr "Tyyni_Valtameri/Funafuti"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:376
 msgid "Pacific/Galapagos"
 msgstr "Tyyni_Valtameri/Galapagos"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:377
 msgid "Pacific/Gambier"
 msgstr "Tyyni_Valtameri/Gambier"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:378
 msgid "Pacific/Guadalcanal"
 msgstr "Tyyni_Valtameri/Guadalcanal"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:379
 msgid "Pacific/Guam"
 msgstr "Tyyni_Valtameri/Guam"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:380
 msgid "Pacific/Honolulu"
 msgstr "Tyyni_Valtameri/Honolulu"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:381
 msgid "Pacific/Johnston"
 msgstr "Tyyni_Valtameri/Johnston"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:382
 msgid "Pacific/Kiritimati"
 msgstr "Tyyni_Valtameri/Kiritimati"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:383
 msgid "Pacific/Kosrae"
 msgstr "Tyyni_Valtameri/Kosrae"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:384
 msgid "Pacific/Kwajalein"
 msgstr "Tyyni_Valtameri/Kwajalein"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:385
 msgid "Pacific/Majuro"
 msgstr "Tyyni_Valtameri/Majuro"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:386
 msgid "Pacific/Marquesas"
 msgstr "Tyyni_Valtameri/Marquesas"
 
-#: ../calendar/zones.h:388
+#: ../calendar/zones.h:387
 msgid "Pacific/Midway"
 msgstr "Tyyni_Valtameri/Midway"
 
-#: ../calendar/zones.h:389
+#: ../calendar/zones.h:388
 msgid "Pacific/Nauru"
 msgstr "Tyyni_Valtameri/Nauru"
 
-#: ../calendar/zones.h:390
+#: ../calendar/zones.h:389
 msgid "Pacific/Niue"
 msgstr "Tyyni_Valtameri/Niue"
 
-#: ../calendar/zones.h:391
+#: ../calendar/zones.h:390
 msgid "Pacific/Norfolk"
 msgstr "Tyyni_Valtameri/Norfolk"
 
-#: ../calendar/zones.h:392
+#: ../calendar/zones.h:391
 msgid "Pacific/Noumea"
 msgstr "Tyyni_Valtameri/Noumea"
 
-#: ../calendar/zones.h:393
+#: ../calendar/zones.h:392
 msgid "Pacific/Pago_Pago"
 msgstr "Tyyni_Valtameri/Pago_Pago"
 
-#: ../calendar/zones.h:394
+#: ../calendar/zones.h:393
 msgid "Pacific/Palau"
 msgstr "Tyyni_Valtameri/Palau"
 
-#: ../calendar/zones.h:395
+#: ../calendar/zones.h:394
 msgid "Pacific/Pitcairn"
 msgstr "Tyyni_Valtameri/Pitcairn"
 
-#: ../calendar/zones.h:396
+#: ../calendar/zones.h:395
 msgid "Pacific/Ponape"
 msgstr "Tyyni_Valtameri/Ponape"
 
-#: ../calendar/zones.h:397
+#: ../calendar/zones.h:396
 msgid "Pacific/Port_Moresby"
 msgstr "Tyyni_Valtameri/Port_Moresby"
 
-#: ../calendar/zones.h:398
+#: ../calendar/zones.h:397
 msgid "Pacific/Rarotonga"
 msgstr "Tyyni_Valtameri/Rarotonga"
 
-#: ../calendar/zones.h:399
+#: ../calendar/zones.h:398
 msgid "Pacific/Saipan"
 msgstr "Tyyni_Valtameri/Saipan"
 
-#: ../calendar/zones.h:400
+#: ../calendar/zones.h:399
 msgid "Pacific/Tahiti"
 msgstr "Tyyni_Valtameri/Tahiti"
 
-#: ../calendar/zones.h:401
+#: ../calendar/zones.h:400
 msgid "Pacific/Tarawa"
 msgstr "Tyyni_Valtameri/Tarawa"
 
-#: ../calendar/zones.h:402
+#: ../calendar/zones.h:401
 msgid "Pacific/Tongatapu"
 msgstr "Tyyni_Valtameri/Tongatapu"
 
-#: ../calendar/zones.h:403
+#: ../calendar/zones.h:402
 msgid "Pacific/Truk"
 msgstr "Tyyni_Valtameri/Truk"
 
-#: ../calendar/zones.h:404
+#: ../calendar/zones.h:403
 msgid "Pacific/Wake"
 msgstr "Tyyni_Valtameri/Wake"
 
-#: ../calendar/zones.h:405
+#: ../calendar/zones.h:404
 msgid "Pacific/Wallis"
 msgstr "Tyyni_Valtameri/Wallis"
 
-#: ../calendar/zones.h:406
+#: ../calendar/zones.h:405
 msgid "Pacific/Yap"
 msgstr "Tyyni_Valtameri/Yap"
 
-#: ../composer/e-composer-actions.c:203
+#: ../composer/e-composer-actions.c:202
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
-#: ../composer/e-composer-actions.c:276
-#: ../e-util/e-mail-signature-editor.c:308
-msgid "_Close"
-msgstr "_Sulje"
-
-#: ../composer/e-composer-actions.c:278
+#: ../composer/e-composer-actions.c:277
 msgid "Close the current file"
 msgstr "Sulje nykyinen tiedosto"
 
-#: ../composer/e-composer-actions.c:283
+#: ../composer/e-composer-actions.c:282
 msgid "New _Message"
 msgstr "Uusi _viesti"
 
-#: ../composer/e-composer-actions.c:285
+#: ../composer/e-composer-actions.c:284
 msgid "Open New Message window"
 msgstr "Avaa uuden viestin luonti-ikkuna"
 
-#: ../composer/e-composer-actions.c:292 ../shell/e-shell-window-actions.c:937
+#: ../composer/e-composer-actions.c:289 ../shell/e-shell-window-actions.c:979
+#| msgid "Mail Preferences"
+msgid "_Preferences"
+msgstr "_Asetukset"
+
+#: ../composer/e-composer-actions.c:291 ../shell/e-shell-window-actions.c:981
 msgid "Configure Evolution"
 msgstr "Evolutionin asetukset"
 
-#: ../composer/e-composer-actions.c:299
+#: ../composer/e-composer-actions.c:298
 msgid "Save the current file"
 msgstr "Tallenna nykyinen tiedosto"
 
-#: ../composer/e-composer-actions.c:304
+#: ../composer/e-composer-actions.c:303
 msgid "Save _As..."
 msgstr "Tallenna _nimellä..."
 
-#: ../composer/e-composer-actions.c:306
+#: ../composer/e-composer-actions.c:305
 msgid "Save the current file with a different name"
 msgstr "Tallenna tiedosto uudella nimellä"
 
-#: ../composer/e-composer-actions.c:313
+#: ../composer/e-composer-actions.c:312
 msgid "Character _Encoding"
 msgstr "M_erkistön koodaus"
 
-#: ../composer/e-composer-actions.c:330
-msgid "_Print..."
-msgstr "T_ulosta..."
-
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:336
 msgid "Print Pre_view"
 msgstr "Tulostuksen _esikatselu"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:343
 msgid "Save as _Draft"
 msgstr "Tallenna _luonnoksena"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:345
 msgid "Save as draft"
 msgstr "Tallenna luonnoksena"
 
-#: ../composer/e-composer-actions.c:351
+#: ../composer/e-composer-actions.c:350
 msgid "S_end"
 msgstr "_Lähetä"
 
-#: ../composer/e-composer-actions.c:353
+#: ../composer/e-composer-actions.c:352
 msgid "Send this message"
 msgstr "Lähetä viesti heti"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:360
 msgid "PGP _Encrypt"
 msgstr "PGP-_salaus"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:362
 msgid "Encrypt this message with PGP"
 msgstr "Salaa tämä viesti PGP:llä"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:368
 msgid "PGP _Sign"
 msgstr "PGP-_allekirjoitus"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:370
 msgid "Sign this message with your PGP key"
 msgstr "Allekirjoita viesti PGP-avaimellasi"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:376
 msgid "_Picture Gallery"
 msgstr "_Kuvagalleria"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:378
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Näytä kokoelma kuvia, joita voi raahata viesteihin"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:384
 msgid "_Prioritize Message"
 msgstr "_Aseta viestin prioriteetti"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:386
 msgid "Set the message priority to high"
 msgstr "Aseta viestille korkea prioriteetti"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:392
 msgid "Re_quest Read Receipt"
 msgstr "Pyydä luku_kuittausta"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:394
 msgid "Get delivery notification when your message is read"
 msgstr "Pyydä lähettämään kuittaus, kun viestisi on luettu"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:400
 msgid "S/MIME En_crypt"
 msgstr "S/_MIME-salaus"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:402
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Salaa viesti S/MIME-salausvarmenteellasi"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:408
 msgid "S/MIME Sig_n"
 msgstr "S/MIME-a_llekirjoitus"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:410
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Allekirjoita tämä viesti S/MIME-allekirjoitusvarmenteellasi"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:416
 msgid "_Bcc Field"
 msgstr "_BCC-kenttä"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:418
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Vaihtelee näytetäänkö BCC-kenttä"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:424
 msgid "_Cc Field"
 msgstr "_Kopio-kenttä"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:426
 msgid "Toggles whether the CC field is displayed"
 msgstr "Määrittää näytetäänkö Kopio-kenttä (CC)."
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:432
 msgid "_Reply-To Field"
 msgstr "_Vastausosoite-kenttä"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:434
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Määrittää näytetäänkö Vastausosoite-kenttä"
 
-#: ../composer/e-composer-actions.c:494
+#: ../composer/e-composer-actions.c:493
 msgid "Save Draft"
 msgstr "Tallenna luonnos"
 
-#: ../composer/e-composer-header-table.c:39
+#: ../composer/e-composer-header-table.c:38
 msgid "Enter the recipients of the message"
 msgstr "Syötä viestin vastaanottajat"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:40
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Anna osoitteet joihin lähetetään kopio viestistä (Cc)"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -6754,48 +7042,48 @@ msgstr ""
 "Anna osoitteet, joihin lähetetään kopiot viestistä ilman että muut "
 "vastaanottajat näkevät vastaanottajia"
 
-#: ../composer/e-composer-header-table.c:772
+#: ../composer/e-composer-header-table.c:771
 msgid "Fr_om:"
 msgstr "_Lähettäjä:"
 
-#: ../composer/e-composer-header-table.c:779
+#: ../composer/e-composer-header-table.c:778
 msgid "_Reply-To:"
 msgstr "_Vastausosoite:"
 
-#: ../composer/e-composer-header-table.c:784
+#: ../composer/e-composer-header-table.c:783
 msgid "_To:"
 msgstr "Vastaan_ottaja:"
 
-#: ../composer/e-composer-header-table.c:790
+#: ../composer/e-composer-header-table.c:789
 msgid "_Cc:"
 msgstr "_Kopiot:"
 
-#: ../composer/e-composer-header-table.c:796
+#: ../composer/e-composer-header-table.c:795
 msgid "_Bcc:"
 msgstr "_Piilokopiot:"
 
-#: ../composer/e-composer-header-table.c:801
+#: ../composer/e-composer-header-table.c:800
 msgid "_Post To:"
 msgstr "_Postita:"
 
-#: ../composer/e-composer-header-table.c:805
+#: ../composer/e-composer-header-table.c:804
 msgid "S_ubject:"
 msgstr "_Aihe:"
 
-#: ../composer/e-composer-header-table.c:813
+#: ../composer/e-composer-header-table.c:812
 #: ../mail/e-mail-config-identity-page.c:488
 msgid "Si_gnature:"
 msgstr "_Allekirjoitus:"
 
-#: ../composer/e-composer-name-header.c:235
+#: ../composer/e-composer-name-header.c:234
 msgid "Click here for the address book"
 msgstr "Avaa osoitekirja tästä"
 
-#: ../composer/e-composer-post-header.c:184
+#: ../composer/e-composer-post-header.c:183
 msgid "Click here to select folders to post to"
 msgstr "Valitse tästä kansiot, joihin postituksia lähetetään"
 
-#: ../composer/e-msg-composer.c:869
+#: ../composer/e-msg-composer.c:879
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -6803,7 +7091,7 @@ msgstr ""
 "Lähtevää viestiä ei voi allekirjoittaa: allekirjoitusvarmennetta ei ole "
 "asetettu tälle tilille"
 
-#: ../composer/e-msg-composer.c:878
+#: ../composer/e-msg-composer.c:888
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -6812,16 +7100,16 @@ msgstr ""
 "Lähtevää viestiä ei voi salata: Salausvarmennetta ei ole asetettu tälle "
 "tilille"
 
-#: ../composer/e-msg-composer.c:1557 ../composer/e-msg-composer.c:1958
+#: ../composer/e-msg-composer.c:1569 ../composer/e-msg-composer.c:1981
 msgid "Compose Message"
 msgstr "Uusi viesti"
 
-#: ../composer/e-msg-composer.c:4213
+#: ../composer/e-msg-composer.c:4243
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "(Muokkain sisältää viestin rungon joka ei ole tekstiä ja jota ei voi muokata)"
 
-#: ../composer/e-msg-composer.c:4886
+#: ../composer/e-msg-composer.c:4943
 msgid "Untitled Message"
 msgstr "Nimeämätön viesti"
 
@@ -6993,13 +7281,27 @@ msgstr "Evolutionin hälytysilmoitukset"
 msgid "Calendar event notifications"
 msgstr "Kalenteritapahtumien ilmoitukset"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1033
-#: ../modules/mailto-handler/evolution-mailto-handler.c:212
-#: ../shell/e-shell-window-private.c:243
+#: ../data/evolution.appdata.xml.in.h:1
+msgid ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+msgstr ""
+
+#: ../data/evolution.appdata.xml.in.h:2
+msgid ""
+"Evolution supports a wide range of industry standard data formats and "
+"network protocols for information exchange, with an emphasis on standards "
+"compliance and security. Evolution can also integrate smoothly with "
+"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
+msgstr ""
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1032
+#: ../modules/mailto-handler/evolution-mailto-handler.c:210
+#: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:83
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:82
 msgid "Groupware Suite"
 msgstr "Ryhmätyöohjelmisto"
 
@@ -7012,8 +7314,10 @@ msgid "Manage your email, contacts and schedule"
 msgstr "Hallitse sähköposteja, yhteystietoja ja ajan käyttöä"
 
 #: ../data/evolution.desktop.in.in.h:5
-msgid "mail;calendar;contact;addressbook;task;"
+msgid "email;calendar;contact;addressbook;task;"
 msgstr ""
+"email;calendar;contact;addressbook;task;sähköposti;kalenteri;yhteystiedot;"
+"osoitekirja;tehtävä;"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
@@ -7602,9 +7906,8 @@ msgid "Vertical position for the tag pane"
 msgstr "Pystysijainti"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
-#, fuzzy
 msgid "Highlight tasks due today"
-msgstr "_Tänään erääntyvät tehtävät:"
+msgstr "Korosta tänään erääntyvät tehtävät"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 msgid ""
@@ -7647,9 +7950,8 @@ msgid "Position of the task preview pane when oriented vertically"
 msgstr "Paneelin sijainti sen ollessa pystyasennossa"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
-#, fuzzy
 msgid "Highlight overdue tasks"
-msgstr "_Eräpäivän ylittäneet tehtävät:"
+msgstr "Korosta eräpäivän ylittäneet tehtävät"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 msgid ""
@@ -8126,7 +8428,7 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
 msgid "Can be either 'mbox' or 'pdf'."
-msgstr ""
+msgstr "Voi olla joko 'mbox' tai 'pdf'."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid "Show image animations"
@@ -8141,16 +8443,10 @@ msgstr ""
 "ovat ärsyttäviä ja he haluavat nähdä kuvat ilman animaatioita."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-#, fuzzy
-#| msgid "Disable or enable ellipsizing of folder names in side bar"
-msgid "Ellipsize mode for folder names in side bar"
-msgstr "Määritä typistetäänkö kansioiden nimet kansionäkymässä"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid "Enable or disable type ahead search feature"
 msgstr "Käytetäänkö kirjoituksenaikaista hakua"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -8158,11 +8454,11 @@ msgstr ""
 "Ota sivupalkin hakutoiminto käyttöön etsiäksesi kansionimiä "
 "interaktiivisesti."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Enable or disable magic space bar"
 msgstr "Käytetäänkö maagista välilyöntinäppäintä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -8170,120 +8466,118 @@ msgstr ""
 "Käytä tätä, jos kaluat käyttää välilyöntinäppäintä siirtyäksesi viestin "
 "esikatselussa, viestiluettelossa ja kansioluettelossa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 #, fuzzy
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Käytä tätä, jos kaluat käyttää välilyöntinäppäintä siirtyäksesi viestin "
 "esikatselussa, viestiluettelossa ja kansioluettelossa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Mark citations in the message \"Preview\""
 msgstr "Merkitse lainaukset viestin \"esikatselussa\""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Merkitse lainaukset viestin \"esikatselussa\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Citation highlight color"
 msgstr "Lainauksen korostusväri"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "Citation highlight color."
 msgstr "Lainauksen korostukseen käytetty väri."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Enable/disable caret mode"
 msgstr "Kytke/poista caret-tila"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Kytke caret-tila, jolloin näet kursorin lukiessasi sähköpostia."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Default charset in which to display messages"
 msgstr "Viestejä näytettäessä oletuksena käytetty merkistö"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Default charset in which to display messages."
 msgstr "Viestejä näytettäessä oletuksena käytetty merkistö."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
-#| msgid "Load images for HTML messages over HTTP"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "Lataa HTML-viestien kuvat HTTP:n yli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid "Show Animations"
 msgstr "Näytä animaatiot"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Show animated images as animations."
 msgstr "Näytä animoidut kuvat animaatioina."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Show all message headers"
 msgstr "Näytä kaikki otsakkeet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Show all the headers when viewing a messages."
 msgstr "Näytä kaikki viestin otsakkeet näytettäessä viestiä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
-#| msgid "Show all the headers when viewing a messages."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "List of headers to show when viewing a message."
 msgstr "Luettelo otsakkeista, jotka näytetään viestiä katsellessa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid ""
 "Each header is represented as a pair: the header name, and a boolean "
 "indicating whether the header is enabled. Disabled headers are not shown "
 "when viewing a message, but are still listed in Preferences."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Show photo of the sender"
 msgstr "Näytä lähettäjän valokuva"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Näytä lähettäjän kuva viesti-ikkunan lukupaneelissa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Mark as Seen after specified timeout"
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Mark as Seen after specified timeout."
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 #, fuzzy
 msgid "Timeout for marking messages as seen"
 msgstr "Aikakatkaisu merkittäessä viestejä nähdyiksi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 #, fuzzy
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Aikakatkaisu merkittäessä viestejä nähdyiksi."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Sender email-address column in the message list"
 msgstr "Näytä lähettäjän sähköposti viestiluettelossa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr ""
 "Näytä lähettäjän sähköpostiosoite viestiluettelossa erillisessä sarakkeessa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 #, fuzzy
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
@@ -8292,7 +8586,7 @@ msgstr ""
 "Määrittää käytetäänkö samaa kirjasinta sekä \"Lähettäjä\"- että "
 "\"Vastaanottaja\"-riveillä \"Viestit\"-sarakkeessa käytettäessä pystynäkymää."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -8300,31 +8594,31 @@ msgstr ""
 "Määrittää käytetäänkö samaa kirjasinta sekä \"Lähettäjä\"- että "
 "\"Vastaanottaja\"-riveillä \"Viestit\"-sarakkeessa käytettäessä pystynäkymää."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Show deleted messages in the message-list"
 msgstr "Näytä poistetut viestit viestiluettelossa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Näytä poistetut viestit yliviivattuna viestiluettelossa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 #, fuzzy
 #| msgid "Enable search folders"
 msgid "Enable Unmatched search folder"
 msgstr "Ota hakunäkymät käyttöön"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Piilottaa kansiokohtaisen esikatselun ja poistaa valinnan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -8333,31 +8627,31 @@ msgstr ""
 "jälkeen.  Tämä peruu sähköpostin valinnan luettelosta ja poistaa esikatselun "
 "kansiolta."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Height of the message-list pane"
 msgstr "Viestiluettelon korkeus"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Height of the message-list pane."
 msgstr "Viestiluettelopaneelin korkeus."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Whether message headers are collapsed in the user interface"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Width of the message-list pane"
 msgstr "Viestiluettelopaneelin leveys"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Width of the message-list pane."
 msgstr "Viestiluettelopaneelin leveys."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Layout style"
 msgstr "Asettelutyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -8365,35 +8659,35 @@ msgid ""
 "message list."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Variable width font"
 msgstr "Vaihtuvanlevyinen kirjasin"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "The variable width font for mail display."
 msgstr "Vaihtelevan levyinen kirjasin viestejä näytettäessä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Terminal font"
 msgstr "Päätteen kirjasin"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "The terminal font for mail display."
 msgstr "Päätekirjasin viestejä näytettäessä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Use custom fonts"
 msgstr "Käytä omia kirjasimia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Use custom fonts for displaying mail."
 msgstr "Käytä omia kirjasimia näytettäessä viestejä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Rajaa näytettäviä To-, Cc- ja Bcc-osoitteita"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -8401,11 +8695,11 @@ msgstr ""
 "Rajaa To-, Cc- ja Bcc-kentissä näytettävien osoitteiden lukumäärä avaimessa "
 "address_count määrättyyn arvoon."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "To-, Cc- ja Bcc-osoitteiden näytettävä lukumäärä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -8413,11 +8707,11 @@ msgstr ""
 "Tämä asettaa viestiluettelon oletusnäkymässä näytettävien viestin "
 "lukumäärän, jonka jälkeen näytetään '...'."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Thread the message-list based on Subject"
 msgstr "Säikeistä viestiluettelo aiheen perusteella"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -8425,11 +8719,11 @@ msgstr ""
 "Palataanko viestien säikeistämiseen otsikon perusteella, jos otsakkeet eivät "
 "sisällä In-Reply-To tai References-otsakkeita."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Default value for thread expand state"
 msgstr "Säikeen laajennuksen tilan oletusarvo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -8437,11 +8731,11 @@ msgstr ""
 "Tämä asetus määrittää, laajennetaanko vai supistetaanko säikeet oletuksena. "
 "Muutos vaatii Evolutionin uudelleenkäynnistyksen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Järjestetäänkö säikeet säikeen viimeisen viestin mukaan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -8451,11 +8745,11 @@ msgstr ""
 "mukaan viestin päiväyksen sijasta. Muutos vaatii Evolutionin "
 "uudelleenkäynnistyksen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Järjestä tilit aakkosjärjestyksessä kansiopuuhun"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to "
 "true accounts are sorted alphabetically, with an exception of On This "
@@ -8463,69 +8757,69 @@ msgid ""
 "given by a user"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Log filter actions"
 msgstr "Kirjaa suodatintoimenpiteet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Log filter actions to the specified log file."
 msgstr "Kirjaa suodattimien toimenpiteet määriteltyyn lokitiedostoon."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Logfile to log filter actions"
 msgstr "Lokitiedosto suodattimien toimenpiteille"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "Logfile to log filter actions."
 msgstr "Lokitiedosto suodattimien toimenpiteille."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Flush Outbox after filtering"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
 "one minute after the last action invocation."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Default forward style"
 msgstr "Välityksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Default reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Prompt on empty subject"
 msgstr "Kysy vahvistus, jos viestin aihe on tyhjä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Kysy vahvistus, jos yritetään lähettää viestiä tyhjällä aihe-otsakkeella."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Prompt when emptying the trash"
 msgstr "Kysy vahvistus roskakoria tyhjennettäessä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Kysy vahvistus käyttäjältä, kun roskakoria ollaan tyhjentämässä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Prompt when user expunges"
 msgstr "Kysy vahvistus, kun käyttäjä siivoaa poistettuja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Kysy vahvistus, kun kansioista siivotaan pysyvästi poistettuja viestejä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 #, fuzzy
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
@@ -8533,7 +8827,7 @@ msgstr ""
 "sähköpostiosoitteiksi:\n"
 "{0}"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
@@ -8542,21 +8836,21 @@ msgstr ""
 "Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä "
 "ja siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Prompt when user only fills Bcc"
 msgstr "Kysy vahvistus, jos käyttäjä syöttää ainoastaan Bcc-kentän"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Varmista, kun käyttäjä yrittää lähettää viestiä ilman Vastaanottaja tai Cc-"
 "kenttiä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Kysy vahvistus, jos yritetään lähteä ei-toivottua HTML-postia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -8564,11 +8858,11 @@ msgstr ""
 "Kysy vahvistus, kun ollaan lähettämässä HTML-viestiä vastaanottajille, jotka "
 "eivät sellaista halua vastaanottaa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Kysy kun käyttäjä yrittää avata kymmenen tai useampia kerralla"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -8576,19 +8870,19 @@ msgstr ""
 "Jos yrität avata 10 tai useampia viestejä kerralla, kysytään haluatko "
 "todella tehdä sen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Prompt while marking multiple messages"
 msgstr "Kysy vahvistus merkittäessä useita viestejä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Näytetäänkö kehto merkittäessä useita viestejä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Prompt when deleting messages in search folder"
 msgstr "Kysy poistettaessa viestejä hakukansiosta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -8597,11 +8891,11 @@ msgstr ""
 "Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä "
 "ja siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid ""
 "Possible values are: 'never' - do not allow copy with drag &amp; drop of "
 "folders in folder tree, 'always' - allow copy with drag &amp; drop of "
@@ -8609,11 +8903,11 @@ msgid ""
 "ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid ""
 "Possible values are: 'never' - do not allow move with drag &amp; drop of "
 "folders in folder tree, 'always' - allow move with drag &amp; drop of "
@@ -8621,12 +8915,12 @@ msgid ""
 "ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 #, fuzzy
 msgid "Prompt when replying privately to list messages"
 msgstr "Kysy vahvistus merkittäessä useita viestejä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
@@ -8635,25 +8929,25 @@ msgstr ""
 "Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä "
 "ja siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 #, fuzzy
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Kysy vahvistus merkittäessä useita viestejä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
 "sets a Reply-To: header which redirects your reply back to the list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 #, fuzzy
 msgid "Prompt when replying to many recipients"
 msgstr ""
 "Vahvista viestin lähetys, jos ainoastaan Bcc-vastaanottajia on määritelty"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
@@ -8662,47 +8956,47 @@ msgstr ""
 "Poistaa käytöstä ominaisuuden, joka kysyy useita kertoja vaaditaanko "
 "synkronointia yhteydettömään tilaan siirryttäessä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid "Empty Trash folders on exit"
 msgstr "Tyhjennä roskakorit lopetettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tyhjennä kaikki roskakorit kun Evolution suljetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Lyhin aika päivinä, jonka kuluttua roskakori tyhjennetään suljettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Vähimmäisaika roskakorin tyhjennysten välillä (päiviä)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Last time Empty Trash was run"
 msgstr "Roskakori tyhjennettiin viimeksi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 #, fuzzy
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Viimeisimmän roskakorin tyhjennyksen unix-aikaleima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Aika sekunteina, kuinka pitkään virheet näytetään tilarivillä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Level beyond which the message should be logged."
 msgstr "Taso, jonka jälkeen viesti kirjoitetaan lokiin."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -8710,22 +9004,22 @@ msgstr ""
 "Tällä asetuksella voi olla kolme arvoa: \"0\" (ei virheitä), "
 "\"1\" (varoitukset) tai \"2\" (vianetsintäviestit)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Show original \"Date\" header value."
 msgstr "Näytä alkuperäinen \"Date\"-otsakearvo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
 "format and local time zone."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "List of Labels and their associated colors"
 msgstr "Merkinnät ja niihin liittyvät värit"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -8733,47 +9027,47 @@ msgstr ""
 "Evolutionin sähköpostiosan tuntemat etiketit. Luettelo sisältää nimi:väri "
 "pareja, joissa väri on määritelty HTML-värien heksadesimaalisessa muodossa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Check incoming mail being junk"
 msgstr "Etsi roskapostia saapuvista sähköposteista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Run junk test on incoming mail."
 msgstr "Suorita roskapostitarkistus saapuvalle postille."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Empty Junk folders on exit"
 msgstr "Tyhjennä roskapostikansiot lopetettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Tyhjennä kaikki roskapostikansiot kun Evolution suljetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Lyhin aika päivinä, jonka kuluttua roskapostit poistetaan suljettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Lyhin aika jonka kuluttua roskapostit poistetaan suljettaessa, arvo päivinä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 #, fuzzy
 msgid "Last time Empty Junk was run"
 msgstr "Viimeisin kerta, kun roskapostikansiot tyhjennettiin"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 #, fuzzy
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Viimeisimmän roskapostien poistokerran unix-aikaleima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "The default plugin for Junk hook"
 msgstr "Roskapostikäsittelijän oletuslisäosa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -8783,11 +9077,11 @@ msgstr ""
 "Jos oletuslisäosa ei ole käytössä, ei palata käyttämään muita käytössä "
 "olevia lisäosia."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Määrittää, etsitäänkö osoitekirjasta lähettäjän sähköpostiosoitetta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -8800,7 +9094,7 @@ msgstr ""
 "haku voi olla hidas, jos osoitteita täydennetään esimerkiksi LDAP-"
 "osoitekirjoista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -8808,7 +9102,7 @@ msgstr ""
 "Määrittää, etsitäänkö lähettäjän sähköpostiosoitetta roskapostin suodatusta "
 "varten vain paikallisista osoitekirjoista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -8818,12 +9112,12 @@ msgstr ""
 "määrittämään, etsitäänkö paikallisesta osoitekirjasta tunnettuja osoitteita, "
 "joille ei tehdä roskapostisuodatusta."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Määrittää käytetäänkö omia roskapostiotsakkeita roskapostin tunnistamiseen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -8833,11 +9127,11 @@ msgstr ""
 "käytössä ja otsakkeet on annettu, voidaan tällä nopeuttaa roskapostin "
 "tunnistamista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Custom headers to use while checking for junk."
 msgstr "Omat otsakkeet, joiden perusteella roskaposti tunnistetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -8845,52 +9139,52 @@ msgstr ""
 "Määrittää oman otsakkeen, josta roskapostiviestejä tunnistetaan. Luettelon "
 "kohdat ovat muodossa \"otsakenimi=arvo\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "UID string of the default account."
 msgstr "Oletustilin UID-merkkijono."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "Save directory"
 msgstr "Tallenna kansio"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Directory for saving mail component files."
 msgstr "Kansio, johon sähköpostin osatiedostot tallennetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid "Composer load/attach directory"
 msgstr "Viesti-ikkunan lataus- ja liitekansio"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Directory for loading/attaching files to composer."
 msgstr "Kansio, josta sähköpostin liitteitä etsitään."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Check for new messages on start"
 msgstr "Tarkista uudet viestit käynnistyksen yhteydessä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid "Check for new messages in all active accounts"
 msgstr "Tarkista uudet viestit kaikilta aktiivisilta tileiltä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
 "started. This option is used only together with 'send_recv_on_start' option."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid "Server synchronization interval"
 msgstr "Palvelimen synkronoinnin aikaväli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -8898,61 +9192,61 @@ msgstr ""
 "Määrittää kuinka usein paikalliset muutokset synkronoidaan "
 "postipalvelimelle. Aikavälin täytyy olla vähintään 30 sekuntia."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 #, fuzzy
 #| msgid "Default forward style"
 msgid "(Deprecated) Default forward style"
 msgstr "Välityksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"forward-style-name\" instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 #, fuzzy
 #| msgid "Default reply style"
 msgid "(Deprecated) Default reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"reply-style-name\" instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 #, fuzzy
 #| msgid "List of custom headers and whether they are enabled."
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "Luettelo omista otsakkeista ja tieto siitä ovatko ne käytössä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"show-headers\" instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 #, fuzzy
 #| msgid "Load images for HTML messages over HTTP"
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "Lataa HTML-viestien kuvat käyttäen HTTP:ta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"image-loading-policy\" instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"browser-close-on-reply-policy\" instead."
@@ -9251,7 +9545,7 @@ msgstr "Tiedostovalitsimen oletuskansio"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser-ikkunoiden oletuskansio."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:308
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:307
 msgid "Start in offline mode"
 msgstr "Aloita yhteydettömässä tilassa"
 
@@ -9346,151 +9640,151 @@ msgstr "Käytä ainoastaan paikallisia roskapostin tarkistuksia."
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Käytä ainoastaan paikallisia roskapostin tarkistuksia (ei DNS:ää)."
 
-#: ../em-format/e-mail-formatter-attachment.c:397
-#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
-#: ../e-util/e-attachment-paned.c:176 ../e-util/e-attachment-paned.c:181
+#: ../em-format/e-mail-formatter-attachment.c:405
+#: ../e-util/e-attachment-bar.c:100 ../e-util/e-attachment-bar.c:105
+#: ../e-util/e-attachment-paned.c:175 ../e-util/e-attachment-paned.c:180
 #: ../mail/message-list.etspec.h:4
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Liite"
 msgstr[1] "Liitteet"
 
-#: ../em-format/e-mail-formatter-attachment.c:398
-#| msgctxt "iCalImp"
-#| msgid "has attachments"
+#: ../em-format/e-mail-formatter-attachment.c:406
 msgid "Display as attachment"
 msgstr "Näytä liitteenä"
 
-#: ../em-format/e-mail-formatter-headers.c:107
-#: ../em-format/e-mail-part-headers.c:47 ../mail/e-mail-tag-editor.c:272
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:64
+#: ../em-format/e-mail-formatter-audio.c:152
+msgid "Audio Player"
+msgstr "Äänisoitin"
+
+#: ../em-format/e-mail-formatter-audio.c:153
+msgid "Play the attachment in embedded audio player"
+msgstr ""
+
+#: ../em-format/e-mail-formatter-headers.c:102
+#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:273
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:63
 msgid "From"
 msgstr "Lähettäjä"
 
-#: ../em-format/e-mail-formatter-headers.c:133
+#: ../em-format/e-mail-formatter-headers.c:128
 msgid "(no subject)"
 msgstr "(Ei aihetta)"
 
-#: ../em-format/e-mail-formatter-headers.c:333
+#: ../em-format/e-mail-formatter-headers.c:328
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Tämä viesti lähetettiin %s käyttäjän %s puolesta"
 
-#: ../em-format/e-mail-formatter-image.c:152
-#| msgid "Save Image"
+#: ../em-format/e-mail-formatter-image.c:170
 msgid "Regular Image"
 msgstr "Tavallinen kuva"
 
-#: ../em-format/e-mail-formatter-image.c:153
+#: ../em-format/e-mail-formatter-image.c:171
 #, fuzzy
 #| msgid "Display the next message"
 msgid "Display part as an image"
 msgstr "Näytä seuraava viesti"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:252
+#: ../em-format/e-mail-formatter-message-rfc822.c:254
 msgid "RFC822 message"
 msgstr "RFC822-viesti"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:253
+#: ../em-format/e-mail-formatter-message-rfc822.c:255
 #, fuzzy
 #| msgid "Formatting message"
 msgid "Format part as an RFC822 message"
 msgstr "Muotoillaan viestiä"
 
-#: ../em-format/e-mail-formatter-print.c:54
-#: ../e-util/gal-view-instance-save-as-dialog.c:95
-#: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1328
-#: ../modules/cal-config-google/e-google-chooser.c:237
-#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+#: ../em-format/e-mail-formatter-print.c:53
+#: ../e-util/gal-view-instance-save-as-dialog.c:94
+#: ../mail/e-mail-label-tree-view.c:98
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1322
+#: ../modules/cal-config-google/e-google-chooser.c:236
+#: ../modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Name"
 msgstr "Nimi"
 
-#: ../em-format/e-mail-formatter-print.c:54
-#: ../e-util/e-attachment-tree-view.c:574 ../mail/message-list.etspec.h:10
+#: ../em-format/e-mail-formatter-print.c:53
+#: ../e-util/e-attachment-tree-view.c:573 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Koko"
 
-#: ../em-format/e-mail-formatter-print-headers.c:144
-#| msgid "Assigned"
+#: ../em-format/e-mail-formatter-print-headers.c:143
 msgid "GPG signed"
 msgstr "GPG-allekirjoitettu"
 
-#: ../em-format/e-mail-formatter-print-headers.c:150
-#| msgid "Unencrypted"
+#: ../em-format/e-mail-formatter-print-headers.c:149
 msgid "GPG encrpyted"
 msgstr "GPG-salattu"
 
-#: ../em-format/e-mail-formatter-print-headers.c:156
-#| msgid "S/MIME Sig_n"
+#: ../em-format/e-mail-formatter-print-headers.c:155
 msgid "S/MIME signed"
 msgstr "S/MIME-allekirjoitettu"
 
-#: ../em-format/e-mail-formatter-print-headers.c:162
-#| msgid "S/MIME En_crypt"
+#: ../em-format/e-mail-formatter-print-headers.c:161
 msgid "S/MIME encrpyted"
 msgstr "S/MIME-salattu"
 
-#: ../em-format/e-mail-formatter-print-headers.c:171
-#: ../mail/e-mail-config-security-page.c:642
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:195
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:129
+#: ../em-format/e-mail-formatter-print-headers.c:170
+#: ../mail/e-mail-config-security-page.c:645
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:128
 msgid "Security"
 msgstr "Turvallisuus"
 
-#: ../em-format/e-mail-formatter-quote-headers.c:168
-#: ../em-format/e-mail-part-headers.c:52 ../mail/e-mail-tag-editor.c:277
-#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:6
-#: ../modules/mail/em-mailer-prefs.c:69 ../smime/lib/e-asn1-object.c:712
+#: ../em-format/e-mail-formatter-quote-headers.c:167
+#: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:278
+#: ../mail/em-filter-i18n.h:51 ../mail/message-list.etspec.h:6
+#: ../modules/mail/em-mailer-prefs.c:68
 msgid "Subject"
 msgstr "Aihe"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:187
-#: ../em-format/e-mail-formatter-utils.c:359
-#: ../modules/mail/em-mailer-prefs.c:1145
+#: ../em-format/e-mail-formatter-quote-headers.c:186
+#: ../em-format/e-mail-formatter-utils.c:342
+#: ../modules/mail/em-mailer-prefs.c:1144
 msgid "Mailer"
 msgstr "Postittaja"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:91
-#: ../em-format/e-mail-formatter-text-enriched.c:104
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:94
+#: ../em-format/e-mail-formatter-text-enriched.c:98
 msgid "Richtext"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:92
-#: ../em-format/e-mail-formatter-text-enriched.c:105
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:95
+#: ../em-format/e-mail-formatter-text-enriched.c:99
 msgid "Display part as enriched text"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:90
-#: ../em-format/e-mail-formatter-text-html.c:353
+#: ../em-format/e-mail-formatter-quote-text-html.c:95
+#: ../em-format/e-mail-formatter-text-html.c:359
 msgid "HTML"
 msgstr "HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:91
-#: ../em-format/e-mail-formatter-text-html.c:354
+#: ../em-format/e-mail-formatter-quote-text-html.c:96
+#: ../em-format/e-mail-formatter-text-html.c:360
 #, fuzzy
 msgid "Format part as HTML"
 msgstr "Muotoile viestit _HTML:nä"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:115
-#: ../em-format/e-mail-formatter-text-plain.c:194
-#| msgid "Plain Text Mode"
+#: ../em-format/e-mail-formatter-quote-text-plain.c:121
+#: ../em-format/e-mail-formatter-text-plain.c:197
 msgid "Plain Text"
 msgstr "Raakateksti"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:116
-#: ../em-format/e-mail-formatter-text-plain.c:195
+#: ../em-format/e-mail-formatter-quote-text-plain.c:122
+#: ../em-format/e-mail-formatter-text-plain.c:198
 #, fuzzy
 #| msgid "Only ever show plain text"
 msgid "Format part as plain text"
 msgstr "Näytä aina raakatekstinä"
 
-#: ../em-format/e-mail-formatter-secure-button.c:52
+#: ../em-format/e-mail-formatter-secure-button.c:51
 msgid "Unsigned"
 msgstr "Allekirjoittamaton"
 
-#: ../em-format/e-mail-formatter-secure-button.c:52
+#: ../em-format/e-mail-formatter-secure-button.c:51
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -9498,11 +9792,11 @@ msgstr ""
 "Viesti ei ole allekirjoitettu. Ei ole varmaa, että viestin lähettäjä on "
 "varmasti se, jolta viesti näyttää olevan."
 
-#: ../em-format/e-mail-formatter-secure-button.c:53
+#: ../em-format/e-mail-formatter-secure-button.c:52
 msgid "Valid signature"
 msgstr "Hyväksytty allekirjoitus"
 
-#: ../em-format/e-mail-formatter-secure-button.c:53
+#: ../em-format/e-mail-formatter-secure-button.c:52
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -9510,11 +9804,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu ja varmennettu. Viesti on hyvin "
 "todennäköisesti aito."
 
-#: ../em-format/e-mail-formatter-secure-button.c:54
+#: ../em-format/e-mail-formatter-secure-button.c:53
 msgid "Invalid signature"
 msgstr "Hylätty allekirjoitus"
 
-#: ../em-format/e-mail-formatter-secure-button.c:54
+#: ../em-format/e-mail-formatter-secure-button.c:53
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -9522,11 +9816,11 @@ msgstr ""
 "Tämän viestin allekirjoitusta ei voi tarkistaa, se on ehkä muuttunut siirron "
 "aikana."
 
-#: ../em-format/e-mail-formatter-secure-button.c:55
+#: ../em-format/e-mail-formatter-secure-button.c:54
 msgid "Valid signature, but cannot verify sender"
 msgstr "Allekirjoitus on kelvollinen, mutta lähettäjää ei voi varmistaa"
 
-#: ../em-format/e-mail-formatter-secure-button.c:55
+#: ../em-format/e-mail-formatter-secure-button.c:54
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -9534,11 +9828,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lähettäjää ei voi varmistaa."
 
-#: ../em-format/e-mail-formatter-secure-button.c:56
+#: ../em-format/e-mail-formatter-secure-button.c:55
 msgid "Signature exists, but need public key"
 msgstr "Allekirjoitus löytyi, mutta tarvitsee julkisen avaimen"
 
-#: ../em-format/e-mail-formatter-secure-button.c:56
+#: ../em-format/e-mail-formatter-secure-button.c:55
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -9546,11 +9840,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lähettäjän julkista avainta ei löydy."
 
-#: ../em-format/e-mail-formatter-secure-button.c:63
+#: ../em-format/e-mail-formatter-secure-button.c:62
 msgid "Unencrypted"
 msgstr "Salaamaton"
 
-#: ../em-format/e-mail-formatter-secure-button.c:63
+#: ../em-format/e-mail-formatter-secure-button.c:62
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -9558,11 +9852,11 @@ msgstr ""
 "Viesti ei ole salattu. Viestin sisältöä voidaan tutkia sen kulkiessa "
 "Internetin läpi."
 
-#: ../em-format/e-mail-formatter-secure-button.c:64
+#: ../em-format/e-mail-formatter-secure-button.c:63
 msgid "Encrypted, weak"
 msgstr "Heikosti salattu"
 
-#: ../em-format/e-mail-formatter-secure-button.c:64
+#: ../em-format/e-mail-formatter-secure-button.c:63
 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 "
@@ -9572,11 +9866,11 @@ msgstr ""
 "mahdotonta, että ulkopuolinen pystyy purkamaan ja katsomaan viestin sisällön "
 "melko lyhyessä ajassa."
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:64
 msgid "Encrypted"
 msgstr "Salattu"
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:64
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -9584,11 +9878,11 @@ msgstr ""
 "Viesti on salattu. Ulkopuolisen on vaikea avata viestin sisältö "
 "luettavakseen."
 
-#: ../em-format/e-mail-formatter-secure-button.c:66
+#: ../em-format/e-mail-formatter-secure-button.c:65
 msgid "Encrypted, strong"
 msgstr "Salattu vahvalla algoritmilla"
 
-#: ../em-format/e-mail-formatter-secure-button.c:66
+#: ../em-format/e-mail-formatter-secure-button.c:65
 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 "
@@ -9598,130 +9892,129 @@ msgstr ""
 "vaikea purkaa salausta ja nähdä tämän viestin sisältöä missään "
 "käytännöllisessä ajassa."
 
-#: ../em-format/e-mail-formatter-secure-button.c:182
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../em-format/e-mail-formatter-secure-button.c:187
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "_View Certificate"
 msgstr "_Näytä varmenne"
 
-#: ../em-format/e-mail-formatter-secure-button.c:197
+#: ../em-format/e-mail-formatter-secure-button.c:202
 msgid "This certificate is not viewable"
 msgstr "Tätä varmennetta ei voi näyttää"
 
-#: ../em-format/e-mail-formatter-source.c:130
+#: ../em-format/e-mail-formatter-source.c:120
 msgid "Source"
 msgstr "Lähde"
 
-#: ../em-format/e-mail-formatter-source.c:131
+#: ../em-format/e-mail-formatter-source.c:121
 msgid "Display source of a MIME part"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-utils.c:207
-#: ../em-format/e-mail-formatter-utils.c:231
-#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:67
+#: ../em-format/e-mail-formatter-utils.c:202
+#: ../em-format/e-mail-formatter-utils.c:219
+#: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:66
 msgid "Cc"
 msgstr "Kopiot"
 
-#: ../em-format/e-mail-formatter-utils.c:209
-#: ../em-format/e-mail-formatter-utils.c:233
-#: ../em-format/e-mail-part-headers.c:51 ../modules/mail/em-mailer-prefs.c:68
+#: ../em-format/e-mail-formatter-utils.c:203
+#: ../em-format/e-mail-formatter-utils.c:220
+#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:67
 msgid "Bcc"
 msgstr "Piilokopiot"
 
-#: ../em-format/e-mail-parser-application-mbox.c:88
+#: ../em-format/e-mail-parser-application-mbox.c:87
 #, c-format
 msgid "Error parsing MBOX part: %s"
 msgstr ""
 
-#: ../em-format/e-mail-parser-application-smime.c:84
-#, fuzzy, c-format
+#: ../em-format/e-mail-parser-application-smime.c:83
+#, c-format
 #| msgid "Could not parse PGP/MIME message"
 msgid "Could not parse S/MIME message: %s"
-msgstr "PGP/MIME-viestiä ei voitu tulkita"
+msgstr "S/MIME-viestin jäsennys epäonnistui: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:80
-#, fuzzy, c-format
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:79
+#, c-format
 #| msgid "Could not parse PGP message: "
 msgid "Could not parse PGP message: %s"
-msgstr "PGP-viestiä ei voitu tulkita:"
+msgstr "PGP-viestin jäsennys epäonnistui: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:83
-#: ../em-format/e-mail-parser-multipart-signed.c:128
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:82
+#: ../em-format/e-mail-parser-multipart-signed.c:135
 #, c-format
-#| msgid "Error verifying signature"
 msgid "Error verifying signature: %s"
 msgstr "Virhe vahvistaessa allekirjoitusta: %s"
 
-#: ../em-format/e-mail-parser-message-external.c:69
+#: ../em-format/e-mail-parser-message-external.c:68
 #, fuzzy
 #| msgid "Malformed external-body part."
 msgid "Malformed external-body part"
 msgstr "Väärin muotoilut rungon ulkopuolinen viestin osa."
 
-#: ../em-format/e-mail-parser-message-external.c:102
+#: ../em-format/e-mail-parser-message-external.c:101
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Osoitin FTP-palvelimelle (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:113
+#: ../em-format/e-mail-parser-message-external.c:112
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Osoitin paikalliseen tiedostoon (%s) palvelimella \"%s\""
 
-#: ../em-format/e-mail-parser-message-external.c:115
+#: ../em-format/e-mail-parser-message-external.c:114
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Osoitin paikalliseen tiedostoon (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:134
+#: ../em-format/e-mail-parser-message-external.c:133
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Osoitin muulla palvelimella olevaan tietoon (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:152
+#: ../em-format/e-mail-parser-message-external.c:151
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 "Osoitin tuntemattomaan muulla palvelimella olevaan tietoon (tyyppiä \"%s\")"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:67
-#: ../em-format/e-mail-parser-multipart-signed.c:81
+#: ../em-format/e-mail-parser-multipart-encrypted.c:66
+#: ../em-format/e-mail-parser-multipart-signed.c:83
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME-viestin tulkitseminen epäonnistui, näytetään lähdekoodi."
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:83
+#: ../em-format/e-mail-parser-multipart-encrypted.c:82
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tuntematon salausmuoto muodolle multipart/encrypted"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:102
-#, fuzzy, c-format
+#: ../em-format/e-mail-parser-multipart-encrypted.c:101
+#, c-format
 #| msgid "Could not parse PGP/MIME message"
 msgid "Could not parse PGP/MIME message: %s"
-msgstr "PGP/MIME-viestiä ei voitu tulkita"
+msgstr "PGP/MIME-viestin jäsennys epäonnistui: %s"
 
-#: ../em-format/e-mail-parser-multipart-signed.c:114
+#: ../em-format/e-mail-parser-multipart-signed.c:121
 msgid "Unsupported signature format"
 msgstr "Allekirjoituksen muoto ei ole tuettu"
 
-#: ../em-format/e-mail-part-headers.c:48 ../modules/mail/em-mailer-prefs.c:65
+#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:64
 msgid "Reply-To"
 msgstr "Vastausosoite"
 
-#: ../em-format/e-mail-part-headers.c:53 ../e-util/e-dateedit.c:550
-#: ../e-util/e-dateedit.c:573 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:549
+#: ../e-util/e-dateedit.c:572 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:69
 msgid "Date"
 msgstr "Päiväys"
 
-#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:70
 msgid "Newsgroups"
 msgstr "Uutisryhmät"
 
-#: ../em-format/e-mail-part-headers.c:55 ../modules/mail/em-mailer-prefs.c:72
+#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Kasvokuva"
 
-#: ../em-format/e-mail-part-utils.c:500
+#: ../em-format/e-mail-part-utils.c:508
 #, c-format
 msgid "%s attachment"
 msgstr "Liite: %s"
@@ -9774,7 +10067,7 @@ msgstr "päivää"
 msgid "_When convenient"
 msgstr "Milloin _sopii"
 
-#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:840
+#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:847
 msgid "Replies"
 msgstr "Vastaukset"
 
@@ -9865,63 +10158,70 @@ msgstr ""
 msgid "Sta_tus Tracking"
 msgstr "_Tilan seuranta"
 
-#: ../e-util/e-table-config.ui.h:1
+#: ../e-util/e-table-config.ui.h:2
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:282
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:192
+#| msgid "_Append"
+msgid "_Apply"
+msgstr "_Toteuta"
+
+#: ../e-util/e-table-config.ui.h:4
 msgid "_Sort..."
 msgstr "_Järjestä..."
 
-#: ../e-util/e-table-config.ui.h:2
+#: ../e-util/e-table-config.ui.h:5
 msgid "_Group By..."
 msgstr "_Ryhmittele..."
 
-#: ../e-util/e-table-config.ui.h:3
+#: ../e-util/e-table-config.ui.h:6
 msgid "_Fields Shown..."
 msgstr "_Näytettävät kentät..."
 
-#: ../e-util/e-table-config.ui.h:6
+#: ../e-util/e-table-config.ui.h:9
 msgid "Clear _All"
 msgstr "Tyhjennä k_aikki"
 
-#: ../e-util/e-table-config.ui.h:7
+#: ../e-util/e-table-config.ui.h:10
 msgid "_Show field in View"
 msgstr "_Näytä kenttä näkymässä"
 
-#: ../e-util/e-table-config.ui.h:8 ../e-util/e-table-header-item.c:1753
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1753
 msgid "Ascending"
 msgstr "Nouseva"
 
-#: ../e-util/e-table-config.ui.h:9 ../e-util/e-table-header-item.c:1753
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1753
 msgid "Descending"
 msgstr "Laskeva"
 
-#: ../e-util/e-table-config.ui.h:10
+#: ../e-util/e-table-config.ui.h:13
 msgid "Group Items By"
 msgstr "Ryhmittele kentän mukaan"
 
-#: ../e-util/e-table-config.ui.h:11
+#: ../e-util/e-table-config.ui.h:14
 msgid "Show _field in View"
 msgstr "Näytä _kenttä näkymässä"
 
-#: ../e-util/e-table-config.ui.h:12
+#: ../e-util/e-table-config.ui.h:15
 msgid "Then By"
 msgstr "sitten"
 
-#: ../e-util/e-table-config.ui.h:13
+#: ../e-util/e-table-config.ui.h:16
 msgid "Show field i_n View"
 msgstr "Näytä k_enttä näkymässä"
 
-#: ../e-util/e-table-config.ui.h:14
+#: ../e-util/e-table-config.ui.h:17
 msgid "Show field in _View"
 msgstr "Näytä kenttä _näkymässä"
 
-#: ../e-util/e-table-config.ui.h:15
+#: ../e-util/e-table-config.ui.h:18
 msgid "Sort"
 msgstr "Järjestä"
 
-#: ../e-util/e-table-config.ui.h:16
+#: ../e-util/e-table-config.ui.h:19
 msgid "Clear All"
 msgstr "Tyhjennä merkki"
 
-#: ../e-util/e-table-config.ui.h:17
+#: ../e-util/e-table-config.ui.h:20
 msgid "Sort Items By"
 msgstr "Järjestä kentän mukaan"
 
@@ -9929,7 +10229,7 @@ msgstr "Järjestä kentän mukaan"
 msgid "Select a Time Zone"
 msgstr "Valitse aikavyöhyke"
 
-#: ../e-util/e-timezone-dialog.ui.h:2
+#: ../e-util/e-timezone-dialog.ui.h:4
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -9939,20 +10239,20 @@ msgstr ""
 "aikavyöhyke.\n"
 "Loitonna kartalla oikealla hiiren napilla."
 
-#: ../e-util/e-timezone-dialog.ui.h:4
+#: ../e-util/e-timezone-dialog.ui.h:6
 msgid "Time Zones"
 msgstr "Aikavyöhykkeet"
 
-#: ../e-util/e-timezone-dialog.ui.h:5
+#: ../e-util/e-timezone-dialog.ui.h:7
 msgid "_Selection"
 msgstr "_Valinta"
 
-#: ../e-util/e-timezone-dialog.ui.h:6
+#: ../e-util/e-timezone-dialog.ui.h:8
 msgid "Timezone drop-down combination box"
 msgstr "Aikavyöhykkeen valinnan pudotusvalikko"
 
-#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1239
-#: ../mail/em-utils.c:240
+#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1243
+#: ../mail/em-utils.c:229
 msgid "Incoming"
 msgstr "Tulevat"
 
@@ -9968,7 +10268,7 @@ msgstr "määrittelemäsi aika"
 msgid "a time relative to the current time"
 msgstr "Aika suhteessa tämänhetkiseen aikaan"
 
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:78
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:83
 msgid "seconds"
 msgstr "sekuntia"
 
@@ -9997,15 +10297,15 @@ msgstr "tulevaisuudessa"
 msgid "Show filters for mail:"
 msgstr "Sähköpostin näytön suodattimet:"
 
-#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:166
+#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
 msgid "_Filter Rules"
 msgstr "_Suodatinsäännöt"
 
-#: ../e-util/filter.ui.h:17
+#: ../e-util/filter.ui.h:23
 msgid "Compare against"
 msgstr "Vertaa arvoon"
 
-#: ../e-util/filter.ui.h:18
+#: ../e-util/filter.ui.h:24
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -10013,7 +10313,7 @@ msgstr ""
 "Viestin päiväystä verrataan aikaan, jolloin\n"
 "suodatus tapahtuu."
 
-#: ../e-util/filter.ui.h:20
+#: ../e-util/filter.ui.h:26
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -10021,7 +10321,7 @@ msgstr ""
 "Viestin päiväystä verrataan määritellyn päivän\n"
 " keskipäivään (klo 12:00)."
 
-#: ../e-util/filter.ui.h:22
+#: ../e-util/filter.ui.h:28
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -10034,9 +10334,9 @@ msgid "_Create new view"
 msgstr "Luo uusi _näkymä"
 
 #: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../e-util/e-mail-signature-script-dialog.c:417
-#: ../mail/e-mail-config-identity-page.c:311
-#: ../mail/e-mail-config-summary-page.c:341
+#: ../e-util/e-mail-signature-script-dialog.c:416
+#: ../mail/e-mail-config-identity-page.c:310
+#: ../mail/e-mail-config-summary-page.c:340
 msgid "_Name:"
 msgstr "_Nimi:"
 
@@ -10044,156 +10344,178 @@ msgstr "_Nimi:"
 msgid "_Replace existing view"
 msgstr "_Korvaa olemassaoleva näkymä"
 
-#: ../e-util/e-activity-proxy.c:311
-#: ../modules/mail/e-mail-shell-view-actions.c:1723
+#: ../e-util/e-activity-proxy.c:308
+#: ../modules/mail/e-mail-shell-view-actions.c:1724
 msgid "Cancel"
 msgstr "Peru"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:259
+#: ../e-util/e-activity.c:258
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (peruttu)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:262
+#: ../e-util/e-activity.c:261
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (valmis)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:265
+#: ../e-util/e-activity.c:264
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (odottaa)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:269
+#: ../e-util/e-activity.c:268
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (perutaan)"
 
-#: ../e-util/e-activity.c:271
+#: ../e-util/e-activity.c:270
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:276
+#: ../e-util/e-activity.c:275
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d %% valmiina)"
 
 #. Translators: Escape is a keyboard binding.
-#: ../e-util/e-alert-bar.c:121
-#| msgid "Close this message"
+#: ../e-util/e-alert-bar.c:118
 msgid "Close this message (Escape)"
 msgstr "Sulje tämä viesti (Escape)"
 
-#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:703
+#: ../e-util/e-attachment-bar.c:659 ../e-util/e-attachment-paned.c:702
 msgid "Icon View"
 msgstr "Kuvakenäkymä"
 
-#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:705
+#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:704
 msgid "List View"
 msgstr "Luettelonäkymä"
 
-#: ../e-util/e-attachment-dialog.c:318
+#: ../e-util/e-attachment-dialog.c:317
 msgid "Attachment Properties"
 msgstr "Liitteen ominaisuudet"
 
-#: ../e-util/e-attachment-dialog.c:340 ../e-util/e-import-assistant.c:273
+#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:273
 msgid "F_ilename:"
 msgstr "_Tiedostonimi:"
 
-#: ../e-util/e-attachment-dialog.c:375
+#: ../e-util/e-attachment-dialog.c:374
 msgid "MIME Type:"
 msgstr "MIME-tyyppi:"
 
-#: ../e-util/e-attachment-dialog.c:383 ../e-util/e-attachment-store.c:483
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:482
 msgid "_Suggest automatic display of attachment"
 msgstr "_Ehdota liitteen automaattista näyttämistä"
 
-#: ../e-util/e-attachment-handler-image.c:97
+#: ../e-util/e-attachment-handler-image.c:96
 msgid "Could not set as background"
 msgstr "Ei voitu asettaa taustakuvaksi"
 
-#: ../e-util/e-attachment-handler-image.c:147
+#: ../e-util/e-attachment-handler-image.c:146
 msgid "Set as _Background"
 msgstr "Aseta _taustakuvaksi"
 
-#: ../e-util/e-attachment-icon-view.c:166
-#: ../e-util/e-attachment-tree-view.c:549
+#: ../e-util/e-attachment-icon-view.c:165
+#: ../e-util/e-attachment-tree-view.c:548
 msgid "Loading"
 msgstr "Ladataan"
 
-#: ../e-util/e-attachment-icon-view.c:178
-#: ../e-util/e-attachment-tree-view.c:561
+#: ../e-util/e-attachment-icon-view.c:177
+#: ../e-util/e-attachment-tree-view.c:560
 msgid "Saving"
 msgstr "Tallennetaan"
 
-#: ../e-util/e-attachment-paned.c:104
+#: ../e-util/e-attachment-paned.c:103
 msgid "Hide Attachment _Bar"
 msgstr "Piilota _liitepalkki"
 
-#: ../e-util/e-attachment-paned.c:106 ../e-util/e-attachment-paned.c:719
+#: ../e-util/e-attachment-paned.c:105 ../e-util/e-attachment-paned.c:718
 msgid "Show Attachment _Bar"
 msgstr "Näytä _liitepalkki"
 
-#: ../e-util/e-attachment-store.c:463
+#: ../e-util/e-attachment-store.c:462
 msgid "Add Attachment"
 msgstr "Lisää liite"
 
-#: ../e-util/e-attachment-store.c:466
+#: ../e-util/e-attachment-store.c:465
 msgid "A_ttach"
 msgstr "Lii_tä"
 
-#: ../e-util/e-attachment-store.c:537
+#: ../e-util/e-attachment-store.c:536
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Tallenna liite"
 msgstr[1] "Tallenna liitteet"
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment-store.c:568 ../e-util/e-attachment.c:2048
-#: ../e-util/e-attachment.c:2708
+#: ../e-util/e-attachment-store.c:567 ../e-util/e-attachment.c:2058
+#: ../e-util/e-attachment.c:2721
 msgid "attachment.dat"
 msgstr "liite.dat"
 
-#: ../e-util/e-attachment-view.c:378
+#: ../e-util/e-attachment-view.c:377
 msgid "Open With Other Application..."
 msgstr "Avaa tois_ella sovelluksella..."
 
-#: ../e-util/e-attachment-view.c:385
+#: ../e-util/e-attachment-view.c:384
 msgid "S_ave All"
 msgstr "Tallenna _kaikki"
 
-#: ../e-util/e-attachment-view.c:411
+#: ../e-util/e-attachment-view.c:391
+#| msgid "Sa_ve"
+msgid "Sa_ve As"
+msgstr "_Tallenna nimellä"
+
+#: ../e-util/e-attachment-view.c:400
+#: ../plugins/save-calendar/save-calendar.c:349
+#: ../plugins/save-calendar/save-calendar.c:380
+#: ../plugins/save-calendar/save-calendar.c:411
+#| msgid "Save _As..."
+msgid "Save _As"
+msgstr "Tallenna _nimellä"
+
+#: ../e-util/e-attachment-view.c:410
 msgid "A_dd Attachment..."
 msgstr "_Lisää liite..."
 
-#: ../e-util/e-attachment-view.c:435
+#: ../e-util/e-attachment-view.c:417
+#: ../modules/addressbook/e-book-shell-view-actions.c:1026
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
+#: ../modules/calendar/e-memo-shell-view-actions.c:628
+#: ../modules/calendar/e-task-shell-view-actions.c:752
+#: ../modules/mail/e-mail-shell-view-actions.c:1526
+#: ../modules/mail/e-mail-shell-view-actions.c:1596
+msgid "_Properties"
+msgstr "_Ominaisuudet"
+
+#: ../e-util/e-attachment-view.c:434
 msgid "_Hide"
 msgstr "_Piilota"
 
-#: ../e-util/e-attachment-view.c:442
+#: ../e-util/e-attachment-view.c:441
 msgid "Hid_e All"
 msgstr "_Piilota kaikki"
 
-#: ../e-util/e-attachment-view.c:449
+#: ../e-util/e-attachment-view.c:448
 msgid "_View Inline"
 msgstr "Näytä _sisäkkäisesti"
 
-#: ../e-util/e-attachment-view.c:456
+#: ../e-util/e-attachment-view.c:455
 msgid "Vie_w All Inline"
 msgstr "_Näytä kaikki sisäkkäisesti"
 
-#: ../e-util/e-attachment-view.c:786
+#: ../e-util/e-attachment-view.c:785
 #, c-format
 msgid "Open With \"%s\""
 msgstr "Avaa sovelluksella \"%s\""
 
-#: ../e-util/e-attachment-view.c:789
+#: ../e-util/e-attachment-view.c:788
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Avaa tämä liite ohjelmalla %s"
@@ -10202,392 +10524,391 @@ msgstr "Avaa tämä liite ohjelmalla %s"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../e-util/e-attachment.c:1103
+#: ../e-util/e-attachment.c:1108
 msgid "Attached message"
 msgstr "Liitetty viesti"
 
-#: ../e-util/e-attachment.c:2129 ../e-util/e-attachment.c:3014
+#: ../e-util/e-attachment.c:2139 ../e-util/e-attachment.c:3027
 msgid "A load operation is already in progress"
 msgstr "Lataus on jo käynnissä"
 
-#: ../e-util/e-attachment.c:2137 ../e-util/e-attachment.c:3022
+#: ../e-util/e-attachment.c:2147 ../e-util/e-attachment.c:3035
 msgid "A save operation is already in progress"
 msgstr "Tallennus on jo käynnissä"
 
-#: ../e-util/e-attachment.c:2254
+#: ../e-util/e-attachment.c:2267
 #, c-format
 msgid "Could not load '%s'"
 msgstr "%s ei voitu ladata"
 
-#: ../e-util/e-attachment.c:2257
+#: ../e-util/e-attachment.c:2270
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Liitettä ei voitu avata"
 
-#: ../e-util/e-attachment.c:2561
+#: ../e-util/e-attachment.c:2574
 #, c-format
 msgid "Could not open '%s'"
 msgstr "%s ei voitu avata"
 
-#: ../e-util/e-attachment.c:2564
+#: ../e-util/e-attachment.c:2577
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Liitettä ei voitu avata"
 
-#: ../e-util/e-attachment.c:3031
+#: ../e-util/e-attachment.c:3044
 msgid "Attachment contents not loaded"
 msgstr "Liitteen sisältöä ei ladattu"
 
-#: ../e-util/e-attachment.c:3107
+#: ../e-util/e-attachment.c:3124
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Tiedostoa \"%s\" ei voitu tallentaa"
 
-#: ../e-util/e-attachment.c:3110
+#: ../e-util/e-attachment.c:3127
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Liitettä ei voitu tallentaa"
 
-#: ../e-util/e-book-source-config.c:98
+#: ../e-util/e-book-source-config.c:97
 msgid "Mark as default address book"
 msgstr "Merkitse oletusosoitekirjaksi"
 
-#: ../e-util/e-book-source-config.c:103
+#: ../e-util/e-book-source-config.c:102
 #, fuzzy
 #| msgid "A_utocomplete with this address book"
 msgid "Autocomplete with this address book"
 msgstr "_Täydennä automaattisesti tästä osoitekirjasta"
 
-#: ../e-util/e-book-source-config.c:277
+#: ../e-util/e-book-source-config.c:276
 #, fuzzy
 #| msgid "Copy _book content locally for offline operation"
 msgid "Copy book content locally for offline operation"
 msgstr "Kopioi _kirjan sisältö yhteydettömään käyttöön"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../e-util/e-buffer-tagger.c:410
+#: ../e-util/e-buffer-tagger.c:407
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-napsauta avataksesi linkin"
 
-#: ../e-util/e-cal-source-config.c:170
+#: ../e-util/e-cal-source-config.c:169
 msgid "Mark as default calendar"
 msgstr "Merkitse oletuskalenteriksi"
 
-#: ../e-util/e-cal-source-config.c:173
+#: ../e-util/e-cal-source-config.c:172
 msgid "Mark as default task list"
 msgstr "Merkitse oletustehtävälistaksi"
 
-#: ../e-util/e-cal-source-config.c:176
+#: ../e-util/e-cal-source-config.c:175
 msgid "Mark as default memo list"
 msgstr "Merkitse oletusmuistiolistaksi"
 
-#: ../e-util/e-cal-source-config.c:201
+#: ../e-util/e-cal-source-config.c:200
 msgid "Color:"
 msgstr "Väri:"
 
-#: ../e-util/e-cal-source-config.c:406
+#: ../e-util/e-cal-source-config.c:405
 #, fuzzy
 #| msgid "Cop_y calendar contents locally for offline operation"
 msgid "Copy calendar contents locally for offline operation"
 msgstr "_Kopioi kalenterin sisältö paikallisesti yhteydettömään käyttöön"
 
-#: ../e-util/e-cal-source-config.c:410
+#: ../e-util/e-cal-source-config.c:409
 #, fuzzy
 #| msgid "Cop_y task list contents locally for offline operation"
 msgid "Copy task list contents locally for offline operation"
 msgstr "_Kopioi tehtävälistan sisältö paikallisesti yhteydettömään käyttöön"
 
-#: ../e-util/e-cal-source-config.c:414
+#: ../e-util/e-cal-source-config.c:413
 #, fuzzy
 #| msgid "Cop_y memo list contents locally for offline operation"
 msgid "Copy memo list contents locally for offline operation"
 msgstr "_Kopioi muistilappujen sisältö paikallisesti yhteydettömään käyttöön"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1327 ../e-util/e-calendar-item.c:2195
+#: ../e-util/e-calendar-item.c:1326 ../e-util/e-calendar-item.c:2194
 msgctxt "CalItem"
 msgid "%B"
-msgstr ""
+msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1329
+#: ../e-util/e-calendar-item.c:1328
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1366
-#| msgid "%B %Y"
+#: ../e-util/e-calendar-item.c:1365
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../e-util/e-calendar.c:190
+#: ../e-util/e-calendar.c:189
 msgid "Previous month"
 msgstr "Edellinen kuukausi"
 
-#: ../e-util/e-calendar.c:215
+#: ../e-util/e-calendar.c:214
 msgid "Next month"
 msgstr "Seuraava kuukausi"
 
-#: ../e-util/e-calendar.c:241
+#: ../e-util/e-calendar.c:240
 msgid "Previous year"
 msgstr "Edellinen vuosi"
 
-#: ../e-util/e-calendar.c:266
+#: ../e-util/e-calendar.c:265
 msgid "Next year"
 msgstr "Seuraava vuosi"
 
-#: ../e-util/e-calendar.c:290
+#: ../e-util/e-calendar.c:289
 msgid "Month Calendar"
 msgstr "Kuukausikalenteri"
 
-#: ../e-util/e-categories-editor.c:224
+#: ../e-util/e-categories-editor.c:223
 msgid "Currently _used categories:"
 msgstr "Käytössä _olevat luokat:"
 
-#: ../e-util/e-categories-editor.c:235
+#: ../e-util/e-categories-editor.c:234
 msgid "_Available Categories:"
 msgstr "_Käytettävissä olevat luokat:"
 
-#: ../e-util/e-categories-selector.c:323
-#| msgid "Icon View"
+#: ../e-util/e-categories-editor.c:274 ../mail/em-folder-selector.c:269
+#: ../plugins/mail-to-task/mail-to-task.c:595
+#: ../shell/e-shell-window-actions.c:1100
+msgid "_New"
+msgstr "_Uusi"
+
+#: ../e-util/e-categories-selector.c:321
 msgid "Icon"
 msgstr "Kuvake"
 
-#: ../e-util/e-category-completion.c:300
+#: ../e-util/e-category-completion.c:299
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Luo luokka \"%s\""
 
-#: ../e-util/e-category-editor.c:137
-#| msgid "Category"
+#: ../e-util/e-category-editor.c:136
 msgid "Category Icon"
 msgstr "Luokan kuvake"
 
-#: ../e-util/e-category-editor.c:141
-#| msgid "_No image"
+#: ../e-util/e-category-editor.c:140
 msgid "_No Image"
 msgstr "_Ei kuvaa"
 
-#: ../e-util/e-category-editor.c:178
-#| msgid "Category"
+#: ../e-util/e-category-editor.c:173
 msgid "Category _Name"
 msgstr "Luokan _nimi"
 
-#: ../e-util/e-category-editor.c:190
-#| msgid "Category"
+#: ../e-util/e-category-editor.c:185
 msgid "Category _Icon"
 msgstr "Luokan _kuvake"
 
-#: ../e-util/e-category-editor.c:216
-#| msgid "Calendar Properties"
+#: ../e-util/e-category-editor.c:211
 msgid "Category Properties"
 msgstr "Luokan ominaisuudet"
 
-#: ../e-util/e-category-editor.c:277
+#: ../e-util/e-category-editor.c:272
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "Asetuksista löytyy jo luokka nimeltä \"%s\". Valitse toinen nimi"
 
-#: ../e-util/e-cell-combo.c:186
+#: ../e-util/e-cell-combo.c:185
 msgid "popup list"
 msgstr "ponnahduslista"
 
-#: ../e-util/e-cell-date-edit.c:299
+#: ../e-util/e-cell-date-edit.c:298
 msgid "Now"
 msgstr "Nyt"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-cell-date-edit.c:307 ../e-util/e-datetime-format.c:209
-#: ../modules/calendar/e-cal-shell-view-actions.c:1900
-#: ../modules/itip-formatter/itip-view.c:230
+#: ../e-util/e-cell-date-edit.c:306 ../e-util/e-datetime-format.c:208
+#: ../modules/calendar/e-cal-shell-view-actions.c:1899
+#: ../modules/itip-formatter/itip-view.c:223
 msgid "Today"
 msgstr "Tänään"
 
 #. Translators: "None" as a label of a button to unset date in a
 #. * date table cell.
-#: ../e-util/e-cell-date-edit.c:317
+#: ../e-util/e-cell-date-edit.c:316
 msgctxt "table-date"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../e-util/e-cell-date-edit.c:325
+#: ../e-util/e-cell-date-edit.c:324 ../mail/e-mail-label-dialog.c:200
 msgid "OK"
 msgstr "OK"
 
-#: ../e-util/e-cell-date-edit.c:873
+#: ../e-util/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ajan tulee olla muodossa: %s"
 
-#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1851
+#: ../e-util/e-cell-date.c:50 ../mail/message-list.c:1853
 msgid "?"
 msgstr "?"
 
-#: ../e-util/e-cell-percent.c:80
+#: ../e-util/e-cell-percent.c:79
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosenttiarvon tulee olla välillä 0 - 100"
 
-#: ../e-util/e-charset-combo-box.c:100
+#: ../e-util/e-charset-combo-box.c:99
 msgid "Character Encoding"
 msgstr "Merkistön koodaus"
 
-#: ../e-util/e-charset-combo-box.c:123
+#: ../e-util/e-charset-combo-box.c:122
 msgid "Enter the character set to use"
 msgstr "Syötä käytettävä merkistö"
 
-#: ../e-util/e-charset-combo-box.c:342
+#: ../e-util/e-charset-combo-box.c:368
 msgid "Other..."
 msgstr "Muut..."
 
-#: ../e-util/e-charset.c:53
+#: ../e-util/e-charset.c:52
 msgid "Arabic"
 msgstr "Arabia"
 
-#: ../e-util/e-charset.c:54
+#: ../e-util/e-charset.c:53
 msgid "Baltic"
 msgstr "Balttilainen"
 
-#: ../e-util/e-charset.c:55
+#: ../e-util/e-charset.c:54
 msgid "Central European"
 msgstr "Keskieurooppalainen"
 
-#: ../e-util/e-charset.c:56
+#: ../e-util/e-charset.c:55
 msgid "Chinese"
 msgstr "Kiinalainen"
 
-#: ../e-util/e-charset.c:57
+#: ../e-util/e-charset.c:56
 msgid "Cyrillic"
 msgstr "Kyrillinen"
 
-#: ../e-util/e-charset.c:58
+#: ../e-util/e-charset.c:57
 msgid "Greek"
 msgstr "Kreikkalainen"
 
-#: ../e-util/e-charset.c:59
+#: ../e-util/e-charset.c:58
 msgid "Hebrew"
 msgstr "Heprea"
 
-#: ../e-util/e-charset.c:60
+#: ../e-util/e-charset.c:59
 msgid "Japanese"
 msgstr "Japanilainen"
 
-#: ../e-util/e-charset.c:61
+#: ../e-util/e-charset.c:60
 msgid "Korean"
 msgstr "Korealainen"
 
-#: ../e-util/e-charset.c:62
+#: ../e-util/e-charset.c:61
 msgid "Thai"
 msgstr "Thai"
 
-#: ../e-util/e-charset.c:63
+#: ../e-util/e-charset.c:62
 msgid "Turkish"
 msgstr "Turkkilainen"
 
-#: ../e-util/e-charset.c:64
+#: ../e-util/e-charset.c:63
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../e-util/e-charset.c:65
+#: ../e-util/e-charset.c:64
 msgid "Western European"
 msgstr "Länsieurooppalainen"
 
-#: ../e-util/e-charset.c:66
+#: ../e-util/e-charset.c:65
 msgid "Western European, New"
 msgstr "Länsieurooppalainen, uusi"
 
 #. Translators: Character set "Chinese, Traditional"
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
+#: ../e-util/e-charset.c:84 ../e-util/e-charset.c:86 ../e-util/e-charset.c:88
 msgid "Traditional"
 msgstr "Perinteinen"
 
 #. Translators: Character set "Chinese, Simplified"
-#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
-#: ../e-util/e-charset.c:97
+#: ../e-util/e-charset.c:90 ../e-util/e-charset.c:92 ../e-util/e-charset.c:94
+#: ../e-util/e-charset.c:96
 msgid "Simplified"
 msgstr "Yksinkertaistettu"
 
 #. Translators: Character set "Cyrillic, Ukrainian"
-#: ../e-util/e-charset.c:101
+#: ../e-util/e-charset.c:100
 msgid "Ukrainian"
 msgstr "Ukrainalainen"
 
 #. Translators: Character set "Hebrew, Visual"
-#: ../e-util/e-charset.c:105
+#: ../e-util/e-charset.c:104
 msgid "Visual"
 msgstr "Visuaali"
 
-#: ../e-util/e-client-cache.c:1162
+#: ../e-util/e-client-cache.c:1189
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr ""
 
-#: ../e-util/e-dateedit.c:524
+#: ../e-util/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "Päiväys ja aika"
 
-#: ../e-util/e-dateedit.c:549
+#: ../e-util/e-dateedit.c:548
 msgid "Text entry to input date"
 msgstr "Tekstikenttä päiväyksen syöttöön"
 
-#: ../e-util/e-dateedit.c:572
+#: ../e-util/e-dateedit.c:571
 msgid "Click this button to show a calendar"
 msgstr "Paina tästä näyttääksesi kalenterin"
 
-#: ../e-util/e-dateedit.c:626
+#: ../e-util/e-dateedit.c:625
 msgid "Drop-down combination box to select time"
 msgstr "Yhdistelmävalitsin ajan valitsemiseen"
 
-#: ../e-util/e-dateedit.c:627
+#: ../e-util/e-dateedit.c:626
 #: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Aika"
 
-#: ../e-util/e-dateedit.c:701
+#: ../e-util/e-dateedit.c:700
 msgid "No_w"
 msgstr "N_yt"
 
-#: ../e-util/e-dateedit.c:708
+#: ../e-util/e-dateedit.c:707
 msgid "_Today"
 msgstr "_Tänään"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../e-util/e-dateedit.c:717
+#: ../e-util/e-dateedit.c:716
 msgid "_None"
 msgstr "_Ei mitään"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../e-util/e-dateedit.c:1813 ../e-util/e-dateedit.c:2061
+#: ../e-util/e-dateedit.c:1838 ../e-util/e-dateedit.c:2086
 msgctxt "date"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../e-util/e-dateedit.c:1953
+#: ../e-util/e-dateedit.c:1978
 msgid "Invalid Date Value"
 msgstr "Virheellinen päivämäärä"
 
-#: ../e-util/e-dateedit.c:1998
+#: ../e-util/e-dateedit.c:2023
 msgid "Invalid Time Value"
 msgstr "Virheellinen ajan kuvaus"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:220 ../modules/itip-formatter/itip-view.c:258
+#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:251
 msgid "Tomorrow"
 msgstr "Huomenna"
 
-#: ../e-util/e-datetime-format.c:222
+#: ../e-util/e-datetime-format.c:221
 msgid "Yesterday"
 msgstr "Eilen"
 
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:230
+#: ../e-util/e-datetime-format.c:229
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "Seuraava ma"
@@ -10595,7 +10916,7 @@ msgstr "Seuraava ma"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:236
+#: ../e-util/e-datetime-format.c:235
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "Seuraava ti"
@@ -10603,7 +10924,7 @@ msgstr "Seuraava ti"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:242
+#: ../e-util/e-datetime-format.c:241
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "Seuraava ke"
@@ -10611,7 +10932,7 @@ msgstr "Seuraava ke"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:248
+#: ../e-util/e-datetime-format.c:247
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "Seuraava to"
@@ -10619,7 +10940,7 @@ msgstr "Seuraava to"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:254
+#: ../e-util/e-datetime-format.c:253
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "Seuraava pe"
@@ -10627,7 +10948,7 @@ msgstr "Seuraava pe"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:260
+#: ../e-util/e-datetime-format.c:259
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "Seuraava la"
@@ -10635,179 +10956,176 @@ msgstr "Seuraava la"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:266
+#: ../e-util/e-datetime-format.c:265
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Seuraava su"
 
-#: ../e-util/e-datetime-format.c:353 ../e-util/e-datetime-format.c:363
-#: ../e-util/e-datetime-format.c:372
+#: ../e-util/e-datetime-format.c:352 ../e-util/e-datetime-format.c:362
+#: ../e-util/e-datetime-format.c:371
 msgid "Use locale default"
 msgstr "Käytä oletusaikavyöhykettä"
 
-#: ../e-util/e-datetime-format.c:577
+#: ../e-util/e-datetime-format.c:576
 msgid "Format:"
 msgstr "Muoto:"
 
-#: ../e-util/e-file-utils.c:121
+#: ../e-util/e-file-utils.c:120
 msgid "(Unknown Filename)"
 msgstr "(Tuntematon tiedostonimi)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:125
+#: ../e-util/e-file-utils.c:124
 #, c-format
 msgid "Writing \"%s\""
 msgstr "Kirjoitetaan tiedostoa ”%s”"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:130
+#: ../e-util/e-file-utils.c:129
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "Kirjoitetaan tiedostoa ”%s” palvelimelle ”%s”"
 
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
-#: ../e-util/e-filter-datespec.c:67
+#: ../e-util/e-filter-datespec.c:66
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 sekunti sitten"
 msgstr[1] "%d sekuntia sitten"
 
-#: ../e-util/e-filter-datespec.c:68
+#: ../e-util/e-filter-datespec.c:67
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 sekunti tulevaisuudessa"
 msgstr[1] "%d sekuntia tulevaisuudessa"
 
-#: ../e-util/e-filter-datespec.c:69
+#: ../e-util/e-filter-datespec.c:68
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minuutti sitten"
 msgstr[1] "%d minuuttia sitten"
 
-#: ../e-util/e-filter-datespec.c:70
+#: ../e-util/e-filter-datespec.c:69
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "yhden minuutin päässä"
 msgstr[1] "%d minuutin päässä"
 
-#: ../e-util/e-filter-datespec.c:71
+#: ../e-util/e-filter-datespec.c:70
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 tunti sitten"
 msgstr[1] "%d tuntia sitten"
 
-#: ../e-util/e-filter-datespec.c:72
+#: ../e-util/e-filter-datespec.c:71
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 tunti tulevaisuudessa"
 msgstr[1] "%d tuntia tulevaisuudessa"
 
-#: ../e-util/e-filter-datespec.c:73
+#: ../e-util/e-filter-datespec.c:72
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 päivä sitten"
 msgstr[1] "%d päivää sitten"
 
-#: ../e-util/e-filter-datespec.c:74
+#: ../e-util/e-filter-datespec.c:73
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "yhden päivän päässä"
 msgstr[1] "%d päivän päässä"
 
-#: ../e-util/e-filter-datespec.c:75
+#: ../e-util/e-filter-datespec.c:74
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 viikko sitten"
 msgstr[1] "%d viikkoa sitten"
 
-#: ../e-util/e-filter-datespec.c:76
+#: ../e-util/e-filter-datespec.c:75
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 viikko tulevaisuudessa"
 msgstr[1] "%d viikkoa tulevaisuudessa"
 
-#: ../e-util/e-filter-datespec.c:77
+#: ../e-util/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 kuukausi sitten"
 msgstr[1] "%d kuukautta sitten"
 
-#: ../e-util/e-filter-datespec.c:78
+#: ../e-util/e-filter-datespec.c:77
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "yhden kuukauden päässä"
 msgstr[1] "%d kuukauden päässä"
 
-#: ../e-util/e-filter-datespec.c:79
+#: ../e-util/e-filter-datespec.c:78
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 vuosi sitten"
 msgstr[1] "%d vuotta sitten"
 
-#: ../e-util/e-filter-datespec.c:80
+#: ../e-util/e-filter-datespec.c:79
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "yhden vuoden päässä"
 msgstr[1] "%d vuoden päässä"
 
-#: ../e-util/e-filter-datespec.c:130
+#: ../e-util/e-filter-datespec.c:129
 msgid "<click here to select a date>"
 msgstr "<napsauta valitaksesi päiväys>"
 
-#: ../e-util/e-filter-datespec.c:133 ../e-util/e-filter-datespec.c:144
-#: ../e-util/e-filter-datespec.c:155
+#: ../e-util/e-filter-datespec.c:132 ../e-util/e-filter-datespec.c:143
+#: ../e-util/e-filter-datespec.c:154
 msgid "now"
 msgstr "nyt"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../e-util/e-filter-datespec.c:140
+#: ../e-util/e-filter-datespec.c:139
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../e-util/e-filter-datespec.c:289
+#: ../e-util/e-filter-datespec.c:288
 msgid "Select a time to compare against"
 msgstr "Valitse aika johon verrataan"
 
-#: ../e-util/e-filter-file.c:187
+#: ../e-util/e-filter-file.c:186
 msgid "Choose a File"
 msgstr "Valitse tiedosto"
 
-#: ../e-util/e-filter-rule.c:743
+#: ../e-util/e-filter-rule.c:750
 msgid "R_ule name:"
 msgstr "_Säännön nimi:"
 
-#: ../e-util/e-filter-rule.c:793
-#| msgid "Find items that meet the following conditions"
+#: ../e-util/e-filter-rule.c:800
 msgid "all the following conditions"
 msgstr "kaikkia seuraavia ehtoja"
 
-#: ../e-util/e-filter-rule.c:794
-#| msgid "Find items that meet the following conditions"
+#: ../e-util/e-filter-rule.c:801
 msgid "any of the following conditions"
 msgstr "mitä tahansa seuraavista ehdoista"
 
-#: ../e-util/e-filter-rule.c:800
-#| msgid "_Find items:"
+#: ../e-util/e-filter-rule.c:807
 msgid "_Find items which match:"
 msgstr "_Etsi kohteet, jotka vastaavat:"
 
-#: ../e-util/e-filter-rule.c:823
+#: ../e-util/e-filter-rule.c:830
 msgid "Find items that meet the following conditions"
 msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 
@@ -10815,35 +11133,36 @@ msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:838 ../e-util/e-mail-signature-combo-box.c:369
-#: ../libemail-engine/camel-null-store.c:28
-#: ../mail/e-mail-config-summary-page.c:139
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
+#: ../e-util/e-filter-rule.c:845 ../e-util/e-mail-identity-combo-box.c:473
+#: ../e-util/e-mail-signature-combo-box.c:368 ../e-util/e-proxy-editor.c:549
+#: ../libemail-engine/camel-null-store.c:27
+#: ../mail/e-mail-config-summary-page.c:138
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
 msgid "None"
 msgstr "Määrittelemätön"
 
-#: ../e-util/e-filter-rule.c:839
+#: ../e-util/e-filter-rule.c:846
 msgid "All related"
 msgstr "Kaikki tähän liittyvät"
 
-#: ../e-util/e-filter-rule.c:841
+#: ../e-util/e-filter-rule.c:848
 msgid "Replies and parents"
 msgstr "Vastaukset ja vanhemmat"
 
-#: ../e-util/e-filter-rule.c:842
+#: ../e-util/e-filter-rule.c:849
 msgid "No reply or parent"
 msgstr "Ei vastasta tai vanhempaa"
 
-#: ../e-util/e-filter-rule.c:845
+#: ../e-util/e-filter-rule.c:852
 #, fuzzy
 msgid "I_nclude threads:"
 msgstr "O_ta myös säikeet mukaan"
 
-#: ../e-util/e-filter-rule.c:922
+#: ../e-util/e-filter-rule.c:929
 msgid "A_dd Condition"
 msgstr "Lisää _ehto"
 
-#: ../e-util/e-filter-rule.c:1239 ../mail/em-utils.c:241
+#: ../e-util/e-filter-rule.c:1243 ../mail/em-utils.c:230
 msgid "Outgoing"
 msgstr "Lähtevät"
 
@@ -10862,7 +11181,7 @@ msgstr "Valitse tiedosto"
 msgid "File _type:"
 msgstr "Tiedoston _tyyppi:"
 
-#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:921
+#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:917
 msgid "Choose the destination for this import"
 msgstr "Valitse tämän tuonnin kohde"
 
@@ -10879,7 +11198,7 @@ msgid "Import a _single file"
 msgstr "Tuo _yksi tiedosto"
 
 #: ../e-util/e-import-assistant.c:403
-#: ../modules/startup-wizard/e-mail-config-import-page.c:202
+#: ../modules/startup-wizard/e-mail-config-import-page.c:201
 msgid "Please select the information that you would like to import:"
 msgstr "Valitse tieto jota haluaisit tuoda:"
 
@@ -10894,7 +11213,7 @@ msgstr ""
 "uudestaan, napsauta ”Takaisin”-painiketta."
 
 #: ../e-util/e-import-assistant.c:559
-#: ../modules/startup-wizard/e-mail-config-import-page.c:231
+#: ../modules/startup-wizard/e-mail-config-import-page.c:230
 #, c-format
 msgid "From %s:"
 msgstr "Ohjelmasta %s:"
@@ -10904,29 +11223,29 @@ msgstr "Ohjelmasta %s:"
 msgid "_Cancel Import"
 msgstr "_Peru tuonti"
 
-#: ../e-util/e-import-assistant.c:920
+#: ../e-util/e-import-assistant.c:916
 msgid "Preview data to be imported"
 msgstr "Esikatsele tuotavia tietoja"
 
-#: ../e-util/e-import-assistant.c:926 ../e-util/e-import-assistant.c:939
-#: ../e-util/e-import-assistant.c:1292 ../e-util/e-import-assistant.c:1368
-#: ../e-util/e-import-assistant.c:1377
+#: ../e-util/e-import-assistant.c:922 ../e-util/e-import-assistant.c:935
+#: ../e-util/e-import-assistant.c:1288 ../e-util/e-import-assistant.c:1364
+#: ../e-util/e-import-assistant.c:1373
 msgid "Import Data"
 msgstr "Tuo tiedot"
 
-#: ../e-util/e-import-assistant.c:934
+#: ../e-util/e-import-assistant.c:930
 msgid "Select what type of file you want to import from the list."
 msgstr "Valitse luettelosta minkä tyyppisen tiedoston haluat tuoda."
 
-#: ../e-util/e-import-assistant.c:1282 ../e-util/e-import-assistant.c:1317
+#: ../e-util/e-import-assistant.c:1278 ../e-util/e-import-assistant.c:1313
 msgid "Evolution Import Assistant"
 msgstr "Evolutionin tuontiapulainen"
 
-#: ../e-util/e-import-assistant.c:1299 ../e-util/e-import-assistant.c:1355
+#: ../e-util/e-import-assistant.c:1295 ../e-util/e-import-assistant.c:1351
 msgid "Import Location"
 msgstr "Tuo sijainti"
 
-#: ../e-util/e-import-assistant.c:1310
+#: ../e-util/e-import-assistant.c:1306
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -10936,43 +11255,43 @@ msgstr ""
 "Tällä apulaisella voit tuoda ulkopuolisia tiedostoja muista ohjelmista "
 "Evolutionin käyttöön."
 
-#: ../e-util/e-import-assistant.c:1327
+#: ../e-util/e-import-assistant.c:1323
 msgid "Importer Type"
 msgstr "Tuojan tyyppi"
 
-#: ../e-util/e-import-assistant.c:1337
+#: ../e-util/e-import-assistant.c:1333
 msgid "Select Information to Import"
 msgstr "Valitse tuotavat tiedot"
 
-#: ../e-util/e-import-assistant.c:1346
+#: ../e-util/e-import-assistant.c:1342
 msgid "Select a File"
 msgstr "Valitse tiedosto"
 
-#: ../e-util/e-import-assistant.c:1363
+#: ../e-util/e-import-assistant.c:1359
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Tuo tiedosto Evolutioniin napsauttamalla \"Toteuta\"."
 
-#: ../e-util/e-mail-signature-combo-box.c:378
+#: ../e-util/e-mail-signature-combo-box.c:377
 msgid "Autogenerated"
 msgstr "Automaattisesti luotu"
 
-#: ../e-util/e-mail-signature-editor.c:310
+#: ../e-util/e-mail-signature-editor.c:309
 msgid "Close"
 msgstr "Sulje"
 
-#: ../e-util/e-mail-signature-editor.c:315
+#: ../e-util/e-mail-signature-editor.c:314
 msgid "_Save and Close"
 msgstr "_Tallenna ja sulje"
 
-#: ../e-util/e-mail-signature-editor.c:529
+#: ../e-util/e-mail-signature-editor.c:528
 msgid "Edit Signature"
 msgstr "Muokkaa allekirjoitusta"
 
-#: ../e-util/e-mail-signature-editor.c:549
+#: ../e-util/e-mail-signature-editor.c:548
 msgid "_Signature Name:"
 msgstr "Allekirjoituk_sen nimi:"
 
-#: ../e-util/e-mail-signature-editor.c:595
+#: ../e-util/e-mail-signature-editor.c:594
 msgid "Unnamed"
 msgstr "Nimeämätön"
 
@@ -10980,15 +11299,15 @@ msgstr "Nimeämätön"
 msgid "Add _Script"
 msgstr "Lisää _skripti"
 
-#: ../e-util/e-mail-signature-manager.c:422
+#: ../e-util/e-mail-signature-manager.c:419
 msgid "Add Signature Script"
 msgstr "Lisää allekirjoitus-skripti"
 
-#: ../e-util/e-mail-signature-manager.c:492
+#: ../e-util/e-mail-signature-manager.c:489
 msgid "Edit Signature Script"
 msgstr "Muokkaa allekirjoitus-skriptiä"
 
-#: ../e-util/e-mail-signature-script-dialog.c:395
+#: ../e-util/e-mail-signature-script-dialog.c:394
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -10998,19 +11317,19 @@ msgstr ""
 "Valitsemasi nimi on käytössä ainoastaan tässä listassa\n"
 "näytettäessä."
 
-#: ../e-util/e-mail-signature-script-dialog.c:446
+#: ../e-util/e-mail-signature-script-dialog.c:445
 msgid "S_cript:"
 msgstr "_Skripti:"
 
-#: ../e-util/e-mail-signature-script-dialog.c:477
+#: ../e-util/e-mail-signature-script-dialog.c:476
 msgid "Script file must be executable."
 msgstr "Skriptitiedoston tulee olla suoritettavissa."
 
-#: ../e-util/e-map.c:886
+#: ../e-util/e-map.c:885
 msgid "World Map"
 msgstr "Maailmankartta"
 
-#: ../e-util/e-map.c:889
+#: ../e-util/e-map.c:888
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -11018,139 +11337,124 @@ msgstr ""
 "Hiirikäyttöinen maailmankartta aikavyöhykkeen valintaa varten. Näppäimistön "
 "käyttäjät voivat valita aikavyöhykkeen alla olevasta pudotusvalikosta."
 
-#: ../e-util/e-misc-utils.c:242
+#: ../e-util/e-misc-utils.c:246
 msgid "Could not open the link."
 msgstr "Linkkiä ei voitu avata."
 
-#: ../e-util/e-misc-utils.c:289
+#: ../e-util/e-misc-utils.c:293
 msgid "Could not display help for Evolution."
 msgstr "Evolutionin ohjetta ei voitu näyttää."
 
-#: ../e-util/e-name-selector-dialog.c:279
-#| msgid "Contacts"
+#: ../e-util/e-name-selector-dialog.c:277
 msgid "Show Contacts"
 msgstr "Näytä yhteystiedot"
 
-#: ../e-util/e-name-selector-dialog.c:311
-#| msgid "Address Book"
+#: ../e-util/e-name-selector-dialog.c:309
 msgid "Address B_ook:"
 msgstr "_Osoitekirja:"
 
-#: ../e-util/e-name-selector-dialog.c:318
-#| msgid "Category"
+#: ../e-util/e-name-selector-dialog.c:316
 msgid "Cat_egory:"
 msgstr "_Luokka:"
 
-#: ../e-util/e-name-selector-dialog.c:342
-#| msgid "_Search"
+#: ../e-util/e-name-selector-dialog.c:340
 msgid "_Search:"
 msgstr "Et_si:"
 
-#: ../e-util/e-name-selector-dialog.c:368
-#: ../e-util/e-name-selector-dialog.c:1276
-#: ../modules/addressbook/e-book-shell-view-actions.c:1116
-#: ../modules/calendar/e-cal-shell-view-actions.c:1733
-#: ../modules/calendar/e-memo-shell-view-actions.c:767
-#: ../modules/calendar/e-task-shell-view-actions.c:938
+#: ../e-util/e-name-selector-dialog.c:366
+#: ../e-util/e-name-selector-dialog.c:1274
+#: ../modules/addressbook/e-book-shell-view-actions.c:1112
+#: ../modules/calendar/e-cal-shell-view-actions.c:1732
+#: ../modules/calendar/e-memo-shell-view-actions.c:766
+#: ../modules/calendar/e-task-shell-view-actions.c:937
 msgid "Any Category"
 msgstr "Mikä tahansa luokka"
 
-#: ../e-util/e-name-selector-dialog.c:370
-#| msgid "Contacts"
+#: ../e-util/e-name-selector-dialog.c:368
 msgid "Co_ntacts"
 msgstr "_Yhteystiedot"
 
-#: ../e-util/e-name-selector-dialog.c:447
-#| msgid "_Search"
+#: ../e-util/e-name-selector-dialog.c:445
 msgid "Search"
 msgstr "Etsi"
 
-#: ../e-util/e-name-selector-dialog.c:450
-#: ../mail/importers/pine-importer.c:426
+#: ../e-util/e-name-selector-dialog.c:448
+#: ../mail/importers/pine-importer.c:427
 msgid "Address Book"
 msgstr "Osoitekirja"
 
-#: ../e-util/e-name-selector-dialog.c:453
-#: ../modules/addressbook/e-book-shell-backend.c:304
-#: ../modules/addressbook/e-book-shell-view.c:372
+#: ../e-util/e-name-selector-dialog.c:451
+#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-view.c:371
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
-#: ../e-util/e-name-selector-dialog.c:578
-#| msgid "Select Address Book"
+#: ../e-util/e-name-selector-dialog.c:576
 msgid "Select Contacts from Address Book"
 msgstr "Valitse yhteystiedot osoitekirjasta"
 
-#: ../e-util/e-name-selector-dialog.c:1001
-msgid "_Remove"
-msgstr "_Poista"
-
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3028
+#: ../e-util/e-name-selector-entry.c:3038
 #, fuzzy, c-format
 msgid "E_xpand %s Inline"
 msgstr "_Laajenna kaikki"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3044
+#: ../e-util/e-name-selector-entry.c:3054
 #, c-format
 msgid "Cop_y %s"
 msgstr "_Kopioi %s"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3055
+#: ../e-util/e-name-selector-entry.c:3065
 #, c-format
 msgid "C_ut %s"
 msgstr "_Leikkaa %s"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3073
+#: ../e-util/e-name-selector-entry.c:3083
 #, c-format
-#| msgid "_Edit"
 msgid "_Edit %s"
 msgstr "_Muokkaa %s"
 
 #: ../e-util/e-name-selector-list.c:583
 #, c-format
-#| msgid "_Delete"
 msgid "_Delete %s"
 msgstr "_Poista %s"
 
-#: ../e-util/e-online-button.c:31
+#: ../e-util/e-online-button.c:30
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr "Evolution on verkossa. Katkaise verkkoyhteydet napsauttamalla napista."
 
-#: ../e-util/e-online-button.c:34
+#: ../e-util/e-online-button.c:33
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr "Evolution ei ole verkossa. Avaa verkkoyhteydet napsauttamalla napista."
 
-#: ../e-util/e-online-button.c:37
+#: ../e-util/e-online-button.c:36
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolution ei ole verkossa, koska verkko ei ole käytettävissä."
 
-#: ../e-util/e-passwords.c:127
+#: ../e-util/e-passwords.c:125
 msgid "Keyring key is unusable: no user or host name"
 msgstr ""
 
-#: ../e-util/e-passwords.c:447
+#: ../e-util/e-passwords.c:445
 msgid "You have the Caps Lock key on."
 msgstr "Caps Lock -näppäin on päällä."
 
-#: ../e-util/e-passwords.c:578
-#| msgid "_Remember password"
+#: ../e-util/e-passwords.c:576
 msgid "_Remember this passphrase"
 msgstr "_Muista salalause"
 
-#: ../e-util/e-passwords.c:579
+#: ../e-util/e-passwords.c:577
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr ""
 
-#: ../e-util/e-passwords.c:584
-#| msgid "_Remember password"
+#: ../e-util/e-passwords.c:582
 msgid "_Remember this password"
 msgstr "_Muista salasana"
 
-#: ../e-util/e-passwords.c:585
+#: ../e-util/e-passwords.c:583
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -11158,143 +11462,231 @@ msgstr ""
 msgid "Evolution Preferences"
 msgstr "Evolutionin asetukset"
 
-#: ../e-util/e-print.c:161
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "Tapahtui virhe tulostettaessa"
 
-#: ../e-util/e-print.c:168
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "Tulostusjärjestelmä kertoi seuraavat yksityiskohdat virheestä:"
 
-#: ../e-util/e-print.c:174
+#: ../e-util/e-print.c:173
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "Tulostusjärjestelmä ei kertonut tarkempia tietoja virheestä."
 
-#: ../e-util/e-rule-editor.c:185
+#: ../e-util/e-proxy-editor.c:314
+#, fuzzy
+#| msgid "Method:"
+msgid "_Method:"
+msgstr "Menetelmä:"
+
+#: ../e-util/e-proxy-editor.c:336
+msgid "Defer to Desktop Settings"
+msgstr ""
+
+#: ../e-util/e-proxy-editor.c:340
+msgid "_Open Desktop Settings"
+msgstr ""
+
+#: ../e-util/e-proxy-editor.c:366
+#, fuzzy
+#| msgid "January"
+msgid "Manual"
+msgstr "Tammikuu"
+
+#: ../e-util/e-proxy-editor.c:385
+#| msgid "H_TTP Proxy:"
+msgid "_HTTP Proxy:"
+msgstr "_HTTP-välityspalvelin:"
+
+#: ../e-util/e-proxy-editor.c:416
+#| msgid "H_TTP Proxy:"
+msgid "H_TTPS Proxy:"
+msgstr "H_TTPS-välityspalvelin:"
+
+#: ../e-util/e-proxy-editor.c:447
+#| msgid "SOC_KS Proxy:"
+msgid "_Socks Proxy:"
+msgstr "So_cks-välityspalvelin:"
+
+#: ../e-util/e-proxy-editor.c:478
+#, fuzzy
+#| msgid "Ignore"
+msgid "_Ignore Hosts:"
+msgstr "Älä välitä"
+
+#: ../e-util/e-proxy-editor.c:504
+#, fuzzy
+#| msgid "Automatic Contacts"
+msgid "Automatic"
+msgstr "Automaattiset yhteystiedot"
+
+#: ../e-util/e-proxy-editor.c:523
+#| msgid "Configuration"
+msgid "Configuration _URL:"
+msgstr "_Määritysosoite:"
+
+#: ../e-util/e-proxy-editor.c:552
+msgid "Use a direct connection, no proxying required."
+msgstr "Käytä suoraa yhteyttä, välityspalvelinta ei tarvita."
+
+#: ../e-util/e-proxy-preferences.c:177
+msgid "Switch to Basic Proxy Preferences"
+msgstr ""
+
+#: ../e-util/e-proxy-preferences.c:179
+msgid "Switch to Advanced Proxy Preferences"
+msgstr ""
+
+#: ../e-util/e-proxy-preferences.c:463
+msgid "Apply custom proxy settings to these accounts:"
+msgstr ""
+
+#: ../e-util/e-proxy-preferences.c:498
+msgid ""
+"<b>Advanced Proxy Preferences</b> lets you define alternate network proxies "
+"and apply them to specific accounts"
+msgstr ""
+
+#: ../e-util/e-proxy-selector.c:85
+#, fuzzy
+#| msgid "_Custom binary:"
+msgid "Custom Proxy"
+msgstr "_Omavalintainen binääri:"
+
+#: ../e-util/e-proxy-selector.c:487
+#| msgid "Create a new appointment"
+msgid "Create a new proxy profile"
+msgstr "Luo uusi välityspalvelinprofiili"
+
+#: ../e-util/e-proxy-selector.c:492
+#| msgid "Delete the selected memo list"
+msgid "Delete the selected proxy profile"
+msgstr "Poista valittu välityspalvelinprofiili"
+
+#: ../e-util/e-rule-editor.c:184
 msgid "Add Rule"
 msgstr "Lisää sääntö"
 
-#: ../e-util/e-rule-editor.c:287
+#: ../e-util/e-rule-editor.c:286
 msgid "Edit Rule"
 msgstr "Muokkaa sääntöä"
 
-#: ../e-util/e-search-bar.c:81
+#: ../e-util/e-search-bar.c:82
 #, c-format
 msgid "Matches: %u"
 msgstr "Osumia: %u"
 
-#: ../e-util/e-search-bar.c:565
+#: ../e-util/e-search-bar.c:566
 msgid "Close the find bar"
 msgstr "Sulje hakupalkki"
 
-#: ../e-util/e-search-bar.c:573
+#: ../e-util/e-search-bar.c:574
 msgid "Fin_d:"
 msgstr "Et_si:"
 
-#: ../e-util/e-search-bar.c:585
+#: ../e-util/e-search-bar.c:586
 msgid "Clear the search"
 msgstr "Tyhjennä hakukenttä"
 
-#: ../e-util/e-search-bar.c:609
+#: ../e-util/e-search-bar.c:610
 msgid "_Previous"
 msgstr "_Edellinen"
 
-#: ../e-util/e-search-bar.c:615
+#: ../e-util/e-search-bar.c:613
 msgid "Find the previous occurrence of the phrase"
 msgstr "Etsi lauseen edellinen esiintymä"
 
-#: ../e-util/e-search-bar.c:624
+#: ../e-util/e-search-bar.c:622
 msgid "_Next"
 msgstr "_Seuraava"
 
-#: ../e-util/e-search-bar.c:630
+#: ../e-util/e-search-bar.c:625
 msgid "Find the next occurrence of the phrase"
 msgstr "Etsi lauseen seuraava esiintymä"
 
-#: ../e-util/e-search-bar.c:639
+#: ../e-util/e-search-bar.c:634
 msgid "Mat_ch case"
 msgstr "Huomioi _kirjainkoko"
 
-#: ../e-util/e-search-bar.c:667
+#: ../e-util/e-search-bar.c:662
 msgid "Reached bottom of page, continued from top"
 msgstr "Saavutettiin sivun loppu, jatketaan alusta"
 
-#: ../e-util/e-search-bar.c:689
+#: ../e-util/e-search-bar.c:684
 msgid "Reached top of page, continued from bottom"
 msgstr "Saavutettiin sivun alku, jatketaan lopusta"
 
-#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:331
-#: ../mail/importers/pine-importer.c:419
-#: ../modules/mail/e-mail-shell-view.c:1075
+#: ../e-util/e-send-options.c:537 ../mail/importers/elm-importer.c:327
+#: ../mail/importers/pine-importer.c:420
+#: ../modules/mail/e-mail-shell-view.c:1097
 msgid "Mail"
 msgstr "Sähköposti"
 
-#: ../e-util/e-send-options.c:570
+#: ../e-util/e-send-options.c:569
 msgid "When de_leted:"
 msgstr "Milloin _poistettu:"
 
-#: ../e-util/e-source-config.c:681 ../e-util/e-source-config.c:685
+#: ../e-util/e-source-config.c:680 ../e-util/e-source-config.c:684
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: ../e-util/e-source-config.c:693 ../e-util/e-source-config.c:697
+#: ../e-util/e-source-config.c:692 ../e-util/e-source-config.c:696
 msgid "Name:"
 msgstr "Nimi:"
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../e-util/e-source-config.c:1302
+#: ../e-util/e-source-config.c:1301
 msgid "Refresh every"
 msgstr "Päivitysväli"
 
-#: ../e-util/e-source-config.c:1332 ../e-util/e-source-config.c:1402
+#: ../e-util/e-source-config.c:1331 ../e-util/e-source-config.c:1401
 msgid "Use a secure connection"
 msgstr "Käytä salattua yhteyttä:"
 
-#: ../e-util/e-source-config.c:1428
+#: ../e-util/e-source-config.c:1427
 #, fuzzy
 #| msgid "Imported Certificate"
 msgid "Unset _trust for SSL certificate"
 msgstr "Tuotu varmenne"
 
-#: ../e-util/e-source-config.c:1464
+#: ../e-util/e-source-config.c:1463
 msgid "User"
 msgstr "Käyttäjä"
 
-#: ../e-util/e-source-selector-dialog.c:229
-#| msgid "_Destination folder:"
+#: ../e-util/e-source-selector-dialog.c:226
 msgid "_Destination"
 msgstr "_Kohde"
 
-#: ../e-util/e-source-selector-dialog.c:342
-#| msgid "Select destination file"
+#: ../e-util/e-source-selector-dialog.c:339
 msgid "Select destination"
 msgstr "Valitse kohde"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:384
+#: ../e-util/e-spell-entry.c:383
 msgid "(no suggestions)"
 msgstr "(ei ehdotuksia)"
 
-#: ../e-util/e-spell-entry.c:408
+#: ../e-util/e-spell-entry.c:407
 msgid "More..."
 msgstr "Lisää..."
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:479
+#: ../e-util/e-spell-entry.c:478
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "Lisää \"%s\" sanastoon"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:530
+#: ../e-util/e-spell-entry.c:529
 #, fuzzy
 #| msgid "Ignore"
 msgid "Ignore All"
 msgstr "Älä välitä"
 
-#: ../e-util/e-spell-entry.c:558
+#: ../e-util/e-spell-entry.c:557
 msgid "Spelling Suggestions"
 msgstr "Kirjoitusehdotukset"
 
@@ -11342,7 +11734,6 @@ msgid "Failed to update data source &quot;{0}&quot;."
 msgstr "Varmuuskopiotiedostoa &quot;{0}&quot; ei voi tallentaa."
 
 #: ../e-util/e-system.error.xml.h:10
-#| msgid "Bad regular expression &quot;{0}&quot;."
 msgid "Failed to delete resource &quot;{0}&quot;."
 msgstr "Resurssin &quot;{0}&quot; poistaminen epäonnistui."
 
@@ -11354,8 +11745,6 @@ msgid ""
 msgstr "Evolutionin osoitekirja sulkeutui odottamatta."
 
 #: ../e-util/e-system.error.xml.h:12
-#| msgid ""
-#| "Your contacts for {0} will not be available until Evolution is restarted."
 msgid ""
 "Some of your contacts may not be available until Evolution is restarted."
 msgstr ""
@@ -11423,71 +11812,70 @@ msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
 msgstr ""
 
 #: ../e-util/e-table-click-to-add.c:680
-#: ../e-util/gal-a11y-e-table-click-to-add.c:62
-#: ../e-util/gal-a11y-e-table-click-to-add.c:143
+#: ../e-util/gal-a11y-e-table-click-to-add.c:61
+#: ../e-util/gal-a11y-e-table-click-to-add.c:142
 msgid "click to add"
 msgstr "lisää napsauttamalla"
 
-#: ../e-util/e-table-column-selector.c:266
+#: ../e-util/e-table-column-selector.c:265
 #, fuzzy
 #| msgid "Move selected messages to another folder"
 msgid "Move selected column names to top"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../e-util/e-table-column-selector.c:271
+#: ../e-util/e-table-column-selector.c:270
 #, fuzzy
 #| msgid "Move selected contacts to another address book"
 msgid "Move selected column names up one row"
 msgstr "Siirrä valitut yhteystiedot toiseen osoitekirjaan"
 
-#: ../e-util/e-table-column-selector.c:276
+#: ../e-util/e-table-column-selector.c:275
 #, fuzzy
 #| msgid "Move selected contacts to another address book"
 msgid "Move selected column names down one row"
 msgstr "Siirrä valitut yhteystiedot toiseen osoitekirjaan"
 
-#: ../e-util/e-table-column-selector.c:281
+#: ../e-util/e-table-column-selector.c:280
 #, fuzzy
 #| msgid "Move selected messages to another folder"
 msgid "Move selected column names to bottom"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../e-util/e-table-column-selector.c:286
-#| msgid "Select all visible memos"
+#: ../e-util/e-table-column-selector.c:285
 msgid "Select all column names"
 msgstr "Valitse kaikki sarakenimet"
 
-#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
+#: ../e-util/e-table-config.c:388 ../e-util/e-table-config.c:434
 msgid "(Ascending)"
 msgstr "(nouseva)"
 
-#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
+#: ../e-util/e-table-config.c:388 ../e-util/e-table-config.c:434
 msgid "(Descending)"
 msgstr "(laskeva)"
 
-#: ../e-util/e-table-config.c:396
+#: ../e-util/e-table-config.c:395
 msgid "Not sorted"
 msgstr "Ei järjestetty"
 
-#: ../e-util/e-table-config.c:441
+#: ../e-util/e-table-config.c:440
 msgid "No grouping"
 msgstr "Ei ryhmitystä"
 
-#: ../e-util/e-table-config.c:546
+#: ../e-util/e-table-config.c:545
 msgid "Show Fields"
 msgstr "Näytä kentät"
 
-#: ../e-util/e-table-config.c:562
+#: ../e-util/e-table-config.c:559
 #, fuzzy
 #| msgid "Choose folders to post the message to."
 msgid "Choose the order of information to appear in the message list."
 msgstr "Valitse kansio johon viesti postitetaan:"
 
-#: ../e-util/e-table-field-chooser-dialog.c:227
+#: ../e-util/e-table-field-chooser-dialog.c:226
 msgid "Add a Column"
 msgstr "Lisää sarake"
 
-#: ../e-util/e-table-field-chooser.c:167
+#: ../e-util/e-table-field-chooser.c:166
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -11495,14 +11883,14 @@ msgstr ""
 "Lisää sarake taulukkoon raahaamalla se kohtaan,\n"
 "johon haluat sen ilmestyvän."
 
-#: ../e-util/e-table-group-container.c:369
+#: ../e-util/e-table-group-container.c:368
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
 msgstr[0] "%s: %s (%d kohta)"
 msgstr[1] "%s: %s (%d kohtaa)"
 
-#: ../e-util/e-table-group-container.c:383
+#: ../e-util/e-table-group-container.c:382
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
@@ -11566,136 +11954,148 @@ msgstr "_Järjestystapa"
 msgid "_Custom"
 msgstr "_Oma"
 
-#: ../e-util/e-text.c:2098
+#: ../e-util/e-text.c:2110
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: ../e-util/e-text.c:2111
+#: ../e-util/e-text.c:2123
 msgid "Input Methods"
 msgstr "Syötemenetelmät"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../e-util/e-timezone-dialog.c:207 ../e-util/e-timezone-dialog.c:429
-#: ../e-util/e-timezone-dialog.c:433 ../e-util/e-timezone-dialog.c:437
-#: ../e-util/e-timezone-dialog.c:803
+#: ../e-util/e-timezone-dialog.c:206 ../e-util/e-timezone-dialog.c:428
+#: ../e-util/e-timezone-dialog.c:432 ../e-util/e-timezone-dialog.c:436
+#: ../e-util/e-timezone-dialog.c:804
 msgid "UTC"
 msgstr "UTC"
 
-#: ../e-util/e-url-entry.c:109
-#| msgid "Click here to go to URL"
+#: ../e-util/e-url-entry.c:108
 msgid "Click here to open the URL"
 msgstr "Napsauta tästä avataksesi verkko-osoitteen"
 
-#: ../e-util/e-url-entry.c:111
-#| msgid "Enter Passphrase"
+#: ../e-util/e-url-entry.c:110
 msgid "Enter a URL here"
 msgstr "Kirjoita verkko-osoite tähän"
 
-#: ../e-util/e-web-view-gtkhtml.c:406 ../e-util/e-web-view.c:285
+#: ../e-util/e-web-view-gtkhtml.c:405 ../e-util/e-web-view.c:282
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: ../e-util/e-web-view-gtkhtml.c:408 ../e-util/e-web-view.c:287
+#: ../e-util/e-web-view-gtkhtml.c:407 ../e-util/e-web-view.c:284
 msgid "Copy the link to the clipboard"
 msgstr "Kopioi linkki leikepöydälle"
 
-#: ../e-util/e-web-view-gtkhtml.c:416 ../e-util/e-web-view.c:295
+#: ../e-util/e-web-view-gtkhtml.c:415 ../e-util/e-web-view.c:292
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: ../e-util/e-web-view-gtkhtml.c:418 ../e-util/e-web-view.c:297
+#: ../e-util/e-web-view-gtkhtml.c:417 ../e-util/e-web-view.c:294
 msgid "Open the link in a web browser"
 msgstr "Avaa linkki selaimessa"
 
-#: ../e-util/e-web-view-gtkhtml.c:426 ../e-util/e-web-view.c:305
+#: ../e-util/e-web-view-gtkhtml.c:425 ../e-util/e-web-view.c:302
 msgid "_Copy Email Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: ../e-util/e-web-view-gtkhtml.c:443 ../e-util/e-web-view.c:322
+#: ../e-util/e-web-view-gtkhtml.c:442 ../e-util/e-web-view.c:319
 msgid "_Copy Image"
 msgstr "K_opioi kuva"
 
-#: ../e-util/e-web-view-gtkhtml.c:445 ../e-util/e-web-view.c:324
+#: ../e-util/e-web-view-gtkhtml.c:444 ../e-util/e-web-view.c:321
 msgid "Copy the image to the clipboard"
 msgstr "Kopioi kuva leikepöydälle"
 
-#: ../e-util/e-web-view-gtkhtml.c:465 ../e-util/e-web-view-gtkhtml.c:1308
-#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1261
+#: ../e-util/e-web-view-gtkhtml.c:464 ../e-util/e-web-view-gtkhtml.c:1307
+#: ../e-util/e-web-view.c:348 ../e-util/e-web-view.c:1319
 msgid "Select all text and images"
 msgstr "Valitse kaikki teksti ja kuvat"
 
-#: ../e-util/e-web-view-gtkhtml.c:972 ../e-util/e-web-view-gtkhtml.c:974
-#: ../e-util/e-web-view-gtkhtml.c:976 ../e-util/e-web-view.c:936
-#: ../e-util/e-web-view.c:938 ../e-util/e-web-view.c:940
+#: ../e-util/e-web-view-gtkhtml.c:971 ../e-util/e-web-view-gtkhtml.c:973
+#: ../e-util/e-web-view-gtkhtml.c:975 ../e-util/e-web-view.c:994
+#: ../e-util/e-web-view.c:996 ../e-util/e-web-view.c:998
 #, c-format
 msgid "Click to call %s"
 msgstr "Soita numeroon %s napsauttamalla"
 
-#: ../e-util/e-web-view-gtkhtml.c:978 ../e-util/e-web-view.c:942
+#: ../e-util/e-web-view-gtkhtml.c:977 ../e-util/e-web-view.c:1000
 msgid "Click to hide/unhide addresses"
 msgstr "Napsauta piilottaaksesi tai näyttääksesi osoitteet"
 
-#: ../e-util/e-web-view-gtkhtml.c:980 ../e-util/e-web-view.c:944
+#: ../e-util/e-web-view-gtkhtml.c:979 ../e-util/e-web-view.c:1002
 #, c-format
 msgid "Click to open %s"
 msgstr "Napsauta avataksesi %s"
 
-#: ../e-util/e-web-view.c:329
+#: ../e-util/e-web-view.c:326
 msgid "Save _Image..."
 msgstr "Tal_lenna kuva..."
 
-#: ../e-util/e-web-view.c:331
+#: ../e-util/e-web-view.c:328
 msgid "Save the image to a file"
 msgstr "Tallenna kuva tiedostoon"
 
-#: ../e-util/e-web-view.c:2834
-#| msgid "Copy the image to the clipboard"
+#: ../e-util/e-web-view.c:2902
 msgid "Copying image to clipboard"
 msgstr "Kopioidaan kuva leikepöydälle"
 
-#: ../e-util/e-web-view.c:3022
+#: ../e-util/e-web-view.c:3090
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../e-util/e-web-view.c:3058
+#: ../e-util/e-web-view.c:3126
 #, c-format
-#| msgid "Moving messages to '%s'"
 msgid "Saving image to '%s'"
 msgstr "Tallennetaan kuva kohteeseen \"%s\""
 
-#: ../e-util/ea-calendar-item.c:315 ../e-util/ea-calendar-item.c:324
+#: ../e-util/e-widget-undo.c:429
+msgid "Undo 'Insert text'"
+msgstr ""
+
+#: ../e-util/e-widget-undo.c:431
+msgid "Redo 'Insert text'"
+msgstr ""
+
+#: ../e-util/e-widget-undo.c:445
+msgid "Undo 'Delete text'"
+msgstr ""
+
+#: ../e-util/e-widget-undo.c:447
+msgid "Redo 'Delete text'"
+msgstr ""
+
+#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
 msgid "%d %B %Y"
 msgstr "%e. %Bta %Y"
 
-#: ../e-util/ea-calendar-item.c:327
+#: ../e-util/ea-calendar-item.c:326
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Kalenteri väliltä %s - %s"
 
-#: ../e-util/ea-calendar-item.c:364
+#: ../e-util/ea-calendar-item.c:363
 msgid "evolution calendar item"
 msgstr "evolutionin kalenterin kohta"
 
-#: ../e-util/evolution-source-viewer.c:635
+#: ../e-util/evolution-source-viewer.c:636
 #, fuzzy
 #| msgid "Evolution Pine importer"
 msgid "Evolution Source Viewer"
 msgstr "Evolutionin Pine-tuoja"
 
 #. Translators: The name that is displayed in the user interface
-#: ../e-util/evolution-source-viewer.c:665
+#: ../e-util/evolution-source-viewer.c:666
 #, fuzzy
 #| msgid "Display"
 msgid "Display Name"
 msgstr "Näytä"
 
-#: ../e-util/evolution-source-viewer.c:674
+#: ../e-util/evolution-source-viewer.c:675
 #, fuzzy
 #| msgid "_Flag:"
 msgid "Flags"
 msgstr "_Merkki:"
 
-#: ../e-util/evolution-source-viewer.c:726
+#: ../e-util/evolution-source-viewer.c:727
 #: ../mail/e-mail-config-identity-page.c:677
 msgid "Identity"
 msgstr "Omat tiedot"
@@ -11745,39 +12145,58 @@ msgstr "Nimi &quot;{0}&quot; on jo käytössä."
 msgid "Please choose another name."
 msgstr "Valitse toinen nimi."
 
+#: ../e-util/filter.error.xml.h:12
+#, fuzzy
+#| msgid "Missing date."
+msgid "Missing condition."
+msgstr "Päiväys puuttuu."
+
+#: ../e-util/filter.error.xml.h:13
+msgid "Filter should have at least one condition."
+msgstr ""
+
+#: ../e-util/filter.error.xml.h:14
+#| msgid "Missing date."
+msgid "Missing value."
+msgstr "Arvo puuttuu."
+
+#: ../e-util/filter.error.xml.h:15
+msgid "One or more values cannot be empty."
+msgstr ""
+
 #. Translators: description of a "popup" action
-#: ../e-util/gal-a11y-e-cell-popup.c:128
+#: ../e-util/gal-a11y-e-cell-popup.c:127
 msgid "popup a child"
 msgstr "Ponnauta lapsi"
 
 #. Translators: description of a "toggle" action
-#: ../e-util/gal-a11y-e-cell-toggle.c:180
+#: ../e-util/gal-a11y-e-cell-toggle.c:179
 msgid "toggle the cell"
 msgstr "Vaihtele solun näkyvyyttä"
 
 #. Translators: description of an "expand" action
-#: ../e-util/gal-a11y-e-cell-tree.c:215
+#: ../e-util/gal-a11y-e-cell-tree.c:213
 msgid "expands the row in the ETree containing this cell"
 msgstr "laajentaa tämän solun sisältävän rivin ETreessä"
 
 #. Translators: description of a "collapse" action
-#: ../e-util/gal-a11y-e-cell-tree.c:223
+#: ../e-util/gal-a11y-e-cell-tree.c:221
 msgid "collapses the row in the ETree containing this cell"
 msgstr "piilota tämän solun sisältävä ETreen rivi"
 
-#: ../e-util/gal-a11y-e-cell.c:123
+#: ../e-util/gal-a11y-e-cell.c:122
 msgid "Table Cell"
 msgstr "Taulukon solu"
 
-#: ../e-util/gal-a11y-e-table-click-to-add.c:72
+#: ../e-util/gal-a11y-e-table-click-to-add.c:71
 msgid "click"
 msgstr "napsauta"
 
-#: ../e-util/gal-a11y-e-table-column-header.c:163
+#: ../e-util/gal-a11y-e-table-column-header.c:162
 msgid "sort"
 msgstr "järjestä"
 
-#: ../e-util/gal-view-instance-save-as-dialog.c:296
+#: ../e-util/gal-view-instance-save-as-dialog.c:295
 msgid "Save Current View"
 msgstr "Tallenna nykyinen näkymä"
 
@@ -11802,12 +12221,10 @@ msgid "Please provide an unique name to identify this signature."
 msgstr "Anna allekirjoitukselle yksikäsitteinen nimi."
 
 #: ../e-util/widgets.error.xml.h:6
-#| msgid "Copy the image to the clipboard"
 msgid "Unable to copy image to clipboard."
 msgstr "Kuvan kopioiminen leikepödälle ei onnistu."
 
 #: ../e-util/widgets.error.xml.h:7
-#| msgid "Unable to save {0}."
 msgid "Unable to save image."
 msgstr "Kuvan tallennus ei onnistu."
 
@@ -11819,86 +12236,85 @@ msgstr "Allekirjoitusta ei voi ladata."
 msgid "Could not save signature."
 msgstr "Allekirjoitusta ei voi tallentaa."
 
-#: ../libemail-engine/camel-sasl-xoauth2.c:27
-#| msgid "OAuth"
+#: ../libemail-engine/camel-sasl-xoauth2.c:26
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: ../libemail-engine/camel-sasl-xoauth2.c:28
+#: ../libemail-engine/camel-sasl-xoauth2.c:27
 msgid "This option will use an OAuth 2.0 access token to connect to the server"
 msgstr ""
 
-#: ../libemail-engine/e-mail-authenticator.c:182
+#: ../libemail-engine/e-mail-authenticator.c:181
 #, fuzzy, c-format
 #| msgid "Invalid authentication"
 msgid "Invalid authentication result code (%d)"
 msgstr "Virheellinen tunnistautuminen"
 
-#: ../libemail-engine/e-mail-folder-utils.c:114
+#: ../libemail-engine/e-mail-folder-utils.c:113
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Tallennetaan viestiä kansioon ”%s”"
 
-#: ../libemail-engine/e-mail-folder-utils.c:572
+#: ../libemail-engine/e-mail-folder-utils.c:571
 msgid "Forwarded messages"
 msgstr "Välitetyt viestit"
 
-#: ../libemail-engine/e-mail-folder-utils.c:682
-#: ../libemail-engine/e-mail-folder-utils.c:933
+#: ../libemail-engine/e-mail-folder-utils.c:681
+#: ../libemail-engine/e-mail-folder-utils.c:932
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Noudetaan %d viesti"
 msgstr[1] "Noudetaan %d viestiä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:776
+#: ../libemail-engine/e-mail-folder-utils.c:775
 msgid "Scanning messages for duplicates"
 msgstr "Etsitään kaksoiskappaleita viesteistä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1184
+#: ../libemail-engine/e-mail-folder-utils.c:1145
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Poistetaan kansiota ”%s”"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1321
+#: ../libemail-engine/e-mail-folder-utils.c:1325
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Tiedosto \"%s\" on poistettu."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1325
+#: ../libemail-engine/e-mail-folder-utils.c:1329
 msgid "File has been removed."
 msgstr "Tiedosto on poistettu."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1384
+#: ../libemail-engine/e-mail-folder-utils.c:1388
 msgid "Removing attachments"
 msgstr "Poistetaan liitteitä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1548
+#: ../libemail-engine/e-mail-folder-utils.c:1552
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Tallennetaan %d viesti"
 msgstr[1] "Tallennetaan %d viestiä"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1926 ../mail/em-folder-utils.c:638
+#: ../libemail-engine/e-mail-folder-utils.c:1930
 #, fuzzy, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Virheellinen kansio: ”%s”"
 
-#: ../libemail-engine/e-mail-session-utils.c:540
+#: ../libemail-engine/e-mail-session-utils.c:539
 #, fuzzy
 #| msgid "No HTML stream available"
 msgid "No mail transport service available"
 msgstr "HTML-virtaa ei ole saatavilla"
 
-#: ../libemail-engine/e-mail-session-utils.c:640
-#: ../libemail-engine/mail-ops.c:730
+#: ../libemail-engine/e-mail-session-utils.c:639
+#: ../libemail-engine/mail-ops.c:707
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Virhe käytettäessä lähtevän postin suodattimia: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:689
-#: ../libemail-engine/mail-ops.c:774
+#: ../libemail-engine/e-mail-session-utils.c:688
+#: ../libemail-engine/mail-ops.c:750
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -11907,67 +12323,67 @@ msgstr ""
 "Kansioon %s lisääminen epäonnistui: %s\n"
 "Lisätään paikalliseen ”Lähetetyt”-kansioon."
 
-#: ../libemail-engine/e-mail-session-utils.c:715
-#: ../libemail-engine/mail-ops.c:798
+#: ../libemail-engine/e-mail-session-utils.c:714
+#: ../libemail-engine/mail-ops.c:774
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Paikalliseen ”Lähetetyt”-kansioon lisääminen epäonnistui: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:916
-#: ../libemail-engine/mail-ops.c:929 ../libemail-engine/mail-ops.c:1031
+#: ../libemail-engine/e-mail-session-utils.c:915
+#: ../libemail-engine/mail-ops.c:906 ../libemail-engine/mail-ops.c:1008
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
-#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:342
-#: ../mail/em-folder-tree-model.c:786
-#: ../modules/mail/e-mail-shell-view-private.c:1076
-#: ../modules/mail/e-mail-shell-view-private.c:1087
+#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:410
+#: ../mail/em-folder-tree-model.c:1160
+#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1071
 msgid "Inbox"
 msgstr "Saapuneet"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:779
-#: ../modules/mail/e-mail-shell-view-private.c:1074
+#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:1153
+#: ../modules/mail/e-mail-shell-view-private.c:1058
 msgid "Drafts"
 msgstr "Luonnokset"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:790
-#: ../modules/mail/e-mail-shell-view-private.c:1078
+#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:1164
+#: ../modules/mail/e-mail-shell-view-private.c:1062
 msgid "Outbox"
 msgstr "Lähtevät"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:794
-#: ../modules/mail/e-mail-shell-view-private.c:1080
+#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:1168
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Sent"
 msgstr "Lähetetyt"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:782
-#: ../modules/mail/e-mail-shell-view-private.c:1082
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:1156
+#: ../modules/mail/e-mail-shell-view-private.c:1066
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1082 ../plugins/templates/templates.c:1381
-#: ../plugins/templates/templates.c:1391
+#: ../plugins/templates/templates.c:1080 ../plugins/templates/templates.c:1379
+#: ../plugins/templates/templates.c:1389
 msgid "Templates"
 msgstr "Pohjat"
 
-#: ../libemail-engine/e-mail-session.c:1347
+#: ../libemail-engine/e-mail-session.c:1245
 #, c-format
 msgid "User cancelled operation"
 msgstr "Käyttäjä perui toimenpiteen"
 
-#: ../libemail-engine/e-mail-session.c:1542
+#: ../libemail-engine/e-mail-session.c:1373
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s-tunnistautuminen epäonnistui"
 
-#: ../libemail-engine/e-mail-session.c:1592
+#: ../libemail-engine/e-mail-session.c:1423
 #, c-format
 msgid "No data source found for UID '%s'"
 msgstr ""
 
-#: ../libemail-engine/e-mail-session.c:1655
+#: ../libemail-engine/e-mail-session.c:1486
 #, fuzzy, c-format
 #| msgid ""
 #| "No destination address provided, forward of the message has been "
@@ -11977,37 +12393,32 @@ msgid ""
 "cancelled."
 msgstr "Kohdeosoitetta ei annettu, viestin edelleenlähetys on peruttu."
 
-#: ../libemail-engine/e-mail-session.c:1668
+#: ../libemail-engine/e-mail-session.c:1499
 #, fuzzy, c-format
 #| msgid "No account found to use, forward of the message has been cancelled."
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "Käytettävää tiliä ei löydy, viestin edelleenlähetys on peruttu."
 
-#: ../libemail-engine/e-mail-store-utils.c:190
+#: ../libemail-engine/e-mail-store-utils.c:189
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Katkaistaan yhteys kohteeseen ”%s”"
 
-#: ../libemail-engine/e-mail-store-utils.c:279
+#: ../libemail-engine/e-mail-store-utils.c:265
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Yhdistetään uudelleen kohteeseen ”%s”"
 
-#: ../libemail-engine/e-mail-store-utils.c:370
+#: ../libemail-engine/e-mail-store-utils.c:350
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Valmistellaan tiliä \"%s\" yhteydettömään tilaan"
 
-#: ../libemail-engine/mail-folder-cache.c:1241
-#, c-format
-msgid "Pinging %s"
-msgstr "Pingataan %s"
-
-#: ../libemail-engine/mail-ops.c:94
+#: ../libemail-engine/mail-ops.c:90
 msgid "Filtering Selected Messages"
 msgstr "Suodatetaan valittuja viestejä"
 
-#: ../libemail-engine/mail-ops.c:152
+#: ../libemail-engine/mail-ops.c:148
 #, c-format
 msgid ""
 "Failed to filter selected messages. One reason can be that folder location "
@@ -12016,13 +12427,12 @@ msgid ""
 "Original error was: %s"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:233
+#: ../libemail-engine/mail-ops.c:229
 #, c-format
-#| msgid "Fetching Mail"
 msgid "Fetching mail from '%s'"
 msgstr "Noudetaan viestejä kohteesta '%s'"
 
-#: ../libemail-engine/mail-ops.c:724
+#: ../libemail-engine/mail-ops.c:701
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -12031,81 +12441,81 @@ msgid ""
 "Original error was: %s"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:940
+#: ../libemail-engine/mail-ops.c:917
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Lähetetään viestiä %d / %d"
 
-#: ../libemail-engine/mail-ops.c:992
+#: ../libemail-engine/mail-ops.c:969
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "Viestin lähetys epäonnistui"
 msgstr[1] "%d viestin %d:stä lähetys epäonnistui"
 
-#: ../libemail-engine/mail-ops.c:998
+#: ../libemail-engine/mail-ops.c:975
 msgid "Canceled."
 msgstr "Peruttu."
 
-#: ../libemail-engine/mail-ops.c:1000
+#: ../libemail-engine/mail-ops.c:977
 msgid "Complete."
 msgstr "Valmis."
 
-#: ../libemail-engine/mail-ops.c:1112
+#: ../libemail-engine/mail-ops.c:1089
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Siirretään viestejä kansioon ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1113
+#: ../libemail-engine/mail-ops.c:1090
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Kopioidaan viestejä kansioon ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1232
+#: ../libemail-engine/mail-ops.c:1209
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Tallennetaan kansiota %s"
 
-#: ../libemail-engine/mail-ops.c:1360
+#: ../libemail-engine/mail-ops.c:1337
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Siivotaan ja tallennetaan tiliä ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1361
+#: ../libemail-engine/mail-ops.c:1338
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Tallennetaan tiliä ”%s”"
 
-#: ../libemail-engine/mail-ops.c:1435
+#: ../libemail-engine/mail-ops.c:1413
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tyhjennetään roskakoria ”%s”"
 
-#: ../libemail-engine/mail-tools.c:71
+#: ../libemail-engine/mail-tools.c:70
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr ""
 
-#: ../libemail-engine/mail-tools.c:111
+#: ../libemail-engine/mail-tools.c:110
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr ""
 
-#: ../libemail-engine/mail-tools.c:237
+#: ../libemail-engine/mail-tools.c:236
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Välitetty viesti - %s"
 
-#: ../libemail-engine/mail-tools.c:239
+#: ../libemail-engine/mail-tools.c:238
 msgid "Forwarded message"
 msgstr "Välitetty viesti"
 
-#: ../libemail-engine/mail-vfolder.c:153
+#: ../libemail-engine/mail-vfolder.c:151
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Määritellään hakunäkymää: %s"
 
-#: ../libemail-engine/mail-vfolder.c:306
+#: ../libemail-engine/mail-vfolder.c:304
 #, c-format
 msgid "Updating Search Folders for '%s' - %s"
 msgstr "Päivitetään hakukansioita - '%s' - %s"
@@ -12115,7 +12525,7 @@ msgstr "Päivitetään hakukansioita - '%s' - %s"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../libemail-engine/mail-vfolder.c:670
+#: ../libemail-engine/mail-vfolder.c:668
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -12133,18 +12543,17 @@ msgstr[1] ""
 "%s on muokattu ottamaan huomioon poistettu kansio \n"
 "”%s”."
 
-#: ../mail/e-mail-account-manager.c:116 ../mail/e-mail-account-manager.c:203
-#| msgid "All Accounts"
+#: ../mail/e-mail-account-manager.c:117 ../mail/e-mail-account-manager.c:204
 msgid "Open _Online Accounts"
 msgstr "Avaa _verkkotilit"
 
-#: ../mail/e-mail-account-manager.c:142 ../mail/e-mail-account-manager.c:229
+#: ../mail/e-mail-account-manager.c:143 ../mail/e-mail-account-manager.c:230
 msgid "This account was created through the Online Accounts service."
 msgstr "Tämä tili luotiin verkkotilipalvelun kautta."
 
 #: ../mail/e-mail-account-manager.c:690
-msgid "_Restore Default"
-msgstr "_Palauta oletus"
+msgid "_Reset Order"
+msgstr ""
 
 #: ../mail/e-mail-account-manager.c:703
 msgid "You can drag and drop account names to reorder them."
@@ -12156,61 +12565,71 @@ msgstr ""
 msgid "De_fault"
 msgstr "_Oletustili"
 
-#: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:443
-#: ../modules/plugin-manager/evolution-plugin-manager.c:359
-#: ../plugins/publish-calendar/publish-calendar.c:890
+#: ../mail/e-mail-account-tree-view.c:84
+#: ../modules/mail/em-composer-prefs.c:1191
+#: ../modules/plugin-manager/evolution-plugin-manager.c:358
+#: ../plugins/publish-calendar/publish-calendar.c:896
 msgid "Enabled"
 msgstr "käytössä"
 
-#: ../mail/e-mail-account-tree-view.c:109
+#: ../mail/e-mail-account-tree-view.c:108
 msgid "Account Name"
 msgstr "Tilin nimi"
 
-#: ../mail/e-mail-account-tree-view.c:136
-#: ../mail/e-mail-config-security-page.c:333
-#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3532
-#: ../mail/mail-config.ui.h:49
+#: ../mail/e-mail-account-tree-view.c:135
+#: ../mail/e-mail-config-security-page.c:335
+#: ../mail/e-mail-config-security-page.c:475 ../mail/e-mail-reader.c:3602
+#: ../mail/mail-config.ui.h:66
 msgid "Default"
 msgstr "Oletukset"
 
-#: ../mail/e-mail-autoconfig.c:578
+#: ../mail/e-mail-autoconfig.c:611
 msgid "No email address provided"
 msgstr "Sähköpostiosoitetta ei annettu."
 
-#: ../mail/e-mail-autoconfig.c:587
-#| msgid "Using email address"
+#: ../mail/e-mail-autoconfig.c:620
 msgid "Missing domain in email address"
 msgstr "Verkkonimi puuttuu sähköpostiosoitteesta"
 
-#: ../mail/e-mail-backend.c:737
+#: ../mail/e-mail-backend.c:841
 msgid "Unknown background operation"
 msgstr "Tuntematon taustatoiminto"
 
-#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:860
-#: ../shell/e-shell-window-actions.c:867 ../shell/e-shell-window-actions.c:874
+#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:904
+#: ../shell/e-shell-window-actions.c:911 ../shell/e-shell-window-actions.c:918
 msgid "Close this window"
 msgstr "Sulje tämä ikkuna"
 
-#: ../mail/e-mail-browser.c:286
+#: ../mail/e-mail-browser.c:285
 msgid "(No Subject)"
 msgstr "(Ei aihetta)"
 
+#. GtkAssistant's back button label.
+#: ../mail/e-mail-config-assistant.c:46
+#| msgid "Go Back"
+msgid "Go _Back"
+msgstr "Siirr_y takaisin"
+
 #. GtkAssistant sinks the floating button reference.
-#: ../mail/e-mail-config-assistant.c:102
+#: ../mail/e-mail-config-assistant.c:114
 msgid "_Skip Lookup"
 msgstr "_Ohita haku"
 
-#: ../mail/e-mail-config-assistant.c:562
+#: ../mail/e-mail-config-assistant.c:654
 msgid "Evolution Account Assistant"
 msgstr "Evolutionin sähköpostitilien apulainen"
 
-#: ../mail/e-mail-config-auth-check.c:352
-#| msgid "Ch_eck for Supported Types"
+#: ../mail/e-mail-config-assistant.c:936
+#, fuzzy
+#| msgid "_Restore Defaults"
+msgid "_Revise Details"
+msgstr "_Palauta oletukset"
+
+#: ../mail/e-mail-config-auth-check.c:350
 msgid "Check for Supported Types"
 msgstr "Tarkista tuetut tyypit"
 
-#: ../mail/e-mail-config-confirm-page.c:157
+#: ../mail/e-mail-config-confirm-page.c:156
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12224,96 +12643,93 @@ msgstr ""
 "\n"
 "Tallenna asetuksesi napsauttamalla painiketta \"Toteuta\"."
 
-#: ../mail/e-mail-config-confirm-page.c:169
+#: ../mail/e-mail-config-confirm-page.c:168
 msgid "Done"
 msgstr "Valmis"
 
-#: ../mail/e-mail-config-defaults-page.c:552
+#: ../mail/e-mail-config-defaults-page.c:549
 msgid "Special Folders"
 msgstr "Erikoiskansiot"
 
-#: ../mail/e-mail-config-defaults-page.c:561
+#: ../mail/e-mail-config-defaults-page.c:558
 msgid "Draft Messages _Folder:"
 msgstr "Luonnosviestin _kansio:"
 
-#: ../mail/e-mail-config-defaults-page.c:571
-#| msgid "Choose folders to post the message to."
+#: ../mail/e-mail-config-defaults-page.c:568
 msgid "Choose a folder for saving draft messages."
 msgstr "Valitse tallennuskansio luonnosviesteille."
 
-#: ../mail/e-mail-config-defaults-page.c:585
+#: ../mail/e-mail-config-defaults-page.c:582
 msgid "Sent _Messages Folder:"
 msgstr "Lähetettyjen _viestien kansio:"
 
-#: ../mail/e-mail-config-defaults-page.c:595
-#| msgid "Choose folders to post the message to."
+#: ../mail/e-mail-config-defaults-page.c:592
 msgid "Choose a folder for saving sent messages."
 msgstr "Valitse tallennuskansio lähetetyille viesteille."
 
-#: ../mail/e-mail-config-defaults-page.c:614
+#: ../mail/e-mail-config-defaults-page.c:611
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:631
+#: ../mail/e-mail-config-defaults-page.c:628
 msgid "_Restore Defaults"
 msgstr "_Palauta oletukset"
 
-#: ../mail/e-mail-config-defaults-page.c:645
+#: ../mail/e-mail-config-defaults-page.c:642
 msgid "Use a Real Folder for _Trash:"
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:646
-#| msgid "Choose folders to post the message to."
+#: ../mail/e-mail-config-defaults-page.c:643
 msgid "Choose a folder for deleted messages."
 msgstr "Valitse kansio poistetuille viesteille."
 
-#: ../mail/e-mail-config-defaults-page.c:655
+#: ../mail/e-mail-config-defaults-page.c:652
 msgid "Use a Real Folder for _Junk:"
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:656
+#: ../mail/e-mail-config-defaults-page.c:653
 #, fuzzy
 #| msgid "Choose folders to post the message to."
 msgid "Choose a folder for junk messages."
 msgstr "Valitse kansio johon viesti postitetaan:"
 
-#: ../mail/e-mail-config-defaults-page.c:673
+#: ../mail/e-mail-config-defaults-page.c:670
 msgid "Composing Messages"
 msgstr "Viestien kirjoittaminen"
 
-#: ../mail/e-mail-config-defaults-page.c:682
+#: ../mail/e-mail-config-defaults-page.c:679
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Lähetä aina kopio (Cc) osoitteeseen:"
 
-#: ../mail/e-mail-config-defaults-page.c:707
+#: ../mail/e-mail-config-defaults-page.c:704
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Lähetä aina _piilotettu kopio (Bcc) osoitteeseen:"
 
-#: ../mail/e-mail-config-defaults-page.c:742
+#: ../mail/e-mail-config-defaults-page.c:739
 msgid "Message Receipts"
 msgstr "Viestin kuittaukset"
 
-#: ../mail/e-mail-config-defaults-page.c:751
+#: ../mail/e-mail-config-defaults-page.c:748
 msgid "S_end message receipts:"
 msgstr "Läh_etä viestin kuittaus:"
 
-#: ../mail/e-mail-config-defaults-page.c:776
+#: ../mail/e-mail-config-defaults-page.c:773
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: ../mail/e-mail-config-defaults-page.c:782
+#: ../mail/e-mail-config-defaults-page.c:779
 msgid "Always"
 msgstr "Aina"
 
-#: ../mail/e-mail-config-defaults-page.c:788
+#: ../mail/e-mail-config-defaults-page.c:785
 msgid "Ask for each message"
 msgstr "Kysy jokaisen viestin osalta"
 
-#: ../mail/e-mail-config-defaults-page.c:859
+#: ../mail/e-mail-config-defaults-page.c:856
 msgid "Defaults"
 msgstr "Oletusasetukset"
 
-#: ../mail/e-mail-config-identity-page.c:266
+#: ../mail/e-mail-config-identity-page.c:265
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12323,16 +12739,13 @@ msgstr ""
 "tiedot eivät ole pakollisia, mutta täyttämällä kyseiset kentät voit lisätä "
 "tiedot lähettämiisi sähköpostiviesteihin."
 
-#: ../mail/e-mail-config-identity-page.c:294
-#: ../mail/e-mail-config-summary-page.c:324
+#: ../mail/e-mail-config-identity-page.c:293
+#: ../mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
 msgstr "Tilitiedot"
 
-#: ../mail/e-mail-config-identity-page.c:303
-#: ../mail/e-mail-config-summary-page.c:333
-#| msgid ""
-#| "Type the name by which you would like to refer to this account.\n"
-#| "For example: \"Work\" or \"Personal\""
+#: ../mail/e-mail-config-identity-page.c:302
+#: ../mail/e-mail-config-summary-page.c:332
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example, \"Work\" or \"Personal\"."
@@ -12340,19 +12753,19 @@ msgstr ""
 "Anna nimi, jolla haluat kutsua tätä sähköpostitiliä.\n"
 "Esimerkiksi \"Työ\" tai \"Henkilökohtainen\""
 
-#: ../mail/e-mail-config-identity-page.c:348
+#: ../mail/e-mail-config-identity-page.c:347
 msgid "Required Information"
 msgstr "Pakolliset tiedot"
 
-#: ../mail/e-mail-config-identity-page.c:357
+#: ../mail/e-mail-config-identity-page.c:356
 msgid "Full Nam_e:"
 msgstr "_Koko nimi:"
 
-#: ../mail/e-mail-config-identity-page.c:384
+#: ../mail/e-mail-config-identity-page.c:383
 msgid "Email _Address:"
 msgstr "Sähköposti_osoite:"
 
-#: ../mail/e-mail-config-identity-page.c:431
+#: ../mail/e-mail-config-identity-page.c:430
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Valinnaiset tiedot"
@@ -12369,187 +12782,191 @@ msgstr "Organi_saatio:"
 msgid "Add Ne_w Signature..."
 msgstr "Lisää uusi _allekirjoitus..."
 
-#: ../mail/e-mail-config-lookup-page.c:68
+#: ../mail/e-mail-config-lookup-page.c:67
 msgid "Looking up account details..."
 msgstr "Etsitään tilin tietoja..."
 
-#: ../mail/e-mail-config-provider-page.c:485
+#: ../mail/e-mail-config-provider-page.c:484
 msgid "Checking for New Mail"
 msgstr "Tarkistetaan uusia viestejä"
 
-#: ../mail/e-mail-config-provider-page.c:501
+#: ../mail/e-mail-config-provider-page.c:500
 msgid "Check for _new messages every"
 msgstr "T_arkista uudet viestit joka"
 
-#: ../mail/e-mail-config-provider-page.c:700
+#: ../mail/e-mail-config-provider-page.c:699
 msgid "Receiving Options"
 msgstr "Vastaanottoasetukset"
 
-#: ../mail/e-mail-config-receiving-page.c:50
+#: ../mail/e-mail-config-receiving-page.c:49
 msgid "Receiving Email"
 msgstr "Vastaanotto"
 
 #: ../mail/e-mail-config-security-page.c:260
-#: ../mail/em-folder-properties.c:266 ../mail/mail-config.ui.h:24
-#: ../modules/addressbook/autocompletion-config.c:114
+#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:26
+#: ../modules/addressbook/autocompletion-config.c:113
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
-#: ../modules/itip-formatter/plugin/config-ui.c:91
+#: ../modules/itip-formatter/plugin/config-ui.c:90
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
-#: ../smime/gui/certificate-viewer.c:653
 msgid "General"
 msgstr "Yleiset"
 
-#: ../mail/e-mail-config-security-page.c:268
+#: ../mail/e-mail-config-security-page.c:269
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Älä allekirjoita kokouskutsuja (Outlook-yhteensopivuus)"
 
-#: ../mail/e-mail-config-security-page.c:290
+#: ../mail/e-mail-config-security-page.c:291
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "Pretty Good Privacy (OpenPGP) -salaus"
 
-#: ../mail/e-mail-config-security-page.c:298
+#: ../mail/e-mail-config-security-page.c:300
 msgid "OpenPGP _Key ID:"
 msgstr "OpenPGP_-avaimen ID:"
 
-#: ../mail/e-mail-config-security-page.c:320
+#: ../mail/e-mail-config-security-page.c:322
 msgid "Si_gning algorithm:"
 msgstr "_Allekirjoitusalgoritmi:"
 
-#: ../mail/e-mail-config-security-page.c:336
-#: ../mail/e-mail-config-security-page.c:475 ../mail/mail-config.ui.h:50
+#: ../mail/e-mail-config-security-page.c:338
+#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:67
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/e-mail-config-security-page.c:339
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:51
+#: ../mail/e-mail-config-security-page.c:341
+#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:68
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/e-mail-config-security-page.c:342
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:52
+#: ../mail/e-mail-config-security-page.c:344
+#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:69
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/e-mail-config-security-page.c:345
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:53
+#: ../mail/e-mail-config-security-page.c:347
+#: ../mail/e-mail-config-security-page.c:487 ../mail/mail-config.ui.h:70
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/e-mail-config-security-page.c:361
+#: ../mail/e-mail-config-security-page.c:363
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Allekirjoita _aina lähtevät viestit käytettäessä tätä sähköpostitiliä"
 
-#: ../mail/e-mail-config-security-page.c:373
+#: ../mail/e-mail-config-security-page.c:375
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Salaa _aina myös itselle lähetettäessä salattu viesti"
 
-#: ../mail/e-mail-config-security-page.c:385
+#: ../mail/e-mail-config-security-page.c:387
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "_Luota salattaessa aina avaimiin avainrenkaassani"
 
-#: ../mail/e-mail-config-security-page.c:409
+#: ../mail/e-mail-config-security-page.c:411
 msgid "Secure MIME (S/MIME)"
 msgstr "Suojattu MIME (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:417
+#: ../mail/e-mail-config-security-page.c:420
 msgid "Sig_ning certificate:"
 msgstr "_Allekirjoitusvarmenne:"
 
-#: ../mail/e-mail-config-security-page.c:441
-#: ../mail/e-mail-config-security-page.c:547
+#: ../mail/e-mail-config-security-page.c:444
+#: ../mail/e-mail-config-security-page.c:550
 msgid "Select"
 msgstr "Valitse"
 
-#: ../mail/e-mail-config-security-page.c:459
+#: ../mail/e-mail-config-security-page.c:453
+#: ../mail/e-mail-config-security-page.c:559 ../mail/mail-dialogs.ui.h:5
+#: ../shell/e-shell-window-actions.c:1007
+#| msgid "Clea_r"
+msgid "_Clear"
+msgstr "_Tyhjennä"
+
+#: ../mail/e-mail-config-security-page.c:462
 msgid "Signing _algorithm:"
 msgstr "Allekirjoitus_algoritmi:"
 
-#: ../mail/e-mail-config-security-page.c:500
-#| msgid "Al_ways sign outgoing messages when using this account"
+#: ../mail/e-mail-config-security-page.c:503
 msgid "Always sign outgoing messages when using this account"
 msgstr "Allekirjoita aina lähtevät viestit käytettäessä tätä tiliä"
 
-#: ../mail/e-mail-config-security-page.c:523
+#: ../mail/e-mail-config-security-page.c:526
 msgid "Encryption certificate:"
 msgstr "Salausvarmenne:"
 
-#: ../mail/e-mail-config-security-page.c:565
-#| msgid "Al_ways sign outgoing messages when using this account"
+#: ../mail/e-mail-config-security-page.c:568
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "Salaa aina lähtevät viestit käytettäessä tätä tiliä"
 
-#: ../mail/e-mail-config-security-page.c:585
+#: ../mail/e-mail-config-security-page.c:588
 #, fuzzy
 #| msgid "Always encrypt to _myself when sending encrypted messages"
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "Salaa _aina myös itselle lähetettäessä salattu viesti"
 
-#: ../mail/e-mail-config-sending-page.c:50
+#: ../mail/e-mail-config-sending-page.c:49
 msgid "Sending Email"
 msgstr "Lähetys"
 
-#: ../mail/e-mail-config-service-page.c:640
+#: ../mail/e-mail-config-service-page.c:639
 msgid "Server _Type:"
 msgstr "_Palvelintyyppi:"
 
-#: ../mail/e-mail-config-summary-page.c:142
+#: ../mail/e-mail-config-summary-page.c:141
 msgid "SSL"
 msgstr "SSL"
 
-#: ../mail/e-mail-config-summary-page.c:145
+#: ../mail/e-mail-config-summary-page.c:144
 msgid "TLS"
 msgstr "TLS"
 
-#: ../mail/e-mail-config-summary-page.c:307
+#: ../mail/e-mail-config-summary-page.c:306
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr ""
 "Alla on yhteenveto asetuksista, joiden avulla otetaan yhteys "
 "sähköpostitiliisi."
 
-#: ../mail/e-mail-config-summary-page.c:372
+#: ../mail/e-mail-config-summary-page.c:371
 msgid "Personal Details"
 msgstr "Henkilökohtaiset tiedot"
 
-#: ../mail/e-mail-config-summary-page.c:381
+#: ../mail/e-mail-config-summary-page.c:380
 msgid "Full Name:"
 msgstr "Koko nimi:"
 
-#: ../mail/e-mail-config-summary-page.c:395
+#: ../mail/e-mail-config-summary-page.c:394
 msgid "Email Address:"
 msgstr "Sähköpostiosoite:"
 
-#: ../mail/e-mail-config-summary-page.c:409
+#: ../mail/e-mail-config-summary-page.c:408
 msgid "Receiving"
 msgstr "Vastaanotto"
 
-#: ../mail/e-mail-config-summary-page.c:421
+#: ../mail/e-mail-config-summary-page.c:420
 msgid "Sending"
 msgstr "Lähetys"
 
-#: ../mail/e-mail-config-summary-page.c:433
+#: ../mail/e-mail-config-summary-page.c:432
 msgid "Server Type:"
 msgstr "Palvelintyyppi:"
 
-#: ../mail/e-mail-config-summary-page.c:454
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
+#: ../mail/e-mail-config-summary-page.c:453
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: ../mail/e-mail-config-summary-page.c:475
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:697
+#: ../mail/e-mail-config-summary-page.c:474
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:696
 msgid "Username:"
 msgstr "Käyttäjätunnus:"
 
-#: ../mail/e-mail-config-summary-page.c:496
+#: ../mail/e-mail-config-summary-page.c:495
 msgid "Security:"
 msgstr "Salaus:"
 
-#: ../mail/e-mail-config-summary-page.c:787
+#: ../mail/e-mail-config-summary-page.c:786
 msgid "Account Summary"
 msgstr "Tilin yhteenveto"
 
-#: ../mail/e-mail-config-welcome-page.c:157
+#: ../mail/e-mail-config-welcome-page.c:156
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12559,83 +12976,83 @@ msgstr ""
 "\n"
 "Aloita napsauttamalla \"Jatka\"."
 
-#: ../mail/e-mail-config-welcome-page.c:167
-#: ../modules/startup-wizard/e-startup-assistant.c:152
+#: ../mail/e-mail-config-welcome-page.c:166
+#: ../modules/startup-wizard/e-startup-assistant.c:151
 msgid "Welcome"
 msgstr "Tervetuloa"
 
-#: ../mail/e-mail-config-window.c:327
+#: ../mail/e-mail-config-window.c:326
 msgid "Account Editor"
 msgstr "Tilimuokkain"
 
-#: ../mail/e-mail-display.c:96
+#: ../mail/e-mail-display.c:95
 msgid "_Add to Address Book..."
 msgstr "_Lisää osoitekirjaan..."
 
-#: ../mail/e-mail-display.c:103
+#: ../mail/e-mail-display.c:102
 msgid "_To This Address"
 msgstr "_Tähän osoitteeseen"
 
-#: ../mail/e-mail-display.c:110
+#: ../mail/e-mail-display.c:109
 msgid "_From This Address"
 msgstr "_Tästä osoitteesta"
 
-#: ../mail/e-mail-display.c:117
+#: ../mail/e-mail-display.c:116
 msgid "Send _Reply To..."
 msgstr "Lähetä _vastaus osoitteeseen..."
 
-#: ../mail/e-mail-display.c:119
+#: ../mail/e-mail-display.c:118
 msgid "Send a reply message to this address"
 msgstr "Lähetä vastausviesti tähän osoitteeseen"
 
-#: ../mail/e-mail-display.c:126
+#: ../mail/e-mail-display.c:125
 msgid "Create Search _Folder"
 msgstr "Luo _hakunäkymä"
 
 #. Label + combo box has a 12px left margin so it's
 #. * aligned with the junk mail options above it.
-#: ../mail/e-mail-junk-options.c:252
+#: ../mail/e-mail-junk-options.c:297
 msgid "Junk filtering software:"
 msgstr ""
 
-#: ../mail/e-mail-label-dialog.c:225
+#: ../mail/e-mail-label-dialog.c:224
 msgid "_Label name:"
 msgstr "_Otsakkeen nimi:"
 
-#: ../mail/e-mail-label-list-store.c:57
+#: ../mail/e-mail-label-list-store.c:56
 msgid "I_mportant"
 msgstr "Tärk_eä"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:58
+#: ../mail/e-mail-label-list-store.c:57
 msgid "_Work"
 msgstr "_Työ"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:59
+#: ../mail/e-mail-label-list-store.c:58
 msgid "_Personal"
 msgstr "_Henkilökohtainen"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:60
+#: ../mail/e-mail-label-list-store.c:59
 msgid "_To Do"
 msgstr "Te_htävää"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:61
+#: ../mail/e-mail-label-list-store.c:60
 msgid "_Later"
 msgstr "_Myöhemmin"
 
-#: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:1025
+#: ../mail/e-mail-label-manager.c:171
+#: ../modules/mail/e-mail-shell-view-actions.c:1028
 msgid "Add Label"
 msgstr "Lisää merkintä"
 
-#: ../mail/e-mail-label-manager.c:221
+#: ../mail/e-mail-label-manager.c:222
 msgid "Edit Label"
 msgstr "Muokkaa merkintää"
 
-#: ../mail/e-mail-label-manager.c:353
+#: ../mail/e-mail-label-manager.c:354
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -12643,653 +13060,644 @@ msgstr ""
 "Huomautus: Alaviivaa merkinnän nimessä käytetään\n"
 "valikon pikavalintana."
 
-#: ../mail/e-mail-label-tree-view.c:89
+#: ../mail/e-mail-label-tree-view.c:88
 msgid "Color"
 msgstr "Väri"
 
-#: ../mail/e-mail-print-config-headers.c:167
+#: ../mail/e-mail-print-config-headers.c:166
 #, fuzzy
 #| msgid "Move selected messages to another folder"
 msgid "Move selected headers to top"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../mail/e-mail-print-config-headers.c:172
+#: ../mail/e-mail-print-config-headers.c:171
 #, fuzzy
 #| msgid "Move selected messages to another folder"
 msgid "Move selected headers up one row"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../mail/e-mail-print-config-headers.c:177
+#: ../mail/e-mail-print-config-headers.c:176
 #, fuzzy
 #| msgid "Move selected messages to another folder"
 msgid "Move selected headers down one row"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../mail/e-mail-print-config-headers.c:182
+#: ../mail/e-mail-print-config-headers.c:181
 #, fuzzy
 #| msgid "Move selected messages to another folder"
 msgid "Move selected headers to bottom"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../mail/e-mail-print-config-headers.c:187
-#| msgid "Select all text"
+#: ../mail/e-mail-print-config-headers.c:186
 msgid "Select all headers"
 msgstr "Valitse kaikki otsakkeet"
 
-#: ../mail/e-mail-print-config-headers.c:206
+#: ../mail/e-mail-print-config-headers.c:205
 msgid "Header Name"
 msgstr "Otsakkeen nimi"
 
-#: ../mail/e-mail-print-config-headers.c:215
+#: ../mail/e-mail-print-config-headers.c:214
 msgid "Header Value"
 msgstr "Otsakkeen arvo"
 
-#: ../mail/e-mail-printer.c:125 ../mail/mail-config.ui.h:101
+#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:106
 msgid "Headers"
 msgstr "Otsakkeet"
 
-#: ../mail/e-mail-printer.c:167
+#: ../mail/e-mail-printer.c:166
 #, c-format
 msgid "Page %d of %d"
 msgstr "Sivu  %d / %d"
 
-#: ../mail/e-mail-reader.c:346 ../mail/em-filter-i18n.h:12
+#: ../mail/e-mail-reader.c:348 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: ../mail/e-mail-reader.c:346 ../mail/em-folder-utils.c:517
+#: ../mail/e-mail-reader.c:348 ../mail/em-folder-utils.c:505
 msgid "C_opy"
 msgstr "_Kopioi"
 
-#: ../mail/e-mail-reader.c:846 ../mail/em-filter-i18n.h:54
+#: ../mail/e-mail-reader.c:848 ../mail/em-filter-i18n.h:33
 msgid "Move to Folder"
 msgstr "Siirrä kansioon"
 
-#: ../mail/e-mail-reader.c:846 ../mail/em-folder-utils.c:517
+#: ../mail/e-mail-reader.c:848 ../mail/em-folder-utils.c:505
 msgid "_Move"
 msgstr "_Siirrä"
 
-#: ../mail/e-mail-reader.c:1172 ../mail/e-mail-reader.c:1384
-#: ../mail/e-mail-reader.c:1424
+#: ../mail/e-mail-reader.c:1174 ../mail/e-mail-reader.c:1386
+#: ../mail/e-mail-reader.c:1426
 msgid "_Do not ask me again."
 msgstr "_Älä kysy uudestaan."
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1432
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Älä koskaan huomioi postituslistojen Reply-To-otsaketta."
 
-#: ../mail/e-mail-reader.c:1632
+#: ../mail/e-mail-reader.c:1634
 msgid "Failed to retrieve message:"
 msgstr "Viestin nouto epäonnistui:"
 
-#: ../mail/e-mail-reader.c:1672 ../mail/e-mail-reader.c:2774
+#: ../mail/e-mail-reader.c:1674 ../mail/e-mail-reader.c:2843
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Noudetaan viestiä ”%s”"
 
-#: ../mail/e-mail-reader.c:1860
+#: ../mail/e-mail-reader.c:1862
 msgid "A_dd Sender to Address Book"
 msgstr "_Lisää lähettäjä osoitekirjaan"
 
-#: ../mail/e-mail-reader.c:1862
+#: ../mail/e-mail-reader.c:1864
 msgid "Add sender to address book"
 msgstr "Lisää lähettäjä osoitekirjaan"
 
-#: ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1869
 msgid "Check for _Junk"
 msgstr "Etsi _roskapostia"
 
-#: ../mail/e-mail-reader.c:1869
+#: ../mail/e-mail-reader.c:1871
 msgid "Filter the selected messages for junk status"
 msgstr "Suodata valitut viestit roskapostiksi"
 
-#: ../mail/e-mail-reader.c:1874
+#: ../mail/e-mail-reader.c:1876
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1878
 msgid "Copy selected messages to another folder"
 msgstr "Kopioi valitut viestit uuteen kansioon"
 
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1883
 msgid "_Delete Message"
 msgstr "Poista _viesti"
 
-#: ../mail/e-mail-reader.c:1883
+#: ../mail/e-mail-reader.c:1885
 msgid "Mark the selected messages for deletion"
 msgstr "Merkitse valitut viestit poistettaviksi"
 
-#: ../mail/e-mail-reader.c:1888
-#| msgid "Filter on Mailing _List..."
+#: ../mail/e-mail-reader.c:1890
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Luo suodatussääntö postitus_listan mukaan..."
 
-#: ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:1892
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Luo sääntö, jolla suodatetaan viestejä tälle postilistalle"
 
-#: ../mail/e-mail-reader.c:1895
-#| msgid "Filter on _Recipients..."
+#: ../mail/e-mail-reader.c:1897
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Luo suodatussääntö _vastaanottajien mukaan..."
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1899
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Luo sääntö, jolla suodatetaan viestejä näille vastaanottajille"
 
-#: ../mail/e-mail-reader.c:1902
-#| msgid "Filter on Se_nder..."
+#: ../mail/e-mail-reader.c:1904
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Luo suodatussääntö _lähettäjän mukaan..."
 
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:1906
 msgid "Create a rule to filter messages from this sender"
 msgstr "Luo sääntö, jolla suodatetaan viestejä tältä lähettäjältä"
 
-#: ../mail/e-mail-reader.c:1909
-#| msgid "Filter on _Subject..."
+#: ../mail/e-mail-reader.c:1911
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Luo suodatusääntö _aiheen mukaan..."
 
-#: ../mail/e-mail-reader.c:1911
+#: ../mail/e-mail-reader.c:1913
 msgid "Create a rule to filter messages with this subject"
 msgstr "Luo sääntö, jolla suodatetaan viestejä tämän otsikon perusteella"
 
-#: ../mail/e-mail-reader.c:1916
+#: ../mail/e-mail-reader.c:1918
 msgid "A_pply Filters"
 msgstr "_Toteuta suodattimet"
 
-#: ../mail/e-mail-reader.c:1918
+#: ../mail/e-mail-reader.c:1920
 msgid "Apply filter rules to the selected messages"
 msgstr "Suodata valitut viestit suodatinsäännöillä"
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:1925
 msgid "_Find in Message..."
 msgstr "_Etsi viestistä..."
 
-#: ../mail/e-mail-reader.c:1925
+#: ../mail/e-mail-reader.c:1927
 msgid "Search for text in the body of the displayed message"
 msgstr "Etsiä tekstiä näytetyn viestin rungosta"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:1932
 msgid "_Clear Flag"
 msgstr "_Poista merkki"
 
-#: ../mail/e-mail-reader.c:1932
+#: ../mail/e-mail-reader.c:1934
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Poista vastausmerkintä valituista viesteistä"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:1939
 msgid "_Flag Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:1941
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Merkitse valittujen viestien vastausmerkintä valmiiksi"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:1946
 msgid "Follow _Up..."
 msgstr "_Vastaa viestiin..."
 
-#: ../mail/e-mail-reader.c:1946
+#: ../mail/e-mail-reader.c:1948
 msgid "Flag the selected messages for follow-up"
 msgstr "Merkitse valitut viestit vastattaviksi"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:1953
 msgid "_Attached"
 msgstr "_Liitetty"
 
-#: ../mail/e-mail-reader.c:1953 ../mail/e-mail-reader.c:1960
+#: ../mail/e-mail-reader.c:1955 ../mail/e-mail-reader.c:1962
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Välitä edelleen valitut viestit liitteenä"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:1960
 msgid "Forward As _Attached"
 msgstr "Välitä _liitteenä"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:1967
 msgid "_Inline"
 msgstr "S_isäkkäisesti"
 
-#: ../mail/e-mail-reader.c:1967 ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:1969 ../mail/e-mail-reader.c:1976
 msgid "Forward the selected message in the body of a new message"
 msgstr "Välitä edelleen valitut viestit uuden viestin rungossa"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:1974
 msgid "Forward As _Inline"
 msgstr "Välitä _rungossa"
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:1981
 msgid "_Quoted"
 msgstr "_Lainattuna"
 
-#: ../mail/e-mail-reader.c:1981 ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:1983 ../mail/e-mail-reader.c:1990
 msgid "Forward the selected message quoted like a reply"
 msgstr "Välitä edelleen valitut viestit lainattuna vastauksen tapaan"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:1988
 msgid "Forward As _Quoted"
 msgstr "Välitä _lainattuna"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:1995
 msgid "_Load Images"
 msgstr "_Lataa kuvat"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:1997
 msgid "Force images in HTML mail to be loaded"
 msgstr "Pakota HTML-viestissä olevien kuvien lataus"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2002
 msgid "_Important"
 msgstr "_Tärkeä"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2004
 msgid "Mark the selected messages as important"
 msgstr "Merkitse valitut viestit tärkeiksi"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2009
 msgid "_Junk"
 msgstr "_Roskapostia"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:2011
 msgid "Mark the selected messages as junk"
 msgstr "Merkitse valitut viestit roskapostiksi"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2016
 msgid "_Not Junk"
 msgstr "_Ei roskapostia"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:2018
 msgid "Mark the selected messages as not being junk"
 msgstr "Merkitse valitut viestit ei-roskapostiksi"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2023
 msgid "_Read"
 msgstr "_Luettu"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:2025
 msgid "Mark the selected messages as having been read"
 msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2030
 msgid "Uni_mportant"
 msgstr "Sa_mantekevä"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:2032
 msgid "Mark the selected messages as unimportant"
 msgstr "Merkitse valitut viestit samantekeviksi"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2037
 msgid "_Unread"
 msgstr "L_ukematon"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2039
 msgid "Mark the selected messages as not having been read"
 msgstr "Merkitse valitut viestit lukemattomiksi"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2044
 msgid "_Edit as New Message..."
 msgstr "_Muokkaa uutena viestinä..."
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2046
 msgid "Open the selected messages in the composer for editing"
 msgstr "Avaa valitut viestit muokkaimessa"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2051
 msgid "Compose _New Message"
 msgstr "Kirjoita _uusi viesti"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:2053
 msgid "Open a window for composing a mail message"
 msgstr "Luo uusi ikkuna sähköpostin kirjoitusikkuna"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2058
 msgid "_Open in New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2060
 msgid "Open the selected messages in a new window"
 msgstr "Avaa valitut viestit uudessa ikkunassa"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2065
 msgid "_Move to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2067
 msgid "Move selected messages to another folder"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2072
 msgid "_Next Message"
 msgstr "_Seuraava viesti"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2074
 msgid "Display the next message"
 msgstr "Näytä seuraava viesti"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2079
 msgid "Next _Important Message"
 msgstr "Seuraava _tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2081
 msgid "Display the next important message"
 msgstr "Näytä seuraava tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2086
 msgid "Next _Thread"
 msgstr "Seuraava _säie"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:2088
 msgid "Display the next thread"
 msgstr "Näytä seuraava säie"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2093
 msgid "Next _Unread Message"
 msgstr "Seuraava _lukematon viesti"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2095
 msgid "Display the next unread message"
 msgstr "Näytä seuraava lukematon viesti"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2100
 msgid "_Previous Message"
 msgstr "_Edellinen viesti"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:2102
 msgid "Display the previous message"
 msgstr "Näytä edellinen viesti"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2107
 msgid "Pr_evious Important Message"
 msgstr "E_dellinen tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2109
 msgid "Display the previous important message"
 msgstr "Näytä edellinen tärkeä viesti"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2114
 msgid "Previous T_hread"
 msgstr "_Edellinen säie"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2116
 msgid "Display the previous thread"
 msgstr "Näytä edellinen säie"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2121
 msgid "P_revious Unread Message"
 msgstr "_Edellinen lukematon viesti"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2123
 msgid "Display the previous unread message"
 msgstr "Näytä edellinen lukematon viesti"
 
-#: ../mail/e-mail-reader.c:2128
+#: ../mail/e-mail-reader.c:2130
 msgid "Print this message"
 msgstr "Tulosta tämä viesti"
 
-#: ../mail/e-mail-reader.c:2135
+#: ../mail/e-mail-reader.c:2137
 msgid "Preview the message to be printed"
 msgstr "Esikatsele tulostettavaa viestiä"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2142
 msgid "Re_direct"
 msgstr "_Uudelleenohjaa"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2144
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Uudelleenohjaa (siirrä) valitut viestit jollekulle"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2149
 msgid "Remo_ve Attachments"
 msgstr "Poista liittee_t"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2151
 msgid "Remove attachments"
 msgstr "Poista liitteet"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2156
 msgid "Remove Du_plicate Messages"
 msgstr "Poista viestin _kaksoiskappaleet"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2158
 msgid "Checks selected messages for duplicates"
 msgstr "Etsii valituista viesteistä kaksoiskappaleita"
 
-#: ../mail/e-mail-reader.c:2161 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1547
-#: ../modules/mail/e-mail-attachment-handler.c:214
+#: ../mail/e-mail-reader.c:2163 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1546
+#: ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: ../mail/e-mail-reader.c:2163
+#: ../mail/e-mail-reader.c:2165
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Kirjoita vastaus kaikille valitun viestin vastaanottajille"
 
-#: ../mail/e-mail-reader.c:2168 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2170 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: ../mail/e-mail-reader.c:2170
+#: ../mail/e-mail-reader.c:2172
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Kirjoita vastaus valitussa viestissä olevalle sähköpostilistalle"
 
-#: ../mail/e-mail-reader.c:2175
-#: ../modules/mail/e-mail-attachment-handler.c:221
+#: ../mail/e-mail-reader.c:2177
+#: ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: ../mail/e-mail-reader.c:2177
+#: ../mail/e-mail-reader.c:2179
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Vastaa valitun viestin lähettäjälle"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2184
 msgid "_Save as mbox..."
 msgstr "_Tallenna mbox-muodossa..."
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2186
 msgid "Save selected messages as an mbox file"
 msgstr "Tallenna valitut viestit mbox-tiedostona"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2191
 msgid "_Message Source"
 msgstr "_Viestin lähdekoodi"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2193
 msgid "Show the raw email source of the message"
 msgstr "Näytä viestin raakatekstimuotoinen lähdekoodi"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2205
 msgid "_Undelete Message"
 msgstr "_Palauta viesti"
 
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2207
 msgid "Undelete the selected messages"
 msgstr "Palauta valitut viestit"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2212
 msgid "_Normal Size"
 msgstr "_Normaali koko"
 
-#: ../mail/e-mail-reader.c:2212
+#: ../mail/e-mail-reader.c:2214
 msgid "Reset the text to its original size"
 msgstr "Palauta teksti alkuperäisen kokoiseksi"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2219
 msgid "_Zoom In"
 msgstr "Lä_hennä"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2221
 msgid "Increase the text size"
 msgstr "Kasvata tekstin kokoa"
 
-#: ../mail/e-mail-reader.c:2224
-msgid "Zoom _Out"
-msgstr "L_oitonna"
-
-#: ../mail/e-mail-reader.c:2226
+#: ../mail/e-mail-reader.c:2228
 msgid "Decrease the text size"
 msgstr "Pienennä tekstin kokoa"
 
-#: ../mail/e-mail-reader.c:2233
+#: ../mail/e-mail-reader.c:2235
 msgid "Cre_ate"
 msgstr "_Luo"
 
-#: ../mail/e-mail-reader.c:2240
+#: ../mail/e-mail-reader.c:2242
 msgid "Ch_aracter Encoding"
 msgstr "Merkistön _koodaus"
 
-#: ../mail/e-mail-reader.c:2247
+#: ../mail/e-mail-reader.c:2249
 msgid "F_orward As"
 msgstr "_Välitä muodossa"
 
-#: ../mail/e-mail-reader.c:2254
+#: ../mail/e-mail-reader.c:2256
 msgid "_Group Reply"
 msgstr "_Vastaa ryhmälle"
 
-#: ../mail/e-mail-reader.c:2261
+#: ../mail/e-mail-reader.c:2263
 msgid "_Go To"
 msgstr "_Siirry"
 
-#: ../mail/e-mail-reader.c:2268
+#: ../mail/e-mail-reader.c:2270
 msgid "Mar_k As"
 msgstr "Mer_kitse"
 
-#: ../mail/e-mail-reader.c:2275
+#: ../mail/e-mail-reader.c:2277
 msgid "_Message"
 msgstr "_Viesti"
 
-#: ../mail/e-mail-reader.c:2282
+#: ../mail/e-mail-reader.c:2284
 msgid "_Zoom"
 msgstr "_Suurenna"
 
-#: ../mail/e-mail-reader.c:2292
-#| msgid "Search Folder from Mailing _List..."
+#: ../mail/e-mail-reader.c:2294
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Luo hakukansio _postilistasta..."
 
-#: ../mail/e-mail-reader.c:2294
+#: ../mail/e-mail-reader.c:2296
 msgid "Create a search folder for this mailing list"
 msgstr "Luo hakunäkymä tästä postilistasta"
 
-#: ../mail/e-mail-reader.c:2299
-#| msgid "Search Folder from Recipien_ts..."
+#: ../mail/e-mail-reader.c:2301
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Luo hakukansio _vastaanottajista..."
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2303
 msgid "Create a search folder for these recipients"
 msgstr "Luo hakunäkymä näistä vastaanottajista"
 
-#: ../mail/e-mail-reader.c:2306
-#| msgid "Search Folder from Sen_der..."
+#: ../mail/e-mail-reader.c:2308
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Luo hakukansio _lähettäjästä..."
 
-#: ../mail/e-mail-reader.c:2308
+#: ../mail/e-mail-reader.c:2310
 msgid "Create a search folder for this sender"
 msgstr "Luo hakunäkymä tästä lähettäjästä"
 
-#: ../mail/e-mail-reader.c:2313
-#| msgid "Search Folder from S_ubject..."
+#: ../mail/e-mail-reader.c:2315
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Luo hakukansio _aiheesta..."
 
-#: ../mail/e-mail-reader.c:2315
+#: ../mail/e-mail-reader.c:2317
 msgid "Create a search folder for this subject"
 msgstr "Luo hakunäkymä tästä aiheesta"
 
-#: ../mail/e-mail-reader.c:2338
+#: ../mail/e-mail-reader.c:2340
 msgid "Mark for Follo_w Up..."
 msgstr "_Merkitse edelleen lähetettäväksi..."
 
-#: ../mail/e-mail-reader.c:2346
+#: ../mail/e-mail-reader.c:2348
 msgid "Mark as _Important"
 msgstr "Merkitse _tärkeäksi"
 
-#: ../mail/e-mail-reader.c:2350
+#: ../mail/e-mail-reader.c:2352
 msgid "Mark as _Junk"
 msgstr "Luokittele _roskapostiksi"
 
-#: ../mail/e-mail-reader.c:2354
+#: ../mail/e-mail-reader.c:2356
 msgid "Mark as _Not Junk"
 msgstr "Luokittele _ei-roskapostiksi"
 
-#: ../mail/e-mail-reader.c:2358
+#: ../mail/e-mail-reader.c:2360
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: ../mail/e-mail-reader.c:2362
+#: ../mail/e-mail-reader.c:2364
 msgid "Mark as Uni_mportant"
 msgstr "Merkitse yhden_tekeväksi"
 
-#: ../mail/e-mail-reader.c:2366
+#: ../mail/e-mail-reader.c:2368
 msgid "Mark as _Unread"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ../mail/e-mail-reader.c:2410
+#: ../mail/e-mail-reader.c:2412
 msgid "_Caret Mode"
 msgstr "Kohdistin_tila"
 
-#: ../mail/e-mail-reader.c:2412
+#: ../mail/e-mail-reader.c:2414
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Näytä välkkyvä kursori näytettävien viestin rungossa"
 
-#: ../mail/e-mail-reader.c:2418
+#: ../mail/e-mail-reader.c:2420
 msgid "All Message _Headers"
 msgstr "Kaikki viestin _otsikot"
 
-#: ../mail/e-mail-reader.c:2420
+#: ../mail/e-mail-reader.c:2422
 msgid "Show messages with all email headers"
 msgstr "Näytä viesti kaikilla otsakkeillaan"
 
-#: ../mail/e-mail-reader.c:2780
+#: ../mail/e-mail-reader.c:2849
 msgid "Retrieving message"
 msgstr "Noudetaan viesti"
 
-#: ../mail/e-mail-reader.c:3702
-#: ../modules/mail/e-mail-attachment-handler.c:207
+#: ../mail/e-mail-reader.c:3772
+#: ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: ../mail/e-mail-reader.c:3703
+#: ../mail/e-mail-reader.c:3773
 msgid "Forward the selected message to someone"
 msgstr "Välitä edelleen valitut viestit jollekulle"
 
-#: ../mail/e-mail-reader.c:3722
+#: ../mail/e-mail-reader.c:3792
 msgid "Group Reply"
 msgstr "Vastaa ryhmälle"
 
-#: ../mail/e-mail-reader.c:3723
+#: ../mail/e-mail-reader.c:3793
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Vastaa sähköpostilistalle tai kaikille vastaanottajille"
 
-#: ../mail/e-mail-reader.c:3789 ../mail/em-filter-i18n.h:15
+#: ../mail/e-mail-reader.c:3859 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "Poista"
 
-#: ../mail/e-mail-reader.c:3801
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../mail/e-mail-reader.c:3871
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../mail/e-mail-reader.c:3805
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../mail/e-mail-reader.c:3875
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ../mail/e-mail-reader.c:3814 ../mail/mail-dialogs.ui.h:15
+#: ../mail/e-mail-reader.c:3884 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Vastaa"
 
-#: ../mail/e-mail-reader-utils.c:151
+#: ../mail/e-mail-reader-utils.c:147
 msgid "Do not warn me again"
 msgstr "Älä varoita uudelleen"
 
+#: ../mail/e-mail-reader-utils.c:557 ../plugins/face/face.c:170
+#: ../smime/gui/certificate-manager.c:329
+msgid "Unknown error"
+msgstr "Tuntematon virhe"
+
 #: ../mail/e-mail-reader-utils.c:976
-#, fuzzy
 #| msgid "Print"
 msgid "Printing"
-msgstr "Tulosta"
+msgstr "Tulostetaan"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
@@ -13326,17 +13734,16 @@ msgstr[0] "Viesti"
 msgstr[1] "Viestit"
 
 #: ../mail/e-mail-reader-utils.c:2416
-#, fuzzy
 #| msgid "Saving %d message"
 #| msgid_plural "Saving %d messages"
 msgid "Parsing message"
-msgstr "Tallennetaan %d viesti"
+msgstr "Jäsennetään viestiä"
 
-#: ../mail/e-mail-request.c:182
+#: ../mail/e-mail-request.c:199
 msgid "The message has no text content."
 msgstr "Viestissä ei ole tekstisisältöä."
 
-#: ../mail/e-mail-tag-editor.c:238
+#: ../mail/e-mail-tag-editor.c:237
 msgid "Flag to Follow Up"
 msgstr "Merkitse edelleenlähetettäväksi"
 
@@ -13344,7 +13751,7 @@ msgstr "Merkitse edelleenlähetettäväksi"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1372
+#: ../mail/em-composer-utils.c:1454
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -13352,27 +13759,27 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kello ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} kirjoitti:"
 
-#: ../mail/em-composer-utils.c:1378
+#: ../mail/em-composer-utils.c:1460
 msgid "-------- Forwarded Message --------"
 msgstr "------- Välitetty viesti ---------"
 
-#: ../mail/em-composer-utils.c:1383
+#: ../mail/em-composer-utils.c:1465
 msgid "-----Original Message-----"
 msgstr "-----Alkuperäinen viesti-----"
 
-#: ../mail/em-composer-utils.c:2528
+#: ../mail/em-composer-utils.c:2615
 msgid "an unknown sender"
 msgstr "Tuntematon lähettäjä"
 
-#: ../mail/em-composer-utils.c:2949
+#: ../mail/em-composer-utils.c:3040
 msgid "Posting destination"
 msgstr "Postituksen kohde"
 
-#: ../mail/em-composer-utils.c:2950
+#: ../mail/em-composer-utils.c:3041
 msgid "Choose folders to post the message to."
 msgstr "Valitse kansio johon viesti postitetaan:"
 
-#: ../mail/em-filter-editor-folder-element.c:157
+#: ../mail/em-filter-editor-folder-element.c:153
 msgid "Select Folder"
 msgstr "Valitse kansio"
 
@@ -13382,7 +13789,6 @@ msgid "Adjust Score"
 msgstr "Muuta pisteytystä"
 
 #: ../mail/em-filter-i18n.h:3
-#| msgid "IMAP Headers"
 msgid "Any header"
 msgstr "Mikä tahansa otsake"
 
@@ -13410,548 +13816,560 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "Valmistui"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "Otettu vastaan"
 
-#: ../mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:13
 msgid "Date sent"
 msgstr "Lähetetty"
 
-#: ../mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "Poistettu"
 
-#: ../mail/em-filter-i18n.h:18
-msgid "does not end with"
-msgstr "ei pääty"
-
-#: ../mail/em-filter-i18n.h:19
-msgid "does not exist"
-msgstr "ei ole olemassa"
-
-#: ../mail/em-filter-i18n.h:20
-msgid "does not have words"
-msgstr "ei sisällä sanoja"
-
-#: ../mail/em-filter-i18n.h:21
-msgid "does not return"
-msgstr "ei palauta"
-
-#: ../mail/em-filter-i18n.h:22
-msgid "does not sound like"
-msgstr "ei kuulosta samalta kuin"
-
-#: ../mail/em-filter-i18n.h:23
-msgid "does not start with"
-msgstr "ei ala"
-
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:17
 msgid "Draft"
 msgstr "Luonnos"
 
-#: ../mail/em-filter-i18n.h:26
-msgid "ends with"
-msgstr "päättyy"
-
-#: ../mail/em-filter-i18n.h:28
-msgid "exists"
-msgstr "on olemassa"
-
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:19
 msgid "Expression"
 msgstr "Lauseke"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:20
 msgid "Follow Up"
 msgstr "Lähetä edelleen"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:21
 msgid "Forward to"
 msgstr "Välitä"
 
-#: ../mail/em-filter-i18n.h:32
-msgid "has words"
-msgstr "sisältää sanat"
-
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:22
 msgid "Important"
 msgstr "Tärkeä"
 
-#: ../mail/em-filter-i18n.h:35
-msgid "is after"
-msgstr "on jälkeen"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is before"
-msgstr "on ennen"
-
-#: ../mail/em-filter-i18n.h:37
-msgid "is Flagged"
-msgstr "on merkitty"
-
-#: ../mail/em-filter-i18n.h:41
-msgid "is not Flagged"
-msgstr "ei ole merkitty"
-
-#: ../mail/em-filter-i18n.h:42
-msgid "is not set"
-msgstr "ei ole asetettu"
-
-#: ../mail/em-filter-i18n.h:43
-msgid "is set"
-msgstr "on asetettu"
+#: ../mail/em-filter-i18n.h:23
+msgid "Junk Test"
+msgstr "Roskapostitesti"
 
-#: ../mail/em-filter-i18n.h:44 ../mail/mail-config.ui.h:108
+#: ../mail/em-filter-i18n.h:24 ../mail/mail-config.ui.h:113
 msgid "Junk"
 msgstr "Roskaposti"
 
-#: ../mail/em-filter-i18n.h:45
-msgid "Junk Test"
-msgstr "Roskapostitesti"
-
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:25
 msgid "Label"
 msgstr "Merkintä"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:26
 msgid "Mailing list"
 msgstr "Postituslista"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:27
 msgid "Match All"
 msgstr "Kaikki käyvät"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:28
 msgid "Message Body"
 msgstr "Viestin runko"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:29
 msgid "Message Header"
 msgstr "Viestin otsakkeet"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:30
+msgid "Message Location"
+msgstr "Viestin sijainti"
+
+#: ../mail/em-filter-i18n.h:31
 msgid "Message is Junk"
 msgstr "Viesti on roskapostia"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:32
 msgid "Message is not Junk"
 msgstr "Viesti ei ole roskapostia"
 
-#: ../mail/em-filter-i18n.h:53
-msgid "Message Location"
-msgstr "Viestin sijainti"
-
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:34
 msgid "Pipe to Program"
 msgstr "Välitä putkessa ohjelmalle"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:35
 msgid "Play Sound"
 msgstr "Soita ääni"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:57 ../mail/mail-dialogs.ui.h:14
+#: ../mail/em-filter-i18n.h:36 ../mail/mail-dialogs.ui.h:15
 msgid "Read"
 msgstr "Luettu"
 
-#: ../mail/em-filter-i18n.h:58 ../mail/message-list.etspec.h:16
+#: ../mail/em-filter-i18n.h:37 ../mail/message-list.etspec.h:16
 msgid "Recipients"
 msgstr "Vastaanottajat"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:38
 msgid "Regex Match"
 msgstr "Regex-osuma"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:39
 msgid "Replied to"
 msgstr "Vastaus viestiin"
 
-#: ../mail/em-filter-i18n.h:61
-msgid "returns"
-msgstr "palauttaa"
-
-#: ../mail/em-filter-i18n.h:62
-msgid "returns greater than"
-msgstr "palauttaa enemmän kuin"
-
-#: ../mail/em-filter-i18n.h:63
-msgid "returns less than"
-msgstr "palauttaa vähemmän kuin"
-
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:40
 msgid "Run Program"
 msgstr "Suorita ohjelma"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/message-list.etspec.h:3
+#: ../mail/em-filter-i18n.h:41 ../mail/message-list.etspec.h:3
 msgid "Score"
 msgstr "Pistemäärä"
 
-#: ../mail/em-filter-i18n.h:66 ../mail/message-list.etspec.h:15
-msgid "Sender"
-msgstr "Lähettäjä"
-
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:42
 msgid "Sender or Recipients"
 msgstr "Lähettäjä tai vastaanottajat"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:43 ../mail/message-list.etspec.h:15
+msgid "Sender"
+msgstr "Lähettäjä"
+
+#: ../mail/em-filter-i18n.h:44
 msgid "Set Label"
 msgstr "Aseta merkintä"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:45
 msgid "Set Status"
 msgstr "Aseta tila"
 
-#: ../mail/em-filter-i18n.h:70
+#: ../mail/em-filter-i18n.h:46
 msgid "Size (kB)"
 msgstr "Koko (kB)"
 
-#: ../mail/em-filter-i18n.h:71
-msgid "sounds like"
-msgstr "kuulostaa samalta kuin"
-
-#: ../mail/em-filter-i18n.h:72
+#: ../mail/em-filter-i18n.h:47
 msgid "Source Account"
 msgstr "Lähteen yhteystieto"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:48
 msgid "Specific header"
 msgstr "Annettu otsake"
 
-#: ../mail/em-filter-i18n.h:74
-msgid "starts with"
-msgstr "alkaa"
-
-#: ../mail/em-filter-i18n.h:76
+#: ../mail/em-filter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Pysäytä käsittely"
 
-#: ../mail/em-filter-i18n.h:79
+#: ../mail/em-filter-i18n.h:53
 msgid "Unset Color"
 msgstr "Poista värin asetus"
 
-#: ../mail/em-filter-i18n.h:80
+#: ../mail/em-filter-i18n.h:54
 msgid "Unset Status"
 msgstr "Poista tilan asetus"
 
+#: ../mail/em-filter-i18n.h:57
+msgid "does not end with"
+msgstr "ei pääty"
+
+#: ../mail/em-filter-i18n.h:58
+msgid "does not exist"
+msgstr "ei ole olemassa"
+
+#: ../mail/em-filter-i18n.h:59
+msgid "does not have words"
+msgstr "ei sisällä sanoja"
+
+#: ../mail/em-filter-i18n.h:60
+msgid "does not return"
+msgstr "ei palauta"
+
+#: ../mail/em-filter-i18n.h:61
+msgid "does not sound like"
+msgstr "ei kuulosta samalta kuin"
+
+#: ../mail/em-filter-i18n.h:62
+msgid "does not start with"
+msgstr "ei ala"
+
+#: ../mail/em-filter-i18n.h:63
+msgid "ends with"
+msgstr "päättyy"
+
+#: ../mail/em-filter-i18n.h:64
+msgid "exists"
+msgstr "on olemassa"
+
+#: ../mail/em-filter-i18n.h:65
+msgid "has words"
+msgstr "sisältää sanat"
+
+#: ../mail/em-filter-i18n.h:66
+msgid "is Flagged"
+msgstr "on merkitty"
+
+#: ../mail/em-filter-i18n.h:67
+msgid "is after"
+msgstr "on jälkeen"
+
+#: ../mail/em-filter-i18n.h:68
+msgid "is before"
+msgstr "on ennen"
+
+#: ../mail/em-filter-i18n.h:71
+msgid "is not Flagged"
+msgstr "ei ole merkitty"
+
+#: ../mail/em-filter-i18n.h:72
+msgid "is not set"
+msgstr "ei ole asetettu"
+
+#: ../mail/em-filter-i18n.h:74
+msgid "is set"
+msgstr "on asetettu"
+
+#: ../mail/em-filter-i18n.h:76
+msgid "returns greater than"
+msgstr "palauttaa enemmän kuin"
+
+#: ../mail/em-filter-i18n.h:77
+msgid "returns less than"
+msgstr "palauttaa vähemmän kuin"
+
+#: ../mail/em-filter-i18n.h:78
+msgid "returns"
+msgstr "palauttaa"
+
+#: ../mail/em-filter-i18n.h:79
+msgid "sounds like"
+msgstr "kuulostaa samalta kuin"
+
+#: ../mail/em-filter-i18n.h:80
+msgid "starts with"
+msgstr "alkaa"
+
 #. and now for the action area
-#: ../mail/em-filter-rule.c:583
+#: ../mail/em-filter-rule.c:587
 msgid "Then"
 msgstr "sitten"
 
-#: ../mail/em-filter-rule.c:648
+#: ../mail/em-filter-rule.c:652
 msgid "Add Ac_tion"
 msgstr "Lisää _toiminto"
 
-#: ../mail/em-folder-properties.c:145
+#: ../mail/em-folder-properties.c:177
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Lukemattomia viestejä:"
 msgstr[1] "Lukemattomia viestejä:"
 
-#: ../mail/em-folder-properties.c:156
+#: ../mail/em-folder-properties.c:188
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Viestejä kaikkiaan:"
 msgstr[1] "Viestejä kaikkiaan:"
 
-#: ../mail/em-folder-properties.c:177
+#: ../mail/em-folder-properties.c:209
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Levytilan käyttö (%s):"
 
-#: ../mail/em-folder-properties.c:179
+#: ../mail/em-folder-properties.c:211
 #, c-format
 msgid "Quota usage"
 msgstr "Levytilan käyttö"
 
-#: ../mail/em-folder-properties.c:347
+#. Translators: Label of a combo with a list of configured accounts where a user can
+#. choose which account to use as the sender when composing a message in this folder
+#: ../mail/em-folder-properties.c:286
+msgid "_Send Account Override:"
+msgstr ""
+
+#: ../mail/em-folder-properties.c:415
 msgid "Folder Properties"
 msgstr "Kansion ominaisuudet"
 
-#: ../mail/em-folder-selection-button.c:80
+#: ../mail/em-folder-selection-button.c:76
 msgid "<click here to select a folder>"
 msgstr "<Valitse kansio tästä>"
 
-#: ../mail/em-folder-selector.c:390
+#: ../mail/em-folder-selector.c:387
 msgid "C_reate"
 msgstr "_Luo"
 
-#: ../mail/em-folder-selector.c:396
+#: ../mail/em-folder-selector.c:393
 msgid "Folder _name:"
 msgstr "Kansion _nimi:"
 
-#: ../mail/em-folder-tree.c:637
+#: ../mail/em-folder-tree.c:682
 msgid "Folder names cannot contain '/'"
 msgstr "Kansion nimi ei voi sisältää merkkiä '/'"
 
-#: ../mail/em-folder-tree.c:774
+#: ../mail/em-folder-tree.c:819
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1599
+#: ../mail/em-folder-tree.c:1661
 msgid "Mail Folder Tree"
 msgstr "Sähköpostikansioiden puu"
 
-#: ../mail/em-folder-tree.c:2168 ../mail/em-folder-utils.c:112
+#: ../mail/em-folder-tree.c:2209 ../mail/em-folder-utils.c:100
 #, c-format
 msgid "Moving folder %s"
 msgstr "Siirretään kansiota %s"
 
-#: ../mail/em-folder-tree.c:2171 ../mail/em-folder-utils.c:114
+#: ../mail/em-folder-tree.c:2212 ../mail/em-folder-utils.c:102
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopioidaan kansiota %s"
 
-#: ../mail/em-folder-tree.c:2178 ../mail/message-list.c:2280
+#: ../mail/em-folder-tree.c:2219 ../mail/message-list.c:2284
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Siirretään viestejä kansioon %s"
 
-#: ../mail/em-folder-tree.c:2182 ../mail/message-list.c:2282
+#: ../mail/em-folder-tree.c:2223 ../mail/message-list.c:2286
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejä kansioon %s"
 
-#: ../mail/em-folder-tree.c:2201
+#: ../mail/em-folder-tree.c:2242
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Viestiä ei voi tiputtaa ylätason taltioon"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:430 ../mail/em-folder-tree-model.c:432
 msgid "UNMATCHED"
 msgstr "EI VASTAAVAA"
 
-#: ../mail/em-folder-tree-model.c:870 ../mail/em-folder-tree-model.c:1165
+#: ../mail/em-folder-tree-model.c:1244 ../mail/em-folder-tree-model.c:1621
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: ../mail/em-folder-utils.c:518
+#: ../mail/em-folder-utils.c:506
 msgid "Move Folder To"
 msgstr "Siirrä kansio kohteeseen"
 
-#: ../mail/em-folder-utils.c:518
+#: ../mail/em-folder-utils.c:506
 msgid "Copy Folder To"
 msgstr "Kopioi kansio kohteeseen"
 
-#: ../mail/em-folder-utils.c:615
+#: ../mail/em-folder-utils.c:604
 msgid "Create Folder"
 msgstr "Luo kansio"
 
-#: ../mail/em-folder-utils.c:616
+#: ../mail/em-folder-utils.c:605
 msgid "Specify where to create the folder:"
 msgstr "Määrittele mihin kansio luodaan:"
 
-#: ../mail/em-subscription-editor.c:867
+#: ../mail/em-subscription-editor.c:855
 msgid "_Subscribe"
 msgstr "_Tilaa"
 
-#: ../mail/em-subscription-editor.c:876
-#, fuzzy
+#: ../mail/em-subscription-editor.c:864
 msgid "Su_bscribe To Shown"
-msgstr "_Tilaa lista"
+msgstr "_Tilaa näytetyt"
 
-#: ../mail/em-subscription-editor.c:884
+#: ../mail/em-subscription-editor.c:872
 msgid "Subscribe To _All"
 msgstr "Tilaa kaikk_i"
 
-#: ../mail/em-subscription-editor.c:981 ../mail/em-subscription-editor.c:1836
-#: ../modules/mail/e-mail-shell-view-actions.c:1630
+#: ../mail/em-subscription-editor.c:969 ../mail/em-subscription-editor.c:1867
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
 msgid "_Unsubscribe"
 msgstr "_Peru tilaus"
 
-#: ../mail/em-subscription-editor.c:990
+#: ../mail/em-subscription-editor.c:978
 #, fuzzy
 msgid "Unsu_bscribe From Hidden"
 msgstr "Peru kansioiden tilauksia"
 
-#: ../mail/em-subscription-editor.c:998
+#: ../mail/em-subscription-editor.c:986
 msgid "Unsubscribe From _All"
 msgstr "_Peru kaikkien tilaus"
 
-#: ../mail/em-subscription-editor.c:1677
+#: ../mail/em-subscription-editor.c:1704
 msgid "Folder Subscriptions"
 msgstr "Tilatut kansiot"
 
-#: ../mail/em-subscription-editor.c:1716
+#: ../mail/em-subscription-editor.c:1743
 msgid "_Account:"
 msgstr "_Tili:"
 
-#: ../mail/em-subscription-editor.c:1729
+#: ../mail/em-subscription-editor.c:1756
 msgid "Clear Search"
 msgstr "Tyhjennä haku"
 
-#: ../mail/em-subscription-editor.c:1746
+#: ../mail/em-subscription-editor.c:1773
 msgid "Sho_w items that contain:"
 msgstr "_Näytä kohteet, jotka sisältävät:"
 
-#: ../mail/em-subscription-editor.c:1789
+#: ../mail/em-subscription-editor.c:1820
 msgid "Subscribe to the selected folder"
 msgstr "Tilaa valittu kansio"
 
-#: ../mail/em-subscription-editor.c:1790
+#: ../mail/em-subscription-editor.c:1821
 msgid "Su_bscribe"
 msgstr "Tila_a"
 
-#: ../mail/em-subscription-editor.c:1835
-#: ../modules/mail/e-mail-shell-view-actions.c:1632
+#: ../mail/em-subscription-editor.c:1866
+#: ../modules/mail/e-mail-shell-view-actions.c:1633
 msgid "Unsubscribe from the selected folder"
 msgstr "Peru tämän kansion tilaus"
 
-#: ../mail/em-subscription-editor.c:1875
-#, fuzzy
+#: ../mail/em-subscription-editor.c:1906
 msgid "Collapse all folders"
-msgstr "Pienennä _kaikki"
+msgstr "Pienennä kaikki kansiot"
 
-#: ../mail/em-subscription-editor.c:1876
-#, fuzzy
+#: ../mail/em-subscription-editor.c:1907
 msgid "C_ollapse All"
-msgstr "Pienennä _kaikki"
+msgstr "Pienennä kaikki"
 
-#: ../mail/em-subscription-editor.c:1886
-#, fuzzy
+#: ../mail/em-subscription-editor.c:1917
 msgid "Expand all folders"
-msgstr "_Laajenna kaikki"
+msgstr "Laajenna kaikki kansiot"
 
-#: ../mail/em-subscription-editor.c:1887
-#, fuzzy
+#: ../mail/em-subscription-editor.c:1918
 msgid "E_xpand All"
 msgstr "_Laajenna kaikki"
 
-#: ../mail/em-subscription-editor.c:1897
+#: ../mail/em-subscription-editor.c:1928
 msgid "Refresh the folder list"
 msgstr "Päivitä kansioluettelo"
 
-#: ../mail/em-subscription-editor.c:1909
+#: ../mail/em-subscription-editor.c:1929
+#: ../modules/mail/e-mail-shell-view-actions.c:1533
+#: ../modules/mail/e-mail-shell-view-actions.c:1603
+msgid "_Refresh"
+msgstr "_Päivitä"
+
+#: ../mail/em-subscription-editor.c:1940
 msgid "Stop the current operation"
 msgstr "Keskeytä nykyinen operaatio"
 
+#: ../mail/em-subscription-editor.c:1941
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
+msgid "_Stop"
+msgstr "_Pysäytä"
+
 #. Translators: This message is shown only for ten or more
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:86
+#: ../mail/em-utils.c:75
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "Haluatko varmasti avata %d viestin kerralla?"
 msgstr[1] "Haluatko varmasti avata %d viestiä kerralla?"
 
-#: ../mail/em-utils.c:142
-#: ../modules/mailto-handler/evolution-mailto-handler.c:150
+#: ../mail/em-utils.c:131
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
 msgid "_Do not show this message again"
 msgstr "Älä _näytä tätä viestiä uudestaan"
 
-#: ../mail/em-utils.c:252
+#: ../mail/em-utils.c:241
 msgid "Message Filters"
 msgstr "Viestisuodattimet"
 
-#: ../mail/em-utils.c:982
+#: ../mail/em-utils.c:970
 #, c-format
 msgid "Messages from %s"
 msgstr "Viestit %s:ltä"
 
-#: ../mail/em-vfolder-editor.c:105
+#: ../mail/em-vfolder-editor.c:104
 msgid "Search _Folders"
 msgstr "_Hakunäkymät"
 
-#: ../mail/em-vfolder-editor-rule.c:397
+#: ../mail/em-vfolder-editor-rule.c:392
 msgid "Add Folder"
 msgstr "Lisää kansio"
 
-#: ../mail/em-vfolder-editor-rule.c:523
+#: ../mail/em-vfolder-editor-rule.c:518
 msgid "Search Folder Sources"
 msgstr ""
 
-#: ../mail/em-vfolder-editor-rule.c:555
+#: ../mail/em-vfolder-editor-rule.c:550
 msgid "Automatically update on any _source folder change"
 msgstr ""
 
-#: ../mail/em-vfolder-editor-rule.c:567
+#: ../mail/em-vfolder-editor-rule.c:562
 msgid "All local folders"
 msgstr "Kaikki paikalliset kansiot"
 
-#: ../mail/em-vfolder-editor-rule.c:568
+#: ../mail/em-vfolder-editor-rule.c:563
 msgid "All active remote folders"
 msgstr "Kaikki aktiiviset etäkansiot"
 
-#: ../mail/em-vfolder-editor-rule.c:569
+#: ../mail/em-vfolder-editor-rule.c:564
 msgid "All local and active remote folders"
 msgstr "Kaikki paikalliset kansiot ja aktiiviset etäkansiot"
 
-#: ../mail/em-vfolder-editor-rule.c:570
+#: ../mail/em-vfolder-editor-rule.c:565
 msgid "Specific folders"
 msgstr "Tietyt kansiot"
 
-#: ../mail/em-vfolder-editor-rule.c:608
+#: ../mail/em-vfolder-editor-rule.c:603
 msgid "include subfolders"
 msgstr "sisällytä alikansiot"
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:173
 msgid "Importing Elm data"
 msgstr "Tuodaan tietoja Elmistä"
 
-#: ../mail/importers/elm-importer.c:378
+#: ../mail/importers/elm-importer.c:374
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm-tuoja"
 
-#: ../mail/importers/elm-importer.c:379
+#: ../mail/importers/elm-importer.c:375
 msgid "Import mail from Elm."
 msgstr "Tuodaan sähköpostit Elmistä."
 
-#: ../mail/importers/evolution-mbox-importer.c:140
-#: ../plugins/dbx-import/dbx-importer.c:250
+#: ../mail/importers/evolution-mbox-importer.c:134
+#: ../plugins/dbx-import/dbx-importer.c:246
 msgid "_Destination folder:"
 msgstr "_Kohdekansio:"
 
-#: ../mail/importers/evolution-mbox-importer.c:146
-#: ../plugins/dbx-import/dbx-importer.c:256
-#: ../plugins/pst-import/pst-importer.c:545
+#: ../mail/importers/evolution-mbox-importer.c:140
+#: ../plugins/dbx-import/dbx-importer.c:252
+#: ../plugins/pst-import/pst-importer.c:541
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: ../mail/importers/evolution-mbox-importer.c:147
-#: ../plugins/dbx-import/dbx-importer.c:257
-#: ../plugins/pst-import/pst-importer.c:546
+#: ../mail/importers/evolution-mbox-importer.c:141
+#: ../plugins/dbx-import/dbx-importer.c:253
+#: ../plugins/pst-import/pst-importer.c:542
 msgid "Select folder to import into"
 msgstr "Valitse kansio, johon tuodaan"
 
-#: ../mail/importers/evolution-mbox-importer.c:437
+#: ../mail/importers/evolution-mbox-importer.c:435
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Aihe"
 
-#: ../mail/importers/evolution-mbox-importer.c:442
+#: ../mail/importers/evolution-mbox-importer.c:440
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Lähettäjä"
 
-#: ../mail/importers/evolution-mbox-importer.c:486
-#: ../shell/e-shell-utils.c:172
+#: ../mail/importers/evolution-mbox-importer.c:493
+#: ../shell/e-shell-utils.c:171
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:487
+#: ../mail/importers/evolution-mbox-importer.c:494
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Berkeley Mailbox-muotoisten kansioiden tuoja"
 
-#: ../mail/importers/mail-importer.c:63
+#: ../mail/importers/mail-importer.c:54
 msgid "Importing mailbox"
 msgstr "Tuodaan kansiota"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:612
-#: ../plugins/pst-import/pst-importer.c:764
+#: ../mail/importers/mail-importer.c:144
+#: ../plugins/dbx-import/dbx-importer.c:609
+#: ../plugins/pst-import/pst-importer.c:760
 #, c-format
 msgid "Importing '%s'"
 msgstr "Tuodaan ”%s”"
 
-#: ../mail/importers/mail-importer.c:316
+#: ../mail/importers/mail-importer.c:309
 #, c-format
 msgid "Scanning %s"
 msgstr "Tutkitaan %s"
@@ -13960,35 +14378,35 @@ msgstr "Tutkitaan %s"
 msgid "Importing Pine data"
 msgstr "Tuodaan tietoja Pinestä"
 
-#: ../mail/importers/pine-importer.c:474
+#: ../mail/importers/pine-importer.c:475
 msgid "Evolution Pine importer"
 msgstr "Evolutionin Pine-tuoja"
 
-#: ../mail/importers/pine-importer.c:475
+#: ../mail/importers/pine-importer.c:476
 msgid "Import mail from Pine."
 msgstr "Tuo sähköpostit Pinestä."
 
-#: ../mail/mail-autofilter.c:70
+#: ../mail/mail-autofilter.c:63
 #, c-format
 msgid "Mail to %s"
 msgstr "Viesti %s:lle"
 
-#: ../mail/mail-autofilter.c:226 ../mail/mail-autofilter.c:269
+#: ../mail/mail-autofilter.c:219 ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Mail from %s"
 msgstr "Viesti %s:ltä"
 
-#: ../mail/mail-autofilter.c:252
+#: ../mail/mail-autofilter.c:245
 #, c-format
 msgid "Subject is %s"
 msgstr "Aihe on %s"
 
-#: ../mail/mail-autofilter.c:293
+#: ../mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s postilista"
 
-#: ../mail/mail-autofilter.c:403
+#: ../mail/mail-autofilter.c:396
 msgid "Add Filter Rule"
 msgstr "Lisää suodatussääntö"
 
@@ -13997,7 +14415,7 @@ msgstr "Lisää suodatussääntö"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:512
+#: ../mail/mail-autofilter.c:505
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -14019,125 +14437,123 @@ msgstr[1] ""
 msgid "Set custom junk header"
 msgstr "Lisää oma roskapostiotsake"
 
-#: ../mail/mail-config.ui.h:2
+#: ../mail/mail-config.ui.h:4
 msgid ""
 "All new emails with header that matches given content will be automatically "
 "filtered as junk"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:3
+#: ../mail/mail-config.ui.h:5
 msgid "Header name"
 msgstr "Otsakkeen nimi"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:6
 msgid "Header content"
 msgstr "Otsakkeen sisältö"
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:7
 msgid "Default Behavior"
 msgstr "Oletustoiminta"
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:8
 msgid "For_mat messages in HTML"
 msgstr "Muotoile viestit _HTML:nä"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:9
 msgid "Automatically insert _emoticon images"
 msgstr "Lisää _hymiöt kuvina automaattisesti"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:10
 msgid "Always request rea_d receipt"
 msgstr "Pyydä aina vastaanoton _kuittausta"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:11
 #, fuzzy
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Muotoile tiedostonimet Outlookin ja GMailin tapaan."
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:12
 msgid "Ch_aracter encoding:"
 msgstr "_Merkistökoodaus:"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:13
 msgid "Replies and Forwards"
 msgstr "Vastaukset ja välitykset"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:14
 msgid "_Reply style:"
 msgstr "_Vastaustyyli:"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:15
 msgid "_Forward style:"
 msgstr "_Välitystyyli:"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:16
 msgid "Start _typing at the bottom on replying"
 msgstr "Aloita _kirjoittaminen lopusta vastattaessa"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:17
 msgid "_Keep signature above the original message on replying"
 msgstr "_Pidä allekirjoitus alkuperäisen viestin yllä vastattaessa"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:18
 #, fuzzy
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "Älä huomioi postituslistojen Reply-To-otsaketta"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:19
 #, fuzzy
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "Ryhmävastaus menee vain sähköpostilistalle, jos mahdollista"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:20
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr ""
 "Allekirjoita viestit _digitaalisesti alkuperäisen viestin ollessa "
 "allekirjoitettu (PGP tai S/MIME)"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:21
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Liite"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:22
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Sisennetty (Outlookin tapaan)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:23
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Lainattu"
 
-#: ../mail/mail-config.ui.h:22
-#| msgctxt "ReplyForward"
-#| msgid "Do not quote"
+#: ../mail/mail-config.ui.h:24
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Älä lainaa"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:25
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "Sisennettynä"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:27
 msgid "Sig_natures"
 msgstr "A_llekirjoitukset"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:28
 msgid "Signatures"
 msgstr "Allekirjoitukset"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:29
 msgid "_Languages"
 msgstr "_Kielet"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:30
 msgid "Languages Table"
 msgstr "Kielitaulukko"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:31
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14145,24 +14561,24 @@ msgstr ""
 "Luettelo käytettävissä olevista kielistä riippuu ainoastaan siitä, mille "
 "kielille sinulla on sanastoja asennettuna."
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:33
 msgid "Check spelling while I _type"
 msgstr "Tarkista _oikeinkirjoitus kirjoitettaessa"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:34
 msgid "Color for _misspelled words:"
 msgstr "_Väärin kirjoitettujen sanojen väri:"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:35
 #: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Pick a color"
 msgstr "Valitse väri"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:36
 msgid "Spell Checking"
 msgstr "Oikoluku"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:37
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -14171,27 +14587,27 @@ msgstr ""
 "seuraavissa tilanteissa etenemistä:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:39
 msgid "Sending a message with an _empty subject line"
 msgstr "Lähettäessä viestejä tyhjällä _Aihe-otsakkeella"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:41
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Jos ainoastaan _Bcc-vastaanottajia (piilokopio) on määritelty"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:43
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Lähetettäessä yksityisiä vastauksia _sähköpostilistaviesteihin"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:45
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Lähettäessä vastausta suurelle määrälle _vastaanottajia"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:47
 #, fuzzy
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr ""
@@ -14199,239 +14615,240 @@ msgstr ""
 "listalle"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:49
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 "Lähettäessä viestiä vastaanottajille, _joita ei ole kirjoitettu "
 "sähköpostiosoitteen muodossa"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:50
 msgid "Confirmations"
 msgstr "Vahvistukset"
 
-#: ../mail/mail-config.ui.h:54 ../smime/gui/smime-ui.ui.h:1
-msgid "a"
-msgstr "a"
-
-#: ../mail/mail-config.ui.h:55 ../smime/gui/smime-ui.ui.h:2
-msgid "b"
-msgstr "b"
+#. Translators: Label of a frame with a list of folders for which to use selected account in Send account overrides
+#: ../mail/mail-config.ui.h:54
+#, fuzzy
+#| msgid "Search Folders"
+msgid "Use for Folders"
+msgstr "Hakunäkymät"
 
-#: ../mail/mail-config.ui.h:56
-msgid "Proxy Settings"
-msgstr "Välityspalvelimen asetukset"
+#: ../mail/mail-config.ui.h:55
+msgid "A_dd"
+msgstr "_Lisää"
 
 #: ../mail/mail-config.ui.h:57
-msgid "_Use system defaults"
-msgstr "Käytä järjestelmän olet_uksia"
-
-#: ../mail/mail-config.ui.h:58
-msgid "_Direct connection to the Internet"
-msgstr "_Suora yhteys Internetiin"
+#| msgid "_Remove"
+msgid "Re_move"
+msgstr "_Poista"
 
+#. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account overrides
 #: ../mail/mail-config.ui.h:59
-msgid "_Manual proxy configuration:"
-msgstr "_Välipalvelimen käsin asettaminen:"
-
-#: ../mail/mail-config.ui.h:60
-msgid "H_TTP Proxy:"
-msgstr "H_TTP-välityspalvelin:"
+#, fuzzy
+#| msgid "Sender or Recipients"
+msgid "Use for Recipients"
+msgstr "Lähettäjä tai vastaanottajat"
 
-#: ../mail/mail-config.ui.h:61
-msgid "_Secure HTTP Proxy:"
-msgstr "_HTTPS-välityspalvelin:"
+#. Translators: Label of a frame with a list of configured accounts in Send account overrides
+#: ../mail/mail-config.ui.h:61 ../modules/mail/em-composer-prefs.c:870
+#| msgid "_Account:"
+msgid "Account"
+msgstr "Tili"
 
 #: ../mail/mail-config.ui.h:62
-msgid "SOC_KS Proxy:"
-msgstr "SO_CKS-välityspalvelin:"
+msgid "Send account overrides"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:63
-msgid "No _Proxy for:"
-msgstr "Ei _välipalvelinta seuraaville:"
+msgid ""
+"Assign which account should be used as a send account for respective folders "
+"or recipients, an override for usual send account detection. List of "
+"recipients can contain partial addresses or names. The name and the address "
+"parts are compared separately."
+msgstr ""
 
 #: ../mail/mail-config.ui.h:64
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:614
-msgid "Port:"
-msgstr "Portti:"
+msgid "_Folder override has precedence over Recipient override"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:65
-msgid "Use Authe_ntication"
-msgstr "Käytä _tunnistautumista"
+#, fuzzy
+#| msgid "Source Account"
+msgid "Send Account"
+msgstr "Lähteen yhteystieto"
 
-#: ../mail/mail-config.ui.h:66
-msgid "Us_ername:"
-msgstr "Käyttäjät_unnus:"
+#: ../mail/mail-config.ui.h:71 ../smime/gui/smime-ui.ui.h:1
+msgid "a"
+msgstr "a"
 
-#: ../mail/mail-config.ui.h:67
-msgid "Pass_word:"
-msgstr "_Salasana:"
+#: ../mail/mail-config.ui.h:72 ../smime/gui/smime-ui.ui.h:2
+msgid "b"
+msgstr "b"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:73
 msgid "Start up"
 msgstr "Käynnistys"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:74
 msgid "Check for new _messages on start"
 msgstr "T_arkista uudet viestit käynnistyksen yhteydessä"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:75
 msgid "Check for new messa_ges in all active accounts"
 msgstr "_Tarkista uudet viestit kaikilta aktiivisilta tileiltä"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:76
 msgid "Message Display"
 msgstr "Viestin näyttäminen"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:77
 msgid "_Use the same fonts as other applications"
 msgstr "Käytä samoja _kirjasimia kuin muut ohjelmat"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:78
 msgid "S_tandard Font:"
 msgstr "_Oletuskirjasin:"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:79
 msgid "Select HTML fixed width font"
 msgstr "Valitse HTML-viestin tasalevyinen kirjasin"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:80
 msgid "Select HTML variable width font"
 msgstr "Valitse HTML-viestin vaihtuvalevyinen kirjasin"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:81
 msgid "Fix_ed Width Font:"
 msgstr "_Tasalevyinen kirjasin:"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:82
 msgid "_Mark messages as read after"
 msgstr "Merkitse vie_stit luetuiksi viiveellä"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:84
 msgid "Highlight _quotations with"
 msgstr "_Lainausten korostukseen käytetty väri"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:85
 msgid "color"
 msgstr "väri"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:86
 msgid "Default character e_ncoding:"
 msgstr "Merkistön _oletuskoodaus:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:87
 msgid "Apply the same _view settings to all folders"
 msgstr "Käytä samoja _näkymäasetuksia kaikille kansioille"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:88
 msgid "F_all back to threading messages by subject"
 msgstr "Palaa viestien säikeistämiseen _aiheen perusteella"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:89
 msgid "Delete Mail"
 msgstr "Sähköpostien poistaminen"
 
-#: ../mail/mail-config.ui.h:85
-#| msgid "Empty trash folders on e_xit"
+#: ../mail/mail-config.ui.h:90
 msgid "Empty _trash folders"
 msgstr "Tyhj_ennä roskakorikansiot"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:91
 msgid "Confirm _when expunging a folder"
 msgstr "_Varmista viestien lopullinen siivous kansiosta"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:93
 msgid "_Show animated images"
 msgstr "N_äytä animoidut kuvat"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:94
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Kysy vahvistus HTML-viesteistä henkilöille, jotka eivät niitä halua"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:95
 msgid "Loading Images"
 msgstr "Kuvien lataaminen"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:96
 msgid "_Never load images from the Internet"
 msgstr "_Älä koskaan lataa kuvia verkosta"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:97
 msgid "_Load images only in messages from contacts"
 msgstr "_Lataa viestin kuvat vain yhteystietojen lähettämissä viesteissä"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:98
 msgid "_Always load images from the Internet"
 msgstr "Lataa _aina kuvat verkosta"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:99
 msgid "HTML Messages"
 msgstr "HTML-viestit"
 
-#: ../mail/mail-config.ui.h:95 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Merkinnät"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:101
 msgid "Sender Photograph"
 msgstr "Lähettäjän valokuva"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:102
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Näytä lähettäjän valokuva sähköpostin esikatselussa"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:103
 msgid "Displayed Message Headers"
 msgstr "Näytettävät viestin otsakkeet"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:104
 msgid "Mail Headers Table"
 msgstr "Sähköposti otsikkotaulu"
 
-#: ../mail/mail-config.ui.h:100
-#: ../modules/addressbook/autocompletion-config.c:117
+#: ../mail/mail-config.ui.h:105
+#: ../modules/addressbook/autocompletion-config.c:116
 #: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Date/Time Format"
 msgstr "Päiväys/aika -muotoilu"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:107
 msgid "Check incoming _messages for junk"
 msgstr "Etsi roskapostia _saapuvasta viesteistä"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:108
 #, fuzzy
 #| msgid "Delete junk messages on e_xit"
 msgid "_Delete junk messages"
 msgstr "Poista roskapostit _suljettaessa"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:109
 msgid "Check cu_stom headers for junk"
 msgstr "Käytä _omia roskapostiotsakkeita"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:110
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Älä merkitse viestejä _roskapostiksi, jos lähettäjä on osoitekirjassa"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:111
 msgid "_Lookup in local address book only"
 msgstr "_Etsi vain paikallisesta osoitekirjasta"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:112
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Valitsin ohitetaan, jos täsmäävä oma sähköpostin roskapostiotsake löydetään."
 
-#: ../mail/mail-config.ui.h:109
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:225
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:159
+#: ../mail/mail-config.ui.h:114
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:224
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:158
 msgid "No encryption"
 msgstr "Ei salausta"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:115
 msgid "TLS encryption"
 msgstr "TLS-salattu"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:116
 msgid "SSL encryption"
 msgstr "SSL-salattu"
 
@@ -14452,63 +14869,63 @@ msgid "_Due By:"
 msgstr "_Erääntyy:"
 
 #. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Co_mpleted"
 msgstr "_Valmis"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Call"
 msgstr "Soita"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Do Not Forward"
 msgstr "Älä välitä"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "Lähetä edelleen"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "Tiedoksesi"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "Välitä"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "No Response Necessary"
 msgstr "Vastaus ei välttämätön"
 
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:17
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Review"
 msgstr "Arvio"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:19
 msgid "License Agreement"
 msgstr "Lisenssisopimus"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "_Tick this to accept the license agreement"
 msgstr "_Laita tähän rasti, jos hyväksyt lisenssiehdot"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:22
 msgid "_Accept License"
 msgstr "_Hyväksy lisenssi"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Security Information"
 msgstr "Turvatiedot"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Digital Signature"
 msgstr "Digitaalinen allekirjoitus"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:25
 msgid "Encryption"
 msgstr "Salaus"
 
@@ -14716,7 +15133,7 @@ msgstr ""
 "Haluatko varmasti poistaa kaikki poistetut viestit kaikista kansioista?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1518
+#: ../modules/mail/e-mail-shell-view-actions.c:1519
 msgid "_Empty Trash"
 msgstr "_Tyhjennä roskakori"
 
@@ -14807,10 +15224,9 @@ msgid "Failed to expunge folder &quot;{0}&quot;."
 msgstr "Allekirjoitustiedostoa &quot;{0}&quot; ei voi lukea."
 
 #: ../mail/mail.error.xml.h:62
-#, fuzzy
 #| msgid "Could not read signature file &quot;{0}&quot;."
 msgid "Failed to refresh folder &quot;{0}&quot;."
-msgstr "Allekirjoitustiedostoa &quot;{0}&quot; ei voi lukea."
+msgstr "Kansion &quot;{0}&quot; päivittäminen epäonnistui."
 
 #: ../mail/mail.error.xml.h:63
 msgid "Cannot rename or move system folder \"{0}\"."
@@ -14865,12 +15281,10 @@ msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kansiota \"{0}\" ei voi siirtää  kohtaan \"{1}\"."
 
 #: ../mail/mail.error.xml.h:74
-#| msgid "Cannot open source \"{2}\"."
 msgid "Cannot open source folder. Error: {2}"
 msgstr "Lähdekansiota ei voi avata. Virhe: {2}"
 
 #: ../mail/mail.error.xml.h:75
-#| msgid "Cannot open target \"{2}\"."
 msgid "Cannot open target folder. Error: {2}"
 msgstr "Kohdekansiota ei voi avata. Virhe: {2}"
 
@@ -14883,7 +15297,6 @@ msgid "Cannot create folder \"{0}\"."
 msgstr "Kansiota \"{0}\" ei voi luoda."
 
 #: ../mail/mail.error.xml.h:78
-#| msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgid "Cannot open folder. Error: {1}"
 msgstr "Kansiota ei voi avata. Virhe: {1}"
 
@@ -14935,7 +15348,7 @@ msgid "Do _Not Disable"
 msgstr "_Älä poista käytöstä"
 
 #: ../mail/mail.error.xml.h:90
-#: ../plugins/publish-calendar/publish-calendar.c:649
+#: ../plugins/publish-calendar/publish-calendar.c:655
 msgid "_Disable"
 msgstr "Älä _käytä"
 
@@ -14980,7 +15393,6 @@ msgid "You must name this Search Folder."
 msgstr "Hakunäkymälle täytyy antaa nimi."
 
 #: ../mail/mail.error.xml.h:102
-#| msgid "No sources selected."
 msgid "No folder selected."
 msgstr "Kansiota ei ole valittu."
 
@@ -15124,12 +15536,10 @@ msgstr ""
 "Pitäisikö Evolutionin sulkea tämä ikkuna vastatessa tai lähettäessä edelleen?"
 
 #: ../mail/mail.error.xml.h:134
-#| msgid "_Always"
 msgid "_Yes, Always"
 msgstr "_Kyllä, aina"
 
 #: ../mail/mail.error.xml.h:135
-#| msgid "Never"
 msgid "_No, Never"
 msgstr "Ei, ei koskaan"
 
@@ -15143,14 +15553,6 @@ msgstr "Kopioidaan kansiota %s"
 msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr "Haluatko varmasti kopioida kansion '{0}' kansioon '{1}'?"
 
-#: ../mail/mail.error.xml.h:138
-msgid "_Yes"
-msgstr "_Kyllä"
-
-#: ../mail/mail.error.xml.h:139
-msgid "_No"
-msgstr "_Ei"
-
 #: ../mail/mail.error.xml.h:140
 msgid "_Always"
 msgstr "_Aina"
@@ -15246,7 +15648,6 @@ msgid "Failed to retrieve messages."
 msgstr "Viestien nouto epäonnistui."
 
 #: ../mail/mail.error.xml.h:163
-#| msgid "Failed to save messages to disk."
 msgid "Failed to mark messages as read."
 msgstr "Viestien merkitseminen luetuiksi epäonnistui."
 
@@ -15295,125 +15696,129 @@ msgstr ""
 "Verkkoyhteyden tulee olla muodostettu, jotta tämä toimenpide on mahdollista "
 "suorittaa."
 
-#: ../mail/mail-send-recv.c:202
+#: ../mail/mail.error.xml.h:173
+msgid "Message from &quot;{0}&quot; account:"
+msgstr ""
+
+#: ../mail/mail-send-recv.c:188
 msgid "Canceling..."
 msgstr "Perutaan..."
 
-#: ../mail/mail-send-recv.c:546
+#: ../mail/mail-send-recv.c:526
 msgid "Send & Receive Mail"
 msgstr "Lähetä ja vastaanota postia"
 
-#: ../mail/mail-send-recv.c:562
+#: ../mail/mail-send-recv.c:542
 msgid "Cancel _All"
 msgstr "_Peruuta kaikki"
 
-#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:1047
+#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:1024
 msgid "Updating..."
 msgstr "Päivitetään..."
 
-#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:736
+#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:714
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: ../mail/mail-send-recv.c:1020
+#: ../mail/mail-send-recv.c:997
 #, fuzzy, c-format
 #| msgid "Checking for new mail"
 msgid "Checking for new mail at '%s'"
 msgstr "Tarkistetaan onko uusia viestejä"
 
-#: ../mail/mail-vfolder-ui.c:78
+#: ../mail/mail-vfolder-ui.c:66
 msgid "Search Folders"
 msgstr "Hakunäkymät"
 
-#: ../mail/mail-vfolder-ui.c:158
+#: ../mail/mail-vfolder-ui.c:146
 msgid "Edit Search Folder"
 msgstr "Muokkaa hakunäkymää"
 
-#: ../mail/mail-vfolder-ui.c:279
+#: ../mail/mail-vfolder-ui.c:267
 msgid "New Search Folder"
 msgstr "Uusi hakunäkymä"
 
-#: ../mail/message-list.c:298
+#: ../mail/message-list.c:287
 msgid "Unseen"
 msgstr "Nähty"
 
-#: ../mail/message-list.c:299
+#: ../mail/message-list.c:288
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: ../mail/message-list.c:300
+#: ../mail/message-list.c:289
 msgid "Answered"
 msgstr "Vastattu"
 
-#: ../mail/message-list.c:301
+#: ../mail/message-list.c:290
 msgid "Forwarded"
 msgstr "Välitetty"
 
-#: ../mail/message-list.c:302
+#: ../mail/message-list.c:291
 msgid "Multiple Unseen Messages"
 msgstr "Useita lukemattomia viestejä"
 
-#: ../mail/message-list.c:303
+#: ../mail/message-list.c:292
 msgid "Multiple Messages"
 msgstr "Useita viestejä"
 
-#: ../mail/message-list.c:316
+#: ../mail/message-list.c:305
 msgid "Lowest"
 msgstr "Matalin"
 
-#: ../mail/message-list.c:317
+#: ../mail/message-list.c:306
 msgid "Lower"
 msgstr "Matalampi"
 
-#: ../mail/message-list.c:321
+#: ../mail/message-list.c:310
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: ../mail/message-list.c:322
+#: ../mail/message-list.c:311
 msgid "Highest"
 msgstr "Korkein"
 
-#: ../mail/message-list.c:466 ../mail/message-list.c:5717
+#: ../mail/message-list.c:455 ../mail/message-list.c:5749
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1858 ../modules/itip-formatter/itip-view.c:244
+#: ../mail/message-list.c:1860 ../modules/itip-formatter/itip-view.c:237
 msgid "Today %l:%M %p"
 msgstr "Tänään %l.%M %p"
 
-#: ../mail/message-list.c:1867
+#: ../mail/message-list.c:1869
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l.%M %p"
 
-#: ../mail/message-list.c:1879
+#: ../mail/message-list.c:1881
 msgid "%a %l:%M %p"
 msgstr "%a %l.%M %p"
 
-#: ../mail/message-list.c:1887
+#: ../mail/message-list.c:1889
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l.%M %p"
 
-#: ../mail/message-list.c:1889
+#: ../mail/message-list.c:1891
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2767
+#: ../mail/message-list.c:2771
 msgid "Select all visible messages"
 msgstr "Valitse kaikki näkyvät viestit"
 
-#: ../mail/message-list.c:3395 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3399 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Viestit"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4762
+#: ../mail/message-list.c:4706
 #, fuzzy
 msgid "Follow-up"
 msgstr "Lähetä edelleen"
 
-#: ../mail/message-list.c:5655
+#: ../mail/message-list.c:5687
 msgid ""
 "No message satisfies your search criteria. Change search criteria by "
 "selecting a new Show message filter from the drop down list above or by "
@@ -15421,7 +15826,7 @@ msgid ""
 "by changing the query above."
 msgstr ""
 
-#: ../mail/message-list.c:5663
+#: ../mail/message-list.c:5695
 msgid "There are no messages in this folder."
 msgstr "Tässä kansiossa ei ole viestejä."
 
@@ -15460,397 +15865,376 @@ msgid "Subject or Addresses contains"
 msgstr "Aihe tai lähettäjät sisältävät"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:2001
+#: ../modules/mail/e-mail-shell-view-actions.c:2002
 msgid "Recipients contain"
 msgstr "Vastaanottajat sisältää"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1994
+#: ../modules/mail/e-mail-shell-view-actions.c:1995
 msgid "Message contains"
 msgstr "Viesti sisältää"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:2015
+#: ../modules/mail/e-mail-shell-view-actions.c:2016
 msgid "Subject contains"
 msgstr "Otsikko sisältää"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:2008
+#: ../modules/mail/e-mail-shell-view-actions.c:2009
 msgid "Sender contains"
 msgstr "Lähettäjä sisältää"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1987
+#: ../modules/mail/e-mail-shell-view-actions.c:1988
 msgid "Body contains"
 msgstr "Runko sisältää"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:123
-#: ../modules/mail/em-mailer-prefs.c:1213
+#: ../modules/addressbook/autocompletion-config.c:122
+#: ../modules/mail/em-mailer-prefs.c:1212
 msgid "_Table column:"
 msgstr "_Taulukon sarake:"
 
-#: ../modules/addressbook/autocompletion-config.c:126
+#: ../modules/addressbook/autocompletion-config.c:125
 msgid "Address formatting"
 msgstr "Osoitteen muotoilu"
 
-#: ../modules/addressbook/autocompletion-config.c:129
+#: ../modules/addressbook/autocompletion-config.c:128
 msgid "_Format address according to standard of its destination country"
 msgstr ""
 
-#: ../modules/addressbook/autocompletion-config.c:137
+#: ../modules/addressbook/autocompletion-config.c:136
 msgid "Autocompletion"
 msgstr "Automaattinen täydennys"
 
-#: ../modules/addressbook/autocompletion-config.c:140
+#: ../modules/addressbook/autocompletion-config.c:139
 msgid "Always _show address of the autocompleted contact"
 msgstr "Näytä _aina automaattitäydennetyn yhteystiedon osoite"
 
-#: ../modules/addressbook/eab-composer-util.c:148
+#: ../modules/addressbook/eab-composer-util.c:147
 msgid "Multiple vCards"
 msgstr "Useita vCard-tiedostoja"
 
-#: ../modules/addressbook/eab-composer-util.c:156
+#: ../modules/addressbook/eab-composer-util.c:155
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard %s"
 
-#: ../modules/addressbook/eab-composer-util.c:168
-#: ../modules/addressbook/eab-composer-util.c:195
+#: ../modules/addressbook/eab-composer-util.c:167
+#: ../modules/addressbook/eab-composer-util.c:194
 #, c-format
 msgid "Contact information"
 msgstr "Yhteystiedot"
 
-#: ../modules/addressbook/eab-composer-util.c:197
+#: ../modules/addressbook/eab-composer-util.c:196
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s yhteystiedot"
 
-#: ../modules/addressbook/e-book-shell-backend.c:259
-#: ../modules/addressbook/e-book-shell-view-actions.c:125
+#: ../modules/addressbook/e-book-shell-backend.c:258
+#: ../modules/addressbook/e-book-shell-view-actions.c:124
 msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-backend.c:268
+#: ../modules/addressbook/e-book-shell-backend.c:267
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-backend.c:270
-#: ../modules/addressbook/e-book-shell-view-actions.c:982
+#: ../modules/addressbook/e-book-shell-backend.c:269
+#: ../modules/addressbook/e-book-shell-view-actions.c:978
 msgid "Create a new contact"
 msgstr "Luo uusi yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-backend.c:275
+#: ../modules/addressbook/e-book-shell-backend.c:274
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Yhteystieto_luettelo"
 
-#: ../modules/addressbook/e-book-shell-backend.c:277
-#: ../modules/addressbook/e-book-shell-view-actions.c:989
+#: ../modules/addressbook/e-book-shell-backend.c:276
+#: ../modules/addressbook/e-book-shell-view-actions.c:985
 msgid "Create a new contact list"
 msgstr "Luo uusi yhteystietoluettelo"
 
-#: ../modules/addressbook/e-book-shell-backend.c:285
+#: ../modules/addressbook/e-book-shell-backend.c:284
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-backend.c:287
-#: ../modules/addressbook/e-book-shell-view-actions.c:905
+#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-view-actions.c:901
 msgid "Create a new address book"
 msgstr "Luo uusi osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-backend.c:315
+#: ../modules/addressbook/e-book-shell-backend.c:314
 msgid "Certificates"
 msgstr "Varmenteet"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:198
+#: ../modules/addressbook/e-book-shell-view-actions.c:197
 msgid "Address Book Properties"
 msgstr "Osoitekirjan ominaisuudet"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:479
-#: ../modules/addressbook/e-book-shell-view-actions.c:775
+#: ../modules/addressbook/e-book-shell-view-actions.c:475
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "Save as vCard"
 msgstr "Tallenna vCard-muodossa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:882
+#: ../modules/addressbook/e-book-shell-view-actions.c:878
 msgid "Co_py All Contacts To..."
 msgstr "Ko_pioi kaikki yhteystiedot..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Kopioi valitun osoitekirjan sisältö toiseen osoitekirjaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:889
+#: ../modules/addressbook/e-book-shell-view-actions.c:885
 msgid "D_elete Address Book"
 msgstr "_Poista osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:891
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
 msgid "Delete the selected address book"
 msgstr "Poista valittu osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:896
+#: ../modules/addressbook/e-book-shell-view-actions.c:892
 msgid "Mo_ve All Contacts To..."
 msgstr "Sii_rrä kaikki yhteystiedot..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:898
+#: ../modules/addressbook/e-book-shell-view-actions.c:894
 msgid "Move the contacts of the selected address book to another"
 msgstr "Siirrä valitun osoitekirjan sisältö toiseen osoitekirjaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:903
+#: ../modules/addressbook/e-book-shell-view-actions.c:899
 msgid "_New Address Book"
 msgstr "_Uusi osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:910
+#: ../modules/addressbook/e-book-shell-view-actions.c:906
 msgid "Address _Book Properties"
 msgstr "Osoite_kirjan ominaisuudet"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:912
+#: ../modules/addressbook/e-book-shell-view-actions.c:908
 msgid "Show properties of the selected address book"
 msgstr "Näytä valitun osoitekirjan ominaisuudet"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:917
-#: ../modules/calendar/e-cal-shell-view-actions.c:1414
-#: ../modules/calendar/e-memo-shell-view-actions.c:636
-#: ../modules/calendar/e-task-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:913
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#: ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "Re_fresh"
 msgstr "Vi_rkistä"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:919
-#| msgid "Rename the selected address book"
+#: ../modules/addressbook/e-book-shell-view-actions.c:915
 msgid "Refresh the selected address book"
 msgstr "Päivitä valittu osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:924
+#: ../modules/addressbook/e-book-shell-view-actions.c:920
 #, fuzzy
 msgid "Address Book _Map"
 msgstr "Osoitekirja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:926
+#: ../modules/addressbook/e-book-shell-view-actions.c:922
 msgid "Show map with all contacts from selected address book"
 msgstr "Näytä kartta, jossa on kaikki yhteystiedot valitusta osoitekirjasta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:931
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
-#: ../modules/calendar/e-task-shell-view-actions.c:767
-#: ../modules/mail/e-mail-shell-view-actions.c:1609
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../modules/calendar/e-task-shell-view-actions.c:766
+#: ../modules/mail/e-mail-shell-view-actions.c:1610
 msgid "_Rename..."
 msgstr "_Nimeä uudestaan..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:933
+#: ../modules/addressbook/e-book-shell-view-actions.c:929
 msgid "Rename the selected address book"
 msgstr "Nimeä valittu osoitekirja uudestaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:940
+#: ../modules/addressbook/e-book-shell-view-actions.c:936
 msgid "Stop loading"
 msgstr "Keskeytä lataaminen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:945
+#: ../modules/addressbook/e-book-shell-view-actions.c:941
 msgid "_Copy Contact To..."
 msgstr "_Kopioi yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:947
+#: ../modules/addressbook/e-book-shell-view-actions.c:943
 msgid "Copy selected contacts to another address book"
 msgstr "Kopioi valitut yhteystiedot toiseen osoitekirjaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:952
+#: ../modules/addressbook/e-book-shell-view-actions.c:948
 msgid "_Delete Contact"
 msgstr "_Poista yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:959
+#: ../modules/addressbook/e-book-shell-view-actions.c:955
 msgid "_Find in Contact..."
 msgstr "_Etsi yhteystiedosta..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:961
+#: ../modules/addressbook/e-book-shell-view-actions.c:957
 msgid "Search for text in the displayed contact"
 msgstr "Etsi tekstiä näytettävästä yhteystiedosta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:966
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
 msgid "_Forward Contact..."
 msgstr "_Välitä yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:968
+#: ../modules/addressbook/e-book-shell-view-actions.c:964
 msgid "Send selected contacts to another person"
 msgstr "Lähetä valitut yhteystiedot toiselle henkilölle"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:973
+#: ../modules/addressbook/e-book-shell-view-actions.c:969
 msgid "_Move Contact To..."
 msgstr "_Siirry yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:975
+#: ../modules/addressbook/e-book-shell-view-actions.c:971
 msgid "Move selected contacts to another address book"
 msgstr "Siirrä valitut yhteystiedot toiseen osoitekirjaan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:980
+#: ../modules/addressbook/e-book-shell-view-actions.c:976
 msgid "_New Contact..."
 msgstr "_Uusi yhteystieto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:987
+#: ../modules/addressbook/e-book-shell-view-actions.c:983
 msgid "New Contact _List..."
 msgstr "Uusi yhteystieto_luettelo..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:994
+#: ../modules/addressbook/e-book-shell-view-actions.c:990
 msgid "_Open Contact"
 msgstr "_Avaa yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:996
+#: ../modules/addressbook/e-book-shell-view-actions.c:992
 msgid "View the current contact"
 msgstr "Katsele nykyistä yhteystietoa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1001
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
 msgid "_Send Message to Contact..."
 msgstr "Lähetä _viesti henkilölle..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1003
+#: ../modules/addressbook/e-book-shell-view-actions.c:999
 msgid "Send a message to the selected contacts"
 msgstr "Lähetä viesti valituille henkilöille"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1010
-#: ../modules/calendar/e-cal-shell-view-actions.c:1577
-#: ../modules/calendar/e-task-shell-view-actions.c:825
+#: ../modules/addressbook/e-book-shell-view-actions.c:1006
+#: ../modules/calendar/e-cal-shell-view-actions.c:1576
+#: ../modules/calendar/e-task-shell-view-actions.c:824
 msgid "_Actions"
 msgstr "T_oiminnot"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1017
-#: ../modules/calendar/e-memo-shell-view-actions.c:680
-#: ../modules/calendar/e-task-shell-view-actions.c:832
-#: ../modules/mail/e-mail-shell-view-actions.c:1774
+#: ../modules/addressbook/e-book-shell-view-actions.c:1013
+#: ../modules/calendar/e-memo-shell-view-actions.c:679
+#: ../modules/calendar/e-task-shell-view-actions.c:831
+#: ../modules/mail/e-mail-shell-view-actions.c:1775
 msgid "_Preview"
 msgstr "_Esikatselu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1026
-#: ../modules/calendar/e-cal-shell-view-actions.c:1594
-#: ../modules/calendar/e-memo-shell-view-actions.c:693
-#: ../modules/calendar/e-task-shell-view-actions.c:845
-msgid "_Delete"
-msgstr "_Poista"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:1030
-#: ../modules/mail/e-mail-shell-view-actions.c:1525
-msgid "_Properties"
-msgstr "_Ominaisuudet"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:1038
+#: ../modules/addressbook/e-book-shell-view-actions.c:1034
 msgid "Address Book Map"
 msgstr "Osoitekirjakartta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1070
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
 msgid "Contact _Preview"
 msgstr "Yhteystiedon _esikatselu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1072
+#: ../modules/addressbook/e-book-shell-view-actions.c:1068
 msgid "Show contact preview window"
 msgstr "Näytä yhteystiedon esikatseluruutu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1078
+#: ../modules/addressbook/e-book-shell-view-actions.c:1074
 msgid "Show _Maps"
 msgstr "Näytä _kartat"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1080
+#: ../modules/addressbook/e-book-shell-view-actions.c:1076
 #, fuzzy
 msgid "Show maps in contact preview window"
 msgstr "Näytä yhteystiedon esikatseluruutu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1099
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
-#: ../modules/calendar/e-task-shell-view-actions.c:914
-#: ../modules/mail/e-mail-shell-view-actions.c:1904
+#: ../modules/addressbook/e-book-shell-view-actions.c:1095
+#: ../modules/calendar/e-memo-shell-view-actions.c:749
+#: ../modules/calendar/e-task-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:1905
 msgid "_Classic View"
 msgstr "_Perinteinen näkymä"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1101
+#: ../modules/addressbook/e-book-shell-view-actions.c:1097
 msgid "Show contact preview below the contact list"
 msgstr "Näytä yhteystiedon esikatselu yhteystietoluettelon alla"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1106
-#: ../modules/calendar/e-memo-shell-view-actions.c:757
-#: ../modules/calendar/e-task-shell-view-actions.c:921
-#: ../modules/mail/e-mail-shell-view-actions.c:1911
+#: ../modules/addressbook/e-book-shell-view-actions.c:1102
+#: ../modules/calendar/e-memo-shell-view-actions.c:756
+#: ../modules/calendar/e-task-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:1912
 msgid "_Vertical View"
 msgstr "_Pystysuuntainen näkymä"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1108
+#: ../modules/addressbook/e-book-shell-view-actions.c:1104
 msgid "Show contact preview alongside the contact list"
 msgstr "Näytä yhteystiedon esikatselu yhteystietoluettelon vieressä"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1123
-#: ../modules/calendar/e-cal-shell-view-actions.c:1754
-#: ../modules/calendar/e-memo-shell-view-actions.c:774
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/addressbook/e-book-shell-view-actions.c:1119
+#: ../modules/calendar/e-cal-shell-view-actions.c:1753
+#: ../modules/calendar/e-memo-shell-view-actions.c:773
+#: ../modules/calendar/e-task-shell-view-actions.c:972
 msgid "Unmatched"
 msgstr "Täsmäämättömät"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1133
-#: ../modules/calendar/e-cal-shell-view-actions.c:1764
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
-#: ../modules/calendar/e-task-shell-view-actions.c:983
-#: ../modules/mail/e-mail-shell-view-actions.c:1980
-#: ../shell/e-shell-content.c:658
+#: ../modules/addressbook/e-book-shell-view-actions.c:1129
+#: ../modules/calendar/e-cal-shell-view-actions.c:1763
+#: ../modules/calendar/e-memo-shell-view-actions.c:783
+#: ../modules/calendar/e-task-shell-view-actions.c:982
+#: ../modules/mail/e-mail-shell-view-actions.c:1981
+#: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Oma haku"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1166
+#: ../modules/addressbook/e-book-shell-view-actions.c:1162
 msgid "Print all shown contacts"
 msgstr "Tulosta kaikki näytettävät yhteystiedot"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1173
+#: ../modules/addressbook/e-book-shell-view-actions.c:1169
 msgid "Preview the contacts to be printed"
 msgstr "Esikatsele tulostettavia yhteystietoja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1180
+#: ../modules/addressbook/e-book-shell-view-actions.c:1176
 msgid "Print selected contacts"
 msgstr "Tulosta valitut yhteystiedot"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1195
+#: ../modules/addressbook/e-book-shell-view-actions.c:1191
 msgid "S_ave Address Book as vCard"
 msgstr "T_allenna osoitekirja VCardina"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1197
+#: ../modules/addressbook/e-book-shell-view-actions.c:1193
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Tallenna yhteystiedot valitussa osoitekirjassa VCardina"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1203
-#: ../modules/addressbook/e-book-shell-view-actions.c:1213
+#: ../modules/addressbook/e-book-shell-view-actions.c:1199
+#: ../modules/addressbook/e-book-shell-view-actions.c:1209
 msgid "_Save as vCard..."
 msgstr "_Tallenna vCard-muodossa..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1205
+#: ../modules/addressbook/e-book-shell-view-actions.c:1201
 msgid "Save selected contacts as a vCard"
 msgstr "Tallenna valitut yhteystiedot VCardina"
 
-#: ../modules/addressbook/e-book-shell-view.c:312
+#: ../modules/addressbook/e-book-shell-view.c:311
 msgid "_Forward Contacts"
 msgstr "_Välitä yhteystiedot"
 
-#: ../modules/addressbook/e-book-shell-view.c:314
+#: ../modules/addressbook/e-book-shell-view.c:313
 msgid "_Forward Contact"
 msgstr "_Välitä yhteystieto"
 
-#: ../modules/addressbook/e-book-shell-view.c:345
+#: ../modules/addressbook/e-book-shell-view.c:344
 msgid "_Send Message to Contacts"
 msgstr "Lähetä _viesti henkilöille"
 
-#: ../modules/addressbook/e-book-shell-view.c:347
+#: ../modules/addressbook/e-book-shell-view.c:346
 msgid "_Send Message to List"
 msgstr "Lähetä _viesti listalle"
 
-#: ../modules/addressbook/e-book-shell-view.c:349
+#: ../modules/addressbook/e-book-shell-view.c:348
 msgid "_Send Message to Contact"
 msgstr "Lähetä _viesti henkilölle"
 
-#: ../modules/audio-inline/e-mail-formatter-audio.c:316
-msgid "Audio Player"
-msgstr "Äänisoitin"
-
-#: ../modules/audio-inline/e-mail-formatter-audio.c:317
-msgid "Play the attachment in embedded audio player"
-msgstr ""
-
-#: ../modules/backup-restore/e-mail-config-restore-page.c:165
+#: ../modules/backup-restore/e-mail-config-restore-page.c:164
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -15861,132 +16245,132 @@ msgstr ""
 "Palautus palauttaa kaikki henkilökohtaiset tiedot, asetukset, "
 "sähköpostisuodattimet jne."
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:180
+#: ../modules/backup-restore/e-mail-config-restore-page.c:179
 msgid "_Restore from a backup file:"
 msgstr "_Palauta varmuuskopiotiedostosta:"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:191
+#: ../modules/backup-restore/e-mail-config-restore-page.c:190
 msgid "Choose a backup file to restore"
 msgstr "Valitse palautettava varmuuskopiotiedosto"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/backup-restore/e-mail-config-restore-page.c:311
-#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:57
+#: ../modules/backup-restore/e-mail-config-restore-page.c:310
+#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:56
 msgid "Restore from Backup"
 msgstr "Palauta varmuuskopiosta"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:217
+#: ../modules/backup-restore/evolution-backup-restore.c:216
 msgid "Select name of the Evolution backup file"
 msgstr "Valitse Evolutionin varmuuskopiotiedoston nimi"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:250
+#: ../modules/backup-restore/evolution-backup-restore.c:249
 msgid "_Restart Evolution after backup"
 msgstr "Käynnistä Evolution _uudestaan varmuuskopioinnin jälkeen"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:277
+#: ../modules/backup-restore/evolution-backup-restore.c:276
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Valitse palautettavan Evolutionin varmuuskopiotiedoston nimi"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:290
+#: ../modules/backup-restore/evolution-backup-restore.c:289
 msgid "_Restart Evolution after restore"
 msgstr "Käynnistä Evolution _uudestaan varmuuskopioinnin jälkeen"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:308
+#: ../modules/backup-restore/evolution-backup-restore.c:307
 msgid "_Back up Evolution Data..."
 msgstr "_Varmuuskopioi Evolutionin tiedot..."
 
-#: ../modules/backup-restore/evolution-backup-restore.c:310
+#: ../modules/backup-restore/evolution-backup-restore.c:309
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Varmuuskopioi Evolutionin tiedot ja asetukset arkistotiedostoon"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:315
+#: ../modules/backup-restore/evolution-backup-restore.c:314
 msgid "R_estore Evolution Data..."
 msgstr "Palauta _Evolutionin tiedot..."
 
-#: ../modules/backup-restore/evolution-backup-restore.c:317
+#: ../modules/backup-restore/evolution-backup-restore.c:316
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Palauta Evolutionin tietoja ja asetuksia arkistotiedostosta"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:84
+#: ../modules/backup-restore/evolution-backup-tool.c:83
 msgid "Back up Evolution directory"
 msgstr "Varmuuskopioi Evolutionin hakemisto"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:86
+#: ../modules/backup-restore/evolution-backup-tool.c:85
 msgid "Restore Evolution directory"
 msgstr "Palauta Evolutionin hakemisto"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:88
+#: ../modules/backup-restore/evolution-backup-tool.c:87
 msgid "Check Evolution Back up"
 msgstr "Tarkista Evolutionin varmuuskopio"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:90
+#: ../modules/backup-restore/evolution-backup-tool.c:89
 msgid "Restart Evolution"
 msgstr "Käynnistä Evolution uudestaan"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:92
+#: ../modules/backup-restore/evolution-backup-tool.c:91
 msgid "With Graphical User Interface"
 msgstr "Graafisen käyttöliittymän kanssa"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:322
-#: ../modules/backup-restore/evolution-backup-tool.c:516
+#: ../modules/backup-restore/evolution-backup-tool.c:321
+#: ../modules/backup-restore/evolution-backup-tool.c:515
 msgid "Shutting down Evolution"
 msgstr "Sammutetaan Evolutionia"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:331
+#: ../modules/backup-restore/evolution-backup-tool.c:330
 msgid "Backing Evolution accounts and settings"
 msgstr "Varmuuskopioidaan Evolutionin tilejä ja asetuksia"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:348
+#: ../modules/backup-restore/evolution-backup-tool.c:347
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Varmuuskopioidaan Evolutionin tietoja (viestejä, yhteystietoja, "
 "kalentereita, tehtäviä ja muistioita)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:364
+#: ../modules/backup-restore/evolution-backup-tool.c:363
 msgid "Back up complete"
 msgstr "Varmuuskopiointi valmistui"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:371
-#: ../modules/backup-restore/evolution-backup-tool.c:703
+#: ../modules/backup-restore/evolution-backup-tool.c:370
+#: ../modules/backup-restore/evolution-backup-tool.c:702
 msgid "Restarting Evolution"
 msgstr "Käynnistetään Evolution uudestaan"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:522
+#: ../modules/backup-restore/evolution-backup-tool.c:521
 msgid "Back up current Evolution data"
 msgstr "Varmuuskopioi tämänhetkiset Evolutionin tiedot"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:529
+#: ../modules/backup-restore/evolution-backup-tool.c:528
 msgid "Extracting files from back up"
 msgstr "Puretaan tiedostoja varmuuskopiosta"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:611
+#: ../modules/backup-restore/evolution-backup-tool.c:610
 msgid "Loading Evolution settings"
 msgstr "Ladataan Evolutionin asetuksia"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:677
+#: ../modules/backup-restore/evolution-backup-tool.c:676
 msgid "Removing temporary back up files"
 msgstr "Poistetaan varmuuskopioinnin väliaikaistiedostoja"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:688
+#: ../modules/backup-restore/evolution-backup-tool.c:687
 msgid "Reloading registry service"
 msgstr "Ladataan uudelleen rekisteripalvelua"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:915
+#: ../modules/backup-restore/evolution-backup-tool.c:916
 msgid "Evolution Back Up"
 msgstr "Evolutionin varmuuskopiointi"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:916
+#: ../modules/backup-restore/evolution-backup-tool.c:917
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Varmuuskopioidaan kansioon %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:920
+#: ../modules/backup-restore/evolution-backup-tool.c:921
 msgid "Evolution Restore"
 msgstr "Evolutionin palautus"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:921
+#: ../modules/backup-restore/evolution-backup-tool.c:922
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Palautetaan kansiosta %s"
@@ -16065,90 +16449,92 @@ msgstr "Oikeudet eivät riitä"
 msgid "The selected folder is not writable."
 msgstr "Valittuun kansioon ei voi kirjoittaa."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:145
+#: ../modules/bogofilter/evolution-bogofilter.c:144
 #, fuzzy, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "Virhe käytettäessä lähtevän postin suodattimia: %s"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:163
+#: ../modules/bogofilter/evolution-bogofilter.c:162
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:212
+#: ../modules/bogofilter/evolution-bogofilter.c:211
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:308
+#: ../modules/bogofilter/evolution-bogofilter.c:307
 msgid "Bogofilter Options"
 msgstr "Bogofilter-asetukset"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:317
+#: ../modules/bogofilter/evolution-bogofilter.c:316
 msgid "Convert message text to _Unicode"
 msgstr "Muunna viestin teksti _Unicode-muotoon"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:474
+#: ../modules/bogofilter/evolution-bogofilter.c:473
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447
-#| msgid "S_tandard Font:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
 msgid "Standard LDAP Port"
 msgstr "Standardi LDAP_portti"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:625
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
 msgid "LDAP over SSL (deprecated)"
 msgstr "LDAP SSL:n yli (vanhennettu)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
 msgid "Microsoft Global Catalog"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:465
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:464
 msgid "Microsoft Global Catalog over SSL"
 msgstr ""
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:570
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:569
 msgid "Connecting to LDAP"
 msgstr "LDAP:iin yhdistäminen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:587
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:586
 msgid "Server Information"
 msgstr "Palvelimen tiedot"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:628
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:613
+msgid "Port:"
+msgstr "Portti:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:627
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (suositeltu)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:630
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:629
 msgid "Encryption:"
 msgstr "Salaus:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:654
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:246
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:180
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:653
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:179
 msgid "Authentication"
 msgstr "Kirjautuminen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
 msgid "Anonymous"
 msgstr "Anonyymisti"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:680
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
 msgid "Using email address"
 msgstr "Käytetään sähköpostiosoitetta"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:682
 msgid "Using distinguished name (DN)"
 msgstr "Käytetään yksilöllistä nimeä (DN)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:685
-#| msgid "Input Methods"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid "Method:"
 msgstr "Menetelmä:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
 #, fuzzy
 #| msgid ""
 #| "This is the method Evolution will use to authenticate you.  Note that "
@@ -16164,38 +16550,38 @@ msgstr ""
 "palvelimellesi."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:705
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:704
 msgid "Using LDAP"
 msgstr "LDAP:in käyttäminen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:722
-#: ../modules/mail/e-mail-shell-view.c:117
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:721
+#: ../modules/mail/e-mail-shell-view.c:115
 msgid "Searching"
 msgstr "Etsitään"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:744
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
 msgid "Search Base:"
 msgstr "Hakupohja:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:749
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:747
 #, fuzzy
 #| msgid "_Find Possible Search Bases"
 msgid "Find Possible Search Bases"
 msgstr "_Etsi mahdolliset hakupohjat"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:774
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:769
 msgid "One Level"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:771
 msgid "Subtree"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
 msgid "Search Scope:"
 msgstr "Hakualue:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:783
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
 #, fuzzy
 #| msgid ""
 #| "The search scope defines how deep you would like the search to extend "
@@ -16213,186 +16599,218 @@ msgstr ""
 "alipuissa, kun taas kattavuus \"Yksi\" kattaa kentät yhden tason "
 "hakupohjastasi alaspäin."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:792
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:787
 msgid "Search Filter:"
 msgstr "Hakusuodatin:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:804
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:799
 msgid "Downloading"
 msgstr "Noudetaan"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:820
 msgid "Limit:"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
 msgid "contacts"
 msgstr "yhteystietoa"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:841
-#, fuzzy
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
 #| msgid "B_rowse this book until limit reached"
 msgid "Browse until limit is reached"
-msgstr "S_elaa tätä kirjaa, kunnes raja tulee vastaan"
+msgstr "Selaa kunnes raja tulee vastaan"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:136
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:205
-#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:128
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:135
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:204
+#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
 msgid "URL:"
 msgstr "URL:"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:146
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:145
 #, fuzzy
 #| msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Vältä IfMatch-komentoa (vaaditaan Apache-versiolle < 2.2.8)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:441
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP-virhe: %s"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:475
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:469
 #, fuzzy
 #| msgid "Could not parse PGP message: "
 msgid "Could not parse response"
 msgstr "PGP-viestiä ei voitu tulkita:"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:484
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:478
 msgid "Empty response"
 msgstr "Tyhjä vastaus"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:492
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:486
 msgid "Unexpected reply from server"
 msgstr "Odottamaton vastaus palvelimelta"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1124
-#, fuzzy
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1118
 #| msgid "Could not find any user calendar."
 msgid "Could not locate user's calendars"
-msgstr "Yhtään käyttäjäkalenteria ei löytynyt."
+msgstr "Käyttäjän kalenterien paikallistaminen epäonnistui"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1348
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1342
 msgid "Path"
 msgstr "Polku"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:264
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:200
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:263
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:199
 msgid "Choose a Calendar"
 msgstr "Valitse kalenteri"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:267
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:266
 #, fuzzy
 #| msgid "New Memo List"
 msgid "Choose a Memo List"
 msgstr "Uusi muistilappulista"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:270
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:269
 #, fuzzy
 #| msgid "Select a Task List"
 msgid "Choose a Task List"
 msgstr "Valitse tehtävälista"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:219
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:218
 #, fuzzy
 #| msgid "Web Calendars"
 msgid "Find Calendars"
 msgstr "Web-kalenterit"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:222
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:221
 #, fuzzy
 #| msgid "Memo List"
 msgid "Find Memo Lists"
 msgstr "Muistilappulista"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:225
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:224
 #, fuzzy
 #| msgid "Task List"
 msgid "Find Task Lists"
 msgstr "Tehtävälista"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:243
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:242
 msgid "Email:"
 msgstr "Sähköposti_"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:248
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:247
 msgid "Server handles meeting invitations"
 msgstr "Palvelin hallitsee tapaamiskutsuja"
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:71
-#| msgid "Add local address books to Evolution."
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:70
 msgid "Choose which address books to use."
 msgstr "Valitse käytettävät osoitekirjat."
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:201
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:200
 #, fuzzy
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Syntymä- ja vuosipäivät"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:127
+#: ../modules/cal-config-google/e-google-chooser-button.c:126
 msgid "Default User Calendar"
 msgstr "Käyttäjän oletuskalenteri"
 
-#: ../modules/cal-config-google/e-google-chooser.c:515
+#: ../modules/cal-config-google/e-google-chooser.c:514
 #, c-format
 msgid "Enter Google password for user '%s'."
 msgstr "Anna käyttäjän '%s' Google-salasana."
 
-#: ../modules/cal-config-google/e-google-chooser.c:532
+#: ../modules/cal-config-google/e-google-chooser.c:531
 msgid "User declined to provide a password"
 msgstr "Käyttäjä kieltäytyi antamasta salasanaa"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:160
+#: ../modules/cal-config-local/evolution-cal-config-local.c:159
 msgid "Use an existing iCalendar (ics) file"
 msgstr "Käytä olemassa olevaa iCalendar (ics) -tiedostoa"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:185
+#: ../modules/cal-config-local/evolution-cal-config-local.c:184
 msgid "iCalendar File"
 msgstr "iCalendar-tiedosto"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:197
+#: ../modules/cal-config-local/evolution-cal-config-local.c:196
 msgid "Choose an iCalendar file"
 msgstr "Valitse iCalendar-tiedosto"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:200
+#: ../modules/cal-config-local/evolution-cal-config-local.c:199
 msgid "File:"
 msgstr "Tiedosto:"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:215
+#: ../modules/cal-config-local/evolution-cal-config-local.c:214
 msgid "Allow Evolution to update the file"
 msgstr "Salli Evolutionin päivittää tiedosto"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:320
+#. Translators: Please indicate whether your locale uses the
+#. * metric or imperial measurement system by changing this to
+#. * either "default:mm" or "default:inch", respectively.
+#. *
+#. * This string is just a fallback mechanism for systems on
+#. * which _NL_MEASUREMENT_MEASUREMENT is not available.
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:187
+#, fuzzy
+#| msgid "Default"
+msgctxt "locale-metric"
+msgid "default:mm"
+msgstr "Oletukset"
+
+#. Translators: This is the temperature in degrees
+#. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:259
+msgid "Fahrenheit (°F)"
+msgstr ""
+
+#. Translators: This is the temperature in degrees
+#. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:264
+msgid "Centigrade (°C)"
+msgstr ""
+
+#. Translators: This is the temperature in kelvin.
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:268
+msgid "Kelvin (K)"
+msgstr ""
+
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:270
+#| msgid "_Units:"
+msgid "Units:"
+msgstr "Yksiköt:"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:319
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "_Tuo"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:406
+#: ../modules/calendar/e-cal-attachment-handler.c:405
 msgid "Select a Calendar"
 msgstr "Valitse kalenteri"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:433
+#: ../modules/calendar/e-cal-attachment-handler.c:432
 msgid "Select a Task List"
 msgstr "Valitse tehtävälista"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:443
+#: ../modules/calendar/e-cal-attachment-handler.c:442
 msgid "I_mport to Calendar"
 msgstr "Tuo _kalenteriin"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:450
+#: ../modules/calendar/e-cal-attachment-handler.c:449
 msgid "I_mport to Tasks"
 msgstr "_Tuo tehtäviin"
 
-#: ../modules/calendar/e-calendar-preferences.c:517
+#: ../modules/calendar/e-calendar-preferences.c:516
 #, fuzzy
 msgid "Selected Calendars for Alarms"
 msgstr "Valitse kalenterit hälytyksille"
 
-#: ../modules/calendar/e-calendar-preferences.c:925
+#: ../modules/calendar/e-calendar-preferences.c:924
 msgid "Ti_me and date:"
 msgstr "_Päiväys ja aika:"
 
-#: ../modules/calendar/e-calendar-preferences.c:926
+#: ../modules/calendar/e-calendar-preferences.c:925
 msgid "_Date only:"
 msgstr "_Vain päiväys:"
 
@@ -16453,7 +16871,7 @@ msgid "_24 hour"
 msgstr "_24 tuntia"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
-#: ../modules/calendar/e-cal-shell-view-actions.c:1716
+#: ../modules/calendar/e-cal-shell-view-actions.c:1715
 msgid "Work Week"
 msgstr "Työviikko"
 
@@ -16550,14 +16968,12 @@ msgid "Task List"
 msgstr "Tehtävälista"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:57
-#, fuzzy
 msgid "Highlight t_asks due today"
-msgstr "_Tänään erääntyvät tehtävät:"
+msgstr "Korosta _tänään erääntyvät tehtävät"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:59
-#, fuzzy
 msgid "Highlight _overdue tasks"
-msgstr "_Eräpäivän ylittäneet tehtävät:"
+msgstr "Korosta _eräpäivän ylittäneet tehtävät"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "_Hide completed tasks after"
@@ -16611,72 +17027,72 @@ msgstr "%u ja %d korvataan sähköpostiosoitteen käyttäjällä ja aluenimellä
 msgid "Publishing Information"
 msgstr "Julkaisupaikka"
 
-#: ../modules/calendar/e-cal-shell-backend.c:313
-#: ../modules/calendar/e-cal-shell-view-actions.c:191
+#: ../modules/calendar/e-cal-shell-backend.c:312
+#: ../modules/calendar/e-cal-shell-view-actions.c:190
 msgid "New Calendar"
 msgstr "Uusi kalenteri"
 
-#: ../modules/calendar/e-cal-shell-backend.c:322
+#: ../modules/calendar/e-cal-shell-backend.c:321
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:324
-#: ../modules/calendar/e-cal-shell-view-actions.c:1521
+#: ../modules/calendar/e-cal-shell-backend.c:323
+#: ../modules/calendar/e-cal-shell-view-actions.c:1520
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:329
+#: ../modules/calendar/e-cal-shell-backend.c:328
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Koko päivän tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:331
+#: ../modules/calendar/e-cal-shell-backend.c:330
 msgid "Create a new all-day appointment"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:336
+#: ../modules/calendar/e-cal-shell-backend.c:335
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Kokous"
 
-#: ../modules/calendar/e-cal-shell-backend.c:338
+#: ../modules/calendar/e-cal-shell-backend.c:337
 msgid "Create a new meeting request"
 msgstr "Luo uusi kokouskutsu"
 
-#: ../modules/calendar/e-cal-shell-backend.c:346
+#: ../modules/calendar/e-cal-shell-backend.c:345
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_Kalenteri"
 
-#: ../modules/calendar/e-cal-shell-backend.c:348
-#: ../modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../modules/calendar/e-cal-shell-backend.c:347
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "Create a new calendar"
 msgstr "Luo uusi kalenteri"
 
-#: ../modules/calendar/e-cal-shell-backend.c:703
+#: ../modules/calendar/e-cal-shell-backend.c:702
 msgid "Calendar and Tasks"
 msgstr "Kalenteri ja tehtävät"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:119
+#: ../modules/calendar/e-cal-shell-sidebar.c:118
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "Avataan kalenteria %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:591
+#: ../modules/calendar/e-cal-shell-sidebar.c:589
 msgid "Calendar Selector"
 msgstr "Kalenterin valinta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:216
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view-actions.c:215
+#: ../modules/calendar/e-cal-shell-view-actions.c:244
 msgid "Print"
 msgstr "Tulosta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:291
+#: ../modules/calendar/e-cal-shell-view-actions.c:290
 msgid "Calendar Properties"
 msgstr "Kalenterin ominaisuudet"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:322
+#: ../modules/calendar/e-cal-shell-view-actions.c:321
 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 "
@@ -16687,599 +17103,613 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:339
+#: ../modules/calendar/e-cal-shell-view-actions.c:338
 msgid "Purge events older than"
 msgstr "Poista vanhemmat tapahtumat kuin"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:585
+#: ../modules/calendar/e-cal-shell-view-actions.c:584
 msgid "Copying Items"
 msgstr "Kopioidaan tiedostoja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:878
+#: ../modules/calendar/e-cal-shell-view-actions.c:877
 msgid "Moving Items"
 msgstr "Siirretään kohteita"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1211
+#: ../modules/calendar/e-cal-shell-view-actions.c:1210
 msgid "event"
 msgstr "tapahtuma"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1213
-#: ../modules/calendar/e-cal-shell-view-memopad.c:231
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:527
-#: ../modules/calendar/e-task-shell-view-actions.c:644
+#: ../modules/calendar/e-cal-shell-view-actions.c:1212
+#: ../modules/calendar/e-cal-shell-view-memopad.c:230
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:297
+#: ../modules/calendar/e-memo-shell-view-actions.c:526
+#: ../modules/calendar/e-task-shell-view-actions.c:643
 msgid "Save as iCalendar"
 msgstr "Tallenna iCalendar-muodossa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
+#: ../modules/calendar/e-memo-shell-view-actions.c:607
+#: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "_Copy..."
 msgstr "_Kopioi..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "D_elete Calendar"
 msgstr "_Poista kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1360
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 msgid "Delete the selected calendar"
 msgstr "Poista valittu kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Go Back"
 msgstr "Siirry takaisin"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
 msgid "Go Forward"
 msgstr "Siirry eteenpäin"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1381
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "Select today"
 msgstr "Valitse tämä päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1386
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 msgid "Select _Date"
 msgstr "Valitse _päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1388
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
 msgid "Select a specific date"
 msgstr "Valitse tietty päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "_New Calendar"
 msgstr "_Uusi kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
-#: ../modules/calendar/e-task-shell-view-actions.c:816
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
+#: ../modules/calendar/e-task-shell-view-actions.c:815
 msgid "Purg_e"
 msgstr "_Tyhjennä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 msgid "Purge old appointments and meetings"
 msgstr "Poista vanhat tapaamiset ja kokoukset"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1416
+#: ../modules/calendar/e-cal-shell-view-actions.c:1415
 msgid "Refresh the selected calendar"
 msgstr "Päivitä valittu kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1422
 msgid "Rename the selected calendar"
 msgstr "Nimeä valittu kalenteri uudestaan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
-msgid "Find _next"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1427
+#| msgid "Find _next"
+msgid "Find _Next"
 msgstr "Etsi _seuraava"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1430
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1429
 #| msgid "Find the next occurrence of the phrase"
 msgid "Find next occurrence of the current search string"
-msgstr "Etsi lauseen seuraava esiintymä"
+msgstr "Etsi hakuehdon seuraava esiintymä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
-msgid "Find _previous"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#| msgid "Find _previous"
+msgid "Find _Previous"
 msgstr "Etsi _edellinen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1437
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1436
 #| msgid "Find the previous occurrence of the phrase"
 msgid "Find previous occurrence of the current search string"
-msgstr "Etsi lauseen edellinen esiintymä"
+msgstr "Etsi hakuehdon edellinen esiintymä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
-msgid "Stop _running search"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+#| msgid "Stop _running search"
+msgid "Stop _Running Search"
 msgstr "Pysäytä _meneillään oleva haku"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1444
+#: ../modules/calendar/e-cal-shell-view-actions.c:1443
 msgid "Stop currently running search"
 msgstr "Pysäytä meneillään oleva haku"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Show _Only This Calendar"
 msgstr "Näytä _vain tämä kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../modules/calendar/e-cal-shell-view-actions.c:1455
 msgid "Cop_y to Calendar..."
 msgstr "_Kopioi kalenteriin..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1463
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
 msgid "_Delegate Meeting..."
 msgstr "_Delegoi kokous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-actions.c:1469
 msgid "_Delete Appointment"
 msgstr "_Poista tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1472
+#: ../modules/calendar/e-cal-shell-view-actions.c:1471
 msgid "Delete selected appointments"
 msgstr "Poista valitut tapaamiset"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../modules/calendar/e-cal-shell-view-actions.c:1476
 msgid "Delete This _Occurrence"
 msgstr "Poista tämä _tapahtumakerta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../modules/calendar/e-cal-shell-view-actions.c:1478
 msgid "Delete this occurrence"
 msgstr "Poista tapahtumiskerta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../modules/calendar/e-cal-shell-view-actions.c:1483
 msgid "Delete All Occ_urrences"
 msgstr "Poista kaikki _esiintymät"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../modules/calendar/e-cal-shell-view-actions.c:1485
 msgid "Delete all occurrences"
 msgstr "Poista kaikki esiintymät"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1491
+#: ../modules/calendar/e-cal-shell-view-actions.c:1490
 msgid "New All Day _Event..."
 msgstr "Uusi koko pä_ivän tapahtuma..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../modules/calendar/e-cal-shell-view-actions.c:1492
 msgid "Create a new all day event"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1498
-#: ../modules/calendar/e-cal-shell-view-memopad.c:265
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-cal-shell-view-actions.c:1497
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
+#: ../modules/calendar/e-memo-shell-view-actions.c:600
+#: ../modules/calendar/e-task-shell-view-actions.c:724
 msgid "_Forward as iCalendar..."
 msgstr "_Välitä iCalendar-muodossa..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1505
+#: ../modules/calendar/e-cal-shell-view-actions.c:1504
 msgid "New _Meeting..."
 msgstr "Uusi _kokous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1507
+#: ../modules/calendar/e-cal-shell-view-actions.c:1506
 msgid "Create a new meeting"
 msgstr "Luo uusi kokous"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1512
+#: ../modules/calendar/e-cal-shell-view-actions.c:1511
 msgid "Mo_ve to Calendar..."
 msgstr "_Siirrä kalenteriin..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
+#: ../modules/calendar/e-cal-shell-view-actions.c:1518
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1525
 msgid "Make this Occurrence _Movable"
 msgstr "Muuta tämä kerta _siirrettäväksi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1533
+#: ../modules/calendar/e-cal-shell-view-actions.c:1532
 msgid "_Open Appointment"
 msgstr "_Avaa tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1535
+#: ../modules/calendar/e-cal-shell-view-actions.c:1534
 msgid "View the current appointment"
 msgstr "Näytä valittu tapaaminen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1540
+#: ../modules/calendar/e-cal-shell-view-actions.c:1539
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1554
+#: ../modules/calendar/e-cal-shell-view-actions.c:1553
 msgid "_Schedule Meeting..."
 msgstr "_Järjestä kokous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+#: ../modules/calendar/e-cal-shell-view-actions.c:1555
 msgid "Converts an appointment to a meeting"
 msgstr "Muuntaa tapaamisen kokoukseksi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1561
+#: ../modules/calendar/e-cal-shell-view-actions.c:1560
 msgid "Conv_ert to Appointment..."
 msgstr "_Muunna kokoukseksi..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1563
+#: ../modules/calendar/e-cal-shell-view-actions.c:1562
 msgid "Converts a meeting to an appointment"
 msgstr "Muuntaa kokouksen tapaamiseksi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1568
+#: ../modules/calendar/e-cal-shell-view-actions.c:1567
 msgid "Quit"
 msgstr "Lopeta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1688
+#: ../modules/calendar/e-cal-shell-view-actions.c:1687
 msgid "Day"
 msgstr "Päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1690
+#: ../modules/calendar/e-cal-shell-view-actions.c:1689
 msgid "Show one day"
 msgstr "Näytä yksi päivä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../modules/calendar/e-cal-shell-view-actions.c:1694
 msgid "List"
 msgstr "Lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1697
+#: ../modules/calendar/e-cal-shell-view-actions.c:1696
 msgid "Show as list"
 msgstr "Näytä luettelona"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1702
+#: ../modules/calendar/e-cal-shell-view-actions.c:1701
 msgid "Month"
 msgstr "Kuukausi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1704
+#: ../modules/calendar/e-cal-shell-view-actions.c:1703
 msgid "Show one month"
 msgstr "Näytä yksi kuukausi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1709
+#: ../modules/calendar/e-cal-shell-view-actions.c:1708
 msgid "Week"
 msgstr "Viikko"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1711
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
 msgid "Show one week"
 msgstr "Näytä yksi viikko"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1718
+#: ../modules/calendar/e-cal-shell-view-actions.c:1717
 msgid "Show one work week"
 msgstr "Näytä yksi työviikko"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-cal-shell-view-actions.c:1725
 msgid "Active Appointments"
 msgstr "Aktiiviset tapaamiset"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1740
+#: ../modules/calendar/e-cal-shell-view-actions.c:1739
 msgid "Next 7 Days' Appointments"
 msgstr "Seuraavien 7 päivän tapaamiset"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1747
+#: ../modules/calendar/e-cal-shell-view-actions.c:1746
 msgid "Occurs Less Than 5 Times"
 msgstr "Ilmenee vähemmän kuin viisi kertaa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1778
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-cal-shell-view-actions.c:1777
+#: ../modules/calendar/e-memo-shell-view-actions.c:797
+#: ../modules/calendar/e-task-shell-view-actions.c:996
 msgid "Description contains"
 msgstr "Kuvaus sisältää"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1785
-#: ../modules/calendar/e-memo-shell-view-actions.c:805
-#: ../modules/calendar/e-task-shell-view-actions.c:1004
+#: ../modules/calendar/e-cal-shell-view-actions.c:1784
+#: ../modules/calendar/e-memo-shell-view-actions.c:804
+#: ../modules/calendar/e-task-shell-view-actions.c:1003
 msgid "Summary contains"
 msgstr "Yhteenveto sisältää"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1797
+#: ../modules/calendar/e-cal-shell-view-actions.c:1794
+#: ../modules/calendar/e-cal-shell-view-actions.c:1808
+#: ../modules/calendar/e-cal-shell-view-memopad.c:295
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
+#: ../modules/calendar/e-memo-shell-view-actions.c:814
+#: ../modules/calendar/e-memo-shell-view-actions.c:828
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
+#: ../modules/calendar/e-task-shell-view-actions.c:1027
+#| msgid "_Print..."
+msgid "Print..."
+msgstr "Tulosta..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1796
 msgid "Print this calendar"
 msgstr "Tulosta tämä kalenteri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1804
+#: ../modules/calendar/e-cal-shell-view-actions.c:1803
 msgid "Preview the calendar to be printed"
 msgstr "Esikatsele tulostettavaa kalenteria"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1826
-#: ../modules/calendar/e-cal-shell-view-memopad.c:306
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:393
-#: ../modules/calendar/e-memo-shell-view-actions.c:846
-#: ../modules/calendar/e-task-shell-view-actions.c:1045
+#: ../modules/calendar/e-cal-shell-view-actions.c:1825
+#: ../modules/calendar/e-cal-shell-view-memopad.c:305
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:392
+#: ../modules/calendar/e-memo-shell-view-actions.c:845
+#: ../modules/calendar/e-task-shell-view-actions.c:1044
 msgid "_Save as iCalendar..."
 msgstr "_Tallenna iCalendar-muodossa..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1903
+#: ../modules/calendar/e-cal-shell-view-actions.c:1902
 msgid "Go To"
 msgstr "Siirry"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:229
-#: ../modules/calendar/e-memo-shell-view-actions.c:525
+#: ../modules/calendar/e-cal-shell-view-memopad.c:228
+#: ../modules/calendar/e-memo-shell-view-actions.c:524
 msgid "memo"
 msgstr "muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:272
-#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../modules/calendar/e-memo-shell-view-actions.c:656
 msgid "New _Memo"
 msgstr "_Uusi muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../modules/calendar/e-memo-shell-backend.c:219
-#: ../modules/calendar/e-memo-shell-view-actions.c:659
+#: ../modules/calendar/e-cal-shell-view-memopad.c:273
+#: ../modules/calendar/e-memo-shell-backend.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:658
 msgid "Create a new memo"
 msgstr "Luo uusi muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:279
-#: ../modules/calendar/e-memo-shell-view-actions.c:664
+#: ../modules/calendar/e-cal-shell-view-memopad.c:278
+#: ../modules/calendar/e-memo-shell-view-actions.c:663
 msgid "_Open Memo"
 msgstr "_Avaa muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:281
-#: ../modules/calendar/e-memo-shell-view-actions.c:666
+#: ../modules/calendar/e-cal-shell-view-memopad.c:280
+#: ../modules/calendar/e-memo-shell-view-actions.c:665
 msgid "View the selected memo"
 msgstr "Näytä valittu muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:286
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
-#: ../modules/calendar/e-memo-shell-view-actions.c:671
-#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/calendar/e-cal-shell-view-memopad.c:285
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:372
+#: ../modules/calendar/e-memo-shell-view-actions.c:670
+#: ../modules/calendar/e-task-shell-view-actions.c:808
 msgid "Open _Web Page"
 msgstr "_Avaa www-sivu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:831
+#: ../modules/calendar/e-cal-shell-view-memopad.c:297
+#: ../modules/calendar/e-memo-shell-view-actions.c:830
 msgid "Print the selected memo"
 msgstr "Tulosta valittu muistilappu"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1600
+#: ../modules/calendar/e-cal-shell-view-private.c:1561
 msgid "Searching next matching event"
 msgstr "Etsitään seuraavaa vastaavaa tapahtumaa"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1601
+#: ../modules/calendar/e-cal-shell-view-private.c:1562
 msgid "Searching previous matching event"
 msgstr "Etsitään edellistä vastaavaa tapahtumaa"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1622
+#: ../modules/calendar/e-cal-shell-view-private.c:1583
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "Vastaavaa tapahtumaa ei löydy %d vuoden aikana"
 msgstr[1] "Vastaavaa tapahtumaa ei löydy %d vuoden aikana"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1626
+#: ../modules/calendar/e-cal-shell-view-private.c:1587
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "Vastaavaa tapahtumaa ei löydy edellisen %d vuoden ajalta"
 msgstr[1] "Vastaavaa tapahtumaa ei löydy edellisen %d vuoden ajalta"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1651
+#: ../modules/calendar/e-cal-shell-view-private.c:1612
 msgid "Cannot search with no active calendar"
-msgstr ""
+msgstr "Etsiminen ei onnistu ilman aktiivista kalenteria"
 
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:296
-#: ../modules/calendar/e-task-shell-view-actions.c:642
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:295
+#: ../modules/calendar/e-task-shell-view-actions.c:641
 msgid "task"
 msgstr "tehtävä"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
-#: ../modules/calendar/e-task-shell-view-actions.c:704
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
+#: ../modules/calendar/e-task-shell-view-actions.c:703
 msgid "_Assign Task"
 msgstr "_Anna tehtäväksi"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
+#: ../modules/calendar/e-task-shell-view-actions.c:780
 msgid "_Mark as Complete"
 msgstr "_Merkitse valmiiksi"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../modules/calendar/e-task-shell-view-actions.c:782
 msgid "Mark selected tasks as complete"
 msgstr "Merkitse valitut tehtävät valmistuneiksi"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
 msgid "_Mark as Incomplete"
 msgstr "_Merkitse keskeneräiseksi"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
-#: ../modules/calendar/e-task-shell-view-actions.c:790
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
+#: ../modules/calendar/e-task-shell-view-actions.c:789
 msgid "Mark selected tasks as incomplete"
 msgstr "Merkitse valitut tehtävät keskeneräisiksi"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-task-shell-view-actions.c:795
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
+#: ../modules/calendar/e-task-shell-view-actions.c:794
 msgid "New _Task"
 msgstr "Uusi _tehtävä"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-task-shell-backend.c:216
-#: ../modules/calendar/e-task-shell-view-actions.c:797
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:360
+#: ../modules/calendar/e-task-shell-backend.c:215
+#: ../modules/calendar/e-task-shell-view-actions.c:796
 msgid "Create a new task"
 msgstr "Luo uusi tehtävä"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:366
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
+#: ../modules/calendar/e-task-shell-view-actions.c:801
 msgid "_Open Task"
 msgstr "Avaa _tehtävä"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:368
-#: ../modules/calendar/e-task-shell-view-actions.c:804
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:367
+#: ../modules/calendar/e-task-shell-view-actions.c:803
 msgid "View the selected task"
 msgstr "Näytä valitut tehtävät"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:385
-#: ../modules/calendar/e-task-shell-view-actions.c:1030
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
+#: ../modules/calendar/e-task-shell-view-actions.c:1029
 msgid "Print the selected task"
 msgstr "Tulosta valittu tehtävä"
 
-#: ../modules/calendar/e-memo-shell-backend.c:208
-#: ../modules/calendar/e-memo-shell-view-actions.c:196
+#: ../modules/calendar/e-memo-shell-backend.c:207
+#: ../modules/calendar/e-memo-shell-view-actions.c:195
 msgid "New Memo List"
 msgstr "Uusi muistilappulista"
 
-#: ../modules/calendar/e-memo-shell-backend.c:217
+#: ../modules/calendar/e-memo-shell-backend.c:216
 msgctxt "New"
 msgid "Mem_o"
 msgstr "_Muistilappu"
 
-#: ../modules/calendar/e-memo-shell-backend.c:224
+#: ../modules/calendar/e-memo-shell-backend.c:223
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Jaettu muistilappu"
 
-#: ../modules/calendar/e-memo-shell-backend.c:226
+#: ../modules/calendar/e-memo-shell-backend.c:225
 msgid "Create a new shared memo"
 msgstr "Luo uusi jaettu muistilappu"
 
-#: ../modules/calendar/e-memo-shell-backend.c:234
+#: ../modules/calendar/e-memo-shell-backend.c:233
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Mui_stilappulista"
 
-#: ../modules/calendar/e-memo-shell-backend.c:236
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-memo-shell-backend.c:235
+#: ../modules/calendar/e-memo-shell-view-actions.c:623
 msgid "Create a new memo list"
 msgstr "Luo uusi muistilappulista"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:117
+#: ../modules/calendar/e-memo-shell-sidebar.c:116
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "Avataan muistilappuluetteloa '%s'"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:547
+#: ../modules/calendar/e-memo-shell-sidebar.c:545
 msgid "Memo List Selector"
 msgstr "Muistilappuluetteloiden valitsin"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:212
-#: ../modules/calendar/e-memo-shell-view-actions.c:227
+#: ../modules/calendar/e-memo-shell-view-actions.c:211
+#: ../modules/calendar/e-memo-shell-view-actions.c:226
 msgid "Print Memos"
 msgstr "Tulosta muistilaput"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:268
+#: ../modules/calendar/e-memo-shell-view-actions.c:267
 msgid "Memo List Properties"
 msgstr "Muistilappulistan ominaisuudet"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:587
+#: ../modules/calendar/e-memo-shell-view-actions.c:586
 msgid "_Delete Memo"
 msgstr "_Poista muistilappu"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:594
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
 msgid "_Find in Memo..."
 msgstr "_Etsi muistilapusta..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:596
+#: ../modules/calendar/e-memo-shell-view-actions.c:595
 msgid "Search for text in the displayed memo"
 msgstr "Etsi tekstiä näytettävästä muistilapusta"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:615
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
 msgid "D_elete Memo List"
 msgstr "_Poista muistilappuluettelo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:616
 msgid "Delete the selected memo list"
 msgstr "Poista valittu muistilappuluettelo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
 msgid "_New Memo List"
 msgstr "_Uusi muistilappulista"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-memo-shell-view-actions.c:637
 msgid "Refresh the selected memo list"
 msgstr "Päivitä valittu muistilappuluettelo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:645
+#: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "Rename the selected memo list"
 msgstr "Nimeä valittu muistilappuluettelo uudestaan"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:650
+#: ../modules/calendar/e-memo-shell-view-actions.c:649
 msgid "Show _Only This Memo List"
 msgstr "Näytä _vain tämä muistilappuluettelo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:729
+#: ../modules/calendar/e-memo-shell-view-actions.c:728
 msgid "Memo _Preview"
 msgstr "Muistilapun _esikatselu"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:731
+#: ../modules/calendar/e-memo-shell-view-actions.c:730
 msgid "Show memo preview pane"
 msgstr "Näytä muistilapun esikatselupaneeli"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:752
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
 msgid "Show memo preview below the memo list"
 msgstr "Näytä muistilapun esikatselu muistilappuluettelon alla"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:759
+#: ../modules/calendar/e-memo-shell-view-actions.c:758
 msgid "Show memo preview alongside the memo list"
 msgstr "Näytä muistilapun esikatselu muistilappuluettelon vieressä"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:817
+#: ../modules/calendar/e-memo-shell-view-actions.c:816
 msgid "Print the list of memos"
 msgstr "Tulosta luettelo muistilapuista"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:824
+#: ../modules/calendar/e-memo-shell-view-actions.c:823
 msgid "Preview the list of memos to be printed"
 msgstr "Esikatsele luetteloa tulostettavista muistilapuista"
 
-#: ../modules/calendar/e-memo-shell-view.c:239
+#: ../modules/calendar/e-memo-shell-view.c:238
 msgid "Delete Memos"
 msgstr "Poista muistilaput"
 
-#: ../modules/calendar/e-memo-shell-view.c:241
+#: ../modules/calendar/e-memo-shell-view.c:240
 msgid "Delete Memo"
 msgstr "Poista muistilappu"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:538
+#: ../modules/calendar/e-memo-shell-view-private.c:537
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d muistilappu"
 msgstr[1] "%d muistilappua"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:542
-#: ../modules/calendar/e-task-shell-view-private.c:746
+#: ../modules/calendar/e-memo-shell-view-private.c:541
+#: ../modules/calendar/e-task-shell-view-private.c:747
 #, c-format
 msgid "%d selected"
 msgstr ", %d valittu"
 
-#: ../modules/calendar/e-task-shell-backend.c:205
-#: ../modules/calendar/e-task-shell-view-actions.c:219
+#: ../modules/calendar/e-task-shell-backend.c:204
+#: ../modules/calendar/e-task-shell-view-actions.c:218
 msgid "New Task List"
 msgstr "Uusi tehtävälista"
 
-#: ../modules/calendar/e-task-shell-backend.c:214
+#: ../modules/calendar/e-task-shell-backend.c:213
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tehtävä"
 
-#: ../modules/calendar/e-task-shell-backend.c:221
+#: ../modules/calendar/e-task-shell-backend.c:220
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tehtäväksi_anto"
 
-#: ../modules/calendar/e-task-shell-backend.c:223
+#: ../modules/calendar/e-task-shell-backend.c:222
 msgid "Create a new assigned task"
 msgstr "Luo uusi tehtäväksianto"
 
-#: ../modules/calendar/e-task-shell-backend.c:231
+#: ../modules/calendar/e-task-shell-backend.c:230
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Te_htävälista"
 
-#: ../modules/calendar/e-task-shell-backend.c:233
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-backend.c:232
+#: ../modules/calendar/e-task-shell-view-actions.c:747
 msgid "Create a new task list"
 msgstr "Luo uusi tehtävälista"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:117
+#: ../modules/calendar/e-task-shell-sidebar.c:116
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "Avataan tehtävälistaa '%s'"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:547
+#: ../modules/calendar/e-task-shell-sidebar.c:545
 msgid "Task List Selector"
 msgstr "Tehtävienluetteloiden valitsin"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:235
-#: ../modules/calendar/e-task-shell-view-actions.c:250
+#: ../modules/calendar/e-task-shell-view-actions.c:234
+#: ../modules/calendar/e-task-shell-view-actions.c:249
 msgid "Print Tasks"
 msgstr "Tulosta tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:291
+#: ../modules/calendar/e-task-shell-view-actions.c:290
 msgid "Task List Properties"
 msgstr "Tehtävälistan ominaisuudet"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:586
+#: ../modules/calendar/e-task-shell-view-actions.c:585
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -17291,115 +17721,111 @@ msgstr ""
 "\n"
 "Valmis poistaa nämä tehtävät?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:593
+#: ../modules/calendar/e-task-shell-view-actions.c:592
 msgid "Do not ask me again"
 msgstr "Älä kysy uudestaan"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:711
+#: ../modules/calendar/e-task-shell-view-actions.c:710
 msgid "_Delete Task"
 msgstr "_Poista tehtävä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:718
+#: ../modules/calendar/e-task-shell-view-actions.c:717
 msgid "_Find in Task..."
 msgstr "_Etsi tehtävästä..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:720
+#: ../modules/calendar/e-task-shell-view-actions.c:719
 msgid "Search for text in the displayed task"
 msgstr "Etsi tekstiä näytettävästä tehtävästä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:732
-msgid "Copy..."
-msgstr "Kopioi..."
-
-#: ../modules/calendar/e-task-shell-view-actions.c:739
+#: ../modules/calendar/e-task-shell-view-actions.c:738
 msgid "D_elete Task List"
 msgstr "_Poista tehtäväluettelo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "Delete the selected task list"
 msgstr "Poista valittu tehtäväluettelo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "_New Task List"
 msgstr "_Uusi tehtävälista"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "Refresh the selected task list"
 msgstr "Päivitä valittu tehtäväluettelo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "Rename the selected task list"
 msgstr "Nimeä valittu tehtäväluettelo uudestaan"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:773
 msgid "Show _Only This Task List"
 msgstr "Näytä _vain tämä tehtävälista"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:787
 msgid "Mar_k as Incomplete"
 msgstr "_Merkitse keskeneräiseksi"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:818
+#: ../modules/calendar/e-task-shell-view-actions.c:817
 msgid "Delete completed tasks"
 msgstr "Poista valmistuneet tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:893
+#: ../modules/calendar/e-task-shell-view-actions.c:892
 msgid "Task _Preview"
 msgstr "Tehtävien _esikatselu"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:895
+#: ../modules/calendar/e-task-shell-view-actions.c:894
 msgid "Show task preview pane"
 msgstr "Näytä tehtävien esikatselupaneeli"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:916
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Show task preview below the task list"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:923
+#: ../modules/calendar/e-task-shell-view-actions.c:922
 msgid "Show task preview alongside the task list"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:931
+#: ../modules/calendar/e-task-shell-view-actions.c:930
 msgid "Active Tasks"
 msgstr "Aktiiviset tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:945
+#: ../modules/calendar/e-task-shell-view-actions.c:944
 msgid "Completed Tasks"
 msgstr "Valmistuneet tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:952
+#: ../modules/calendar/e-task-shell-view-actions.c:951
 msgid "Next 7 Days' Tasks"
 msgstr "Seuraavien 7 päivän tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:959
+#: ../modules/calendar/e-task-shell-view-actions.c:958
 msgid "Overdue Tasks"
 msgstr "Vanhentuneet tehtävät"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../modules/calendar/e-task-shell-view-actions.c:965
 msgid "Tasks with Attachments"
 msgstr "Tehtävät, joissa on liitteitä"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1016
+#: ../modules/calendar/e-task-shell-view-actions.c:1015
 msgid "Print the list of tasks"
 msgstr "Tulosta tehtävälista"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1023
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
 msgid "Preview the list of tasks to be printed"
 msgstr "Esikatsele luetteloa tulostettavista tehtävistä"
 
-#: ../modules/calendar/e-task-shell-view.c:374
+#: ../modules/calendar/e-task-shell-view.c:373
 msgid "Delete Tasks"
 msgstr "Poista tehtäviä"
 
-#: ../modules/calendar/e-task-shell-view.c:376
+#: ../modules/calendar/e-task-shell-view.c:375
 msgid "Delete Task"
 msgstr "Poista tehtävä"
 
-#: ../modules/calendar/e-task-shell-view-private.c:631
+#: ../modules/calendar/e-task-shell-view-private.c:632
 msgid "Expunging"
 msgstr "Poistetaan poistettuja"
 
-#: ../modules/calendar/e-task-shell-view-private.c:742
+#: ../modules/calendar/e-task-shell-view-private.c:743
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -17416,281 +17842,281 @@ msgstr ""
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:235
+#: ../modules/itip-formatter/itip-view.c:228
 msgid "Today %H:%M"
 msgstr "Tänään %H.%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:239
+#: ../modules/itip-formatter/itip-view.c:232
 msgid "Today %H:%M:%S"
 msgstr "Tänään %H.%M.%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:248
+#: ../modules/itip-formatter/itip-view.c:241
 msgid "Today %l:%M:%S %p"
 msgstr "Tänään %l.%M.%S %p"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:263
+#: ../modules/itip-formatter/itip-view.c:256
 msgid "Tomorrow %H:%M"
 msgstr "Huomenna %H.%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:267
+#: ../modules/itip-formatter/itip-view.c:260
 msgid "Tomorrow %H:%M:%S"
 msgstr "Huomenna %H.%M.%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:272
+#: ../modules/itip-formatter/itip-view.c:265
 msgid "Tomorrow %l:%M %p"
 msgstr "Huomenna %l.%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:276
+#: ../modules/itip-formatter/itip-view.c:269
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Huomenna %l.%M.%S %p"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:295
+#: ../modules/itip-formatter/itip-view.c:288
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:300
+#: ../modules/itip-formatter/itip-view.c:293
 msgid "%A %H:%M"
 msgstr "%Ana klo %H.%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:304
+#: ../modules/itip-formatter/itip-view.c:297
 msgid "%A %H:%M:%S"
 msgstr "%Ana klo %H.%M.%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:309
+#: ../modules/itip-formatter/itip-view.c:302
 msgid "%A %l:%M %p"
 msgstr "%Ana klo %l.%M %p"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:313
+#: ../modules/itip-formatter/itip-view.c:306
 msgid "%A %l:%M:%S %p"
 msgstr "%Ana klo %l.%M.%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../modules/itip-formatter/itip-view.c:322
+#: ../modules/itip-formatter/itip-view.c:315
 msgid "%A, %B %e"
 msgstr "+%Ana %e. %Bn %Y"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:328
+#: ../modules/itip-formatter/itip-view.c:321
 msgid "%A, %B %e %H:%M"
 msgstr "+%Ana %e. %Bn klo %H.%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:332
+#: ../modules/itip-formatter/itip-view.c:325
 msgid "%A, %B %e %H:%M:%S"
 msgstr "+%Ana %e. %Bn klo %H.%M.%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:337
+#: ../modules/itip-formatter/itip-view.c:330
 msgid "%A, %B %e %l:%M %p"
 msgstr "+%Ana %e. %Bn klo %l.%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:341
+#: ../modules/itip-formatter/itip-view.c:334
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "+%Ana %e. %Bn klo %l.%M.%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../modules/itip-formatter/itip-view.c:347
+#: ../modules/itip-formatter/itip-view.c:340
 msgid "%A, %B %e, %Y"
 msgstr "%Ana %e. %Bta %Y"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:352
+#: ../modules/itip-formatter/itip-view.c:345
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Ana %e. %Bta %Y klo %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:356
+#: ../modules/itip-formatter/itip-view.c:349
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Ana %e. %Bta %Y klo %H.%M.%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:361
+#: ../modules/itip-formatter/itip-view.c:354
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Ana %e. %Bta %Y klo %l.%M %p"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:365
+#: ../modules/itip-formatter/itip-view.c:358
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Ana %e. %Bta %Y klo %l.%M.%S %p"
 
-#: ../modules/itip-formatter/itip-view.c:403
-#: ../modules/itip-formatter/itip-view.c:404
-#: ../modules/itip-formatter/itip-view.c:493
-#: ../modules/itip-formatter/itip-view.c:494
-#: ../modules/itip-formatter/itip-view.c:583
+#: ../modules/itip-formatter/itip-view.c:396
+#: ../modules/itip-formatter/itip-view.c:397
+#: ../modules/itip-formatter/itip-view.c:486
+#: ../modules/itip-formatter/itip-view.c:487
+#: ../modules/itip-formatter/itip-view.c:576
 msgid "An unknown person"
 msgstr "Tuntematon henkilö"
 
-#: ../modules/itip-formatter/itip-view.c:408
-#: ../modules/itip-formatter/itip-view.c:498
-#: ../modules/itip-formatter/itip-view.c:587
+#: ../modules/itip-formatter/itip-view.c:401
+#: ../modules/itip-formatter/itip-view.c:491
+#: ../modules/itip-formatter/itip-view.c:580
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Vastaa henkilön %s puolesta"
 
-#: ../modules/itip-formatter/itip-view.c:410
-#: ../modules/itip-formatter/itip-view.c:500
-#: ../modules/itip-formatter/itip-view.c:589
+#: ../modules/itip-formatter/itip-view.c:403
+#: ../modules/itip-formatter/itip-view.c:493
+#: ../modules/itip-formatter/itip-view.c:582
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Vastaanotettu henkilön %s puolesta"
 
-#: ../modules/itip-formatter/itip-view.c:415
+#: ../modules/itip-formatter/itip-view.c:408
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s on julkaissut seuraavat kokoustiedot %s kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:417
+#: ../modules/itip-formatter/itip-view.c:410
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s on julkaissut seuraavat kokoustiedot:"
 
-#: ../modules/itip-formatter/itip-view.c:422
+#: ../modules/itip-formatter/itip-view.c:415
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s delegoi seuraavan kokouksen sinulle:"
 
-#: ../modules/itip-formatter/itip-view.c:425
+#: ../modules/itip-formatter/itip-view.c:418
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s pyytää läsnäoloasi seuraavassa kokouksessa %s:n kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:427
+#: ../modules/itip-formatter/itip-view.c:420
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s pyytää läsnäoloasi seuraavassa kokouksessa:"
 
-#: ../modules/itip-formatter/itip-view.c:433
+#: ../modules/itip-formatter/itip-view.c:426
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s toivoo lisäystänsä olemassa olevaan kokoukseen %s kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:435
+#: ../modules/itip-formatter/itip-view.c:428
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s toivoo lisäystään olemassa olevaan kokoukseen:"
 
-#: ../modules/itip-formatter/itip-view.c:439
+#: ../modules/itip-formatter/itip-view.c:432
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 msgstr "%s %s kautta pyytää viimeisimpiä tietoja seuraavasta kokouksesta:"
 
-#: ../modules/itip-formatter/itip-view.c:441
+#: ../modules/itip-formatter/itip-view.c:434
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s toivoo saavansa viimeisimmät tiedot seuraavasta kokouksesta:"
 
-#: ../modules/itip-formatter/itip-view.c:445
+#: ../modules/itip-formatter/itip-view.c:438
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s %s kautta lähetti takaisin seuraavan kokousvastauksen:"
 
-#: ../modules/itip-formatter/itip-view.c:447
+#: ../modules/itip-formatter/itip-view.c:440
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s lähetti takaisin seuraavan kokousvastauksen:"
 
-#: ../modules/itip-formatter/itip-view.c:451
+#: ../modules/itip-formatter/itip-view.c:444
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s perui seuraavan kokouksen %s:n kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:453
+#: ../modules/itip-formatter/itip-view.c:446
 #, c-format
 msgid "%s has canceled the following meeting:"
 msgstr "%s on perunut seuraavan tapaamisen:"
 
-#: ../modules/itip-formatter/itip-view.c:457
+#: ../modules/itip-formatter/itip-view.c:450
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s %s kautta ehdottaa seuraavia muutoksia kokoukseen."
 
-#: ../modules/itip-formatter/itip-view.c:459
+#: ../modules/itip-formatter/itip-view.c:452
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s ehdottaa seuraavia muutoksia kokoukseen:"
 
-#: ../modules/itip-formatter/itip-view.c:463
+#: ../modules/itip-formatter/itip-view.c:456
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s kieltäytyi %s:n kautta seuraavista muutoksista kokoukseen:"
 
-#: ../modules/itip-formatter/itip-view.c:465
+#: ../modules/itip-formatter/itip-view.c:458
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s kieltäytyi seuraavista kokousmuutoksista:"
 
-#: ../modules/itip-formatter/itip-view.c:505
+#: ../modules/itip-formatter/itip-view.c:498
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s julkaisi %s:n kautta seuraavat tehtävät:"
 
-#: ../modules/itip-formatter/itip-view.c:507
+#: ../modules/itip-formatter/itip-view.c:500
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s julkaisi seuraavat tehtävät:"
 
-#: ../modules/itip-formatter/itip-view.c:512
+#: ../modules/itip-formatter/itip-view.c:505
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s pyytää %s:n suorittamaan seuraavat tehtävät:"
 
-#: ../modules/itip-formatter/itip-view.c:515
+#: ../modules/itip-formatter/itip-view.c:508
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s antoi sinulle tehtävän %s:n kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:517
+#: ../modules/itip-formatter/itip-view.c:510
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s antoi sinulle tehtävän:"
 
-#: ../modules/itip-formatter/itip-view.c:523
+#: ../modules/itip-formatter/itip-view.c:516
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s haluaa lisätä olemassa olevaan tehtävään %s kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:525
+#: ../modules/itip-formatter/itip-view.c:518
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s haluaa lisätä olemassa olevaan tehtävään:"
 
-#: ../modules/itip-formatter/itip-view.c:529
+#: ../modules/itip-formatter/itip-view.c:522
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -17698,341 +18124,337 @@ msgid ""
 msgstr ""
 "%s %s kautta toivoo saavansa viimeisimmät tiedot seuraavista työtehtävistä:"
 
-#: ../modules/itip-formatter/itip-view.c:531
+#: ../modules/itip-formatter/itip-view.c:524
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s toivoo saavansa viimeisimmät tiedot seuraavista työtehtävistä:"
 
-#: ../modules/itip-formatter/itip-view.c:535
+#: ../modules/itip-formatter/itip-view.c:528
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s lähetti takaisin %s kautta seuraavan annetun tehtävän vastauksen:"
 
-#: ../modules/itip-formatter/itip-view.c:537
+#: ../modules/itip-formatter/itip-view.c:530
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s lähetti takaisin seuraavan annetun tehtävän vastauksen:"
 
-#: ../modules/itip-formatter/itip-view.c:541
+#: ../modules/itip-formatter/itip-view.c:534
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s on perunut seuraavan annetun tehtävän %s:n kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:543
+#: ../modules/itip-formatter/itip-view.c:536
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s on perunut seuraavan annetun tehtävän:"
 
-#: ../modules/itip-formatter/itip-view.c:547
+#: ../modules/itip-formatter/itip-view.c:540
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s %s kautta ehdottaa seuraavia muutoksia annettuun tehtävään:"
 
-#: ../modules/itip-formatter/itip-view.c:549
+#: ../modules/itip-formatter/itip-view.c:542
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s ehdottaa seuraavia muutoksia annettuun tehtävään:"
 
-#: ../modules/itip-formatter/itip-view.c:553
+#: ../modules/itip-formatter/itip-view.c:546
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s kieltäytyi seuraavasta toimeksiannosta %s kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:555
+#: ../modules/itip-formatter/itip-view.c:548
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s on kieltäytynyt seuraavasta annetusta tehtävästä:"
 
-#: ../modules/itip-formatter/itip-view.c:594
+#: ../modules/itip-formatter/itip-view.c:587
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s julkaisi %s:n kautta seuraavan muistilapun:"
 
-#: ../modules/itip-formatter/itip-view.c:596
+#: ../modules/itip-formatter/itip-view.c:589
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s julkaisi seuraavan muistilapun:"
 
-#: ../modules/itip-formatter/itip-view.c:601
+#: ../modules/itip-formatter/itip-view.c:594
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s haluaa lisätä olemassa olevaan muistilappuun %s kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:603
+#: ../modules/itip-formatter/itip-view.c:596
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s haluaa lisätä olemassa olevaan muistilappuun:"
 
-#: ../modules/itip-formatter/itip-view.c:607
+#: ../modules/itip-formatter/itip-view.c:600
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s perui seuraavan jaetun muistilapun %s:n kautta:"
 
-#: ../modules/itip-formatter/itip-view.c:609
+#: ../modules/itip-formatter/itip-view.c:602
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s on perunut seuraavan jaetun muistilapun:"
 
-#: ../modules/itip-formatter/itip-view.c:682
+#: ../modules/itip-formatter/itip-view.c:675
 msgid "All day:"
 msgstr "Koko päivä:"
 
-#: ../modules/itip-formatter/itip-view.c:688
+#: ../modules/itip-formatter/itip-view.c:681
 msgid "Start day:"
 msgstr "Aloituspäivä:"
 
-#: ../modules/itip-formatter/itip-view.c:688
-#: ../modules/itip-formatter/itip-view.c:1490
+#: ../modules/itip-formatter/itip-view.c:681
+#: ../modules/itip-formatter/itip-view.c:1504
 msgid "Start time:"
 msgstr "Alkamisaika:"
 
-#: ../modules/itip-formatter/itip-view.c:697
+#: ../modules/itip-formatter/itip-view.c:690
 msgid "End day:"
 msgstr "Päättymispäivä:"
 
-#: ../modules/itip-formatter/itip-view.c:697
-#: ../modules/itip-formatter/itip-view.c:1491
+#: ../modules/itip-formatter/itip-view.c:690
+#: ../modules/itip-formatter/itip-view.c:1505
 msgid "End time:"
 msgstr "Loppumisaika:"
 
-#: ../modules/itip-formatter/itip-view.c:1016
-#| msgid "_Open Calendar"
+#: ../modules/itip-formatter/itip-view.c:1030
 msgid "Ope_n Calendar"
 msgstr "_Avaa kalenteri"
 
-#: ../modules/itip-formatter/itip-view.c:1019
+#: ../modules/itip-formatter/itip-view.c:1033
 msgid "_Decline all"
 msgstr "_Hylkää kaikki"
 
-#: ../modules/itip-formatter/itip-view.c:1022
+#: ../modules/itip-formatter/itip-view.c:1036
 msgid "_Decline"
 msgstr "_Hylkää"
 
-#: ../modules/itip-formatter/itip-view.c:1025
+#: ../modules/itip-formatter/itip-view.c:1039
 msgid "_Tentative all"
 msgstr "Kaikki _alustavasti"
 
-#: ../modules/itip-formatter/itip-view.c:1028
+#: ../modules/itip-formatter/itip-view.c:1042
 msgid "_Tentative"
 msgstr "_Alustavasti"
 
-#: ../modules/itip-formatter/itip-view.c:1031
-#| msgid "A_ccept all"
+#: ../modules/itip-formatter/itip-view.c:1045
 msgid "Acce_pt all"
 msgstr "_Hyväksy kaikki"
 
-#: ../modules/itip-formatter/itip-view.c:1034
-#| msgid "Accepted"
+#: ../modules/itip-formatter/itip-view.c:1048
 msgid "Acce_pt"
 msgstr "H_yväksy"
 
-#: ../modules/itip-formatter/itip-view.c:1037
-#, fuzzy
+#: ../modules/itip-formatter/itip-view.c:1051
 #| msgid "_Send Information"
 msgid "Send _Information"
 msgstr "_Lähetä tiedot"
 
-#: ../modules/itip-formatter/itip-view.c:1040
+#: ../modules/itip-formatter/itip-view.c:1054
 msgid "_Update Attendee Status"
 msgstr "_Päivitä läsnäolijan tila"
 
-#: ../modules/itip-formatter/itip-view.c:1043
+#: ../modules/itip-formatter/itip-view.c:1057
 msgid "_Update"
 msgstr "_Päivitä"
 
-#: ../modules/itip-formatter/itip-view.c:1493
-#: ../modules/itip-formatter/itip-view.c:1541
-#: ../modules/itip-formatter/itip-view.c:1612
+#: ../modules/itip-formatter/itip-view.c:1507
+#: ../modules/itip-formatter/itip-view.c:1555
+#: ../modules/itip-formatter/itip-view.c:1626
 msgid "Comment:"
 msgstr "Kommentti:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1529
+#: ../modules/itip-formatter/itip-view.c:1543
 msgid "Send reply to sender"
 msgstr "Vastaa lähettäjälle"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1544
+#: ../modules/itip-formatter/itip-view.c:1558
 msgid "Send _updates to attendees"
 msgstr "Lähetä _päivitykset osallistujille"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1547
+#: ../modules/itip-formatter/itip-view.c:1561
 msgid "_Apply to all instances"
 msgstr "Toteuta _kaikkiin tapahtumakertoihin"
 
-#: ../modules/itip-formatter/itip-view.c:1548
+#: ../modules/itip-formatter/itip-view.c:1562
 msgid "Show time as _free"
 msgstr "Näytä aika _vapaana"
 
-#: ../modules/itip-formatter/itip-view.c:1549
+#: ../modules/itip-formatter/itip-view.c:1563
 msgid "_Preserve my reminder"
 msgstr "_Säilytä oma muistutus"
 
-#: ../modules/itip-formatter/itip-view.c:1550
+#: ../modules/itip-formatter/itip-view.c:1564
 msgid "_Inherit reminder"
 msgstr "_Peri muistutus"
 
-#: ../modules/itip-formatter/itip-view.c:1880
+#: ../modules/itip-formatter/itip-view.c:1894
 msgid "_Tasks:"
 msgstr "_Tehtävät:"
 
-#: ../modules/itip-formatter/itip-view.c:1883
+#: ../modules/itip-formatter/itip-view.c:1897
 msgid "_Memos:"
 msgstr "_Muistilaput:"
 
-#: ../modules/itip-formatter/itip-view.c:3111
+#: ../modules/itip-formatter/itip-view.c:3125
 msgid "Sa_ve"
 msgstr "_Tallenna"
 
-#: ../modules/itip-formatter/itip-view.c:3571
-#: ../modules/itip-formatter/itip-view.c:5016
+#: ../modules/itip-formatter/itip-view.c:3585
+#: ../modules/itip-formatter/itip-view.c:5032
 msgid "Attendee status updated"
 msgstr "Läsnäolon tila päivitetty"
 
-#: ../modules/itip-formatter/itip-view.c:3750
+#: ../modules/itip-formatter/itip-view.c:3764
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr ""
 "Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen "
 "kanssa"
 
-#: ../modules/itip-formatter/itip-view.c:3779
+#: ../modules/itip-formatter/itip-view.c:3793
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
-#: ../modules/itip-formatter/itip-view.c:3892
+#: ../modules/itip-formatter/itip-view.c:3906
 msgid "Unable to find any calendars"
 msgstr "Yhtäkään kalenteria ei löydy"
 
-#: ../modules/itip-formatter/itip-view.c:3900
+#: ../modules/itip-formatter/itip-view.c:3914
 msgid "Unable to find this meeting in any calendar"
 msgstr "Tätä kokousta ei löydy mistään kalenterista"
 
-#: ../modules/itip-formatter/itip-view.c:3905
+#: ../modules/itip-formatter/itip-view.c:3919
 msgid "Unable to find this task in any task list"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
-#: ../modules/itip-formatter/itip-view.c:3910
+#: ../modules/itip-formatter/itip-view.c:3924
 msgid "Unable to find this memo in any memo list"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
-#: ../modules/itip-formatter/itip-view.c:4254
+#: ../modules/itip-formatter/itip-view.c:4268
 msgid "Opening the calendar. Please wait..."
 msgstr "Avataan kalenteria, odota hetki..."
 
-#: ../modules/itip-formatter/itip-view.c:4259
+#: ../modules/itip-formatter/itip-view.c:4273
 msgid "Searching for an existing version of this appointment"
 msgstr "Etsitään olemassa olevia versioita tapaamisesta"
 
-#: ../modules/itip-formatter/itip-view.c:4652
+#: ../modules/itip-formatter/itip-view.c:4668
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kohtaa ei voi lähettää kalenteriin \"%s\". %s"
 
-#: ../modules/itip-formatter/itip-view.c:4667
+#: ../modules/itip-formatter/itip-view.c:4683
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Lähetetty kalenteriin \"%s\" hyväksyttynä"
 
-#: ../modules/itip-formatter/itip-view.c:4672
+#: ../modules/itip-formatter/itip-view.c:4688
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Lähetetty kalenteriin \"%s\" alustavana"
 
-#: ../modules/itip-formatter/itip-view.c:4678
+#: ../modules/itip-formatter/itip-view.c:4694
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Lähetetty kalenteriin \"%s\" hylättynä"
 
-#: ../modules/itip-formatter/itip-view.c:4684
+#: ../modules/itip-formatter/itip-view.c:4700
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Lähetetty kalenteriin \"%s\" peruttuna"
 
-#: ../modules/itip-formatter/itip-view.c:4705
-#: ../modules/itip-formatter/itip-view.c:5162
-#: ../modules/itip-formatter/itip-view.c:5268
+#: ../modules/itip-formatter/itip-view.c:4721
+#: ../modules/itip-formatter/itip-view.c:5178
+#: ../modules/itip-formatter/itip-view.c:5284
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Tallennetaan muutoksia kalenteriin, odota hetki..."
 
-#: ../modules/itip-formatter/itip-view.c:4746
+#: ../modules/itip-formatter/itip-view.c:4762
 msgid "Unable to parse item"
 msgstr "Kohdetta ei voi tulkita"
 
-#: ../modules/itip-formatter/itip-view.c:4939
+#: ../modules/itip-formatter/itip-view.c:4955
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Järjestäjä on poistanut valtuutuksen %s "
 
-#: ../modules/itip-formatter/itip-view.c:4956
+#: ../modules/itip-formatter/itip-view.c:4972
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Lähetettiin perumisilmoitus valtuutetulle"
 
-#: ../modules/itip-formatter/itip-view.c:4960
+#: ../modules/itip-formatter/itip-view.c:4976
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Perumisilmoitusta ei voi lähettää valtuutetulle"
 
-#: ../modules/itip-formatter/itip-view.c:5008
+#: ../modules/itip-formatter/itip-view.c:5024
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Läsnäolijaa ei voi päivittää. %s"
 
-#: ../modules/itip-formatter/itip-view.c:5051
+#: ../modules/itip-formatter/itip-view.c:5067
 msgid "The meeting is invalid and cannot be updated"
 msgstr "Tapaaminen on virheellinen, eikä sitä voi päivittää"
 
-#: ../modules/itip-formatter/itip-view.c:5127
+#: ../modules/itip-formatter/itip-view.c:5143
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Läsnäolon tilaa ei voi päivittää virheellisen tilan takia"
 
-#: ../modules/itip-formatter/itip-view.c:5199
-#: ../modules/itip-formatter/itip-view.c:5238
+#: ../modules/itip-formatter/itip-view.c:5215
+#: ../modules/itip-formatter/itip-view.c:5254
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Läsnäolon tilaa ei voi päivittää, koska kohdetta ei enää ole olemassa"
 
-#: ../modules/itip-formatter/itip-view.c:5301
+#: ../modules/itip-formatter/itip-view.c:5317
 msgid "Meeting information sent"
 msgstr "Kokouksen tiedot lähetetty"
 
-#: ../modules/itip-formatter/itip-view.c:5306
+#: ../modules/itip-formatter/itip-view.c:5322
 msgid "Task information sent"
 msgstr "Tehtävän tiedot lähetetty"
 
-#: ../modules/itip-formatter/itip-view.c:5311
+#: ../modules/itip-formatter/itip-view.c:5327
 msgid "Memo information sent"
 msgstr "Muistilapun tiedot lähetetty"
 
-#: ../modules/itip-formatter/itip-view.c:5322
+#: ../modules/itip-formatter/itip-view.c:5338
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kokoustietoja ei voitu lähettää, koska kokousta ei löydy"
 
-#: ../modules/itip-formatter/itip-view.c:5327
+#: ../modules/itip-formatter/itip-view.c:5343
 msgid "Unable to send task information, the task does not exist"
 msgstr "Tehtävän tietoja ei voitu lähettää, koska tehtävää ei löydy"
 
-#: ../modules/itip-formatter/itip-view.c:5332
+#: ../modules/itip-formatter/itip-view.c:5348
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Muistilapun tietoja ei voitu lähettää, koska muistilappua ei löydy"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5397
+#: ../modules/itip-formatter/itip-view.c:5413
 msgid "calendar.ics"
 msgstr "kalenteri.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5402
+#: ../modules/itip-formatter/itip-view.c:5418
 msgid "Save Calendar"
 msgstr "Tallenna kalenteri"
 
-#: ../modules/itip-formatter/itip-view.c:5451
-#: ../modules/itip-formatter/itip-view.c:5464
+#: ../modules/itip-formatter/itip-view.c:5467
+#: ../modules/itip-formatter/itip-view.c:5480
 msgid "The calendar attached is not valid"
 msgstr "Liitetty kalenteri ei ole kelvollinen"
 
-#: ../modules/itip-formatter/itip-view.c:5452
-#: ../modules/itip-formatter/itip-view.c:5465
+#: ../modules/itip-formatter/itip-view.c:5468
+#: ../modules/itip-formatter/itip-view.c:5481
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18040,15 +18462,15 @@ msgstr ""
 "Viesti väittää sisältävänsä kalenterin, mutta kalenteri ei ole kelvollinen "
 "iCalendar-tiedosto."
 
-#: ../modules/itip-formatter/itip-view.c:5507
-#: ../modules/itip-formatter/itip-view.c:5537
-#: ../modules/itip-formatter/itip-view.c:5638
+#: ../modules/itip-formatter/itip-view.c:5523
+#: ../modules/itip-formatter/itip-view.c:5553
+#: ../modules/itip-formatter/itip-view.c:5654
 msgid "The item in the calendar is not valid"
 msgstr "Kalenterin sisältö ei ole kelvollinen"
 
-#: ../modules/itip-formatter/itip-view.c:5508
-#: ../modules/itip-formatter/itip-view.c:5538
-#: ../modules/itip-formatter/itip-view.c:5639
+#: ../modules/itip-formatter/itip-view.c:5524
+#: ../modules/itip-formatter/itip-view.c:5554
+#: ../modules/itip-formatter/itip-view.c:5655
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18056,11 +18478,11 @@ msgstr ""
 "Viesti sisältää kalenterin, mutta kalenterissa ei ole tapahtumia, tehtäviä "
 "tai vapaa/varattu-tietoja."
 
-#: ../modules/itip-formatter/itip-view.c:5553
+#: ../modules/itip-formatter/itip-view.c:5569
 msgid "The calendar attached contains multiple items"
 msgstr "Liitetyssä kalenterissa on useita kohtia"
 
-#: ../modules/itip-formatter/itip-view.c:5554
+#: ../modules/itip-formatter/itip-view.c:5570
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18068,24 +18490,24 @@ msgstr ""
 "Jos haluat käsitellä kaikki nämä kohdat, tiedosto täytyy tallentaa ja avata "
 "tuomalla tiedosto kalenteriin"
 
-#: ../modules/itip-formatter/itip-view.c:6055
+#: ../modules/itip-formatter/itip-view.c:6072
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../modules/itip-formatter/itip-view.c:6071
+#: ../modules/itip-formatter/itip-view.c:6088
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
 
-#: ../modules/itip-formatter/itip-view.c:6231
+#: ../modules/itip-formatter/itip-view.c:6248
 msgid "This meeting recurs"
 msgstr "Tapaaminen on toistuva"
 
-#: ../modules/itip-formatter/itip-view.c:6234
+#: ../modules/itip-formatter/itip-view.c:6251
 msgid "This task recurs"
 msgstr "Tehtävä on toistuva"
 
-#: ../modules/itip-formatter/itip-view.c:6237
+#: ../modules/itip-formatter/itip-view.c:6254
 msgid "This memo recurs"
 msgstr "Muistilappu on toistuva"
 
@@ -18106,21 +18528,21 @@ msgstr ""
 "&quot;{0}&quot; on antanut kokouksen järjestettäväksi. Haluatko lisätä "
 "osallistujan &quot;{1}&quot;?"
 
-#: ../modules/itip-formatter/plugin/config-ui.c:82
+#: ../modules/itip-formatter/plugin/config-ui.c:81
 msgid "Meeting Invitations"
 msgstr "Kokouskutsut"
 
-#: ../modules/itip-formatter/plugin/config-ui.c:108
+#: ../modules/itip-formatter/plugin/config-ui.c:107
 msgid "_Delete message after acting"
 msgstr "_Poista viesti, kun toimenpide on suoritettu"
 
-#: ../modules/itip-formatter/plugin/config-ui.c:122
-#: ../modules/itip-formatter/plugin/config-ui.c:153
+#: ../modules/itip-formatter/plugin/config-ui.c:121
+#: ../modules/itip-formatter/plugin/config-ui.c:152
 msgid "Conflict Search"
 msgstr "Ristiriitaisuuksien haku"
 
 #. Source selector
-#: ../modules/itip-formatter/plugin/config-ui.c:137
+#: ../modules/itip-formatter/plugin/config-ui.c:136
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Valitse kalenterit, joista etsitään päällekkäisiä kokouksia"
 
@@ -18132,679 +18554,681 @@ msgstr "Itip-muotoilija"
 msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "Näytä \"text/calendar\"-MIME-osat viesteissä."
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:252
+#: ../modules/mail-config/e-mail-config-google-summary.c:251
 msgid "Google Features"
 msgstr "Google-ominaisuudet"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:261
+#: ../modules/mail-config/e-mail-config-google-summary.c:260
 msgid "Add Google Ca_lendar to this account"
 msgstr "Lisää _Google-kalenteri tähän tiliin"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:269
+#: ../modules/mail-config/e-mail-config-google-summary.c:268
 msgid "Add Google Con_tacts to this account"
 msgstr "Lisää Google-_yhteystiedot tähän tiliin"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:277
+#: ../modules/mail-config/e-mail-config-google-summary.c:276
 msgid "You may need to enable IMAP access"
 msgstr "Sinun on mahdollisesti sallittava IMAP-käyttö"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:246
-#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+#: ../modules/mail-config/e-mail-config-local-accounts.c:245
+#: ../modules/mail-config/e-mail-config-local-accounts.c:291
 #, fuzzy
 #| msgid "Save directory"
 msgid "Mail _Directory:"
 msgstr "Tallenna kansio"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:247
+#: ../modules/mail-config/e-mail-config-local-accounts.c:246
 #, fuzzy
 #| msgid "Choose a file to restore"
 msgid "Choose a MH mail directory"
 msgstr "Valitse palautettava tiedosto"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+#: ../modules/mail-config/e-mail-config-local-accounts.c:268
 msgid "Local Delivery _File:"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+#: ../modules/mail-config/e-mail-config-local-accounts.c:269
 #, fuzzy
 #| msgid "Choose calendar file"
 msgid "Choose a local delivery file"
 msgstr "Valitse kalenteritiedosto"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:293
+#: ../modules/mail-config/e-mail-config-local-accounts.c:292
 #, fuzzy
 #| msgid "Choose a file to restore"
 msgid "Choose a Maildir mail directory"
 msgstr "Valitse palautettava tiedosto"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+#: ../modules/mail-config/e-mail-config-local-accounts.c:314
 #, fuzzy
 #| msgid "_File:"
 msgid "Spool _File:"
 msgstr "_Tiedosto:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:316
+#: ../modules/mail-config/e-mail-config-local-accounts.c:315
 #, fuzzy
 #| msgid "Choose a File"
 msgid "Choose a mbox spool file"
 msgstr "Valitse tiedosto"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+#: ../modules/mail-config/e-mail-config-local-accounts.c:337
 #, fuzzy
 #| msgid "Save directory"
 msgid "Spool _Directory:"
 msgstr "Tallenna kansio"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:339
+#: ../modules/mail-config/e-mail-config-local-accounts.c:338
 #, fuzzy
 #| msgid "Choose a file to restore"
 msgid "Choose a mbox spool directory"
 msgstr "Valitse palautettava tiedosto"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:137
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:80
-#: ../modules/plugin-manager/evolution-plugin-manager.c:159
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:136
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:53
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:79
+#: ../modules/plugin-manager/evolution-plugin-manager.c:158
 msgid "Configuration"
 msgstr "Asetukset"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:98
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:154
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:97
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "_Palvelin:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:168
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:227
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:180
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:226
 msgid "User_name:"
 msgstr "Käyttäjät_unnus:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:214
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:148
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:213
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:147
 msgid "Encryption _method:"
 msgstr "Salaus_tapa:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:229
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:228
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:162
 msgid "STARTTLS after connecting"
 msgstr "STARTTLS yhteyden muodostamisen jälkeen"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:233
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:167
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:232
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:166
 msgid "SSL on a dedicated port"
 msgstr "SSL tietyssä portissa"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:69
 msgid "_Use custom binary, instead of 'sendmail'"
 msgstr "_Käytä omavalintaista binääriä 'sendmail'-binäärin sijaan"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:74
-#| msgid "Custom Reminder:"
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:73
 msgid "_Custom binary:"
 msgstr "_Omavalintainen binääri:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:90
 #, fuzzy
 #| msgid "Use custom fonts"
 msgid "U_se custom arguments"
 msgstr "Käytä omia kirjasimia"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:94
 #, fuzzy
 #| msgid "_Arguments:"
 msgid "Cus_tom arguments:"
 msgstr "_Argumentit:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:112
 msgid ""
 "Default arguments are '-i -f %F -- %R', where\n"
 "   %F - stands for the From address\n"
 "   %R - stands for the recipient addresses"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:127
 #, fuzzy
 #| msgid "Start in offline mode"
 msgid "Send mail also when in offline _mode"
 msgstr "Aloita yhteydettömässä tilassa"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:122
 msgid "Ser_ver requires authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:209
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:208
 msgid "T_ype:"
 msgstr "_Tyyppi:"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:247
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:246
 msgid "Yahoo! Features"
 msgstr "Yahoo!-ominaisuudet"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:256
-#| msgid "Add Google Calendars to Evolution."
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:255
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Lisää Yahoo!-kalenteri ja -tehtävät tälle tilille"
 
-#: ../modules/mail/e-mail-attachment-handler.c:425
+#: ../modules/mail/e-mail-attachment-handler.c:424
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d liitetty viesti"
 msgstr[1] "%d liitettyä viestiä"
 
-#: ../modules/mail/e-mail-shell-backend.c:237
+#: ../modules/mail/e-mail-shell-backend.c:314
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Sähköpostiviesti"
 
-#: ../modules/mail/e-mail-shell-backend.c:239
+#: ../modules/mail/e-mail-shell-backend.c:316
 msgid "Compose a new mail message"
 msgstr "Kirjoita uusi viesti"
 
-#: ../modules/mail/e-mail-shell-backend.c:247
+#: ../modules/mail/e-mail-shell-backend.c:324
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "_Sähköpostitili"
 
-#: ../modules/mail/e-mail-shell-backend.c:249
+#: ../modules/mail/e-mail-shell-backend.c:326
 msgid "Create a new mail account"
 msgstr "Luo uusi sähköpostitili"
 
-#: ../modules/mail/e-mail-shell-backend.c:254
+#: ../modules/mail/e-mail-shell-backend.c:331
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Sähköposti_kansio"
 
-#: ../modules/mail/e-mail-shell-backend.c:256
+#: ../modules/mail/e-mail-shell-backend.c:333
 msgid "Create a new mail folder"
 msgstr "Luo uusi sähköpostikansio"
 
-#: ../modules/mail/e-mail-shell-backend.c:551
+#: ../modules/mail/e-mail-shell-backend.c:644
 msgid "Mail Accounts"
 msgstr "Sähköpostitilit"
 
-#: ../modules/mail/e-mail-shell-backend.c:560
+#: ../modules/mail/e-mail-shell-backend.c:653
 msgid "Mail Preferences"
 msgstr "Sähköpostin asetukset"
 
-#: ../modules/mail/e-mail-shell-backend.c:569
+#: ../modules/mail/e-mail-shell-backend.c:662
 msgid "Composer Preferences"
 msgstr "Muokkaimen asetukset"
 
-#: ../modules/mail/e-mail-shell-backend.c:578
+#: ../modules/mail/e-mail-shell-backend.c:672
 msgid "Network Preferences"
 msgstr "Verkkoasetukset"
 
-#. Translators: The first item in the list, to be able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:867
+#. Translators: The first item in the list, to be
+#. * able to set rule: [Label] [is/is-not] [None]
+#: ../modules/mail/e-mail-shell-backend.c:964
 msgctxt "label"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:659
-#| msgid "Mark Me_ssages as Read"
+#: ../modules/mail/e-mail-shell-view-actions.c:670
 msgid "Marking messages as read..."
 msgstr "Merkitään viestejä luetuiksi..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1511
+#: ../modules/mail/e-mail-shell-view-actions.c:1512
 msgid "_Disable Account"
 msgstr "_Poista tili käytöstä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1513
+#: ../modules/mail/e-mail-shell-view-actions.c:1514
 msgid "Disable this account"
 msgstr "Poista tämä tili käytöstä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1520
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Poista kaikki pyyhityt viesti pysyvästi kaikista kansioista"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1527
+#: ../modules/mail/e-mail-shell-view-actions.c:1528
 msgid "Edit properties of this account"
 msgstr "Muokkaa tilin ominaisuuksia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1532
-#| msgctxt "Meeting"
-#| msgid "Refresh"
-msgid "_Refresh"
-msgstr "_Päivitä"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1534
-#| msgid "Edit properties of this account"
+#: ../modules/mail/e-mail-shell-view-actions.c:1535
 msgid "Refresh list of folders of this account"
 msgstr "Päivitä tämän tilin kansioiden luettelo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1539
+#: ../modules/mail/e-mail-shell-view-actions.c:1540
 msgid "_Download Messages for Offline Usage"
 msgstr "_Nouda viestit yhteydettömään käyttöön"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1541
+#: ../modules/mail/e-mail-shell-view-actions.c:1542
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "Lataa yhteydettömään käyttöön merkittyjen tilien ja kansioiden viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1546
+#: ../modules/mail/e-mail-shell-view-actions.c:1547
 msgid "Fl_ush Outbox"
 msgstr "T_yhjennä lähtevien kansio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1553
+#: ../modules/mail/e-mail-shell-view-actions.c:1554
 msgid "_Copy Folder To..."
 msgstr "_Kopioi kansio..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1555
+#: ../modules/mail/e-mail-shell-view-actions.c:1556
 msgid "Copy the selected folder into another folder"
 msgstr "Kopioi valittu kansio toiseen kansioon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1562
+#: ../modules/mail/e-mail-shell-view-actions.c:1563
 msgid "Permanently remove this folder"
 msgstr "Poista tämä kansio pysyvästi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1567
+#: ../modules/mail/e-mail-shell-view-actions.c:1568
 msgid "E_xpunge"
 msgstr "_Poista poistetut"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1569
+#: ../modules/mail/e-mail-shell-view-actions.c:1570
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Poista pysyvästi kaikki poistetut viestit tästä kansiosta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1574
-#: ../modules/mail/e-mail-shell-view-actions.c:1674
+#: ../modules/mail/e-mail-shell-view-actions.c:1575
+#: ../modules/mail/e-mail-shell-view-actions.c:1675
 msgid "Mar_k All Messages as Read"
 msgstr "Mer_kitse kaikki viestit luetuiksi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1576
-#: ../modules/mail/e-mail-shell-view-actions.c:1676
+#: ../modules/mail/e-mail-shell-view-actions.c:1577
+#: ../modules/mail/e-mail-shell-view-actions.c:1677
 msgid "Mark all messages in the folder as read"
 msgstr "Merkitse kaikki kansion viestit luetuksi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1581
+#: ../modules/mail/e-mail-shell-view-actions.c:1582
 msgid "_Move Folder To..."
 msgstr "_Siirrä kansio..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1583
+#: ../modules/mail/e-mail-shell-view-actions.c:1584
 msgid "Move the selected folder into another folder"
 msgstr "Siirrä valittu kansio toiseen kansioon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1588
+#: ../modules/mail/e-mail-shell-view-actions.c:1589
 msgid "_New..."
 msgstr "_Uusi..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1590
+#: ../modules/mail/e-mail-shell-view-actions.c:1591
 msgid "Create a new folder for storing mail"
 msgstr "Luo uusi kansio viestien tallentamiseen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1597
+#: ../modules/mail/e-mail-shell-view-actions.c:1598
 msgid "Change the properties of this folder"
 msgstr "Vaihda tämän kansion ominaisuuksia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1604
+#: ../modules/mail/e-mail-shell-view-actions.c:1605
 msgid "Refresh the folder"
 msgstr "Virkistä kansio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1611
+#: ../modules/mail/e-mail-shell-view-actions.c:1612
 msgid "Change the name of this folder"
 msgstr "Muuta tämän kansion nimeä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1616
+#: ../modules/mail/e-mail-shell-view-actions.c:1617
 msgid "Select Message _Thread"
 msgstr "Valitse viesti_säie"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1618
+#: ../modules/mail/e-mail-shell-view-actions.c:1619
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 "Valitse kaikki viestit, jotka ovat samassa säikeessä kuin nyt valittu viesti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1623
+#: ../modules/mail/e-mail-shell-view-actions.c:1624
 msgid "Select Message S_ubthread"
 msgstr "Valitse viesti_säie"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1625
+#: ../modules/mail/e-mail-shell-view-actions.c:1626
 msgid "Select all replies to the currently selected message"
 msgstr "Valitse kaikki vastaukset nyt valittuun viestiin"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1637
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "Empty _Trash"
 msgstr "_Tyhjennä roskakori"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1639
+#: ../modules/mail/e-mail-shell-view-actions.c:1640
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Poista pysyvästi kaikki poistetut viestit kaikilta tileiltä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1644
+#: ../modules/mail/e-mail-shell-view-actions.c:1645
 msgid "_New Label"
 msgstr "_uusi merkintä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1653
+#: ../modules/mail/e-mail-shell-view-actions.c:1654
 msgid "N_one"
 msgstr "Ei _mitään"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1667
+#: ../modules/mail/e-mail-shell-view-actions.c:1668
 msgid "_Manage Subscriptions"
 msgstr "_Hallitse tilauksia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1669
-#: ../modules/mail/e-mail-shell-view-actions.c:1753
+#: ../modules/mail/e-mail-shell-view-actions.c:1670
+#: ../modules/mail/e-mail-shell-view-actions.c:1754
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Tilaa tai peru kansioiden tilauksia muilta palvelimilta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1681
-#: ../modules/mail/e-mail-shell-view-actions.c:1702
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "Send / _Receive"
 msgstr "Lähetä ja _vastaanota"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1683
+#: ../modules/mail/e-mail-shell-view-actions.c:1684
 msgid "Send queued items and retrieve new items"
 msgstr "Lähetä jonossa olevat viestit ja nouda uudet viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1688
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
 msgid "R_eceive All"
 msgstr "_Vastaanota kaikki"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1690
+#: ../modules/mail/e-mail-shell-view-actions.c:1691
 msgid "Receive new items from all accounts"
 msgstr "Vastaanota kohteita kaikilta tileiltä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1695
+#: ../modules/mail/e-mail-shell-view-actions.c:1696
 msgid "_Send All"
 msgstr "_Lähetä kaikki"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1697
+#: ../modules/mail/e-mail-shell-view-actions.c:1698
 #, fuzzy
 msgid "Send queued items in all accounts"
 msgstr "Lähetä jonossa olevat viestit ja nouda uudet viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1725
+#: ../modules/mail/e-mail-shell-view-actions.c:1726
 msgid "Cancel the current mail operation"
 msgstr "Peru nykyinen postioperaatio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1730
+#: ../modules/mail/e-mail-shell-view-actions.c:1731
 msgid "Collapse All _Threads"
 msgstr "Sulje kaikki _säikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1732
+#: ../modules/mail/e-mail-shell-view-actions.c:1733
 msgid "Collapse all message threads"
 msgstr "Sulje kaikki viestisäikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1737
+#: ../modules/mail/e-mail-shell-view-actions.c:1738
 msgid "E_xpand All Threads"
 msgstr "_Laajenna kaikki säikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1739
+#: ../modules/mail/e-mail-shell-view-actions.c:1740
 msgid "Expand all message threads"
 msgstr "Laajenna kaikki viestisäikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1744
+#: ../modules/mail/e-mail-shell-view-actions.c:1745
 msgid "_Message Filters"
 msgstr "Viesti_suodattimet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1746
+#: ../modules/mail/e-mail-shell-view-actions.c:1747
 msgid "Create or edit rules for filtering new mail"
 msgstr "Luo tai muokkaa sääntöjä uuden sähköpostin suodatukseen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1751
+#: ../modules/mail/e-mail-shell-view-actions.c:1752
 msgid "_Subscriptions..."
 msgstr "_Tilaukset..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1760
+#: ../modules/mail/e-mail-shell-view-actions.c:1761
 msgid "F_older"
 msgstr "_Kansio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1767
+#: ../modules/mail/e-mail-shell-view-actions.c:1768
 msgid "_Label"
 msgstr "_Merkintä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1784
+#: ../modules/mail/e-mail-shell-view-actions.c:1785
 msgid "C_reate Search Folder From Search..."
 msgstr "Luo _hakunäkymä haun perusteella..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1791
+#: ../modules/mail/e-mail-shell-view-actions.c:1792
 msgid "Search F_olders"
 msgstr "Etsi _kansioita"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1793
+#: ../modules/mail/e-mail-shell-view-actions.c:1794
 msgid "Create or edit search folder definitions"
 msgstr "Luo tai muokkaa hakunäkymien määrittelyjä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1832
+#: ../modules/mail/e-mail-shell-view-actions.c:1833
 msgid "_New Folder..."
 msgstr "_Uusi kansio..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1860
+#: ../modules/mail/e-mail-shell-view-actions.c:1861
 msgid "Show Message _Preview"
 msgstr "Näytä viestin _esikatselu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1862
+#: ../modules/mail/e-mail-shell-view-actions.c:1863
 msgid "Show message preview pane"
 msgstr "Näytä viestin esikatseluikkuna"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1868
+#: ../modules/mail/e-mail-shell-view-actions.c:1869
 msgid "Show _Deleted Messages"
 msgstr "Näytä _poistetut viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1870
+#: ../modules/mail/e-mail-shell-view-actions.c:1871
 msgid "Show deleted messages with a line through them"
 msgstr "Näytä poistetut viestit yliviivattuna"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1876
+#: ../modules/mail/e-mail-shell-view-actions.c:1877
 msgid "_Group By Threads"
 msgstr "Ryhmittele _säikeittäin"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1878
+#: ../modules/mail/e-mail-shell-view-actions.c:1879
 msgid "Threaded message list"
 msgstr "Säikeistetty viestiluettelo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1884
+#: ../modules/mail/e-mail-shell-view-actions.c:1885
 msgid "_Unmatched Folder Enabled"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1886
+#: ../modules/mail/e-mail-shell-view-actions.c:1887
 #, fuzzy
 #| msgid "Toggles whether the Role field is displayed"
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Määrittää näytetäänkö roolikenttä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1906
+#: ../modules/mail/e-mail-shell-view-actions.c:1907
 msgid "Show message preview below the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon alla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1913
+#: ../modules/mail/e-mail-shell-view-actions.c:1914
 msgid "Show message preview alongside the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon vieressä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1921
+#: ../modules/mail/e-mail-shell-view-actions.c:1922
 msgid "All Messages"
 msgstr "Kaikki viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1928
+#: ../modules/mail/e-mail-shell-view-actions.c:1929
 msgid "Important Messages"
 msgstr "Tärkeät viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1935
+#: ../modules/mail/e-mail-shell-view-actions.c:1936
 msgid "Last 5 Days' Messages"
 msgstr "Viimeisten viiden päivän viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1942
+#: ../modules/mail/e-mail-shell-view-actions.c:1943
 msgid "Messages Not Junk"
 msgstr "Viestit, jotka eivät ole roskapostia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1949
+#: ../modules/mail/e-mail-shell-view-actions.c:1950
 msgid "Messages with Attachments"
 msgstr "Viestit, joissa on liitteitä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1956
+#: ../modules/mail/e-mail-shell-view-actions.c:1957
 msgid "No Label"
 msgstr "Ei merkintää"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1963
+#: ../modules/mail/e-mail-shell-view-actions.c:1964
 msgid "Read Messages"
 msgstr "Luetut viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1970
+#: ../modules/mail/e-mail-shell-view-actions.c:1971
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2022
+#: ../modules/mail/e-mail-shell-view-actions.c:2023
 msgid "Subject or Addresses contain"
 msgstr "Aihe tai osoitteet sisältävät"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2032
+#: ../modules/mail/e-mail-shell-view-actions.c:2033
 msgid "All Accounts"
 msgstr "Kaikki tilit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2039
+#: ../modules/mail/e-mail-shell-view-actions.c:2040
 msgid "Current Account"
 msgstr "Valittu tili"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2046
+#: ../modules/mail/e-mail-shell-view-actions.c:2047
 msgid "Current Folder"
 msgstr "Valittu kansio"
 
-#: ../modules/mail/e-mail-shell-view.c:630
+#: ../modules/mail/e-mail-shell-view.c:636
 msgid "All Account Search"
 msgstr "Etsi kaikilta tileiltä"
 
-#: ../modules/mail/e-mail-shell-view.c:734
+#: ../modules/mail/e-mail-shell-view.c:744
 msgid "Account Search"
 msgstr "Haku tileiltä"
 
-#: ../modules/mail/e-mail-shell-view-private.c:988
+#: ../modules/mail/e-mail-shell-view-private.c:972
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d valittu, "
 msgstr[1] "%d valittua, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:997
-#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:981
+#: ../modules/mail/e-mail-shell-view-private.c:998
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d poistettu"
 msgstr[1] "%d poistettua"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1023
-#: ../modules/mail/e-mail-shell-view-private.c:1029
+#: ../modules/mail/e-mail-shell-view-private.c:1007
+#: ../modules/mail/e-mail-shell-view-private.c:1013
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d roskaposti"
 msgstr[1] "%d roskapostia"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1036
+#: ../modules/mail/e-mail-shell-view-private.c:1020
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d luonnos"
 msgstr[1] "%d luonnosta"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1042
+#: ../modules/mail/e-mail-shell-view-private.c:1026
 #, 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ä"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1048
+#: ../modules/mail/e-mail-shell-view-private.c:1032
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d lähetetty"
 msgstr[1] "%d lähetettyä"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1044
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d lukematon, "
 msgstr[1] "%d lukematonta, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1063
+#: ../modules/mail/e-mail-shell-view-private.c:1047
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d viesti"
 msgstr[1] "%d viestiä"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1084
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Trash"
 msgstr "Roskakori"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1522
+#: ../modules/mail/e-mail-shell-view-private.c:1505
 msgid "Send / Receive"
 msgstr "Lähetä / Vastaanota"
 
-#: ../modules/mail/em-composer-prefs.c:447
+#: ../modules/mail/em-composer-prefs.c:443
+#| msgid "Select Folder"
+msgid "Select Folder to Add"
+msgstr "Valitse lisättävä kansio"
+
+#: ../modules/mail/em-composer-prefs.c:888
+#| msgid "F_older"
+msgid "Folder"
+msgstr "Kansio"
+
+#: ../modules/mail/em-composer-prefs.c:924
+#| msgid "Recipients"
+msgid "Recipient"
+msgstr "Vastaanottaja"
+
+#: ../modules/mail/em-composer-prefs.c:1195
 msgid "Language(s)"
 msgstr "Kielet"
 
-#: ../modules/mail/em-mailer-prefs.c:81
-#| msgid "Every time"
+#: ../modules/mail/em-mailer-prefs.c:80
 msgid "On exit, every time"
 msgstr "Poistuessa, joka kerta"
 
-#: ../modules/mail/em-mailer-prefs.c:82
-#| msgid "Once per day"
+#: ../modules/mail/em-mailer-prefs.c:81
 msgid "On exit, once per day"
 msgstr "Poistuessa, kerran päivässä"
 
-#: ../modules/mail/em-mailer-prefs.c:83
-#| msgid "Once per week"
+#: ../modules/mail/em-mailer-prefs.c:82
 msgid "On exit, once per week"
 msgstr "Poistuessa, kerran viikossa"
 
-#: ../modules/mail/em-mailer-prefs.c:84
-#| msgid "Once per month"
+#: ../modules/mail/em-mailer-prefs.c:83
 msgid "On exit, once per month"
 msgstr "Poistuessa, kerran kuussa"
 
-#: ../modules/mail/em-mailer-prefs.c:85
+#: ../modules/mail/em-mailer-prefs.c:84
 msgid "Immediately, on folder leave"
 msgstr ""
 
-#: ../modules/mail/em-mailer-prefs.c:356
+#: ../modules/mail/em-mailer-prefs.c:355
 msgid "Header"
 msgstr "Otsake"
 
-#: ../modules/mail/em-mailer-prefs.c:360
+#: ../modules/mail/em-mailer-prefs.c:359
 msgid "Contains Value"
 msgstr "Sisältää arvon"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1215
+#: ../modules/mail/em-mailer-prefs.c:1214
 msgid "_Date header:"
 msgstr "_Päiväysotsake:"
 
-#: ../modules/mail/em-mailer-prefs.c:1216
+#: ../modules/mail/em-mailer-prefs.c:1215
 msgid "Show _original header value"
 msgstr "Näytä _alkuperäinen otsakkeen arvo"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:142
+#: ../modules/mailto-handler/evolution-mailto-handler.c:140
 msgid "Do you want to make Evolution your default email client?"
 msgstr "Haluatko käyttää Evolutionia oletuksena sähköpostin käsittelyyn?"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:311
+#: ../modules/mdn/evolution-mdn.c:307
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Osoitteeseen %1$s %3$s lähettämäsi viesti ”%2$s” on luettu."
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:378
+#: ../modules/mdn/evolution-mdn.c:374
 #, fuzzy, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "Toimituskuittaus viestille: ”%s”"
 
-#: ../modules/mdn/evolution-mdn.c:543
+#: ../modules/mdn/evolution-mdn.c:539
 #, fuzzy, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "Läh_etä viestin kuittaus:"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:548
+#: ../modules/mdn/evolution-mdn.c:544
 msgid "_Notify Sender"
 msgstr "_Ilmoita lähettäjälle"
 
@@ -18836,74 +19260,73 @@ msgid ""
 "established."
 msgstr "Evolution ei ole verkossa, koska verkko ei ole käytettävissä."
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
 msgid "Author(s)"
 msgstr "Kirjoittaja(t)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:254
+#: ../modules/plugin-manager/evolution-plugin-manager.c:253
 msgid "Plugin Manager"
 msgstr "Lisäosien hallinta"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:269
+#: ../modules/plugin-manager/evolution-plugin-manager.c:268
 msgid "Note: Some changes will not take effect until restart"
 msgstr ""
 "Huomio: jotkut muutokset eivät astu voimaan ennen uudelleenkäynnistystä"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:298
+#: ../modules/plugin-manager/evolution-plugin-manager.c:297
 msgid "Overview"
 msgstr "Yhteenveto"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:367
-#: ../modules/plugin-manager/evolution-plugin-manager.c:450
+#: ../modules/plugin-manager/evolution-plugin-manager.c:366
+#: ../modules/plugin-manager/evolution-plugin-manager.c:449
 msgid "Plugin"
 msgstr "Lisäosa"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:488
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
 msgid "_Plugins"
 msgstr "_Lisäosat"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:489
+#: ../modules/plugin-manager/evolution-plugin-manager.c:488
 msgid "Enable and disable plugins"
 msgstr "Käytä ja poista käytöstä lisäosia"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:140
-#| msgid "Display the next message"
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:139
 msgid "Display plain text version"
 msgstr "Näytä raakatekstiversio"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:142
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:141
 #, fuzzy
 #| msgid "Display the next important message"
 msgid "Display plain text version of multipart/alternative message"
 msgstr "Näytä seuraava tärkeä viesti"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:148
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:147
 msgid "Display HTML version"
 msgstr "Näytä HTML-versio"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:150
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:149
 #, fuzzy
 #| msgid "Display the previous important message"
 msgid "Display HTML version of multipart/alternative message"
 msgstr "Näytä edellinen tärkeä viesti"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
-#: ../modules/prefer-plain/plugin/config-ui.c:44
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:77
+#: ../modules/prefer-plain/plugin/config-ui.c:43
 msgid "Show HTML if present"
 msgstr "Näytä HTML:ää, jos se on saatavilla"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
-#: ../modules/prefer-plain/plugin/config-ui.c:45
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../modules/prefer-plain/plugin/config-ui.c:44
 msgid "Let Evolution choose the best part to show."
 msgstr "Anna Evolutionin valita näytettäväksi paras osa."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
-#: ../modules/prefer-plain/plugin/config-ui.c:48
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:81
+#: ../modules/prefer-plain/plugin/config-ui.c:47
 msgid "Show plain text if present"
 msgstr "Näytä raakatekstinä, jos mahdollista"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
-#: ../modules/prefer-plain/plugin/config-ui.c:49
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../modules/prefer-plain/plugin/config-ui.c:48
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -18911,13 +19334,13 @@ msgstr ""
 "Näytä raakatekstiosa, jos se on saatavilla, muussa tapauksessa anna "
 "Evolutionin valita näytettäväksi paras osa."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
-#: ../modules/prefer-plain/plugin/config-ui.c:53
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:86
+#: ../modules/prefer-plain/plugin/config-ui.c:52
 msgid "Only ever show plain text"
 msgstr "Näytä aina raakatekstinä"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
-#: ../modules/prefer-plain/plugin/config-ui.c:54
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../modules/prefer-plain/plugin/config-ui.c:53
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -18925,11 +19348,11 @@ msgstr ""
 "Näytä aina raakatekstinä ja tee muista osista liitetiedostoja, jos niin "
 "pyydetään."
 
-#: ../modules/prefer-plain/plugin/config-ui.c:105
+#: ../modules/prefer-plain/plugin/config-ui.c:104
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Näytä _piilotetut HTML-osat liitetiedostoina"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:127
+#: ../modules/prefer-plain/plugin/config-ui.c:126
 msgid "HTML _Mode"
 msgstr "HTML-_tila"
 
@@ -18946,62 +19369,62 @@ msgstr "Raakatekstin tila"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "Näytä viestit raakatekstinä, vaikka ne sisältäisivät HTML-sisältöä."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:151
+#: ../modules/spamassassin/evolution-spamassassin.c:150
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:174
+#: ../modules/spamassassin/evolution-spamassassin.c:173
 #, fuzzy
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr "Suodata roskaposteja spamassasinilla."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:193
+#: ../modules/spamassassin/evolution-spamassassin.c:192
 #, fuzzy, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "%d viestin %d:stä lähetys epäonnistui"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:221
+#: ../modules/spamassassin/evolution-spamassassin.c:220
 msgid "Failed to read output from SpamAssassin: "
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:276
+#: ../modules/spamassassin/evolution-spamassassin.c:275
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:356
+#: ../modules/spamassassin/evolution-spamassassin.c:355
 msgid "SpamAssassin Options"
 msgstr "Spamassassin-valitsimet"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:371
+#: ../modules/spamassassin/evolution-spamassassin.c:370
 msgid "I_nclude remote tests"
 msgstr "_Lisää myös etätestit"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:385
+#: ../modules/spamassassin/evolution-spamassassin.c:384
 #, fuzzy
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "Tämä tekee Spamassassinista luotettavamman, mutta hitaamman"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:559
+#: ../modules/spamassassin/evolution-spamassassin.c:558
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:262
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:342
+#: ../modules/startup-wizard/e-mail-config-import-page.c:261
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:340
 msgid "Importing Files"
 msgstr "Tiedostojen tuonti"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:261
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:259
 msgid "Import cancelled."
 msgstr "Tuonti peruttiin."
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:278
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:276
 msgid "Import complete."
 msgstr "Tuonti valmistui."
 
-#: ../modules/startup-wizard/e-startup-assistant.c:156
+#: ../modules/startup-wizard/e-startup-assistant.c:155
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
@@ -19013,288 +19436,288 @@ msgstr ""
 "Seuraavaksi kysyttävien tietojen avulla Evolution ottaa yhteyttä "
 "sähköpostitileihisi ja tuo tarvittavia tietoja muista sovelluksista."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:229
+#: ../modules/startup-wizard/evolution-startup-wizard.c:228
 msgid "Loading accounts..."
 msgstr "Ladataan tilejä..."
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:95
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:94
 msgid "_Format as..."
 msgstr "_Muotoile..."
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:103
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:102
 msgid "_Other languages"
 msgstr "_Muut kielet"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:367
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:481
 msgid "Text Highlight"
 msgstr "Tekstin korostus"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:368
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:482
 msgid "Syntax highlighting of mail parts"
 msgstr ""
 
-#: ../modules/text-highlight/languages.c:32
+#: ../modules/text-highlight/languages.c:31
 msgid "_Plain text"
 msgstr "_Raakateksti"
 
-#: ../modules/text-highlight/languages.c:38
+#: ../modules/text-highlight/languages.c:37
 msgid "_Assembler"
 msgstr "_Assembler"
 
-#: ../modules/text-highlight/languages.c:43
+#: ../modules/text-highlight/languages.c:42
 msgid "_Bash"
 msgstr "_Bash"
 
-#: ../modules/text-highlight/languages.c:54
+#: ../modules/text-highlight/languages.c:53
 msgid "_C/C++"
 msgstr "_C/C++"
 
-#: ../modules/text-highlight/languages.c:63
+#: ../modules/text-highlight/languages.c:62
 msgid "_C#"
 msgstr "_C#"
 
-#: ../modules/text-highlight/languages.c:68
+#: ../modules/text-highlight/languages.c:67
 msgid "_Cascade Style Sheet"
 msgstr "_Cascade Style Sheet (CSS)"
 
-#: ../modules/text-highlight/languages.c:73
+#: ../modules/text-highlight/languages.c:72
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../modules/text-highlight/languages.c:81
+#: ../modules/text-highlight/languages.c:80
 msgid "_Java"
 msgstr "_Java"
 
-#: ../modules/text-highlight/languages.c:87
+#: ../modules/text-highlight/languages.c:86
 msgid "_JavaScript"
 msgstr "_JavaScript"
 
-#: ../modules/text-highlight/languages.c:93
+#: ../modules/text-highlight/languages.c:92
 msgid "_Patch/diff"
 msgstr "_Patch/diff"
 
-#: ../modules/text-highlight/languages.c:99
+#: ../modules/text-highlight/languages.c:98
 msgid "_Perl"
 msgstr "_Perl"
 
-#: ../modules/text-highlight/languages.c:110
+#: ../modules/text-highlight/languages.c:109
 msgid "_PHP"
 msgstr "_PHP"
 
-#: ../modules/text-highlight/languages.c:123
+#: ../modules/text-highlight/languages.c:122
 msgid "_Python"
 msgstr "_Python"
 
-#: ../modules/text-highlight/languages.c:128
+#: ../modules/text-highlight/languages.c:127
 msgid "_Ruby"
 msgstr "_Ruby"
 
-#: ../modules/text-highlight/languages.c:135
+#: ../modules/text-highlight/languages.c:134
 msgid "_Tcl/Tk"
 msgstr "_Tcl/Tk"
 
-#: ../modules/text-highlight/languages.c:141
+#: ../modules/text-highlight/languages.c:140
 msgid "_TeX/LaTeX"
 msgstr "_TeX/LaTeX"
 
-#: ../modules/text-highlight/languages.c:147
+#: ../modules/text-highlight/languages.c:146
 msgid "_Vala"
 msgstr "_Vala"
 
-#: ../modules/text-highlight/languages.c:152
+#: ../modules/text-highlight/languages.c:151
 msgid "_Visual Basic"
 msgstr "_Visual Basic"
 
-#: ../modules/text-highlight/languages.c:159
+#: ../modules/text-highlight/languages.c:158
 msgid "_XML"
 msgstr "_XML"
 
-#: ../modules/text-highlight/languages.c:177
+#: ../modules/text-highlight/languages.c:176
 msgid "_ActionScript"
 msgstr "_ActionScript"
 
-#: ../modules/text-highlight/languages.c:182
+#: ../modules/text-highlight/languages.c:181
 msgid "_ADA95"
 msgstr "_ADA95"
 
-#: ../modules/text-highlight/languages.c:189
+#: ../modules/text-highlight/languages.c:188
 msgid "_ALGOL 68"
 msgstr "_ALGOL 68"
 
-#: ../modules/text-highlight/languages.c:194
+#: ../modules/text-highlight/languages.c:193
 msgid "(_G)AWK"
 msgstr "(_G)AWK"
 
-#: ../modules/text-highlight/languages.c:199
+#: ../modules/text-highlight/languages.c:198
 msgid "_COBOL"
 msgstr "_COBOL"
 
-#: ../modules/text-highlight/languages.c:204
+#: ../modules/text-highlight/languages.c:203
 msgid "_DOS Batch"
 msgstr "_DOS Batch"
 
-#: ../modules/text-highlight/languages.c:209
+#: ../modules/text-highlight/languages.c:208
 msgid "_D"
 msgstr "_D"
 
-#: ../modules/text-highlight/languages.c:214
+#: ../modules/text-highlight/languages.c:213
 msgid "_Erlang"
 msgstr "_Erlang"
 
-#: ../modules/text-highlight/languages.c:219
+#: ../modules/text-highlight/languages.c:218
 msgid "_FORTRAN 77"
 msgstr "_FORTRAN 77"
 
-#: ../modules/text-highlight/languages.c:225
+#: ../modules/text-highlight/languages.c:224
 msgid "_FORTRAN 90"
 msgstr "_FORTRAN 90"
 
-#: ../modules/text-highlight/languages.c:230
+#: ../modules/text-highlight/languages.c:229
 msgid "_F#"
 msgstr "_F#"
 
-#: ../modules/text-highlight/languages.c:235
+#: ../modules/text-highlight/languages.c:234
 msgid "_Go"
 msgstr "_Go"
 
-#: ../modules/text-highlight/languages.c:240
+#: ../modules/text-highlight/languages.c:239
 msgid "_Haskell"
 msgstr "_Haskell"
 
-#: ../modules/text-highlight/languages.c:245
+#: ../modules/text-highlight/languages.c:244
 msgid "_JSP"
 msgstr "_JSP"
 
-#: ../modules/text-highlight/languages.c:250
+#: ../modules/text-highlight/languages.c:249
 msgid "_Lisp"
 msgstr "_Lisp"
 
-#: ../modules/text-highlight/languages.c:258
+#: ../modules/text-highlight/languages.c:257
 msgid "_Lotus"
 msgstr "_Lotus"
 
-#: ../modules/text-highlight/languages.c:263
+#: ../modules/text-highlight/languages.c:262
 msgid "_Lua"
 msgstr "_Lua"
 
-#: ../modules/text-highlight/languages.c:268
+#: ../modules/text-highlight/languages.c:267
 msgid "_Maple"
 msgstr "_Maple"
 
-#: ../modules/text-highlight/languages.c:273
+#: ../modules/text-highlight/languages.c:272
 msgid "_Matlab"
 msgstr "_Matlab"
 
-#: ../modules/text-highlight/languages.c:278
+#: ../modules/text-highlight/languages.c:277
 msgid "_Maya"
 msgstr "_Maya"
 
-#: ../modules/text-highlight/languages.c:283
+#: ../modules/text-highlight/languages.c:282
 msgid "_Oberon"
 msgstr "_Oberon"
 
-#: ../modules/text-highlight/languages.c:288
+#: ../modules/text-highlight/languages.c:287
 msgid "_Objective C"
 msgstr "_Objective C"
 
-#: ../modules/text-highlight/languages.c:294
+#: ../modules/text-highlight/languages.c:293
 msgid "_OCaml"
 msgstr "_OCaml"
 
-#: ../modules/text-highlight/languages.c:299
+#: ../modules/text-highlight/languages.c:298
 msgid "_Octave"
 msgstr "_Octave"
 
-#: ../modules/text-highlight/languages.c:304
+#: ../modules/text-highlight/languages.c:303
 msgid "_Object Script"
 msgstr "_Object Script"
 
-#: ../modules/text-highlight/languages.c:309
+#: ../modules/text-highlight/languages.c:308
 msgid "_Pascal"
 msgstr "_Pascal"
 
-#: ../modules/text-highlight/languages.c:314
+#: ../modules/text-highlight/languages.c:313
 msgid "_POV-Ray"
 msgstr "_POV-Ray"
 
-#: ../modules/text-highlight/languages.c:319
+#: ../modules/text-highlight/languages.c:318
 msgid "_Prolog"
 msgstr "_Prolog"
 
-#: ../modules/text-highlight/languages.c:324
+#: ../modules/text-highlight/languages.c:323
 msgid "_PostScript"
 msgstr "_PostScript"
 
-#: ../modules/text-highlight/languages.c:329
+#: ../modules/text-highlight/languages.c:328
 msgid "_R"
 msgstr "_R"
 
-#: ../modules/text-highlight/languages.c:334
+#: ../modules/text-highlight/languages.c:333
 msgid "_RPM Spec"
 msgstr "_RPM Spec"
 
-#: ../modules/text-highlight/languages.c:339
+#: ../modules/text-highlight/languages.c:338
 msgid "_Scala"
 msgstr "_Scala"
 
-#: ../modules/text-highlight/languages.c:344
+#: ../modules/text-highlight/languages.c:343
 msgid "_Smalltalk"
 msgstr "_Smalltalk"
 
-#: ../modules/text-highlight/languages.c:350
+#: ../modules/text-highlight/languages.c:349
 msgid "_TCSH"
 msgstr "_TCSH"
 
-#: ../modules/text-highlight/languages.c:355
+#: ../modules/text-highlight/languages.c:354
 msgid "_VHDL"
 msgstr "_VHDL"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:129
-#: ../modules/vcard-inline/e-mail-part-vcard.c:152
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:131
+#: ../modules/vcard-inline/e-mail-part-vcard.c:151
 msgid "Show F_ull vCard"
 msgstr "Näytä koko _vCard"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:132
-#: ../modules/vcard-inline/e-mail-part-vcard.c:170
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:134
+#: ../modules/vcard-inline/e-mail-part-vcard.c:169
 msgid "Show Com_pact vCard"
 msgstr "Näytä tiivistetty vCar_d"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:157
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:162
 msgid "Save _To Addressbook"
 msgstr "Tallenna _osoitekirjaan"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:178
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
 msgid "There is one other contact."
 msgstr "Löytyi yksi muu yhteystieto."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:189
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Löytyi %d muu yhteystieto."
 msgstr[1] "Löytyi %d muuta yhteystietoa."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:209
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:215
 #, fuzzy
 msgid "Addressbook Contact"
 msgstr "Osoitekirjan ominaisuudet"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:210
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:216
 msgid "Display the part as an addressbook contact"
 msgstr ""
 
-#: ../modules/web-inspector/evolution-web-inspector.c:96
+#: ../modules/web-inspector/evolution-web-inspector.c:95
 #, fuzzy
 #| msgid "Evolution Website"
 msgid "Evolution Web Inspector"
 msgstr "Evolutionin www-sivut"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:122
 msgid "_Do not show this message again."
 msgstr "Älä _näytä tätä viestiä uudestaan."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:583
-#: ../plugins/templates/templates.c:480
+#: ../plugins/attachment-reminder/attachment-reminder.c:584
+#: ../plugins/templates/templates.c:478
 msgid "Keywords"
 msgstr "Avainsanat"
 
@@ -19326,35 +19749,35 @@ msgstr "Liitemuistuttaja"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "Muistuttaa, jos unohdit lisätä liitteen viestiin."
 
-#: ../plugins/bbdb/bbdb.c:635 ../plugins/bbdb/bbdb.c:644
+#: ../plugins/bbdb/bbdb.c:636 ../plugins/bbdb/bbdb.c:645
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automaattiset yhteystiedot"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:659
+#: ../plugins/bbdb/bbdb.c:660
 msgid "Create _address book entries when sending mails"
 msgstr "Lisää lähettäjä _osoitekirjaan lähetettäessä viestejä"
 
-#: ../plugins/bbdb/bbdb.c:666
+#: ../plugins/bbdb/bbdb.c:667
 msgid "Select Address book for Automatic Contacts"
 msgstr "Valitse osoitekirja automaattisille yhteystiedoille"
 
-#: ../plugins/bbdb/bbdb.c:683
+#: ../plugins/bbdb/bbdb.c:684
 msgid "Instant Messaging Contacts"
 msgstr "Pikaviestinnän yhteystiedot"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:698
+#: ../plugins/bbdb/bbdb.c:699
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "_Yhdistä yhteystiedot ja kuvat Pidginin tuttavalistasta"
 
-#: ../plugins/bbdb/bbdb.c:705
+#: ../plugins/bbdb/bbdb.c:706
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Valitse osoitekirja Pigdinin tuttavalistalle"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:718
+#: ../plugins/bbdb/bbdb.c:719
 msgid "Synchronize with _buddy list now"
 msgstr "Yhdistä tiedot _tuttavalistasta"
 
@@ -19375,7 +19798,7 @@ msgstr ""
 "Lisää nimet ja sähköpostiosoitteet automaattisesti osoitekirjaan, kun "
 "vastaat viesteihin. Liittää myös IM-yhteystiedot tuttavalistoiltasi."
 
-#: ../plugins/dbx-import/dbx-importer.c:282
+#: ../plugins/dbx-import/dbx-importer.c:278
 msgid "Importing Outlook Express data"
 msgstr "Tuodaan Outlook Expressin tietoja"
 
@@ -19391,52 +19814,52 @@ msgstr "Outlook Express 5/6 -henkilökohtaiset kansiot (.dbx)"
 msgid "Import Outlook Express messages from DBX file"
 msgstr "Tuodaan Outlook Express -viestejä DBX-tiedostosta"
 
-#: ../plugins/email-custom-header/email-custom-header.c:291
+#: ../plugins/email-custom-header/email-custom-header.c:293
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Turvallisuus:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:295
+#: ../plugins/email-custom-header/email-custom-header.c:297
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
-#: ../plugins/email-custom-header/email-custom-header.c:296
+#: ../plugins/email-custom-header/email-custom-header.c:298
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Luokittelematon"
 
-#: ../plugins/email-custom-header/email-custom-header.c:297
+#: ../plugins/email-custom-header/email-custom-header.c:299
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Suojattu"
 
-#: ../plugins/email-custom-header/email-custom-header.c:298
+#: ../plugins/email-custom-header/email-custom-header.c:300
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: ../plugins/email-custom-header/email-custom-header.c:299
+#: ../plugins/email-custom-header/email-custom-header.c:301
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Salainen"
 
-#: ../plugins/email-custom-header/email-custom-header.c:300
+#: ../plugins/email-custom-header/email-custom-header.c:302
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Erittäin salainen"
 
-#: ../plugins/email-custom-header/email-custom-header.c:360
+#: ../plugins/email-custom-header/email-custom-header.c:362
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../plugins/email-custom-header/email-custom-header.c:536
+#: ../plugins/email-custom-header/email-custom-header.c:538
 msgid "_Custom Header"
 msgstr "_Omat otsakkeet"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:806
+#: ../plugins/email-custom-header/email-custom-header.c:808
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -19444,12 +19867,12 @@ msgstr ""
 "Omien otsakeavainten määrittelyssä käytetty muoto on seuraava:\n"
 "Omien otsakenimien avainarvot eroteltuna merkillä \";\"."
 
-#: ../plugins/email-custom-header/email-custom-header.c:859
+#: ../plugins/email-custom-header/email-custom-header.c:861
 msgid "Key"
 msgstr "Avaimet"
 
-#: ../plugins/email-custom-header/email-custom-header.c:876
-#: ../plugins/templates/templates.c:489
+#: ../plugins/email-custom-header/email-custom-header.c:878
+#: ../plugins/templates/templates.c:487
 msgid "Values"
 msgstr "Arvot"
 
@@ -19466,11 +19889,11 @@ msgstr "Lisää oma otsake lähteviin viesteihin."
 msgid "Email Custom Header"
 msgstr "Omat sähköpostiotsakkeet"
 
-#: ../plugins/external-editor/external-editor.c:112
+#: ../plugins/external-editor/external-editor.c:113
 msgid "Command to be executed to launch the editor: "
 msgstr "Ulkoisen muokkaimen käynnistyskomento: "
 
-#: ../plugins/external-editor/external-editor.c:113
+#: ../plugins/external-editor/external-editor.c:114
 #, fuzzy
 msgid ""
 "For XEmacs use \"xemacs\"\n"
@@ -19479,13 +19902,12 @@ msgstr ""
 "Emacsia varten käytä arvoa \"xemacs\"\n"
 "VI:tä varten käytä arvoa \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:123
-#| msgid "Automatically launch when a new mail is edited"
+#: ../plugins/external-editor/external-editor.c:124
 msgid "_Automatically launch when a new mail is edited"
 msgstr "Käynnistä _automaattisesti, kun uutta viestiä on muokattu"
 
-#: ../plugins/external-editor/external-editor.c:413
-#: ../plugins/external-editor/external-editor.c:415
+#: ../plugins/external-editor/external-editor.c:417
+#: ../plugins/external-editor/external-editor.c:419
 msgid "Compose in External Editor"
 msgstr "Kirjoita viestit ulkoisessa muokkaimessa"
 
@@ -19533,27 +19955,23 @@ msgstr ""
 "Ulkoinen muokkain on vielä käynnissä. Viestin lähetysikkunaa ei voi sulkea "
 "ennen kuin ulkoinen muokkain on käynnissä."
 
-#: ../plugins/face/face.c:171 ../smime/gui/certificate-manager.c:322
-msgid "Unknown error"
-msgstr "Tuntematon virhe"
-
-#: ../plugins/face/face.c:289
+#: ../plugins/face/face.c:288
 msgid "Select a Face Picture"
 msgstr "Valitse kasvokuva"
 
-#: ../plugins/face/face.c:299
+#: ../plugins/face/face.c:298
 msgid "Image files"
 msgstr "Kuvatiedostot"
 
-#: ../plugins/face/face.c:358
+#: ../plugins/face/face.c:357
 msgid "_Insert Face picture by default"
 msgstr "_Lisää kasvokuva oletuksena"
 
-#: ../plugins/face/face.c:371
+#: ../plugins/face/face.c:370
 msgid "Load new _Face picture"
 msgstr "Lataa uusi _kasvokuva"
 
-#: ../plugins/face/face.c:432
+#: ../plugins/face/face.c:431
 msgid "Include _Face"
 msgstr "Sisällytä _kasvokuva"
 
@@ -19593,55 +20011,55 @@ msgstr "Sisäkkäiset kuvat"
 msgid "View image attachments directly in mail messages."
 msgstr "Näytä kuvaliitteet suoraan sähköpostiviesteissä."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:368
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:364
 msgid "Get List _Archive"
 msgstr "Nouda listan _arkisto"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:370
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
 msgid "Get an archive of the list this message belongs to"
 msgstr "Nouda arkisto viestin sisältämästä postituslistasta"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:375
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:371
 msgid "Get List _Usage Information"
 msgstr "Näytä tietoja listan _käytöstä"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:377
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Nouda tietoja viestin sisältämän postituslistan käytöstä"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:378
 msgid "Contact List _Owner"
 msgstr "Ota yhteyttä listan _omistajaan"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:384
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Ota yhteyttä viestin sisältämän sähköpostilistan omistajaan"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:385
 msgid "_Post Message to List"
 msgstr "_Lähetä viesti listalle"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:391
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Kirjoita vastaus viestin sisältämälle sähköpostilistalle"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:396
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:392
 msgid "_Subscribe to List"
 msgstr "_Tilaa lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:398
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Tilaa viestin sisältämä postituslista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:403
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:399
 msgid "_Unsubscribe from List"
 msgstr "Per_u listan tilaus"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:405
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Peru viestin sisältämän postituslistan tilaus"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:412
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:408
 msgid "Mailing _List"
 msgstr "Postitus_lista"
 
@@ -19732,8 +20150,8 @@ msgstr ""
 "\n"
 "Otsake: {0}"
 
-#: ../plugins/mail-notification/mail-notification.c:384
-#: ../plugins/mail-notification/mail-notification.c:420
+#: ../plugins/mail-notification/mail-notification.c:382
+#: ../plugins/mail-notification/mail-notification.c:418
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -19742,54 +20160,54 @@ msgstr[1] "%d uutta viestiä vastaanotettu."
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user@example.com"
-#: ../plugins/mail-notification/mail-notification.c:395
+#: ../plugins/mail-notification/mail-notification.c:393
 #, c-format
 msgid "From: %s"
 msgstr "Lähettäjä: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:409
+#: ../plugins/mail-notification/mail-notification.c:407
 #, c-format
 msgid "Subject: %s"
 msgstr "Aihe: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:426
+#: ../plugins/mail-notification/mail-notification.c:424
 msgid "New email in Evolution"
 msgstr "Uusia sähköpostiviestejä Evolutionissa"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:461
+#: ../plugins/mail-notification/mail-notification.c:459
 #, c-format
 msgid "Show %s"
 msgstr "Näytä %s"
 
-#: ../plugins/mail-notification/mail-notification.c:663
+#: ../plugins/mail-notification/mail-notification.c:661
 msgid "_Play sound when a new message arrives"
 msgstr "_Soita ääni uuden sähköpostin saapuessa"
 
-#: ../plugins/mail-notification/mail-notification.c:695
+#: ../plugins/mail-notification/mail-notification.c:693
 msgid "_Beep"
 msgstr "_Piippaa"
 
-#: ../plugins/mail-notification/mail-notification.c:708
+#: ../plugins/mail-notification/mail-notification.c:706
 msgid "Use sound _theme"
 msgstr "Käytä ääni_teemaa"
 
-#: ../plugins/mail-notification/mail-notification.c:727
+#: ../plugins/mail-notification/mail-notification.c:725
 msgid "Play _file:"
 msgstr "So_ita tiedosto:"
 
-#: ../plugins/mail-notification/mail-notification.c:736
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Select sound file"
 msgstr "Valitse äänitiedosto"
 
-#: ../plugins/mail-notification/mail-notification.c:792
+#: ../plugins/mail-notification/mail-notification.c:790
 msgid "Notify new messages for _Inbox only"
 msgstr "Huomauta uusista viesteistä _vain saapuvien kansiossa"
 
-#: ../plugins/mail-notification/mail-notification.c:802
+#: ../plugins/mail-notification/mail-notification.c:800
 msgid "Show _notification when a new message arrives"
 msgstr "Näytä ilmoitus uusien _viestien saapuessa"
 
@@ -19802,12 +20220,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Huomauttaa uusien viestien saapumisesta."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:232
+#: ../plugins/mail-to-task/mail-to-task.c:229
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Luotu sähköpostiviestistä, jonka lähetti %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../plugins/mail-to-task/mail-to-task.c:613
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -19816,7 +20234,7 @@ msgstr ""
 "Valittu kalenteri sisältää jo tapahtuman \"%s\". Haluatko muokata aiemmin "
 "lisättyä tapahtumaa?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:619
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -19825,7 +20243,7 @@ msgstr ""
 "Valittu tehtävälista sisältää jo tehtävän \"%s\". Haluatko muokata aiemmin "
 "lisättyä tehtävää?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:622
+#: ../plugins/mail-to-task/mail-to-task.c:619
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -19834,7 +20252,7 @@ msgstr ""
 "Valittu muistilappulista sisältää jo muistilapun \"%s\". Haluatko muokata "
 "aiemmin lisättyä muistilappua?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:642
+#: ../plugins/mail-to-task/mail-to-task.c:639
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -19845,7 +20263,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:649
+#: ../plugins/mail-to-task/mail-to-task.c:646
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -19856,7 +20274,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:656
+#: ../plugins/mail-to-task/mail-to-task.c:653
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -19867,33 +20285,30 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:677
+#: ../plugins/mail-to-task/mail-to-task.c:674
 #, fuzzy
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Haluatko ylikirjoittaa?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:753
+#: ../plugins/mail-to-task/mail-to-task.c:750
 msgid "[No Summary]"
 msgstr "[Ei yhteenvetoa]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:766
+#: ../plugins/mail-to-task/mail-to-task.c:763
 msgid "Invalid object returned from a server"
 msgstr "Palvelin palautti virheellisen olion"
 
-#: ../plugins/mail-to-task/mail-to-task.c:821
+#: ../plugins/mail-to-task/mail-to-task.c:818
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Tapahtui virhe käsiteltäessä: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:855
+#: ../plugins/mail-to-task/mail-to-task.c:852
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kalenteria ei voi avata: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:862
-#| msgid ""
-#| "Selected source is read only, thus cannot create event there. Select "
-#| "other source, please."
+#: ../plugins/mail-to-task/mail-to-task.c:856
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -19901,7 +20316,7 @@ msgstr ""
 "Valittu kalenteri on vain luettavissa, joten et voi luoda siihen tapahtumia. "
 "Valitse jokin toinen kalenteri."
 
-#: ../plugins/mail-to-task/mail-to-task.c:865
+#: ../plugins/mail-to-task/mail-to-task.c:859
 #, fuzzy
 #| msgid ""
 #| "Selected source is read only, thus cannot create task there. Select other "
@@ -19913,7 +20328,7 @@ msgstr ""
 "Valittu lähde on vain luettavissa, joten et voi luoda siihen tehtäviä. "
 "Valitse joku toinen lähde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:868
+#: ../plugins/mail-to-task/mail-to-task.c:862
 #, fuzzy
 #| msgid ""
 #| "Selected source is read only, thus cannot create memo there. Select other "
@@ -19925,39 +20340,35 @@ msgstr ""
 "Valittu lähde on vain luettavissa, joten et voi luoda siihen muistilappuja. "
 "Valitse joku toinen lähde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1203
-msgid "No writable calendar is available."
-msgstr "Kirjoitettavaa kalenteria ei ole saatavilla."
-
-#: ../plugins/mail-to-task/mail-to-task.c:1280
+#: ../plugins/mail-to-task/mail-to-task.c:1261
 msgid "Create an _Appointment"
 msgstr "Luo _tapaaminen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1282
+#: ../plugins/mail-to-task/mail-to-task.c:1263
 msgid "Create a new event from the selected message"
 msgstr "Luo uusi tapahtuma valitusta viestistä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1287
+#: ../plugins/mail-to-task/mail-to-task.c:1268
 msgid "Create a Mem_o"
 msgstr "Luo _muistilappu"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1289
+#: ../plugins/mail-to-task/mail-to-task.c:1270
 msgid "Create a new memo from the selected message"
 msgstr "Luo uusi muistilappu valitusta viestistä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1294
+#: ../plugins/mail-to-task/mail-to-task.c:1275
 msgid "Create a _Task"
 msgstr "Luo _tehtävä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1296
+#: ../plugins/mail-to-task/mail-to-task.c:1277
 msgid "Create a new task from the selected message"
 msgstr "Luo uusi tehtävä valitusta viestistä"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1304
+#: ../plugins/mail-to-task/mail-to-task.c:1285
 msgid "Create a _Meeting"
 msgstr "Luo _kokous"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1306
+#: ../plugins/mail-to-task/mail-to-task.c:1287
 msgid "Create a new meeting from the selected message"
 msgstr "Luo uusi kokous valitusta viestistä"
 
@@ -19977,37 +20388,37 @@ msgstr "Outlookin omat kansiot (.pst)"
 msgid "Import Outlook messages from PST file"
 msgstr "Tuo Outlook-viestejä PST-tiedostosta"
 
-#: ../plugins/pst-import/pst-importer.c:530
+#: ../plugins/pst-import/pst-importer.c:526
 msgid "_Mail"
 msgstr "_Sähköposti"
 
-#: ../plugins/pst-import/pst-importer.c:559
+#: ../plugins/pst-import/pst-importer.c:555
 msgid "Destination folder:"
 msgstr "Kohdekansio:"
 
-#: ../plugins/pst-import/pst-importer.c:569
+#: ../plugins/pst-import/pst-importer.c:565
 msgid "_Address Book"
 msgstr "_Osoitekirja"
 
-#: ../plugins/pst-import/pst-importer.c:574
+#: ../plugins/pst-import/pst-importer.c:570
 msgid "A_ppointments"
 msgstr "_Tapaamiset"
 
-#: ../plugins/pst-import/pst-importer.c:579 ../views/tasks/galview.xml.h:1
+#: ../plugins/pst-import/pst-importer.c:575 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "_Tehtävät"
 
-#: ../plugins/pst-import/pst-importer.c:584
+#: ../plugins/pst-import/pst-importer.c:580
 msgid "_Journal entries"
 msgstr "_Päiväkirjamerkinnät"
 
-#: ../plugins/pst-import/pst-importer.c:701
+#: ../plugins/pst-import/pst-importer.c:697
 msgid "Importing Outlook data"
 msgstr "Tuodaan tietoja Outlookista"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:141
-#: ../plugins/publish-calendar/publish-calendar.c:148
+#: ../plugins/publish-calendar/publish-calendar.c:140
+#: ../plugins/publish-calendar/publish-calendar.c:147
 msgid "Calendar Publishing"
 msgstr "Kalenterien julkaisu"
 
@@ -20040,23 +20451,23 @@ msgstr "Julkaisu kohteeseen %s onnistui"
 msgid "Mount of %s failed:"
 msgstr "Kohteen %s liittäminen epäonnistui:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:649
-#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+#: ../plugins/publish-calendar/publish-calendar.c:655
+#: ../plugins/publish-calendar/publish-calendar.ui.h:35
 msgid "E_nable"
 msgstr "Kä_ytä"
 
-#: ../plugins/publish-calendar/publish-calendar.c:799
+#: ../plugins/publish-calendar/publish-calendar.c:805
 msgid "Are you sure you want to remove this location?"
 msgstr "Haluatko varmasti poistaa tämän sijainnin?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1138
+#: ../plugins/publish-calendar/publish-calendar.c:1142
 msgid "Could not create publish thread."
 msgstr "Julkaisusäiettä ei voitu luoda."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1148
+#: ../plugins/publish-calendar/publish-calendar.c:1152
 msgid "_Publish Calendar Information"
 msgstr "_Julkaise kalenteritietoja"
 
@@ -20148,100 +20559,100 @@ msgstr "_Muista salasana"
 msgid "Publishing Location"
 msgstr "Julkaisupaikka"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:100
-#: ../plugins/publish-calendar/publish-format-ical.c:103
+#: ../plugins/publish-calendar/publish-format-fb.c:99
+#: ../plugins/publish-calendar/publish-format-ical.c:102
 #, fuzzy, c-format
 msgid "Invalid source UID '%s'"
 msgstr "Virheellinen kansio: ”%s”"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:540
+#: ../plugins/publish-calendar/url-editor-dialog.c:544
 msgid "New Location"
 msgstr "Uusi sijainti"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:542
+#: ../plugins/publish-calendar/url-editor-dialog.c:546
 msgid "Edit Location"
 msgstr "Muokkaa sijaintia"
 
 #. Translators: the %F %T is the third argument for a
 #. * strftime function.  It lets you define the formatting
 #. * of the date in the csv-file.
-#: ../plugins/save-calendar/csv-format.c:161
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Description List"
 msgstr "Kuvauslista"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Categories List"
 msgstr "Luokkalista"
 
-#: ../plugins/save-calendar/csv-format.c:379
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Comment List"
 msgstr "Kommenttilista"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Contact List"
 msgstr "Yhteystietolista"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "Start"
 msgstr "Alkaa"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "End"
 msgstr "Päättyy"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Due"
 msgstr "Erääntyy"
 
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "percent Done"
 msgstr "prosenttia valmiina"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:388
 msgid "Attendees List"
 msgstr "Osanottajalista"
 
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "Modified"
 msgstr "Muokattu"
 
-#: ../plugins/save-calendar/csv-format.c:564
+#: ../plugins/save-calendar/csv-format.c:563
 msgid "A_dvanced options for the CSV format"
 msgstr "CSV-muodon _lisäasetukset"
 
-#: ../plugins/save-calendar/csv-format.c:572
+#: ../plugins/save-calendar/csv-format.c:571
 msgid "Prepend a _header"
 msgstr "Lisää otsake _ennen"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:580
 msgid "_Value delimiter:"
 msgstr "_Arvojen erotin:"
 
-#: ../plugins/save-calendar/csv-format.c:592
+#: ../plugins/save-calendar/csv-format.c:591
 msgid "_Record delimiter:"
 msgstr "_Kenttien erotin:"
 
-#: ../plugins/save-calendar/csv-format.c:603
+#: ../plugins/save-calendar/csv-format.c:602
 msgid "_Encapsulate values with:"
 msgstr "_Kapsuloi arvot käyttäen:"
 
-#: ../plugins/save-calendar/csv-format.c:629
+#: ../plugins/save-calendar/csv-format.c:628
 msgid "Comma separated values (.csv)"
 msgstr "Pilkuin erotetut arvot (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:184 ../shell/e-shell-utils.c:178
+#: ../plugins/save-calendar/ical-format.c:183 ../shell/e-shell-utils.c:177
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -20266,23 +20677,28 @@ msgstr "%FT%T"
 msgid "RDF (.rdf)"
 msgstr "RDF-tiedostot (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:121
+#: ../plugins/save-calendar/save-calendar.c:120
 msgid "_Format:"
 msgstr "_Muoto:"
 
-#: ../plugins/save-calendar/save-calendar.c:187
+#: ../plugins/save-calendar/save-calendar.c:186
 msgid "Select destination file"
 msgstr "Valitse kohdetiedosto"
 
-#: ../plugins/save-calendar/save-calendar.c:343
+#: ../plugins/save-calendar/save-calendar.c:190
+#| msgid "_Save"
+msgid "_Save As"
+msgstr "_Tallenna nimellä"
+
+#: ../plugins/save-calendar/save-calendar.c:347
 msgid "Save the selected calendar to disk"
 msgstr "Tallenna valittu kalenteri levylle"
 
-#: ../plugins/save-calendar/save-calendar.c:374
+#: ../plugins/save-calendar/save-calendar.c:378
 msgid "Save the selected memo list to disk"
 msgstr "Tallenna valittu muistilappu levylle"
 
-#: ../plugins/save-calendar/save-calendar.c:405
+#: ../plugins/save-calendar/save-calendar.c:409
 msgid "Save the selected task list to disk"
 msgstr "Tallenna valittu tehtävälista levylle"
 
@@ -20293,40 +20709,39 @@ msgid ""
 "an email you are replying to."
 msgstr ""
 
-#: ../plugins/templates/templates.c:1148
+#: ../plugins/templates/templates.c:1146
 msgid "No Title"
 msgstr "Ei otsikkoa"
 
-#: ../plugins/templates/templates.c:1257
+#: ../plugins/templates/templates.c:1255
 msgid "Save as _Template"
 msgstr "Tallenna _pohjana"
 
-#: ../plugins/templates/templates.c:1259
+#: ../plugins/templates/templates.c:1257
 msgid "Save as Template"
 msgstr "Tallenna pohjana"
 
-#: ../shell/e-shell.c:278
+#: ../shell/e-shell.c:302
 msgid "Preparing to go offline..."
 msgstr "Valmistellaan verkotonta tilaa..."
 
-#: ../shell/e-shell.c:331
+#: ../shell/e-shell.c:355
 msgid "Preparing to go online..."
 msgstr "Valmistellaan verkkoyhteydellistä tilaa..."
 
-#: ../shell/e-shell.c:412
-#| msgid "Preparing to quit..."
+#: ../shell/e-shell.c:436
 msgid "Preparing to quit"
 msgstr "Valmistellaan sulkemista"
 
-#: ../shell/e-shell.c:418
+#: ../shell/e-shell.c:442
 msgid "Preparing to quit..."
 msgstr "Valmistellaan sulkemista..."
 
-#: ../shell/e-shell-content.c:721 ../shell/e-shell-content.c:722
+#: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
 msgid "Searches"
 msgstr "Haut"
 
-#: ../shell/e-shell-content.c:765
+#: ../shell/e-shell-content.c:764
 msgid "Save Search"
 msgstr "Tallenna haku"
 
@@ -20334,38 +20749,38 @@ msgstr "Tallenna haku"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:1102
+#: ../shell/e-shell-searchbar.c:937
 msgid "Sho_w:"
 msgstr "Nä_ytä:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1136
+#: ../shell/e-shell-searchbar.c:962
 msgid "Sear_ch:"
 msgstr "_Etsi:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1217
+#: ../shell/e-shell-searchbar.c:1030
 msgid "i_n"
 msgstr "lä_hteestä"
 
-#: ../shell/e-shell-utils.c:175
+#: ../shell/e-shell-utils.c:174
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:199
+#: ../shell/e-shell-utils.c:198
 msgid "All Files (*)"
 msgstr "Kaikki tiedostot (*)"
 
-#: ../shell/e-shell-view.c:292
+#: ../shell/e-shell-view.c:291
 msgid "Saving user interface state"
 msgstr "Tallennetaan käyttöliittymän tilaa"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:74
+#: ../shell/e-shell-window-actions.c:73
 msgid "translator-credits"
 msgstr ""
 "Ilkka Tuohela, 2002-2009\n"
@@ -20392,284 +20807,290 @@ msgstr ""
 "  Timo Jyrinki https://launchpad.net/~timo-jyrinki\n"
 "  papukaija https://launchpad.net/~papukaija"
 
-#: ../shell/e-shell-window-actions.c:85
+#: ../shell/e-shell-window-actions.c:84
 msgid "Evolution Website"
 msgstr "Evolutionin www-sivut"
 
-#: ../shell/e-shell-window-actions.c:341
+#: ../shell/e-shell-window-actions.c:340
 msgid "Categories Editor"
 msgstr "Luokkamuokkain"
 
-#: ../shell/e-shell-window-actions.c:672
+#: ../shell/e-shell-window-actions.c:716
 msgid "Bug Buddy is not installed."
 msgstr "Bug buddya ei ole asennettu."
 
-#: ../shell/e-shell-window-actions.c:673
+#: ../shell/e-shell-window-actions.c:717
 msgid "Bug Buddy could not be run."
 msgstr "Bug buddya ei voitu suorittaa."
 
-#: ../shell/e-shell-window-actions.c:853
+#: ../shell/e-shell-window-actions.c:895
+msgid "_About"
+msgstr "_Tietoja"
+
+#: ../shell/e-shell-window-actions.c:897
 msgid "Show information about Evolution"
 msgstr "Näytä tietoja Evolutionista"
 
-#: ../shell/e-shell-window-actions.c:858 ../shell/e-shell-window-actions.c:872
+#: ../shell/e-shell-window-actions.c:902 ../shell/e-shell-window-actions.c:916
 msgid "_Close Window"
 msgstr "_Sulje ikkuna"
 
-#: ../shell/e-shell-window-actions.c:879
+#: ../shell/e-shell-window-actions.c:923
 msgid "_Contents"
 msgstr "_Sisältö"
 
-#: ../shell/e-shell-window-actions.c:881
+#: ../shell/e-shell-window-actions.c:925
 msgid "Open the Evolution User Guide"
 msgstr "Avaa Evolutionin käyttäjäopas"
 
-#: ../shell/e-shell-window-actions.c:907
+#: ../shell/e-shell-window-actions.c:951
 msgid "I_mport..."
 msgstr "_Tuo..."
 
-#: ../shell/e-shell-window-actions.c:909
+#: ../shell/e-shell-window-actions.c:953
 msgid "Import data from other programs"
 msgstr "Tuo tietoja muista ohjelmista"
 
-#: ../shell/e-shell-window-actions.c:914
+#: ../shell/e-shell-window-actions.c:958
 msgid "New _Window"
 msgstr "Uusi _Ikkuna"
 
-#: ../shell/e-shell-window-actions.c:916
+#: ../shell/e-shell-window-actions.c:960
 msgid "Create a new window displaying this view"
 msgstr "Luo uusi ikkuna tälle näkymälle"
 
-#: ../shell/e-shell-window-actions.c:928
+#: ../shell/e-shell-window-actions.c:972
 msgid "Available Cate_gories"
 msgstr "Käytettävissä olevat _luokat"
 
-#: ../shell/e-shell-window-actions.c:930
+#: ../shell/e-shell-window-actions.c:974
 msgid "Manage available categories"
 msgstr "Hallitse käytettävissä olevia luokkia"
 
-#: ../shell/e-shell-window-actions.c:942
+#: ../shell/e-shell-window-actions.c:986
 msgid "_Quick Reference"
 msgstr "_Pikaopas"
 
-#: ../shell/e-shell-window-actions.c:944
+#: ../shell/e-shell-window-actions.c:988
 msgid "Show Evolution's shortcut keys"
 msgstr "Näytä Evolutionin pikanäppäimet"
 
-#: ../shell/e-shell-window-actions.c:951
+#: ../shell/e-shell-window-actions.c:993
+#| msgid "Quit"
+msgid "_Quit"
+msgstr "_Lopeta"
+
+#: ../shell/e-shell-window-actions.c:995
 msgid "Exit the program"
 msgstr "Poistu ohjelmasta"
 
-#: ../shell/e-shell-window-actions.c:956
+#: ../shell/e-shell-window-actions.c:1000
 msgid "_Advanced Search..."
 msgstr "_Oma haku..."
 
-#: ../shell/e-shell-window-actions.c:958
+#: ../shell/e-shell-window-actions.c:1002
 msgid "Construct a more advanced search"
 msgstr "Luo monimutkaisempi haku"
 
-#: ../shell/e-shell-window-actions.c:965
+#: ../shell/e-shell-window-actions.c:1009
 msgid "Clear the current search parameters"
 msgstr "Tyhjennä nykyiset hakuehdot"
 
-#: ../shell/e-shell-window-actions.c:970
+#: ../shell/e-shell-window-actions.c:1014
 msgid "_Edit Saved Searches..."
 msgstr "_Muokkaa tallennettuja hakuja..."
 
-#: ../shell/e-shell-window-actions.c:972
+#: ../shell/e-shell-window-actions.c:1016
 msgid "Manage your saved searches"
 msgstr "Hallitse tallennettuja hakuja"
 
-#: ../shell/e-shell-window-actions.c:979
+#: ../shell/e-shell-window-actions.c:1023
 msgid "Click here to change the search type"
 msgstr "Muuta hakutyyppiä napsauttamalla tästä"
 
-#: ../shell/e-shell-window-actions.c:984
+#: ../shell/e-shell-window-actions.c:1028
 msgid "_Find Now"
 msgstr "_Etsi nyt"
 
-#. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:986
+#: ../shell/e-shell-window-actions.c:1030
 msgid "Execute the current search parameters"
 msgstr "Suorita tämänhetkiset hakuehdot"
 
-#: ../shell/e-shell-window-actions.c:991
+#: ../shell/e-shell-window-actions.c:1035
 msgid "_Save Search..."
 msgstr "_Tallenna haku..."
 
-#: ../shell/e-shell-window-actions.c:993
+#: ../shell/e-shell-window-actions.c:1037
 msgid "Save the current search parameters"
 msgstr "Tallenna tämänhetkiset hakuehdot"
 
-#: ../shell/e-shell-window-actions.c:1005
+#: ../shell/e-shell-window-actions.c:1049
 msgid "Submit _Bug Report..."
 msgstr "Lähetä _vikailmoitus..."
 
-#: ../shell/e-shell-window-actions.c:1007
+#: ../shell/e-shell-window-actions.c:1051
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Lähetä vikailmoitus käyttäen Bug Buddyä"
 
-#: ../shell/e-shell-window-actions.c:1012
+#: ../shell/e-shell-window-actions.c:1056
 msgid "_Work Offline"
 msgstr "_Katkaise verkkoyhteydet"
 
-#: ../shell/e-shell-window-actions.c:1014
+#: ../shell/e-shell-window-actions.c:1058
 msgid "Put Evolution into offline mode"
 msgstr "Katkaise verkkoyhteydet"
 
-#: ../shell/e-shell-window-actions.c:1019
+#: ../shell/e-shell-window-actions.c:1063
 msgid "_Work Online"
 msgstr "A_vaa verkkoyhteydet"
 
-#: ../shell/e-shell-window-actions.c:1021
+#: ../shell/e-shell-window-actions.c:1065
 msgid "Put Evolution into online mode"
 msgstr "Avaa verkkoyhteydet"
 
-#: ../shell/e-shell-window-actions.c:1049
+#: ../shell/e-shell-window-actions.c:1093
 msgid "Lay_out"
 msgstr "_Asettelu"
 
-#: ../shell/e-shell-window-actions.c:1056
-msgid "_New"
-msgstr "_Uusi"
-
-#: ../shell/e-shell-window-actions.c:1063
+#: ../shell/e-shell-window-actions.c:1107
 msgid "_Search"
 msgstr "Et_si"
 
-#: ../shell/e-shell-window-actions.c:1070
+#: ../shell/e-shell-window-actions.c:1114
 msgid "_Switcher Appearance"
 msgstr "Valit_simen tyyli"
 
-#: ../shell/e-shell-window-actions.c:1084
+#: ../shell/e-shell-window-actions.c:1128
 msgid "_Window"
 msgstr "_Ikkuna"
 
-#: ../shell/e-shell-window-actions.c:1113
+#: ../shell/e-shell-window-actions.c:1157
 msgid "Show Side _Bar"
 msgstr "Näytä sivu_palkki"
 
-#: ../shell/e-shell-window-actions.c:1115
+#: ../shell/e-shell-window-actions.c:1159
 msgid "Show the side bar"
 msgstr "Näytä sivupalkki"
 
-#: ../shell/e-shell-window-actions.c:1121
+#: ../shell/e-shell-window-actions.c:1165
 msgid "Show _Buttons"
 msgstr "Näytä _painikkeet"
 
-#: ../shell/e-shell-window-actions.c:1123
+#: ../shell/e-shell-window-actions.c:1167
 msgid "Show the switcher buttons"
 msgstr "Näytä vaihtimen painikkeet"
 
-#: ../shell/e-shell-window-actions.c:1129
+#: ../shell/e-shell-window-actions.c:1173
 msgid "Show _Status Bar"
 msgstr "Näytä _tilarivi"
 
-#: ../shell/e-shell-window-actions.c:1131
+#: ../shell/e-shell-window-actions.c:1175
 msgid "Show the status bar"
 msgstr "Näytä tilarivi"
 
-#: ../shell/e-shell-window-actions.c:1137
+#: ../shell/e-shell-window-actions.c:1181
 msgid "Show _Tool Bar"
 msgstr "Näytä työ_kalupalkki"
 
-#: ../shell/e-shell-window-actions.c:1139
+#: ../shell/e-shell-window-actions.c:1183
 msgid "Show the tool bar"
 msgstr "Näytä työkalurivi"
 
-#: ../shell/e-shell-window-actions.c:1161
+#: ../shell/e-shell-window-actions.c:1205
 msgid "_Icons Only"
 msgstr "Vain _kuvakkeet"
 
-#: ../shell/e-shell-window-actions.c:1163
+#: ../shell/e-shell-window-actions.c:1207
 msgid "Display window buttons with icons only"
 msgstr "Näytä ikkunan napit ainoastaan kuvakkeina"
 
-#: ../shell/e-shell-window-actions.c:1168
+#: ../shell/e-shell-window-actions.c:1212
 msgid "_Text Only"
 msgstr "Vain _teksti"
 
-#: ../shell/e-shell-window-actions.c:1170
+#: ../shell/e-shell-window-actions.c:1214
 msgid "Display window buttons with text only"
 msgstr "Näytä ikkunan napit ainoastaan tekstinä"
 
-#: ../shell/e-shell-window-actions.c:1175
+#: ../shell/e-shell-window-actions.c:1219
 msgid "Icons _and Text"
 msgstr "Kuvakkeet _ja teksti"
 
-#: ../shell/e-shell-window-actions.c:1177
+#: ../shell/e-shell-window-actions.c:1221
 msgid "Display window buttons with icons and text"
 msgstr "Näytä ikkunan napit kuvakkeina ja tekstinä"
 
-#: ../shell/e-shell-window-actions.c:1182
+#: ../shell/e-shell-window-actions.c:1226
 msgid "Tool_bar Style"
 msgstr "_Työkalupalkin tyyli"
 
-#: ../shell/e-shell-window-actions.c:1184
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Näytä ikkunan napit työpöydän työkalupalkin asetuksen mukaisesti"
 
-#: ../shell/e-shell-window-actions.c:1192
-#| msgid "Save Current View"
+#: ../shell/e-shell-window-actions.c:1236
 msgid "Delete Current View"
 msgstr "Poista nykyinen näkymä"
 
-#: ../shell/e-shell-window-actions.c:1199
+#: ../shell/e-shell-window-actions.c:1243
 msgid "Save Custom View..."
 msgstr "Tallenna oma näkymä..."
 
-#: ../shell/e-shell-window-actions.c:1201
+#: ../shell/e-shell-window-actions.c:1245
 msgid "Save current custom view"
 msgstr "Tallenna nykyinen muokattu näkymä"
 
-#: ../shell/e-shell-window-actions.c:1208
+#: ../shell/e-shell-window-actions.c:1252
 msgid "C_urrent View"
 msgstr "N_ykyinen näkymä"
 
-#: ../shell/e-shell-window-actions.c:1218
+#: ../shell/e-shell-window-actions.c:1262
 msgid "Custom View"
 msgstr "Oma näkymä"
 
-#: ../shell/e-shell-window-actions.c:1220
+#: ../shell/e-shell-window-actions.c:1264
 msgid "Current view is a customized view"
 msgstr "Nykyinen näkymä tai muokattu näkymä"
 
-#: ../shell/e-shell-window-actions.c:1230
+#: ../shell/e-shell-window-actions.c:1272
+msgid "Page Set_up..."
+msgstr "_Sivun asetukset..."
+
+#: ../shell/e-shell-window-actions.c:1274
 msgid "Change the page settings for your current printer"
 msgstr "Muuta nykyisen tulostimen sivuasetuksia"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1635
 #, c-format
 msgid "Switch to %s"
 msgstr "Avaa %s"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1758
 #, c-format
 msgid "Select view: %s"
 msgstr "Valitse näkymä: %s"
 
-#: ../shell/e-shell-window-actions.c:1731
+#: ../shell/e-shell-window-actions.c:1775
 #, c-format
-#| msgid "Select view: %s"
 msgid "Delete view: %s"
 msgstr "Poista näkymä: %s"
 
-#: ../shell/e-shell-window-actions.c:1825
+#: ../shell/e-shell-window-actions.c:1869
 msgid "Execute these search parameters"
 msgstr "Suorita nämä hakuehdot"
 
-#: ../shell/e-shell-window.c:455
+#: ../shell/e-shell-window.c:503
 msgid "New"
 msgstr "Uusi"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:580
+#: ../shell/e-shell-window-private.c:579
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:183
+#: ../shell/main.c:182
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20705,7 +21126,7 @@ msgstr ""
 "Toivomme että nautit kovan työmme tuloksista, ja odotamme innolla\n"
 "osallistumistasi kehitystyöhön!\n"
 
-#: ../shell/main.c:207
+#: ../shell/main.c:206
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20713,13 +21134,13 @@ msgstr ""
 "Kiitos\n"
 "Evolution-tiimi\n"
 
-#: ../shell/main.c:213
+#: ../shell/main.c:212
 msgid "Do not tell me again"
 msgstr "Älä kerro tätä uudestaan"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:302
+#: ../shell/main.c:301
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -20727,51 +21148,53 @@ msgstr ""
 "Käynnistä Evolution näyttäen tiettyä näkymää. Käytettävissä olevat valinnat "
 "ovat 'mail', 'calendar', 'contacts', 'tasks' ja 'memos'"
 
-#: ../shell/main.c:306
+#: ../shell/main.c:305
 msgid "Apply the given geometry to the main window"
 msgstr "Käytä annettua muotoa pääikkunalle"
 
-#: ../shell/main.c:310
+#: ../shell/main.c:309
 msgid "Start in online mode"
 msgstr "Käynnistä verkkoyhteydet auki"
 
-#: ../shell/main.c:312
+#: ../shell/main.c:311
 msgid "Ignore network availability"
 msgstr "Älä kiinnitä huomiota, onko verkko käytettävissä vai ei"
 
-#: ../shell/main.c:315
+#: ../shell/main.c:314
 msgid "Forcibly shut down Evolution"
 msgstr "Sammuta Evolution väkisin"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:317
 msgid "Disable loading of any plugins."
 msgstr "Älä lataa mitään lisäosia."
 
-#: ../shell/main.c:320
+#: ../shell/main.c:319
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Poista sähköpostien, yhteystietojen ja tehtävien esikatselu käytöstä."
 
-#: ../shell/main.c:324
+#: ../shell/main.c:323
 #, fuzzy
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Tuo argumentteina annettavat URI-osoitteet tai tiedostot."
 
-#: ../shell/main.c:326
+#: ../shell/main.c:325
 msgid "Request a running Evolution process to quit"
 msgstr "Pyydä käynnissä olevaa Evolution-prosessia lopettamaan"
 
-#: ../shell/main.c:403
+#: ../shell/main.c:402
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
 "System error: %s"
 msgstr ""
+"Evolutionin käynnistäminen epäonnistui. Toinen Evolution-istunto saattaa "
+"olla reagoimaton. Järjestelmävirhe: %s"
 
-#: ../shell/main.c:499 ../shell/main.c:504
+#: ../shell/main.c:496 ../shell/main.c:501
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution, henkilökohtaisten tietojen hallinta sekä sähköposti"
 
-#: ../shell/main.c:571
+#: ../shell/main.c:568
 #, fuzzy, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20780,7 +21203,7 @@ msgstr ""
 "%s: --online ja --offline eivät voi olla käytössä samaan aikaan.\n"
 " Käytä %s '--help' saadaksesi lisätietoja.\n"
 
-#: ../shell/main.c:577
+#: ../shell/main.c:574
 #, fuzzy, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -20825,7 +21248,7 @@ msgstr ""
 "Evolution ei enää tue päivittämistä suoraan versiosta {0}. Kiertokeinona "
 "voit kokeilla päivittää ensin Evolutionin versioon 2 ja sitten versioon 3."
 
-#: ../smime/gui/ca-trust-dialog.c:109
+#: ../smime/gui/ca-trust-dialog.c:108
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20836,181 +21259,109 @@ msgstr ""
 "\n"
 "Muokkaa luotettavuusasetuksia:"
 
-#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
-#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:80 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:119
 msgid "Certificate Name"
 msgstr "Varmenteen nimi"
 
-#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:101
 #, fuzzy
 msgid "Issued To Organization"
 msgstr "Organi_saatio:"
 
-#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
 #, fuzzy
 msgid "Issued To Organizational Unit"
 msgstr "Organisaatioyksikkö (OU)"
 
-#: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
-#: ../smime/gui/certificate-manager.c:114
-#: ../smime/gui/certificate-viewer.c:638 ../smime/lib/e-asn1-object.c:134
+#: ../smime/gui/certificate-manager.c:83
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:121
 msgid "Serial Number"
 msgstr "Sarjanumero"
 
-#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
-#: ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:122
 msgid "Purposes"
 msgstr "Käyttötarkoitus"
 
-#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
-#: ../smime/gui/certificate-manager.c:116
-#: ../smime/gui/certificate-viewer.c:640
+#: ../smime/gui/certificate-manager.c:85
+#: ../smime/gui/certificate-manager.c:105
+#: ../smime/gui/certificate-manager.c:123
 msgid "Issued By"
 msgstr "Myöntäjä"
 
-#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
-#: ../smime/gui/certificate-manager.c:117
+#: ../smime/gui/certificate-manager.c:86
+#: ../smime/gui/certificate-manager.c:106
+#: ../smime/gui/certificate-manager.c:124
 #, fuzzy
 msgid "Issued By Organization"
 msgstr "Organi_saatio:"
 
-#: ../smime/gui/certificate-manager.c:80
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:118
+#: ../smime/gui/certificate-manager.c:87
+#: ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:125
 #, fuzzy
 msgid "Issued By Organizational Unit"
 msgstr "Organisaatioyksikkö (OU)"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
-#: ../smime/gui/certificate-manager.c:119
+#: ../smime/gui/certificate-manager.c:88
+#: ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:126
 msgid "Issued"
 msgstr "Myönnetty"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
-#: ../smime/gui/certificate-manager.c:120
+#: ../smime/gui/certificate-manager.c:89
+#: ../smime/gui/certificate-manager.c:109
+#: ../smime/gui/certificate-manager.c:127
 msgid "Expires"
 msgstr "Vanhenemispäivä"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121
-#: ../smime/gui/certificate-viewer.c:650
+#: ../smime/gui/certificate-manager.c:90
+#: ../smime/gui/certificate-manager.c:110
+#: ../smime/gui/certificate-manager.c:128
 msgid "SHA1 Fingerprint"
 msgstr "SHA1-sormenjälki"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122
-#: ../smime/gui/certificate-viewer.c:651
+#: ../smime/gui/certificate-manager.c:91
+#: ../smime/gui/certificate-manager.c:111
+#: ../smime/gui/certificate-manager.c:129
 msgid "MD5 Fingerprint"
 msgstr "MD5-sormenjälki"
 
-#: ../smime/gui/certificate-manager.c:93
-#: ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:120
 msgid "Email Address"
 msgstr "Sähköpostiosoite"
 
-#: ../smime/gui/certificate-manager.c:614
+#: ../smime/gui/certificate-manager.c:621
 msgid "Select a certificate to import..."
 msgstr "Valitse tuotava varmenne..."
 
-#: ../smime/gui/certificate-manager.c:628
+#: ../smime/gui/certificate-manager.c:635
 msgid "All files"
 msgstr "Kaikki tiedostot"
 
-#: ../smime/gui/certificate-manager.c:664
+#: ../smime/gui/certificate-manager.c:671
 msgid "Failed to import certificate"
 msgstr "Varmenteen tuonti epäonnistui"
 
-#: ../smime/gui/certificate-manager.c:1046
+#: ../smime/gui/certificate-manager.c:1053
 msgid "All PKCS12 files"
 msgstr "Kaikki PKCS12-tiedostot"
 
-#: ../smime/gui/certificate-manager.c:1063
+#: ../smime/gui/certificate-manager.c:1070
 msgid "All email certificate files"
 msgstr "Kaikki sähköpostivarmennetiedostot"
 
-#: ../smime/gui/certificate-manager.c:1080
+#: ../smime/gui/certificate-manager.c:1087
 msgid "All CA certificate files"
 msgstr "Kaikki CA-varmenteiden tiedostot"
 
-#: ../smime/gui/certificate-viewer.c:292
-#, fuzzy
-#| msgid "<Not Part of Certificate>"
-msgid "Not part of certificate"
-msgstr "<Ei varmenteen osa>"
-
-#: ../smime/gui/certificate-viewer.c:600
-msgid "This certificate has been verified for the following uses:"
-msgstr "Tämä varmenne on todennettu seuraaviin käyttötarkoituksiin:"
-
-#: ../smime/gui/certificate-viewer.c:604 ../smime/lib/e-asn1-object.c:387
-msgid "SSL Client Certificate"
-msgstr "SSL-asiakkaan varmenne"
-
-#: ../smime/gui/certificate-viewer.c:609 ../smime/lib/e-asn1-object.c:391
-msgid "SSL Server Certificate"
-msgstr "SSL-palvelimen varmenne"
-
-#: ../smime/gui/certificate-viewer.c:614
-msgid "Email Signer Certificate"
-msgstr "Sähköpostin allekirjoittajan varmenne"
-
-#: ../smime/gui/certificate-viewer.c:619
-msgid "Email Recipient Certificate"
-msgstr "Sähköpostin vastaanottajan varmenne"
-
-#: ../smime/gui/certificate-viewer.c:634
-msgid "Issued To"
-msgstr "Myönnetty"
-
-#: ../smime/gui/certificate-viewer.c:635 ../smime/gui/certificate-viewer.c:641
-msgid "Common Name (CN)"
-msgstr "Julkinen nimi (CN)"
-
-#: ../smime/gui/certificate-viewer.c:636 ../smime/gui/certificate-viewer.c:642
-msgid "Organization (O)"
-msgstr "Organisaatio (O)"
-
-#: ../smime/gui/certificate-viewer.c:637 ../smime/gui/certificate-viewer.c:643
-msgid "Organizational Unit (OU)"
-msgstr "Organisaatioyksikkö (OU)"
-
-#: ../smime/gui/certificate-viewer.c:645
-msgid "Validity"
-msgstr "Kelvollisuus"
-
-#: ../smime/gui/certificate-viewer.c:646
-msgid "Issued On"
-msgstr "Myönnetty"
-
-#: ../smime/gui/certificate-viewer.c:647
-msgid "Expires On"
-msgstr "Vanhenee"
-
-#: ../smime/gui/certificate-viewer.c:649
-msgid "Fingerprints"
-msgstr "Sormenjäljet"
-
-#: ../smime/gui/certificate-viewer.c:671
-msgid "Certificate Hierarchy"
-msgstr "Varmennehierarkia"
-
-#: ../smime/gui/certificate-viewer.c:674
-msgid "Certificate Fields"
-msgstr "Varmenteen kentät"
-
-#: ../smime/gui/certificate-viewer.c:677
-msgid "Field Value"
-msgstr "Kentän arvo"
-
-#: ../smime/gui/certificate-viewer.c:679
-msgid "Details"
-msgstr "Yksityiskohtaiset"
-
-#: ../smime/gui/cert-trust-dialog.c:153
+#: ../smime/gui/cert-trust-dialog.c:152
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -21019,7 +21370,7 @@ msgstr ""
 "Koska luotat varmentajaan, 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:158
+#: ../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 "
@@ -21028,28 +21379,28 @@ msgstr ""
 "Koska et luota varmentajaan, joka myönsi tämän varmenteen, et "
 "automaattisesti luota tähän varmenteeseen, jollei tässä muuten mainita"
 
-#: ../smime/gui/component.c:56
+#: ../smime/gui/component.c:55
 #, fuzzy, c-format
 #| msgid "Enter Google password for user '%s'."
 msgid "Enter the password for '%s', token '%s'"
 msgstr "Anna käyttäjän '%s' Google-salasana."
 
-#: ../smime/gui/component.c:58
+#: ../smime/gui/component.c:57
 #, c-format
 msgid "Enter the password for '%s'"
 msgstr ""
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:86
+#: ../smime/gui/component.c:85
 msgid "Enter new password for certificate database"
 msgstr "Syötä uusi salasana varmennetietokannalle"
 
-#: ../smime/gui/component.c:89
+#: ../smime/gui/component.c:88
 msgid "Enter new password"
 msgstr "Syötä uusi salasana"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -21058,7 +21409,7 @@ msgstr ""
 "Myönnetty:\n"
 "  Käyttöön: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:123
+#: ../smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -21067,7 +21418,7 @@ msgstr ""
 "Myöntäjä:\n"
 " Käyttö: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:176
+#: ../smime/gui/e-cert-selector.c:175
 msgid "Select certificate"
 msgstr "Valitse varmenne"
 
@@ -21088,47 +21439,47 @@ msgstr "_Varmuuskopioi"
 msgid "Backup _All"
 msgstr "Varmuuskopioi _kaikki"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Your Certificates"
 msgstr "Omat varmenteet"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "You have certificates on file that identify these people:"
 msgstr "Seuraavat henkilöt voidaan tunnistaa tallentamistasi varmenteista:"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Contact Certificates"
 msgstr "Tuttavien varmenteet"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:15
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "Seuraavat varmentajat voidaan tunnistaa tallentamistasi varmenteista:"
 
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Authorities"
 msgstr "Varmentajat"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Certificate Authority Trust"
 msgstr "Varmentajan luottamus"
 
-#: ../smime/gui/smime-ui.ui.h:16
+#: ../smime/gui/smime-ui.ui.h:18
 #, fuzzy
 msgid "Trust this CA to identify _websites."
 msgstr "Luota tähän CA:han www-sivustojen tunnistamisessa."
 
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:19
 #, fuzzy
 msgid "Trust this CA to identify _email users."
 msgstr "Luota tähän CA:han sähköpostikäyttäjien tunnistamisessa."
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:20
 #, fuzzy
 msgid "Trust this CA to identify _software developers."
 msgstr "Luota tähän CA:han ohjelmistokehittäjien tunnistamisessa."
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:21
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -21136,214 +21487,44 @@ msgstr ""
 "Ennen kuin luotat tähän CA:han missään tarkoituksessa, tulisi sinun tutkia "
 "varmenne tarkasti."
 
-#: ../smime/gui/smime-ui.ui.h:21 ../smime/lib/e-asn1-object.c:658
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Certificate"
 msgstr "Varmenne"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "Certificate details"
 msgstr "Varmenteen yksityiskohdat"
 
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Email Certificate Trust Settings"
 msgstr "Varmenteen luottamuksen asetukset"
 
-#: ../smime/gui/smime-ui.ui.h:24
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Trust the authenticity of this certificate"
 msgstr "Luota tämän varmenteen oikeellisuuteen"
 
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Älä luota tämän varmenteen oikeellisuuteen"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:30
 msgid "_Edit CA Trust"
 msgstr "_Muokkaa CA:n luottamusta"
 
-#: ../smime/lib/e-asn1-object.c:95
-msgid "Version"
-msgstr "Versio"
-
-#: ../smime/lib/e-asn1-object.c:110
-msgid "Version 1"
-msgstr "Versio 1"
-
-#: ../smime/lib/e-asn1-object.c:113
-msgid "Version 2"
-msgstr "Versio 2"
-
-#: ../smime/lib/e-asn1-object.c:116
-msgid "Version 3"
-msgstr "Versio 3"
-
-#: ../smime/lib/e-asn1-object.c:192
-msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr "PKCS #1 MD2 RSA -salauksella"
-
-#: ../smime/lib/e-asn1-object.c:195
-msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr "PKCS #1 MD5 RSA -salauksella"
-
-#: ../smime/lib/e-asn1-object.c:198
-msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr "PKCS #1 SHA-1 RSA -salauksella"
-
-#: ../smime/lib/e-asn1-object.c:201
-msgid "PKCS #1 SHA-256 With RSA Encryption"
-msgstr "PKCS #1 SHA-256 RSA -salauksella"
-
-#: ../smime/lib/e-asn1-object.c:204
-msgid "PKCS #1 SHA-384 With RSA Encryption"
-msgstr "PKCS #1 SHA-384 RSA -salauksella"
-
-#: ../smime/lib/e-asn1-object.c:207
-msgid "PKCS #1 SHA-512 With RSA Encryption"
-msgstr "PKCS #1 SHA-512 RSA -salauksella"
-
-#: ../smime/lib/e-asn1-object.c:234
-msgid "PKCS #1 RSA Encryption"
-msgstr "PKCS #1 RSA-salaus"
-
-#: ../smime/lib/e-asn1-object.c:237
-msgid "Certificate Key Usage"
-msgstr "Varmenneavaimen käyttö"
-
-#: ../smime/lib/e-asn1-object.c:240
-msgid "Netscape Certificate Type"
-msgstr "Netscape-varmenteen tyyppi"
-
-#: ../smime/lib/e-asn1-object.c:243
-msgid "Certificate Authority Key Identifier"
-msgstr "Varmentajan avaintunniste"
-
-#: ../smime/lib/e-asn1-object.c:255
-#, c-format
-msgid "Object Identifier (%s)"
-msgstr "Kohteen tunniste (%s)"
-
-#: ../smime/lib/e-asn1-object.c:306
-msgid "Algorithm Identifier"
-msgstr "Algoritmin tunniste"
-
-#: ../smime/lib/e-asn1-object.c:314
-msgid "Algorithm Parameters"
-msgstr "Algoritmin parametrit"
-
-#: ../smime/lib/e-asn1-object.c:336
-msgid "Subject Public Key Info"
-msgstr "Aiheen julkisen avaimen tiedot"
-
-#: ../smime/lib/e-asn1-object.c:341
-msgid "Subject Public Key Algorithm"
-msgstr "Aiheen julkisen avaimen algoritmi"
-
-#: ../smime/lib/e-asn1-object.c:356
-msgid "Subject's Public Key"
-msgstr "Kohteen julkinen avain"
-
-#: ../smime/lib/e-asn1-object.c:378 ../smime/lib/e-asn1-object.c:428
-msgid "Error: Unable to process extension"
-msgstr "Virhe: laajennosta ei voi käsitellä"
-
-#: ../smime/lib/e-asn1-object.c:399 ../smime/lib/e-asn1-object.c:411
-msgid "Object Signer"
-msgstr "Kohteen allekirjoittaja"
-
-#: ../smime/lib/e-asn1-object.c:403
-msgid "SSL Certificate Authority"
-msgstr "SSL-varmenteiden varmentaja"
-
-#: ../smime/lib/e-asn1-object.c:407
-msgid "Email Certificate Authority"
-msgstr "Sähköpostivarmenteiden varmentaja"
-
-#: ../smime/lib/e-asn1-object.c:436
-msgid "Signing"
-msgstr "Allekirjoitus"
-
-#: ../smime/lib/e-asn1-object.c:440
-msgid "Non-repudiation"
-msgstr "Kiistämättömyys"
-
-#: ../smime/lib/e-asn1-object.c:444
-msgid "Key Encipherment"
-msgstr "Avaimen salakoodaus"
-
-#: ../smime/lib/e-asn1-object.c:448
-msgid "Data Encipherment"
-msgstr "Tiedon salakoodaus"
-
-#: ../smime/lib/e-asn1-object.c:452
-msgid "Key Agreement"
-msgstr "Avaimen sopimus"
-
-#: ../smime/lib/e-asn1-object.c:456
-msgid "Certificate Signer"
-msgstr "Varmenteen allekirjoittaja"
-
-#: ../smime/lib/e-asn1-object.c:460
-msgid "CRL Signer"
-msgstr "CRL allekirjoittaja"
-
-#: ../smime/lib/e-asn1-object.c:509
-msgid "Critical"
-msgstr "Kriittinen"
-
-#: ../smime/lib/e-asn1-object.c:511 ../smime/lib/e-asn1-object.c:514
-msgid "Not Critical"
-msgstr "Ei-kriittinen"
-
-#: ../smime/lib/e-asn1-object.c:535
-msgid "Extensions"
-msgstr "Laajennokset"
-
-#. Translators: This string is used in Certificate
-#. * details for fields like Issuer or Subject, which
-#. * shows the field name on the left and its respective
-#. * value on the right, both as stored in the
-#. * certificate itself.  You probably do not need to
-#. * change this string, unless changing the order of
-#. * name and value.  As a result example:
-#. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-asn1-object.c:615
-#, c-format
-msgid "%s = %s"
-msgstr "%s = %s"
-
-#: ../smime/lib/e-asn1-object.c:672 ../smime/lib/e-asn1-object.c:807
-msgid "Certificate Signature Algorithm"
-msgstr "Varmenteen allekirjoitusalgoritmi"
-
-#: ../smime/lib/e-asn1-object.c:681
-msgid "Issuer"
-msgstr "Myöntäjä"
-
-#: ../smime/lib/e-asn1-object.c:735
-msgid "Issuer Unique ID"
-msgstr "Myöntäjän yksilöllinen ID"
-
-#: ../smime/lib/e-asn1-object.c:754
-msgid "Subject Unique ID"
-msgstr "Kohteen yksilöllinen tunniste"
-
-#: ../smime/lib/e-asn1-object.c:813
-msgid "Certificate Signature Value"
-msgstr "Varmenteen allekirjoituksen arvo"
-
-#: ../smime/lib/e-cert.c:201 ../smime/lib/e-cert.c:213
+#: ../smime/lib/e-cert.c:236 ../smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:392
+#: ../smime/lib/e-cert.c:404
 msgid "Sign"
 msgstr "Allekirjoita"
 
-#: ../smime/lib/e-cert.c:393
+#: ../smime/lib/e-cert.c:405
 msgid "Encrypt"
 msgstr "Salaa"
 
-#: ../smime/lib/e-cert-db.c:864
+#: ../smime/lib/e-cert-db.c:718
 msgid "Certificate already exists"
 msgstr "Varmenne on jo olemassa"
 
@@ -21431,6 +21612,229 @@ msgstr "_Eräpäivän kanssa"
 msgid "With _Status"
 msgstr "_Tilan kanssa"
 
+#~ msgid "Original Contact:"
+#~ msgstr "Alkuperäinen yhteystieto:"
+
+#, fuzzy
+#~| msgid "Disable or enable ellipsizing of folder names in side bar"
+#~ msgid "Ellipsize mode for folder names in side bar"
+#~ msgstr "Määritä typistetäänkö kansioiden nimet kansionäkymässä"
+
+#~ msgid "Pinging %s"
+#~ msgstr "Pingataan %s"
+
+#~ msgid "_Restore Default"
+#~ msgstr "_Palauta oletus"
+
+#~ msgid "Proxy Settings"
+#~ msgstr "Välityspalvelimen asetukset"
+
+#~ msgid "_Use system defaults"
+#~ msgstr "Käytä järjestelmän olet_uksia"
+
+#~ msgid "_Direct connection to the Internet"
+#~ msgstr "_Suora yhteys Internetiin"
+
+#~ msgid "_Manual proxy configuration:"
+#~ msgstr "_Välipalvelimen käsin asettaminen:"
+
+#~ msgid "_Secure HTTP Proxy:"
+#~ msgstr "_HTTPS-välityspalvelin:"
+
+#~ msgid "No _Proxy for:"
+#~ msgstr "Ei _välipalvelinta seuraaville:"
+
+#~ msgid "Use Authe_ntication"
+#~ msgstr "Käytä _tunnistautumista"
+
+#~ msgid "Us_ername:"
+#~ msgstr "Käyttäjät_unnus:"
+
+#~ msgid "Pass_word:"
+#~ msgstr "_Salasana:"
+
+#~ msgid "Copy..."
+#~ msgstr "Kopioi..."
+
+#~ msgid "No writable calendar is available."
+#~ msgstr "Kirjoitettavaa kalenteria ei ole saatavilla."
+
+#, fuzzy
+#~| msgid "<Not Part of Certificate>"
+#~ msgid "Not part of certificate"
+#~ msgstr "<Ei varmenteen osa>"
+
+#~ msgid "This certificate has been verified for the following uses:"
+#~ msgstr "Tämä varmenne on todennettu seuraaviin käyttötarkoituksiin:"
+
+#~ msgid "SSL Client Certificate"
+#~ msgstr "SSL-asiakkaan varmenne"
+
+#~ msgid "SSL Server Certificate"
+#~ msgstr "SSL-palvelimen varmenne"
+
+#~ msgid "Email Signer Certificate"
+#~ msgstr "Sähköpostin allekirjoittajan varmenne"
+
+#~ msgid "Email Recipient Certificate"
+#~ msgstr "Sähköpostin vastaanottajan varmenne"
+
+#~ msgid "Issued To"
+#~ msgstr "Myönnetty"
+
+#~ msgid "Common Name (CN)"
+#~ msgstr "Julkinen nimi (CN)"
+
+#~ msgid "Organization (O)"
+#~ msgstr "Organisaatio (O)"
+
+#~ msgid "Organizational Unit (OU)"
+#~ msgstr "Organisaatioyksikkö (OU)"
+
+#~ msgid "Validity"
+#~ msgstr "Kelvollisuus"
+
+#~ msgid "Issued On"
+#~ msgstr "Myönnetty"
+
+#~ msgid "Expires On"
+#~ msgstr "Vanhenee"
+
+#~ msgid "Fingerprints"
+#~ msgstr "Sormenjäljet"
+
+#~ msgid "Certificate Hierarchy"
+#~ msgstr "Varmennehierarkia"
+
+#~ msgid "Certificate Fields"
+#~ msgstr "Varmenteen kentät"
+
+#~ msgid "Field Value"
+#~ msgstr "Kentän arvo"
+
+#~ msgid "Details"
+#~ msgstr "Yksityiskohtaiset"
+
+#~ msgid "Version"
+#~ msgstr "Versio"
+
+#~ msgid "Version 1"
+#~ msgstr "Versio 1"
+
+#~ msgid "Version 2"
+#~ msgstr "Versio 2"
+
+#~ msgid "Version 3"
+#~ msgstr "Versio 3"
+
+#~ msgid "PKCS #1 MD2 With RSA Encryption"
+#~ msgstr "PKCS #1 MD2 RSA -salauksella"
+
+#~ msgid "PKCS #1 MD5 With RSA Encryption"
+#~ msgstr "PKCS #1 MD5 RSA -salauksella"
+
+#~ msgid "PKCS #1 SHA-1 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-1 RSA -salauksella"
+
+#~ msgid "PKCS #1 SHA-256 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-256 RSA -salauksella"
+
+#~ msgid "PKCS #1 SHA-384 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-384 RSA -salauksella"
+
+#~ msgid "PKCS #1 SHA-512 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-512 RSA -salauksella"
+
+#~ msgid "PKCS #1 RSA Encryption"
+#~ msgstr "PKCS #1 RSA-salaus"
+
+#~ msgid "Certificate Key Usage"
+#~ msgstr "Varmenneavaimen käyttö"
+
+#~ msgid "Netscape Certificate Type"
+#~ msgstr "Netscape-varmenteen tyyppi"
+
+#~ msgid "Certificate Authority Key Identifier"
+#~ msgstr "Varmentajan avaintunniste"
+
+#~ msgid "Object Identifier (%s)"
+#~ msgstr "Kohteen tunniste (%s)"
+
+#~ msgid "Algorithm Identifier"
+#~ msgstr "Algoritmin tunniste"
+
+#~ msgid "Algorithm Parameters"
+#~ msgstr "Algoritmin parametrit"
+
+#~ msgid "Subject Public Key Info"
+#~ msgstr "Aiheen julkisen avaimen tiedot"
+
+#~ msgid "Subject Public Key Algorithm"
+#~ msgstr "Aiheen julkisen avaimen algoritmi"
+
+#~ msgid "Subject's Public Key"
+#~ msgstr "Kohteen julkinen avain"
+
+#~ msgid "Error: Unable to process extension"
+#~ msgstr "Virhe: laajennosta ei voi käsitellä"
+
+#~ msgid "Object Signer"
+#~ msgstr "Kohteen allekirjoittaja"
+
+#~ msgid "SSL Certificate Authority"
+#~ msgstr "SSL-varmenteiden varmentaja"
+
+#~ msgid "Email Certificate Authority"
+#~ msgstr "Sähköpostivarmenteiden varmentaja"
+
+#~ msgid "Signing"
+#~ msgstr "Allekirjoitus"
+
+#~ msgid "Non-repudiation"
+#~ msgstr "Kiistämättömyys"
+
+#~ msgid "Key Encipherment"
+#~ msgstr "Avaimen salakoodaus"
+
+#~ msgid "Data Encipherment"
+#~ msgstr "Tiedon salakoodaus"
+
+#~ msgid "Key Agreement"
+#~ msgstr "Avaimen sopimus"
+
+#~ msgid "Certificate Signer"
+#~ msgstr "Varmenteen allekirjoittaja"
+
+#~ msgid "CRL Signer"
+#~ msgstr "CRL allekirjoittaja"
+
+#~ msgid "Critical"
+#~ msgstr "Kriittinen"
+
+#~ msgid "Not Critical"
+#~ msgstr "Ei-kriittinen"
+
+#~ msgid "Extensions"
+#~ msgstr "Laajennokset"
+
+#~ msgid "%s = %s"
+#~ msgstr "%s = %s"
+
+#~ msgid "Certificate Signature Algorithm"
+#~ msgstr "Varmenteen allekirjoitusalgoritmi"
+
+#~ msgid "Issuer"
+#~ msgstr "Myöntäjä"
+
+#~ msgid "Issuer Unique ID"
+#~ msgstr "Myöntäjän yksilöllinen ID"
+
+#~ msgid "Subject Unique ID"
+#~ msgstr "Kohteen yksilöllinen tunniste"
+
+#~ msgid "Certificate Signature Value"
+#~ msgstr "Varmenteen allekirjoituksen arvo"
+
 #~ msgid "Card View"
 #~ msgstr "Korttinäkymä"
 
@@ -21913,9 +22317,6 @@ msgstr "_Tilan kanssa"
 #~ msgid "Move _Up"
 #~ msgstr "Siirrä _ylös"
 
-#~ msgid "Move _Down"
-#~ msgstr "Siirrä _alas"
-
 #~ msgid "Some features may not work properly with your current server"
 #~ msgstr ""
 #~ "Jotkut ominaisuudet eivät välttämättä toimi oikein palvelimen "
@@ -22573,9 +22974,6 @@ msgstr "_Tilan kanssa"
 #~ msgid "S_elect..."
 #~ msgstr "_Valitse..."
 
-#~ msgid "Clea_r"
-#~ msgstr "_Tyhjennä"
-
 #~ msgid "Cle_ar"
 #~ msgstr "_Tyhjennä"
 
@@ -23063,9 +23461,6 @@ msgstr "_Tilan kanssa"
 #~ msgid "None"
 #~ msgstr "Ei mitään"
 
-#~ msgid "_Units:"
-#~ msgstr "_Yksikkö:"
-
 #~ msgid "Metric (Celsius, cm, etc)"
 #~ msgstr "Metrinen (Celsiusta, cm jne.)"
author	Ville-Pekka Vainio <vpvainio@iki.fi>	2014-03-17 05:31:35 +0800
committer	Ville-Pekka Vainio <vpvainio@iki.fi>	2014-03-17 05:31:35 +0800
commit	28bed602297d0c62a7012f6707caa74ba3b301d9 (patch)
tree	2007f9b58ee925db1ad96ca03e89994f97cb40ff
parent	8bc198a393fcdbd0aba31ece6671189637932064 (diff)
download	gsoc2013-evolution-28bed602297d0c62a7012f6707caa74ba3b301d9.tar gsoc2013-evolution-28bed602297d0c62a7012f6707caa74ba3b301d9.tar.gz gsoc2013-evolution-28bed602297d0c62a7012f6707caa74ba3b301d9.tar.bz2 gsoc2013-evolution-28bed602297d0c62a7012f6707caa74ba3b301d9.tar.lz gsoc2013-evolution-28bed602297d0c62a7012f6707caa74ba3b301d9.tar.xz gsoc2013-evolution-28bed602297d0c62a7012f6707caa74ba3b301d9.tar.zst gsoc2013-evolution-28bed602297d0c62a7012f6707caa74ba3b301d9.zip