Finnish translation update

author: Juhani Numminen <juhaninumminen0@gmail.com> 2014-05-01 19:43:39 +0800
committer: Timo Jyrinki <timo.jyrinki@iki.fi> 2014-05-01 19:43:39 +0800
commit: 865f4618efb146d9978a11fbcde3a89df4622615 (patch)
tree: 78f4dbce9ef376c1c6be34989829fcd44f0f8fc1 /po
parent: e0e498c644a485aee0029805532622f0a711ecfc (diff)
download: gsoc2013-evolution-865f4618efb146d9978a11fbcde3a89df4622615.tar
gsoc2013-evolution-865f4618efb146d9978a11fbcde3a89df4622615.tar.gz
gsoc2013-evolution-865f4618efb146d9978a11fbcde3a89df4622615.tar.bz2
gsoc2013-evolution-865f4618efb146d9978a11fbcde3a89df4622615.tar.lz
gsoc2013-evolution-865f4618efb146d9978a11fbcde3a89df4622615.tar.xz
gsoc2013-evolution-865f4618efb146d9978a11fbcde3a89df4622615.tar.zst
gsoc2013-evolution-865f4618efb146d9978a11fbcde3a89df4622615.zip
1 files changed, 1098 insertions, 1207 deletions
diff --git a/po/fi.po b/po/fi.po
index 526295da77..70b553294f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,23 +13,23 @@
 # Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>, 2010.
 # Jiri Grönroos <jiri.gronroos+l10n@iki.fi>, 2012, 2013, 2014.
 #
-#: ../shell/main.c:554
+# Juhani Numminen <juhaninumminen0@gmail.com>, 2014.
+#
+#: ../shell/main.c:555
 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: 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"
+"POT-Creation-Date: 2014-04-30 14:12+0000\n"
+"PO-Revision-Date: 2014-03-22 12:47+0200\n"
+"Last-Translator: Juhani Numminen <juhaninumminen0@gmail.com>\n"
+"Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Launchpad-Export-Date: 2010-09-13 15:08+0000\n"
-"X-POT-Import-Date: 2012-03-05 15:05:59+0000\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
 #: ../addressbook/addressbook.error.xml.h:1
@@ -123,7 +123,6 @@ 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"
 msgid "Unable to open address book '{0}'"
 msgstr "Osoitekirjan '{0}' avaaminen epäonnistui"
 
@@ -205,9 +204,9 @@ msgstr ""
 #: ../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
+#: ../mail/e-mail-label-manager.c:373 ../mail/em-vfolder-editor-rule.c:396
+#: ../mail/em-vfolder-editor-rule.c:625 ../mail/mail-config.ui.h:51
+#: ../modules/mail/em-composer-prefs.c:448
 #: ../plugins/attachment-reminder/attachment-reminder.c:557
 #: ../plugins/email-custom-header/email-custom-header.c:838
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
@@ -220,13 +219,12 @@ msgid "Some addresses already exist in this contact list."
 msgstr "Jotkin osoitteet ovat jo olemassa tässä yhteystietoluettelossa."
 
 #: ../addressbook/addressbook.error.xml.h:35
-#, fuzzy
 msgid ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
 msgstr ""
-"Yhteystiedon nimi tai sähköpostiosoite on ja tässä kansioissa.\n"
-"Haluatko lisätä joka tapauksessa?"
+"Yrität lisätä sähköpostiosoitteita, jotka ovat jo tällä listalla. Haluatko "
+"lisätä ne joka tapauksessa?"
 
 #: ../addressbook/addressbook.error.xml.h:36
 msgid "Skip duplicates"
@@ -273,7 +271,7 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:45
 msgid "Cannot save a contact, address book is still opening"
-msgstr ""
+msgstr "Yhteystietoa ei voi tallentaa, sillä osoitekirja avautuu vielä"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:47
@@ -281,11 +279,13 @@ 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 ""
+"Yhteystietoa ei voi tallentaa osoitekirjaan ”{0}”, koska se avautuu vielä. "
+"Voit odottaa, että osoitekirja avautuu, tai valita toisen osoitekirjan."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:752
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:774
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3102
 msgid "Contact Editor"
 msgstr "Yhteystietojen muokkain"
 
@@ -324,8 +324,8 @@ msgstr "Haluaa sähköpostit _HTML-muodossa"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 #: ../addressbook/gui/widgets/eab-contact-merging.c:408
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:980
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:748
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1162
 msgid "Email"
 msgstr "Sähköposti"
 
@@ -334,115 +334,121 @@ msgid "Telephone"
 msgstr "Puhelin"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#, fuzzy
+#| msgid "Address"
+msgid "SIP Address"
+msgstr "Osoite"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 msgid "Instant Messaging"
 msgstr "Pikaviestintä"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 #: ../addressbook/importers/evolution-vcard-importer.c:971
 msgid "Contact"
 msgstr "Yhteystieto"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "_Home Page:"
 msgstr "K_otisivu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 #: ../calendar/gui/dialogs/event-page.c:709
 #: ../calendar/gui/dialogs/event-page.ui.h:25
 #: ../modules/itip-formatter/itip-view.c:1891
 msgid "_Calendar:"
 msgstr "_Kalenteri:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "_Free/Busy:"
 msgstr "_Vapaa/varattu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "_Video Chat:"
 msgstr "_Videokeskustelu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 msgid "Home Page:"
 msgstr "Kotisivu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 #: ../modules/cal-config-google/evolution-cal-config-google.c:96
 msgid "Calendar:"
 msgstr "Kalenteri:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 msgid "Free/Busy:"
 msgstr "Vapaa/Varattu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Video Chat:"
 msgstr "Videokeskustelu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "_Blog:"
-msgstr "_Blog:"
+msgstr "_Blogi:"
 
 #. Translators: an accessibility name
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Blog:"
-msgstr "Blog:"
+msgstr "Blogi:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "Web-osoitteet"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 msgid "Web addresses"
 msgstr "Web-osoitteet"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Profession:"
 msgstr "_Ammatti:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgctxt "Job"
 msgid "_Title:"
 msgstr "_Titteli:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Company:"
 msgstr "_Yritys:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Department:"
 msgstr "_Osasto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Office:"
 msgstr "_Toimisto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Manager:"
 msgstr "_Esimies:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_Assistant:"
 msgstr "_Apulainen:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "Job"
 msgstr "Työ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Spouse:"
 msgstr "_Puoliso:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Birthday:"
 msgstr "_Syntymäpäivä:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Anniversary:"
 msgstr "_Vuosipäivä:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:692
-#: ../calendar/gui/e-calendar-view.c:2288
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:874
+#: ../calendar/gui/e-calendar-view.c:2292
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
@@ -451,79 +457,79 @@ msgstr "Vuosipäivä"
 #. Get the icon file for some default category.  Doesn't matter
 #. * 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:691
-#: ../calendar/gui/e-calendar-view.c:2287 ../shell/main.c:127
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:873
+#: ../calendar/gui/e-calendar-view.c:2291 ../shell/main.c:127
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "Miscellaneous"
 msgstr "Sekalaiset"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "Personal Information"
 msgstr "Henkilökohtaiset tiedot"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_City:"
 msgstr "_Kaupunki:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_Zip/Postal Code:"
 msgstr "_Postinumero:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_State/Province:"
 msgstr "_Osavaltio/lääni:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Country:"
 msgstr "_Maa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_PO Box:"
 msgstr "_Postilokero:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Address:"
 msgstr "_Osoite:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
 #: ../addressbook/gui/widgets/e-contact-map.c:371
 #: ../addressbook/gui/widgets/eab-contact-display.c:356
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
 msgid "Home"
 msgstr "Koti"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
 #: ../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
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:841
 msgid "Work"
 msgstr "Työ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../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
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:210
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:83
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:512
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:908
+#: ../calendar/gui/e-cal-model.c:3951
 msgid "Other"
 msgstr "Muut"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
 msgid "Mailing Address"
 msgstr "Postitusosoite"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
 msgid "Notes"
 msgstr "Muistilaput"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
 #: ../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
@@ -534,8 +540,8 @@ 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/contact-editor.ui.h:54
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3661
 #: ../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
@@ -551,7 +557,7 @@ msgstr "O_hje"
 #: ../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-activity-bar.c:336 ../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
@@ -561,10 +567,10 @@ msgstr "O_hje"
 #: ../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/e-web-view.c:3096 ../e-util/evolution-source-viewer.c:833
 #: ../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/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:314
 #: ../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
@@ -580,113 +586,125 @@ msgstr "O_hje"
 #: ../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-editor/contact-editor.ui.h:55
 #: ../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/e-mail-signature-script-dialog.c:370 ../e-util/e-web-view.c:3097
 #: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:753
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:602
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:756
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:604
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:758
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:605
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:759
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:603
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:757
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:755
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../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:180
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:754
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:606
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:760
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:761
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../calendar/gui/dialogs/comp-editor.c:1299
+#, fuzzy
+#| msgid "Undo"
+msgid "_Undo"
+msgstr "Kumoa"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
 #: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../calendar/gui/dialogs/comp-editor.c:1306
+#, fuzzy
+#| msgid "Redo"
+msgid "_Redo"
+msgstr "Tee uudelleen"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 #: ../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/contact-editor/e-contact-editor.c:328
 #: ../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:330
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:348
 msgid "Error modifying contact"
 msgstr "Virhe muokattaessa yhteystietoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:368
 msgid "Error removing contact"
 msgstr "Virhe poistettaessa yhteystietoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:750
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3031
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:768
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Yhteystietojen muokkain - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3572
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3658
 msgid "Please select an image for this contact"
 msgstr "Valitse kuva tälle henkilölle"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3576
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3662
 #: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3663
 msgid "_No image"
 msgstr "_Ei kuvaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3926
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4012
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -694,28 +712,28 @@ msgstr ""
 "Yhteystieto on virheellinen:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3932
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4018
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' sisältää virheellisen muotoilun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3940
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4026
 #, 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:3948
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4034
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' sisältää virheellisen muotoilun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3961
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3975
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4047
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4061
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' on tyhjä"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3990
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4076
 msgid "Invalid contact."
 msgstr "Virheellinen yhteystieto."
 
@@ -736,15 +754,14 @@ msgstr "Virheellinen yhteystieto."
 #: ../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/em-folder-selector.c:43 ../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
+#: ../shell/main.c:168 ../smime/gui/e-cert-selector.c:233
 #: ../smime/gui/smime-ui.ui.h:24
-#| msgid "OK"
 msgid "_OK"
 msgstr "_OK"
 
@@ -875,7 +892,7 @@ msgstr "Poista sähköpostiosoite luettelosta"
 #: ../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/em-filter-rule.c:440 ../mail/em-vfolder-editor-rule.c:630
 #: ../mail/mail-config.ui.h:52
 #: ../plugins/attachment-reminder/attachment-reminder.c:567
 #: ../plugins/email-custom-header/email-custom-header.c:848
@@ -900,13 +917,11 @@ 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"
 
@@ -954,27 +969,19 @@ msgid "Duplicate Contact Detected"
 msgstr "Päällekkäisiä yhteystietoja havaittu"
 
 #: ../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 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?"
+"Yhteystiedon nimi tai sähköpostiosoite on jo tässä kansiossa.\n"
+"Haluatko tallentaa muutokset joka tapauksessa?"
 
 #: ../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?"
 msgstr ""
-"Yhteystiedon nimi tai sähköpostiosoite on ja tässä kansioissa.\n"
+"Yhteystiedon nimi tai sähköpostiosoite on jo tässä kansioissa.\n"
 "Haluatko lisätä joka tapauksessa?"
 
 #: ../addressbook/gui/widgets/eab-contact-merging.c:692
@@ -990,10 +997,8 @@ msgid "Conflicting Contact:"
 msgstr "Ristiriitainen yhteystieto:"
 
 #: ../addressbook/gui/widgets/eab-contact-merging.c:735
-#, fuzzy
-#| msgid "Contact: "
 msgid "Old Contact:"
-msgstr "Yhteystiedot: "
+msgstr "Vanhat yhteystiedot: "
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../modules/addressbook/e-book-shell-view-actions.c:1150
@@ -1088,13 +1093,13 @@ 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
+#: ../e-util/evolution-source-viewer.c:804
 #: ../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
+#: ../modules/mail/e-mail-shell-view-actions.c:1597
 #: ../shell/e-shell-window-actions.c:944 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "_Poista"
@@ -1136,7 +1141,7 @@ msgid "Family Name"
 msgstr "Sukunimi"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:752
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
@@ -1193,7 +1198,7 @@ msgid "ISDN Phone"
 msgstr "ISDN-numero"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:689
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:870
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
@@ -1232,7 +1237,7 @@ msgid "TTYTDD"
 msgstr "TTYTTD"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:818
 msgid "Company"
 msgstr "Yritys"
 
@@ -1241,7 +1246,7 @@ msgid "Unit"
 msgstr "Yksikkö"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:820
 msgid "Office"
 msgstr "Asema"
 
@@ -1256,12 +1261,12 @@ msgid "Role"
 msgstr "Rooli"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:823
 msgid "Manager"
 msgstr "Johtaja"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:657
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:824
 msgid "Assistant"
 msgstr "Apulainen"
 
@@ -1282,12 +1287,12 @@ msgid "Categories"
 msgstr "Ryhmät"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:693
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:875
 msgid "Spouse"
 msgstr "Puoliso"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:748
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:930
 msgid "Note"
 msgstr "Huomautus"
 
@@ -1297,7 +1302,6 @@ msgstr "Yhteystietokartta"
 
 #. Zoom-in button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:410
-#| msgid "_Zoom In"
 msgid "Zoom _In"
 msgstr "Lä_hennä"
 
@@ -1310,7 +1314,6 @@ 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"
 
@@ -1381,7 +1384,7 @@ msgid "Home Email"
 msgstr "Henkilökohtainen sähköposti"
 
 #: ../addressbook/gui/widgets/e-minicard.c:94
-#: ../addressbook/gui/widgets/e-minicard.c:827
+#: ../addressbook/gui/widgets/e-minicard.c:828
 msgid "Other Email"
 msgstr "Muu sähköposti"
 
@@ -1427,52 +1430,56 @@ msgid "Copy _Email Address"
 msgstr "Kopioi _sähköpostiosoite"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view-gtkhtml.c:427 ../e-util/e-web-view.c:304
+#: ../e-util/e-web-view-gtkhtml.c:427 ../e-util/e-web-view.c:308
 msgid "Copy the email address to the clipboard"
 msgstr "Kopioi sähköpostiosoite leikepöydälle"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:156
-#: ../e-util/e-web-view-gtkhtml.c:432 ../e-util/e-web-view.c:309
+#: ../e-util/e-web-view-gtkhtml.c:432 ../e-util/e-web-view.c:313
 msgid "_Send New Message To..."
 msgstr "Lähetä uusi _viesti..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:158
-#: ../e-util/e-web-view-gtkhtml.c:434 ../e-util/e-web-view.c:311
+#: ../e-util/e-web-view-gtkhtml.c:434 ../e-util/e-web-view.c:315
 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:290
-#: ../e-util/e-web-view-gtkhtml.c:969 ../e-util/e-web-view.c:992
+#: ../e-util/e-web-view-gtkhtml.c:969 ../e-util/e-web-view.c:996
 #, c-format
 msgid "Click to mail %s"
 msgstr "Napsauta lähettääksesi %s"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:136
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:141
 msgid "Open map"
 msgstr "Avaa kartta"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:535
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:437
+msgid "SIP"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
 msgid "List Members:"
 msgstr "Luettelon jäsenet:"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:819
 msgid "Department"
 msgstr "Osasto"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:821
 msgid "Profession"
 msgstr "Ammatti"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:822
 msgid "Position"
 msgstr "Asema"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:658
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:825
 msgid "Video Chat"
 msgstr "Videokeskustelu"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:659
-#: ../e-util/e-send-options.c:545
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:826
+#: ../e-util/e-send-options.c:546
 #: ../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
@@ -1480,53 +1487,53 @@ msgstr "Videokeskustelu"
 msgid "Calendar"
 msgstr "Kalenteri"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:660
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:827
 #: ../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:661
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:688
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:828
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:869
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:662
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:829
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:663
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:690
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:716
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:831
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:872
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:898
 msgid "Address"
 msgstr "Osoite"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:867
 msgid "Home Page"
 msgstr "Kotisivu"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:687
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:868
 msgid "Web Log"
 msgstr "Web-loki"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:885
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:944
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1126
 msgid "List Members"
 msgstr "Listan jäsenet"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:965
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1147
 msgid "Job Title"
 msgstr "Tehtävänimike"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1006
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1188
 msgid "Home page"
 msgstr "Kotisivu"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1016
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1198
 msgid "Blog"
 msgstr "Blogi"
 
@@ -1645,41 +1652,35 @@ msgstr "Kopioi yhteystiedot"
 #: ../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
+#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:935
+#: ../calendar/importers/icalendar-importer.c:974 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Tuodaan..."
 
 #: ../addressbook/importers/evolution-csv-importer.c:1081
-#, fuzzy
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
-msgstr "Outlookin CSV tai Tab (.csv, .tab)"
+msgstr "Outlookin yhteystiedot, CSV tai Tab (.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1082
-#, fuzzy
 msgid "Outlook Contacts CSV and Tab Importer"
-msgstr "Outlookin CSV- ja Tab-tuoja"
+msgstr "Outlookin yhteystietojen CSV- ja Tab-tuoja"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1090
-#, fuzzy
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
-msgstr "Mozillan CVS tai Tab (.cvs, .tab)"
+msgstr "Mozillan yhteystiedot, CSV tai Tab (.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1091
-#, fuzzy
 msgid "Mozilla Contacts CSV and Tab Importer"
-msgstr "Mozillan CVS- ja Tab-tuoja"
+msgstr "Mozillan yhteystietojen CSV- ja Tab-tuoja"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1099
-#, fuzzy
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
-msgstr "Evolutionin CSV tai Tab (.csv, .tab)"
+msgstr "Evolutionin yhteystiedot, CSV tai Tab (.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:1100
-#, fuzzy
 msgid "Evolution Contacts CSV and Tab Importer"
-msgstr "Evolutionin CSV- ja Tab-tuoja"
+msgstr "Evolutionin yhteystietojen CSV- ja Tab-tuoja"
 
 #: ../addressbook/importers/evolution-ldif-importer.c:806
 msgid "LDAP Data Interchange Format (.ldif)"
@@ -1718,11 +1719,11 @@ msgstr "Näytä paikalliset osoitekirjakansiot"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "Show cards as vcard or csv file"
-msgstr "Nämä kortit vcard- tai cvs-tiedostoina"
+msgstr "Nämä kortit vcard- tai csv-tiedostoina"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:66
 msgid "[vcard|csv]"
-msgstr "[vcard|cvs]"
+msgstr "[vcard|csv]"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:133
 msgid ""
@@ -1732,7 +1733,7 @@ msgstr ""
 
 #: ../addressbook/tools/evolution-addressbook-export.c:147
 msgid "Only support csv or vcard format."
-msgstr "Vain cvs ja vcard ovat tuettuja muotoja."
+msgstr "Vain csv ja vcard ovat tuettuja muotoja."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:178
 msgid "Unhandled error"
@@ -1806,7 +1807,6 @@ msgid "_Edit"
 msgstr "_Muokkaa"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#| msgid "Print"
 msgid "_Print"
 msgstr "_Tulosta"
 
@@ -1924,7 +1924,7 @@ 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:69 ../calendar/gui/e-alarm-list.c:369
+#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:382
 #: ../calendar/gui/misc.c:103
 #, c-format
 msgid "%d hour"
@@ -1933,7 +1933,7 @@ 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:75 ../calendar/gui/e-alarm-list.c:375
+#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:388
 #: ../calendar/gui/misc.c:109
 #, c-format
 msgid "%d minute"
@@ -1944,7 +1944,7 @@ 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:79 ../calendar/gui/e-alarm-list.c:381
+#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:394
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d second"
@@ -2321,10 +2321,8 @@ msgstr ""
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:81
-#, fuzzy
-#| msgid "Error loading task list"
 msgid "Error loading task list '{0}'"
-msgstr "Virhe ladattaessa tehtävälistaa"
+msgstr "Tehtävälistan ”{0}” lataus epäonnistui"
 
 #: ../calendar/calendar.error.xml.h:82
 msgid "The task list is not marked for offline usage."
@@ -2332,10 +2330,8 @@ msgstr "Tehtävälista ei ole merkitty käytettäväksi yhteydettömässä tilas
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:84
-#, fuzzy
-#| msgid "Error loading memo list"
 msgid "Error loading memo list '{0}'"
-msgstr "Virhe ladattaessa muistilappulistaa"
+msgstr "Muistilappulistan ”{0}” lataus epäonnistui"
 
 #: ../calendar/calendar.error.xml.h:85
 msgid "The memo list is not marked for offline usage."
@@ -2344,45 +2340,33 @@ msgstr ""
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:87
-#, fuzzy
-#| msgid "Failed to load the calendar '%s' (%s)"
 msgid "Failed to copy an event into the calendar '{0}'"
-msgstr "Kalenterin ”%s” lataus epäonnistui (%s)"
+msgstr "Tapahtuman kopiointi kalenteriin ”{0}” epäonnistui"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:89
-#, fuzzy
-#| msgid "Unable to find this task in any task list"
 msgid "Failed to copy a task into the task list '{0}'"
-msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
+msgstr "Tehtävän kopiointi tehtävälistaan ”{0}” epäonnistui"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:91
-#, fuzzy
-#| msgid "Unable to find this memo in any memo list"
 msgid "Failed to copy a memo into the memo list '{0}'"
-msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
+msgstr "Muistilapun kopiointi muistilappulistaan ”{0}” epäonnistui"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:93
-#, fuzzy
-#| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to move an event into the calendar '{0}'"
-msgstr "Tapaaminen löytyi kalenterista \"%s\""
+msgstr "Tapahtuman siirto kalenteriin ”{0}” epäonnistui"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:95
-#, fuzzy
-#| msgid "Unable to find this task in any task list"
 msgid "Failed to move a task into the task list '{0}'"
-msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
+msgstr "Tehtävän siirto tehtävälistaan ”{0}” epäonnistui"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:97
-#, fuzzy
-#| msgid "Unable to find this memo in any memo list"
 msgid "Failed to move a memo into the memo list '{0}'"
-msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
+msgstr "Muistilapun siirto muistilappulistaan ”{0}” epäonnistui"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:99
@@ -2391,17 +2375,13 @@ msgstr "Kopioidaan tapahtumaa kalenteriin '{0}'"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:101
-#, fuzzy
-#| msgid "Show task preview below the task list"
 msgid "Copying a task into the task list '{0}'"
-msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
+msgstr "Kopioidaan tehtävää tehtävälistaan ”{0}”"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:103
-#, fuzzy
-#| msgid "Delete memo list '{0}'?"
 msgid "Copying a memo into the memo list '{0}'"
-msgstr "Poistetaanko muistilappulista \"{0}\"?"
+msgstr "Kopioidaan muistilappua muistilappulistaan ”{0}”"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:105
@@ -2410,17 +2390,13 @@ msgstr "Siirretään tapahtumaa kalenteriin '{0}'"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:107
-#, fuzzy
-#| msgid "Show task preview below the task list"
 msgid "Moving a task into the task list '{0}'"
-msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
+msgstr "Siirretään tehtävää tehtävälistaan ”{0}”"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:109
-#, fuzzy
-#| msgid "Delete memo list '{0}'?"
 msgid "Moving a memo into the memo list '{0}'"
-msgstr "Poistetaanko muistilappulista \"{0}\"?"
+msgstr "Siirretään muistilappua muistilappulistaan ”{0}”"
 
 #: ../calendar/gui/caltypes.xml.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:4
@@ -2431,12 +2407,14 @@ 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:55
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/filtertypes.xml.in.h:2
+#: ../mail/searchtypes.xml.in.h:2 ../mail/vfoldertypes.xml.in.h:2
 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:56
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/filtertypes.xml.in.h:3
+#: ../mail/searchtypes.xml.in.h:3 ../mail/vfoldertypes.xml.in.h:3
 msgid "does not contain"
 msgstr "ei sisällä"
 
@@ -2457,12 +2435,14 @@ 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:75
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/filtertypes.xml.in.h:4
+#: ../mail/searchtypes.xml.in.h:4 ../mail/vfoldertypes.xml.in.h:4
 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:73
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/filtertypes.xml.in.h:5
+#: ../mail/searchtypes.xml.in.h:5 ../mail/vfoldertypes.xml.in.h:5
 msgid "is not"
 msgstr "ei ole"
 
@@ -2509,24 +2489,27 @@ 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:326
+#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:327
 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:53
 #: ../em-format/e-mail-formatter-print-headers.c:203
-#: ../mail/em-filter-i18n.h:6
+#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
+#: ../mail/vfoldertypes.xml.in.h:48
 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:18
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:46
+#: ../mail/searchtypes.xml.in.h:48 ../mail/vfoldertypes.xml.in.h:49
 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:16
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:47
+#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
 msgid "Do Not Exist"
 msgstr "Ei ole olemassa"
 
@@ -2568,22 +2551,22 @@ msgid "Edit Reminder"
 msgstr "Muokkaa muistutusta"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:896
-#: ../calendar/gui/e-alarm-list.c:411
+#: ../calendar/gui/e-alarm-list.c:424
 msgid "Pop up an alert"
 msgstr "Ponnahdusikkuna hälytykselle"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:897
-#: ../calendar/gui/e-alarm-list.c:407
+#: ../calendar/gui/e-alarm-list.c:420
 msgid "Play a sound"
 msgstr "Soita ääni"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:898
-#: ../calendar/gui/e-alarm-list.c:419
+#: ../calendar/gui/e-alarm-list.c:432
 msgid "Run a program"
 msgstr "Suorita ohjelma"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:899
-#: ../calendar/gui/e-alarm-list.c:415
+#: ../calendar/gui/e-alarm-list.c:428
 msgid "Send an email"
 msgstr "Lähetä sähköpostia"
 
@@ -2799,16 +2782,15 @@ msgstr "Sulje nykyinen ikkuna"
 #. 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
+#: ../e-util/e-web-view.c:340 ../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
+#: ../e-util/e-web-view-gtkhtml.c:454 ../e-util/e-web-view-gtkhtml.c:1294
+#: ../e-util/e-web-view.c:342 ../e-util/e-web-view.c:1310
 #: ../mail/e-mail-browser.c:135 ../shell/e-shell-window-actions.c:932
 msgid "Copy the selection"
 msgstr "Kopioi valinta"
@@ -2822,7 +2804,7 @@ 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
+#: ../e-util/e-web-view-gtkhtml.c:1288 ../e-util/e-web-view.c:1304
 #: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:939
 msgid "Cut the selection"
 msgstr "Leikkaa valinta"
@@ -2841,13 +2823,12 @@ msgstr "Näytä ohje"
 #: ../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
+#: ../e-util/e-web-view-gtkhtml.c:1300 ../e-util/e-web-view.c:1316
 #: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:967
 msgid "Paste the clipboard"
 msgstr "Liitä leikepöytä"
@@ -2864,7 +2845,6 @@ msgstr "T_ulosta..."
 #: ../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..."
 
@@ -2882,9 +2862,8 @@ 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:745
-#: ../e-util/e-web-view-gtkhtml.c:462 ../e-util/e-web-view.c:346
+#: ../e-util/e-web-view-gtkhtml.c:462 ../e-util/e-web-view.c:350
 #: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1042
-#| msgid "Select All"
 msgid "Select _All"
 msgstr "Valitse _kaikki"
 
@@ -3005,18 +2984,18 @@ msgstr "Määrittää näytetäänkö läsnäolijan tyyppi"
 msgid "Attach"
 msgstr "Liitä tiedosto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2563
-#: ../calendar/gui/dialogs/comp-editor.c:2773
-#: ../calendar/gui/dialogs/comp-editor.c:3786
+#: ../calendar/gui/dialogs/comp-editor.c:2564
+#: ../calendar/gui/dialogs/comp-editor.c:2774
+#: ../calendar/gui/dialogs/comp-editor.c:3787
 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:3748
+#: ../calendar/gui/dialogs/comp-editor.c:3749
 #: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:120
 msgid "attachment"
 msgstr "liite"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3818
+#: ../calendar/gui/dialogs/comp-editor.c:3819
 msgid "Unable to use current version!"
 msgstr "Nykyistä versiota ei voi käyttää!"
 
@@ -3201,7 +3180,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:3171
+#: ../calendar/gui/dialogs/event-page.c:3172
 msgid "This event has reminders"
 msgstr "Tapahtumaan liittyy muistutuksia"
 
@@ -3210,78 +3189,80 @@ msgstr "Tapahtumaan liittyy muistutuksia"
 msgid "Or_ganizer:"
 msgstr "_Järjestäjä:"
 
-#: ../calendar/gui/dialogs/event-page.c:1302
+#: ../calendar/gui/dialogs/event-page.c:1303
 msgid "Event with no start date"
 msgstr "Tapahtuma ilman alkupäivämäärää"
 
-#: ../calendar/gui/dialogs/event-page.c:1305
+#: ../calendar/gui/dialogs/event-page.c:1306
 msgid "Event with no end date"
 msgstr "Tapahtuma ilman päättymispäivää"
 
-#: ../calendar/gui/dialogs/event-page.c:1483
+#: ../calendar/gui/dialogs/event-page.c:1484
 #: ../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:1494
+#: ../calendar/gui/dialogs/event-page.c:1495
 msgid "End date is wrong"
 msgstr "Lopetuspäiväys on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1518
+#: ../calendar/gui/dialogs/event-page.c:1519
 msgid "Start time is wrong"
 msgstr "Alkamisaika on väärin"
 
-#: ../calendar/gui/dialogs/event-page.c:1526
+#: ../calendar/gui/dialogs/event-page.c:1527
 msgid "End time is wrong"
 msgstr "Lopetusaika on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1690
+#: ../calendar/gui/dialogs/event-page.c:1691
 #: ../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:1725
+#: ../calendar/gui/dialogs/event-page.c:1726
 #: ../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:1931
+#: ../calendar/gui/dialogs/event-page.c:1932
 msgid "_Delegatees"
 msgstr "_Valtuutetut"
 
-#: ../calendar/gui/dialogs/event-page.c:1933
+#: ../calendar/gui/dialogs/event-page.c:1934
 msgid "Atte_ndees"
 msgstr "_Osanottajat"
 
-#: ../calendar/gui/dialogs/event-page.c:3451
+#: ../calendar/gui/dialogs/event-page.c:3452
 #, 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:3457
+#: ../calendar/gui/dialogs/event-page.c:3458
 #, 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:3463
+#: ../calendar/gui/dialogs/event-page.c:3464
 #, 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:3484
-msgid "Customize"
-msgstr "Muokkaa"
+#: ../calendar/gui/dialogs/event-page.c:3485
+#, fuzzy
+#| msgid "_Custom"
+msgid "Custom"
+msgstr "_Oma"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3491
+#: ../calendar/gui/dialogs/event-page.c:3492
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ei mitään"
@@ -3354,10 +3335,6 @@ msgstr "_Osanottajat..."
 msgid "_Reminder"
 msgstr "_Muistutus"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:31
-msgid "Custom Reminder:"
-msgstr "Omavalintainen muistutus:"
-
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:1
 msgid "January"
 msgstr "Tammikuu"
@@ -3440,8 +3417,9 @@ msgstr "Muistilappua ei voi muokata täysin, koska et ole sen järjestäjä"
 #: ../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
+#: ../em-format/e-mail-part-headers.c:48 ../mail/message-list.etspec.h:9
+#: ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11
+#: ../modules/mail/em-mailer-prefs.c:65
 msgid "To"
 msgstr "Vastaanottaja"
 
@@ -3745,7 +3723,7 @@ msgid "_Send Options"
 msgstr "_Lähetysasetukset"
 
 #: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3498
-#: ../e-util/e-send-options.c:552
+#: ../e-util/e-send-options.c:553
 msgid "Task"
 msgstr "Tehtävä"
 
@@ -3771,12 +3749,11 @@ msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "Tehtävää ei voi muokata kokonaan, koska et ole tehtävän järjestäjä"
 
 #: ../calendar/gui/dialogs/task-page.c:372
-#, fuzzy
 msgid ""
 "Task cannot be edited, because the selected task list does not support "
 "assigned tasks"
 msgstr ""
-"Tehtävää ei voi muokata, koska valittu tehtävälista on vain luettavissa"
+"Tehtävää ei voi muokata, koska valittu tehtävälista ei tue tehtäväksiantoja"
 
 #: ../calendar/gui/dialogs/task-page.c:1011
 msgid "Due date is wrong"
@@ -3789,7 +3766,7 @@ 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:336
+#: ../calendar/gui/e-cal-component-preview.c:338
 #: ../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"
@@ -3797,8 +3774,8 @@ msgstr "Korkea"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:338
-#: ../calendar/gui/e-cal-model.c:1665 ../calendar/gui/e-task-table.c:573
+#: ../calendar/gui/e-cal-component-preview.c:340
+#: ../calendar/gui/e-cal-model.c:1659 ../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:308
 msgid "Normal"
@@ -3806,7 +3783,7 @@ msgstr "Tavallinen"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:340
+#: ../calendar/gui/e-cal-component-preview.c:342
 #: ../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"
@@ -3821,7 +3798,7 @@ 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:321
+#: ../calendar/gui/e-cal-component-preview.c:323
 #: ../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
@@ -3831,7 +3808,7 @@ msgstr "Ei aloitettu"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:18
-#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-component-preview.c:313
 #: ../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
@@ -3842,7 +3819,7 @@ 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:314
+#: ../calendar/gui/e-cal-component-preview.c:316
 #: ../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
@@ -3855,7 +3832,7 @@ msgstr "Valmis"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:22
-#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-cal-component-preview.c:319
 #: ../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
@@ -3982,7 +3959,7 @@ msgstr "taulukko, josta voi nähdä ja valita nykyisen aika-alueen"
 
 #: ../calendar/gui/ea-gnome-calendar.c:47
 #: ../calendar/gui/ea-gnome-calendar.c:55
-#: ../calendar/importers/icalendar-importer.c:1107
+#: ../calendar/importers/icalendar-importer.c:1108
 msgid "Gnome Calendar"
 msgstr "Gnome-kalenteri"
 
@@ -3997,8 +3974,8 @@ 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:210 ../calendar/gui/e-day-view.c:2796
-#: ../calendar/gui/e-day-view-top-item.c:858
+#: ../calendar/gui/ea-gnome-calendar.c:210 ../calendar/gui/e-day-view.c:2798
+#: ../calendar/gui/e-day-view-top-item.c:859
 #: ../calendar/gui/e-week-view-main-item.c:218
 #: ../modules/calendar/e-cal-shell-view-private.c:1194
 msgid "%a %d %b"
@@ -4029,8 +4006,8 @@ 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:246 ../calendar/gui/e-day-view.c:2812
-#: ../calendar/gui/e-day-view-top-item.c:862
+#: ../calendar/gui/ea-gnome-calendar.c:246 ../calendar/gui/e-day-view.c:2814
+#: ../calendar/gui/e-day-view-top-item.c:863
 #: ../calendar/gui/e-week-view-main-item.c:232
 #: ../modules/calendar/e-cal-shell-view-private.c:1230
 msgid "%d %b"
@@ -4045,7 +4022,7 @@ 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:357 ../calendar/gui/misc.c:97
+#: ../calendar/gui/e-alarm-list.c:370 ../calendar/gui/misc.c:97
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -4053,61 +4030,61 @@ 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:363
+#: ../calendar/gui/e-alarm-list.c:376
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d viikko"
 msgstr[1] "%d viikkoa"
 
-#: ../calendar/gui/e-alarm-list.c:425
+#: ../calendar/gui/e-alarm-list.c:438
 msgid "Unknown action to be performed"
 msgstr "Tuntematon suoritettava tehtävä"
 
-#: ../calendar/gui/e-alarm-list.c:440
+#: ../calendar/gui/e-alarm-list.c:453
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s ennen tapaamisen alkua"
 
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:459
 #, 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:453
+#: ../calendar/gui/e-alarm-list.c:466
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s tapaamisen alussa"
 
-#: ../calendar/gui/e-alarm-list.c:465
+#: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s ennen tapaamisen loppumista"
 
-#: ../calendar/gui/e-alarm-list.c:471
+#: ../calendar/gui/e-alarm-list.c:484
 #, 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:478
+#: ../calendar/gui/e-alarm-list.c:491
 #, 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:502
+#: ../calendar/gui/e-alarm-list.c:515
 #, 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:510
+#: ../calendar/gui/e-alarm-list.c:523
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s tuntemattomalle liipaisintyypille"
@@ -4139,54 +4116,52 @@ msgstr "Nimetön"
 msgid "Categories:"
 msgstr "Luokat:"
 
-#: ../calendar/gui/e-cal-component-preview.c:262
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Summary:"
 msgstr "Kuvaus:"
 
-#: ../calendar/gui/e-cal-component-preview.c:271
+#: ../calendar/gui/e-cal-component-preview.c:273
 msgid "Start Date:"
 msgstr "Alkamispäivä:"
 
-#: ../calendar/gui/e-cal-component-preview.c:283
+#: ../calendar/gui/e-cal-component-preview.c:285
 msgid "End Date:"
 msgstr "Päättymispäivä:"
 
-#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-component-preview.c:297
 msgid "Due Date:"
 msgstr "Eräpäivä:"
 
-#: ../calendar/gui/e-cal-component-preview.c:307
+#: ../calendar/gui/e-cal-component-preview.c:309
 #: ../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:334
+#: ../calendar/gui/e-cal-component-preview.c:336
 msgid "Priority:"
 msgstr "Prioriteetti:"
 
-#: ../calendar/gui/e-cal-component-preview.c:359
+#: ../calendar/gui/e-cal-component-preview.c:361
 #: ../mail/e-mail-config-service-page.c:671
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: ../calendar/gui/e-cal-component-preview.c:390
+#: ../calendar/gui/e-cal-component-preview.c:392
 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}'"
+#, c-format
 msgid "Copying an event into the calendar %s"
-msgstr "Kopioidaan tapahtumaa kalenteriin '{0}'"
+msgstr "Kopioidaan tapahtumaa kalenteriin %s"
 
 #: ../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}'"
+#, c-format
 msgid "Moving an event into the calendar %s"
-msgstr "Siirretään tapahtumaa kalenteriin '{0}'"
+msgstr "Siirretään tapahtumaa kalenteriin %s"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:1
 msgid "Click to add a task"
@@ -4231,11 +4206,12 @@ 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:4011
+#: ../calendar/gui/e-cal-model.c:4005
 #: ../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:49
-#: ../mail/message-list.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/filtertypes.xml.in.h:33
+#: ../mail/message-list.etspec.h:1 ../mail/searchtypes.xml.in.h:35
+#: ../mail/vfoldertypes.xml.in.h:35
 msgid "Status"
 msgstr "Tila"
 
@@ -4304,7 +4280,7 @@ msgid "Location: %s"
 msgstr "Sijainti: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2145
+#: ../calendar/gui/e-calendar-view.c:2149
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aika: %s %s"
@@ -4329,56 +4305,56 @@ msgstr "Päättymispäivä"
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../calendar/gui/e-cal-model.c:1667
+#: ../calendar/gui/e-cal-model.c:1661
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../calendar/gui/e-cal-model.c:1669
+#: ../calendar/gui/e-cal-model.c:1663
 msgid "Assigned"
 msgstr "Annettu tehtäväksi"
 
-#: ../calendar/gui/e-cal-model.c:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-cal-model.c:1665 ../calendar/gui/e-cal-model-tasks.c:1163
 #: ../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:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-cal-model.c:1665 ../calendar/gui/e-cal-model-tasks.c:1163
 #: ../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:3952
+#: ../calendar/gui/e-cal-model.c:3946
 #: ../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:3953
+#: ../calendar/gui/e-cal-model.c:3947
 #: ../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:3954
+#: ../calendar/gui/e-cal-model.c:3948
 #: ../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:3955
+#: ../calendar/gui/e-cal-model.c:3949
 #: ../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:3956
+#: ../calendar/gui/e-cal-model.c:3950
 msgid "Needs action"
 msgstr "Vaatii toimenpiteitä"
 
@@ -4409,16 +4385,16 @@ 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:158
+#: ../calendar/gui/e-cell-date-edit-text.c:160
 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:161
+#: ../calendar/gui/e-cell-date-edit-text.c:163
 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:169
+#: ../calendar/gui/e-cell-date-edit-text.c:171
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4428,14 +4404,14 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1986 ../calendar/gui/e-week-view.c:1540
+#: ../calendar/gui/e-day-view.c:1988 ../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:1989 ../calendar/gui/e-week-view.c:1543
+#: ../calendar/gui/e-day-view.c:1991 ../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"
@@ -4447,13 +4423,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:2779 ../calendar/gui/e-day-view-top-item.c:854
+#: ../calendar/gui/e-day-view.c:2781 ../calendar/gui/e-day-view-top-item.c:855
 #: ../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:3443
+#: ../calendar/gui/e-day-view.c:3445
 #, c-format
 msgid "Week %d"
 msgstr "Viikko %d"
@@ -4743,7 +4719,7 @@ msgstr "%d %%"
 
 #: ../calendar/gui/e-task-table.c:720 ../calendar/gui/print.c:2414
 #: ../calendar/importers/icalendar-importer.c:78
-#: ../calendar/importers/icalendar-importer.c:1071
+#: ../calendar/importers/icalendar-importer.c:1072
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
 #: ../modules/calendar/e-cal-shell-content.c:438
 #: ../modules/calendar/e-task-shell-view-actions.c:234
@@ -5147,11 +5123,13 @@ msgstr "Kesken"
 msgid "% Completed"
 msgstr "% valmiina"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:69
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/filtertypes.xml.in.h:30
+#: ../mail/searchtypes.xml.in.h:32 ../mail/vfoldertypes.xml.in.h:32
 msgid "is greater than"
 msgstr "on suurempi kuin"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:70
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/filtertypes.xml.in.h:31
+#: ../mail/searchtypes.xml.in.h:33 ../mail/vfoldertypes.xml.in.h:33
 msgid "is less than"
 msgstr "on vähemmän kuin"
 
@@ -5159,177 +5137,177 @@ msgstr "on vähemmän kuin"
 msgid "Appointments and Meetings"
 msgstr "Tapaamiset ja kokoukset"
 
-#: ../calendar/importers/icalendar-importer.c:461
-#: ../calendar/importers/icalendar-importer.c:900
+#: ../calendar/importers/icalendar-importer.c:462
+#: ../calendar/importers/icalendar-importer.c:901
 msgid "Opening calendar"
 msgstr "Avataan kalenteria"
 
-#: ../calendar/importers/icalendar-importer.c:609
+#: ../calendar/importers/icalendar-importer.c:610
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar tiedostot (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:610
+#: ../calendar/importers/icalendar-importer.c:611
 msgid "Evolution iCalendar importer"
 msgstr "Evolutionin iCalendar-tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:702
+#: ../calendar/importers/icalendar-importer.c:703
 msgid "Reminder!"
 msgstr "Muistutus!"
 
-#: ../calendar/importers/icalendar-importer.c:786
+#: ../calendar/importers/icalendar-importer.c:787
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar-tiedostot (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:787
+#: ../calendar/importers/icalendar-importer.c:788
 msgid "Evolution vCalendar importer"
 msgstr "Evolutionin vCalendar-tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:1064
+#: ../calendar/importers/icalendar-importer.c:1065
 msgid "Calendar Events"
 msgstr "Kalenteritapahtumat"
 
-#: ../calendar/importers/icalendar-importer.c:1108
+#: ../calendar/importers/icalendar-importer.c:1109
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution-kalenterin älykäs tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:1179
-#: ../calendar/importers/icalendar-importer.c:1493
+#: ../calendar/importers/icalendar-importer.c:1180
+#: ../calendar/importers/icalendar-importer.c:1494
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Kokous"
 
-#: ../calendar/importers/icalendar-importer.c:1179
-#: ../calendar/importers/icalendar-importer.c:1493
+#: ../calendar/importers/icalendar-importer.c:1180
+#: ../calendar/importers/icalendar-importer.c:1494
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: ../calendar/importers/icalendar-importer.c:1182
-#: ../calendar/importers/icalendar-importer.c:1494
+#: ../calendar/importers/icalendar-importer.c:1183
+#: ../calendar/importers/icalendar-importer.c:1495
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Tehtävä"
 
-#: ../calendar/importers/icalendar-importer.c:1185
-#: ../calendar/importers/icalendar-importer.c:1495
+#: ../calendar/importers/icalendar-importer.c:1186
+#: ../calendar/importers/icalendar-importer.c:1496
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Muistilappu"
 
-#: ../calendar/importers/icalendar-importer.c:1194
+#: ../calendar/importers/icalendar-importer.c:1195
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "sisältää toistuvuuksia"
 
-#: ../calendar/importers/icalendar-importer.c:1199
+#: ../calendar/importers/icalendar-importer.c:1200
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "on instanssi"
 
-#: ../calendar/importers/icalendar-importer.c:1204
+#: ../calendar/importers/icalendar-importer.c:1205
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "sisältää muistutuksia"
 
-#: ../calendar/importers/icalendar-importer.c:1209
+#: ../calendar/importers/icalendar-importer.c:1210
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "sisältää liitteitä"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1222
+#: ../calendar/importers/icalendar-importer.c:1223
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Julkinen"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1225
+#: ../calendar/importers/icalendar-importer.c:1226
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Henkilökohtainen"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1228
+#: ../calendar/importers/icalendar-importer.c:1229
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1232
+#: ../calendar/importers/icalendar-importer.c:1233
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Luokittelu"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1237
-#: ../calendar/importers/icalendar-importer.c:1537
+#: ../calendar/importers/icalendar-importer.c:1238
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Yhteenveto"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1244
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Sijainti"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1251
-#: ../calendar/importers/icalendar-importer.c:1532
+#: ../calendar/importers/icalendar-importer.c:1252
+#: ../calendar/importers/icalendar-importer.c:1533
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Alkaa"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1262
+#: ../calendar/importers/icalendar-importer.c:1263
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Erääntyy"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1274
+#: ../calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Päättyy"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1284
+#: ../calendar/importers/icalendar-importer.c:1285
 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:1308
+#: ../calendar/importers/icalendar-importer.c:1309
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Valmiina"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1316
+#: ../calendar/importers/icalendar-importer.c:1317
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1327
-#: ../calendar/importers/icalendar-importer.c:1330
+#: ../calendar/importers/icalendar-importer.c:1328
+#: ../calendar/importers/icalendar-importer.c:1331
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Järjestäjä"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1350
-#: ../calendar/importers/icalendar-importer.c:1353
+#: ../calendar/importers/icalendar-importer.c:1351
+#: ../calendar/importers/icalendar-importer.c:1354
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Osanottajat"
 
-#: ../calendar/importers/icalendar-importer.c:1367
+#: ../calendar/importers/icalendar-importer.c:1368
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../calendar/importers/icalendar-importer.c:1527
+#: ../calendar/importers/icalendar-importer.c:1528
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Tyyppi"
@@ -6898,7 +6876,6 @@ msgid "Open New Message window"
 msgstr "Avaa uuden viestin luonti-ikkuna"
 
 #: ../composer/e-composer-actions.c:289 ../shell/e-shell-window-actions.c:979
-#| msgid "Mail Preferences"
 msgid "_Preferences"
 msgstr "_Asetukset"
 
@@ -7218,9 +7195,8 @@ msgstr ""
 "Käyttäjätili täytyy määritellä ennen kuin sähköpostia voidaan lähettää."
 
 #: ../composer/mail-composer.error.xml.h:25
-#, fuzzy
 msgid "An error occurred while saving to your Outbox folder."
-msgstr "Tapahtui virhe tulostettaessa"
+msgstr "Tapahtui virhe tallennettaessa Lähtevät-kansioosi."
 
 #: ../composer/mail-composer.error.xml.h:26
 msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
@@ -7248,9 +7224,8 @@ msgid "The reported error was &quot;{0}&quot;."
 msgstr "Ilmoitettu virhe oli &quot;{0}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:31
-#, fuzzy
 msgid "_Save to Outbox"
-msgstr "_Tallenna mbox-muodossa..."
+msgstr "_Tallenna lähteviin"
 
 #: ../composer/mail-composer.error.xml.h:32
 msgid "_Try Again"
@@ -7262,9 +7237,8 @@ msgid "Your message was sent, but an error occurred during post-processing."
 msgstr "Tapahtui virhe käsiteltäessä: %s"
 
 #: ../composer/mail-composer.error.xml.h:34
-#, fuzzy
 msgid "Saving message to Outbox."
-msgstr "Tallennetaan viestiä kansioon"
+msgstr "Tallennetaan viestiä lähteviin."
 
 #: ../composer/mail-composer.error.xml.h:35
 msgid ""
@@ -8398,7 +8372,7 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
 msgid "Ignore list Reply-To:"
-msgstr ""
+msgstr "Älä huomioi listan Reply-To-otsaketta"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
 msgid ""
@@ -8413,7 +8387,7 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
 msgid "List of localized 'Re'"
-msgstr ""
+msgstr "Lista ”Re”-käännöksistä"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
 msgid ""
@@ -9545,7 +9519,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:307
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:308
 msgid "Start in offline mode"
 msgstr "Aloita yhteydettömässä tilassa"
 
@@ -9699,7 +9673,7 @@ msgstr "Muotoillaan viestiä"
 #: ../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-caldav/e-caldav-chooser.c:1271
 #: ../modules/cal-config-google/e-google-chooser.c:236
 #: ../modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Name"
@@ -9727,7 +9701,7 @@ msgid "S/MIME encrpyted"
 msgstr "S/MIME-salattu"
 
 #: ../em-format/e-mail-formatter-print-headers.c:170
-#: ../mail/e-mail-config-security-page.c:645
+#: ../mail/e-mail-config-security-page.c:737
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:194
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:128
 msgid "Security"
@@ -9735,7 +9709,8 @@ msgstr "Turvallisuus"
 
 #: ../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
+#: ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
+#: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17
 #: ../modules/mail/em-mailer-prefs.c:68
 msgid "Subject"
 msgstr "Aihe"
@@ -9928,13 +9903,11 @@ msgstr ""
 
 #: ../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 "S/MIME-viestin jäsennys epäonnistui: %s"
 
 #: ../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-viestin jäsennys epäonnistui: %s"
 
@@ -9987,7 +9960,6 @@ msgstr "Tuntematon salausmuoto muodolle multipart/encrypted"
 
 #: ../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-viestin jäsennys epäonnistui: %s"
 
@@ -10161,7 +10133,6 @@ msgstr "_Tilan seuranta"
 #: ../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"
 
@@ -10345,7 +10316,7 @@ msgid "_Replace existing view"
 msgstr "_Korvaa olemassaoleva näkymä"
 
 #: ../e-util/e-activity-proxy.c:308
-#: ../modules/mail/e-mail-shell-view-actions.c:1724
+#: ../modules/mail/e-mail-shell-view-actions.c:1760
 msgid "Cancel"
 msgstr "Peru"
 
@@ -10468,7 +10439,6 @@ msgid "S_ave All"
 msgstr "Tallenna _kaikki"
 
 #: ../e-util/e-attachment-view.c:391
-#| msgid "Sa_ve"
 msgid "Sa_ve As"
 msgstr "_Tallenna nimellä"
 
@@ -10476,7 +10446,6 @@ msgstr "_Tallenna nimellä"
 #: ../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ä"
 
@@ -10489,8 +10458,8 @@ msgstr "_Lisää liite..."
 #: ../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
+#: ../modules/mail/e-mail-shell-view-actions.c:1562
+#: ../modules/mail/e-mail-shell-view-actions.c:1632
 msgid "_Properties"
 msgstr "_Ominaisuudet"
 
@@ -10671,17 +10640,17 @@ msgstr "Käytössä _olevat luokat:"
 msgid "_Available Categories:"
 msgstr "_Käytettävissä olevat luokat:"
 
-#: ../e-util/e-categories-editor.c:274 ../mail/em-folder-selector.c:269
+#: ../e-util/e-categories-editor.c:274
 #: ../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
+#: ../e-util/e-categories-selector.c:322
 msgid "Icon"
 msgstr "Kuvake"
 
-#: ../e-util/e-category-completion.c:299
+#: ../e-util/e-category-completion.c:302
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Luo luokka \"%s\""
@@ -10739,7 +10708,7 @@ msgstr "Ei mitään"
 msgid "OK"
 msgstr "OK"
 
-#: ../e-util/e-cell-date-edit.c:872
+#: ../e-util/e-cell-date-edit.c:873
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ajan tulee olla muodossa: %s"
@@ -10748,7 +10717,7 @@ msgstr "Ajan tulee olla muodossa: %s"
 msgid "?"
 msgstr "?"
 
-#: ../e-util/e-cell-percent.c:79
+#: ../e-util/e-cell-percent.c:81
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosenttiarvon tulee olla välillä 0 - 100"
 
@@ -11154,9 +11123,8 @@ msgid "No reply or parent"
 msgstr "Ei vastasta tai vanhempaa"
 
 #: ../e-util/e-filter-rule.c:852
-#, fuzzy
 msgid "I_nclude threads:"
-msgstr "O_ta myös säikeet mukaan"
+msgstr "O_ta mukaan säikeet:"
 
 #: ../e-util/e-filter-rule.c:929
 msgid "A_dd Condition"
@@ -11476,10 +11444,8 @@ msgid ""
 msgstr "Tulostusjärjestelmä ei kertonut tarkempia tietoja virheestä."
 
 #: ../e-util/e-proxy-editor.c:314
-#, fuzzy
-#| msgid "Method:"
 msgid "_Method:"
-msgstr "Menetelmä:"
+msgstr "_Menetelmä:"
 
 #: ../e-util/e-proxy-editor.c:336
 msgid "Defer to Desktop Settings"
@@ -11487,26 +11453,21 @@ msgstr ""
 
 #: ../e-util/e-proxy-editor.c:340
 msgid "_Open Desktop Settings"
-msgstr ""
+msgstr "_Avaa työpöytäasetukset"
 
 #: ../e-util/e-proxy-editor.c:366
-#, fuzzy
-#| msgid "January"
 msgid "Manual"
-msgstr "Tammikuu"
+msgstr "Manuaalinen"
 
 #: ../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:"
 
@@ -11517,13 +11478,10 @@ msgid "_Ignore Hosts:"
 msgstr "Älä välitä"
 
 #: ../e-util/e-proxy-editor.c:504
-#, fuzzy
-#| msgid "Automatic Contacts"
 msgid "Automatic"
-msgstr "Automaattiset yhteystiedot"
+msgstr "Automaattinen"
 
 #: ../e-util/e-proxy-editor.c:523
-#| msgid "Configuration"
 msgid "Configuration _URL:"
 msgstr "_Määritysosoite:"
 
@@ -11550,18 +11508,14 @@ msgid ""
 msgstr ""
 
 #: ../e-util/e-proxy-selector.c:85
-#, fuzzy
-#| msgid "_Custom binary:"
 msgid "Custom Proxy"
-msgstr "_Omavalintainen binääri:"
+msgstr "Oma välityspalvelin"
 
 #: ../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"
 
@@ -11618,41 +11572,41 @@ msgstr "Saavutettiin sivun loppu, jatketaan alusta"
 msgid "Reached top of page, continued from bottom"
 msgstr "Saavutettiin sivun alku, jatketaan lopusta"
 
-#: ../e-util/e-send-options.c:537 ../mail/importers/elm-importer.c:327
+#: ../e-util/e-send-options.c:538 ../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:569
+#: ../e-util/e-send-options.c:570
 msgid "When de_leted:"
 msgstr "Milloin _poistettu:"
 
-#: ../e-util/e-source-config.c:680 ../e-util/e-source-config.c:684
+#: ../e-util/e-source-config.c:681 ../e-util/e-source-config.c:685
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: ../e-util/e-source-config.c:692 ../e-util/e-source-config.c:696
+#: ../e-util/e-source-config.c:693 ../e-util/e-source-config.c:697
 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:1301
+#: ../e-util/e-source-config.c:1302
 msgid "Refresh every"
 msgstr "Päivitysväli"
 
-#: ../e-util/e-source-config.c:1331 ../e-util/e-source-config.c:1401
+#: ../e-util/e-source-config.c:1332 ../e-util/e-source-config.c:1402
 msgid "Use a secure connection"
 msgstr "Käytä salattua yhteyttä:"
 
-#: ../e-util/e-source-config.c:1427
+#: ../e-util/e-source-config.c:1428
 #, fuzzy
 #| msgid "Imported Certificate"
 msgid "Unset _trust for SSL certificate"
 msgstr "Tuotu varmenne"
 
-#: ../e-util/e-source-config.c:1463
+#: ../e-util/e-source-config.c:1464
 msgid "User"
 msgstr "Käyttäjä"
 
@@ -11977,91 +11931,89 @@ msgstr "Napsauta tästä avataksesi verkko-osoitteen"
 msgid "Enter a URL here"
 msgstr "Kirjoita verkko-osoite tähän"
 
-#: ../e-util/e-web-view-gtkhtml.c:405 ../e-util/e-web-view.c:282
+#: ../e-util/e-web-view-gtkhtml.c:405 ../e-util/e-web-view.c:286
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: ../e-util/e-web-view-gtkhtml.c:407 ../e-util/e-web-view.c:284
+#: ../e-util/e-web-view-gtkhtml.c:407 ../e-util/e-web-view.c:288
 msgid "Copy the link to the clipboard"
 msgstr "Kopioi linkki leikepöydälle"
 
-#: ../e-util/e-web-view-gtkhtml.c:415 ../e-util/e-web-view.c:292
+#: ../e-util/e-web-view-gtkhtml.c:415 ../e-util/e-web-view.c:296
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: ../e-util/e-web-view-gtkhtml.c:417 ../e-util/e-web-view.c:294
+#: ../e-util/e-web-view-gtkhtml.c:417 ../e-util/e-web-view.c:298
 msgid "Open the link in a web browser"
 msgstr "Avaa linkki selaimessa"
 
-#: ../e-util/e-web-view-gtkhtml.c:425 ../e-util/e-web-view.c:302
+#: ../e-util/e-web-view-gtkhtml.c:425 ../e-util/e-web-view.c:306
 msgid "_Copy Email Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: ../e-util/e-web-view-gtkhtml.c:442 ../e-util/e-web-view.c:319
+#: ../e-util/e-web-view-gtkhtml.c:442 ../e-util/e-web-view.c:323
 msgid "_Copy Image"
 msgstr "K_opioi kuva"
 
-#: ../e-util/e-web-view-gtkhtml.c:444 ../e-util/e-web-view.c:321
+#: ../e-util/e-web-view-gtkhtml.c:444 ../e-util/e-web-view.c:325
 msgid "Copy the image to the clipboard"
 msgstr "Kopioi kuva leikepöydälle"
 
-#: ../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
+#: ../e-util/e-web-view-gtkhtml.c:464 ../e-util/e-web-view-gtkhtml.c:1306
+#: ../e-util/e-web-view.c:352 ../e-util/e-web-view.c:1322
 msgid "Select all text and images"
 msgstr "Valitse kaikki teksti ja kuvat"
 
-#: ../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
+#: ../e-util/e-web-view-gtkhtml.c:974 ../e-util/e-web-view.c:1001
 #, c-format
 msgid "Click to call %s"
 msgstr "Soita numeroon %s napsauttamalla"
 
-#: ../e-util/e-web-view-gtkhtml.c:977 ../e-util/e-web-view.c:1000
+#: ../e-util/e-web-view-gtkhtml.c:976 ../e-util/e-web-view.c:1003
 msgid "Click to hide/unhide addresses"
 msgstr "Napsauta piilottaaksesi tai näyttääksesi osoitteet"
 
-#: ../e-util/e-web-view-gtkhtml.c:979 ../e-util/e-web-view.c:1002
+#: ../e-util/e-web-view-gtkhtml.c:978 ../e-util/e-web-view.c:1005
 #, c-format
 msgid "Click to open %s"
 msgstr "Napsauta avataksesi %s"
 
-#: ../e-util/e-web-view.c:326
+#: ../e-util/e-web-view.c:330
 msgid "Save _Image..."
 msgstr "Tal_lenna kuva..."
 
-#: ../e-util/e-web-view.c:328
+#: ../e-util/e-web-view.c:332
 msgid "Save the image to a file"
 msgstr "Tallenna kuva tiedostoon"
 
-#: ../e-util/e-web-view.c:2902
+#: ../e-util/e-web-view.c:2906
 msgid "Copying image to clipboard"
 msgstr "Kopioidaan kuva leikepöydälle"
 
-#: ../e-util/e-web-view.c:3090
+#: ../e-util/e-web-view.c:3094
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../e-util/e-web-view.c:3126
+#: ../e-util/e-web-view.c:3130
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "Tallennetaan kuva kohteeseen \"%s\""
 
 #: ../e-util/e-widget-undo.c:429
 msgid "Undo 'Insert text'"
-msgstr ""
+msgstr "Kumoa ”tekstin lisäys”"
 
 #: ../e-util/e-widget-undo.c:431
 msgid "Redo 'Insert text'"
-msgstr ""
+msgstr "Tee uudelleen ”tekstin lisäys”"
 
 #: ../e-util/e-widget-undo.c:445
 msgid "Undo 'Delete text'"
-msgstr ""
+msgstr "Kumoa ”tekstin poisto”"
 
 #: ../e-util/e-widget-undo.c:447
 msgid "Redo 'Delete text'"
-msgstr ""
+msgstr "Tee uudelleen ”tekstin poisto”"
 
 #: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
 msgid "%d %B %Y"
@@ -12156,7 +12108,6 @@ 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."
 
@@ -12566,7 +12517,7 @@ msgid "De_fault"
 msgstr "_Oletustili"
 
 #: ../mail/e-mail-account-tree-view.c:84
-#: ../modules/mail/em-composer-prefs.c:1191
+#: ../modules/mail/em-composer-prefs.c:1195
 #: ../modules/plugin-manager/evolution-plugin-manager.c:358
 #: ../plugins/publish-calendar/publish-calendar.c:896
 msgid "Enabled"
@@ -12577,8 +12528,8 @@ msgid "Account Name"
 msgstr "Tilin nimi"
 
 #: ../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/e-mail-config-security-page.c:427
+#: ../mail/e-mail-config-security-page.c:567 ../mail/e-mail-reader.c:3608
 #: ../mail/mail-config.ui.h:66
 msgid "Default"
 msgstr "Oletukset"
@@ -12591,7 +12542,7 @@ msgstr "Sähköpostiosoitetta ei annettu."
 msgid "Missing domain in email address"
 msgstr "Verkkonimi puuttuu sähköpostiosoitteesta"
 
-#: ../mail/e-mail-backend.c:841
+#: ../mail/e-mail-backend.c:855
 msgid "Unknown background operation"
 msgstr "Tuntematon taustatoiminto"
 
@@ -12606,7 +12557,6 @@ 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"
 
@@ -12802,104 +12752,110 @@ msgstr "Vastaanottoasetukset"
 msgid "Receiving Email"
 msgstr "Vastaanotto"
 
-#: ../mail/e-mail-config-security-page.c:260
+#. Translators: This string is to describe a PGP key in a combo box in mail account's preferences.
+#. The first '%s' is a key ID, the second '%s' is a display name of the key.
+#: ../mail/e-mail-config-security-page.c:251
+#, fuzzy, c-format
+#| msgid "Task - %s"
+msgctxt "PGPKeyDescription"
+msgid "%s - %s"
+msgstr "Tehtävä - %s"
+
+#: ../mail/e-mail-config-security-page.c:341
 #: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:26
-#: ../modules/addressbook/autocompletion-config.c:113
+#: ../modules/addressbook/autocompletion-config.c:114
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
 #: ../modules/itip-formatter/plugin/config-ui.c:90
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "Yleiset"
 
-#: ../mail/e-mail-config-security-page.c:269
+#: ../mail/e-mail-config-security-page.c:350
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Älä allekirjoita kokouskutsuja (Outlook-yhteensopivuus)"
 
-#: ../mail/e-mail-config-security-page.c:291
+#: ../mail/e-mail-config-security-page.c:372
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "Pretty Good Privacy (OpenPGP) -salaus"
 
-#: ../mail/e-mail-config-security-page.c:300
+#: ../mail/e-mail-config-security-page.c:381
 msgid "OpenPGP _Key ID:"
 msgstr "OpenPGP_-avaimen ID:"
 
-#: ../mail/e-mail-config-security-page.c:322
+#: ../mail/e-mail-config-security-page.c:414
 msgid "Si_gning algorithm:"
 msgstr "_Allekirjoitusalgoritmi:"
 
-#: ../mail/e-mail-config-security-page.c:338
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:67
+#: ../mail/e-mail-config-security-page.c:430
+#: ../mail/e-mail-config-security-page.c:570 ../mail/mail-config.ui.h:67
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/e-mail-config-security-page.c:341
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:68
+#: ../mail/e-mail-config-security-page.c:433
+#: ../mail/e-mail-config-security-page.c:573 ../mail/mail-config.ui.h:68
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/e-mail-config-security-page.c:344
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:69
+#: ../mail/e-mail-config-security-page.c:436
+#: ../mail/e-mail-config-security-page.c:576 ../mail/mail-config.ui.h:69
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/e-mail-config-security-page.c:347
-#: ../mail/e-mail-config-security-page.c:487 ../mail/mail-config.ui.h:70
+#: ../mail/e-mail-config-security-page.c:439
+#: ../mail/e-mail-config-security-page.c:579 ../mail/mail-config.ui.h:70
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/e-mail-config-security-page.c:363
+#: ../mail/e-mail-config-security-page.c:455
 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:375
+#: ../mail/e-mail-config-security-page.c:467
 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:387
+#: ../mail/e-mail-config-security-page.c:479
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "_Luota salattaessa aina avaimiin avainrenkaassani"
 
-#: ../mail/e-mail-config-security-page.c:411
+#: ../mail/e-mail-config-security-page.c:503
 msgid "Secure MIME (S/MIME)"
 msgstr "Suojattu MIME (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:420
+#: ../mail/e-mail-config-security-page.c:512
 msgid "Sig_ning certificate:"
 msgstr "_Allekirjoitusvarmenne:"
 
-#: ../mail/e-mail-config-security-page.c:444
-#: ../mail/e-mail-config-security-page.c:550
+#: ../mail/e-mail-config-security-page.c:536
+#: ../mail/e-mail-config-security-page.c:642
 msgid "Select"
 msgstr "Valitse"
 
-#: ../mail/e-mail-config-security-page.c:453
-#: ../mail/e-mail-config-security-page.c:559 ../mail/mail-dialogs.ui.h:5
+#: ../mail/e-mail-config-security-page.c:545
+#: ../mail/e-mail-config-security-page.c:651 ../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
+#: ../mail/e-mail-config-security-page.c:554
 msgid "Signing _algorithm:"
 msgstr "Allekirjoitus_algoritmi:"
 
-#: ../mail/e-mail-config-security-page.c:503
+#: ../mail/e-mail-config-security-page.c:595
 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:526
+#: ../mail/e-mail-config-security-page.c:618
 msgid "Encryption certificate:"
 msgstr "Salausvarmenne:"
 
-#: ../mail/e-mail-config-security-page.c:568
+#: ../mail/e-mail-config-security-page.c:660
 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:588
-#, fuzzy
-#| msgid "Always encrypt to _myself when sending encrypted messages"
+#: ../mail/e-mail-config-security-page.c:680
 msgid "Always encrypt to myself when sending encrypted messages"
-msgstr "Salaa _aina myös itselle lähetettäessä salattu viesti"
+msgstr "Salaa aina myös itselle lähetettäessä salattu viesti"
 
 #: ../mail/e-mail-config-sending-page.c:49
 msgid "Sending Email"
@@ -12966,7 +12922,7 @@ msgstr "Salaus:"
 msgid "Account Summary"
 msgstr "Tilin yhteenveto"
 
-#: ../mail/e-mail-config-welcome-page.c:156
+#: ../mail/e-mail-config-welcome-page.c:157
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12976,7 +12932,7 @@ msgstr ""
 "\n"
 "Aloita napsauttamalla \"Jatka\"."
 
-#: ../mail/e-mail-config-welcome-page.c:166
+#: ../mail/e-mail-config-welcome-page.c:167
 #: ../modules/startup-wizard/e-startup-assistant.c:151
 msgid "Welcome"
 msgstr "Tervetuloa"
@@ -13009,6 +12965,22 @@ msgstr "Lähetä vastausviesti tähän osoitteeseen"
 msgid "Create Search _Folder"
 msgstr "Luo _hakunäkymä"
 
+#: ../mail/e-mail-folder-create-dialog.c:328
+msgid "Create Folder"
+msgstr "Luo kansio"
+
+#: ../mail/e-mail-folder-create-dialog.c:332
+msgid "Specify where to create the folder:"
+msgstr "Määrittele mihin kansio luodaan:"
+
+#: ../mail/e-mail-folder-create-dialog.c:335
+msgid "C_reate"
+msgstr "_Luo"
+
+#: ../mail/e-mail-folder-create-dialog.c:352
+msgid "Folder _name:"
+msgstr "Kansion _nimi:"
+
 #. 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:297
@@ -13044,7 +13016,7 @@ msgid "_Later"
 msgstr "_Myöhemmin"
 
 #: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1028
+#: ../modules/mail/e-mail-shell-view-actions.c:1064
 msgid "Add Label"
 msgstr "Lisää merkintä"
 
@@ -13065,28 +13037,20 @@ msgid "Color"
 msgstr "Väri"
 
 #: ../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"
+msgstr "Siirrä valitut otsakkeet ylös"
 
 #: ../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"
+msgstr "Siirrä valitut otsakkeet riviä ylemmäs"
 
 #: ../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"
+msgstr "Siirrä valitut otsakkeet riviä alemmas"
 
 #: ../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"
+msgstr "Siirrä valitut otsakkeet alas"
 
 #: ../mail/e-mail-print-config-headers.c:186
 msgid "Select all headers"
@@ -13109,19 +13073,19 @@ msgstr "Otsakkeet"
 msgid "Page %d of %d"
 msgstr "Sivu  %d / %d"
 
-#: ../mail/e-mail-reader.c:348 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:347 ../mail/filtertypes.xml.in.h:62
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: ../mail/e-mail-reader.c:348 ../mail/em-folder-utils.c:505
+#: ../mail/e-mail-reader.c:351 ../mail/em-folder-utils.c:487
 msgid "C_opy"
 msgstr "_Kopioi"
 
-#: ../mail/e-mail-reader.c:848 ../mail/em-filter-i18n.h:33
+#: ../mail/e-mail-reader.c:849 ../mail/filtertypes.xml.in.h:61
 msgid "Move to Folder"
 msgstr "Siirrä kansioon"
 
-#: ../mail/e-mail-reader.c:848 ../mail/em-folder-utils.c:505
+#: ../mail/e-mail-reader.c:853 ../mail/em-folder-utils.c:487
 msgid "_Move"
 msgstr "_Siirrä"
 
@@ -13138,7 +13102,7 @@ msgstr "_Älä koskaan huomioi postituslistojen Reply-To-otsaketta."
 msgid "Failed to retrieve message:"
 msgstr "Viestin nouto epäonnistui:"
 
-#: ../mail/e-mail-reader.c:1674 ../mail/e-mail-reader.c:2843
+#: ../mail/e-mail-reader.c:1674 ../mail/e-mail-reader.c:2849
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Noudetaan viestiä ”%s”"
@@ -13646,42 +13610,42 @@ msgstr "Kaikki viestin _otsikot"
 msgid "Show messages with all email headers"
 msgstr "Näytä viesti kaikilla otsakkeillaan"
 
-#: ../mail/e-mail-reader.c:2849
+#: ../mail/e-mail-reader.c:2855
 msgid "Retrieving message"
 msgstr "Noudetaan viesti"
 
-#: ../mail/e-mail-reader.c:3772
+#: ../mail/e-mail-reader.c:3778
 #: ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: ../mail/e-mail-reader.c:3773
+#: ../mail/e-mail-reader.c:3779
 msgid "Forward the selected message to someone"
 msgstr "Välitä edelleen valitut viestit jollekulle"
 
-#: ../mail/e-mail-reader.c:3792
+#: ../mail/e-mail-reader.c:3798
 msgid "Group Reply"
 msgstr "Vastaa ryhmälle"
 
-#: ../mail/e-mail-reader.c:3793
+#: ../mail/e-mail-reader.c:3799
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Vastaa sähköpostilistalle tai kaikille vastaanottajille"
 
-#: ../mail/e-mail-reader.c:3859 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3865 ../mail/filtertypes.xml.in.h:63
 msgid "Delete"
 msgstr "Poista"
 
-#: ../mail/e-mail-reader.c:3871
+#: ../mail/e-mail-reader.c:3877
 #: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../mail/e-mail-reader.c:3875
+#: ../mail/e-mail-reader.c:3881
 #: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ../mail/e-mail-reader.c:3884 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3890 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Vastaa"
 
@@ -13695,7 +13659,6 @@ msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
 #: ../mail/e-mail-reader-utils.c:976
-#| msgid "Print"
 msgid "Printing"
 msgstr "Tulostetaan"
 
@@ -13734,8 +13697,6 @@ msgstr[0] "Viesti"
 msgstr[1] "Viestit"
 
 #: ../mail/e-mail-reader-utils.c:2416
-#| msgid "Saving %d message"
-#| msgid_plural "Saving %d messages"
 msgid "Parsing message"
 msgstr "Jäsennetään viestiä"
 
@@ -13771,11 +13732,12 @@ msgstr "-----Alkuperäinen viesti-----"
 msgid "an unknown sender"
 msgstr "Tuntematon lähettäjä"
 
-#: ../mail/em-composer-utils.c:3040
+#. FIXME GTK_WINDOW (composer)
+#: ../mail/em-composer-utils.c:3041
 msgid "Posting destination"
 msgstr "Postituksen kohde"
 
-#: ../mail/em-composer-utils.c:3041
+#: ../mail/em-composer-utils.c:3046
 msgid "Choose folders to post the message to."
 msgstr "Valitse kansio johon viesti postitetaan:"
 
@@ -13783,264 +13745,6 @@ msgstr "Valitse kansio johon viesti postitetaan:"
 msgid "Select Folder"
 msgstr "Valitse kansio"
 
-#. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Muuta pisteytystä"
-
-#: ../mail/em-filter-i18n.h:3
-msgid "Any header"
-msgstr "Mikä tahansa otsake"
-
-#: ../mail/em-filter-i18n.h:4
-msgid "Assign Color"
-msgstr "Aseta väri"
-
-#: ../mail/em-filter-i18n.h:5
-msgid "Assign Score"
-msgstr "Aseta pistemäärä"
-
-#: ../mail/em-filter-i18n.h:7
-msgid "BCC"
-msgstr "BCC"
-
-#: ../mail/em-filter-i18n.h:8
-msgid "Beep"
-msgstr "Piippaa"
-
-#: ../mail/em-filter-i18n.h:9
-msgid "CC"
-msgstr "CC"
-
-#: ../mail/em-filter-i18n.h:10
-msgid "Completed On"
-msgstr "Valmistui"
-
-#: ../mail/em-filter-i18n.h:12
-msgid "Date received"
-msgstr "Otettu vastaan"
-
-#: ../mail/em-filter-i18n.h:13
-msgid "Date sent"
-msgstr "Lähetetty"
-
-#: ../mail/em-filter-i18n.h:15
-msgid "Deleted"
-msgstr "Poistettu"
-
-#: ../mail/em-filter-i18n.h:17
-msgid "Draft"
-msgstr "Luonnos"
-
-#: ../mail/em-filter-i18n.h:19
-msgid "Expression"
-msgstr "Lauseke"
-
-#: ../mail/em-filter-i18n.h:20
-msgid "Follow Up"
-msgstr "Lähetä edelleen"
-
-#: ../mail/em-filter-i18n.h:21
-msgid "Forward to"
-msgstr "Välitä"
-
-#: ../mail/em-filter-i18n.h:22
-msgid "Important"
-msgstr "Tärkeä"
-
-#: ../mail/em-filter-i18n.h:23
-msgid "Junk Test"
-msgstr "Roskapostitesti"
-
-#: ../mail/em-filter-i18n.h:24 ../mail/mail-config.ui.h:113
-msgid "Junk"
-msgstr "Roskaposti"
-
-#: ../mail/em-filter-i18n.h:25
-msgid "Label"
-msgstr "Merkintä"
-
-#: ../mail/em-filter-i18n.h:26
-msgid "Mailing list"
-msgstr "Postituslista"
-
-#: ../mail/em-filter-i18n.h:27
-msgid "Match All"
-msgstr "Kaikki käyvät"
-
-#: ../mail/em-filter-i18n.h:28
-msgid "Message Body"
-msgstr "Viestin runko"
-
-#: ../mail/em-filter-i18n.h:29
-msgid "Message Header"
-msgstr "Viestin otsakkeet"
-
-#: ../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:32
-msgid "Message is not Junk"
-msgstr "Viesti ei ole roskapostia"
-
-#: ../mail/em-filter-i18n.h:34
-msgid "Pipe to Program"
-msgstr "Välitä putkessa ohjelmalle"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "Play Sound"
-msgstr "Soita ääni"
-
-#. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:36 ../mail/mail-dialogs.ui.h:15
-msgid "Read"
-msgstr "Luettu"
-
-#: ../mail/em-filter-i18n.h:37 ../mail/message-list.etspec.h:16
-msgid "Recipients"
-msgstr "Vastaanottajat"
-
-#: ../mail/em-filter-i18n.h:38
-msgid "Regex Match"
-msgstr "Regex-osuma"
-
-#: ../mail/em-filter-i18n.h:39
-msgid "Replied to"
-msgstr "Vastaus viestiin"
-
-#: ../mail/em-filter-i18n.h:40
-msgid "Run Program"
-msgstr "Suorita ohjelma"
-
-#: ../mail/em-filter-i18n.h:41 ../mail/message-list.etspec.h:3
-msgid "Score"
-msgstr "Pistemäärä"
-
-#: ../mail/em-filter-i18n.h:42
-msgid "Sender or Recipients"
-msgstr "Lähettäjä tai vastaanottajat"
-
-#: ../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:45
-msgid "Set Status"
-msgstr "Aseta tila"
-
-#: ../mail/em-filter-i18n.h:46
-msgid "Size (kB)"
-msgstr "Koko (kB)"
-
-#: ../mail/em-filter-i18n.h:47
-msgid "Source Account"
-msgstr "Lähteen yhteystieto"
-
-#: ../mail/em-filter-i18n.h:48
-msgid "Specific header"
-msgstr "Annettu otsake"
-
-#: ../mail/em-filter-i18n.h:50
-msgid "Stop Processing"
-msgstr "Pysäytä käsittely"
-
-#: ../mail/em-filter-i18n.h:53
-msgid "Unset Color"
-msgstr "Poista värin asetus"
-
-#: ../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:587
 msgid "Then"
@@ -14086,13 +13790,11 @@ msgstr "Kansion ominaisuudet"
 msgid "<click here to select a folder>"
 msgstr "<Valitse kansio tästä>"
 
-#: ../mail/em-folder-selector.c:387
-msgid "C_reate"
-msgstr "_Luo"
-
-#: ../mail/em-folder-selector.c:393
-msgid "Folder _name:"
-msgstr "Kansion _nimi:"
+#: ../mail/em-folder-selector.c:394
+#, fuzzy
+#| msgid "Create a new mail folder"
+msgid "Create a new folder"
+msgstr "Luo uusi sähköpostikansio"
 
 #: ../mail/em-folder-tree.c:682
 msgid "Folder names cannot contain '/'"
@@ -14104,31 +13806,31 @@ msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1661
+#: ../mail/em-folder-tree.c:1667
 msgid "Mail Folder Tree"
 msgstr "Sähköpostikansioiden puu"
 
-#: ../mail/em-folder-tree.c:2209 ../mail/em-folder-utils.c:100
+#: ../mail/em-folder-tree.c:2215 ../mail/em-folder-utils.c:82
 #, c-format
 msgid "Moving folder %s"
 msgstr "Siirretään kansiota %s"
 
-#: ../mail/em-folder-tree.c:2212 ../mail/em-folder-utils.c:102
+#: ../mail/em-folder-tree.c:2218 ../mail/em-folder-utils.c:84
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopioidaan kansiota %s"
 
-#: ../mail/em-folder-tree.c:2219 ../mail/message-list.c:2284
+#: ../mail/em-folder-tree.c:2225 ../mail/message-list.c:2284
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Siirretään viestejä kansioon %s"
 
-#: ../mail/em-folder-tree.c:2223 ../mail/message-list.c:2286
+#: ../mail/em-folder-tree.c:2229 ../mail/message-list.c:2286
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejä kansioon %s"
 
-#: ../mail/em-folder-tree.c:2242
+#: ../mail/em-folder-tree.c:2248
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Viestiä ei voi tiputtaa ylätason taltioon"
@@ -14138,26 +13840,18 @@ msgstr "Viestiä ei voi tiputtaa ylätason taltioon"
 msgid "UNMATCHED"
 msgstr "EI VASTAAVAA"
 
-#: ../mail/em-folder-tree-model.c:1244 ../mail/em-folder-tree-model.c:1621
+#: ../mail/em-folder-tree-model.c:1244 ../mail/em-folder-tree-model.c:1620
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: ../mail/em-folder-utils.c:506
+#: ../mail/em-folder-utils.c:488
 msgid "Move Folder To"
 msgstr "Siirrä kansio kohteeseen"
 
-#: ../mail/em-folder-utils.c:506
+#: ../mail/em-folder-utils.c:488
 msgid "Copy Folder To"
 msgstr "Kopioi kansio kohteeseen"
 
-#: ../mail/em-folder-utils.c:604
-msgid "Create Folder"
-msgstr "Luo kansio"
-
-#: ../mail/em-folder-utils.c:605
-msgid "Specify where to create the folder:"
-msgstr "Määrittele mihin kansio luodaan:"
-
 #: ../mail/em-subscription-editor.c:855
 msgid "_Subscribe"
 msgstr "_Tilaa"
@@ -14171,14 +13865,13 @@ msgid "Subscribe To _All"
 msgstr "Tilaa kaikk_i"
 
 #: ../mail/em-subscription-editor.c:969 ../mail/em-subscription-editor.c:1867
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1667
 msgid "_Unsubscribe"
 msgstr "_Peru tilaus"
 
 #: ../mail/em-subscription-editor.c:978
-#, fuzzy
 msgid "Unsu_bscribe From Hidden"
-msgstr "Peru kansioiden tilauksia"
+msgstr "Per_u piilotettujen tilaus"
 
 #: ../mail/em-subscription-editor.c:986
 msgid "Unsubscribe From _All"
@@ -14209,7 +13902,7 @@ msgid "Su_bscribe"
 msgstr "Tila_a"
 
 #: ../mail/em-subscription-editor.c:1866
-#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../modules/mail/e-mail-shell-view-actions.c:1669
 msgid "Unsubscribe from the selected folder"
 msgstr "Peru tämän kansion tilaus"
 
@@ -14234,8 +13927,8 @@ msgid "Refresh the folder list"
 msgstr "Päivitä kansioluettelo"
 
 #: ../mail/em-subscription-editor.c:1929
-#: ../modules/mail/e-mail-shell-view-actions.c:1533
-#: ../modules/mail/e-mail-shell-view-actions.c:1603
+#: ../modules/mail/e-mail-shell-view-actions.c:1569
+#: ../modules/mail/e-mail-shell-view-actions.c:1639
 msgid "_Refresh"
 msgstr "_Päivitä"
 
@@ -14281,34 +13974,324 @@ msgstr "_Hakunäkymät"
 msgid "Add Folder"
 msgstr "Lisää kansio"
 
-#: ../mail/em-vfolder-editor-rule.c:518
+#: ../mail/em-vfolder-editor-rule.c:521
 msgid "Search Folder Sources"
 msgstr ""
 
-#: ../mail/em-vfolder-editor-rule.c:550
+#: ../mail/em-vfolder-editor-rule.c:553
 msgid "Automatically update on any _source folder change"
 msgstr ""
 
-#: ../mail/em-vfolder-editor-rule.c:562
+#: ../mail/em-vfolder-editor-rule.c:565
 msgid "All local folders"
 msgstr "Kaikki paikalliset kansiot"
 
-#: ../mail/em-vfolder-editor-rule.c:563
+#: ../mail/em-vfolder-editor-rule.c:566
 msgid "All active remote folders"
 msgstr "Kaikki aktiiviset etäkansiot"
 
-#: ../mail/em-vfolder-editor-rule.c:564
+#: ../mail/em-vfolder-editor-rule.c:567
 msgid "All local and active remote folders"
 msgstr "Kaikki paikalliset kansiot ja aktiiviset etäkansiot"
 
-#: ../mail/em-vfolder-editor-rule.c:565
+#: ../mail/em-vfolder-editor-rule.c:568
 msgid "Specific folders"
 msgstr "Tietyt kansiot"
 
-#: ../mail/em-vfolder-editor-rule.c:603
+#: ../mail/em-vfolder-editor-rule.c:606
 msgid "include subfolders"
 msgstr "sisällytä alikansiot"
 
+#: ../mail/filtertypes.xml.in.h:1 ../mail/message-list.etspec.h:15
+#: ../mail/searchtypes.xml.in.h:1 ../mail/vfoldertypes.xml.in.h:1
+msgid "Sender"
+msgstr "Lähettäjä"
+
+#: ../mail/filtertypes.xml.in.h:6 ../mail/searchtypes.xml.in.h:6
+#: ../mail/vfoldertypes.xml.in.h:6
+msgid "starts with"
+msgstr "alkaa"
+
+#: ../mail/filtertypes.xml.in.h:7 ../mail/searchtypes.xml.in.h:7
+#: ../mail/vfoldertypes.xml.in.h:7
+msgid "does not start with"
+msgstr "ei ala"
+
+#: ../mail/filtertypes.xml.in.h:8 ../mail/searchtypes.xml.in.h:8
+#: ../mail/vfoldertypes.xml.in.h:8
+msgid "ends with"
+msgstr "päättyy"
+
+#: ../mail/filtertypes.xml.in.h:9 ../mail/searchtypes.xml.in.h:9
+#: ../mail/vfoldertypes.xml.in.h:9
+msgid "does not end with"
+msgstr "ei pääty"
+
+#: ../mail/filtertypes.xml.in.h:10 ../mail/searchtypes.xml.in.h:12
+#: ../mail/vfoldertypes.xml.in.h:12
+msgid "sounds like"
+msgstr "kuulostaa samalta kuin"
+
+#: ../mail/filtertypes.xml.in.h:11 ../mail/searchtypes.xml.in.h:13
+#: ../mail/vfoldertypes.xml.in.h:13
+msgid "does not sound like"
+msgstr "ei kuulosta samalta kuin"
+
+#: ../mail/filtertypes.xml.in.h:12 ../mail/message-list.etspec.h:16
+#: ../mail/searchtypes.xml.in.h:10 ../mail/vfoldertypes.xml.in.h:10
+msgid "Recipients"
+msgstr "Vastaanottajat"
+
+#: ../mail/filtertypes.xml.in.h:13 ../mail/searchtypes.xml.in.h:14
+#: ../mail/vfoldertypes.xml.in.h:14
+msgid "CC"
+msgstr "CC"
+
+#: ../mail/filtertypes.xml.in.h:14 ../mail/searchtypes.xml.in.h:15
+#: ../mail/vfoldertypes.xml.in.h:15
+msgid "BCC"
+msgstr "BCC"
+
+#: ../mail/filtertypes.xml.in.h:15 ../mail/searchtypes.xml.in.h:16
+#: ../mail/vfoldertypes.xml.in.h:16
+msgid "Sender or Recipients"
+msgstr "Lähettäjä tai vastaanottajat"
+
+#: ../mail/filtertypes.xml.in.h:17 ../mail/searchtypes.xml.in.h:18
+#: ../mail/vfoldertypes.xml.in.h:18
+msgid "has words"
+msgstr "sisältää sanat"
+
+#: ../mail/filtertypes.xml.in.h:18 ../mail/searchtypes.xml.in.h:19
+#: ../mail/vfoldertypes.xml.in.h:19
+msgid "does not have words"
+msgstr "ei sisällä sanoja"
+
+#: ../mail/filtertypes.xml.in.h:19 ../mail/searchtypes.xml.in.h:20
+#: ../mail/vfoldertypes.xml.in.h:20
+msgid "Specific header"
+msgstr "Annettu otsake"
+
+#: ../mail/filtertypes.xml.in.h:20 ../mail/searchtypes.xml.in.h:21
+#: ../mail/vfoldertypes.xml.in.h:21
+msgid "exists"
+msgstr "on olemassa"
+
+#: ../mail/filtertypes.xml.in.h:21 ../mail/searchtypes.xml.in.h:22
+#: ../mail/vfoldertypes.xml.in.h:22
+msgid "does not exist"
+msgstr "ei ole olemassa"
+
+#: ../mail/filtertypes.xml.in.h:22 ../mail/searchtypes.xml.in.h:24
+#: ../mail/vfoldertypes.xml.in.h:24
+msgid "Message Body"
+msgstr "Viestin runko"
+
+#: ../mail/filtertypes.xml.in.h:23 ../mail/searchtypes.xml.in.h:25
+#: ../mail/vfoldertypes.xml.in.h:25
+msgid "Expression"
+msgstr "Lauseke"
+
+#: ../mail/filtertypes.xml.in.h:24 ../mail/searchtypes.xml.in.h:26
+#: ../mail/vfoldertypes.xml.in.h:26
+msgid "Date sent"
+msgstr "Lähetetty"
+
+#: ../mail/filtertypes.xml.in.h:25 ../mail/searchtypes.xml.in.h:27
+#: ../mail/vfoldertypes.xml.in.h:27
+msgid "is before"
+msgstr "on ennen"
+
+#: ../mail/filtertypes.xml.in.h:26 ../mail/searchtypes.xml.in.h:28
+#: ../mail/vfoldertypes.xml.in.h:28
+msgid "is after"
+msgstr "on jälkeen"
+
+#: ../mail/filtertypes.xml.in.h:27 ../mail/searchtypes.xml.in.h:29
+#: ../mail/vfoldertypes.xml.in.h:29
+msgid "Date received"
+msgstr "Otettu vastaan"
+
+#: ../mail/filtertypes.xml.in.h:28 ../mail/searchtypes.xml.in.h:30
+#: ../mail/vfoldertypes.xml.in.h:30
+msgid "Label"
+msgstr "Merkintä"
+
+#: ../mail/filtertypes.xml.in.h:29 ../mail/message-list.etspec.h:3
+#: ../mail/searchtypes.xml.in.h:31 ../mail/vfoldertypes.xml.in.h:31
+msgid "Score"
+msgstr "Pistemäärä"
+
+#: ../mail/filtertypes.xml.in.h:32 ../mail/searchtypes.xml.in.h:34
+#: ../mail/vfoldertypes.xml.in.h:34
+msgid "Size (kB)"
+msgstr "Koko (kB)"
+
+#: ../mail/filtertypes.xml.in.h:34 ../mail/searchtypes.xml.in.h:36
+#: ../mail/vfoldertypes.xml.in.h:36
+msgid "Replied to"
+msgstr "Vastaus viestiin"
+
+#: ../mail/filtertypes.xml.in.h:35 ../mail/searchtypes.xml.in.h:38
+#: ../mail/vfoldertypes.xml.in.h:38
+msgid "Draft"
+msgstr "Luonnos"
+
+#: ../mail/filtertypes.xml.in.h:36 ../mail/searchtypes.xml.in.h:39
+#: ../mail/vfoldertypes.xml.in.h:39
+msgid "Important"
+msgstr "Tärkeä"
+
+#. Past tense, as in "has been read".
+#: ../mail/filtertypes.xml.in.h:37 ../mail/mail-dialogs.ui.h:15
+#: ../mail/searchtypes.xml.in.h:40 ../mail/vfoldertypes.xml.in.h:40
+msgid "Read"
+msgstr "Luettu"
+
+#: ../mail/filtertypes.xml.in.h:38 ../mail/mail-config.ui.h:113
+#: ../mail/vfoldertypes.xml.in.h:41
+msgid "Junk"
+msgstr "Roskaposti"
+
+#: ../mail/filtertypes.xml.in.h:39 ../mail/searchtypes.xml.in.h:41
+#: ../mail/vfoldertypes.xml.in.h:42
+msgid "Follow Up"
+msgstr "Lähetä edelleen"
+
+#: ../mail/filtertypes.xml.in.h:40 ../mail/searchtypes.xml.in.h:42
+#: ../mail/vfoldertypes.xml.in.h:43
+msgid "is Flagged"
+msgstr "on merkitty"
+
+#: ../mail/filtertypes.xml.in.h:41 ../mail/searchtypes.xml.in.h:43
+#: ../mail/vfoldertypes.xml.in.h:44
+msgid "is not Flagged"
+msgstr "ei ole merkitty"
+
+#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
+#: ../mail/vfoldertypes.xml.in.h:45
+msgid "Completed On"
+msgstr "Valmistui"
+
+#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
+#: ../mail/vfoldertypes.xml.in.h:46
+msgid "is set"
+msgstr "on asetettu"
+
+#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
+#: ../mail/vfoldertypes.xml.in.h:47
+msgid "is not set"
+msgstr "ei ole asetettu"
+
+#: ../mail/filtertypes.xml.in.h:48 ../mail/searchtypes.xml.in.h:50
+#: ../mail/vfoldertypes.xml.in.h:51
+msgid "Mailing list"
+msgstr "Postituslista"
+
+#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
+#: ../mail/vfoldertypes.xml.in.h:52
+msgid "Regex Match"
+msgstr "Regex-osuma"
+
+#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
+#: ../mail/vfoldertypes.xml.in.h:53
+msgid "Message Header"
+msgstr "Viestin otsakkeet"
+
+#: ../mail/filtertypes.xml.in.h:51
+msgid "Source Account"
+msgstr "Lähteen yhteystieto"
+
+#: ../mail/filtertypes.xml.in.h:52
+msgid "Pipe to Program"
+msgstr "Välitä putkessa ohjelmalle"
+
+#: ../mail/filtertypes.xml.in.h:53
+msgid "returns"
+msgstr "palauttaa"
+
+#: ../mail/filtertypes.xml.in.h:54
+msgid "does not return"
+msgstr "ei palauta"
+
+#: ../mail/filtertypes.xml.in.h:55
+msgid "returns greater than"
+msgstr "palauttaa enemmän kuin"
+
+#: ../mail/filtertypes.xml.in.h:56
+msgid "returns less than"
+msgstr "palauttaa vähemmän kuin"
+
+#: ../mail/filtertypes.xml.in.h:57
+msgid "Junk Test"
+msgstr "Roskapostitesti"
+
+#: ../mail/filtertypes.xml.in.h:58
+msgid "Message is Junk"
+msgstr "Viesti on roskapostia"
+
+#: ../mail/filtertypes.xml.in.h:59
+msgid "Message is not Junk"
+msgstr "Viesti ei ole roskapostia"
+
+#: ../mail/filtertypes.xml.in.h:60 ../mail/searchtypes.xml.in.h:53
+#: ../mail/vfoldertypes.xml.in.h:55
+msgid "Match All"
+msgstr "Kaikki käyvät"
+
+#: ../mail/filtertypes.xml.in.h:64
+msgid "Stop Processing"
+msgstr "Pysäytä käsittely"
+
+#: ../mail/filtertypes.xml.in.h:65
+msgid "Set Label"
+msgstr "Aseta merkintä"
+
+#: ../mail/filtertypes.xml.in.h:66
+msgid "Assign Color"
+msgstr "Aseta väri"
+
+#: ../mail/filtertypes.xml.in.h:67
+msgid "Unset Color"
+msgstr "Poista värin asetus"
+
+#: ../mail/filtertypes.xml.in.h:68
+msgid "Assign Score"
+msgstr "Aseta pistemäärä"
+
+#: ../mail/filtertypes.xml.in.h:69
+msgid "Adjust Score"
+msgstr "Muuta pisteytystä"
+
+#: ../mail/filtertypes.xml.in.h:70
+msgid "Set Status"
+msgstr "Aseta tila"
+
+#: ../mail/filtertypes.xml.in.h:71 ../mail/searchtypes.xml.in.h:37
+#: ../mail/vfoldertypes.xml.in.h:37
+msgid "Deleted"
+msgstr "Poistettu"
+
+#: ../mail/filtertypes.xml.in.h:72
+msgid "Unset Status"
+msgstr "Poista tilan asetus"
+
+#: ../mail/filtertypes.xml.in.h:73
+msgid "Beep"
+msgstr "Piippaa"
+
+#: ../mail/filtertypes.xml.in.h:74
+msgid "Play Sound"
+msgstr "Soita ääni"
+
+#: ../mail/filtertypes.xml.in.h:75
+msgid "Run Program"
+msgstr "Suorita ohjelma"
+
+#: ../mail/filtertypes.xml.in.h:76
+msgid "Forward to"
+msgstr "Välitä"
+
 #: ../mail/importers/elm-importer.c:173
 msgid "Importing Elm data"
 msgstr "Tuodaan tietoja Elmistä"
@@ -14433,9 +14416,8 @@ msgstr[1] ""
 "”%s”."
 
 #: ../mail/mail-config.ui.h:1
-#, fuzzy
 msgid "Set custom junk header"
-msgstr "Lisää oma roskapostiotsake"
+msgstr "Aseta oma roskapostiotsake"
 
 #: ../mail/mail-config.ui.h:4
 msgid ""
@@ -14468,9 +14450,8 @@ msgid "Always request rea_d receipt"
 msgstr "Pyydä aina vastaanoton _kuittausta"
 
 #: ../mail/mail-config.ui.h:11
-#, fuzzy
 msgid "Encode filenames in an _Outlook/GMail way"
-msgstr "Muotoile tiedostonimet Outlookin ja GMailin tapaan."
+msgstr "Mu_otoile tiedostonimet Outlookin ja GMailin tapaan"
 
 #: ../mail/mail-config.ui.h:12
 msgid "Ch_aracter encoding:"
@@ -14497,14 +14478,12 @@ msgid "_Keep signature above the original message on replying"
 msgstr "_Pidä allekirjoitus alkuperäisen viestin yllä vastattaessa"
 
 #: ../mail/mail-config.ui.h:18
-#, fuzzy
 msgid "Ig_nore Reply-To: for mailing lists"
-msgstr "Älä huomioi postituslistojen Reply-To-otsaketta"
+msgstr "Älä huo_mioi postituslistojen Reply-To-otsaketta"
 
 #: ../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"
+msgstr "_Ryhmävastaus menee vain sähköpostilistalle, jos mahdollista"
 
 #: ../mail/mail-config.ui.h:20
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
@@ -14608,10 +14587,9 @@ 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:47
-#, fuzzy
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr ""
-"Kysy vahvistus, kun sähköpostilista ohjaa yksityisen vastauksen takaisin "
+"K_ysy vahvistus, kun sähköpostilista ohjaa yksityisen vastauksen takaisin "
 "listalle"
 
 #. This is in the context of: Ask for confirmation before...
@@ -14627,30 +14605,24 @@ msgstr "Vahvistukset"
 
 #. 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"
+msgstr "Käytä kansioille"
 
 #: ../mail/mail-config.ui.h:55
 msgid "A_dd"
 msgstr "_Lisää"
 
 #: ../mail/mail-config.ui.h:57
-#| 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
-#, fuzzy
-#| msgid "Sender or Recipients"
 msgid "Use for Recipients"
-msgstr "Lähettäjä tai vastaanottajat"
+msgstr "Käytä vastaanottajille"
 
 #. 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:"
+#: ../mail/mail-config.ui.h:61 ../modules/mail/em-composer-prefs.c:874
 msgid "Account"
 msgstr "Tili"
 
@@ -14671,10 +14643,8 @@ msgid "_Folder override has precedence over Recipient override"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:65
-#, fuzzy
-#| msgid "Source Account"
 msgid "Send Account"
-msgstr "Lähteen yhteystieto"
+msgstr "Lähetystili"
 
 #: ../mail/mail-config.ui.h:71 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
@@ -14806,7 +14776,7 @@ msgid "Mail Headers Table"
 msgstr "Sähköposti otsikkotaulu"
 
 #: ../mail/mail-config.ui.h:105
-#: ../modules/addressbook/autocompletion-config.c:116
+#: ../modules/addressbook/autocompletion-config.c:117
 #: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Date/Time Format"
 msgstr "Päiväys/aika -muotoilu"
@@ -14816,10 +14786,8 @@ msgid "Check incoming _messages for junk"
 msgstr "Etsi roskapostia _saapuvasta viesteistä"
 
 #: ../mail/mail-config.ui.h:108
-#, fuzzy
-#| msgid "Delete junk messages on e_xit"
 msgid "_Delete junk messages"
-msgstr "Poista roskapostit _suljettaessa"
+msgstr "Po_ista roskapostit"
 
 #: ../mail/mail-config.ui.h:109
 msgid "Check cu_stom headers for junk"
@@ -15133,7 +15101,7 @@ msgstr ""
 "Haluatko varmasti poistaa kaikki poistetut viestit kaikista kansioista?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1555
 msgid "_Empty Trash"
 msgstr "_Tyhjennä roskakori"
 
@@ -15224,7 +15192,6 @@ msgid "Failed to expunge folder &quot;{0}&quot;."
 msgstr "Allekirjoitustiedostoa &quot;{0}&quot; ei voi lukea."
 
 #: ../mail/mail.error.xml.h:62
-#| msgid "Could not read signature file &quot;{0}&quot;."
 msgid "Failed to refresh folder &quot;{0}&quot;."
 msgstr "Kansion &quot;{0}&quot; päivittäminen epäonnistui."
 
@@ -15264,9 +15231,9 @@ msgid ""
 "Folder will delete the actual messages from the folder or folders in which "
 "they physically reside. Do you really want to delete these messages?"
 msgstr ""
-"Varoitus: viestin poisto hakunäkymästä poistaa varsinaisen viestin "
-"alkuperäisestä kansiosta, ei vain hakutuloksista.\n"
-"Haluatko varmasti poistaa viestin?"
+"Hakunäkymässä näkyvät viestit eivät ole kopioita. Viestin poisto "
+"hakunäkymästä poistaa varsinaisen viestin alkuperäisestä kansiosta tai "
+"kansioista, ei vain hakutuloksista. Haluatko varmasti poistaa viestit?"
 
 #: ../mail/mail.error.xml.h:71
 msgid "Cannot rename \"{0}\" to \"{1}\"."
@@ -15453,9 +15420,8 @@ msgid "_Exit Evolution"
 msgstr "_Poistu Evolutionista"
 
 #: ../mail/mail.error.xml.h:117
-#, fuzzy
 msgid "_Migrate Now"
-msgstr "Siirto"
+msgstr "_Siirrä nyt"
 
 #: ../mail/mail.error.xml.h:118
 msgid "Unable to read license file."
@@ -15623,9 +15589,8 @@ msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "Varmuuskopiotiedostoa &quot;{0}&quot; ei voi tallentaa."
 
 #: ../mail/mail.error.xml.h:157
-#, fuzzy
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
-msgstr "Perutaanko todella kansion \"%s\" tilaus?"
+msgstr "Kansion &quot;{0}&quot; tilauksen peruminen epäonnistui."
 
 #: ../mail/mail.error.xml.h:158
 msgid "Unable to retrieve message."
@@ -15656,9 +15621,8 @@ msgid "Failed to remove attachments from messages."
 msgstr "Liitteiden poisto viesteistä epäonnistui."
 
 #: ../mail/mail.error.xml.h:165
-#, fuzzy
 msgid "Failed to download messages for offline viewing."
-msgstr "_Nouda viestit yhteydettömään käyttöön"
+msgstr "Viestien nouto yhteydettömään käyttöön epäonnistui."
 
 #: ../mail/mail.error.xml.h:166
 msgid "Failed to save messages to disk."
@@ -15685,10 +15649,8 @@ msgid "The printer replied &quot;{0}&quot;."
 msgstr "Tulostimen vastaus: &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:171
-#, fuzzy
-#| msgid "Could not open destination"
 msgid "Could not perform this operation on {0}."
-msgstr "Kohdetta ei voi avata"
+msgstr "Toiminnon suorittaminen kohteella {0} epäonnistui."
 
 #: ../mail/mail.error.xml.h:172
 msgid "You must be working online to complete this operation."
@@ -15778,7 +15740,7 @@ msgstr "Korkeampi"
 msgid "Highest"
 msgstr "Korkein"
 
-#: ../mail/message-list.c:455 ../mail/message-list.c:5749
+#: ../mail/message-list.c:455 ../mail/message-list.c:5750
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
@@ -15814,11 +15776,10 @@ msgstr "Viestit"
 
 #. default follow-up flag name to use when clicked in the message list column
 #: ../mail/message-list.c:4706
-#, fuzzy
 msgid "Follow-up"
-msgstr "Lähetä edelleen"
+msgstr "Vastaus"
 
-#: ../mail/message-list.c:5687
+#: ../mail/message-list.c:5688
 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 "
@@ -15826,7 +15787,7 @@ msgid ""
 "by changing the query above."
 msgstr ""
 
-#: ../mail/message-list.c:5695
+#: ../mail/message-list.c:5696
 msgid "There are no messages in this folder."
 msgstr "Tässä kansiossa ei ole viestejä."
 
@@ -15860,54 +15821,62 @@ msgstr "Viestit"
 msgid "Subject - Trimmed"
 msgstr "Otsikko - rajattu"
 
-#: ../mail/searchtypes.xml.h:1
+#: ../mail/searchtypes.xml.in.h:23 ../mail/vfoldertypes.xml.in.h:23
+msgid "Any header"
+msgstr "Mikä tahansa otsake"
+
+#: ../mail/searchtypes.xml.in.h:54
 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:2002
+#: ../mail/searchtypes.xml.in.h:55
+#: ../modules/mail/e-mail-shell-view-actions.c:2038
 msgid "Recipients contain"
 msgstr "Vastaanottajat sisältää"
 
-#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1995
+#: ../mail/searchtypes.xml.in.h:56
+#: ../modules/mail/e-mail-shell-view-actions.c:2031
 msgid "Message contains"
 msgstr "Viesti sisältää"
 
-#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:2016
+#: ../mail/searchtypes.xml.in.h:57
+#: ../modules/mail/e-mail-shell-view-actions.c:2052
 msgid "Subject contains"
 msgstr "Otsikko sisältää"
 
-#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:2009
+#: ../mail/searchtypes.xml.in.h:58
+#: ../modules/mail/e-mail-shell-view-actions.c:2045
 msgid "Sender contains"
 msgstr "Lähettäjä sisältää"
 
-#: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1988
+#: ../mail/searchtypes.xml.in.h:59
+#: ../modules/mail/e-mail-shell-view-actions.c:2024
 msgid "Body contains"
 msgstr "Runko sisältää"
 
+#: ../mail/vfoldertypes.xml.in.h:54
+msgid "Message Location"
+msgstr "Viestin sijainti"
+
 #. 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:122
+#: ../modules/addressbook/autocompletion-config.c:123
 #: ../modules/mail/em-mailer-prefs.c:1212
 msgid "_Table column:"
 msgstr "_Taulukon sarake:"
 
-#: ../modules/addressbook/autocompletion-config.c:125
+#: ../modules/addressbook/autocompletion-config.c:126
 msgid "Address formatting"
 msgstr "Osoitteen muotoilu"
 
-#: ../modules/addressbook/autocompletion-config.c:128
+#: ../modules/addressbook/autocompletion-config.c:129
 msgid "_Format address according to standard of its destination country"
 msgstr ""
 
-#: ../modules/addressbook/autocompletion-config.c:136
+#: ../modules/addressbook/autocompletion-config.c:137
 msgid "Autocompletion"
 msgstr "Automaattinen täydennys"
 
-#: ../modules/addressbook/autocompletion-config.c:139
+#: ../modules/addressbook/autocompletion-config.c:140
 msgid "Always _show address of the autocompleted contact"
 msgstr "Näytä _aina automaattitäydennetyn yhteystiedon osoite"
 
@@ -16040,7 +16009,7 @@ msgstr "Näytä kartta, jossa on kaikki yhteystiedot valitusta osoitekirjasta"
 #: ../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
+#: ../modules/mail/e-mail-shell-view-actions.c:1646
 msgid "_Rename..."
 msgstr "_Nimeä uudestaan..."
 
@@ -16121,7 +16090,7 @@ msgstr "T_oiminnot"
 #: ../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
+#: ../modules/mail/e-mail-shell-view-actions.c:1811
 msgid "_Preview"
 msgstr "_Esikatselu"
 
@@ -16149,7 +16118,7 @@ msgstr "Näytä yhteystiedon esikatseluruutu"
 #: ../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
+#: ../modules/mail/e-mail-shell-view-actions.c:1941
 msgid "_Classic View"
 msgstr "_Perinteinen näkymä"
 
@@ -16160,7 +16129,7 @@ msgstr "Näytä yhteystiedon esikatselu yhteystietoluettelon alla"
 #: ../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
+#: ../modules/mail/e-mail-shell-view-actions.c:1948
 msgid "_Vertical View"
 msgstr "_Pystysuuntainen näkymä"
 
@@ -16179,7 +16148,7 @@ msgstr "Täsmäämättömät"
 #: ../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
+#: ../modules/mail/e-mail-shell-view-actions.c:2017
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Oma haku"
@@ -16476,7 +16445,7 @@ msgstr "Bogofilter"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
 msgid "Standard LDAP Port"
-msgstr "Standardi LDAP_portti"
+msgstr "Standardi LDAP-portti"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
@@ -16485,11 +16454,11 @@ msgstr "LDAP SSL:n yli (vanhennettu)"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
 msgid "Microsoft Global Catalog"
-msgstr ""
+msgstr "Microsoft Global Catalog"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:464
 msgid "Microsoft Global Catalog over SSL"
-msgstr ""
+msgstr "Microsoft Global Catalog SSL:n yli"
 
 #. Page 1
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:569
@@ -16535,19 +16504,14 @@ msgid "Method:"
 msgstr "Menetelmä:"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
-#, fuzzy
-#| msgid ""
-#| "This is the method Evolution will use to authenticate you.  Note that "
-#| "setting this to \"Email Address\" requires anonymous access to your LDAP "
-#| "server."
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
 "LDAP server."
 msgstr ""
 "Tämä on menetelmä, jota Evolution käyttää tunnistamiseesi. Huomaa, että "
-"asettaminen arvoon \"Sähköpostiosoite\" vaatii anonyymiä pääsyä LDAP-"
-"palvelimellesi."
+"asettaminen arvoon ”Käytetään sähköpostiosoitetta” vaatii anonyymiä pääsyä "
+"LDAP-palvelimellesi."
 
 #. Page 2
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:704
@@ -16564,30 +16528,22 @@ msgid "Search Base:"
 msgstr "Hakupohja:"
 
 #: ../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"
+msgstr "Etsi mahdolliset hakupohjat"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:769
 msgid "One Level"
-msgstr ""
+msgstr "Yksi taso"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:771
 msgid "Subtree"
-msgstr ""
+msgstr "Alipuu"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
 msgid "Search Scope:"
 msgstr "Hakualue:"
 
 #: ../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 "
-#| "down the directory tree. A search scope of \"sub\" will include all "
-#| "entries below your search base. A search scope of \"one\" will only "
-#| "include the entries one level beneath your base."
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree.  A search scope of \"Subtree\" will include all entries "
@@ -16595,9 +16551,8 @@ msgid ""
 "the entries one level beneath your search base."
 msgstr ""
 "Haun kattavuus määrittelee, kuinka syvälle hakemistopuuhun haluat hakusi "
-"menevän. Kattavuus \"Ali\" kattaa kaikki kentät hakupohjasi alla ja sen "
-"alipuissa, kun taas kattavuus \"Yksi\" kattaa kentät yhden tason "
-"hakupohjastasi alaspäin."
+"menevän. Kattavuus ”Alipuu” kattaa kaikki kentät hakupohjasi alla, kun taas "
+"kattavuus ”Yksi taso” kattaa kentät yhden tason hakupohjastasi alaspäin."
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:787
 msgid "Search Filter:"
@@ -16609,14 +16564,13 @@ msgstr "Noudetaan"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:820
 msgid "Limit:"
-msgstr ""
+msgstr "Rajoitus:"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
 msgid "contacts"
 msgstr "yhteystietoa"
 
 #: ../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 "Selaa kunnes raja tulee vastaan"
 
@@ -16627,36 +16581,31 @@ msgid "URL:"
 msgstr "URL:"
 
 #: ../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)"
+msgstr "Vältä IfMatch-komentoa (vaaditaan Apache-versiolle < 2.2.8)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:441
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:413
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP-virhe: %s"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:469
-#, fuzzy
-#| msgid "Could not parse PGP message: "
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:441
 msgid "Could not parse response"
-msgstr "PGP-viestiä ei voitu tulkita:"
+msgstr "Vastauksen jäsentäminen epäonnistui"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:478
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:450
 msgid "Empty response"
 msgstr "Tyhjä vastaus"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:486
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:458
 msgid "Unexpected reply from server"
 msgstr "Odottamaton vastaus palvelimelta"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1118
-#| msgid "Could not find any user calendar."
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1065
 msgid "Could not locate user's calendars"
 msgstr "Käyttäjän kalenterien paikallistaminen epäonnistui"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1342
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1291
 msgid "Path"
 msgstr "Polku"
 
@@ -16666,38 +16615,28 @@ msgid "Choose a Calendar"
 msgstr "Valitse kalenteri"
 
 #: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:266
-#, fuzzy
-#| msgid "New Memo List"
 msgid "Choose a Memo List"
-msgstr "Uusi muistilappulista"
+msgstr "Valitse muistilappulista"
 
 #: ../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:218
-#, fuzzy
-#| msgid "Web Calendars"
 msgid "Find Calendars"
-msgstr "Web-kalenterit"
+msgstr "Etsi kalentereita"
 
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:221
-#, fuzzy
-#| msgid "Memo List"
 msgid "Find Memo Lists"
-msgstr "Muistilappulista"
+msgstr "Etsi muistilappulistoja"
 
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:224
-#, fuzzy
-#| msgid "Task List"
 msgid "Find Task Lists"
-msgstr "Tehtävälista"
+msgstr "Etsi tehtävälistoja"
 
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:242
 msgid "Email:"
-msgstr "Sähköposti_"
+msgstr "Sähköposti:"
 
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:247
 msgid "Server handles meeting invitations"
@@ -16708,9 +16647,8 @@ msgid "Choose which address books to use."
 msgstr "Valitse käytettävät osoitekirjat."
 
 #: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:200
-#, fuzzy
 msgid "Use in Birthdays & Anniversaries calendar"
-msgstr "Syntymä- ja vuosipäivät"
+msgstr "Käytä Syntymä- ja vuosipäivät -kalenterissa"
 
 #: ../modules/cal-config-google/e-google-chooser-button.c:126
 msgid "Default User Calendar"
@@ -16719,7 +16657,7 @@ msgstr "Käyttäjän oletuskalenteri"
 #: ../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."
+msgstr "Anna käyttäjän ”%s” Google-salasana."
 
 #: ../modules/cal-config-google/e-google-chooser.c:531
 msgid "User declined to provide a password"
@@ -16752,31 +16690,28 @@ msgstr "Salli Evolutionin päivittää tiedosto"
 #. * 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"
+msgstr "default:mm"
 
 #. 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 ""
+msgstr "Fahrenheit (°F)"
 
 #. 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 ""
+msgstr "Celsius (°C)"
 
 #. Translators: This is the temperature in kelvin.
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:268
 msgid "Kelvin (K)"
-msgstr ""
+msgstr "Kelvin (K)"
 
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:270
-#| msgid "_Units:"
 msgid "Units:"
 msgstr "Yksiköt:"
 
@@ -16802,9 +16737,8 @@ msgid "I_mport to Tasks"
 msgstr "_Tuo tehtäviin"
 
 #: ../modules/calendar/e-calendar-preferences.c:516
-#, fuzzy
 msgid "Selected Calendars for Alarms"
-msgstr "Valitse kalenterit hälytyksille"
+msgstr "Valitut kalenterit hälytyksille"
 
 #: ../modules/calendar/e-calendar-preferences.c:924
 msgid "Ti_me and date:"
@@ -16906,7 +16840,7 @@ msgstr "_Ke"
 #. Thursday
 #: ../modules/calendar/e-calendar-preferences.ui.h:33
 msgid "T_hu"
-msgstr "_To"
+msgstr "T_o"
 
 #. Friday
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
@@ -16954,6 +16888,8 @@ msgstr "Näytä viikko_numerot"
 #: ../modules/calendar/e-calendar-preferences.ui.h:52
 msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr ""
+"Näytä toi_stuvat tapahtumat kursiivilla vasemmalla alhaalla olevassa "
+"kalenterissa"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "Sc_roll Month View by a week"
@@ -16980,9 +16916,8 @@ msgid "_Hide completed tasks after"
 msgstr "Piilota _poistetut viestit kun on kulunut"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:63
-#, fuzzy
 msgid "Display reminders in _notification area only"
-msgstr "Näytä hälytykset vain _ilmoitusalueella"
+msgstr "Näytä muistutukset vain _ilmoitusalueella"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
 #: ../modules/calendar/e-calendar-preferences.ui.h:65
@@ -16992,7 +16927,7 @@ msgstr "_Näytä muistutus"
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
 #: ../modules/calendar/e-calendar-preferences.ui.h:67
 msgid "before every appointment"
-msgstr "ennen tapaamista"
+msgstr "ennen joka tapaamista"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
 #: ../modules/calendar/e-calendar-preferences.ui.h:69
@@ -17002,7 +16937,7 @@ msgstr "Näytä _muistutus"
 #. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
 #: ../modules/calendar/e-calendar-preferences.ui.h:71
 msgid "before every anniversary/birthday"
-msgstr "ennen joka vuosipäivää ja syntymäpäivää"
+msgstr "ennen joka vuosi- ja syntymäpäivää"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:72
 #, fuzzy
@@ -17023,9 +16958,8 @@ msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr "%u ja %d korvataan sähköpostiosoitteen käyttäjällä ja aluenimellä."
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:77
-#, fuzzy
 msgid "Publishing Information"
-msgstr "Julkaisupaikka"
+msgstr "Julkaisutiedot"
 
 #: ../modules/calendar/e-cal-shell-backend.c:312
 #: ../modules/calendar/e-cal-shell-view-actions.c:190
@@ -17185,27 +17119,22 @@ msgid "Rename the selected calendar"
 msgstr "Nimeä valittu kalenteri uudestaan"
 
 #: ../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:1429
-#| msgid "Find the next occurrence of the phrase"
 msgid "Find next occurrence of the current search string"
 msgstr "Etsi hakuehdon seuraava esiintymä"
 
 #: ../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:1436
-#| msgid "Find the previous occurrence of the phrase"
 msgid "Find previous occurrence of the current search string"
 msgstr "Etsi hakuehdon edellinen esiintymä"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1441
-#| msgid "Stop _running search"
 msgid "Stop _Running Search"
 msgstr "Pysäytä _meneillään oleva haku"
 
@@ -17385,7 +17314,6 @@ msgstr "Yhteenveto sisältää"
 #: ../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..."
 
@@ -18251,7 +18179,6 @@ msgid "Acce_pt"
 msgstr "H_yväksy"
 
 #: ../modules/itip-formatter/itip-view.c:1051
-#| msgid "_Send Information"
 msgid "Send _Information"
 msgstr "_Lähetä tiedot"
 
@@ -18572,16 +18499,12 @@ msgstr "Sinun on mahdollisesti sallittava IMAP-käyttö"
 
 #: ../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"
+msgstr "Po_stihakemisto:"
 
 #: ../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"
+msgstr "Valitse MH-postihakemisto"
 
 #: ../modules/mail-config/e-mail-config-local-accounts.c:268
 msgid "Local Delivery _File:"
@@ -18624,7 +18547,7 @@ msgid "Choose a mbox spool directory"
 msgstr "Valitse palautettava tiedosto"
 
 #: ../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-sendmail-backend.c:54
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:79
 #: ../modules/plugin-manager/evolution-plugin-manager.c:158
 msgid "Configuration"
@@ -18661,38 +18584,35 @@ msgstr "STARTTLS yhteyden muodostamisen jälkeen"
 msgid "SSL on a dedicated port"
 msgstr "SSL tietyssä portissa"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:69
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
 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:73
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:74
 msgid "_Custom binary:"
 msgstr "_Omavalintainen binääri:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:90
-#, fuzzy
-#| msgid "Use custom fonts"
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
 msgid "U_se custom arguments"
-msgstr "Käytä omia kirjasimia"
+msgstr "Kä_ytä omavalintaisia komentoriviargumentteja"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:94
-#, fuzzy
-#| msgid "_Arguments:"
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
 msgid "Cus_tom arguments:"
-msgstr "_Argumentit:"
+msgstr "_Omavalintaiset argumentit:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:112
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
 msgid ""
 "Default arguments are '-i -f %F -- %R', where\n"
 "   %F - stands for the From address\n"
 "   %R - stands for the recipient addresses"
 msgstr ""
+"Oletusargumentit ovat ”-i -f %F -- %R”, missä\n"
+"   %F - lähettäjän osoite\n"
+"   %R - vastaanottajien osoitteet"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:127
-#, fuzzy
-#| msgid "Start in offline mode"
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
 msgid "Send mail also when in offline _mode"
-msgstr "Aloita yhteydettömässä tilassa"
+msgstr "Lähetä sähköposti myös yhteydettömässä tilassa"
 
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:122
 msgid "Ser_ver requires authentication"
@@ -18717,361 +18637,360 @@ msgid_plural "%d attached messages"
 msgstr[0] "%d liitetty viesti"
 msgstr[1] "%d liitettyä viestiä"
 
-#: ../modules/mail/e-mail-shell-backend.c:314
+#: ../modules/mail/e-mail-shell-backend.c:348
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Sähköpostiviesti"
 
-#: ../modules/mail/e-mail-shell-backend.c:316
+#: ../modules/mail/e-mail-shell-backend.c:350
 msgid "Compose a new mail message"
 msgstr "Kirjoita uusi viesti"
 
-#: ../modules/mail/e-mail-shell-backend.c:324
+#: ../modules/mail/e-mail-shell-backend.c:358
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "_Sähköpostitili"
 
-#: ../modules/mail/e-mail-shell-backend.c:326
+#: ../modules/mail/e-mail-shell-backend.c:360
 msgid "Create a new mail account"
 msgstr "Luo uusi sähköpostitili"
 
-#: ../modules/mail/e-mail-shell-backend.c:331
+#: ../modules/mail/e-mail-shell-backend.c:365
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Sähköposti_kansio"
 
-#: ../modules/mail/e-mail-shell-backend.c:333
+#: ../modules/mail/e-mail-shell-backend.c:367
 msgid "Create a new mail folder"
 msgstr "Luo uusi sähköpostikansio"
 
-#: ../modules/mail/e-mail-shell-backend.c:644
+#: ../modules/mail/e-mail-shell-backend.c:678
 msgid "Mail Accounts"
 msgstr "Sähköpostitilit"
 
-#: ../modules/mail/e-mail-shell-backend.c:653
+#: ../modules/mail/e-mail-shell-backend.c:687
 msgid "Mail Preferences"
 msgstr "Sähköpostin asetukset"
 
-#: ../modules/mail/e-mail-shell-backend.c:662
+#: ../modules/mail/e-mail-shell-backend.c:696
 msgid "Composer Preferences"
 msgstr "Muokkaimen asetukset"
 
-#: ../modules/mail/e-mail-shell-backend.c:672
+#: ../modules/mail/e-mail-shell-backend.c:706
 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:964
+#: ../modules/mail/e-mail-shell-backend.c:998
 msgctxt "label"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:670
+#: ../modules/mail/e-mail-shell-view-actions.c:692
 msgid "Marking messages as read..."
 msgstr "Merkitään viestejä luetuiksi..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1548
 msgid "_Disable Account"
 msgstr "_Poista tili käytöstä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1514
+#: ../modules/mail/e-mail-shell-view-actions.c:1550
 msgid "Disable this account"
 msgstr "Poista tämä tili käytöstä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../modules/mail/e-mail-shell-view-actions.c:1557
 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:1528
+#: ../modules/mail/e-mail-shell-view-actions.c:1564
 msgid "Edit properties of this account"
 msgstr "Muokkaa tilin ominaisuuksia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1535
+#: ../modules/mail/e-mail-shell-view-actions.c:1571
 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:1540
+#: ../modules/mail/e-mail-shell-view-actions.c:1576
 msgid "_Download Messages for Offline Usage"
 msgstr "_Nouda viestit yhteydettömään käyttöön"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1542
+#: ../modules/mail/e-mail-shell-view-actions.c:1578
 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:1547
+#: ../modules/mail/e-mail-shell-view-actions.c:1583
 msgid "Fl_ush Outbox"
 msgstr "T_yhjennä lähtevien kansio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1554
+#: ../modules/mail/e-mail-shell-view-actions.c:1590
 msgid "_Copy Folder To..."
 msgstr "_Kopioi kansio..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1556
+#: ../modules/mail/e-mail-shell-view-actions.c:1592
 msgid "Copy the selected folder into another folder"
 msgstr "Kopioi valittu kansio toiseen kansioon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1563
+#: ../modules/mail/e-mail-shell-view-actions.c:1599
 msgid "Permanently remove this folder"
 msgstr "Poista tämä kansio pysyvästi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1568
+#: ../modules/mail/e-mail-shell-view-actions.c:1604
 msgid "E_xpunge"
 msgstr "_Poista poistetut"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1570
+#: ../modules/mail/e-mail-shell-view-actions.c:1606
 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:1575
-#: ../modules/mail/e-mail-shell-view-actions.c:1675
+#: ../modules/mail/e-mail-shell-view-actions.c:1611
+#: ../modules/mail/e-mail-shell-view-actions.c:1711
 msgid "Mar_k All Messages as Read"
 msgstr "Mer_kitse kaikki viestit luetuiksi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1577
-#: ../modules/mail/e-mail-shell-view-actions.c:1677
+#: ../modules/mail/e-mail-shell-view-actions.c:1613
+#: ../modules/mail/e-mail-shell-view-actions.c:1713
 msgid "Mark all messages in the folder as read"
 msgstr "Merkitse kaikki kansion viestit luetuksi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1582
+#: ../modules/mail/e-mail-shell-view-actions.c:1618
 msgid "_Move Folder To..."
 msgstr "_Siirrä kansio..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1584
+#: ../modules/mail/e-mail-shell-view-actions.c:1620
 msgid "Move the selected folder into another folder"
 msgstr "Siirrä valittu kansio toiseen kansioon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1589
+#: ../modules/mail/e-mail-shell-view-actions.c:1625
 msgid "_New..."
 msgstr "_Uusi..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1591
+#: ../modules/mail/e-mail-shell-view-actions.c:1627
 msgid "Create a new folder for storing mail"
 msgstr "Luo uusi kansio viestien tallentamiseen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1598
+#: ../modules/mail/e-mail-shell-view-actions.c:1634
 msgid "Change the properties of this folder"
 msgstr "Vaihda tämän kansion ominaisuuksia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1605
+#: ../modules/mail/e-mail-shell-view-actions.c:1641
 msgid "Refresh the folder"
 msgstr "Virkistä kansio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1612
+#: ../modules/mail/e-mail-shell-view-actions.c:1648
 msgid "Change the name of this folder"
 msgstr "Muuta tämän kansion nimeä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1617
+#: ../modules/mail/e-mail-shell-view-actions.c:1653
 msgid "Select Message _Thread"
 msgstr "Valitse viesti_säie"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1619
+#: ../modules/mail/e-mail-shell-view-actions.c:1655
 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:1624
+#: ../modules/mail/e-mail-shell-view-actions.c:1660
 msgid "Select Message S_ubthread"
 msgstr "Valitse viesti_säie"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1626
+#: ../modules/mail/e-mail-shell-view-actions.c:1662
 msgid "Select all replies to the currently selected message"
 msgstr "Valitse kaikki vastaukset nyt valittuun viestiin"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../modules/mail/e-mail-shell-view-actions.c:1674
 msgid "Empty _Trash"
 msgstr "_Tyhjennä roskakori"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1640
+#: ../modules/mail/e-mail-shell-view-actions.c:1676
 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:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1681
 msgid "_New Label"
 msgstr "_uusi merkintä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1654
+#: ../modules/mail/e-mail-shell-view-actions.c:1690
 msgid "N_one"
 msgstr "Ei _mitään"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1668
+#: ../modules/mail/e-mail-shell-view-actions.c:1704
 msgid "_Manage Subscriptions"
 msgstr "_Hallitse tilauksia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1670
-#: ../modules/mail/e-mail-shell-view-actions.c:1754
+#: ../modules/mail/e-mail-shell-view-actions.c:1706
+#: ../modules/mail/e-mail-shell-view-actions.c:1790
 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:1682
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/mail/e-mail-shell-view-actions.c:1718
+#: ../modules/mail/e-mail-shell-view-actions.c:1739
 msgid "Send / _Receive"
 msgstr "Lähetä ja _vastaanota"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1684
+#: ../modules/mail/e-mail-shell-view-actions.c:1720
 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:1689
+#: ../modules/mail/e-mail-shell-view-actions.c:1725
 msgid "R_eceive All"
 msgstr "_Vastaanota kaikki"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1691
+#: ../modules/mail/e-mail-shell-view-actions.c:1727
 msgid "Receive new items from all accounts"
 msgstr "Vastaanota kohteita kaikilta tileiltä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1732
 msgid "_Send All"
 msgstr "_Lähetä kaikki"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1698
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:1734
 msgid "Send queued items in all accounts"
-msgstr "Lähetä jonossa olevat viestit ja nouda uudet viestit"
+msgstr "Lähetä kaikkien tilien jonossa olevat viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1726
+#: ../modules/mail/e-mail-shell-view-actions.c:1762
 msgid "Cancel the current mail operation"
 msgstr "Peru nykyinen postioperaatio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
+#: ../modules/mail/e-mail-shell-view-actions.c:1767
 msgid "Collapse All _Threads"
 msgstr "Sulje kaikki _säikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1733
+#: ../modules/mail/e-mail-shell-view-actions.c:1769
 msgid "Collapse all message threads"
 msgstr "Sulje kaikki viestisäikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1738
+#: ../modules/mail/e-mail-shell-view-actions.c:1774
 msgid "E_xpand All Threads"
 msgstr "_Laajenna kaikki säikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1740
+#: ../modules/mail/e-mail-shell-view-actions.c:1776
 msgid "Expand all message threads"
 msgstr "Laajenna kaikki viestisäikeet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1745
+#: ../modules/mail/e-mail-shell-view-actions.c:1781
 msgid "_Message Filters"
 msgstr "Viesti_suodattimet"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1747
+#: ../modules/mail/e-mail-shell-view-actions.c:1783
 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:1752
+#: ../modules/mail/e-mail-shell-view-actions.c:1788
 msgid "_Subscriptions..."
 msgstr "_Tilaukset..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1761
+#: ../modules/mail/e-mail-shell-view-actions.c:1797
 msgid "F_older"
 msgstr "_Kansio"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1804
 msgid "_Label"
 msgstr "_Merkintä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1785
+#: ../modules/mail/e-mail-shell-view-actions.c:1821
 msgid "C_reate Search Folder From Search..."
 msgstr "Luo _hakunäkymä haun perusteella..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1792
+#: ../modules/mail/e-mail-shell-view-actions.c:1828
 msgid "Search F_olders"
 msgstr "Etsi _kansioita"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1794
+#: ../modules/mail/e-mail-shell-view-actions.c:1830
 msgid "Create or edit search folder definitions"
 msgstr "Luo tai muokkaa hakunäkymien määrittelyjä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1833
+#: ../modules/mail/e-mail-shell-view-actions.c:1869
 msgid "_New Folder..."
 msgstr "_Uusi kansio..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1861
+#: ../modules/mail/e-mail-shell-view-actions.c:1897
 msgid "Show Message _Preview"
 msgstr "Näytä viestin _esikatselu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1863
+#: ../modules/mail/e-mail-shell-view-actions.c:1899
 msgid "Show message preview pane"
 msgstr "Näytä viestin esikatseluikkuna"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1869
+#: ../modules/mail/e-mail-shell-view-actions.c:1905
 msgid "Show _Deleted Messages"
 msgstr "Näytä _poistetut viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1871
+#: ../modules/mail/e-mail-shell-view-actions.c:1907
 msgid "Show deleted messages with a line through them"
 msgstr "Näytä poistetut viestit yliviivattuna"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1877
+#: ../modules/mail/e-mail-shell-view-actions.c:1913
 msgid "_Group By Threads"
 msgstr "Ryhmittele _säikeittäin"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1879
+#: ../modules/mail/e-mail-shell-view-actions.c:1915
 msgid "Threaded message list"
 msgstr "Säikeistetty viestiluettelo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1885
+#: ../modules/mail/e-mail-shell-view-actions.c:1921
 msgid "_Unmatched Folder Enabled"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1887
+#: ../modules/mail/e-mail-shell-view-actions.c:1923
 #, 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:1907
+#: ../modules/mail/e-mail-shell-view-actions.c:1943
 msgid "Show message preview below the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon alla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1914
+#: ../modules/mail/e-mail-shell-view-actions.c:1950
 msgid "Show message preview alongside the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon vieressä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1922
+#: ../modules/mail/e-mail-shell-view-actions.c:1958
 msgid "All Messages"
 msgstr "Kaikki viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1929
+#: ../modules/mail/e-mail-shell-view-actions.c:1965
 msgid "Important Messages"
 msgstr "Tärkeät viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1936
+#: ../modules/mail/e-mail-shell-view-actions.c:1972
 msgid "Last 5 Days' Messages"
 msgstr "Viimeisten viiden päivän viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1943
+#: ../modules/mail/e-mail-shell-view-actions.c:1979
 msgid "Messages Not Junk"
 msgstr "Viestit, jotka eivät ole roskapostia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1950
+#: ../modules/mail/e-mail-shell-view-actions.c:1986
 msgid "Messages with Attachments"
 msgstr "Viestit, joissa on liitteitä"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1957
+#: ../modules/mail/e-mail-shell-view-actions.c:1993
 msgid "No Label"
 msgstr "Ei merkintää"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1964
+#: ../modules/mail/e-mail-shell-view-actions.c:2000
 msgid "Read Messages"
 msgstr "Luetut viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1971
+#: ../modules/mail/e-mail-shell-view-actions.c:2007
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2023
+#: ../modules/mail/e-mail-shell-view-actions.c:2059
 msgid "Subject or Addresses contain"
 msgstr "Aihe tai osoitteet sisältävät"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2033
+#: ../modules/mail/e-mail-shell-view-actions.c:2069
 msgid "All Accounts"
 msgstr "Kaikki tilit"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2040
+#: ../modules/mail/e-mail-shell-view-actions.c:2076
 msgid "Current Account"
 msgstr "Valittu tili"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2047
+#: ../modules/mail/e-mail-shell-view-actions.c:2083
 msgid "Current Folder"
 msgstr "Valittu kansio"
 
@@ -19149,22 +19068,19 @@ msgstr "Roskakori"
 msgid "Send / Receive"
 msgstr "Lähetä / Vastaanota"
 
-#: ../modules/mail/em-composer-prefs.c:443
-#| msgid "Select Folder"
+#: ../modules/mail/em-composer-prefs.c:445
 msgid "Select Folder to Add"
 msgstr "Valitse lisättävä kansio"
 
-#: ../modules/mail/em-composer-prefs.c:888
-#| msgid "F_older"
+#: ../modules/mail/em-composer-prefs.c:892
 msgid "Folder"
 msgstr "Kansio"
 
-#: ../modules/mail/em-composer-prefs.c:924
-#| msgid "Recipients"
+#: ../modules/mail/em-composer-prefs.c:928
 msgid "Recipient"
 msgstr "Vastaanottaja"
 
-#: ../modules/mail/em-composer-prefs.c:1195
+#: ../modules/mail/em-composer-prefs.c:1199
 msgid "Language(s)"
 msgstr "Kielet"
 
@@ -19218,14 +19134,14 @@ 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:374
-#, fuzzy, c-format
+#, c-format
 msgid "Delivery Notification for \"%s\""
-msgstr "Toimituskuittaus viestille: ”%s”"
+msgstr "Toimituskuittaus viestille ”%s”"
 
 #: ../modules/mdn/evolution-mdn.c:539
-#, fuzzy, c-format
+#, c-format
 msgid "Send a read receipt to '%s'"
-msgstr "Läh_etä viestin kuittaus:"
+msgstr "Läh_etä viestin kuittaus vastaanottajalle ”%s”"
 
 #. name doesn't matter
 #: ../modules/mdn/evolution-mdn.c:544
@@ -19249,7 +19165,6 @@ msgid "Click 'Work Online' to return to online mode."
 msgstr ""
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
-#, fuzzy
 msgid "Evolution is currently offline due to a network outage."
 msgstr "Evolution ei ole verkossa, koska verkko ei ole käytettävissä."
 
@@ -19258,7 +19173,7 @@ msgstr "Evolution ei ole verkossa, koska verkko ei ole käytettävissä."
 msgid ""
 "Evolution will return to online mode once a network connection is "
 "established."
-msgstr "Evolution ei ole verkossa, koska verkko ei ole käytettävissä."
+msgstr "Evolution palaa verkkoon, kun verkkoyhteys on muodostettu."
 
 #: ../modules/plugin-manager/evolution-plugin-manager.c:67
 msgid "Author(s)"
@@ -19295,20 +19210,16 @@ msgid "Display plain text version"
 msgstr "Näytä raakatekstiversio"
 
 #: ../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"
+msgstr "Näytä multipart/alternative-viestin raakatekstiversio"
 
 #: ../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:149
-#, fuzzy
-#| msgid "Display the previous important message"
 msgid "Display HTML version of multipart/alternative message"
-msgstr "Näytä edellinen tärkeä viesti"
+msgstr "Näytä multipart/alternative-viestin HTML-versio"
 
 #: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:77
 #: ../modules/prefer-plain/plugin/config-ui.c:43
@@ -19401,9 +19312,8 @@ msgid "I_nclude remote tests"
 msgstr "_Lisää myös etätestit"
 
 #: ../modules/spamassassin/evolution-spamassassin.c:384
-#, fuzzy
 msgid "This will make SpamAssassin more reliable, but slower."
-msgstr "Tämä tekee Spamassassinista luotettavamman, mutta hitaamman"
+msgstr "Tämä tekee SpamAssassinista luotettavamman, mutta hitaamman."
 
 #: ../modules/spamassassin/evolution-spamassassin.c:558
 msgid "SpamAssassin"
@@ -19448,11 +19358,11 @@ msgstr "_Muotoile..."
 msgid "_Other languages"
 msgstr "_Muut kielet"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:481
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:482
 msgid "Text Highlight"
 msgstr "Tekstin korostus"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:482
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:483
 msgid "Syntax highlighting of mail parts"
 msgstr ""
 
@@ -19698,19 +19608,16 @@ msgstr[0] "Löytyi %d muu yhteystieto."
 msgstr[1] "Löytyi %d muuta yhteystietoa."
 
 #: ../modules/vcard-inline/e-mail-formatter-vcard.c:215
-#, fuzzy
 msgid "Addressbook Contact"
-msgstr "Osoitekirjan ominaisuudet"
+msgstr "Osoitekirjan yhteystieto"
 
 #: ../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:95
-#, fuzzy
-#| msgid "Evolution Website"
 msgid "Evolution Web Inspector"
-msgstr "Evolutionin www-sivut"
+msgstr "Evolutionin www-tarkastaja"
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:122
 msgid "_Do not show this message again."
@@ -19749,35 +19656,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:636 ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:694 ../plugins/bbdb/bbdb.c:703
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automaattiset yhteystiedot"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:718
 msgid "Create _address book entries when sending mails"
 msgstr "Lisää lähettäjä _osoitekirjaan lähetettäessä viestejä"
 
-#: ../plugins/bbdb/bbdb.c:667
+#: ../plugins/bbdb/bbdb.c:725
 msgid "Select Address book for Automatic Contacts"
 msgstr "Valitse osoitekirja automaattisille yhteystiedoille"
 
-#: ../plugins/bbdb/bbdb.c:684
+#: ../plugins/bbdb/bbdb.c:742
 msgid "Instant Messaging Contacts"
 msgstr "Pikaviestinnän yhteystiedot"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:757
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "_Yhdistä yhteystiedot ja kuvat Pidginin tuttavalistasta"
 
-#: ../plugins/bbdb/bbdb.c:706
+#: ../plugins/bbdb/bbdb.c:764
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Valitse osoitekirja Pigdinin tuttavalistalle"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:719
+#: ../plugins/bbdb/bbdb.c:777
 msgid "Synchronize with _buddy list now"
 msgstr "Yhdistä tiedot _tuttavalistasta"
 
@@ -19894,13 +19801,12 @@ msgid "Command to be executed to launch the editor: "
 msgstr "Ulkoisen muokkaimen käynnistyskomento: "
 
 #: ../plugins/external-editor/external-editor.c:114
-#, fuzzy
 msgid ""
 "For XEmacs use \"xemacs\"\n"
 "For Vim use \"gvim -f\""
 msgstr ""
-"Emacsia varten käytä arvoa \"xemacs\"\n"
-"VI:tä varten käytä arvoa \"gvim -f\""
+"XEmacsia varten käytä arvoa ”xemacs”\n"
+"Vimiä varten käytä arvoa ”gvim -f”"
 
 #: ../plugins/external-editor/external-editor.c:124
 msgid "_Automatically launch when a new mail is edited"
@@ -20003,14 +19909,6 @@ msgstr "Tiedosto ei ole kuvatiedosto"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "Valittu tiedosto ei näytä kelvolliselta .png-kuvalta. Virhe: {0}"
 
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
-msgid "Inline Image"
-msgstr "Sisäkkäiset kuvat"
-
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
-msgid "View image attachments directly in mail messages."
-msgstr "Näytä kuvaliitteet suoraan sähköpostiviesteissä."
-
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:364
 msgid "Get List _Archive"
 msgstr "Nouda listan _arkisto"
@@ -20286,9 +20184,8 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../plugins/mail-to-task/mail-to-task.c:674
-#, fuzzy
 msgid "Do you wish to continue converting remaining mails?"
-msgstr "Haluatko ylikirjoittaa?"
+msgstr "Haluatko jatkaa jäljellä olevien viestien muuntamista?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:750
 msgid "[No Summary]"
@@ -20317,28 +20214,20 @@ msgstr ""
 "Valitse jokin toinen kalenteri."
 
 #: ../plugins/mail-to-task/mail-to-task.c:859
-#, fuzzy
-#| msgid ""
-#| "Selected source is read only, thus cannot create task there. Select other "
-#| "source, please."
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
 msgstr ""
-"Valittu lähde on vain luettavissa, joten et voi luoda siihen tehtäviä. "
-"Valitse joku toinen lähde."
+"Valittu tehtävälista on vain luettavissa, joten et voi luoda siihen "
+"tehtäviä. Valitse jokin toinen tehtävälista."
 
 #: ../plugins/mail-to-task/mail-to-task.c:862
-#, fuzzy
-#| msgid ""
-#| "Selected source is read only, thus cannot create memo there. Select other "
-#| "source, please."
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
 msgstr ""
-"Valittu lähde on vain luettavissa, joten et voi luoda siihen muistilappuja. "
-"Valitse joku toinen lähde."
+"Valittu muistilappulista on vain luettavissa, joten et voi luoda siihen "
+"muistilappuja. Valitse jokin toinen muistilappulista."
 
 #: ../plugins/mail-to-task/mail-to-task.c:1261
 msgid "Create an _Appointment"
@@ -20561,9 +20450,9 @@ msgstr "Julkaisupaikka"
 
 #: ../plugins/publish-calendar/publish-format-fb.c:99
 #: ../plugins/publish-calendar/publish-format-ical.c:102
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid source UID '%s'"
-msgstr "Virheellinen kansio: ”%s”"
+msgstr "Virheellinen lähde-UID ”%s”"
 
 #: ../plugins/publish-calendar/url-editor-dialog.c:544
 msgid "New Location"
@@ -20686,7 +20575,6 @@ msgid "Select destination file"
 msgstr "Valitse kohdetiedosto"
 
 #: ../plugins/save-calendar/save-calendar.c:190
-#| msgid "_Save"
 msgid "_Save As"
 msgstr "_Tallenna nimellä"
 
@@ -20749,19 +20637,19 @@ 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:937
+#: ../shell/e-shell-searchbar.c:930
 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:962
+#: ../shell/e-shell-searchbar.c:955
 msgid "Sear_ch:"
 msgstr "_Etsi:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1030
+#: ../shell/e-shell-searchbar.c:1023
 msgid "i_n"
 msgstr "lä_hteestä"
 
@@ -20783,11 +20671,12 @@ msgstr "Tallennetaan käyttöliittymän tilaa"
 #: ../shell/e-shell-window-actions.c:73
 msgid "translator-credits"
 msgstr ""
+"Juhani Numminen, 2014\n"
+"Ville-Pekka Vainio, 2010\n"
 "Ilkka Tuohela, 2002-2009\n"
 "Timo Jyrinki, 2008\n"
 "Sami Pesonen, 2001-2003\n"
 "Jarkko Ranta, 2000-2001\n"
-"Ville-Pekka Vainio, 2010\n"
 "\n"
 "http://gnome.fi/\n"
 "\n"
@@ -20876,7 +20765,6 @@ msgid "Show Evolution's shortcut keys"
 msgstr "Näytä Evolutionin pikanäppäimet"
 
 #: ../shell/e-shell-window-actions.c:993
-#| msgid "Quit"
 msgid "_Quit"
 msgstr "_Lopeta"
 
@@ -21090,7 +20978,7 @@ msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:182
+#: ../shell/main.c:183
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -21126,7 +21014,7 @@ msgstr ""
 "Toivomme että nautit kovan työmme tuloksista, ja odotamme innolla\n"
 "osallistumistasi kehitystyöhön!\n"
 
-#: ../shell/main.c:206
+#: ../shell/main.c:207
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -21134,13 +21022,13 @@ msgstr ""
 "Kiitos\n"
 "Evolution-tiimi\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:213
 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:301
+#: ../shell/main.c:302
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -21148,40 +21036,39 @@ 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:305
+#: ../shell/main.c:306
 msgid "Apply the given geometry to the main window"
 msgstr "Käytä annettua muotoa pääikkunalle"
 
-#: ../shell/main.c:309
+#: ../shell/main.c:310
 msgid "Start in online mode"
 msgstr "Käynnistä verkkoyhteydet auki"
 
-#: ../shell/main.c:311
+#: ../shell/main.c:312
 msgid "Ignore network availability"
 msgstr "Älä kiinnitä huomiota, onko verkko käytettävissä vai ei"
 
-#: ../shell/main.c:314
+#: ../shell/main.c:315
 msgid "Forcibly shut down Evolution"
 msgstr "Sammuta Evolution väkisin"
 
-#: ../shell/main.c:317
+#: ../shell/main.c:318
 msgid "Disable loading of any plugins."
 msgstr "Älä lataa mitään lisäosia."
 
-#: ../shell/main.c:319
+#: ../shell/main.c:320
 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:323
-#, fuzzy
+#: ../shell/main.c:324
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Tuo argumentteina annettavat URI-osoitteet tai tiedostot."
 
-#: ../shell/main.c:325
+#: ../shell/main.c:326
 msgid "Request a running Evolution process to quit"
 msgstr "Pyydä käynnissä olevaa Evolution-prosessia lopettamaan"
 
-#: ../shell/main.c:402
+#: ../shell/main.c:403
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
@@ -21190,27 +21077,27 @@ msgstr ""
 "Evolutionin käynnistäminen epäonnistui. Toinen Evolution-istunto saattaa "
 "olla reagoimaton. Järjestelmävirhe: %s"
 
-#: ../shell/main.c:496 ../shell/main.c:501
+#: ../shell/main.c:497 ../shell/main.c:502
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution, henkilökohtaisten tietojen hallinta sekä sähköposti"
 
-#: ../shell/main.c:568
-#, fuzzy, c-format
+#: ../shell/main.c:569
+#, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
 msgstr ""
 "%s: --online ja --offline eivät voi olla käytössä samaan aikaan.\n"
-" Käytä %s '--help' saadaksesi lisätietoja.\n"
+"  Suorita ”%s --help” saadaksesi lisätietoja.\n"
 
-#: ../shell/main.c:574
-#, fuzzy, c-format
+#: ../shell/main.c:575
+#, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
 msgstr ""
-"%s: --online ja --offline eivät voi olla käytössä samaan aikaan.\n"
-" Käytä %s '--help' saadaksesi lisätietoja.\n"
+"%s: --force-online ja --offline eivät voi olla käytössä samaan aikaan.\n"
+"  Suorita ”%s --help” saadaksesi lisätietoja.\n"
 
 #: ../shell/shell.error.xml.h:2
 msgid "Upgrade from previous version failed:"
@@ -21266,15 +21153,13 @@ msgstr "Varmenteen nimi"
 
 #: ../smime/gui/certificate-manager.c:81
 #: ../smime/gui/certificate-manager.c:101
-#, fuzzy
 msgid "Issued To Organization"
-msgstr "Organi_saatio:"
+msgstr "Myönnetty rganisaatiolle"
 
 #: ../smime/gui/certificate-manager.c:82
 #: ../smime/gui/certificate-manager.c:102
-#, fuzzy
 msgid "Issued To Organizational Unit"
-msgstr "Organisaatioyksikkö (OU)"
+msgstr "Myönnetty organisaatioyksikölle"
 
 #: ../smime/gui/certificate-manager.c:83
 #: ../smime/gui/certificate-manager.c:103
@@ -21297,16 +21182,14 @@ msgstr "Myöntäjä"
 #: ../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:"
+msgstr "Myöntäjäorganisaatio"
 
 #: ../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)"
+msgstr "Myöntäjäorganisaatioyksikkö"
 
 #: ../smime/gui/certificate-manager.c:88
 #: ../smime/gui/certificate-manager.c:108
@@ -21380,15 +21263,14 @@ msgstr ""
 "automaattisesti luota tähän varmenteeseen, jollei tässä muuten mainita"
 
 #: ../smime/gui/component.c:55
-#, fuzzy, c-format
-#| msgid "Enter Google password for user '%s'."
+#, c-format
 msgid "Enter the password for '%s', token '%s'"
-msgstr "Anna käyttäjän '%s' Google-salasana."
+msgstr "Anna käyttäjän ”%s”, poletti ”%s”, salasana."
 
 #: ../smime/gui/component.c:57
 #, c-format
 msgid "Enter the password for '%s'"
-msgstr ""
+msgstr "Anna käyttäjän ”%s” salasana"
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:85
@@ -21465,19 +21347,16 @@ msgid "Certificate Authority Trust"
 msgstr "Varmentajan luottamus"
 
 #: ../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."
+msgstr "Luota tähän CA:han _www-sivustojen tunnistamisessa."
 
 #: ../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."
+msgstr "Luot_a tähän CA:han sähköpostikäyttäjien tunnistamisessa."
 
 #: ../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."
+msgstr "Luota tähän CA:han o_hjelmistokehittäjien tunnistamisessa."
 
 #: ../smime/gui/smime-ui.ui.h:21
 msgid ""
@@ -21612,6 +21491,18 @@ msgstr "_Eräpäivän kanssa"
 msgid "With _Status"
 msgstr "_Tilan kanssa"
 
+#~ msgid "Customize"
+#~ msgstr "Muokkaa"
+
+#~ msgid "Custom Reminder:"
+#~ msgstr "Omavalintainen muistutus:"
+
+#~ msgid "Inline Image"
+#~ msgstr "Sisäkkäiset kuvat"
+
+#~ msgid "View image attachments directly in mail messages."
+#~ msgstr "Näytä kuvaliitteet suoraan sähköpostiviesteissä."
+
 #~ msgid "Original Contact:"
 #~ msgstr "Alkuperäinen yhteystieto:"
author	Juhani Numminen <juhaninumminen0@gmail.com>	2014-05-01 19:43:39 +0800
committer	Timo Jyrinki <timo.jyrinki@iki.fi>	2014-05-01 19:43:39 +0800
commit	865f4618efb146d9978a11fbcde3a89df4622615 (patch)
tree	78f4dbce9ef376c1c6be34989829fcd44f0f8fc1 /po
parent	e0e498c644a485aee0029805532622f0a711ecfc (diff)
download	gsoc2013-evolution-865f4618efb146d9978a11fbcde3a89df4622615.tar gsoc2013-evolution-865f4618efb146d9978a11fbcde3a89df4622615.tar.gz gsoc2013-evolution-865f4618efb146d9978a11fbcde3a89df4622615.tar.bz2 gsoc2013-evolution-865f4618efb146d9978a11fbcde3a89df4622615.tar.lz gsoc2013-evolution-865f4618efb146d9978a11fbcde3a89df4622615.tar.xz gsoc2013-evolution-865f4618efb146d9978a11fbcde3a89df4622615.tar.zst gsoc2013-evolution-865f4618efb146d9978a11fbcde3a89df4622615.zip