Finnish translation updated by Sami Pesonen (sampeson@iki.fi)

svn path=/trunk/; revision=20118
author: Sami Pesonen <spesonen@src.gnome.org> 2003-03-03 02:55:26 +0800
committer: Sami Pesonen <spesonen@src.gnome.org> 2003-03-03 02:55:26 +0800
commit: 9bcc86b12edbc01f776439b5dc604c04158f727c (patch)
tree: a3f8e897c8d0acfbfa780f85653d6dbc6708eec1
parent: 5b3f48071d4c5937c39ef7f8c544c16d0d3446f7 (diff)
download: gsoc2013-evolution-9bcc86b12edbc01f776439b5dc604c04158f727c.tar.gz
gsoc2013-evolution-9bcc86b12edbc01f776439b5dc604c04158f727c.tar.zst
gsoc2013-evolution-9bcc86b12edbc01f776439b5dc604c04158f727c.zip
2 files changed, 5938 insertions, 6452 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 4a8e9ae152..f871a0687a 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-02  Sami Pesonen <sampeson@iki.fi>
+
+	* fi.po: converted fi.po to UTF-8 encoding & updated.
+
 2003-03-02  Rodney Dawes  <dobey@ximian.com>
 
 	* POTFILES.in: s/server.in$/server.in.in/
diff --git a/po/fi.po b/po/fi.po
index 8d9e9ebfa7..1f133fcaac 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,52 +1,57 @@
 # Finnish messages for evolution
-# Copyright (C) 2000-2001 Free Software Foundation, Inc.
-# Jarkko Ranta <jjranta@cc.joensuu.fi> 2000-2001.
+# Copyright (C) 2000-2003 Free Software Foundation, Inc.
+# Jarkko Ranta <jjranta@cc.joensuu.fi> 2000-2001,
+# Sami Pesonen <sampeson@iki.fi> 2001-2003.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-10-28 16:49-0500\n"
-"PO-Revision-Date: 2001-11-06 15:00+0300\n"
-"Last-Translator: Jarkko Ranta <jjranta@cc.joensuu.fi>\n"
-"Language-Team: Finnish <fi@li.org>\n"
+"POT-Creation-Date: 2003-03-02 20:51+0200\n"
+"PO-Revision-Date: 2003-03-02 20:48+0200\n"
+"Last-Translator: Sami Pesonen <sampeson@iki.fi>\n"
+"Language-Team: Gnome Finnish Translation Team <laatu@gnome-fi.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
 msgid "Factory to import LDIF files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
 msgid "Imports LDIF files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
 msgid "Imports VCard files into Evolution."
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1297
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1311
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nimi"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1338
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
-msgstr "Sähköposti"
+msgstr "SÃ¤hkÃ¶posti"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1756
+#: addressbook/gui/contact-editor/e-contact-editor.c:1764
 msgid "Primary"
 msgstr "Ensisijainen"
 
@@ -56,18 +61,19 @@ msgstr "Ensisij"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/backend/ebook/e-card.c:1400
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
-#: addressbook/gui/contact-editor/e-contact-editor.c:1809
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/contact-editor/e-contact-editor.c:1821
 msgid "Business"
-msgstr "Työ"
+msgstr "TyÃ¶"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
@@ -75,12 +81,12 @@ msgid "Bus"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
 msgid "Callback"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
 msgid "Company"
 msgstr "Yritys"
 
@@ -91,12 +97,13 @@ msgstr "Yrit"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1810
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
+#: addressbook/gui/contact-editor/e-contact-editor.c:1822
 msgid "Home"
 msgstr "Koti"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1358
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organisaatio"
@@ -107,79 +114,79 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
 msgid "Mobile"
 msgstr "Matkapuhelin"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
 msgid "Car"
 msgstr "Auto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
-msgstr "Työ/faksi"
+msgstr "TyÃ¶/faksi"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Koti/faksi"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "Business 2"
-msgstr "Työ 2"
+msgstr "TyÃ¶ 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
 msgid "Bus 2"
-msgstr "Työ 2"
+msgstr "TyÃ¶ 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
 msgid "Home 2"
 msgstr "Koti 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/contact-editor/e-contact-editor.c:1811
+#: addressbook/gui/contact-editor/e-contact-editor.c:1761
+#: addressbook/gui/contact-editor/e-contact-editor.c:1823
 msgid "Other"
 msgstr "Muut"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1762
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Muu faksi"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/contact-editor/e-contact-editor.c:1763
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1766
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr ""
@@ -190,18 +197,18 @@ msgid "TTY"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/component/e-address-popup.c:482
+#: addressbook/gui/contact-editor/e-contact-editor.c:1794
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
-msgstr "Sähköposti 2"
+msgstr "SÃ¤hkÃ¶posti 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/component/e-address-popup.c:492
+#: addressbook/gui/contact-editor/e-contact-editor.c:1795
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
-msgstr "Sähköposti 3"
+msgstr "SÃ¤hkÃ¶posti 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
@@ -222,6 +229,7 @@ msgid "Dep"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1372
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Asema"
@@ -231,6 +239,7 @@ msgid "Off"
 msgstr "Asm"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1379
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr ""
@@ -245,6 +254,7 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1393
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr ""
@@ -258,6 +268,7 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1407
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Kutsumanimi"
@@ -267,16 +278,19 @@ msgid "Nick"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1414
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Puoliso"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1448
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1434
 msgid "Calendar URI"
 msgstr ""
 
@@ -294,6 +308,7 @@ msgid "FBUrl"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card.c:1421
 msgid "Anniversary"
 msgstr ""
 
@@ -303,110 +318,203 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
-msgstr "Syntymäpäivä"
+msgstr "SyntymÃ¤pÃ¤ivÃ¤"
 
 #: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card.c:1462
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
-msgstr "Ryhmät"
+msgstr "RyhmÃ¤t"
 
 #: addressbook/backend/ebook/e-card-simple.c:105
 msgid "Family Name"
 msgstr "Sukunimi"
 
-#: addressbook/backend/ebook/e-card-simple.c:792
+#: addressbook/backend/ebook/e-card-simple.c:334
+#, fuzzy
+msgid "ECard"
+msgstr "Auto"
+
+#: addressbook/backend/ebook/e-card-simple.c:829
 #, c-format
 msgid "%x"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-card-simple.c:890
 #: addressbook/backend/ebook/e-destination.c:706
 #, fuzzy
 msgid "Unnamed List"
-msgstr "Nimetön kontaktiluettelo"
+msgstr "NimetÃ¶n kontaktiluettelo"
 
-#: addressbook/backend/ebook/e-card.c:2683
-msgid "Multiple VCards"
+#: addressbook/backend/ebook/e-card.c:1304
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Koko nimi"
+
+#: addressbook/backend/ebook/e-card.c:1317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+msgid "Address"
+msgstr "Osoite"
+
+#: addressbook/backend/ebook/e-card.c:1324
+msgid "Address Label"
+msgstr "Osoitteen nimike"
+
+#: addressbook/backend/ebook/e-card.c:1331
+#, fuzzy
+msgid "Phone"
+msgstr "MÃ¤Ã¤rittelemÃ¤tÃ¶n"
+
+#: addressbook/backend/ebook/e-card.c:1345
+msgid "Birth date"
+msgstr "SyntymÃ¤pÃ¤ivÃ¤"
+
+#: addressbook/backend/ebook/e-card.c:1351
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL:"
+
+#: addressbook/backend/ebook/e-card.c:1365
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "Organisaatio"
+
+#: addressbook/backend/ebook/e-card.c:1386
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Rooli"
+
+#: addressbook/backend/ebook/e-card.c:1427 mail/mail-format.c:936
+#, fuzzy
+msgid "Mailer"
+msgstr "_Matkapuhelin"
+
+#: addressbook/backend/ebook/e-card.c:1441
+#, fuzzy
+msgid "Free/Busy URL"
+msgstr "Edellinen viesti"
+
+#: addressbook/backend/ebook/e-card.c:1455
+msgid "Related Contacts"
+msgstr "Asiaan liittyvÃ¤t yhteystiedot"
+
+#: addressbook/backend/ebook/e-card.c:1469
+#, fuzzy
+msgid "Category List"
+msgstr "RyhmÃ¤t"
+
+#: addressbook/backend/ebook/e-card.c:1476
+msgid "Wants HTML"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2691
-#, c-format
-msgid "VCard for %s"
+#: addressbook/backend/ebook/e-card.c:1483
+msgid "Wants HTML set"
 msgstr ""
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
-#: addressbook/backend/ebook/load-pine-addressbook.c:22
-#: addressbook/backend/ebook/test-client-list.c:23
-#: addressbook/backend/ebook/test-client.c:34
-#: addressbook/conduit/address-conduit.c:1860
-#: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1807
-#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:67
-#: tools/evolution-addressbook-abuse.c:132
-#: tools/evolution-addressbook-export.c:60
-#: tools/evolution-addressbook-import.c:86
+#: addressbook/backend/ebook/e-card.c:1490
+#, fuzzy
+msgid "List"
+msgstr "Pakistan"
+
+#: addressbook/backend/ebook/e-card.c:1497
+#, fuzzy
+msgid "List Show Addresses"
+msgstr "Muu osoite"
+
+#: addressbook/backend/ebook/e-card.c:1504
+msgid "Arbitrary"
+msgstr "Arbitrary"
+
+#: addressbook/backend/ebook/e-card.c:1511
+#, fuzzy
+msgid "ID"
+msgstr "I"
+
+#: addressbook/backend/ebook/e-card.c:1518
+#, fuzzy
+msgid "Last Use"
+msgstr "LiitÃ¤"
+
+#: addressbook/backend/ebook/e-card.c:1529
+#, fuzzy
+msgid "Use Score"
+msgstr "Peruuta"
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:170
 msgid "Could not initialize Bonobo"
 msgstr "Bonobon alustus ei onnistunut"
 
-#: addressbook/backend/pas/pas-backend-file.c:364
-#: addressbook/backend/pas/pas-backend-ldap.c:2978
+#: addressbook/backend/pas/pas-backend-file.c:465
+#: addressbook/backend/pas/pas-backend-ldap.c:3045
 msgid "Searching..."
-msgstr "Etsitään..."
+msgstr "EtsitÃ¤Ã¤n..."
 
-#: addressbook/backend/pas/pas-backend-file.c:366
+#: addressbook/backend/pas/pas-backend-file.c:467
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:687
+#: addressbook/backend/pas/pas-backend-ldap.c:597
+msgid "Using Distinguished Name (DN)"
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:601
+#, fuzzy
+msgid "Using Email Address"
+msgstr "_TÃ¤mÃ¤ on postitusosoite"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:747
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
-msgstr "Odotetaan yhteyttä LDAP-palvelimeen..."
+msgstr "Odotetaan yhteyttÃ¤ LDAP-palvelimeen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1230
+#: addressbook/backend/pas/pas-backend-ldap.c:1290
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1336
+#: addressbook/backend/pas/pas-backend-ldap.c:1401
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1572
-#: addressbook/backend/pas/pas-backend-ldap.c:1575
+#: addressbook/backend/pas/pas-backend-ldap.c:1637
+#: addressbook/backend/pas/pas-backend-ldap.c:1640
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2889
+#: addressbook/backend/pas/pas-backend-ldap.c:2956
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2998
+#: addressbook/backend/pas/pas-backend-ldap.c:3065
 #, fuzzy
 msgid "Error performing search"
 msgstr "Virhe kortin poistossa"
 
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:292
 #, fuzzy
 msgid "Default Sync Address:"
-msgstr "Sähköpostiosoite:"
+msgstr "SÃ¤hkÃ¶postiosoite:"
 
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:535
 msgid "Cursor could not be loaded\n"
-msgstr "Kohdistimen lataaminen epäonnistui\n"
+msgstr "Kohdistimen lataaminen epÃ¤onnistui\n"
 
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:548
 msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1278
-#: calendar/conduits/todo/todo-conduit.c:889
+#: calendar/conduits/calendar/calendar-conduit.c:1267
+#: calendar/conduits/todo/todo-conduit.c:877
 msgid "Could not start wombat server"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1279
-#: calendar/conduits/todo/todo-conduit.c:890
+#: calendar/conduits/calendar/calendar-conduit.c:1268
+#: calendar/conduits/todo/todo-conduit.c:878
 msgid "Could not start wombat"
 msgstr ""
 
@@ -415,189 +523,159 @@ msgstr ""
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "A Bonobo control for an address popup."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "A Bonobo control for displaying an address."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
 msgid "A sample Bonobo control which displays an addressbook."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Configure access to LDAP directory servers here"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook minicard viewer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution component for handling contacts."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Addressbook Minicard control"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the Addressbook's address displayer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
-msgid "Factory for the Addressbook's address popup"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Factory for the controls exported by the Evolution Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
-msgid "Factory for the configuration controls for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid "Factory for the sample Addressbook control"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:611
-#: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
-#: shell/e-shortcuts.c:1067
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:612
+#: calendar/gui/dialogs/comp-editor-util.c:309
+#: calendar/gui/dialogs/comp-editor-util.c:365
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1863
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
 msgid "Contacts"
-msgstr "Kontaktit"
+msgstr "Yhteystiedot"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:76
 msgid "Folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP Server"
 msgstr "LDAP-palvelin"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:77
-#, fuzzy
+#: addressbook/gui/component/addressbook-component.c:80
 msgid "Public Contacts"
-msgstr "Kontaktit"
+msgstr "Julkiset yhteystiedot"
 
-#: addressbook/gui/component/addressbook-component.c:77
-#, fuzzy
+#: addressbook/gui/component/addressbook-component.c:80
 msgid "Public folder containing contact information"
-msgstr "Suodata postituslistan mukaan"
+msgstr "Yhteystietoja sisÃ¤ltÃ¤vÃ¤ julkinen kansio"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "New Contact"
-msgstr "Uusi kontakti"
+msgstr "Uusi yhteystieto"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:571
 msgid "_Contact"
-msgstr "_Kontakti"
+msgstr "_Yhteystieto"
 
-#: addressbook/gui/component/addressbook-component.c:568
-#, fuzzy
+#: addressbook/gui/component/addressbook-component.c:572
 msgid "Create a new contact"
-msgstr "Luo uusi kontakti"
+msgstr "Luo uusi yhteystieto"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:575
 msgid "New Contact List"
-msgstr "Uusi kontaktiluettelo"
+msgstr "Uusi yhteystietoluettelo"
 
-#: addressbook/gui/component/addressbook-component.c:571
-#, fuzzy
+#: addressbook/gui/component/addressbook-component.c:575
 msgid "Contact _List"
-msgstr "_Kontaktiluettelo"
+msgstr "_Yhteystietoluettelo"
 
-#: addressbook/gui/component/addressbook-component.c:572
-#, fuzzy
+#: addressbook/gui/component/addressbook-component.c:576
 msgid "Create a new contact list"
-msgstr "Luo uusi kontaktiluettelo"
+msgstr "Luo uusi yhteystietoluettelo"
 
-#: addressbook/gui/component/addressbook-config.c:197
+#: addressbook/gui/component/addressbook-config.c:206
 #, fuzzy
 msgid "Failed to connect to LDAP server"
-msgstr "Yhdistäminen palvelimeen epäonnistui."
+msgstr "YhdistÃ¤minen palvelimeen epÃ¤onnistui."
 
-#: addressbook/gui/component/addressbook-config.c:216
+#: addressbook/gui/component/addressbook-config.c:231
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
-msgstr "Yhdistäminen palvelimeen epäonnistui."
+msgstr "YhdistÃ¤minen palvelimeen epÃ¤onnistui."
 
-#: addressbook/gui/component/addressbook-config.c:239
+#: addressbook/gui/component/addressbook-config.c:259
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:648
+#: addressbook/gui/component/addressbook-config.c:682
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1154
+#: addressbook/gui/component/addressbook-config.c:1191
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1176
+#: addressbook/gui/component/addressbook-config.c:1213
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1184
+#: addressbook/gui/component/addressbook-config.c:1221
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1630
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.etspec.h:1
+#: addressbook/gui/component/addressbook-config.c:1647
 msgid "Account Name"
 msgstr "Tilin nimi"
 
-#: addressbook/gui/component/addressbook-config.etspec.h:2
+#: addressbook/gui/component/addressbook-config.c:1649
 msgid "Server Name"
 msgstr "Palvelimen nimi"
 
-#: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
-msgid "Could not initialize gnome-vfs"
-msgstr "gnome-vfs:n alustus ei onnistunut"
+#: addressbook/gui/component/addressbook-config.c:1686
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:169
 msgid "Other Contacts"
-msgstr "Muut kontaktit"
+msgstr "Muut yhteystiedot"
 
-#: addressbook/gui/component/addressbook.c:474
-msgid "Unable to open addressbook"
-msgstr "Osoitekirjaa ei voitu avata"
-
-#: addressbook/gui/component/addressbook.c:480
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:490
+#: addressbook/gui/component/addressbook.c:522
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is unreachable."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:527
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -605,55 +683,58 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:537
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
 "is unreachable."
 msgstr ""
 
-#. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:582
+#: addressbook/gui/component/addressbook.c:557
+msgid "Unable to open addressbook"
+msgstr "Osoitekirjaa ei voitu avata"
+
+#: addressbook/gui/component/addressbook.c:622
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:625
+#: addressbook/gui/component/addressbook.c:667
 #, fuzzy
 msgid "Failed to authenticate.\n"
-msgstr "Yhdistäminen palvelimeen epäonnistui."
+msgstr "YhdistÃ¤minen palvelimeen epÃ¤onnistui."
 
-#: addressbook/gui/component/addressbook.c:633
-#: addressbook/gui/component/addressbook.c:636
+#: addressbook/gui/component/addressbook.c:675
+#: addressbook/gui/component/addressbook.c:678
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:782
+#: addressbook/gui/component/addressbook.c:813
 #, fuzzy
 msgid "Name begins with"
 msgstr "loppuu merkkijonoon"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:814
 #, fuzzy
 msgid "Email begins with"
 msgstr "loppuu merkkijonoon"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:816
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
-msgstr "Mikä tahansa kenttä sisältää"
+msgstr "MikÃ¤ tahansa kenttÃ¤ sisÃ¤ltÃ¤Ã¤"
 
-#: addressbook/gui/component/addressbook.c:786
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr "Edistyneet..."
 
-#: addressbook/gui/component/addressbook.c:956
+#: addressbook/gui/component/addressbook.c:987
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -661,7 +742,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:962
+#: addressbook/gui/component/addressbook.c:993
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -669,25 +750,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:968
+#: addressbook/gui/component/addressbook.c:999
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:971
+#: addressbook/gui/component/addressbook.c:1002
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:975
+#: addressbook/gui/component/addressbook.c:1006
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1050
-#: calendar/gui/cal-search-bar.c:382
+#: addressbook/gui/component/addressbook.c:1089
+#: calendar/gui/cal-search-bar.c:352
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1132
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -697,138 +778,139 @@ msgstr ""
 #. * card.
 #.
 #: addressbook/gui/component/e-address-popup.c:178
-#, fuzzy
 msgid "(none)"
-msgstr "(Ei nimeä)"
+msgstr "(ei nimeÃ¤)"
 
-#: addressbook/gui/component/e-address-popup.c:474
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1783
+#: addressbook/gui/component/e-address-popup.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:1793
 msgid "Primary Email"
-msgstr "Ensisijainen sähköposti"
+msgstr "Ensisijainen sÃ¤hkÃ¶posti"
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/e-address-popup.c:608
 msgid "Select an Action"
 msgstr "Valitse toiminto"
 
-#: addressbook/gui/component/e-address-popup.c:593
+#: addressbook/gui/component/e-address-popup.c:615
 #, c-format
 msgid "Create a new contact \"%s\""
-msgstr "Luo uusi kontakti \"%s\""
+msgstr "Luo uusi yhteystieto \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:605
+#: addressbook/gui/component/e-address-popup.c:630
 #, c-format
 msgid "Add address to existing contact \"%s\""
-msgstr "Lisää osoite olemassaolevaan kontaktiin \"%s\""
+msgstr "LisÃ¤Ã¤ osoite olemassaolevaan yhteystietoon \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/e-address-popup.c:911
 msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+#: addressbook/gui/component/e-address-popup.c:995
+#: addressbook/gui/component/e-address-widget.c:392
+#: addressbook/gui/component/select-names/e-select-names-popup.c:300
 msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+#: addressbook/gui/component/e-address-popup.c:1025
+#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/select-names/e-select-names-popup.c:479
 msgid "Add to Contacts"
-msgstr "Lisää kontakteihin"
+msgstr "LisÃ¤Ã¤ yhteystietoihin"
 
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/e-address-popup.c:1068
 msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
-msgstr "Älä salli kyselyjä"
+msgstr "Ã„lÃ¤ salli kyselyjÃ¤"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Salli kyselyt (Vaarallista!)"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#, fuzzy
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: mail/mail-config.glade.h:1 mail/subscribe-dialog.glade.h:1
+msgid "\n"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
-msgstr "Tar_kista tuetut tavat"
+msgstr " Tar_kista tuetut kannat "
+
+#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: mail/mail-config.glade.h:6 mail/subscribe-dialog.glade.h:3
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "*"
+msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:2
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "1:00"
-msgstr "100%"
+msgstr "1:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:6
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "380"
-msgstr "389"
+msgstr "380"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:13
 msgid "666"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "<- _Remove"
-msgstr "Poista"
+msgstr "<- _Poista"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:15
 msgid "<< Fewer Options"
-msgstr "Asetukset"
+msgstr "<< VÃ¤hemmÃ¤n vaihtoehtoja"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Addressbook Sources"
-msgstr "Osoitekirjalähteet"
+msgstr "OsoitekirjalÃ¤hteet"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:14
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:16
 msgid "Always"
-msgstr "päivää"
+msgstr "Aina"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Anonymously"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:17
-msgid "Associated LDAP Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:18
-msgid "Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Congratulations, you are finished setting up this LDAP server. You\n"
 "are now ready to access this directory.\n"
@@ -837,15 +919,11 @@ msgid ""
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Connecting"
 msgstr "Hakuasetukset"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Corresponding Evolution Attribute"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:25
 msgid "DN Customization"
 msgstr ""
@@ -860,53 +938,44 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Email Address:"
-msgstr "Sähköpostiosoite:"
+msgstr "SÃ¤hkÃ¶postiosoite:"
 
 #: addressbook/gui/component/ldap-config.glade.h:29
-#, fuzzy
-msgid "Evolution Attribute"
-msgstr "Evolution"
-
-#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:31
 #, fuzzy
 msgid "Finished"
 msgstr "Etsi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:32
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "General"
 msgstr "Yleiset"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-msgid "LDAP Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:33
 #, fuzzy
 msgid "LDAP Configuration Assistant"
 msgstr "Palvelimen asetukset"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:34
 #, fuzzy
 msgid "Mappings"
 msgstr "Reunukset"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:35 mail/mail-account-gui.c:64
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Never"
 msgstr "Joka"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -916,73 +985,62 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Objectclasses"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid "Objectclasses Used in Evolution:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: addressbook/gui/component/ldap-config.glade.h:41
 msgid "Objectclasses Used on Server:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Please select an Evolution attribute and an\n"
 "LDAP attribute to associate with it."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid ""
-"Please select and Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "R_estore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid "Re_store Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "S_earch scope: "
-msgstr "_Etsi viestiä"
+msgstr "_Etsi viestiÃ¤"
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
-#: calendar/gui/e-week-view.c:1240
+#: addressbook/gui/component/ldap-config.glade.h:48
+#: calendar/gui/calendar-model.c:1968 calendar/gui/e-day-view.c:1669
+#: calendar/gui/e-week-view.c:1224
 #, fuzzy
 msgid "Searching"
-msgstr "Etsitään..."
-
-#: addressbook/gui/component/ldap-config.glade.h:53
-#, fuzzy
-msgid "Select"
-msgstr "Valitse kaikki"
+msgstr "EtsitÃ¤Ã¤n..."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "Selected:"
 msgstr "Poistettu"
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -993,7 +1051,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -1002,53 +1060,46 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
-msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
-"searches, and for creating and editting contacts. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:62
 #, fuzzy
 msgid "Step 1: Server Information"
-msgstr "Lähteen tiedot"
+msgstr "LÃ¤hteen tiedot"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:63
 #, fuzzy
 msgid "Step 2: Connecting to Server"
-msgstr "Yhdistetään LDAP-palvelimeen..."
+msgstr "YhdistetÃ¤Ã¤n LDAP-palvelimeen..."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:65
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1056,7 +1107,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1065,7 +1116,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1073,17 +1124,17 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
 "directory tree. A search scope of \"sub\" will include all entries below "
 "your search base.\n"
 "A search scope of \"one\" will only include the entries one level beneath "
-"your base."
+"your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1093,36 +1144,36 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 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."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
-"Tätä nimeä käytetään tilisi tunnistamiseksi. Se on vain sinua itseäsi varten"
+"TÃ¤tÃ¤ nimeÃ¤ kÃ¤ytetÃ¤Ã¤n tilisi tunnistamiseksi. Se on vain sinua itseÃ¤si varten"
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1130,11 +1181,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:101
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1143,74 +1194,74 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:100
 #, fuzzy
 msgid "Using email address"
-msgstr "_Tämä on postitusosoite"
+msgstr "_TÃ¤mÃ¤ on postitusosoite"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:101
+#: mail/mail-account-gui.c:63 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:108
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
-msgstr "_Lisää"
+msgstr "_LisÃ¤Ã¤"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:103
 #, fuzzy
 msgid "_Add ->"
-msgstr "_Lisää"
+msgstr "_LisÃ¤Ã¤"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:104
 #, fuzzy
 msgid "_Add Mapping"
-msgstr "Lisää toiminto"
+msgstr "LisÃ¤Ã¤ toiminto"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:105
 #, fuzzy
 msgid "_Add to DN"
-msgstr "Lisää toiminto"
+msgstr "LisÃ¤Ã¤ toiminto"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:106
 msgid "_Always"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:107
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Poista kaikki"
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:108
 #, fuzzy
 msgid "_Display name:"
-msgstr "_Päivä"
+msgstr "_PÃ¤ivÃ¤"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:109
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:110
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:111
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:112 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
@@ -1220,212 +1271,211 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Muokkaa tapaamista"
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:118
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_Asetukset"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Portti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:122
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Etsi"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_Server name:"
 msgstr "Palvelimen _nimi: "
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "account-druid"
 msgstr "Tili"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "account-editor"
 msgstr "kontaktinhallinta"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
 msgid "cards"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Hakuasetukset"
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:130
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "general-tab"
 msgstr "Yleiset"
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:132
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:139
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:140
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "searching-tab"
-msgstr "Etsitään..."
+msgstr "EtsitÃ¤Ã¤n..."
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:2
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:699
-#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
-#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
-#: shell/e-shortcuts-view.c:178
+#: addressbook/gui/component/select-names/e-select-names-popup.c:162
+#: addressbook/gui/component/select-names/e-select-names.c:688
+#: composer/e-msg-composer-attachment-bar.c:507
+#: my-evolution/e-summary-shown.c:536
 msgid "Remove"
 msgstr "Poista"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:178
+#: addressbook/gui/component/select-names/e-select-names-popup.c:177
 msgid "Remove All"
 msgstr "Poista kaikki"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:202
+#: addressbook/gui/component/select-names/e-select-names-popup.c:201
 msgid "Send HTML Mail?"
-msgstr "Lähetä HTML-postia?"
+msgstr "LÃ¤hetÃ¤ HTML-postia?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:405
+#: addressbook/gui/component/select-names/e-select-names-popup.c:399
 msgid "Edit Contact List"
-msgstr "Muokkaa kontaktiluetteloa"
+msgstr "Muokkaa yhteystietoluetteloa"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:417
 msgid "Unnamed Contact List"
-msgstr "Nimetön kontaktiluettelo"
+msgstr "NimetÃ¶n yhteystietoluettelo"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:440
+#: addressbook/gui/component/select-names/e-select-names-popup.c:434
 #, c-format
 msgid "(%d not shown)"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:506
+#: addressbook/gui/component/select-names/e-select-names-popup.c:500
 msgid "Unnamed Contact"
-msgstr "Nimetön kontakti"
+msgstr "NimetÃ¶n yhteystieto"
+
+#: addressbook/gui/component/select-names/e-select-names-table-model.c:349
+#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
+msgid "Source"
+msgstr "LÃ¤hde"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/e-select-names.c:495
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:564
-#, fuzzy
+#: addressbook/gui/component/select-names/e-select-names.c:555
 msgid "Find contact in"
-msgstr "Lähettäjäkenttä sisältää"
+msgstr "Etsi yhteystieto"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Find"
+msgstr "Etsi:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "Valitse nimet"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-#, fuzzy
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 msgid "Selected Contacts:"
-msgstr "Poista kontakti?"
+msgstr "Valitut yhteystiedot:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-#, fuzzy
+#: addressbook/gui/component/select-names/select-names.glade.h:5
 msgid "Show Contacts"
-msgstr "Kontaktit"
+msgstr "NÃ¤ytÃ¤ yhteystiedot"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid ""
 "Type a name into the entry, or\n"
 "select one from the list below:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Category:"
-msgstr "_Ryhmä:"
+msgstr "_RyhmÃ¤:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 msgid "_Folder:"
 msgstr "_Kansio:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "A_ssistant's name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
-#, fuzzy
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Add_ress..."
 msgstr "_Osoite..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Anni_versary:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
-#, fuzzy
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Birthda_y:"
-msgstr "_Syntymäpäivä:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#, fuzzy
-msgid "C_ontacts..."
-msgstr "_Kontaktit..."
+msgstr "_SyntymÃ¤pÃ¤ivÃ¤:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
 #: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
-msgstr "Ry_hmät..."
+msgstr "Ry_hmÃ¤t..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "Collaboration"
@@ -1433,9 +1483,9 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1369
+#: addressbook/gui/contact-editor/e-contact-editor.c:1343
 msgid "Contact Editor"
-msgstr "Kontaktinhallinta"
+msgstr "Yhteystiedonhallinta"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
 #, fuzzy
@@ -1443,7 +1493,7 @@ msgid "D_epartment:"
 msgstr "_Osasto:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:211
+#: calendar/gui/dialogs/task-editor.c:195
 msgid "Details"
 msgstr "Yksityiskohtaiset"
 
@@ -1484,1301 +1534,1345 @@ msgstr "Organi_saatio:"
 msgid "P_rofession:"
 msgstr "_Ammatti:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Phone Types"
-msgstr "Puhelintyypit"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "S_pouse:"
 msgstr "Puoli_so:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "This is the _mailing address"
-msgstr "_Tämä on postitusosoite"
+msgstr "_TÃ¤mÃ¤ on postitusosoite"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Wants to receive _HTML mail"
-msgstr "Haluaa sähköpostit HTML-muodossa"
+msgstr "Haluaa sÃ¤hkÃ¶postit HTML-muodossa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
-#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
-#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
-#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
+#: calendar/gui/dialogs/meeting-page.c:652 calendar/gui/e-calendar-table.c:968
+#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3539
+#: filter/filter.glade.h:15 mail/folder-browser.c:1768
+#: mail/mail-config.glade.h:148 shell/glade/e-folder-list.glade.h:2
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:97 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:48
 msgid "_Delete"
 msgstr "_Poista"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
-msgstr "_Tehtävänimike:"
+msgstr "_TehtÃ¤vÃ¤nimike:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
 msgstr "_Kutsumanimi:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "_Asema:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Public Calendar URL:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Web page address:"
 msgstr "_Kotisivun osoite:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
-#: my-evolution/Locations.h:2341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:102
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
+#: addressbook/gui/widgets/e-addressbook-model.c:318
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-minicard-label.c:151
+#: addressbook/gui/widgets/e-minicard-view-widget.c:118
+#: addressbook/gui/widgets/e-minicard-view.c:473
+#: addressbook/gui/widgets/e-minicard.c:179
+#, fuzzy
+msgid "Editable"
+msgstr "KÃ¤ytÃ¤"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: my-evolution/Locations.h:2340
 msgid "United States"
 msgstr "Yhdysvallat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Afghanistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "American Samoa"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Andorra"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Angola"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Anguilla"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Antarctica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antigua And Barbuda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 #: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr "Argentiina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Armenia"
 msgstr "Armenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "Australia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 #: my-evolution/Locations.h:155
 msgid "Austria"
-msgstr "Itävalta"
+msgstr "ItÃ¤valta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Azerbaijan"
 msgstr "Azerbaidzan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "Bahamasaaret"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Belarus"
-msgstr "Valko-Venäjä"
+msgstr "Valko-VenÃ¤jÃ¤"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "Belgia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 #: my-evolution/Locations.h:218
 msgid "Belize"
 msgstr "Belize"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bermuda"
 msgstr "Bermudasaaret"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia-Hertsegovina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bouvet Island"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "British Indian Ocean Territory"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brunei Darussalam"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cambodia"
 msgstr "Kambodza"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cape Verde"
 msgstr "Kap Verde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "Caymansaaret"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Central African Republic"
 msgstr "Keski-Afrikan Tasavalta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Chad"
 msgstr "Tsad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "China"
 msgstr "Kiina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "Joulusaaret"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cocos (Keeling) Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "Kolumbia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Comoros"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr "Kongo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cook Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cote d'Ivoire"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "Kroatia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr "Kuuba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "Kypros"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "Tsekinmaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "Tanska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Dominica"
 msgstr "Dominica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "Dominikaaninen Tasavalta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "East Timor"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "Egypti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
-msgstr "Päiväntasaajan Guinea"
+msgstr "PÃ¤ivÃ¤ntasaajan Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "Viro"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr "Falklandsaaret"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
-msgstr "Färsaaret"
+msgstr "FÃ¤rsaaret"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr "Fidzi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "Suomi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr "Ranska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "Ranskan Guiana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr "Polynesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "Gambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "Georgia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "Saksa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr "Ghana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "Kreikka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
-msgstr "Grönlanti"
+msgstr "GrÃ¶nlanti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guinea"
 msgstr "Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea-bissau"
 msgstr "Guinea Bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guyana"
 msgstr "Guyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 #: my-evolution/Locations.h:888
 msgid "Haiti"
 msgstr "Haiti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Heard And McDonald Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Holy See"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 #: my-evolution/Locations.h:945
 msgid "Honduras"
 msgstr "Honduras"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "Unkari"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "Islanti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr "Intia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "Irlanti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Israel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "Italia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "Jamaika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "Japani"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "Jordania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Kenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 #, fuzzy
 msgid "Korea, Republic Of"
 msgstr "Tsekinmaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kyrgyzstan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Latvia"
 msgstr "Latvia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lesotho"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Liettua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Macau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Macedonia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Madagascar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Malaysia"
 msgstr "Malesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Maldives"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 #: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Marshall Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Martinique"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mauritania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mayotte"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
-#: my-evolution/Locations.h:1386
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: my-evolution/Locations.h:1385
 msgid "Mexico"
 msgstr "Meksiko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Micronesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Moldova, Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Monaco"
 msgstr "Monaco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mongolia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Montserrat"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
-#: my-evolution/Locations.h:1469
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: my-evolution/Locations.h:1468
 msgid "Morocco"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mozambique"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Myanmar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Namibia"
 msgstr "Namibia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Nauru"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nepal"
 msgstr "Nepali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
-#: my-evolution/Locations.h:1530
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: my-evolution/Locations.h:1529
 msgid "Netherlands"
 msgstr "Alankomaat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Netherlands Antilles"
 msgstr "Alankomaiden Antillit"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "New Caledonia"
 msgstr "Uusi Kaledonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
-#: my-evolution/Locations.h:1559
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1558
 msgid "New Zealand"
 msgstr "Uusi-Seelanti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
-#: my-evolution/Locations.h:1561
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1560
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Niger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niue"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1573
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1572
 msgid "Norfolk Island"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Northern Mariana Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1586
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1585
 msgid "Norway"
 msgstr "Norja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
-#: my-evolution/Locations.h:1631
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1630
 msgid "Oman"
 msgstr "Oman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
-#: my-evolution/Locations.h:1672
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: my-evolution/Locations.h:1671
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Palau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Palestinian Territory"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1682
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1681
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Papua New Guinea"
 msgstr "Papua Uusi-Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
-#: my-evolution/Locations.h:1687
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1686
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
-#: my-evolution/Locations.h:1722
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: my-evolution/Locations.h:1721
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Philippines"
 msgstr "Filippiinit"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pitcairn"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1763
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: my-evolution/Locations.h:1762
 msgid "Poland"
 msgstr "Puola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1790
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: my-evolution/Locations.h:1789
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
-#: my-evolution/Locations.h:1823
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: my-evolution/Locations.h:1822
 msgid "Puerto Rico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1835
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: my-evolution/Locations.h:1834
 msgid "Qatar"
 msgstr "Qatar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Reunion"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
-#: my-evolution/Locations.h:1910
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: my-evolution/Locations.h:1909
 msgid "Romania"
 msgstr "Romania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Russian Federation"
-msgstr "Venäjä"
+msgstr "VenÃ¤jÃ¤"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Rwanda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Saint Kitts And Nevis"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Saint Lucia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Vincent And The Grena-dines"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Samoa"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "San Marino"
 msgstr "San Marino"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Sao Tome And Principe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
-#: my-evolution/Locations.h:2033
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: my-evolution/Locations.h:2032
 msgid "Saudi Arabia"
 msgstr "Saudi Arabia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Seychelles"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Sierra Leone"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2088
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2087
 msgid "Singapore"
 msgstr "Singapore"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
-#: my-evolution/Locations.h:2101
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: my-evolution/Locations.h:2100
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
-#: my-evolution/Locations.h:2102
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: my-evolution/Locations.h:2101
 msgid "Slovenia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Solomon Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Somalia"
 msgstr "Somalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2116
 msgid "South Africa"
-msgstr "Etelä-Afrikka"
+msgstr "EtelÃ¤-Afrikka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
-#: my-evolution/Locations.h:2125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: my-evolution/Locations.h:2124
 msgid "Spain"
 msgstr "Espanja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "St. Helena"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "St. Pierre And Miquelon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sudan"
 msgstr "Sudan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
-#: my-evolution/Locations.h:2174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: my-evolution/Locations.h:2173
 msgid "Suriname"
 msgstr "Surinam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Svalbard And Jan Mayen Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Swaziland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: my-evolution/Locations.h:2178
 msgid "Sweden"
 msgstr "Ruotsi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
-#: my-evolution/Locations.h:2181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: my-evolution/Locations.h:2180
 msgid "Switzerland"
 msgstr "Sveitsi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
-#: my-evolution/Locations.h:2203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: my-evolution/Locations.h:2202
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tajikistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Tanzania, United Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Thailand"
 msgstr "Thaimaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tokelau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Trinidad And Tobago"
 msgstr "Trinidad ja Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
-#: my-evolution/Locations.h:2319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2318
 msgid "Turkey"
 msgstr "Turkki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Turkmenistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Turks And Caicos Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tuvalu"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2331
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "United Arab Emirates"
 msgstr "Yhdistyneet arabiemiirikunnat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: my-evolution/Locations.h:2339
 msgid "United Kingdom"
 msgstr "Iso-Britannia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "United States Minor Outlying Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
-#: my-evolution/Locations.h:2346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: my-evolution/Locations.h:2345
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uzbekistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Vanuatu"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#: my-evolution/Locations.h:2378
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2377
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
-#: my-evolution/Locations.h:2390
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: my-evolution/Locations.h:2389
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 #, fuzzy
 msgid "Virgin Islands, British"
 msgstr "Neitsytsaaret"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 #, fuzzy
 msgid "Virgin Islands, U.S."
 msgstr "Neitsytsaaret"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Wallis And Futuna Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Western Sahara"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
-#: my-evolution/Locations.h:2510
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: my-evolution/Locations.h:2509
 msgid "Yemen"
 msgstr "Jemen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
-#: my-evolution/Locations.h:2522
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: my-evolution/Locations.h:2521
 msgid "Yugoslavia"
 msgstr "Jugoslavia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Zambia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Haluatko varmasti\n"
-"poistaa tämän kontaktin?"
+#: addressbook/gui/contact-editor/e-contact-editor.c:159
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:304
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-view.c:180
+#: addressbook/gui/widgets/e-minicard-view-widget.c:104
+#: addressbook/gui/widgets/e-minicard-view.c:459
+#, fuzzy
+msgid "Book"
+msgstr "MÃ¤Ã¤rittelemÃ¤tÃ¶n"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
-msgstr "Poista kontakti?"
+#: addressbook/gui/contact-editor/e-contact-editor.c:166
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:186
+#, fuzzy
+msgid "Card"
+msgstr "Auto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:826
+#: addressbook/gui/contact-editor/e-contact-editor.c:173
+#, fuzzy
+msgid "Is New Card"
+msgstr "Uusi"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#, fuzzy
+msgid "Writable Fields"
+msgstr "Ã„lÃ¤ salli kyselyjÃ¤"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:194
+#, fuzzy
+msgid "Changed"
+msgstr "Tsad"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:833
+#: addressbook/gui/contact-editor/e-contact-editor.c:844
 msgid "This contact belongs to these categories:"
-msgstr "Tämä kontakti kuuluu näihin ryhmiin:"
+msgstr "TÃ¤mÃ¤ yhteystieto kuuluu nÃ¤ihin ryhmiin:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1047
+#: addressbook/gui/contact-editor/e-contact-editor.c:1018
 msgid "Save Contact as VCard"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1064
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Haluatko varmasti\n"
+"poistaa nÃ¤mÃ¤ yhteystiedot?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1067
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Haluatko varmasti\n"
+"poistaa tÃ¤mÃ¤n yhteystiedon?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1767
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2440
+#: addressbook/gui/contact-editor/e-contact-editor.c:2371
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
-msgstr "Kontaktin pikalisäys"
+msgstr "Yhteystiedon pikalisÃ¤ys"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
 msgid "Edit Full"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Koko nimi"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "E-mail"
-msgstr "Sähköposti"
+msgstr "SÃ¤hkÃ¶posti"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:66
+#, fuzzy, c-format
+msgid "Error saving %s: %s"
+msgstr "Virhe tallennettaessa tiedostoa: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:103
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:183
+#: addressbook/gui/contact-editor/e-contact-save-as.c:173
 msgid "list"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:221
+#: addressbook/gui/contact-editor/e-contact-save-as.c:206
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/file-exists.glade.h:1
-msgid "Confirm Overwrite"
-msgstr ""
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:2
-msgid "Don't bother translating this string.  It's not used."
-msgstr ""
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:3
+#: addressbook/gui/contact-editor/e-contact-save-as.c:210
 #, fuzzy
 msgid "Overwrite"
 msgstr "Kirjoita tiedoston yli?"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Osoite _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Tarkista osoite"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "M_aa:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Osoite:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_City:"
 msgstr "_Kaupunki:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_Postilokero:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
-msgstr "_Osavaltio/lääni:"
+msgstr "_Osavaltio/lÃ¤Ã¤ni:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "Po_stinumero:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Check Full Name"
 msgstr "Tarkasta kokonimi"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Dr."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "Esq."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "II"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "III"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "Neiti"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "Hra."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Rva."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Nti."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_Etunimi:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Sukunimi:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "_Toinen nimi:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 msgid "List _name:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Members"
-msgstr "Jäsenet"
+msgstr "JÃ¤senet"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Poista"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
-msgstr "kontaktinhallinta"
+msgstr "yhteystiedonhallinta"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
+#, fuzzy
+msgid "Is New List"
+msgstr "Uusi"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:238
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:242
 msgid "Contact List Editor"
-msgstr "Kontaktinhallinta"
+msgstr "Yhteystiedonhallinta"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 msgid "Save List as VCard"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#, fuzzy
 msgid "Contact"
-msgstr "Kontaktit"
+msgstr "Yhteystieto"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
@@ -2791,11 +2885,11 @@ msgstr ""
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
 msgid "New Contact:"
-msgstr "Uusi kontakti:"
+msgstr "Uusi yhteystieto:"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
 msgid "Original Contact:"
-msgstr "Alkuperäinen kontakti:"
+msgstr "AlkuperÃ¤inen yhteystieto:"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
@@ -2809,7 +2903,7 @@ msgstr "Muuta silti"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Changed Contact:"
-msgstr "Muutettu kontakti:"
+msgstr "Muutettu yhteystieto:"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
@@ -2821,50 +2915,59 @@ msgid ""
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
 #: widgets/misc/e-filter-bar.c:153
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search.c:263
-msgid "Search"
-msgstr "Etsi"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 msgid "No cards"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:159
 msgid "1 card"
 msgstr "1 kortti"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:152
+#: addressbook/gui/widgets/e-addressbook-model.c:162
 #, c-format
 msgid "%d cards"
 msgstr "%d korttia"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:408
+#: addressbook/gui/widgets/e-addressbook-model.c:311
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-view.c:187
+#: addressbook/gui/widgets/e-minicard-view-widget.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:466
+#, fuzzy
+msgid "Query"
+msgstr "Saksa"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:457
 #, fuzzy
 msgid "Error getting book view"
-msgstr "Virhe %s:n käynnistyksessä"
+msgstr "Virhe %s:n kÃ¤ynnistyksessÃ¤"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#, fuzzy
+msgid "Model"
+msgstr "Matkapuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
-#: addressbook/gui/widgets/e-addressbook-util.c:91
-#: addressbook/gui/widgets/e-minicard.c:475
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:143
+#: addressbook/gui/widgets/e-addressbook-util.c:104
+#: addressbook/gui/widgets/e-minicard.c:515
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1141
+#: shell/evolution-shell-component.c:1160
 msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:309
 #: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
+#: camel/providers/pop3/camel-pop3-store.c:522 shell/e-shell.c:2102
+#: shell/e-storage.c:606 shell/evolution-shell-component.c:1199
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
@@ -2872,8 +2975,8 @@ msgstr "Tuntematon virhe"
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1171
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:592
+#: shell/evolution-shell-component.c:1190
 msgid "Permission denied"
 msgstr ""
 
@@ -2890,23 +2993,21 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
+#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1176
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
-#: camel/camel-service.c:739 camel/camel-service.c:779
+#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2319
+#: camel/camel-service.c:737 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:436
-#: camel/providers/pop3/camel-pop3-store.c:513
+#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:516
 msgid "Cancelled"
 msgstr "Peruutettu"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
-#, fuzzy
 msgid "Authentication Failed"
-msgstr "Todennus epäonnistui."
+msgstr "Todennus epÃ¤onnistui"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:44
-#, fuzzy
 msgid "Authentication Required"
 msgstr "Todennus vaaditaan"
 
@@ -2915,191 +3016,196 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
-#, fuzzy
 msgid "Addressbook does not exist"
-msgstr "Kansiota `%s' ei ole olemassa."
+msgstr "Osoitekirjaa ei ole olemassa"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Muu virhe"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:63
-#: calendar/gui/dialogs/save-comp.c:50
+#: addressbook/gui/widgets/e-addressbook-util.c:74
+#: calendar/gui/dialogs/save-comp.c:49
 msgid "Do you want to save changes?"
 msgstr "Haluatko tallentaa muutokset?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:76
+#, fuzzy
+msgid "_Discard"
+msgstr "Tulosta kortti"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
-#: addressbook/gui/widgets/e-addressbook-util.c:292
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:271
 msgid "Error adding card"
-msgstr "Virhe kortin lisäämisessä"
+msgstr "Virhe kortin lisÃ¤Ã¤misessÃ¤"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:91
+#: addressbook/gui/widgets/e-addressbook-util.c:104
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:114
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
-#: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1588
+#: addressbook/gui/widgets/e-addressbook-util.c:114
+#: addressbook/gui/widgets/e-addressbook-util.c:229
 msgid "Error removing card"
 msgstr "Virhe kortin poistossa"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
-#, fuzzy
-msgid "Display Cards?"
-msgstr "Kirjoita viesti"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:209
-#, fuzzy
-msgid "Display Cards"
-msgstr "Kirjoita viesti"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:213
+#: addressbook/gui/widgets/e-addressbook-util.c:196
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
 "Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:348
+#: addressbook/gui/widgets/e-addressbook-util.c:327
 #, fuzzy
 msgid "Move card to"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:350
+#: addressbook/gui/widgets/e-addressbook-util.c:329
 #, fuzzy
 msgid "Copy card to"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:353
+#: addressbook/gui/widgets/e-addressbook-util.c:332
 #, fuzzy
 msgid "Move cards to"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:355
+#: addressbook/gui/widgets/e-addressbook-util.c:334
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:194
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Tyyppi"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#: mail/importers/pine-importer.c:591
 msgid "Addressbook"
 msgstr "Osoitekirja"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:624
-#: addressbook/gui/widgets/e-addressbook-view.c:813
-#: addressbook/gui/widgets/e-addressbook-view.c:1790
+#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:1863
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "New Contact..."
-msgstr "Uusi kontakti"
+msgstr "Uusi yhteystieto..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:801
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "New Contact List..."
-msgstr "Uusi kontaktiluettelo"
+msgstr "Uusi yhteystietoluettelo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Siirry kansioon..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 #, fuzzy
 msgid "Import..."
 msgstr "_Siirry kansioon..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Search for Contacts..."
-msgstr "_Etsi kontakteja"
+msgstr "Etsi yhteystietoja..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Addressbook Sources..."
-msgstr "_Osoitekirjan lähteet..."
+msgstr "Osoitekirjan lÃ¤hteet..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Pilot Settings..."
-msgstr "_Sähköpostiasetukset..."
+msgstr "_SÃ¤hkÃ¶postiasetukset..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:814
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:815
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Send Message to Contact"
-msgstr "Lähetä viesti kontaktille"
+msgstr "LÃ¤hetÃ¤ viesti yhteystiedolle"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:816
+#: addressbook/gui/widgets/e-addressbook-view.c:887 calendar/gui/print.c:2454
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Tulosta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:818
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:822
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "_Kopioi kansioon..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:823
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 #, fuzzy
 msgid "Move to folder..."
-msgstr "_Siirrä kansioon..."
+msgstr "_SiirrÃ¤ kansioon..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:826
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Leikkaa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:827
+#: addressbook/gui/widgets/e-addressbook-view.c:898
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopioi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:828
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
-msgstr "Liitä"
+msgstr "LiitÃ¤"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:900 filter/libfilter-i18n.h:10
+#: mail/mail-accounts.c:225 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Poista"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:833
-#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: calendar/gui/e-day-view.c:3674 calendar/gui/e-week-view.c:3504
 #, fuzzy
 msgid "Current View"
-msgstr "_Nykyinen näkymä"
+msgstr "_Nykyinen nÃ¤kymÃ¤"
 
 #. Minicard view stuff
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:938
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3107,11 +3213,11 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:943
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1290
+#: addressbook/gui/widgets/e-addressbook-view.c:1343
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3129,15 +3235,15 @@ msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Address"
-msgstr "Työosoite"
+msgstr "TyÃ¶osoite"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Business Phone"
-msgstr "Työpuhelin"
+msgstr "TyÃ¶puhelin"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Business Phone 2"
-msgstr "Työpuhelin 2"
+msgstr "TyÃ¶puhelin 2"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 msgid "Callback Phone"
@@ -3179,20 +3285,60 @@ msgstr "Muu puhelin"
 msgid "Primary Phone"
 msgstr "Ensisijainen puhelin"
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:187
+#: addressbook/gui/widgets/e-minicard-control.c:206
 msgid "and one other card."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:316
+#: addressbook/gui/widgets/e-minicard-control.c:318
 msgid "Save in addressbook"
 msgstr "Tallenna osoitekirjaan"
 
-#: addressbook/gui/widgets/e-minicard-view.c:140
+#: addressbook/gui/widgets/e-minicard-label.c:102
+#: addressbook/gui/widgets/e-minicard.c:142
+#, fuzzy
+msgid "Width"
+msgstr "Leveys:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:109
+#: addressbook/gui/widgets/e-minicard.c:149
+#, fuzzy
+msgid "Height"
+msgstr "Korkeus:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:116
+#: addressbook/gui/widgets/e-minicard.c:157
+msgid "Has Focus"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:123
+#, fuzzy
+msgid "Field"
+msgstr "_Kopio-kenttÃ¤"
+
+#: addressbook/gui/widgets/e-minicard-label.c:130
+#, fuzzy
+msgid "Field Name"
+msgstr "Sukunimi"
+
+#: addressbook/gui/widgets/e-minicard-label.c:137
+msgid "Text Model"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:144
+msgid "Max field name length"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:125
+#, fuzzy
+msgid "Column Width"
+msgstr "Kolumbia"
+
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -3201,28 +3347,46 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:143
+#: addressbook/gui/widgets/e-minicard-view.c:144
 msgid ""
 "\n"
 "\n"
 "There are no items to show in this view."
 msgstr ""
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
+#: addressbook/gui/widgets/e-minicard-view.c:452
+msgid "Adapter"
+msgstr "Sovitin"
+
+#: addressbook/gui/widgets/e-minicard.c:165
+#, fuzzy
+msgid "Selected"
+msgstr "Poistettu"
+
+#: addressbook/gui/widgets/e-minicard.c:172
+msgid "Has Cursor"
+msgstr ""
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
+#: addressbook/gui/widgets/gal-view-factory-treeview.c:25
+#, fuzzy
+msgid "GTK Tree View"
+msgstr "Viikko"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
 msgstr "Tulosta kirjekuori"
 
-#: addressbook/printing/e-contact-print.c:1115
+#: addressbook/printing/e-contact-print.c:1130
 msgid "Print cards"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1175
-#: addressbook/printing/e-contact-print.c:1197
+#: addressbook/printing/e-contact-print.c:1195
+#: addressbook/printing/e-contact-print.c:1217
 msgid "Print card"
 msgstr "Tulosta kortti"
 
@@ -3268,11 +3432,11 @@ msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:11
 msgid "Header"
-msgstr "Ylätunniste:"
+msgstr "YlÃ¤tunniste:"
 
 #: addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
-msgstr "Ylä-/Alatunniste"
+msgstr "YlÃ¤-/Alatunniste"
 
 #: addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
@@ -3295,7 +3459,6 @@ msgid "Include:"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Vaaka"
 
@@ -3313,19 +3476,18 @@ msgstr "Reunukset"
 
 #: addressbook/printing/e-contact-print.glade.h:22
 msgid "Number of columns:"
-msgstr "Sarakkeiden määrä:"
+msgstr "Sarakkeiden mÃ¤Ã¤rÃ¤:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
 msgid "Options"
 msgstr "Asetukset"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Suunta"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr "Sivu"
 
@@ -3339,11 +3501,9 @@ msgstr "Paperi"
 
 #: addressbook/printing/e-contact-print.glade.h:28
 msgid "Paper source:"
-msgstr "Paperilähde:"
+msgstr "PaperilÃ¤hde:"
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Pysty"
 
@@ -3385,7 +3545,7 @@ msgstr "Tyylin nimi:"
 
 #: addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
-msgstr "Ylä:"
+msgstr "YlÃ¤:"
 
 #: addressbook/printing/e-contact-print.glade.h:40
 msgid "Type:"
@@ -3399,137 +3559,249 @@ msgstr "Leveys:"
 msgid "_Font..."
 msgstr "_Kirjasin..."
 
-#: calendar/cal-util/cal-component.c:1218
+#: calendar/cal-util/cal-component.c:1216
 msgid "Untitled appointment"
 msgstr ""
 
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: calendar/cal-util/cal-recur.c:3983 calendar/gui/print.c:478
+msgid "1st"
+msgstr "1."
+
+#: calendar/cal-util/cal-recur.c:3984 calendar/gui/print.c:478
+msgid "2nd"
+msgstr "2."
+
+#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:478
+msgid "3rd"
+msgstr "3."
+
+#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:478
+msgid "4th"
+msgstr "4."
+
+#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:478
+msgid "5th"
+msgstr "5."
+
+#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:479
+msgid "6th"
+msgstr "6."
+
+#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:479
+msgid "7th"
+msgstr "7."
+
+#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:479
+msgid "8th"
+msgstr "8."
+
+#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:479
+msgid "9th"
+msgstr "9."
+
+#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:479
+msgid "10th"
+msgstr "10."
+
+#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:480
+msgid "11th"
+msgstr "11."
+
+#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:480
+msgid "12th"
+msgstr "12."
+
+#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:480
+msgid "13th"
+msgstr "13."
+
+#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:480
+msgid "14th"
+msgstr "14."
+
+#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:480
+msgid "15th"
+msgstr "15."
+
+#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:481
+msgid "16th"
+msgstr "16."
+
+#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:481
+msgid "17th"
+msgstr "17."
+
+#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:481
+msgid "18th"
+msgstr "18."
+
+#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:481
+msgid "19th"
+msgstr "19."
+
+#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:481
+msgid "20th"
+msgstr "20."
+
+#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:482
+msgid "21st"
+msgstr "21."
+
+#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:482
+msgid "22nd"
+msgstr "22."
+
+#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:482
+msgid "23rd"
+msgstr "23."
+
+#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:482
+msgid "24th"
+msgstr "24."
+
+#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:482
+msgid "25th"
+msgstr "25."
+
+#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:483
+msgid "26th"
+msgstr "26."
+
+#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:483
+msgid "27th"
+msgstr "27."
+
+#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:483
+msgid "28th"
+msgstr "28."
+
+#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:483
+msgid "29th"
+msgstr "29."
+
+#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:483
+msgid "30th"
+msgstr "30."
+
+#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:484
+msgid "31st"
+msgstr "31."
+
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:393 mail/message-list.c:752
 msgid "High"
 msgstr "Korkea"
 
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1721
+#: calendar/cal-util/cal-util.c:501 calendar/cal-util/cal-util.c:523
+#: calendar/gui/calendar-model.c:1694
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
+#: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
 msgid "Normal"
 msgstr "Tavallinen"
 
-#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
+#: calendar/cal-util/cal-util.c:503 calendar/cal-util/cal-util.c:525
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
+#: calendar/gui/e-calendar-table.c:395 mail/message-list.c:750
 msgid "Low"
 msgstr "Matala"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:520
+#: calendar/cal-util/cal-util.c:519
 #: calendar/gui/dialogs/task-details-page.glade.h:14
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-calendar-table.c:396
 msgid "Undefined"
-msgstr "Määrittelemätön"
+msgstr "MÃ¤Ã¤rittelemÃ¤tÃ¶n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:205
+#: calendar/conduits/calendar/calendar-conduit.c:204
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1225
-#: calendar/conduits/todo/todo-conduit.c:835
+#: calendar/conduits/calendar/calendar-conduit.c:1214
+#: calendar/conduits/todo/todo-conduit.c:823
 msgid "Error while communicating with calendar server"
 msgstr "Virhe kommunikoitaessa kalenteripalvelimen kanssa"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1372
-#: calendar/conduits/calendar/calendar-conduit.c:1375
+#: calendar/conduits/calendar/calendar-conduit.c:1361
+#: calendar/conduits/calendar/calendar-conduit.c:1364
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:204
 #, fuzzy
 msgid "Default Priority:"
 msgstr "_Prioriteetti:"
 
-#: calendar/conduits/todo/todo-conduit.c:951
-#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:939
+#: calendar/conduits/todo/todo-conduit.c:942
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 msgid "A Bonobo control which displays a task list."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
 msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#, fuzzy
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Calendar and Tasks"
-msgstr "_Kalenterin asetukset..."
+msgstr "Kalenteri ja tehtÃ¤vÃ¤t"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Configuration control for the Evolution Calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Evolution Tasks control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-msgid "Factory for the sample Calendar control"
-msgstr ""
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Factory for the Evolution Calendar objects"
+msgstr "Evolutionin sÃ¤hkÃ¶postikomponentin alustus epÃ¤onnistui."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
-msgid "Factory to create a component editor factory"
-msgstr ""
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
 msgid "Alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:2
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 #, fuzzy
 msgid "Starting:"
 msgstr "Asetukset"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 #, fuzzy
 msgid "Ending:"
 msgstr "Varjostus"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:229
 msgid "invalid time"
-msgstr "epäkelpo aika"
+msgstr "epÃ¤kelpo aika"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:274
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:369
 #, c-format
 msgid "Alarm on %s"
 msgstr ""
@@ -3555,7 +3827,13 @@ msgstr "_Muokkaa tapaamista"
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:741
+#: calendar/gui/alarm-notify/alarm-queue.c:742
+#: calendar/gui/alarm-notify/alarm-queue.c:766
+#: calendar/gui/tasks-control.c:457 widgets/misc/e-messagebox.c:161
+msgid "Warning"
+msgstr "Varoitus"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:746
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3563,13 +3841,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Varoitus"
-
-#: calendar/gui/alarm-notify/alarm-queue.c:764
+#: calendar/gui/alarm-notify/alarm-queue.c:772
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3580,65 +3852,61 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:778
+#: calendar/gui/alarm-notify/alarm-queue.c:786
 #, fuzzy
 msgid "Do not ask me about this program again."
-msgstr "Älä kysy tätä enää uudelleen"
+msgstr "Ã„lÃ¤ kysy tÃ¤tÃ¤ enÃ¤Ã¤ uudelleen"
 
-#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
-msgid "Could not initialize GNOME"
-msgstr "GNOMEn alustus ei onnistunut"
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize gnome-vfs"
+msgstr "gnome-vfs:n alustus ei onnistunut"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:180
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
 #: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
-msgstr "Yhteenveto sisältää"
+msgstr "Yhteenveto sisÃ¤ltÃ¤Ã¤"
 
 #: calendar/gui/cal-search-bar.c:51
-#, fuzzy
 msgid "Description contains"
-msgstr "Kuvaus:"
+msgstr "Kuvaus sisÃ¤ltÃ¤Ã¤"
 
 #: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
-msgstr "Kommentti sisältää"
+msgstr "Kommentti sisÃ¤ltÃ¤Ã¤"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1115
+#: calendar/gui/cal-search-bar.c:356 mail/mail-ops.c:1106
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:405
-#, fuzzy
+#: calendar/gui/calendar-commands.c:404
 msgid "%A %d %B %Y"
-msgstr "%A, %e %B %Y"
+msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:266
+#: calendar/gui/e-day-view.c:1387 calendar/gui/e-week-view-main-item.c:312
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
-#, fuzzy
+#: calendar/gui/calendar-commands.c:409 calendar/gui/calendar-commands.c:414
+#: calendar/gui/calendar-commands.c:416
 msgid "%a %d %b %Y"
-msgstr "%a %d %b"
+msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
-#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
-#, fuzzy
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:434
+#: calendar/gui/calendar-commands.c:440 calendar/gui/calendar-commands.c:442
 msgid "%d %B %Y"
-msgstr "%A, %e %B %Y"
+msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:433
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
+#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1513
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -3647,68 +3915,167 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
-#: calendar/gui/e-calendar-table.c:397
+#: calendar/gui/calendar-component.c:71 calendar/gui/gnome-cal.c:1341
+#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1862
+#: my-evolution/my-evolution.glade.h:3 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1085
+msgid "Calendar"
+msgstr "Kalenteri"
+
+#: calendar/gui/calendar-component.c:72
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:76
+#, fuzzy
+msgid "Public Calendar"
+msgstr "Tulosta kalenteri"
+
+#: calendar/gui/calendar-component.c:77
+msgid "Public folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:81 calendar/gui/e-tasks.c:735
+#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:511
+#: calendar/importers/icalendar-importer.c:708
+#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1864
+#: my-evolution/e-summary-tasks.c:326 my-evolution/e-summary-tasks.c:344
+#: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
+msgid "Tasks"
+msgstr "TehtÃ¤vÃ¤t"
+
+#: calendar/gui/calendar-component.c:82
+msgid "Folder containing to-do items"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:86
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Tulosta kortti"
+
+#: calendar/gui/calendar-component.c:87
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Suodata postituslistan mukaan"
+
+#: calendar/gui/calendar-component.c:739
+#, fuzzy
+msgid "New appointment"
+msgstr "Uusi tapaaminen"
+
+#: calendar/gui/calendar-component.c:739
+#, fuzzy
+msgid "_Appointment"
+msgstr "Tapaaminen"
+
+#: calendar/gui/calendar-component.c:740
+msgid "Create a new appointment"
+msgstr "Luo uusi tapaaminen"
+
+#: calendar/gui/calendar-component.c:744
+#, fuzzy
+msgid "New meeting"
+msgstr "Peruuta tapaaminen"
+
+#: calendar/gui/calendar-component.c:744
+#, fuzzy
+msgid "_Meeting"
+msgstr "Peruuta tapaaminen"
+
+#: calendar/gui/calendar-component.c:745
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Luo uusi tehtÃ¤vÃ¤"
+
+#: calendar/gui/calendar-component.c:749
+#, fuzzy
+msgid "New task"
+msgstr "Uusi tehtÃ¤vÃ¤"
+
+#: calendar/gui/calendar-component.c:749
+msgid "_Task"
+msgstr "_TehtÃ¤vÃ¤"
+
+#: calendar/gui/calendar-component.c:750
+msgid "Create a new task"
+msgstr "Luo uusi tehtÃ¤vÃ¤"
+
+#: calendar/gui/calendar-component.c:754
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Uusi tapaaminen"
+
+#: calendar/gui/calendar-component.c:754
+msgid "All _Day Appointment"
+msgstr "Koko _pÃ¤ivÃ¤n tapaaminen"
+
+#: calendar/gui/calendar-component.c:755
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Luo uusi tapaaminen"
+
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:956
+#: calendar/gui/e-calendar-table.c:372
 msgid "Private"
-msgstr "Henkilökohtainen"
+msgstr "HenkilÃ¶kohtainen"
 
-#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:958
+#: calendar/gui/e-calendar-table.c:373
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:410 calendar/gui/e-calendar-table.c:371
 msgid "Public"
 msgstr "Julkinen"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "N"
 msgstr "P"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "S"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "E"
 msgstr "I"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "W"
 msgstr "L"
 
-#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
-#: calendar/gui/e-calendar-table.c:470
+#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1126
+#: calendar/gui/e-calendar-table.c:445
 #, fuzzy
 msgid "Free"
 msgstr "Pe"
 
-#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
-#: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1165
+#: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-meeting-time-sel.c:408
+#: shell/evolution-shell-component.c:1184
 msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:742 calendar/gui/calendar-model.c:1170
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
+#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1172
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
+#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1174
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
-#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
+#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:305
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/print.c:2316
 msgid "Completed"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1028
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3716,189 +4083,103 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
-#: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
-#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
-#: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
+#: calendar/gui/calendar-model.c:1168 calendar/gui/dialogs/meeting-page.c:286
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1978
+#: mail/folder-browser.c:1730 mail/mail-account-gui.c:1254
+#: mail/mail-account-gui.c:1682 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:78
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:196
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:450
+#: widgets/misc/e-dateedit.c:1484 widgets/misc/e-dateedit.c:1599
 msgid "None"
-msgstr "Määrittelemätön"
+msgstr "MÃ¤Ã¤rittelemÃ¤tÃ¶n"
 
-#: calendar/gui/calendar-model.c:1723
+#: calendar/gui/calendar-model.c:1696
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1725
+#: calendar/gui/calendar-model.c:1698
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
-#: calendar/gui/e-meeting-model.c:862
+#: calendar/gui/calendar-model.c:1704 calendar/gui/e-meeting-model.c:277
+#: calendar/gui/e-meeting-model.c:287 calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:838
 msgid "Yes"
-msgstr "Kyllä"
+msgstr "KyllÃ¤"
 
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:863
+#: calendar/gui/calendar-model.c:1704 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:839
 msgid "No"
 msgstr "Ei"
 
-#: calendar/gui/calendar-view-factory.c:148
+#: calendar/gui/calendar-view-factory.c:118
 #, fuzzy
 msgid "Day View"
-msgstr "_Näytä"
+msgstr "_NÃ¤ytÃ¤"
 
-#: calendar/gui/calendar-view-factory.c:151
+#: calendar/gui/calendar-view-factory.c:121
 #, fuzzy
 msgid "Work Week View"
-msgstr "Työviikk_o"
+msgstr "TyÃ¶viikk_o"
 
-#: calendar/gui/calendar-view-factory.c:154
+#: calendar/gui/calendar-view-factory.c:124
 #, fuzzy
 msgid "Week View"
 msgstr "Viikko"
 
-#: calendar/gui/calendar-view-factory.c:157
+#: calendar/gui/calendar-view-factory.c:127
 #, fuzzy
 msgid "Month View"
 msgstr "Kuukausi"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
-#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
-msgid "Calendar"
-msgstr "Kalenteri"
-
-#: calendar/gui/component-factory.c:72
-msgid "Folder containing appointments and events"
-msgstr ""
-
-#: calendar/gui/component-factory.c:76
+#: calendar/gui/comp-editor-factory.c:457
 #, fuzzy
-msgid "Public Calendar"
-msgstr "Tulosta kalenteri"
+msgid "Error while opening the calendar"
+msgstr "Virhe kommunikoitaessa kalenteripalvelimen kanssa"
 
-#: calendar/gui/component-factory.c:77
-msgid "Public folder containing appointments and events"
+#: calendar/gui/comp-editor-factory.c:468
+msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:722
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:508
-#: calendar/importers/icalendar-importer.c:704
-#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
-#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
-#: shell/e-shortcuts.c:1063
-msgid "Tasks"
-msgstr "Tehtävät"
-
-#: calendar/gui/component-factory.c:82
-msgid "Folder containing to-do items"
+#: calendar/gui/comp-editor-factory.c:474
+msgid "Permission denied to open the calendar"
 msgstr ""
 
-#: calendar/gui/component-factory.c:86
-#, fuzzy
-msgid "Public Tasks"
-msgstr "Tulosta kortti"
-
-#: calendar/gui/component-factory.c:87
-#, fuzzy
-msgid "Public folder containing to-do items"
-msgstr "Suodata postituslistan mukaan"
-
-#: calendar/gui/component-factory.c:750
-#, fuzzy
-msgid "New appointment"
-msgstr "Uusi tapaaminen"
-
-#: calendar/gui/component-factory.c:750
-#, fuzzy
-msgid "_Appointment"
-msgstr "Tapaaminen"
-
-#: calendar/gui/component-factory.c:751
-msgid "Create a new appointment"
-msgstr "Luo uusi tapaaminen"
-
-#: calendar/gui/component-factory.c:755
-#, fuzzy
-msgid "New meeting"
-msgstr "Peruuta tapaaminen"
-
-#: calendar/gui/component-factory.c:755
-#, fuzzy
-msgid "_Meeting"
-msgstr "Peruuta tapaaminen"
-
-#: calendar/gui/component-factory.c:756
-#, fuzzy
-msgid "Create a new meeting request"
-msgstr "Luo uusi tehtävä"
-
-#: calendar/gui/component-factory.c:760
-#, fuzzy
-msgid "New task"
-msgstr "Uusi tehtävä"
-
-#: calendar/gui/component-factory.c:760
-msgid "_Task"
-msgstr "_Tehtävä"
-
-#: calendar/gui/component-factory.c:761
-msgid "Create a new task"
-msgstr "Luo uusi tehtävä"
-
-#: calendar/gui/component-factory.c:765
-#, fuzzy
-msgid "New All Day Appointment"
-msgstr "Uusi tapaaminen"
-
-#: calendar/gui/component-factory.c:765
-#, fuzzy
-msgid "All _Day Appointment"
-msgstr "Uusi t_apaaminen"
-
-#: calendar/gui/component-factory.c:766
-#, fuzzy
-msgid "Create a new all-day appointment"
-msgstr "Luo uusi tapaaminen"
-
-#: calendar/gui/control-factory.c:123
+#: calendar/gui/control-factory.c:119
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr ""
-"Tiedoston %s poistaminen epäonnistui:\n"
+"Tiedoston %s poistaminen epÃ¤onnistui:\n"
 "%s"
 
-#: calendar/gui/control-factory.c:167
+#: calendar/gui/control-factory.c:163
 msgid "The URI that the calendar will display"
-msgstr "URI jonka kalenteri näyttää"
+msgstr "URI jonka kalenteri nÃ¤yttÃ¤Ã¤"
 
-#: calendar/gui/control-factory.c:174
+#: calendar/gui/control-factory.c:170
 msgid "The type of view to show"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:359
+#: calendar/gui/dialogs/alarm-options.c:358
 msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:368
+#: calendar/gui/dialogs/alarm-options.c:367
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "Vastaanottajat"
 
-#: calendar/gui/dialogs/alarm-options.c:377
+#: calendar/gui/dialogs/alarm-options.c:376
 #, fuzzy
 msgid "Mail Alarm Options"
-msgstr "Näytä asetukset"
+msgstr "NÃ¤ytÃ¤ asetukset"
 
-#: calendar/gui/dialogs/alarm-options.c:386
+#: calendar/gui/dialogs/alarm-options.c:385
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:395
+#: calendar/gui/dialogs/alarm-options.c:394
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -3934,136 +4215,131 @@ msgstr "Aja ohjelma"
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:68
 #: filter/filter.glade.h:20
 msgid "days"
-msgstr "päivää"
+msgstr "pÃ¤ivÃ¤Ã¤"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:9
 #, fuzzy
 msgid "extra times every"
-msgstr "Päivitä joka"
+msgstr "PÃ¤ivitÃ¤ joka"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:67
 #: filter/filter.glade.h:21
 msgid "hours"
 msgstr "tuntia"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:66
 #: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minuutti"
 
-#: calendar/gui/dialogs/alarm-page.c:319
-#, fuzzy, c-format
+#: calendar/gui/dialogs/alarm-page.c:313 calendar/gui/e-alarm-list.c:393
+#, c-format
 msgid "%d days"
-msgstr " %d päivää"
+msgstr "%d pÃ¤ivÃ¤Ã¤"
 
-#: calendar/gui/dialogs/alarm-page.c:322
-#, fuzzy
+#: calendar/gui/dialogs/alarm-page.c:316 calendar/gui/e-alarm-list.c:396
 msgid "1 day"
-msgstr " 1 päivä"
+msgstr "1 pÃ¤ivÃ¤"
 
-#: calendar/gui/dialogs/alarm-page.c:327
-#, fuzzy, c-format
+#: calendar/gui/dialogs/alarm-page.c:321 calendar/gui/e-alarm-list.c:401
+#, c-format
 msgid "%d weeks"
-msgstr " %d viikkoa"
+msgstr "%d viikkoa"
 
-#: calendar/gui/dialogs/alarm-page.c:330
-#, fuzzy
+#: calendar/gui/dialogs/alarm-page.c:324 calendar/gui/e-alarm-list.c:404
 msgid "1 week"
-msgstr " 1 viikko"
+msgstr "1 viikko"
 
-#: calendar/gui/dialogs/alarm-page.c:335
-#, fuzzy, c-format
+#: calendar/gui/dialogs/alarm-page.c:329 calendar/gui/e-alarm-list.c:409
+#, c-format
 msgid "%d hours"
-msgstr " %d tuntia"
+msgstr "%d tuntia"
 
-#: calendar/gui/dialogs/alarm-page.c:338
-#, fuzzy
+#: calendar/gui/dialogs/alarm-page.c:332 calendar/gui/e-alarm-list.c:412
 msgid "1 hour"
-msgstr " 1 tunti"
+msgstr "1 tunti"
 
-#: calendar/gui/dialogs/alarm-page.c:343
-#, fuzzy, c-format
+#: calendar/gui/dialogs/alarm-page.c:337 calendar/gui/e-alarm-list.c:417
+#, c-format
 msgid "%d minutes"
-msgstr " %d minuuttia"
+msgstr "%d minuuttia"
 
-#: calendar/gui/dialogs/alarm-page.c:346
-#, fuzzy
+#: calendar/gui/dialogs/alarm-page.c:340 calendar/gui/e-alarm-list.c:420
 msgid "1 minute"
-msgstr " 1 minuutti"
+msgstr "1 minuutti"
 
-#: calendar/gui/dialogs/alarm-page.c:351
-#, fuzzy, c-format
+#: calendar/gui/dialogs/alarm-page.c:345 calendar/gui/e-alarm-list.c:425
+#, c-format
 msgid "%d seconds"
-msgstr " %d sekuntia"
+msgstr "%d sekuntia"
 
-#: calendar/gui/dialogs/alarm-page.c:354
-#, fuzzy
+#: calendar/gui/dialogs/alarm-page.c:348 calendar/gui/e-alarm-list.c:428
 msgid "1 second"
-msgstr " 1 sekunti"
+msgstr "1 sekunti"
 
-#: calendar/gui/dialogs/alarm-page.c:383
-#: calendar/gui/dialogs/alarm-page.glade.h:4
+#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
 msgid "Play a sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:3
+#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
 #, fuzzy
 msgid "Display a message"
 msgstr "Kirjoita viesti"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:385 calendar/gui/e-alarm-list.c:465
 msgid "Send an email"
-msgstr "Lähetä sähköpostia"
+msgstr "LÃ¤hetÃ¤ sÃ¤hkÃ¶postia"
 
-#: calendar/gui/dialogs/alarm-page.c:395
-#: calendar/gui/dialogs/alarm-page.glade.h:6
+#: calendar/gui/dialogs/alarm-page.c:389
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
 msgid "Run a program"
 msgstr "Aja ohjelma"
 
-#: calendar/gui/dialogs/alarm-page.c:401
+#: calendar/gui/dialogs/alarm-page.c:395 calendar/gui/e-alarm-list.c:475
 msgid "Unknown action to be performed"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:413
-#, fuzzy, c-format
+#: calendar/gui/dialogs/alarm-page.c:407 calendar/gui/e-alarm-list.c:487
+#, c-format
 msgid "%s %s before the start of the appointment"
-msgstr "Luo uusi tapaaminen"
+msgstr "%s %s ennen tapaamisen alkua"
 
-#: calendar/gui/dialogs/alarm-page.c:416
-#, fuzzy, c-format
+#: calendar/gui/dialogs/alarm-page.c:410 calendar/gui/e-alarm-list.c:490
+#, c-format
 msgid "%s %s after the start of the appointment"
-msgstr "Luo uusi tapaaminen"
+msgstr "%s %s tapaamisen alun jÃ¤lkeen"
 
-#: calendar/gui/dialogs/alarm-page.c:421
-#, fuzzy, c-format
+#: calendar/gui/dialogs/alarm-page.c:415 calendar/gui/e-alarm-list.c:495
+#, c-format
 msgid "%s at the start of the appointment"
-msgstr "Luo uusi tapaaminen"
+msgstr "%s tapaamisen alussa"
 
-#: calendar/gui/dialogs/alarm-page.c:430
-#, fuzzy, c-format
+#: calendar/gui/dialogs/alarm-page.c:424 calendar/gui/e-alarm-list.c:504
+#, c-format
 msgid "%s %s before the end of the appointment"
-msgstr "Luo uusi tapaaminen"
+msgstr "%s %s ennen tapaamisen loppumista"
 
-#: calendar/gui/dialogs/alarm-page.c:433
-#, fuzzy, c-format
+#: calendar/gui/dialogs/alarm-page.c:427 calendar/gui/e-alarm-list.c:507
+#, c-format
 msgid "%s %s after the end of the appointment"
-msgstr "Luo uusi tapaaminen"
+msgstr "%s %s tapaamisen pÃ¤Ã¤ttymisen jÃ¤lkeen"
 
-#: calendar/gui/dialogs/alarm-page.c:438
-#, fuzzy, c-format
+#: calendar/gui/dialogs/alarm-page.c:432 calendar/gui/e-alarm-list.c:512
+#, c-format
 msgid "%s at the end of the appointment"
-msgstr "Luo uusi tapaaminen"
+msgstr "%s tapaamisen lopussa"
 
-#: calendar/gui/dialogs/alarm-page.c:462
+#: calendar/gui/dialogs/alarm-page.c:456 calendar/gui/e-alarm-list.c:536
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:468
+#: calendar/gui/dialogs/alarm-page.c:462 calendar/gui/e-alarm-list.c:542
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -4077,7 +4353,7 @@ msgstr ""
 #: calendar/gui/dialogs/recurrence-page.glade.h:3
 #, fuzzy
 msgid "Date/Time:"
-msgstr "Päiväys & Aika"
+msgstr "PÃ¤ivÃ¤ys & Aika"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
@@ -4085,7 +4361,7 @@ msgstr "Muistutukset"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kuvaus:"
 
@@ -4096,7 +4372,7 @@ msgstr "_Asetukset"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "after"
-msgstr "jälkeen"
+msgstr "jÃ¤lkeen"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
@@ -4105,7 +4381,7 @@ msgstr "ennen"
 #: calendar/gui/dialogs/alarm-page.glade.h:13
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
-msgstr "päivä(ä)"
+msgstr "pÃ¤ivÃ¤(Ã¤)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:14
 msgid "end of appointment"
@@ -4143,15 +4419,13 @@ msgstr "30 minuuttia"
 msgid "60 minutes"
 msgstr "60 minuuttia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
-#, fuzzy
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:14
 msgid "Alerts"
-msgstr "Kansiot"
+msgstr "HÃ¤lytykset"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-#, fuzzy
 msgid "Calendar and Tasks Settings"
-msgstr "_Kalenterin asetukset..."
+msgstr "Kalenterin ja tehtÃ¤vien asetukset"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
@@ -4168,10 +4442,11 @@ msgstr ""
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #, fuzzy
 msgid "Days"
-msgstr "päivää"
+msgstr "pÃ¤ivÃ¤Ã¤"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1135
+#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/e-itip-control.c:608
 msgid "Friday"
 msgstr "Perjantai"
 
@@ -4186,7 +4461,8 @@ msgid "Minutes"
 msgstr "minuutti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1131
+#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/e-itip-control.c:604
 msgid "Monday"
 msgstr "Maanantai"
 
@@ -4196,7 +4472,8 @@ msgid "S_un"
 msgstr "Su"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1136
+#: calendar/gui/dialogs/recurrence-page.c:1051
+#: calendar/gui/e-itip-control.c:609
 msgid "Saturday"
 msgstr "Lauantai"
 
@@ -4207,10 +4484,11 @@ msgstr ""
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #, fuzzy
 msgid "Show week _numbers in date navigator"
-msgstr "Näytä viikkonumerot"
+msgstr "NÃ¤ytÃ¤ viikkonumerot"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1137
+#: calendar/gui/dialogs/recurrence-page.c:1052
+#: calendar/gui/e-itip-control.c:603
 msgid "Sunday"
 msgstr "Sunnuntai"
 
@@ -4226,10 +4504,11 @@ msgstr "To"
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
-msgstr "Tehtävät"
+msgstr "TehtÃ¤vÃ¤t"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1134
+#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/e-itip-control.c:607
 msgid "Thursday"
 msgstr "Torstai"
 
@@ -4242,14 +4521,15 @@ msgstr ""
 msgid "Time _zone:"
 msgstr ""
 "\n"
-"Aikavyöhyke: "
+"AikavyÃ¶hyke: "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1132
+#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/e-itip-control.c:605
 msgid "Tuesday"
 msgstr "Tiistai"
 
@@ -4258,7 +4538,8 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1133
+#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/e-itip-control.c:606
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
@@ -4266,7 +4547,7 @@ msgstr "Keskiviikko"
 #: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Work Week"
-msgstr "Työviikk_o"
+msgstr "TyÃ¶viikk_o"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Work days:"
@@ -4289,7 +4570,7 @@ msgstr ""
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #, fuzzy
 msgid "_Compress weekends in month view"
-msgstr "Tiivistä viikonloput"
+msgstr "TiivistÃ¤ viikonloput"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
@@ -4299,7 +4580,7 @@ msgstr "Valmis"
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #, fuzzy
 msgid "_Display"
-msgstr "_Päivä"
+msgstr "_PÃ¤ivÃ¤"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #, fuzzy
@@ -4327,14 +4608,13 @@ msgid "_Overdue tasks:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#, fuzzy
 msgid "_Sat"
-msgstr "La"
+msgstr "_La"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
-msgstr "Näytä tapaamisten loppumisajat"
+msgstr "NÃ¤ytÃ¤ tapaamisten loppumisajat"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
@@ -4356,160 +4636,161 @@ msgstr "Ke"
 msgid "before every appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/dialogs/cancel-comp.c:56
+#: calendar/gui/dialogs/cancel-comp.c:55
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:59
-#, fuzzy
+#: calendar/gui/dialogs/cancel-comp.c:58
 msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Haluatko varmasti poistaa tämän tilin?"
+msgstr "Haluatko varmasti peruuttaa ja poistaa tÃ¤mÃ¤n tapaamisen?"
 
-#: calendar/gui/dialogs/cancel-comp.c:65
+#: calendar/gui/dialogs/cancel-comp.c:64
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:68
-#, fuzzy
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Haluatko todella poistaa tehtävän '%s'?"
+msgstr "Haluatko todella peruuttaa ja poistaa tÃ¤mÃ¤n tehtÃ¤vÃ¤n?"
 
-#: calendar/gui/dialogs/cancel-comp.c:74
+#: calendar/gui/dialogs/cancel-comp.c:73
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:77
-#, fuzzy
+#: calendar/gui/dialogs/cancel-comp.c:76
 msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Haluatko varmasti poistaa tämän tilin?"
+msgstr "Haluatko varmasti peruuttaa ja poistaa tÃ¤mÃ¤n pÃ¤ivÃ¤kirjamerkinnÃ¤n?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Tuntematon virhe: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
-#, fuzzy
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2230
 msgid " (Completed "
-msgstr "Valmis"
+msgstr " (Valmis "
 
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2232
 #, fuzzy
 msgid "Completed "
 msgstr "Valmis"
 
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2237
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2239
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:322
 #, fuzzy
 msgid "Could not update invalid object"
-msgstr "Tiedostojen päivitys ei onnistunut"
+msgstr "Tiedostojen pÃ¤ivitys ei onnistunut"
 
-#: calendar/gui/dialogs/comp-editor.c:346
+#: calendar/gui/dialogs/comp-editor.c:325
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:349
+#: calendar/gui/dialogs/comp-editor.c:328
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:352
+#: calendar/gui/dialogs/comp-editor.c:331
 #, fuzzy
 msgid "Could not update object"
-msgstr "Tiedostojen päivitys ei onnistunut"
+msgstr "Tiedostojen pÃ¤ivitys ei onnistunut"
 
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:777
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: calendar/gui/dialogs/comp-editor.c:803
+#: calendar/gui/dialogs/comp-editor.c:782
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:806
+#: calendar/gui/dialogs/comp-editor.c:785
 #, c-format
 msgid "Task - %s"
-msgstr "Tehtävä - %s"
+msgstr "TehtÃ¤vÃ¤ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:788
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:799
 msgid "No summary"
 msgstr "Ei kuvausta"
 
-#: calendar/gui/dialogs/comp-editor.c:1221
-#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
-#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
+#: calendar/gui/dialogs/comp-editor.c:1206
+#: calendar/gui/e-calendar-table.c:1035 calendar/gui/e-day-view.c:3929
+#: calendar/gui/e-week-view.c:3737 composer/e-msg-composer.c:1155
 msgid "Save as..."
-msgstr "Tallenna nimellä..."
+msgstr "Tallenna nimellÃ¤..."
 
-#: calendar/gui/dialogs/comp-editor.c:1322
-#: calendar/gui/dialogs/comp-editor.c:1346
-#: calendar/gui/dialogs/comp-editor.c:1370
+#: calendar/gui/dialogs/comp-editor.c:1307
+#: calendar/gui/dialogs/comp-editor.c:1331
+#: calendar/gui/dialogs/comp-editor.c:1355
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1397
+#: calendar/gui/dialogs/comp-editor.c:1382
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4520,16 +4801,16 @@ msgstr "Haluatko todella poistaa tapaamisen '%s'?"
 
 #: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Haluatko todella poistaa tämän nimettömän tapaamisen?"
+msgstr "Haluatko todella poistaa tÃ¤mÃ¤n nimettÃ¶mÃ¤n tapaamisen?"
 
 #: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Haluatko todella poistaa tehtävän '%s'?"
+msgstr "Haluatko todella poistaa tehtÃ¤vÃ¤n '%s'?"
 
 #: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
-msgstr "Haluatko todella poistaa tämän nimettömän tehtävän?"
+msgstr "Haluatko todella poistaa tÃ¤mÃ¤n nimettÃ¶mÃ¤n tehtÃ¤vÃ¤n?"
 
 #: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
@@ -4541,24 +4822,23 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
 #: calendar/gui/dialogs/delete-comp.c:132
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to delete %d appointments?"
-msgstr "Haluatko todella poistaa tapaamisen '%s'?"
+msgstr "Haluatko todella poistaa %d tapaamiset?"
 
 #: calendar/gui/dialogs/delete-comp.c:137
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to delete %d tasks?"
-msgstr "Haluatko todella poistaa tehtävän '%s'?"
+msgstr "Haluatko todella poistaa %d tehtÃ¤vÃ¤Ã¤?"
 
 #: calendar/gui/dialogs/delete-comp.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to delete %d journal entries?"
-msgstr "Haluatko varmasti poistaa tämän tilin?"
+msgstr "Haluatko varmasti poistaa %d pÃ¤ivÃ¤kirjamerkintÃ¤Ã¤?"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-#, fuzzy
 msgid "Addressbook..."
-msgstr "Osoitekirja"
+msgstr "Osoitekirja..."
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #, fuzzy
@@ -4570,35 +4850,52 @@ msgstr "Poistettu"
 msgid "Enter Delegate"
 msgstr "Poistettu"
 
-#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2265
 msgid "Appointment"
 msgstr "Tapaaminen"
 
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Muistutus"
 
-#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:232
-#: calendar/gui/dialogs/event-editor.c:299
-#: calendar/gui/dialogs/event-editor.c:433
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:289
+#: calendar/gui/dialogs/event-editor.c:424
 #, fuzzy
 msgid "Scheduling"
 msgstr "Varjostus"
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:302
-#: calendar/gui/dialogs/event-editor.c:436 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:427 ui/evolution-event-editor.xml.h:6
 #, fuzzy
 msgid "Meeting"
 msgstr "Peruuta tapaaminen"
 
+#: calendar/gui/dialogs/event-page.c:644 calendar/gui/dialogs/task-page.c:554
+msgid "Start date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:654
+msgid "End date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:677
+#, fuzzy
+msgid "Start time is wrong"
+msgstr "_Alkamisaika:"
+
+#: calendar/gui/dialogs/event-page.c:684
+msgid "End time is wrong"
+msgstr ""
+
 #: calendar/gui/dialogs/event-page.glade.h:1
 msgid "A_ll day event"
-msgstr "_Koko päivän kestävä tapahtuma"
+msgstr "_Koko pÃ¤ivÃ¤n kestÃ¤vÃ¤ tapahtuma"
 
 #: calendar/gui/dialogs/event-page.glade.h:2
 msgid "B_usy"
@@ -4619,7 +4916,7 @@ msgstr "Luottamuksellinen"
 #: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
-msgstr "Päiväys & Aika"
+msgstr "PÃ¤ivÃ¤ys & Aika"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
 #, fuzzy
@@ -4647,7 +4944,7 @@ msgstr "Ju_lkinen"
 #: calendar/gui/e-calendar-table.etspec.h:13
 #, fuzzy
 msgid "Show Time As"
-msgstr "Näytä"
+msgstr "NÃ¤ytÃ¤"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:9
@@ -4657,7 +4954,7 @@ msgstr "K_uvaus:"
 #: calendar/gui/dialogs/event-page.glade.h:13
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
-msgstr "_Kontaktit..."
+msgstr "_Yhteystiedot..."
 
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
@@ -4667,19 +4964,19 @@ msgstr "_Loppumisaika:"
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: calendar/gui/dialogs/meeting-page.c:414
+#: calendar/gui/dialogs/meeting-page.c:396
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:420
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:594
+#: calendar/gui/dialogs/meeting-page.c:575
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:648
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Poista..."
@@ -4723,30 +5020,18 @@ msgid "Member"
 msgstr "Joulukuu"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:958
+#: calendar/gui/e-itip-control.c:1104
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Rooli"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Tila"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-#: shell/glade/e-active-connection-dialog.glade.h:5
-msgid "Type"
-msgstr "Tyyppi"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4758,113 +5043,65 @@ msgid "_Change Organizer"
 msgstr "Organisoija:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:456
+#: calendar/gui/e-meeting-time-sel.c:426
 msgid "_Invite Others..."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:126
-#: calendar/gui/dialogs/recurrence-page.c:146
-#: calendar/gui/dialogs/recurrence-page.c:156
-#, fuzzy
-msgid "st"
-msgstr "1."
-
-#: calendar/gui/dialogs/recurrence-page.c:127
-#: calendar/gui/dialogs/recurrence-page.c:147
-#, fuzzy
-msgid "nd"
-msgstr "2."
-
-#: calendar/gui/dialogs/recurrence-page.c:128
-#: calendar/gui/dialogs/recurrence-page.c:148
-#, fuzzy
-msgid "rd"
-msgstr "3."
-
-#: calendar/gui/dialogs/recurrence-page.c:129
-#: calendar/gui/dialogs/recurrence-page.c:130
-#: calendar/gui/dialogs/recurrence-page.c:131
-#: calendar/gui/dialogs/recurrence-page.c:132
-#: calendar/gui/dialogs/recurrence-page.c:133
-#: calendar/gui/dialogs/recurrence-page.c:134
-#: calendar/gui/dialogs/recurrence-page.c:135
-#: calendar/gui/dialogs/recurrence-page.c:136
-#: calendar/gui/dialogs/recurrence-page.c:137
-#: calendar/gui/dialogs/recurrence-page.c:138
-#: calendar/gui/dialogs/recurrence-page.c:139
-#: calendar/gui/dialogs/recurrence-page.c:140
-#: calendar/gui/dialogs/recurrence-page.c:141
-#: calendar/gui/dialogs/recurrence-page.c:142
-#: calendar/gui/dialogs/recurrence-page.c:143
-#: calendar/gui/dialogs/recurrence-page.c:144
-#: calendar/gui/dialogs/recurrence-page.c:145
-#: calendar/gui/dialogs/recurrence-page.c:149
-#: calendar/gui/dialogs/recurrence-page.c:150
-#: calendar/gui/dialogs/recurrence-page.c:151
-#: calendar/gui/dialogs/recurrence-page.c:152
-#: calendar/gui/dialogs/recurrence-page.c:153
-#: calendar/gui/dialogs/recurrence-page.c:154
-#: calendar/gui/dialogs/recurrence-page.c:155
-msgid "th"
-msgstr "."
-
-#: calendar/gui/dialogs/recurrence-page.c:629
+#: calendar/gui/dialogs/recurrence-page.c:550
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:898
+#: calendar/gui/dialogs/recurrence-page.c:824
 msgid "Recurrent date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1007
+#: calendar/gui/dialogs/recurrence-page.c:929
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:990
 #, fuzzy
 msgid "first"
 msgstr "_Etunimi:"
 
-#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:991 filter/filter-datespec.c:65
 msgid "second"
 msgstr "sekunti"
 
-#: calendar/gui/dialogs/recurrence-page.c:1074
-#, fuzzy
+#: calendar/gui/dialogs/recurrence-page.c:992
 msgid "third"
-msgstr "Muut"
+msgstr "kolmas"
 
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:993
 #, fuzzy
 msgid "fourth"
 msgstr "tunti"
 
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:994
 #, fuzzy
 msgid "last"
-msgstr "Liitä"
+msgstr "LiitÃ¤"
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1017
 #, fuzzy
 msgid "Other Date"
 msgstr "Muu faksi"
 
-#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1045 filter/filter-datespec.c:68
 msgid "day"
-msgstr "päivä"
+msgstr "pÃ¤ivÃ¤"
 
-#: calendar/gui/dialogs/recurrence-page.c:1270
+#: calendar/gui/dialogs/recurrence-page.c:1182
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1455
+#: calendar/gui/dialogs/recurrence-page.c:1367
 msgid "occurrences"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
-#, fuzzy
 msgid "A_dd"
-msgstr "Lisää"
+msgstr "_LisÃ¤Ã¤"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -4923,45 +5160,50 @@ msgstr "viikkoa"
 msgid "year(s)"
 msgstr "vuotta"
 
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:59
+#: calendar/gui/dialogs/send-comp.c:58
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The task assignment information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:70
+#: calendar/gui/dialogs/send-comp.c:69
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
+#: calendar/gui/dialogs/task-details-page.c:398
+#, fuzzy
+msgid "Completed date is wrong"
+msgstr "Valmis"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "% Complete"
-msgstr "Valmis"
+msgstr "% Valmis"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 msgid "Date Completed:"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
+#: calendar/gui/e-meeting-model.c:295 calendar/gui/e-meeting-model.c:318
+#: calendar/gui/e-meeting-model.c:549 calendar/gui/e-meeting-model.c:851
 #, fuzzy
 msgid "Needs Action"
-msgstr "Lisää toiminto"
+msgstr "LisÃ¤Ã¤ toiminto"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:860
+#: my-evolution/e-summary-preferences.c:630
 msgid "URL:"
 msgstr "URL:"
 
@@ -4973,162 +5215,153 @@ msgstr "_Prioriteetti:"
 msgid "_Status:"
 msgstr "_Tila:"
 
-#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:188
 msgid "Basic"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:216
-#: calendar/gui/dialogs/task-editor.c:261
-#: calendar/gui/dialogs/task-editor.c:386
-#, fuzzy
+#: calendar/gui/dialogs/task-editor.c:202
+#: calendar/gui/dialogs/task-editor.c:247
+#: calendar/gui/dialogs/task-editor.c:373
 msgid "Assignment"
 msgstr "Tapaaminen"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
+#: calendar/gui/dialogs/task-page.c:527
+msgid "Due date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1034
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Kuvaus:"
 
 #: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
-msgstr "_Alkamispäivä:"
+msgstr "_AlkamispÃ¤ivÃ¤:"
 
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:440
-#, c-format
+#: calendar/gui/e-calendar-table.c:415
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:441
-#, c-format
+#: calendar/gui/e-calendar-table.c:416
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:442
-#, c-format
+#: calendar/gui/e-calendar-table.c:417
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:443
-#, c-format
+#: calendar/gui/e-calendar-table.c:418
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:444
-#, c-format
+#: calendar/gui/e-calendar-table.c:419
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:445
-#, c-format
+#: calendar/gui/e-calendar-table.c:420
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:446
-#, c-format
+#: calendar/gui/e-calendar-table.c:421
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:447
-#, c-format
+#: calendar/gui/e-calendar-table.c:422
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:448
-#, c-format
+#: calendar/gui/e-calendar-table.c:423
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:449
-#, c-format
+#: calendar/gui/e-calendar-table.c:424
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:450
-#, fuzzy, c-format
+#: calendar/gui/e-calendar-table.c:425
 msgid "100%"
-msgstr "10%"
+msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
-#: calendar/gui/e-week-view.c:1917
+#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2824
+#: calendar/gui/e-week-view.c:1901
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Poista valitut kontaktit"
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
-#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
-#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:949 calendar/gui/e-day-view.c:3696
+#: calendar/gui/e-week-view.c:3521 mail/folder-browser.c:1741
+#: shell/e-shortcuts-view.c:415 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Avaa"
 
-#: calendar/gui/e-calendar-table.c:988
+#: calendar/gui/e-calendar-table.c:950
 #, fuzzy
 msgid "_Save as..."
-msgstr "Tallenna nimellä..."
+msgstr "Tallenna nimellÃ¤..."
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
-#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
+#: calendar/gui/e-calendar-table.c:951 calendar/gui/e-day-view.c:3698
+#: calendar/gui/e-week-view.c:3496 calendar/gui/e-week-view.c:3523
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "T_ulosta..."
 
-#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
-#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:955 calendar/gui/e-day-view.c:3703
+#: calendar/gui/e-week-view.c:3528 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "L_eikkaa"
 
-#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
-#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3704
+#: calendar/gui/e-week-view.c:3529 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
-#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3669
+#: calendar/gui/e-day-view.c:3705 calendar/gui/e-week-view.c:3500
+#: calendar/gui/e-week-view.c:3530 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
-msgstr "L_iitä"
+msgstr "L_iitÃ¤"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:961
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1000
-#, fuzzy
+#: calendar/gui/e-calendar-table.c:962
 msgid "_Forward as iCalendar"
-msgstr "Ladataan kalenteria"
+msgstr "_VÃ¤litÃ¤ iCalendar-muodossa"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:963
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:964
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-calendar-table.c:1007
+#: calendar/gui/e-calendar-table.c:969
 #, fuzzy
 msgid "_Delete Selected Tasks"
-msgstr "Poista tehtävä"
+msgstr "Poista tehtÃ¤vÃ¤"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
-#: calendar/gui/e-week-view.c:4240
+#: calendar/gui/e-calendar-table.c:1239 calendar/gui/e-day-view.c:7551
+#: calendar/gui/e-week-view.c:4215
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1360
+#: calendar/gui/e-calendar-table.c:1322
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
@@ -5137,8 +5370,8 @@ msgstr ""
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1096
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr "Valmis"
 
@@ -5167,8 +5400,8 @@ msgid "Start Date"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:748
-#: shell/e-shortcuts.c:1051
+#: my-evolution/component-factory.c:56 shell/e-shell.c:765
+#: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Kuvaus"
 
@@ -5176,19 +5409,15 @@ msgstr "Kuvaus"
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URL:"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:166
+#: e-util/e-time-utils.c:379
 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:121 e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:161
+#: e-util/e-time-utils.c:388
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
@@ -5199,524 +5428,590 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Päiväys tulee antaa seuraavassa muodossa: \n"
+"PÃ¤ivÃ¤ys tulee antaa seuraavassa muodossa: \n"
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:518
+#: calendar/gui/e-day-view-time-item.c:531
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
+#: calendar/gui/e-day-view-top-item.c:262 calendar/gui/e-day-view.c:1373
+#: calendar/gui/e-week-view-main-item.c:303 calendar/gui/print.c:1529
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
-#: calendar/gui/e-week-view-main-item.c:347
+#: calendar/gui/e-day-view-top-item.c:270 calendar/gui/e-day-view.c:1400
+#: calendar/gui/e-week-view-main-item.c:326
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:375
-#: calendar/gui/print.c:791
+#: calendar/gui/e-day-view.c:610 calendar/gui/e-week-view.c:344
+#: calendar/gui/print.c:813
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
-#: calendar/gui/print.c:793
+#: calendar/gui/e-day-view.c:613 calendar/gui/e-week-view.c:347
+#: calendar/gui/print.c:815
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-day-view.c:3653
 msgid "New _Appointment"
 msgstr "Uusi t_apaaminen"
 
-#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
+#: calendar/gui/e-day-view.c:3655 calendar/gui/e-week-view.c:3490
 msgid "New All Day _Event"
-msgstr "Uusi koko pä_ivän tapahtuma"
+msgstr "Uusi koko pÃ¤_ivÃ¤n tapahtuma"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-day-view.c:3657 calendar/gui/e-week-view.c:3491
 #, fuzzy
 msgid "New Meeting"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3659 calendar/gui/e-week-view.c:3492
 msgid "New Task"
-msgstr "Uusi tehtävä"
+msgstr "Uusi tehtÃ¤vÃ¤"
 
-#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3664 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Tulosta..."
 
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: calendar/gui/e-day-view.c:3676 calendar/gui/e-week-view.c:3506
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
+#: calendar/gui/e-day-view.c:3678 calendar/gui/e-week-view.c:3507
 msgid "_Go to Date..."
-msgstr "Siirry _päivään..."
+msgstr "Siirry _pÃ¤ivÃ¤Ã¤n..."
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3511
 #: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: calendar/gui/e-day-view.c:3688 calendar/gui/e-week-view.c:3515
 #: ui/evolution.xml.h:62
 #, fuzzy
 msgid "_Settings..."
-msgstr "_Sähköpostiasetukset..."
+msgstr "_SÃ¤hkÃ¶postiasetukset..."
 
-#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
-#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3522
+#: mail/folder-browser.c:1743 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
-msgstr "Tallenna _nimellä..."
+msgstr "Tallenna _nimellÃ¤..."
 
-#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3534
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Varjostus"
 
-#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
-#, fuzzy
+#: calendar/gui/e-day-view.c:3710 calendar/gui/e-week-view.c:3535
 msgid "_Forward as iCalendar..."
-msgstr "_Kontaktit..."
+msgstr "_VÃ¤litÃ¤ iCalendar-muodossa..."
 
-#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
+#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3540
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3716 calendar/gui/e-week-view.c:3541
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3542
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:615
-msgid "<b>Starts:</b> "
+#: calendar/gui/e-itip-control.c:637
+msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:649
 #, fuzzy
-msgid "<b>Ends:</b> "
-msgstr "Lähteen tiedot"
+msgid "Every day"
+msgstr "Joka"
+
+#: calendar/gui/e-itip-control.c:651
+#, fuzzy, c-format
+msgid "Every %d days"
+msgstr " %d pÃ¤ivÃ¤Ã¤"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:657
 #, fuzzy
+msgid "Every week"
+msgstr "Joka"
+
+#: calendar/gui/e-itip-control.c:659
+#, fuzzy, c-format
+msgid "Every %d weeks"
+msgstr " %d viikkoa"
+
+#: calendar/gui/e-itip-control.c:662
+msgid "Every week on "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:664
+#, fuzzy, c-format
+msgid "Every %d weeks on "
+msgstr " %d viikkoa"
+
+#: calendar/gui/e-itip-control.c:672
+msgid " and "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:679
+#, c-format
+msgid "The %s day of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:692
+#, c-format
+msgid "The %s %s of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "every month"
+msgstr "Yksi kuukausi"
+
+#: calendar/gui/e-itip-control.c:702
+#, c-format
+msgid "every %d months"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:708
+#, fuzzy
+msgid "Every year"
+msgstr "Joka"
+
+#: calendar/gui/e-itip-control.c:710
+#, c-format
+msgid "Every %d years"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:722
+#, c-format
+msgid " a total of %d times"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:730
+msgid ", ending on "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:754
+msgid "<b>Starts:</b> "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:764
+msgid "<b>Ends:</b> "
+msgstr "<b>Loppuu:</b> "
+
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
-msgstr "Valmis"
+msgstr "<b>Valmis:</b> "
 
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:881
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "Pakolliset tiedot"
 
 #. Title
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:846
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Kalenteri"
 
-#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
-#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
-#, fuzzy
+#: calendar/gui/e-itip-control.c:912 calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:939 calendar/gui/e-itip-control.c:956
 msgid "An unknown person"
-msgstr "Tuntematon virhe"
+msgstr "Tuntematon henkilÃ¶"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:963
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:832
+#: calendar/gui/e-itip-control.c:978
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:842
+#: calendar/gui/e-itip-control.c:988
 #, fuzzy
 msgid "Location:"
 msgstr ""
 "\n"
 "Maant. sijainti: "
 
-#: calendar/gui/e-itip-control.c:856
+#: calendar/gui/e-itip-control.c:1002
 #, fuzzy
 msgid "Status:"
 msgstr "_Tila:"
 
-#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:490
-#, fuzzy
+#: calendar/gui/e-itip-control.c:1007 calendar/gui/e-meeting-model.c:297
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:852
+#: calendar/gui/itip-utils.c:392
 msgid "Accepted"
-msgstr "Hyväksy "
+msgstr "HyvÃ¤ksytty"
 
-#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/itip-utils.c:395
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-meeting-model.c:299
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:853
+#: calendar/gui/itip-utils.c:398 calendar/gui/itip-utils.c:424
 #, fuzzy
 msgid "Declined"
 msgstr "Poistettu"
 
-#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
-#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
-#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
-#: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-itip-control.c:1225
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:268
+#: calendar/gui/e-meeting-model.c:333 calendar/gui/e-meeting-model.c:810
+#: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1531
+#: camel/camel-gpg-context.c:1581 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:327
-#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
-#: widgets/misc/e-charset-picker.c:444
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:345
+#: mail/mail-display.c:931 widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:510
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
-#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
-#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1126 calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1152 calendar/gui/e-itip-control.c:1165
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Valitse toiminto"
 
-#: calendar/gui/e-itip-control.c:927
-#, fuzzy
+#: calendar/gui/e-itip-control.c:1073
 msgid "Update"
-msgstr "Tehtävät"
+msgstr "PÃ¤ivitÃ¤"
 
-#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
-#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:1074 calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1128 calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1154 calendar/gui/e-itip-control.c:1167
+#: shell/e-shell.c:2092 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:955
-#, fuzzy
+#: calendar/gui/e-itip-control.c:1101
 msgid "Accept"
-msgstr "Hyväksy "
+msgstr "HyvÃ¤ksy"
 
-#: calendar/gui/e-itip-control.c:956
+#: calendar/gui/e-itip-control.c:1102
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:957
+#: calendar/gui/e-itip-control.c:1103
 #, fuzzy
 msgid "Decline"
 msgstr "Poistettu"
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:1127
 #, fuzzy
 msgid "Send Free/Busy Information"
-msgstr "Lähteen tiedot"
+msgstr "LÃ¤hteen tiedot"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:1140
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1007
+#: calendar/gui/e-itip-control.c:1153
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Tiedoksi"
 
-#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
-#: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/itip-utils.c:412
+#: shell/evolution-shell-component.c:1162 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: calendar/gui/e-itip-control.c:1101
-#, fuzzy, c-format
+#: calendar/gui/e-itip-control.c:1247
+#, c-format
 msgid "<b>%s</b> has published meeting information."
-msgstr "Pakolliset tiedot"
+msgstr "<b>%s</b> on julkaissut tapaamistietonsa."
 
-#: calendar/gui/e-itip-control.c:1102
+#: calendar/gui/e-itip-control.c:1248
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/e-itip-control.c:1107
-#, fuzzy, c-format
+#: calendar/gui/e-itip-control.c:1253
+#, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr "Pakolliset tiedot"
+msgstr "<b>%s</b> pyytÃ¤Ã¤ %s lÃ¤snÃ¤oloa tapaamisessa."
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1255
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1256
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1260
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1261
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1119
-#, fuzzy, c-format
+#: calendar/gui/e-itip-control.c:1265
+#, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "Pakolliset tiedot"
+msgstr "<b>%s</b> toivoo saavansa viimeisimmÃ¤t tapaamistiedot."
 
-#: calendar/gui/e-itip-control.c:1120
+#: calendar/gui/e-itip-control.c:1266
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1127
-#, fuzzy, c-format
+#: calendar/gui/e-itip-control.c:1273
+#, c-format
 msgid "<b>%s</b> has replied to a meeting request."
-msgstr "Pakolliset tiedot"
+msgstr "<b>%s</b> on vastannut tapaamispyyntÃ¶Ã¶n."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1274
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1135
-#, fuzzy, c-format
+#: calendar/gui/e-itip-control.c:1281
+#, c-format
 msgid "<b>%s</b> has cancelled a meeting."
-msgstr "Pakolliset tiedot"
+msgstr "<b>%s</b> on peruuttanut tapaamisen."
 
-#: calendar/gui/e-itip-control.c:1136
+#: calendar/gui/e-itip-control.c:1282
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Valitse toiminto"
 
-#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
-#: calendar/gui/e-itip-control.c:1245
+#: calendar/gui/e-itip-control.c:1289 calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1391
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1144
-#, fuzzy
+#: calendar/gui/e-itip-control.c:1290
 msgid "Bad Meeting Message"
-msgstr "Hae viestistä"
+msgstr "Huono tapaaminen-sanoma"
 
-#: calendar/gui/e-itip-control.c:1168
-#, fuzzy, c-format
+#: calendar/gui/e-itip-control.c:1314
+#, c-format
 msgid "<b>%s</b> has published task information."
-msgstr "Pakolliset tiedot"
+msgstr "<b>%s</b> on julkaissut tehtÃ¤vÃ¤tietonsa."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1315
 #, fuzzy
 msgid "Task Information"
 msgstr "Tiedoksi"
 
-#: calendar/gui/e-itip-control.c:1174
-#, fuzzy, c-format
+#: calendar/gui/e-itip-control.c:1320
+#, c-format
 msgid "<b>%s</b> requests %s to perform a task."
-msgstr "Pakolliset tiedot"
+msgstr "<b>%s</b> pyytÃ¤Ã¤ %s tekemÃ¤Ã¤n tyÃ¶tehtÃ¤vÃ¤n."
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1322
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1323
 #, fuzzy
 msgid "Task Proposal"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1327
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1182
+#: calendar/gui/e-itip-control.c:1328
 #, fuzzy
 msgid "Task Update"
-msgstr "Tehtävät"
+msgstr "TehtÃ¤vÃ¤t"
 
-#: calendar/gui/e-itip-control.c:1186
-#, fuzzy, c-format
+#: calendar/gui/e-itip-control.c:1332
+#, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "Pakolliset tiedot"
+msgstr "<b>%s</b> toivoo saavansa viimeisimmÃ¤t tyÃ¶tehtÃ¤vÃ¤tiedot."
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1333
 #, fuzzy
 msgid "Task Update Request"
-msgstr "Tehtävät"
+msgstr "TehtÃ¤vÃ¤t"
 
-#: calendar/gui/e-itip-control.c:1194
-#, fuzzy, c-format
+#: calendar/gui/e-itip-control.c:1340
+#, c-format
 msgid "<b>%s</b> has replied to a task assignment."
-msgstr "Pakolliset tiedot"
+msgstr "<b>%s</b> on vastannut tyÃ¶tehtÃ¤vÃ¤n antoon."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1341
 #, fuzzy
 msgid "Task Reply"
 msgstr "Vastaa"
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1348
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1349
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Peruuta operaatio"
 
-#: calendar/gui/e-itip-control.c:1211
-#, fuzzy
+#: calendar/gui/e-itip-control.c:1357
 msgid "Bad Task Message"
-msgstr "Hae viestistä"
+msgstr "Huono tehtÃ¤vÃ¤-sanoma"
 
-#: calendar/gui/e-itip-control.c:1230
-#, fuzzy, c-format
+#: calendar/gui/e-itip-control.c:1376
+#, c-format
 msgid "<b>%s</b> has published free/busy information."
-msgstr "Pakolliset tiedot"
+msgstr "<b>%s</b> on julkaissut vapaa/kiireinen-tietonsa."
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1377
 #, fuzzy
 msgid "Free/Busy Information"
-msgstr "Lähteen tiedot"
+msgstr "LÃ¤hteen tiedot"
 
-#: calendar/gui/e-itip-control.c:1235
-#, fuzzy, c-format
+#: calendar/gui/e-itip-control.c:1381
+#, c-format
 msgid "<b>%s</b> requests your free/busy information."
-msgstr "Pakolliset tiedot"
+msgstr "<b>%s</b> pyytÃ¤Ã¤ sinun vapaa/varattu -tietoja."
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1382
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Edellinen viesti"
 
-#: calendar/gui/e-itip-control.c:1240
-#, fuzzy, c-format
+#: calendar/gui/e-itip-control.c:1386
+#, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "Pakolliset tiedot"
+msgstr "<b>%s</b> on vastannut vapaa/varattu -kyselyyn."
 
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1387
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Edellinen viesti"
 
-#: calendar/gui/e-itip-control.c:1246
-#, fuzzy
+#: calendar/gui/e-itip-control.c:1392
 msgid "Bad Free/Busy Message"
-msgstr "Edellinen viesti"
+msgstr "Huono vapaa/kiireinen -viesti"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1382
+#: calendar/gui/e-itip-control.c:1528
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1556 calendar/gui/e-itip-control.c:1562
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1441
+#: calendar/gui/e-itip-control.c:1587
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1807 calendar/gui/e-itip-control.c:1899
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1810 calendar/gui/e-itip-control.c:1902
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
+#: calendar/gui/e-itip-control.c:1813 calendar/gui/e-itip-control.c:1905
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Bug buddya ei voitu ajaa."
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1816
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr ""
-"Tiedoston %s poistaminen epäonnistui:\n"
+"Tiedoston %s poistaminen epÃ¤onnistui:\n"
 "%s"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1819
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:1677
-#, fuzzy
+#: calendar/gui/e-itip-control.c:1822
 msgid "Calendar file could not be updated!\n"
-msgstr "Kohdistimen lataaminen epäonnistui\n"
+msgstr "Kalenteritiedostoa ei voitu pÃ¤ivittÃ¤Ã¤!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
+#: calendar/gui/e-itip-control.c:1851 calendar/gui/e-itip-control.c:1917
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1727
+#: calendar/gui/e-itip-control.c:1872
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1739
+#: calendar/gui/e-itip-control.c:1884
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:1908
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
-"Tiedoston %s poistaminen epäonnistui:\n"
+"Tiedoston %s poistaminen epÃ¤onnistui:\n"
 "%s"
 
-#: calendar/gui/e-itip-control.c:1766
+#: calendar/gui/e-itip-control.c:1911
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
-msgstr "Kohdistimen lataaminen epäonnistui\n"
+msgstr "Kohdistimen lataaminen epÃ¤onnistui\n"
 
-#: calendar/gui/e-itip-control.c:1804
+#: calendar/gui/e-itip-control.c:1949
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
+#: calendar/gui/e-itip-control.c:1979 calendar/gui/e-itip-control.c:2029
 #, fuzzy
 msgid "Item sent!\n"
-msgstr "Lähetetty"
+msgstr "LÃ¤hetetty"
 
-#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
+#: calendar/gui/e-itip-control.c:1981 calendar/gui/e-itip-control.c:2033
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1961
+#: calendar/gui/e-itip-control.c:2106
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Valitse kansio"
 
-#: calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:2113
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Valitse kansio"
@@ -5736,7 +6031,7 @@ msgstr ""
 
 #: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
-msgstr "Päiväys:"
+msgstr "PÃ¤ivÃ¤ys:"
 
 #: calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
@@ -5758,230 +6053,229 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:81
 #, fuzzy
 msgid "Chair Persons"
 msgstr "Autopuhelin"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1736
 #, fuzzy
 msgid "Required Participants"
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-meeting-model.c:86
+#: calendar/gui/e-meeting-model.c:83
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/e-meeting-model.c:87
+#: calendar/gui/e-meeting-model.c:84
 #, fuzzy
 msgid "Resources"
-msgstr "Paperilähde:"
+msgstr "PaperilÃ¤hde:"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:208 calendar/gui/e-meeting-model.c:225
+#: calendar/gui/e-meeting-model.c:539 calendar/gui/e-meeting-model.c:806
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:831
+#: calendar/gui/e-meeting-model.c:210 calendar/gui/e-meeting-model.c:227
+#: calendar/gui/e-meeting-model.c:807
 #, fuzzy
 msgid "Group"
-msgstr "Ryhmän nimi:"
+msgstr "RyhmÃ¤n nimi:"
 
-#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:212 calendar/gui/e-meeting-model.c:229
+#: calendar/gui/e-meeting-model.c:808
 #, fuzzy
 msgid "Resource"
-msgstr "Paperilähde:"
+msgstr "PaperilÃ¤hde:"
 
-#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:214 calendar/gui/e-meeting-model.c:231
+#: calendar/gui/e-meeting-model.c:809
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:243 calendar/gui/e-meeting-model.c:260
+#: calendar/gui/e-meeting-model.c:822
 msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
+#: calendar/gui/e-meeting-model.c:245 calendar/gui/e-meeting-model.c:262
+#: calendar/gui/e-meeting-model.c:541 calendar/gui/e-meeting-model.c:823
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:247 calendar/gui/e-meeting-model.c:264
+#: calendar/gui/e-meeting-model.c:824
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/e-meeting-model.c:249 calendar/gui/e-meeting-model.c:266
+#: calendar/gui/e-meeting-model.c:825
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:301 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:407
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:879
+#: calendar/gui/e-meeting-model.c:303 calendar/gui/e-meeting-model.c:326
+#: calendar/gui/e-meeting-model.c:855
 #, fuzzy
 msgid "Delegated"
 msgstr "Poistettu"
 
-#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
+#: calendar/gui/e-meeting-model.c:307 calendar/gui/e-meeting-model.c:330
 #, fuzzy
 msgid "In Process"
 msgstr "Ammatti"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2114
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2077
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2144 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2107 e-util/e-time-utils.c:189
+#: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1597
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:224
+#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1608
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:439
+#: calendar/gui/e-meeting-time-sel.c:409 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:440
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:448
 msgid "_Options"
 msgstr "_Asetukset"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:468
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:508
+#: calendar/gui/e-meeting-time-sel.c:482
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:526
+#: calendar/gui/e-meeting-time-sel.c:500
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:544
+#: calendar/gui/e-meeting-time-sel.c:518
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:561
+#: calendar/gui/e-meeting-time-sel.c:535
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:575
+#: calendar/gui/e-meeting-time-sel.c:549
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:568
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:581
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:631
+#: calendar/gui/e-meeting-time-sel.c:607
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:654
+#: calendar/gui/e-meeting-time-sel.c:630
 msgid "Meeting _start time:"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:673
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/e-tasks.c:356 calendar/gui/gnome-cal.c:2013
 #: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:385 calendar/gui/tasks-control.c:199
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:393
+#: calendar/gui/e-tasks.c:400
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
+#: calendar/gui/e-tasks.c:414 calendar/gui/gnome-cal.c:1531
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr ""
-"Tiedoston %s poistaminen epäonnistui:\n"
+"Tiedoston %s poistaminen epÃ¤onnistui:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
+#: calendar/gui/e-tasks.c:482 calendar/gui/gnome-cal.c:1735
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
-msgstr "Virhe %s:n käynnistyksessä"
+msgstr "Virhe %s:n kÃ¤ynnistyksessÃ¤"
 
-#: calendar/gui/e-tasks.c:540
+#: calendar/gui/e-tasks.c:554
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:563
+#: calendar/gui/e-tasks.c:577
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Poista valitut kontaktit"
 
-#: calendar/gui/e-tasks.c:656
+#: calendar/gui/e-tasks.c:672
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3513
+#: calendar/gui/e-week-view.c:3489
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: calendar/gui/gnome-cal.c:1530
+#: calendar/gui/gnome-cal.c:1503
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1541
+#: calendar/gui/gnome-cal.c:1517
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1581
-#, fuzzy, c-format
+#: calendar/gui/gnome-cal.c:1563
+#, c-format
 msgid "Adding alarms for %s"
-msgstr "Poistetaan kansiota %s"
+msgstr "LisÃ¤tÃ¤Ã¤n hÃ¤lytyksiÃ¤ %s varten"
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1755
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5989,7 +6283,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1764
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5997,7 +6291,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1996
+#: calendar/gui/gnome-cal.c:1995
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
@@ -6029,7 +6323,7 @@ msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:6
 msgid "Go To Today"
-msgstr "Siirry tähän päivään"
+msgstr "Siirry tÃ¤hÃ¤n pÃ¤ivÃ¤Ã¤n"
 
 #: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
@@ -6037,11 +6331,11 @@ msgstr "Tammikuu"
 
 #: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
-msgstr "Heinäkuu"
+msgstr "HeinÃ¤kuu"
 
 #: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
-msgstr "Kesäkuu"
+msgstr "KesÃ¤kuu"
 
 #: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
@@ -6063,327 +6357,182 @@ msgstr "Lokakuu"
 msgid "September"
 msgstr "Syyskuu"
 
-#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
+#: calendar/gui/itip-utils.c:250 calendar/gui/itip-utils.c:321
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:383
+#: calendar/gui/itip-utils.c:285
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:364 calendar/gui/itip-utils.c:473
 #, fuzzy
 msgid "Event information"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
+#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:475
 #, fuzzy
 msgid "Task information"
 msgstr "Tiedoksi"
 
-#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
+#: calendar/gui/itip-utils.c:368 calendar/gui/itip-utils.c:477
 #, fuzzy
 msgid "Journal information"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
+#: calendar/gui/itip-utils.c:370 calendar/gui/itip-utils.c:494
 #, fuzzy
 msgid "Free/Busy information"
-msgstr "Lähteen tiedot"
+msgstr "LÃ¤hteen tiedot"
 
-#: calendar/gui/itip-utils.c:470
-#, fuzzy
+#: calendar/gui/itip-utils.c:372
 msgid "Calendar information"
-msgstr "Pakolliset tiedot"
+msgstr "Kalenteritiedot"
 
-#: calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:408
 #, fuzzy
 msgid "Updated"
-msgstr "Tehtävät"
+msgstr "TehtÃ¤vÃ¤t"
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:416
 #, fuzzy
 msgid "Refresh"
 msgstr "vuotta"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:420
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:586
+#: calendar/gui/itip-utils.c:488
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
-msgstr "Lähteen tiedot"
+msgstr "LÃ¤hteen tiedot"
 
-#: calendar/gui/itip-utils.c:598
+#: calendar/gui/itip-utils.c:500
 #, fuzzy
 msgid "iCalendar information"
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/itip-utils.c:756
+#: calendar/gui/itip-utils.c:648
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:70
-#, fuzzy
-msgid "Could not activate Bonobo"
-msgstr "Bonobon alustus ei onnistunut"
-
-#: calendar/gui/main.c:99
-#, fuzzy
-msgid "Could not create the component editor factory"
-msgstr "Väliaikaishakemistoa ei voitu luoda: %s"
-
-#: calendar/gui/print.c:456
-msgid "1st"
-msgstr "1."
-
-#: calendar/gui/print.c:456
-msgid "2nd"
-msgstr "2."
-
-#: calendar/gui/print.c:456
-msgid "3rd"
-msgstr "3."
-
-#: calendar/gui/print.c:456
-msgid "4th"
-msgstr "4."
-
-#: calendar/gui/print.c:456
-msgid "5th"
-msgstr "5."
-
-#: calendar/gui/print.c:457
-msgid "6th"
-msgstr "6."
-
-#: calendar/gui/print.c:457
-msgid "7th"
-msgstr "7."
-
-#: calendar/gui/print.c:457
-msgid "8th"
-msgstr "8."
-
-#: calendar/gui/print.c:457
-msgid "9th"
-msgstr "9."
-
-#: calendar/gui/print.c:457
-msgid "10th"
-msgstr "10."
-
-#: calendar/gui/print.c:458
-msgid "11th"
-msgstr "11."
-
-#: calendar/gui/print.c:458
-msgid "12th"
-msgstr "12."
-
-#: calendar/gui/print.c:458
-msgid "13th"
-msgstr "13."
-
-#: calendar/gui/print.c:458
-msgid "14th"
-msgstr "14."
-
-#: calendar/gui/print.c:458
-msgid "15th"
-msgstr "15."
-
-#: calendar/gui/print.c:459
-msgid "16th"
-msgstr "16."
-
-#: calendar/gui/print.c:459
-msgid "17th"
-msgstr "17."
-
-#: calendar/gui/print.c:459
-msgid "18th"
-msgstr "18."
-
-#: calendar/gui/print.c:459
-msgid "19th"
-msgstr "19."
-
-#: calendar/gui/print.c:459
-msgid "20th"
-msgstr "20."
-
-#: calendar/gui/print.c:460
-msgid "21st"
-msgstr "21."
-
-#: calendar/gui/print.c:460
-msgid "22nd"
-msgstr "22."
-
-#: calendar/gui/print.c:460
-msgid "23rd"
-msgstr "23."
-
-#: calendar/gui/print.c:460
-msgid "24th"
-msgstr "24."
-
-#: calendar/gui/print.c:460
-msgid "25th"
-msgstr "25."
-
-#: calendar/gui/print.c:461
-msgid "26th"
-msgstr "26."
-
-#: calendar/gui/print.c:461
-msgid "27th"
-msgstr "27."
-
-#: calendar/gui/print.c:461
-msgid "28th"
-msgstr "28."
-
-#: calendar/gui/print.c:461
-msgid "29th"
-msgstr "29."
-
-#: calendar/gui/print.c:461
-msgid "30th"
-msgstr "30."
-
-#: calendar/gui/print.c:462
-msgid "31st"
-msgstr "31."
-
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Su"
 msgstr "Su"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr "Ma"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr "Ti"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr "Ke"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr "To"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "Pe"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "La"
 
 #. Day
-#: calendar/gui/print.c:1863
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
+#: calendar/gui/print.c:1910 calendar/gui/print.c:1914
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1889
+#: calendar/gui/print.c:1911
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
-#: calendar/gui/print.c:1896
+#: calendar/gui/print.c:1915 calendar/gui/print.c:1917
+#: calendar/gui/print.c:1918
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1900
+#: calendar/gui/print.c:1922
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1930
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1937
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2249
+#: calendar/gui/print.c:2267
 #, fuzzy
 msgid "Task"
-msgstr "_Tehtävä"
+msgstr "_TehtÃ¤vÃ¤"
 
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2326
 #, fuzzy, c-format
 msgid "Status: %s"
 msgstr "_Tila:"
 
-#: calendar/gui/print.c:2324
+#: calendar/gui/print.c:2344
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Prioriteetti:"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2358
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis"
 
-#: calendar/gui/print.c:2350
-#, fuzzy, c-format
+#: calendar/gui/print.c:2370
+#, c-format
 msgid "URL: %s"
-msgstr "URL:"
+msgstr "URL: %s"
 
-#: calendar/gui/print.c:2364
+#: calendar/gui/print.c:2384
 #, fuzzy, c-format
 msgid "Categories: %s"
 msgstr ""
 "\n"
-"Ryhmät: "
+"RyhmÃ¤t: "
 
-#: calendar/gui/print.c:2375
-#, fuzzy
+#: calendar/gui/print.c:2395
 msgid "Contacts: "
-msgstr "Ko_ntaktit:"
+msgstr "Yhteystiedot: "
 
-#: calendar/gui/print.c:2430
-msgid "Print Calendar"
-msgstr "Tulosta kalenteri"
-
-#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
-#: my-evolution/e-summary.c:633
+#: calendar/gui/print.c:2533 calendar/gui/print.c:2619
+#: calendar/gui/tasks-control.c:579 mail/mail-callbacks.c:2925
+#: my-evolution/e-summary.c:620
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
 
-#: calendar/gui/print.c:2550
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr "Tulosta kohta"
 
-#: calendar/gui/print.c:2631
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr "Tulostusasetukset"
 
-#: calendar/gui/tasks-control-factory.c:75
-msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr ""
-
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:150
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:462
+#: calendar/gui/tasks-control.c:465
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6391,13 +6540,12 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
-#: mail/mail-callbacks.c:2912
+#: calendar/gui/tasks-control.c:472
 #, fuzzy
 msgid "Do not ask me again."
-msgstr "Älä kysy tätä enää uudelleen"
+msgstr "Ã„lÃ¤ kysy tÃ¤tÃ¤ enÃ¤Ã¤ uudelleen"
 
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:608
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Tulosta kortti"
@@ -6430,58 +6578,59 @@ msgid ""
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
+#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:379
 msgid "SMTWTFS"
 msgstr "SMTKTPL"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
 msgid "Factory to import iCalendar files into Evolution"
 msgstr ""
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
 msgid "Imports iCalendar files into Evolution"
 msgstr ""
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
 msgid "Imports vCalendar files into Evolution"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:168
-#, fuzzy, c-format
+#: calendar/importers/icalendar-importer.c:172
+#, c-format
 msgid "Can't get storage list from registry: %s"
-msgstr ""
-"Viestin %s hakeminen kansiosta %s epäonnistui\n"
-"  %s"
+msgstr "Tallennuspaikkaluettelon haku rekisteristÃ¤ epÃ¤onnistui: %s"
 
-#: calendar/importers/icalendar-importer.c:180
-#, fuzzy, c-format
+#: calendar/importers/icalendar-importer.c:184
+#, c-format
 msgid "Can't call getFolderAtPath on storage: %s"
-msgstr "Yhdistäminen palvelimeen epäonnistui: %s"
+msgstr "Kutsu getFolderAtPath-tallennuspaikkaan epÃ¤onnistui: %s"
 
-#: calendar/importers/icalendar-importer.c:483
+#: calendar/importers/icalendar-importer.c:487
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Muistutus"
 
-#: calendar/importers/icalendar-importer.c:697
-#, fuzzy
+#: calendar/importers/icalendar-importer.c:701
 msgid "Calendar Events"
-msgstr "Kalenteri"
+msgstr "Kalenteritapahtumat"
 
-#: calendar/importers/icalendar-importer.c:722
+#: calendar/importers/icalendar-importer.c:726
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
-"Evolution löysi Pinen sähköpostitiedostoja.\n"
-"Haluatko tuoda nämä Evolutioniin?"
+"Evolution lÃ¶ysi Pinen sÃ¤hkÃ¶postitiedostoja.\n"
+"Haluatko tuoda nÃ¤mÃ¤ Evolutioniin?"
 
-#: calendar/importers/icalendar-importer.c:729
+#: calendar/importers/icalendar-importer.c:733
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Kalenteri"
 
+#: calendar/pcs/cal-backend-file.c:301
+msgid "Can't save calendar data: Malformed URI."
+msgstr ""
+
 #: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr ""
@@ -6669,9 +6818,8 @@ msgid "Africa/Dar_es_Salaam"
 msgstr ""
 
 #: calendar/zones.h:25
-#, fuzzy
 msgid "Africa/Djibouti"
-msgstr "Djibouti"
+msgstr "Afrikka/Djibouti"
 
 #: calendar/zones.h:26
 msgid "Africa/Douala"
@@ -6822,9 +6970,8 @@ msgid "America/Antigua"
 msgstr ""
 
 #: calendar/zones.h:63
-#, fuzzy
 msgid "America/Araguaina"
-msgstr "Nicaragua"
+msgstr "Amerikka/Nicaragua"
 
 #: calendar/zones.h:64
 msgid "America/Aruba"
@@ -6835,18 +6982,16 @@ msgid "America/Asuncion"
 msgstr ""
 
 #: calendar/zones.h:66
-#, fuzzy
 msgid "America/Barbados"
-msgstr "Barbados"
+msgstr "Amerikka/Barbados"
 
 #: calendar/zones.h:67
 msgid "America/Belem"
 msgstr ""
 
 #: calendar/zones.h:68
-#, fuzzy
 msgid "America/Belize"
-msgstr "Belize"
+msgstr "Amerikka/Belize"
 
 #: calendar/zones.h:69
 msgid "America/Boa_Vista"
@@ -6901,9 +7046,8 @@ msgid "America/Cordoba"
 msgstr ""
 
 #: calendar/zones.h:82
-#, fuzzy
 msgid "America/Costa_Rica"
-msgstr "Costa Rica"
+msgstr "Amerikka/Costa_Rica"
 
 #: calendar/zones.h:83
 msgid "America/Cuiaba"
@@ -6934,9 +7078,8 @@ msgid "America/Detroit"
 msgstr ""
 
 #: calendar/zones.h:90
-#, fuzzy
 msgid "America/Dominica"
-msgstr "Dominica"
+msgstr "Amerikka/Dominica"
 
 #: calendar/zones.h:91
 msgid "America/Edmonton"
@@ -6947,9 +7090,8 @@ msgid "America/Eirunepe"
 msgstr ""
 
 #: calendar/zones.h:93
-#, fuzzy
 msgid "America/El_Salvador"
-msgstr "El Salvador"
+msgstr "Amerikka/El_Salvador"
 
 #: calendar/zones.h:94
 msgid "America/Fortaleza"
@@ -6972,28 +7114,24 @@ msgid "America/Grand_Turk"
 msgstr ""
 
 #: calendar/zones.h:99
-#, fuzzy
 msgid "America/Grenada"
-msgstr "Grenada"
+msgstr "Amerikka/Grenada"
 
 #: calendar/zones.h:100
-#, fuzzy
 msgid "America/Guadeloupe"
-msgstr "Guadeloupe"
+msgstr "Amerikka/Guadeloupe"
 
 #: calendar/zones.h:101
-#, fuzzy
 msgid "America/Guatemala"
-msgstr "Guatemala"
+msgstr "Amerikka/Guatemala"
 
 #: calendar/zones.h:102
 msgid "America/Guayaquil"
 msgstr ""
 
 #: calendar/zones.h:103
-#, fuzzy
 msgid "America/Guyana"
-msgstr "Guyana"
+msgstr "Amerikka/Guyana"
 
 #: calendar/zones.h:104
 msgid "America/Halifax"
@@ -7036,9 +7174,8 @@ msgid "America/Iqaluit"
 msgstr ""
 
 #: calendar/zones.h:114
-#, fuzzy
 msgid "America/Jamaica"
-msgstr "Jamaika"
+msgstr "Amerikka/Jamaika"
 
 #: calendar/zones.h:115
 msgid "America/Jujuy"
@@ -7153,9 +7290,8 @@ msgid "America/North_Dakota/Center"
 msgstr ""
 
 #: calendar/zones.h:143
-#, fuzzy
 msgid "America/Panama"
-msgstr "Panama"
+msgstr "Amerikka/Panama"
 
 #: calendar/zones.h:144
 msgid "America/Pangnirtung"
@@ -7266,9 +7402,8 @@ msgid "America/Thunder_Bay"
 msgstr ""
 
 #: calendar/zones.h:171
-#, fuzzy
 msgid "America/Tijuana"
-msgstr "Azerbaidzan"
+msgstr "Amerikka/Tijuana"
 
 #: calendar/zones.h:172
 msgid "America/Tortola"
@@ -7367,9 +7502,8 @@ msgid "Asia/Baghdad"
 msgstr ""
 
 #: calendar/zones.h:196
-#, fuzzy
 msgid "Asia/Bahrain"
-msgstr "Bahrain"
+msgstr "Aasia/Bahrain"
 
 #: calendar/zones.h:197
 msgid "Asia/Baku"
@@ -7404,9 +7538,8 @@ msgid "Asia/Chongqing"
 msgstr ""
 
 #: calendar/zones.h:205
-#, fuzzy
 msgid "Asia/Colombo"
-msgstr "Kolumbia"
+msgstr "Aasia/Colombo"
 
 #: calendar/zones.h:206
 msgid "Asia/Damascus"
@@ -7437,9 +7570,8 @@ msgid "Asia/Harbin"
 msgstr ""
 
 #: calendar/zones.h:213
-#, fuzzy
 msgid "Asia/Hong_Kong"
-msgstr "Hong Kong"
+msgstr "Aasia/Hong_Kong"
 
 #: calendar/zones.h:214
 msgid "Asia/Hovd"
@@ -7498,27 +7630,24 @@ msgid "Asia/Kuching"
 msgstr ""
 
 #: calendar/zones.h:228
-#, fuzzy
 msgid "Asia/Kuwait"
-msgstr "Kuwait"
+msgstr "Aasia/Kuwait"
 
 #: calendar/zones.h:229
 msgid "Asia/Macao"
 msgstr ""
 
 #: calendar/zones.h:230
-#, fuzzy
 msgid "Asia/Macau"
-msgstr "Qatar"
+msgstr "Aasia/Macau"
 
 #: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr ""
 
 #: calendar/zones.h:232
-#, fuzzy
 msgid "Asia/Makassar"
-msgstr "Qatar"
+msgstr "Aasia/Makassar"
 
 #: calendar/zones.h:233
 msgid "Asia/Manila"
@@ -7541,9 +7670,8 @@ msgid "Asia/Omsk"
 msgstr ""
 
 #: calendar/zones.h:238
-#, fuzzy
 msgid "Asia/Oral"
-msgstr "Bahrain"
+msgstr "Aasia/Oral"
 
 #: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
@@ -7558,9 +7686,8 @@ msgid "Asia/Pyongyang"
 msgstr ""
 
 #: calendar/zones.h:242
-#, fuzzy
 msgid "Asia/Qatar"
-msgstr "Qatar"
+msgstr "Aasia/Qatar"
 
 #: calendar/zones.h:243
 msgid "Asia/Qyzylorda"
@@ -7595,9 +7722,8 @@ msgid "Asia/Shanghai"
 msgstr ""
 
 #: calendar/zones.h:251
-#, fuzzy
 msgid "Asia/Singapore"
-msgstr "Singapore"
+msgstr "Aasia/Singapore"
 
 #: calendar/zones.h:252
 msgid "Asia/Taipei"
@@ -7660,18 +7786,16 @@ msgid "Atlantic/Azores"
 msgstr ""
 
 #: calendar/zones.h:267
-#, fuzzy
 msgid "Atlantic/Bermuda"
-msgstr "Bermudasaaret"
+msgstr "Atlantti/Bermudasaaret"
 
 #: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr ""
 
 #: calendar/zones.h:269
-#, fuzzy
 msgid "Atlantic/Cape_Verde"
-msgstr "Kap Verde"
+msgstr "Atlantti/Kap_Verde"
 
 #: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
@@ -8163,30 +8287,38 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:170
+#: camel/camel-cipher-context.c:178
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:210
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:296
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-data-cache.c:169
+#: camel/camel-cipher-context.c:342
+msgid "You may not import keys with this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:374
+msgid "You may not export keys with this cipher"
+msgstr ""
+
+#: camel/camel-data-cache.c:137
 msgid "Unable to create cache path"
 msgstr ""
 
-#: camel/camel-data-cache.c:443
+#: camel/camel-data-cache.c:375
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
-msgstr "Välimuistihakemistoa ei voitu avata: %s"
+msgstr "VÃ¤limuistihakemistoa ei voitu avata: %s"
 
 #: camel/camel-disco-diary.c:185
 #, c-format
@@ -8217,103 +8349,108 @@ msgstr "Poistetaan kansiota %s"
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Viestin salauksen purkaminen epÃ¤onnistui."
+
+#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Viestin salauksen purkaminen epÃ¤onnistui."
+
+#: camel/camel-filter-driver.c:744
+#, fuzzy, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr "Hakemistoa %s ei voitu luoda: %s"
+
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
-msgstr "Virhe jäsennettäessä suodatinta: %s: %s"
+msgstr "Virhe jÃ¤sennettÃ¤essÃ¤ suodatinta: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:951
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:966
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
-msgstr "Haetaan viestiä %d (%d%%)"
+msgstr "Haetaan viestiÃ¤ %d (%d%%)"
 
-#: camel/camel-filter-driver.c:970
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
-msgstr "Viestiä ei voida avata"
+msgstr "ViestiÃ¤ ei voida avata"
 
-#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr "Virhe viestin %d kohdalla"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:1058
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
-msgstr "Haetaan viestiä %d / %d"
+msgstr "Haetaan viestiÃ¤ %d / %d"
 
-#: camel/camel-filter-driver.c:1073
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Virhe viestin %d/%d kohdalla"
 
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 #, fuzzy
 msgid "Failed to retrieve message"
-msgstr "Viestin salauksen purkaminen epäonnistui."
+msgstr "Viestin salauksen purkaminen epÃ¤onnistui."
 
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 msgid "Invalid arguments to (system-flag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 msgid "Invalid arguments to (user-tag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:514
-#, fuzzy, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "Viestin salauksen purkaminen epäonnistui."
-
-#: camel/camel-filter-search.c:550
-#, fuzzy, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "Viestin salauksen purkaminen epäonnistui."
-
-#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
+#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
@@ -8336,14 +8473,14 @@ msgstr ""
 #: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Moving messages"
-msgstr "Lähetetään viestiä"
+msgstr "LÃ¤hetetÃ¤Ã¤n viestiÃ¤"
 
 #: camel/camel-folder.c:1319
 #, fuzzy
 msgid "Copying messages"
-msgstr "Lähetetään viestiä"
+msgstr "LÃ¤hetetÃ¤Ã¤n viestiÃ¤"
 
-#: camel/camel-gpg-context.c:697
+#: camel/camel-gpg-context.c:724
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8351,75 +8488,76 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:711
+#: camel/camel-gpg-context.c:738
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:761
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:742
+#: camel/camel-gpg-context.c:769
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
-#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
-#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
+#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1246
+#: camel/camel-gpg-context.c:1353 camel/camel-gpg-context.c:1428
+#: camel/camel-gpg-context.c:1485 mail/mail-send-recv.c:565
 msgid "Cancelled."
 msgstr "Peruutettu."
 
-#: camel/camel-gpg-context.c:771
+#: camel/camel-gpg-context.c:798
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:777
+#: camel/camel-gpg-context.c:804
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Odottamaton vastaus POP-palvelimelta: %s"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:814
 #, fuzzy
 msgid "No data provided"
-msgstr "Vastaanottajia ei ole määritelty"
+msgstr "Vastaanottajia ei ole mÃ¤Ã¤ritelty"
 
-#: camel/camel-gpg-context.c:830
+#: camel/camel-gpg-context.c:857
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
-msgstr "Viestiä ei voida lähettää: vastaanottajia ei ole määritelty."
+msgstr "ViestiÃ¤ ei voida lÃ¤hettÃ¤Ã¤: vastaanottajia ei ole mÃ¤Ã¤ritelty."
 
-#: camel/camel-gpg-context.c:1082
+#: camel/camel-gpg-context.c:1122
 #, fuzzy, c-format
 msgid ""
-"Failed to GPG %s message: %s\n"
+"Failed to GPG %s: %s\n"
 "\n"
 "%.*s"
-msgstr "Viestin salauksen purkaminen epäonnistui."
+msgstr "Viestin salauksen purkaminen epÃ¤onnistui."
 
-#: camel/camel-gpg-context.c:1088
+#: camel/camel-gpg-context.c:1128
 #, fuzzy, c-format
-msgid "Failed to GPG %s message: %s\n"
-msgstr "Viestin salauksen purkaminen epäonnistui."
+msgid "Failed to GPG %s: %s\n"
+msgstr "Viestin salauksen purkaminen epÃ¤onnistui."
 
-#: camel/camel-gpg-context.c:1197
+#: camel/camel-gpg-context.c:1237 camel/camel-gpg-context.c:1530
+#: camel/camel-gpg-context.c:1580
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
-msgstr "Viestin salauksen purkaminen epäonnistui."
+msgstr "Viestin salauksen purkaminen epÃ¤onnistui."
 
-#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
-#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
-#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
+#: camel/camel-gpg-context.c:1267 camel/camel-gpg-context.c:1345
+#: camel/camel-gpg-context.c:1419 camel/camel-gpg-context.c:1449
+#: camel/camel-gpg-context.c:1476 camel/camel-gpg-context.c:1506
 #, fuzzy
 msgid "Failed to execute gpg."
-msgstr "Viestin salauksen purkaminen epäonnistui."
+msgstr "Viestin salauksen purkaminen epÃ¤onnistui."
 
-#: camel/camel-gpg-context.c:1290
+#: camel/camel-gpg-context.c:1330
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "Väliaikaistiedostoa ei voitu luoda: %s"
+msgstr "VÃ¤liaikaistiedostoa ei voitu luoda: %s"
 
 #: camel/camel-lock-client.c:111
 #, c-format
@@ -8439,25 +8577,24 @@ msgstr ""
 #: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
-msgstr "Lukitus epäonnistui: %s"
+msgstr "Lukitus epÃ¤onnistui: %s"
 
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:93 camel/camel-lock.c:112
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:152
+#: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:206
+#: camel/camel-lock.c:209
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:268
+#: camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
@@ -8467,54 +8604,54 @@ msgstr ""
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:121
+#: camel/camel-movemail.c:120
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:129
+#: camel/camel-movemail.c:128
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:157
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
-msgstr "Viestin tallentaminen väliaikaistiedostoon %s epäonnistui: %s"
+msgstr "Viestin tallentaminen vÃ¤liaikaistiedostoon %s epÃ¤onnistui: %s"
 
-#: camel/camel-movemail.c:188
+#: camel/camel-movemail.c:187
 #, c-format
 msgid "Could not create pipe: %s"
-msgstr "Putken luonti epäonnistui: %s"
+msgstr "Putken luonti epÃ¤onnistui: %s"
 
-#: camel/camel-movemail.c:200
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not fork: %s"
-msgstr "Haaroitus epäonnistui: %s"
+msgstr "Haaroitus epÃ¤onnistui: %s"
 
-#: camel/camel-movemail.c:238
+#: camel/camel-movemail.c:237
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 msgid "(Unknown error)"
 msgstr "(tuntematon virhe)"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:261
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "VIrhe luettaessa viestitiedostoa: %s"
 
-#: camel/camel-movemail.c:273
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Error writing mail temp file: %s"
-msgstr "Virhe kirjoitettaessa väliaikaista viestitiedostoa: %s"
+msgstr "Virhe kirjoitettaessa vÃ¤liaikaista viestitiedostoa: %s"
 
-#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
+#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
 #, c-format
 msgid "Error copying mail temp file: %s"
-msgstr "Virhe kopioitaessa viestin väliaikaistiedostoa: %s"
+msgstr "Virhe kopioitaessa viestin vÃ¤liaikaistiedostoa: %s"
 
 #: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
@@ -8528,28 +8665,28 @@ msgstr ""
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:624
+#: camel/camel-multipart-signed.c:628
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:678
+#: camel/camel-multipart-signed.c:682
 #, fuzzy
 msgid "parse error"
 msgstr "Muu virhe"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:132
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
-"Moduulin %s lataaminen epäonnistui: Järjestelmäsi ei tue moduulien "
+"Moduulin %s lataaminen epÃ¤onnistui: JÃ¤rjestelmÃ¤si ei tue moduulien "
 "lataamista."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:141
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:149
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
@@ -8560,11 +8697,11 @@ msgstr ""
 
 #: camel/camel-sasl-anonymous.c:35
 msgid "This option will connect to the server using an anonymous login."
-msgstr "Tämä valitsin kirjautuu palvelimelle anonyymisti."
+msgstr "TÃ¤mÃ¤ valitsin kirjautuu palvelimelle anonyymisti."
 
 #: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
-msgstr "Todennus epäonnistui."
+msgstr "Todennus epÃ¤onnistui."
 
 #: camel/camel-sasl-anonymous.c:119
 #, c-format
@@ -8597,40 +8734,112 @@ msgid ""
 "the server supports it."
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:43
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:45
+#: camel/camel-sasl-digest-md5.c:48
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:825
+#: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:847
+#: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr ""
 
+#: camel/camel-sasl-gssapi.c:40
+msgid "GSSAPI"
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:42
+#, fuzzy
+msgid "This option will connect to the server using Kerberos 5 authentication."
+msgstr "TÃ¤mÃ¤ valitsin kirjautuu palvelimelle anonyymisti."
+
+#: camel/camel-sasl-gssapi.c:133
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:138
+msgid "The provided target_name parameter was ill-formed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:141
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:145
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:150
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:154
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:159
+msgid ""
+"Indicates that the supplied context handle did not refer to a valid context."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:163
+msgid "Indicates that consistency checks performed on the input_token failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:167
+msgid "The consistency checks performed on the credential failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:170
+msgid "The referenced credentials have expired."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:177 camel/camel-sasl-gssapi.c:222
+#: camel/camel-sasl-gssapi.c:257 camel/camel-sasl-gssapi.c:273
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:1052
+msgid "Bad authentication response from server."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:281
+#, fuzzy
+msgid "Unsupported security layer."
+msgstr "Tar_kista tuetut tavat"
+
 #: camel/camel-sasl-kerberos4.c:40
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
@@ -8646,19 +8855,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1059
-msgid "Bad authentication response from server."
-msgstr ""
-
 #: camel/camel-sasl-login.c:32
 #, fuzzy
 msgid "Login"
-msgstr "lähtevät"
+msgstr "lÃ¤htevÃ¤t"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
-msgstr "Tämä valitsin yhdistää palvelimeen yksinkertaista salasanaa käyttäen."
+msgstr "TÃ¤mÃ¤ valitsin yhdistÃ¤Ã¤ palvelimeen yksinkertaista salasanaa kÃ¤yttÃ¤en."
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
@@ -8673,7 +8877,7 @@ msgstr ""
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
-msgstr "Tämä valitsin yhdistää palvelimeen yksinkertaista salasanaa käyttäen."
+msgstr "TÃ¤mÃ¤ valitsin yhdistÃ¤Ã¤ palvelimeen yksinkertaista salasanaa kÃ¤yttÃ¤en."
 
 #: camel/camel-sasl-plain.c:32
 msgid "PLAIN"
@@ -8690,7 +8894,7 @@ msgstr ""
 #: camel/camel-sasl-popb4smtp.c:107
 #, fuzzy
 msgid "POP Source URI"
-msgstr "Lähde"
+msgstr "LÃ¤hde"
 
 #: camel/camel-sasl-popb4smtp.c:111
 msgid "POP Before SMTP auth using an unknown transport"
@@ -8700,7 +8904,7 @@ msgstr ""
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
-#: camel/camel-search-private.c:113
+#: camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
@@ -8720,12 +8924,12 @@ msgstr ""
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:743
+#: camel/camel-service.c:741
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:774 camel/camel-service.c:885
+#: camel/camel-service.c:773 camel/camel-service.c:885
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
@@ -8761,12 +8965,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:351 camel/camel-session.c:419
+#: camel/camel-session.c:354 camel/camel-session.c:422
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:545
+#: camel/camel-session.c:548
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8775,52 +8979,51 @@ msgstr ""
 "Hakemistoa %s ei voitu luoda:\n"
 "%s"
 
-#: camel/camel-smime-context.c:173
+#: camel/camel-smime-context.c:171
 #, c-format
 msgid "Please enter your password for %s"
 msgstr ""
 
-#: camel/camel-smime-context.c:203
+#: camel/camel-smime-context.c:201
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
 
-#: camel/camel-smime-context.c:209
+#: camel/camel-smime-context.c:207
 #, c-format
 msgid "The signature certificate for \"%s\" does not exist."
 msgstr ""
 
-#: camel/camel-smime-context.c:249
+#: camel/camel-smime-context.c:247
 #, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr ""
 
-#: camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-#: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+#: camel/camel-smime-context.c:417 camel/camel-smime-context.c:428
+#: camel/camel-smime-context.c:534 camel/camel-smime-context.c:544
 #, c-format
 msgid "Failed to find certificate for \"%s\"."
 msgstr ""
 
-#: camel/camel-smime-context.c:556
+#: camel/camel-smime-context.c:554
 msgid "Failed to find a common bulk algorithm."
 msgstr ""
 
-#: camel/camel-smime-context.c:810
+#: camel/camel-smime-context.c:808
 msgid "Failed to decode message."
-msgstr "Viestin salauksen purkaminen epäonnistui."
+msgstr "Viestin salauksen purkaminen epÃ¤onnistui."
 
-#: camel/camel-smime-context.c:855
+#: camel/camel-smime-context.c:853
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:214
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/camel-store.c:306
-#, fuzzy
+#: camel/camel-store.c:268
 msgid "Cannot create folder: Invalid operation on this store"
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
+msgstr "Kansion luominen ei onnistu: virheellinen tapahtuma tallennuspaikassa"
 
 #: camel/camel-tcp-stream-openssl.c:566
 msgid "Unable to get issuer's certificate"
@@ -8940,7 +9143,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:811
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8949,11 +9152,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:817
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:817
 msgid "BAD"
 msgstr ""
 
@@ -8970,7 +9173,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:690
+#: camel/camel-tcp-stream-ssl.c:821
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8980,28 +9183,28 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:734
+#: camel/camel-tcp-stream-ssl.c:865
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:786
+#: camel/camel-tcp-stream-ssl.c:917
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:804
+#: camel/camel-tcp-stream-ssl.c:935
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:821
+#: camel/camel-tcp-stream-ssl.c:952
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9011,12 +9214,12 @@ msgstr ""
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
-msgstr "URL:n `%s' jäsentäminen epäonnistui"
+msgstr "URL:n `%s' jÃ¤sentÃ¤minen epÃ¤onnistui"
 
 #: camel/camel-vee-folder.c:618
 #, fuzzy, c-format
 msgid "Error storing `%s': %s"
-msgstr "Virhe %s:n käynnistyksessä"
+msgstr "Virhe %s:n kÃ¤ynnistyksessÃ¤"
 
 #: camel/camel-vee-folder.c:656
 #, c-format
@@ -9024,50 +9227,52 @@ msgid "No such message %s in %s"
 msgstr ""
 
 #: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
-#, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "Etsi uusia viestejä kaikista kansioista"
+msgstr ""
+"Viestien kopioiminen tai siirtÃ¤minen ei onnistu virtuaalisiin kansioihin"
 
-#: camel/camel-vee-store.c:296
-#, fuzzy, c-format
+#: camel/camel-vee-store.c:272
+#, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
+msgstr "Kansion poistaminen ei onnistu: %s: Virheellinen tapahtuma"
 
-#: camel/camel-vee-store.c:319
+#: camel/camel-vee-store.c:291
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/camel-vee-store.c:332
+#: camel/camel-vee-store.c:304
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/camel-vee-store.c:340
+#: camel/camel-vee-store.c:312
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
-#: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2611
+#: camel/providers/imap/camel-imap-command.c:452
+#: camel/providers/imap/camel-imap-store.c:2642
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2614
+#: camel/providers/imap/camel-imap-store.c:2645
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
 
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:326
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
-msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
+msgstr ""
+"HÃ¤lytys IMAP-palvelimelta %s@%s:\n"
+"%s"
 
 #: camel/providers/imap/camel-imap-command.c:395
 #, c-format
@@ -9077,85 +9282,85 @@ msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
 #: camel/providers/imap/camel-imap-command.c:405
 #, c-format
 msgid "IMAP command failed: %s"
-msgstr "IMAP-komento epäonnistui: %s"
+msgstr "IMAP-komento epÃ¤onnistui: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:462
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:654
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:690
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:221
+#: camel/providers/imap/camel-imap-folder.c:222
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:240
+#: camel/providers/imap/camel-imap-folder.c:241
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:306
+#: camel/providers/imap/camel-imap-folder.c:307
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:548
+#: camel/providers/imap/camel-imap-folder.c:549
 msgid "Scanning for changed messages"
-msgstr "Etsitään muuttuneita viestejä"
+msgstr "EtsitÃ¤Ã¤n muuttuneita viestejÃ¤"
 
-#: camel/providers/imap/camel-imap-folder.c:1872
+#: camel/providers/imap/camel-imap-folder.c:1873
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
-msgstr "Viestin salauksen purkaminen epäonnistui."
+msgstr "Viestin salauksen purkaminen epÃ¤onnistui."
 
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-maildir-folder.c:225
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:211
+#: camel/providers/local/camel-mh-folder.c:220
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1931
-#: camel/providers/imap/camel-imap-folder.c:2527
+#: camel/providers/imap/camel-imap-folder.c:1933
+#: camel/providers/imap/camel-imap-folder.c:2529
 msgid "This message is not currently available"
-msgstr "Tätä viestiä ei ole juuri nyt saatavilla"
+msgstr "TÃ¤tÃ¤ viestiÃ¤ ei ole juuri nyt saatavilla"
 
-#: camel/providers/imap/camel-imap-folder.c:2191
-#: camel/providers/imap/camel-imap-folder.c:2261
+#: camel/providers/imap/camel-imap-folder.c:2193
+#: camel/providers/imap/camel-imap-folder.c:2263
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2565
+#: camel/providers/imap/camel-imap-folder.c:2567
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
 #: camel/providers/imap/camel-imap-message-cache.c:155
 #, c-format
 msgid "Could not open cache directory: %s"
-msgstr "Välimuistihakemistoa ei voitu avata: %s"
+msgstr "VÃ¤limuistihakemistoa ei voitu avata: %s"
 
 #: camel/providers/imap/camel-imap-message-cache.c:252
 #: camel/providers/imap/camel-imap-message-cache.c:309
@@ -9163,22 +9368,22 @@ msgstr "Välimuistihakemistoa ei voitu avata: %s"
 #: camel/providers/imap/camel-imap-message-cache.c:372
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
-msgstr "Viestin salauksen purkaminen epäonnistui."
+msgstr "Viestin salauksen purkaminen epÃ¤onnistui."
 
 #: camel/providers/imap/camel-imap-message-cache.c:417
 #, fuzzy, c-format
 msgid "Failed to cache %s: %s"
-msgstr "Viestin salauksen purkaminen epäonnistui."
+msgstr "Viestin salauksen purkaminen epÃ¤onnistui."
 
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
-msgstr "Tarkastetaan onko uutta sähköpostia"
+msgstr "Tarkastetaan onko uutta sÃ¤hkÃ¶postia"
 
 #: camel/providers/imap/camel-imap-provider.c:45
 msgid "Check for new messages in all folders"
-msgstr "Etsi uusia viestejä kaikista kansioista"
+msgstr "Etsi uusia viestejÃ¤ kaikista kansioista"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1133
 msgid "Folders"
 msgstr "Kansiot"
 
@@ -9209,13 +9414,13 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
 msgid "Password"
 msgstr "Salasana"
 
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "Ota yhteys IMAP-palvelimeen tekstimuotoista salasanaa käyttäen."
+msgstr "Ota yhteys IMAP-palvelimeen tekstimuotoista salasanaa kÃ¤yttÃ¤en."
 
 #: camel/providers/imap/camel-imap-store.c:457
 #, fuzzy, c-format
@@ -9227,59 +9432,58 @@ msgstr "SMTP-palvelin %s"
 msgid "IMAP service for %s on %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
-#: camel/providers/pop3/camel-pop3-store.c:180
+#: camel/providers/pop3/camel-pop3-store.c:183
 msgid "Connection cancelled"
 msgstr "Yhteys peruutettu"
 
-#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/imap/camel-imap-store.c:590
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:275
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:646
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Yhdistäminen palvelimeen epäonnistui: %s"
+msgstr "YhdistÃ¤minen palvelimeen epÃ¤onnistui: %s"
 
-#: camel/providers/imap/camel-imap-store.c:647
-#: camel/providers/pop3/camel-pop3-store.c:213
+#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/pop3/camel-pop3-store.c:216
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:678
-#: camel/providers/pop3/camel-pop3-store.c:254
+#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/pop3/camel-pop3-store.c:257
 #, fuzzy
 msgid "SSL negotiations failed"
-msgstr "Todennus epäonnistui."
+msgstr "Todennus epÃ¤onnistui."
 
-#: camel/providers/imap/camel-imap-store.c:1082
+#: camel/providers/imap/camel-imap-store.c:1075
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1092
-#: camel/providers/smtp/camel-smtp-transport.c:482
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:485
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1116
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1131
-#: camel/providers/smtp/camel-smtp-transport.c:523
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr "Et antanut salasanaa."
 
-#: camel/providers/imap/camel-imap-store.c:1160
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9287,24 +9491,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1462
-#: camel/providers/imap/camel-imap-store.c:1604
+#: camel/providers/imap/camel-imap-store.c:1496
+#: camel/providers/imap/camel-imap-store.c:1638
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1839
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1817
+#: camel/providers/imap/camel-imap-store.c:1851
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Tuntematon virhe: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:1887
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9378,8 +9582,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -9391,38 +9595,38 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:239
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr "Paikallinen viestitiedosto %s"
 
-#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:905
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
-msgstr "Hakemistoa %s ei voitu uudelleennimetä seuraavaksi: %s: %s"
+msgstr "Hakemistoa %s ei voitu uudelleennimetÃ¤ seuraavaksi: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:363
+#: camel/providers/local/camel-local-store.c:365
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr ""
-"Tiedoston %s poistaminen epäonnistui:\n"
+"Tiedoston %s poistaminen epÃ¤onnistui:\n"
 "%s"
 
-#: camel/providers/local/camel-local-store.c:384
+#: camel/providers/local/camel-local-store.c:388
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:394
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -9431,10 +9635,10 @@ msgstr ""
 #, fuzzy, c-format
 msgid "Could not save summary: %s: %s"
 msgstr ""
-"Tiedoston %s poistaminen epäonnistui:\n"
+"Tiedoston %s poistaminen epÃ¤onnistui:\n"
 "%s"
 
-#: camel/providers/local/camel-local-summary.c:454
+#: camel/providers/local/camel-local-summary.c:457
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -9448,14 +9652,14 @@ msgstr "Virhe viestin %d kohdalla"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:219
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mh-folder.c:221
 msgid "Invalid message contents"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:160
+#: camel/providers/local/camel-spool-store.c:164
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9465,14 +9669,14 @@ msgstr ""
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:168
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Kansiota `%s' ei ole olemassa."
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:168
+#: camel/providers/local/camel-spool-store.c:173
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9485,84 +9689,84 @@ msgid "`%s' is not a maildir directory."
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
+#: camel/providers/local/camel-maildir-store.c:205
 #: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
-msgstr "Kansion `%s' poistaminen epäonnistui: %s"
+msgstr "Kansion `%s' poistaminen epÃ¤onnistui: %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:169
 msgid "not a maildir directory"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:282
-#: camel/providers/local/camel-spool-store.c:312
+#: camel/providers/local/camel-spool-store.c:287
+#: camel/providers/local/camel-spool-store.c:317
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:416
-#: camel/providers/local/camel-maildir-summary.c:545
+#: camel/providers/local/camel-maildir-summary.c:417
+#: camel/providers/local/camel-maildir-summary.c:548
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:539
+#: camel/providers/local/camel-maildir-summary.c:541
 #, fuzzy
 msgid "Checking folder consistency"
-msgstr "Tarkastetaan onko uutta sähköpostia"
+msgstr "Tarkastetaan onko uutta sÃ¤hkÃ¶postia"
 
-#: camel/providers/local/camel-maildir-summary.c:640
+#: camel/providers/local/camel-maildir-summary.c:644
 #, fuzzy
 msgid "Checking for new messages"
-msgstr "Etsitään uusia viestejä"
+msgstr "EtsitÃ¤Ã¤n uusia viestejÃ¤"
 
-#: camel/providers/local/camel-maildir-summary.c:729
+#: camel/providers/local/camel-maildir-summary.c:733
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:583
-#: camel/providers/local/camel-mbox-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:679
 #: camel/providers/local/camel-spool-summary.c:145
 #, fuzzy
 msgid "Storing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:159
+#: camel/providers/local/camel-spool-folder.c:149
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:218
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:274
+#: camel/providers/local/camel-mbox-folder.c:278
 msgid "Mail append cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:281
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:396
-#: camel/providers/local/camel-mbox-folder.c:404
+#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:400
+#: camel/providers/local/camel-mbox-folder.c:408
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
-"Viestin %s hakeminen kansiosta %s epäonnistui\n"
+"Viestin %s hakeminen kansiosta %s epÃ¤onnistui\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:401
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:405
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -9599,81 +9803,81 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:350
+#: camel/providers/local/camel-mbox-summary.c:351
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
-"Tiedoston %s poistaminen epäonnistui:\n"
+"Tiedoston %s poistaminen epÃ¤onnistui:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:398
+#: camel/providers/local/camel-mbox-summary.c:399
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:453
-#, fuzzy, c-format
+#: camel/providers/local/camel-mbox-summary.c:455
+#, c-format
 msgid "Cannot check folder: %s: %s"
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
+msgstr "Kansion tarkistus ei onnistu: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:588
-#: camel/providers/local/camel-mbox-summary.c:678
+#: camel/providers/local/camel-mbox-summary.c:593
+#: camel/providers/local/camel-mbox-summary.c:684
 #: camel/providers/local/camel-spool-summary.c:150
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
-"Tiedoston %s poistaminen epäonnistui:\n"
+"Tiedoston %s poistaminen epÃ¤onnistui:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-spool-summary.c:169
+#: camel/providers/local/camel-mbox-summary.c:605
+#: camel/providers/local/camel-spool-summary.c:170
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:612
-#: camel/providers/local/camel-mbox-summary.c:774
+#: camel/providers/local/camel-mbox-summary.c:618
+#: camel/providers/local/camel-mbox-summary.c:780
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:621
+#: camel/providers/local/camel-mbox-summary.c:627
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:632
+#: camel/providers/local/camel-mbox-summary.c:638
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:716
-#: camel/providers/local/camel-mbox-summary.c:724
-#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:722
+#: camel/providers/local/camel-mbox-summary.c:730
 #: camel/providers/local/camel-mbox-summary.c:921
+#: camel/providers/local/camel-mbox-summary.c:929
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:848
-#: camel/providers/local/camel-spool-summary.c:332
+#: camel/providers/local/camel-mbox-summary.c:855
+#: camel/providers/local/camel-spool-summary.c:342
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Tuntematon virhe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:883
+#: camel/providers/local/camel-mbox-summary.c:890
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr ""
-"Tiedoston %s poistaminen epäonnistui:\n"
+"Tiedoston %s poistaminen epÃ¤onnistui:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:976
-#: camel/providers/local/camel-mbox-summary.c:1001
+#: camel/providers/local/camel-mbox-summary.c:984
+#: camel/providers/local/camel-mbox-summary.c:1010
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:993
+#: camel/providers/local/camel-mbox-summary.c:1001
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
@@ -9681,7 +9885,7 @@ msgstr ""
 #: camel/providers/local/camel-mh-folder.c:175
 #, fuzzy
 msgid "MH append message cancelled"
-msgstr "Lähetä viesti kontaktille"
+msgstr "LÃ¤hetÃ¤ viesti kontaktille"
 
 #: camel/providers/local/camel-mh-folder.c:178
 #, c-format
@@ -9693,68 +9897,68 @@ msgstr ""
 msgid "`%s' is not a directory."
 msgstr "`%s' ei ole hakemisto."
 
-#: camel/providers/local/camel-mh-summary.c:243
+#: camel/providers/local/camel-mh-summary.c:244
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:118
+#: camel/providers/local/camel-spool-store.c:122
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:130
+#: camel/providers/local/camel-spool-store.c:134
 #, fuzzy, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "`%s' ei ole tavallinen tiedosto."
 
-#: camel/providers/local/camel-spool-store.c:150
+#: camel/providers/local/camel-spool-store.c:154
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Kansiota `%s/%s' ei ole olemassa."
 
-#: camel/providers/local/camel-spool-store.c:176
+#: camel/providers/local/camel-spool-store.c:181
 #, fuzzy, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "`%s' ei ole tavallinen tiedosto."
 
-#: camel/providers/local/camel-spool-store.c:193
+#: camel/providers/local/camel-spool-store.c:198
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:210
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:210
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "Poistetaan kansiota %s"
 
-#: camel/providers/local/camel-spool-store.c:213
+#: camel/providers/local/camel-spool-store.c:218
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:221
+#: camel/providers/local/camel-spool-store.c:226
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:181
-#: camel/providers/local/camel-spool-summary.c:190
-#: camel/providers/local/camel-spool-summary.c:199
+#: camel/providers/local/camel-spool-summary.c:183
+#: camel/providers/local/camel-spool-summary.c:193
+#: camel/providers/local/camel-spool-summary.c:203
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
-msgstr "Väliaikaishakemistoa %s ei voitu synkronoida: %s"
+msgstr "VÃ¤liaikaishakemistoa %s ei voitu synkronoida: %s"
 
-#: camel/providers/local/camel-spool-summary.c:214
+#: camel/providers/local/camel-spool-summary.c:219
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:244
-#: camel/providers/local/camel-spool-summary.c:262
-#: camel/providers/local/camel-spool-summary.c:274
+#: camel/providers/local/camel-spool-summary.c:250
+#: camel/providers/local/camel-spool-summary.c:269
+#: camel/providers/local/camel-spool-summary.c:282
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -9763,11 +9967,11 @@ msgstr ""
 
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
-msgstr "Keskusteluryhmät"
+msgstr "KeskusteluryhmÃ¤t"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "Tämä on USENET-keskusteluryhmien toimittaja."
+msgstr "TÃ¤mÃ¤ on USENET-keskusteluryhmien toimittaja."
 
 #: camel/providers/nntp/camel-nntp-store.c:151
 #, fuzzy, c-format
@@ -9793,23 +9997,23 @@ msgstr ""
 #: camel/providers/nntp/camel-nntp-summary.c:234
 #, fuzzy, c-format
 msgid "No such folder: %s"
-msgstr "Ei kyseistä viestiä: %s"
+msgstr "Ei kyseistÃ¤ viestiÃ¤: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:238
 #, fuzzy, c-format
 msgid "Could not get group: %s"
-msgstr "Putken luonti epäonnistui: %s"
+msgstr "Putken luonti epÃ¤onnistui: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:344
 #, fuzzy, c-format
 msgid "NNTP Command failed: %s"
-msgstr "IMAP-komento epäonnistui: %s"
+msgstr "IMAP-komento epÃ¤onnistui: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:404
 #: camel/providers/nntp/camel-nntp-summary.c:505
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Scanning new messages"
-msgstr "Etsitään uusia viestejä"
+msgstr "%s: Etsii uusia viestejÃ¤"
 
 #: camel/providers/nntp/camel-nntp-summary.c:520
 #, fuzzy, c-format
@@ -9831,43 +10035,43 @@ msgid "Retrieving POP summary"
 msgstr "Haetaan POP-yhteenvetoa"
 
 #: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:427
-#: camel/providers/pop3/camel-pop3-folder.c:486
-#: camel/providers/pop3/camel-pop3-folder.c:503
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
 #, fuzzy
 msgid "User cancelled"
 msgstr "Peruutettu"
 
-#: camel/providers/pop3/camel-pop3-folder.c:264
+#: camel/providers/pop3/camel-pop3-folder.c:265
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:306
+#: camel/providers/pop3/camel-pop3-folder.c:308
 msgid "Expunging deleted messages"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:401
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:408
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, c-format
 msgid "Retrieving POP message %d"
-msgstr "Haetaan POP-viestiä %d"
+msgstr "Haetaan POP-viestiÃ¤ %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:488
-#: camel/providers/pop3/camel-pop3-folder.c:495
-#: camel/providers/pop3/camel-pop3-folder.c:505
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:500
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Tuntematon virhe"
@@ -9878,14 +10082,14 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
-msgstr "Jätä viestit palvelimelle"
+msgstr "JÃ¤tÃ¤ viestit palvelimelle"
 
 #: camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
 msgid "Delete after %s day(s)"
-msgstr "Poista %s:n päivän kuluttua"
+msgstr "Poista %s:n pÃ¤ivÃ¤n kuluttua"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
 msgid "POP"
 msgstr "POP"
 
@@ -9906,66 +10110,66 @@ msgid ""
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/pop3/camel-pop3-store.c:186
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
-msgstr "Yhdistäminen palvelimeen epäonnistui: %s"
+msgstr "YhdistÃ¤minen palvelimeen epÃ¤onnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:212
-#: camel/providers/pop3/camel-pop3-store.c:241
-#: camel/providers/pop3/camel-pop3-store.c:253
+#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:244
+#: camel/providers/pop3/camel-pop3-store.c:256
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr "Yhdistäminen palvelimeen epäonnistui: %s"
+msgstr "YhdistÃ¤minen palvelimeen epÃ¤onnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:351
+#: camel/providers/pop3/camel-pop3-store.c:354
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s"
-msgstr "Yhdistäminen palvelimeen epäonnistui: %s"
+msgstr "YhdistÃ¤minen palvelimeen epÃ¤onnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:502
+#: camel/providers/pop3/camel-pop3-store.c:395
+#: camel/providers/pop3/camel-pop3-store.c:505
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr "Palveli_meni vaati todennuksen"
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:411
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
-msgstr "IMAP-komento epäonnistui: %s"
+msgstr "IMAP-komento epÃ¤onnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:420
+#: camel/providers/pop3/camel-pop3-store.c:423
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:442
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
-msgstr "Yhdistäminen palvelimeen epäonnistui."
+msgstr "YhdistÃ¤minen palvelimeen epÃ¤onnistui."
 
-#: camel/providers/pop3/camel-pop3-store.c:462
+#: camel/providers/pop3/camel-pop3-store.c:464
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:516
-#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:519
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
-msgstr "Yhdistäminen palvelimeen epäonnistui: %s"
+msgstr "YhdistÃ¤minen palvelimeen epÃ¤onnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:614
+#: camel/providers/pop3/camel-pop3-store.c:623
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9975,50 +10179,50 @@ msgid ""
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#: camel/providers/sendmail/camel-sendmail-transport.c:109
 #, fuzzy
 msgid "Could not parse recipient list"
-msgstr "URL:n `%s' jäsentäminen epäonnistui"
+msgstr "URL:n `%s' jÃ¤sentÃ¤minen epÃ¤onnistui"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:120
+#: camel/providers/sendmail/camel-sendmail-transport.c:140
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:137
+#: camel/providers/sendmail/camel-sendmail-transport.c:161
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:164
+#: camel/providers/sendmail/camel-sendmail-transport.c:192
 #, c-format
 msgid "Could not send message: %s"
-msgstr "Viestin lähettäminen epäonnistui: %s"
+msgstr "Viestin lÃ¤hettÃ¤minen epÃ¤onnistui: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:186
+#: camel/providers/sendmail/camel-sendmail-transport.c:220
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
+#: camel/providers/sendmail/camel-sendmail-transport.c:227
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:198
+#: camel/providers/sendmail/camel-sendmail-transport.c:232
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:212
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:214
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10120,46 +10324,46 @@ msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
-msgstr "Väliaikainen todennusvirhe"
+msgstr "VÃ¤liaikainen todennusvirhe"
 
 #: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Todennus vaaditaan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:298
 msgid "Welcome response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:342
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "Yhdistäminen palvelimeen epäonnistui: %s"
+msgstr "YhdistÃ¤minen palvelimeen epÃ¤onnistui: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:343
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:357
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:372
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:472
+#: camel/providers/smtp/camel-smtp-transport.c:475
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Palveli_meni vaati todennuksen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:531
+#: camel/providers/smtp/camel-smtp-transport.c:532
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10167,84 +10371,84 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:664
+#: camel/providers/smtp/camel-smtp-transport.c:665
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:667
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:684
+#: camel/providers/smtp/camel-smtp-transport.c:685
 msgid "Cannot send message: sender address not valid."
-msgstr "Viestiä ei voida lähettää: lähettäjän osoite on epäkelpo."
+msgstr "ViestiÃ¤ ei voida lÃ¤hettÃ¤Ã¤: lÃ¤hettÃ¤jÃ¤n osoite on epÃ¤kelpo."
 
-#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:613
 msgid "Sending message"
-msgstr "Lähetetään viestiä"
+msgstr "LÃ¤hetetÃ¤Ã¤n viestiÃ¤"
 
-#: camel/providers/smtp/camel-smtp-transport.c:703
+#: camel/providers/smtp/camel-smtp-transport.c:705
 msgid "Cannot send message: no recipients defined."
-msgstr "Viestiä ei voida lähettää: vastaanottajia ei ole määritelty."
+msgstr "ViestiÃ¤ ei voida lÃ¤hettÃ¤Ã¤: vastaanottajia ei ole mÃ¤Ã¤ritelty."
 
-#: camel/providers/smtp/camel-smtp-transport.c:713
+#: camel/providers/smtp/camel-smtp-transport.c:714
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
-msgstr "Viestiä ei voida lähettää: vastaanottajia ei ole määritelty."
+msgstr "ViestiÃ¤ ei voida lÃ¤hettÃ¤Ã¤: vastaanottajia ei ole mÃ¤Ã¤ritelty."
 
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:882
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:928
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:950
 #, fuzzy
 msgid "HELO response error"
 msgstr "Muu virhe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1016
 msgid "SMTP Authentication"
 msgstr "SMTP-todennus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1022
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1060
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1146
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1166
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1190
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1212
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
@@ -10261,76 +10465,76 @@ msgstr ""
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1313
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1314
+#: camel/providers/smtp/camel-smtp-transport.c:1337
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1357
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1379
+#: camel/providers/smtp/camel-smtp-transport.c:1380
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1400
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1422
+#: camel/providers/smtp/camel-smtp-transport.c:1423
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1443
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:107
-#, fuzzy, c-format
+#: composer/e-msg-composer-attachment-bar.c:104
+#, c-format
 msgid "%.0fK"
-msgstr "%.1fK"
+msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:110
-#, fuzzy, c-format
+#: composer/e-msg-composer-attachment-bar.c:107
+#, c-format
 msgid "%.0fM"
-msgstr "%.1fM"
+msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:113
-#, fuzzy, c-format
+#: composer/e-msg-composer-attachment-bar.c:110
+#, c-format
 msgid "%.0fG"
-msgstr "%.1fG"
+msgstr "%.0fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
+#: composer/e-msg-composer-attachment-bar.c:367 mail/mail-display.c:223
 msgid "attachment"
 msgstr "liite"
 
-#: composer/e-msg-composer-attachment-bar.c:520
+#: composer/e-msg-composer-attachment-bar.c:508
 msgid "Remove selected items from the attachment list"
 msgstr "Poista seuraavat tiedostot liiteluettelosta"
 
-#: composer/e-msg-composer-attachment-bar.c:551
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Add attachment..."
-msgstr "Lisää liite..."
+msgstr "LisÃ¤Ã¤ liite..."
 
-#: composer/e-msg-composer-attachment-bar.c:552
+#: composer/e-msg-composer-attachment-bar.c:539
 msgid "Attach a file to the message"
-msgstr "Lisää viestiin liitetiedoston"
+msgstr "LisÃ¤Ã¤ viestiin liitetiedoston"
 
-#: composer/e-msg-composer-attachment.c:169
-#: composer/e-msg-composer-attachment.c:185
+#: composer/e-msg-composer-attachment.c:168
+#: composer/e-msg-composer-attachment.c:184
 #, c-format
 msgid "Cannot attach file %s: %s"
-msgstr "Tiedoston %s liittäminen epäonnistui: %s"
+msgstr "Tiedoston %s liittÃ¤minen epÃ¤onnistui: %s"
 
-#: composer/e-msg-composer-attachment.c:177
+#: composer/e-msg-composer-attachment.c:176
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
-msgstr "Tiedoston %s liittäminen epäonnistui: epätavallinen tiedosto"
+msgstr "Tiedoston %s liittÃ¤minen epÃ¤onnistui: epÃ¤tavallinen tiedosto"
 
 #: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
@@ -10345,11 +10549,15 @@ msgid "MIME type:"
 msgstr "MIME-tyyppi:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:163
+#: composer/e-msg-composer-select-file.c:66
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:289
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:479
 msgid "Click here for the address book"
 msgstr ""
 
@@ -10360,126 +10568,129 @@ msgstr ""
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:400
+#: composer/e-msg-composer-hdrs.c:511
 msgid "Reply-To:"
 msgstr "Vastausosoite:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:411
+#: composer/e-msg-composer-hdrs.c:522
 msgid "From:"
-msgstr "Lähettäjä:"
+msgstr "LÃ¤hettÃ¤jÃ¤:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:528
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:542
 msgid "To:"
 msgstr "Vastaanottaja:"
 
-#: composer/e-msg-composer-hdrs.c:432
+#: composer/e-msg-composer-hdrs.c:543
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:546
 msgid "Cc:"
 msgstr "Kopiot:"
 
-#: composer/e-msg-composer-hdrs.c:436
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Anna osoitteet joihin lähetetään kopio viestistä (Cc)"
+msgstr "Anna osoitteet joihin lÃ¤hetetÃ¤Ã¤n kopio viestistÃ¤ (Cc)"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:550
 msgid "Bcc:"
 msgstr "Piilokopiot:"
 
-#: composer/e-msg-composer-hdrs.c:440
+#: composer/e-msg-composer-hdrs.c:551
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
-"Anna osoitteet joihin lähetetään kopiot viestistä ilman että muut "
-"vastaanottajat näkisivät tätä (Bcc)"
+"Anna osoitteet joihin lÃ¤hetetÃ¤Ã¤n kopiot viestistÃ¤ ilman ettÃ¤ muut "
+"vastaanottajat nÃ¤kisivÃ¤t tÃ¤tÃ¤ (Bcc)"
 
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:447
+#: composer/e-msg-composer-hdrs.c:558
 #, fuzzy
 msgid "Post To:"
 msgstr "_Portti:"
 
-#: composer/e-msg-composer-hdrs.c:449
+#: composer/e-msg-composer-hdrs.c:560
 #, fuzzy
 msgid "Posting destination"
 msgstr "Kuvaus:"
 
-#: composer/e-msg-composer-select-file.c:275
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Liitä tiedosto"
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+msgid "Attach file(s)"
+msgstr "LiitÃ¤ tiedosto(t)"
 
-#: composer/e-msg-composer.c:514
+#: composer/e-msg-composer.c:526
 #, fuzzy
 msgid "Could not create a PGP signature context"
-msgstr "Allekirjoitustiedoston luonti epäonnistui."
+msgstr "Allekirjoitustiedoston luonti epÃ¤onnistui."
 
-#: composer/e-msg-composer.c:787
+#: composer/e-msg-composer.c:805
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
-"Tiedoston %s lukeminen epäonnistui:\n"
+"Tiedoston %s lukeminen epÃ¤onnistui:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1160
-msgid "Warning!"
-msgstr "Varoitus!"
-
-#: composer/e-msg-composer.c:1164
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
 msgstr "Tiedosto on jo olemassa, kirjoitetaanko yli?"
 
-#: composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1186
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1207
+#: composer/e-msg-composer.c:1209
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Virhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1240
+#: composer/e-msg-composer.c:1244
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1252
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1255
+#: composer/e-msg-composer.c:1259
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1262
+#: composer/e-msg-composer.c:1266
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1275
+#, c-format
+msgid ""
+"Unable to copy file descriptor: %s\n"
+"%s"
+msgstr ""
+
+#: composer/e-msg-composer.c:1284
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10488,53 +10699,57 @@ msgstr ""
 "Virhe tallennettaessa tiedostoa automaattisesti: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1371
+#: composer/e-msg-composer.c:1378
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
-"Ximian Evolution on löytänyt tallentamattomia tiedostoja edelliseltä \n"
+"Ximian Evolution on lÃ¶ytÃ¤nyt tallentamattomia tiedostoja edelliseltÃ¤ \n"
 "istunnolta. Haluatko koettaa niiden palauttamista?"
 
-#: composer/e-msg-composer.c:1525
+#: composer/e-msg-composer.c:1540
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
-"Tätä viestiä ei ole lähetetty.\n"
+"TÃ¤tÃ¤ viestiÃ¤ ei ole lÃ¤hetetty.\n"
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: composer/e-msg-composer.c:1536
+#: composer/e-msg-composer.c:1545
+msgid "_Discard Changes"
+msgstr ""
+
+#: composer/e-msg-composer.c:1549
 msgid "Warning: Modified Message"
 msgstr "Varoitus: Muutettu viesti"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1581
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:1927
+#: composer/e-msg-composer.c:1939
 #, fuzzy
 msgid "Signature:"
 msgstr "Tallenna allekirjoitus"
 
-#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
+#: composer/e-msg-composer.c:1979 mail/mail-account-gui.c:1255
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
+#: composer/e-msg-composer.c:2158 composer/e-msg-composer.c:2757
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: composer/e-msg-composer.c:2796
+#: composer/e-msg-composer.c:2788
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2822
+#: composer/e-msg-composer.c:2814
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10542,30 +10757,30 @@ msgid ""
 "Please make sure you have the correct version\n"
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
-"Viestimuokkain -ikkunan luominen epäonnistui:\n"
-"HTML-muokkainkomponentin käynnistys ei onnistunut."
+"Viestimuokkain -ikkunan luominen epÃ¤onnistui:\n"
+"HTML-muokkainkomponentin kÃ¤ynnistys ei onnistunut."
 
-#: composer/e-msg-composer.c:2879
+#: composer/e-msg-composer.c:2874
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
-"Viestimuokkain -ikkunan luominen epäonnistui:\n"
-"HTML-muokkainkomponentin käynnistys ei onnistunut."
+"Viestimuokkain -ikkunan luominen epÃ¤onnistui:\n"
+"HTML-muokkainkomponentin kÃ¤ynnistys ei onnistunut."
 
-#: composer/e-msg-composer.c:3858
+#: composer/e-msg-composer.c:3890
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/evolution-composer.c:393
+#: composer/evolution-composer.c:417
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:408
+#: composer/evolution-composer.c:432
 #, fuzzy
 msgid "Cannot initialize the Evolution composer."
 msgstr "Evolutionin muokkaimen alustus ei onnistunut."
@@ -10589,38 +10804,137 @@ msgstr ""
 
 #: default_user/searches.xml.h:1
 msgid "Body contains"
-msgstr "Runko sisältää"
+msgstr "Runko sisÃ¤ltÃ¤Ã¤"
 
 #: default_user/searches.xml.h:2
 msgid "Body does not contain"
-msgstr "Runko ei sisällä"
+msgstr "Runko ei sisÃ¤llÃ¤"
 
 #: default_user/searches.xml.h:3
 msgid "Body or subject contains"
-msgstr "Runko tai otsikko sisältää"
+msgstr "Runko tai otsikko sisÃ¤ltÃ¤Ã¤"
 
 #: default_user/searches.xml.h:4
 msgid "Message contains"
-msgstr "Viesti sisältää"
+msgstr "Viesti sisÃ¤ltÃ¤Ã¤"
 
 #: default_user/searches.xml.h:5
 msgid "Recipients contain"
-msgstr "Vastaanottajakenttä sisältää"
+msgstr "VastaanottajakenttÃ¤ sisÃ¤ltÃ¤Ã¤"
 
 #: default_user/searches.xml.h:6
 msgid "Sender contains"
-msgstr "Lähettäjäkenttä sisältää"
+msgstr "LÃ¤hettÃ¤jÃ¤kenttÃ¤ sisÃ¤ltÃ¤Ã¤"
 
 #: default_user/searches.xml.h:7
 msgid "Subject contains"
-msgstr "Otsikko sisältää"
+msgstr "Otsikko sisÃ¤ltÃ¤Ã¤"
 
 #: default_user/searches.xml.h:8
 msgid "Subject does not contain"
-msgstr "Otsikko ei sisällä"
+msgstr "Otsikko ei sisÃ¤llÃ¤"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
-#: mail/mail-display.c:192
+#: designs/OOA/ooa.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:5
+msgid "<b>Status:</b>"
+msgstr "<b>Tila:</b>"
+
+#: designs/OOA/ooa.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:8
+msgid "I am currently in the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:9
+msgid "I am currently out of the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:10
+msgid "No, Don't Change Status"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:12
+#, fuzzy
+msgid "Out of Office Assistant"
+msgstr "Evolutionin asennus"
+
+#: designs/OOA/ooa.glade.h:13
+#, fuzzy
+msgid "Yes, Change Status"
+msgstr "Tila"
+
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:2
+msgid "<b>Receiving Email</b>"
+msgstr "<b>Vastaanotetaan sÃ¤hkÃ¶postia</b>"
+
+#: designs/read_receipts/read.glade.h:3
+msgid "<b>Sending Email:</b>"
+msgstr "<b>LÃ¤hetetÃ¤Ã¤n sÃ¤hkÃ¶postia:</b>"
+
+#: designs/read_receipts/read.glade.h:4
+msgid ""
+"<small>This page allows you to choose if you want to be notified via a read "
+"receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:6
+msgid "Always send back a read reciept"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:7
+msgid "Ask me if I want to send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:8
+msgid "Never send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:9
+#, fuzzy
+msgid "Read Receipts"
+msgstr "Vastaanottajat"
+
+#: designs/read_receipts/read.glade.h:10
+msgid "Request a read receipt for all messages I send"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:11
+msgid "Unless the message is sent to a mailing list, and not to me personally"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:12
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
+msgstr ""
+
+#: e-util/e-component-listener.c:128
+msgid ""
+"ping_timeout_callback: could not determine if the CORBA object is nil or not"
+msgstr ""
+
+#: e-util/e-dialog-utils.c:230
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10628,295 +10942,286 @@ msgstr ""
 "Saman niminen tiedosto on jo olemassa.\n"
 "Kirjoitetaanko sen yli?"
 
-#: e-util/e-passwords.c:363
+#: e-util/e-passwords.c:345
 msgid "Remember this password"
-msgstr "Muista tämä salasana"
+msgstr "Muista tÃ¤mÃ¤ salasana"
 
-#: e-util/e-passwords.c:365
+#: e-util/e-passwords.c:347
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
-#: e-util/e-pilot-settings.c:96
+#: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
 msgstr ""
 
-#: e-util/e-pilot-settings.c:105
+#: e-util/e-pilot-settings.c:102
 #, fuzzy
 msgid "Sync Categories:"
-msgstr "Ryhmät"
+msgstr "RyhmÃ¤t"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:171 e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:176 e-util/e-time-utils.c:375
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:182
+#: e-util/e-time-utils.c:181
 msgid "%a %m/%d/%Y %I %p"
 msgstr ""
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:186
 msgid "%a %m/%d/%Y %H"
 msgstr ""
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:197
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:202
+#: e-util/e-time-utils.c:201
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:206
 msgid "%m/%d/%Y %I:%M %p"
 msgstr ""
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:212
+#: e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %H:%M"
 msgstr ""
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:217
+#: e-util/e-time-utils.c:216
 msgid "%m/%d/%Y %I %p"
 msgstr ""
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:222
+#: e-util/e-time-utils.c:221
 msgid "%m/%d/%Y %H"
 msgstr ""
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:325 e-util/e-time-utils.c:424
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:329 e-util/e-time-utils.c:416
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1632
+#: e-util/e-time-utils.c:334 e-util/e-time-utils.c:421
+#: widgets/misc/e-dateedit.c:1430 widgets/misc/e-dateedit.c:1643
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1629
+#: e-util/e-time-utils.c:338 e-util/e-time-utils.c:413
+#: widgets/misc/e-dateedit.c:1427 widgets/misc/e-dateedit.c:1640
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:342
 msgid "%I %p"
 msgstr ""
 
-#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: filter/filter-datespec.c:65 filter/filter.glade.h:24
 #: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "sekuntia"
 
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:66
 msgid "minute"
 msgstr "minuutti"
 
-#: filter/filter-datespec.c:72
+#: filter/filter-datespec.c:67
 msgid "hour"
 msgstr "tunti"
 
-#: filter/filter-datespec.c:74
+#: filter/filter-datespec.c:69
 msgid "week"
 msgstr "viikko"
 
-#: filter/filter-datespec.c:74 filter/filter.glade.h:29
+#: filter/filter-datespec.c:69 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "viikkoa"
 
-#: filter/filter-datespec.c:75
+#: filter/filter-datespec.c:70
 msgid "month"
 msgstr "kuukausi"
 
-#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+#: filter/filter-datespec.c:70 filter/filter.glade.h:23
 msgid "months"
 msgstr "kuukautta"
 
-#: filter/filter-datespec.c:76
+#: filter/filter-datespec.c:71
 msgid "year"
 msgstr "vuosi"
 
-#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+#: filter/filter-datespec.c:71 filter/filter.glade.h:33
 msgid "years"
 msgstr "vuotta"
 
-#: filter/filter-datespec.c:174
+#: filter/filter-datespec.c:176
 #, fuzzy
 msgid "You must choose a date."
-msgstr "Olet unohtanut valita päivän."
+msgstr "Olet unohtanut valita pÃ¤ivÃ¤n."
 
-#: filter/filter-datespec.c:269
+#: filter/filter-datespec.c:275
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
 msgid "now"
 msgstr "nyt"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:279
-#, fuzzy
+#: filter/filter-datespec.c:285
 msgid "%d-%b-%Y"
-msgstr "%a %d %b"
+msgstr "%d-%b-%Y"
 
 #. 1 (minute|day|...) ago (singular time ago)
-#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#: filter/filter-datespec.c:298 filter/filter-datespec.c:301
 #, c-format
 msgid "%d %s ago"
 msgstr ""
 
-#: filter/filter-datespec.c:407
+#: filter/filter-datespec.c:417
 msgid "Select a time to compare against"
 msgstr "Valitse aika johon verrataan"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr ""
 
-#: filter/filter-file.c:178
+#: filter/filter-file.c:166
 #, fuzzy
-msgid "You must specify a file name"
+msgid "You must specify a file name."
 msgstr "Tyylin nimi:"
 
-#: filter/filter-file.c:190
+#: filter/filter-file.c:184
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "`%s' ei ole hakemisto."
 
-#: filter/filter-file.c:307
+#: filter/filter-file.c:293
 #, fuzzy
 msgid "Choose a file"
 msgstr "Valitse toiminto"
 
 #. and now for the action area
-#: filter/filter-filter.c:513
+#: filter/filter-filter.c:491
 msgid "Then"
 msgstr "Sitten"
 
-#: filter/filter-filter.c:527
-msgid "Add action"
-msgstr "Lisää toiminto"
-
-#: filter/filter-folder.c:149
+#: filter/filter-folder.c:155
 #, fuzzy
-msgid "You must specify a folder.\n"
+msgid "You must specify a folder."
 msgstr "Tyylin nimi:"
 
-#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:408
+#: mail/mail-account-gui.c:1500 mail/mail-account-gui.c:1514
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-input.c:200
+#: filter/filter-input.c:191
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
-#: mail/mail-config.glade.h:62
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:68
+#: mail/mail-config.glade.h:64
 msgid "Important"
 msgstr ""
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:69
+#: filter/filter-label.c:122 mail/mail-config.c:69
 #: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
-msgstr "Työviikk_o"
+msgstr "TyÃ¶viikk_o"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
+#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:87
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:71
+#: filter/filter-label.c:124 mail/mail-config.c:71
 #: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
+#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Later"
-msgstr "jälkeen"
+msgstr "jÃ¤lkeen"
 
-#: filter/filter-part.c:545 shell/evolution-test-component.c:49
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:223
+#: filter/filter-rule.c:219
 #, fuzzy
 msgid "You must name this filter."
-msgstr "Muuta tämän kansion nimeä"
+msgstr "Muuta tÃ¤mÃ¤n kansion nimeÃ¤"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:751
 msgid "Rule name: "
-msgstr "Säännön nimi: "
+msgstr "SÃ¤Ã¤nnÃ¶n nimi: "
 
-#: filter/filter-rule.c:768
+#: filter/filter-rule.c:755
 msgid "Untitled"
-msgstr "Nimetön"
+msgstr "NimetÃ¶n"
 
-#: filter/filter-rule.c:785
+#: filter/filter-rule.c:772
 msgid "If"
 msgstr "Jos"
 
-#: filter/filter-rule.c:803
+#: filter/filter-rule.c:790
 msgid "Execute actions"
 msgstr "Suorita toiminnot"
 
-#: filter/filter-rule.c:807
+#: filter/filter-rule.c:794
 msgid "if all criteria are met"
-msgstr "kaikki ehdot täytetään"
+msgstr "kaikki ehdot tÃ¤ytetÃ¤Ã¤n"
 
-#: filter/filter-rule.c:812
+#: filter/filter-rule.c:799
 #, fuzzy
 msgid "if any criteria are met"
-msgstr "mikään ehdoista täyttyy"
-
-#: filter/filter-rule.c:823
-msgid "Add criterion"
-msgstr "Lisää ehto"
+msgstr "mikÃ¤Ã¤n ehdoista tÃ¤yttyy"
 
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "incoming"
 msgstr "tulevat"
 
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "outgoing"
-msgstr "lähtevät"
+msgstr "lÃ¤htevÃ¤t"
 
 #: filter/filter.glade.h:1
 msgid "Compare against"
@@ -10936,7 +11241,7 @@ msgstr "Tulevat"
 
 #: filter/filter.glade.h:6
 msgid "Outgoing"
-msgstr "Lähtevät"
+msgstr "LÃ¤htevÃ¤t"
 
 #: filter/filter.glade.h:7
 msgid ""
@@ -10956,7 +11261,7 @@ msgid ""
 "the current time when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
 msgid "Virtual Folders"
 msgstr ""
 
@@ -11019,297 +11324,311 @@ msgid "Beep"
 msgstr "Belize"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "sisältää"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Otettu vastaan"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
-msgstr "Lähetetty"
+msgstr "LÃ¤hetetty"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Poistettu"
 
+#: filter/libfilter-i18n.h:12
+msgid "Do Not Exist"
+msgstr ""
+
 #: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "ei sisällä"
+msgid "Draft"
+msgstr "Luonnos"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "ei lopu merkkijonoon"
+msgid "Exist"
+msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "ei ole olemassa"
+msgid "Expression"
+msgstr ""
 
 #: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "ei ole olemassa"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
+msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "ei ala merkkijonolla"
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1778
+msgid "Label"
+msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Luonnos"
+msgid "Message Body"
+msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "loppuu merkkijonoon"
+msgid "Message Header"
+msgstr "Viestin otsikko"
 
 #: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr ""
+msgid "Move to Folder"
+msgstr "SiirrÃ¤ kansioon"
 
 #: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr ""
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "LÃ¤hetÃ¤ viesti kontaktille"
 
 #: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr ""
+#, fuzzy
+msgid "Play Sound"
+msgstr "Puola"
 
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr ""
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
+msgid "Read"
+msgstr "Lue"
+
+#: filter/libfilter-i18n.h:26
+msgid "Recipients"
+msgstr "Vastaanottajat"
 
 #: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "on"
+msgid "Regex Match"
+msgstr ""
 
 #: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "is after"
-msgstr "jälkeen"
-
-#: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "ennen"
+msgid "Replied to"
+msgstr ""
 
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
+#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
 msgstr ""
 
+#: filter/libfilter-i18n.h:30 mail/mail-callbacks.c:1809
+msgid "Sender"
+msgstr "LÃ¤hettÃ¤jÃ¤"
+
 #: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "on suurempi kuin"
+msgid "Set Status"
+msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "on pienempi kuin"
+#, fuzzy
+msgid "Shell Command"
+msgstr "Yritys"
 
 #: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "ei ole"
+msgid "Size (kB)"
+msgstr "Koko (kt)"
 
 #: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "is not Flagged"
-msgstr "ei ole"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
-msgid "Label"
+msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36
-msgid "Mailing list"
+#: filter/libfilter-i18n.h:35
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "Message Body"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
-msgid "Message Header"
-msgstr "Viestin otsikko"
+#: filter/libfilter-i18n.h:38 mail/mail-format.c:909
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: mail/message-tags.glade.h:4
+msgid "Subject"
+msgstr "Aihe"
 
 #: filter/libfilter-i18n.h:39
-msgid "Move to Folder"
-msgstr "Siirrä kansioon"
+#, fuzzy
+msgid "Unset Status"
+msgstr "Yhdysvallat"
 
 #: filter/libfilter-i18n.h:40
-#, fuzzy
-msgid "Pipe Message to Shell Command"
-msgstr "Lähetä viesti kontaktille"
+msgid "contains"
+msgstr "sisÃ¤ltÃ¤Ã¤"
 
 #: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Play Sound"
-msgstr "Puola"
+msgid "does not contain"
+msgstr "ei sisÃ¤llÃ¤"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
-msgid "Read"
-msgstr "Lue"
+#: filter/libfilter-i18n.h:42
+msgid "does not end with"
+msgstr "ei lopu merkkijonoon"
 
 #: filter/libfilter-i18n.h:43
-msgid "Recipients"
-msgstr "Vastaanottajat"
+msgid "does not exist"
+msgstr "ei ole olemassa"
 
 #: filter/libfilter-i18n.h:44
-msgid "Regex Match"
-msgstr ""
+#, fuzzy
+msgid "does not return"
+msgstr "ei ole olemassa"
 
 #: filter/libfilter-i18n.h:45
-msgid "Replied to"
+msgid "does not sound like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:46
-#, fuzzy
-msgid "returns"
-msgstr "Burundi"
+msgid "does not start with"
+msgstr "ei ala merkkijonolla"
 
 #: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "returns greater than"
-msgstr "on suurempi kuin"
+msgid "ends with"
+msgstr "loppuu merkkijonoon"
 
 #: filter/libfilter-i18n.h:48
-#, fuzzy
-msgid "returns less than"
-msgstr "on pienempi kuin"
+msgid "exists"
+msgstr ""
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:10
-msgid "Score"
+#: filter/libfilter-i18n.h:49
+msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
-msgid "Sender"
-msgstr "Lähettäjä"
+#: filter/libfilter-i18n.h:50
+#, fuzzy
+msgid "is after"
+msgstr "jÃ¤lkeen"
 
 #: filter/libfilter-i18n.h:51
-msgid "Set Status"
-msgstr ""
+#, fuzzy
+msgid "is before"
+msgstr "ennen"
 
 #: filter/libfilter-i18n.h:52
-#, fuzzy
-msgid "Shell Command"
-msgstr "Yritys"
+msgid "is greater than"
+msgstr "on suurempi kuin"
 
 #: filter/libfilter-i18n.h:53
-msgid "Size (kB)"
-msgstr "Koko (kt)"
+msgid "is less than"
+msgstr "on pienempi kuin"
 
 #: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr ""
+#, fuzzy
+msgid "is not Flagged"
+msgstr "ei ole"
 
 #: filter/libfilter-i18n.h:55
-msgid "Source Account"
-msgstr ""
+msgid "is not"
+msgstr "ei ole"
 
 #: filter/libfilter-i18n.h:56
-msgid "Specific header"
-msgstr ""
+msgid "is"
+msgstr "on"
 
 #: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "alkaa merkkijonolla"
+#, fuzzy
+msgid "returns greater than"
+msgstr "on suurempi kuin"
+
+#: filter/libfilter-i18n.h:58
+#, fuzzy
+msgid "returns less than"
+msgstr "on pienempi kuin"
 
 #: filter/libfilter-i18n.h:59
-msgid "Stop Processing"
-msgstr ""
+#, fuzzy
+msgid "returns"
+msgstr "Burundi"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
-#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
-msgid "Subject"
-msgstr "Aihe"
+#: filter/libfilter-i18n.h:60
+msgid "sounds like"
+msgstr ""
 
 #: filter/libfilter-i18n.h:61
-#, fuzzy
-msgid "Unset Status"
-msgstr "Yhdysvallat"
+msgid "starts with"
+msgstr "alkaa merkkijonolla"
 
-#: filter/rule-editor.c:180
+#: filter/rule-editor.c:170
 msgid "Rules"
-msgstr "Säännöt"
+msgstr "SÃ¤Ã¤nnÃ¶t"
 
-#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#: filter/rule-editor.c:241 filter/rule-editor.c:325
 #, c-format
-msgid "Rule name '%s' is not unique, choose another"
+msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:299
+#: filter/rule-editor.c:291
 msgid "Add Rule"
-msgstr "Lisää sääntö"
+msgstr "LisÃ¤Ã¤ sÃ¤Ã¤ntÃ¶"
 
-#: filter/rule-editor.c:388
+#: filter/rule-editor.c:372
 msgid "Edit Rule"
-msgstr "Muokkaa sääntöä"
+msgstr "Muokkaa sÃ¤Ã¤ntÃ¶Ã¤"
 
-#: filter/score-editor.c:130
+#: filter/rule-editor.c:689
+#, fuzzy
+msgid "Rule name"
+msgstr "SÃ¤Ã¤nnÃ¶n nimi: "
+
+#: filter/score-editor.c:114
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:206
-#, fuzzy
+#: filter/vfolder-rule.c:208
 msgid "You must name this vfolder."
-msgstr "Muuta tämän kansion nimeä"
+msgstr "Muuta tÃ¤mÃ¤n vKansion nimeÃ¤"
 
-#: filter/vfolder-rule.c:215
+#: filter/vfolder-rule.c:222
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: importers/elm-importer.c:95
+#: filter/vfolder-rule.c:492
+msgid "VFolder source"
+msgstr "vKansion lÃ¤hde"
+
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:103
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
 #: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:101 mail/importers/elm-importer.c:104
+#: mail/importers/netscape-importer.c:1237 mail/importers/pine-importer.c:114
 msgid "Importing..."
 msgstr "Tuodaan..."
 
 #: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103
+#: importers/pine-importer.c:103 mail/importers/elm-importer.c:106
+#: mail/importers/netscape-importer.c:1239 mail/importers/pine-importer.c:116
 msgid "Please wait"
-msgstr "Odota, ole hyvä"
+msgstr "Odota, ole hyvÃ¤"
 
 #: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365
+#: importers/pine-importer.c:365 mail/importers/elm-importer.c:183
+#: mail/importers/netscape-importer.c:1794 mail/importers/pine-importer.c:330
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
 #: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471
+#: importers/pine-importer.c:471 mail/importers/elm-importer.c:389
+#: mail/importers/netscape-importer.c:1906 mail/importers/pine-importer.c:439
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:353
+#: importers/pine-importer.c:637 mail/component-factory.c:113
+#: mail/folder-browser-ui.c:357 mail/importers/elm-importer.c:523
+#: mail/importers/netscape-importer.c:2104 mail/importers/pine-importer.c:586
 msgid "Mail"
 msgstr ""
 
-#: importers/elm-importer.c:545
+#: importers/elm-importer.c:545 mail/importers/elm-importer.c:544
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
-"Evolution löysi Elmin sähköpostitiedostoja.\n"
-"Haluatko tuoda nämä Evolutioniin?"
+"Evolution lÃ¶ysi Elmin sÃ¤hkÃ¶postitiedostoja.\n"
+"Haluatko tuoda nÃ¤mÃ¤ Evolutioniin?"
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:565
 msgid "Elm"
 msgstr "Elm"
 
@@ -11318,15 +11637,15 @@ msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
-"Evolution löysi GnomeCardin tiedostoja.\n"
-"Haluatko tuoda nämä Evolutioniin?"
+"Evolution lÃ¶ysi GnomeCardin tiedostoja.\n"
+"Haluatko tuoda nÃ¤mÃ¤ Evolutioniin?"
 
-#: importers/netscape-importer.c:70
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:74
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
 msgstr "_Prioriteetti:"
 
-#: importers/netscape-importer.c:653
+#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:662
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -11341,7 +11660,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: importers/netscape-importer.c:677
+#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -11349,7 +11668,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: importers/netscape-importer.c:694
+#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:703
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -11358,468 +11677,454 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1227
+#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1236
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
-#: shell/e-local-storage.c:183
+#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1861
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Roskakori"
 
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:2014
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Paikallinen viestitiedosto %s"
 
 #: importers/netscape-importer.c:2038 importers/pine-importer.c:570
+#: mail/importers/netscape-importer.c:2025 mail/importers/pine-importer.c:534
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:2047
+#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2034
+#: shell/e-shell-startup-wizard.c:519
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2109
 msgid "Settings"
 msgstr "Asetukset"
 
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2114
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Suodattimet"
 
-#: importers/netscape-importer.c:2161
+#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2138
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
-"Evolution löysi Netscapen sähköpostitiedostoja.\n"
-"Haluatko tuoda nämä Evolutioniin?"
+"Evolution lÃ¶ysi Netscapen sÃ¤hkÃ¶postitiedostoja.\n"
+"Haluatko tuoda nÃ¤mÃ¤ Evolutioniin?"
 
-#: importers/pine-importer.c:100
+#: importers/pine-importer.c:100 mail/importers/pine-importer.c:113
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:663 mail/importers/pine-importer.c:613
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
-"Evolution löysi Pinen sähköpostitiedostoja.\n"
-"Haluatko tuoda nämä Evolutioniin?"
+"Evolution lÃ¶ysi Pinen sÃ¤hkÃ¶postitiedostoja.\n"
+"Haluatko tuoda nÃ¤mÃ¤ Evolutioniin?"
 
-#: importers/pine-importer.c:691
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:632
 #, fuzzy
 msgid "Pine"
 msgstr "Tulosta"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid "Configuration control for the Evolution Display Fonts."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configuration control for the Evolution Mail Accounts."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configuration control for the Evolution Mailer."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Configuration control for the Evolution Message Composer."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Configure the fonts used by Evolution here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Configure your email accounts here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution component for handling mail."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution mail composer."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
 msgid "Evolution mail executive summary component."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
 msgid "Evolution mail folder display component."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
-msgid "Evolution mail folder factory component."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+msgid "Factory for the controls exported by the Evolution Mailer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
-msgid "Factory for the Evolution composer."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
-msgid "Factory for the Mail Summary component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 msgid "Font Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Tilit"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
+#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:71
 msgid "Mail Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
+#: mail/GNOME_Evolution_Mail.server.in.in.h:18
 msgid "Mail configuration interface"
 msgstr ""
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:113
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Suodata postituslistan mukaan"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:114
 #, fuzzy
 msgid "Public Mail"
 msgstr "Julkinen"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:114
 #, fuzzy
 msgid "Public folder containing mail"
 msgstr "Suodata postituslistan mukaan"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:115
 msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:115
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:132
+#: mail/component-factory.c:143
 msgid "This folder cannot contain messages."
-msgstr "Tämä kansio ei voi sisältää viestejä."
+msgstr "TÃ¤mÃ¤ kansio ei voi sisÃ¤ltÃ¤Ã¤ viestejÃ¤."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:437
 msgid "Properties..."
 msgstr "Ominaisuudet..."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:437
 msgid "Change this folder's properties"
-msgstr "Muuta tämän kansion ominaisuuksia"
+msgstr "Muuta tÃ¤mÃ¤n kansion ominaisuuksia"
 
-#: mail/component-factory.c:805
+#: mail/component-factory.c:821
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:970
+#: mail/component-factory.c:988
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:992
+#: mail/component-factory.c:1012
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:998
-#, fuzzy
-msgid "Warning: Unsent Messages"
-msgstr "Varoitus: Muutettu viesti"
-
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1052
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Seuraava viesti"
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1052
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:1041
+#: mail/component-factory.c:1053
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Kirjoita viesti"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1061
 #, fuzzy
 msgid "New Message Post"
 msgstr "Seuraava viesti"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1061
 #, fuzzy
 msgid "_Post Message"
 msgstr "Edellinen viesti"
 
-#: mail/component-factory.c:1050
+#: mail/component-factory.c:1062
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Seuraava viesti"
 
-#: mail/component-factory.c:1078
+#: mail/component-factory.c:1090
 #, fuzzy
 msgid "Cannot initialize the Evolution mail component."
-msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+msgstr "Evolutionin sÃ¤hkÃ¶postikomponentin alustus epÃ¤onnistui."
 
-#: mail/component-factory.c:1087
+#: mail/component-factory.c:1099
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
-msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+msgstr "Evolutionin sÃ¤hkÃ¶postikomponentin alustus epÃ¤onnistui."
 
-#: mail/component-factory.c:1093
+#: mail/component-factory.c:1105
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
-msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+msgstr "Evolutionin sÃ¤hkÃ¶postikomponentin alustus epÃ¤onnistui."
 
-#: mail/component-factory.c:1334 mail/component-factory.c:1364
+#: mail/component-factory.c:1349 mail/component-factory.c:1379
 #, fuzzy
 msgid "Connecting..."
 msgstr "Peruutetaan..."
 
-#: mail/component-factory.c:1375
+#: mail/component-factory.c:1390
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:471
+#: mail/folder-browser-ui.c:483
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Kansion \"%s\" ominaisuudet"
 
-#: mail/folder-browser-ui.c:473
+#: mail/folder-browser-ui.c:485
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
+#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:920
 #, c-format
 msgid "Could not create temporary directory: %s"
-msgstr "Väliaikaishakemistoa ei voitu luoda: %s"
+msgstr "VÃ¤liaikaishakemistoa ei voitu luoda: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:775
-#: mail/folder-browser.c:778
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:787
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:789
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:776
-#, fuzzy, c-format
+#: mail/folder-browser.c:794
+#, c-format
 msgid "%d selected"
-msgstr "Poistettu"
+msgstr "%d valittu"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:799
 #, c-format
 msgid "%d unsent"
-msgstr "%d lähettämätöntä"
+msgstr "%d lÃ¤hettÃ¤mÃ¤tÃ¶ntÃ¤"
 
-#: mail/folder-browser.c:783
-#, fuzzy, c-format
+#: mail/folder-browser.c:801
+#, c-format
 msgid "%d sent"
-msgstr "%d lähettämätöntä"
+msgstr "%d lÃ¤hetetty"
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
-msgstr "%d yhteensä"
+msgstr "%d yhteensÃ¤"
 
-#: mail/folder-browser.c:1118
+#: mail/folder-browser.c:1167
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
-msgstr "_Luo viestistä suodatin"
+msgstr "_Luo viestistÃ¤ suodatin"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1714
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1715
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1716
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1717
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1721
 msgid "Filter on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1722
 msgid "Filter on Sen_der"
-msgstr "Suodata _lähettäjän mukaan"
+msgstr "Suodata _lÃ¤hettÃ¤jÃ¤n mukaan"
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1723
 msgid "Filter on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
+#: mail/folder-browser.c:1724 mail/folder-browser.c:2048
 msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1742
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "Tulosta viesti..."
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1744
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1748 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
-msgstr "_Vastaa lähettäjälle"
+msgstr "_Vastaa lÃ¤hettÃ¤jÃ¤lle"
 
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1750 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1751
 msgid "_Forward"
-msgstr "_Välitä"
+msgstr "_VÃ¤litÃ¤"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1755
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1744
+#: mail/folder-browser.c:1756
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Valmis"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Kalenteri"
 
 #. separator here?
-#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1761 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1762
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1763
 msgid "Mark as _Important"
-msgstr "Merkitse tärkeäks_i"
+msgstr "Merkitse tÃ¤rkeÃ¤ks_i"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1764
 #, fuzzy
 msgid "_Mark as Unimportant"
-msgstr "Merkitse tärkeäks_i"
+msgstr "Merkitse tÃ¤rkeÃ¤ks_i"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1769
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Palauta"
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1773
 #, fuzzy
 msgid "Mo_ve to Folder..."
-msgstr "_Siirrä kansioon..."
+msgstr "_SiirrÃ¤ kansioon..."
 
-#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1774 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: mail/folder-browser.c:1770
-#, fuzzy
+#: mail/folder-browser.c:1782
 msgid "Add Sender to Address_book"
-msgstr "Lisää lähettäjä osoitekirjaan"
+msgstr "LisÃ¤Ã¤ lÃ¤hettÃ¤jÃ¤ _osoitekirjaan"
 
-#: mail/folder-browser.c:1774
-#, fuzzy
+#: mail/folder-browser.c:1786
 msgid "Appl_y Filters"
-msgstr "Toteuta suodattimet"
+msgstr "Toteuta _suodattimet"
 
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1790
 #, fuzzy
 msgid "Crea_te Rule From Message"
-msgstr "_Luo viestistä sääntö"
+msgstr "_Luo viestistÃ¤ sÃ¤Ã¤ntÃ¶"
 
-#: mail/folder-browser.c:2036
-#, fuzzy
+#: mail/folder-browser.c:2049
 msgid "VFolder on M_ailing List"
-msgstr "Suodata postituslistan mukaan"
+msgstr "Suodata vKansio _postituslistan mukaan"
 
-#: mail/folder-browser.c:2038
+#: mail/folder-browser.c:2051
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Suodata postituslistan mukaan (%s)"
 
-#: mail/folder-browser.c:2039
-#, fuzzy, c-format
+#: mail/folder-browser.c:2052
+#, c-format
 msgid "VFolder on M_ailing List (%s)"
-msgstr "Suodata postituslistan mukaan (%s)"
+msgstr "Suodata vKansio _postituslistan mukaan (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default"
 msgstr "_Oletukset"
 
-#: mail/folder-info.c:71
+#: mail/folder-info.c:70
 #, fuzzy
 msgid "Getting Folder Information"
 msgstr "Valinnaiset tiedot"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
 msgid "Imports mbox files into Evolution"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
 msgid "Factory to import Outlook Express 4 mails into Evolution"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr ""
 
@@ -11830,7 +12135,7 @@ msgstr ""
 #: mail/local-config.glade.h:2
 #, fuzzy
 msgid "Index body contents"
-msgstr "sisältää"
+msgstr "sisÃ¤ltÃ¤Ã¤"
 
 #: mail/local-config.glade.h:3
 msgid "New store format:"
@@ -11855,99 +12160,98 @@ msgstr ""
 msgid "mh"
 msgstr ""
 
-#: mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:102
 msgid "You have not filled in all of the required information."
-msgstr "Et ole täyttänyt kaikkia tarvittavia kohtia."
+msgstr "Et ole tÃ¤yttÃ¤nyt kaikkia tarvittavia kohtia."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:159
+#: mail/mail-account-editor.c:146
 msgid "Evolution Account Editor"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:752 mail/mail-config.glade.h:157
 msgid "_Host:"
-msgstr "_Isäntäpalvelin:"
+msgstr "_IsÃ¤ntÃ¤palvelin:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
-msgstr "Käyttäjät_unnus:"
+msgstr "KÃ¤yttÃ¤jÃ¤t_unnus:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Polku:"
 
-#: mail/mail-account-gui.c:1847
+#: mail/mail-account-gui.c:1877
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:224
+#: mail/mail-accounts.c:222
 msgid "Are you sure you want to delete this account?"
-msgstr "Haluatko varmasti poistaa tämän tilin?"
+msgstr "Haluatko varmasti poistaa tÃ¤mÃ¤n tilin?"
 
-#: mail/mail-accounts.c:228
+#: mail/mail-accounts.c:230
 msgid "Don't delete"
-msgstr "Älä poista"
-
-#: mail/mail-accounts.c:231
-msgid "Really delete account?"
-msgstr "Poistetaanko tili todella?"
+msgstr "Ã„lÃ¤ poista"
 
-#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:303 mail/mail-accounts.c:341
+#: mail/mail-composer-prefs.c:657 mail/mail-composer-prefs.c:675
 msgid "Disable"
-msgstr "Älä käytä"
+msgstr "Ã„lÃ¤ kÃ¤ytÃ¤"
 
-#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:303 mail/mail-accounts.c:343
+#: mail/mail-composer-prefs.c:657 mail/mail-composer-prefs.c:675
 msgid "Enable"
-msgstr "Käytä"
+msgstr "KÃ¤ytÃ¤"
 
-#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:53
+#. translators: default account indicator
+#: mail/mail-accounts.c:383
+#, fuzzy
+msgid "[Default]"
+msgstr "_Oletukset"
+
+#: mail/mail-accounts.c:427 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:818
 msgid "Enabled"
-msgstr "Käytä"
+msgstr "KÃ¤ytÃ¤"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
-#, fuzzy
+#: mail/mail-accounts.c:432 mail/mail-accounts.etspec.h:1
 msgid "Account name"
-msgstr "_Tilin nimi:"
+msgstr "Tilin nimi"
 
-#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:434 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
-#: mail/mail-autofilter.c:78
+#: mail/mail-autofilter.c:74
 #, fuzzy, c-format
 msgid "Mail to %s"
 msgstr "Suodattimet"
 
-#: mail/mail-autofilter.c:242
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Aihe on %s"
 
-#: mail/mail-autofilter.c:258
+#: mail/mail-autofilter.c:254
 #, fuzzy, c-format
 msgid "Mail from %s"
-msgstr "Lähettäjä:"
+msgstr "LÃ¤hettÃ¤jÃ¤:"
 
-#: mail/mail-autofilter.c:275
-#, fuzzy, c-format
+#: mail/mail-autofilter.c:271
+#, c-format
 msgid "%s mailing list"
-msgstr "Sähköposti 2"
+msgstr "%s postilista"
 
-#: mail/mail-autofilter.c:327
+#: mail/mail-autofilter.c:323
 msgid "Add Filter Rule"
-msgstr "Lisää suodatussääntö"
+msgstr "LisÃ¤Ã¤ suodatussÃ¤Ã¤ntÃ¶"
 
-#: mail/mail-autofilter.c:376
+#: mail/mail-autofilter.c:372
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:382
+#: mail/mail-autofilter.c:378
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11955,244 +12259,279 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:154
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:102 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr "Ã„lÃ¤ nÃ¤ytÃ¤ tÃ¤tÃ¤ viestiÃ¤ uudelleen."
+
+#: mail/mail-callbacks.c:191
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
 "receive or compose mail.\n"
 "Would you like to configure it now?"
 msgstr ""
-"Et ole asettanut sähköpostiasiakkaan asetuksia.\n"
-"Tämä täytyy tehdä jotta voisit lähettää,\n"
-"vastaanottaa tai kirjoittaa viestejä.\n"
-"Haluatko tehdä asetukset nyt?"
+"Et ole asettanut sÃ¤hkÃ¶postiasiakkaan asetuksia.\n"
+"TÃ¤mÃ¤ tÃ¤ytyy tehdÃ¤ jotta voisit lÃ¤hettÃ¤Ã¤,\n"
+"vastaanottaa tai kirjoittaa viestejÃ¤.\n"
+"Haluatko tehdÃ¤ asetukset nyt?"
 
-#: mail/mail-callbacks.c:203
+#: mail/mail-callbacks.c:213
+#, fuzzy
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr "Sinun tulee luoda tili ennen kuin voit lÃ¤hettÃ¤Ã¤ tÃ¤tÃ¤ viestiÃ¤."
+
+#: mail/mail-callbacks.c:227
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:234
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
+#: mail/mail-callbacks.c:256
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:268
 #, fuzzy
 msgid "Send anyway?"
-msgstr "Lähetä sähköpostia"
+msgstr "LÃ¤hetÃ¤ sÃ¤hkÃ¶postia"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:289
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
-"Viestillä ei ole aihetta.\n"
-"Lähetetäänkö toedella?"
+"ViestillÃ¤ ei ole aihetta.\n"
+"LÃ¤hetetÃ¤Ã¤nkÃ¶ toedella?"
 
-#: mail/mail-callbacks.c:356
+#: mail/mail-callbacks.c:315
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:360
+#: mail/mail-callbacks.c:319
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:364
+#: mail/mail-callbacks.c:324
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:513
+#: mail/mail-callbacks.c:458
 msgid "You must specify recipients in order to send this message."
 msgstr ""
-"Sinuun tulee määritellä vastaanottajat ennen tämän viestin lähettämistä."
+"Sinuun tulee mÃ¤Ã¤ritellÃ¤ vastaanottajat ennen tÃ¤mÃ¤n viestin lÃ¤hettÃ¤mistÃ¤."
 
-#: mail/mail-callbacks.c:777
+#: mail/mail-callbacks.c:713
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1207
+#: mail/mail-callbacks.c:1178
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Tuntematon virhe"
 
-#: mail/mail-callbacks.c:1211
+#: mail/mail-callbacks.c:1182
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1689 mail/message-browser.c:143
 msgid "Move message(s) to"
-msgstr "Siirrä viesti(t) kansioon"
+msgstr "SiirrÃ¤ viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1691 mail/message-browser.c:145
 msgid "Copy message(s) to"
 msgstr "Kopioi viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2335
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2406
+#: mail/mail-callbacks.c:2351
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 "Voit muokata vain Luonnokset\n"
-"-kansiossa olevia viestejä."
+"-kansiossa olevia viestejÃ¤."
 
-#: mail/mail-callbacks.c:2445
+#: mail/mail-callbacks.c:2384
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
-"Voit lähettää uudelleen vain\n"
-"\"Lähetetyt\"-kansiossa olevia viestejä."
+"Voit lÃ¤hettÃ¤Ã¤ uudelleen vain\n"
+"\"LÃ¤hetetyt\"-kansiossa olevia viestejÃ¤."
 
-#: mail/mail-callbacks.c:2459
+#: mail/mail-callbacks.c:2394
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
-msgstr "Haluatko todella lähettää kaikki %d viestiä uudelleen?"
+msgstr "Haluatko todella lÃ¤hettÃ¤Ã¤ kaikki %d viestiÃ¤ uudelleen?"
 
-#: mail/mail-callbacks.c:2485
+#: mail/mail-callbacks.c:2415
 msgid "No Message Selected"
-msgstr "Ei viestejä valittuna"
+msgstr "Ei viestejÃ¤ valittuna"
 
-#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
-msgid "Overwrite file?"
-msgstr "Kirjoita tiedoston yli?"
+#: mail/mail-callbacks.c:2456
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr "Kansion hakeminen ei onnistu: %s: %s"
+
+#: mail/mail-callbacks.c:2461
+#, fuzzy, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Saman niminen tiedosto on jo olemassa.\n"
+"Kirjoitetaanko sen yli?"
 
-#: mail/mail-callbacks.c:2584
+#: mail/mail-callbacks.c:2502
 msgid "Save Message As..."
-msgstr "Tallenna viesti nimellä..."
+msgstr "Tallenna viesti nimellÃ¤..."
 
-#: mail/mail-callbacks.c:2586
+#: mail/mail-callbacks.c:2504
 msgid "Save Messages As..."
-msgstr "Tallenna viestit nimellä..."
+msgstr "Tallenna viestit nimellÃ¤..."
 
-#: mail/mail-callbacks.c:2655
-#, fuzzy
-msgid "Go to next folder with unread messages?"
-msgstr "Näytä seuraava lukematon viesti"
-
-#: mail/mail-callbacks.c:2662
+#: mail/mail-callbacks.c:2672
 msgid ""
-"There are no more new messages in this folder.\n"
-"Would you like to go to the next folder?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2905
-msgid ""
-"This operation will permanently erase all messages marked as deleted. If you "
-"continue, you will not be able to recover these messages.\n"
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:3018
+#: mail/mail-callbacks.c:2758
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:3030
+#: mail/mail-callbacks.c:2766
 msgid "Filters"
 msgstr "Suodattimet"
 
-#: mail/mail-callbacks.c:3074
+#: mail/mail-callbacks.c:2808
 #, fuzzy, c-format
 msgid "Page %d of %d"
-msgstr "Haetaan viestiä %d / %d"
+msgstr "Haetaan viestiÃ¤ %d / %d"
 
-#: mail/mail-callbacks.c:3129
+#: mail/mail-callbacks.c:2864
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/mail-callbacks.c:3156
-msgid "US-Letter"
-msgstr ""
-
-#: mail/mail-callbacks.c:3197
+#: mail/mail-callbacks.c:2931
 msgid "Printing of message failed"
-msgstr "Viestin tulostus epäonnistui"
+msgstr "Viestin tulostus epÃ¤onnistui"
 
-#: mail/mail-callbacks.c:3387
+#: mail/mail-callbacks.c:3121
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:223
+#: mail/mail-composer-prefs.c:226
 msgid ""
 "Please specify signature filename\n"
-"in Andvanced section of signature settings."
+"in Advanced section of signature settings."
 msgstr ""
 
-#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
-#: mail/mail-composer-prefs.c:416
+#: mail/mail-composer-prefs.c:246 mail/mail-composer-prefs.c:253
+#: mail/mail-composer-prefs.c:383 mail/mail-composer-prefs.c:438
+msgid "[script]"
+msgstr "[komentotiedosto]"
+
+#: mail/mail-composer-prefs.c:251
 #, fuzzy
-msgid " [script]"
-msgstr "Kuvaus:"
+msgid "Unnamed [script]"
+msgstr "NimetÃ¶n kontaktiluettelo"
 
-#: mail/mail-composer-prefs.c:309
-msgid "Please specify a valid script name"
-msgstr ""
+#: mail/mail-composer-prefs.c:327
+msgid "You must specify a valid script name."
+msgstr "MÃ¤Ã¤rittele kelvollinen komentotiedoston nimi."
 
-#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
+#: mail/mail-composer-prefs.c:342 mail/mail-config.c:1218
 #, fuzzy
 msgid "Unnamed"
-msgstr "Nimetön kontakti"
+msgstr "NimetÃ¶n kontakti"
 
-#: mail/mail-composer-prefs.c:875
+#: mail/mail-composer-prefs.c:822
 #, fuzzy
+msgid "Language(s)"
+msgstr "Lataa k_uvat"
+
+#: mail/mail-composer-prefs.c:866
 msgid "Add script signature"
-msgstr "Lisää ehto"
+msgstr "LisÃ¤Ã¤ allekirjoituskomentotiedosto"
 
-#: mail/mail-composer-prefs.c:876
+#: mail/mail-composer-prefs.c:885
 #, fuzzy
-msgid "Add Signature"
-msgstr "Tallenna allekirjoitus"
+msgid "Signature(s)"
+msgstr "_HTML-allekirjoitus:"
 
-#: mail/mail-config-druid.c:146
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr ""
+
+#: mail/mail-config-druid.c:382
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:148
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "Tuleva posti"
+
+#: mail/mail-config-druid.c:390
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:150
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:152
+#: mail/mail-config-druid.c:400
+#, fuzzy
+msgid "Sending Mail"
+msgstr "LÃ¤htevÃ¤ posti"
+
+#: mail/mail-config-druid.c:402
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:154
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr "Tilinhallinta"
+
+#: mail/mail-config-druid.c:409
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12201,455 +12540,425 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#. set window title
-#: mail/mail-config-druid.c:637
-#, fuzzy
-msgid "Evolution Account Assistant"
-msgstr "Evolutionin tilimuokkain"
-
-#: mail/mail-config.c:622
-#, fuzzy, c-format
-msgid "Account %d"
-msgstr "Tili"
-
-#: mail/mail-config.c:2316
+#: mail/mail-config.c:922
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2394 mail/mail-config.c:2398
+#: mail/mail-config.c:1000 mail/mail-config.c:1004
 msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
-#, fuzzy
+#: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
-msgstr "Tar_kista tuetut tavat"
+msgstr "Tar_kista tuetut tyypit"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
-msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-msgstr ""
-
-#: mail/mail-config.glade.h:6
-#, fuzzy
+#: mail/mail-config.glade.h:8
 msgid "Account Editor"
-msgstr "Tili"
+msgstr "Tilimuokkain"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Tilitiedot"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr "Tilinhallinta"
-
-#: mail/mail-config.glade.h:9
-#, fuzzy
+#: mail/mail-config.glade.h:11
 msgid "Add Sc_ript"
-msgstr "Lisää ehto"
+msgstr "LisÃ¤Ã¤ _skripti"
 
-#: mail/mail-config.glade.h:10
-#, fuzzy
+#: mail/mail-config.glade.h:12
 msgid "Add new signature..."
-msgstr "Tallenna allekirjoitus"
+msgstr "LisÃ¤Ã¤ uusi allekirjoitus..."
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
-#, fuzzy
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
-msgstr "Lisää viestiin liitetiedoston"
+msgstr "LiitÃ¤ alkuperÃ¤inen viesti"
 
-#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Liite"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Todennus"
 
-#: mail/mail-config.glade.h:21
-#, fuzzy
+#: mail/mail-config.glade.h:23
 msgid "Automatically _detect links"
-msgstr "T_arkasta onko uutta postia joka"
+msgstr "_Havaitse linkit automaattisesti"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
-#, fuzzy
+#: mail/mail-config.glade.h:27
 msgid "C_olors"
-msgstr "_Sulje"
+msgstr "_VÃ¤rit"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Checking for New Mail"
-msgstr "Tarkastetaan onko uutta sähköpostia"
+msgstr "Tarkastetaan onko uutta sÃ¤hkÃ¶postia"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Kirjoita viesti"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Configuration"
 msgstr "Palvelimen asetukset"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
 "You are now ready to send and receive email \n"
 "using Evolution. \n"
 "\n"
-"Click \"Finish\" to save your settings."
+"Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default Behavior"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Tuleva posti"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
-msgstr "Viestiä ei voida avata"
+msgstr "ViestiÃ¤ ei voida avata"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Valmis"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Luonnoskansio:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
-msgstr "Kä_ytä"
+msgstr "KÃ¤_ytÃ¤"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Emacs"
-msgstr "Sähköposti"
+msgstr "SÃ¤hkÃ¶posti"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email Accounts"
-msgstr "Sähköposti sisältää"
+msgstr "SÃ¤hkÃ¶posti sisÃ¤ltÃ¤Ã¤"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Email _address:"
-msgstr "Sähköpostiosoite:"
+msgstr "SÃ¤hkÃ¶postiosoite:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Empty _trash folders on exit"
-msgstr "Tyhj_ennä roskakorit lopetettaessa"
+msgstr "Tyhj_ennÃ¤ roskakorit lopetettaessa"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Evolution Account Assistant"
+msgstr "Evolutionin tilimuokkain"
+
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Suorita toiminnot"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "loppuu merkkijonoon"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Font Properties"
 msgstr "Ominaisuudet"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Format messages in _HTML"
-msgstr "Välitetyt viestit"
+msgstr "VÃ¤litetyt viestit"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Highlight _quotations with"
-msgstr "_Korosta lainaukset värillä"
+msgstr "_Korosta lainaukset vÃ¤rillÃ¤"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
-msgstr ""
-
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:65
-#, fuzzy
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
-msgstr "Tallenna ja sulje"
+msgstr "Nimikkeet ja vÃ¤rit"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Loading Images"
 msgstr "Lataa k_uvat"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Viestin otsikko"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "Viestit"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Microsoft"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Valinnaiset tiedot"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_saatio:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
-msgstr "Valitse väri"
+msgstr "Valitse vÃ¤ri"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "Viestiä ei voida lähettää: vastaanottajia ei ole määritelty."
+msgstr "ViestiÃ¤ ei voida lÃ¤hettÃ¤Ã¤: vastaanottajia ei ole mÃ¤Ã¤ritelty."
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Tulosta valitut kontaktit"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Quote original message"
-msgstr "Viestiä ei voida avata"
+msgstr "ViestiÃ¤ ei voida avata"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Re_member this password"
-msgstr "Muista tämä salasana"
+msgstr "Muista tÃ¤mÃ¤ salasana"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Vastausosoite:"
 
-#: mail/mail-config.glade.h:96 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
 msgid "Receiving Email"
-msgstr "Otetaan vastaan sähköpostia"
+msgstr "Otetaan vastaan sÃ¤hkÃ¶postia"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Hakuasetukset"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Remember this _password"
-msgstr "Muista tämä salasana"
+msgstr "Muista tÃ¤mÃ¤ salasana"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr "Pakolliset tiedot"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Turvallisuus"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109
 msgid "Sending Email"
-msgstr "Lähetetään sähköpostia"
+msgstr "LÃ¤hetetÃ¤Ã¤n sÃ¤hkÃ¶postia"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sent _messages folder:"
-msgstr "Lähetettyjen kansio:"
+msgstr "LÃ¤hetettyjen kansio:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
-msgstr "Lähetetyt viestit ja luonnokset"
+msgstr "LÃ¤hetetyt viestit ja luonnokset"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "Palvelimen asetukset"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Palvelintyyppi: "
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Oikotiet"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Tyylin nimi:"
 
-#: mail/mail-config.glade.h:117
-msgid "Spell Checking Language"
-msgstr ""
-
 #: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
@@ -12686,7 +12995,7 @@ msgstr ""
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Next\" to begin. "
+"Click \"Forward\" to begin. "
 msgstr ""
 
 #: mail/mail-config.glade.h:134
@@ -12755,16 +13064,15 @@ msgstr ""
 #: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
-msgstr "Käytä"
+msgstr "KÃ¤ytÃ¤"
 
 #: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
 #: mail/mail-config.glade.h:153
-#, fuzzy
 msgid "_Forward style:"
-msgstr "_Välitetä viesti"
+msgstr "_VÃ¤litÃ¤ tyyli:"
 
 #: mail/mail-config.glade.h:154
 #, fuzzy
@@ -12774,7 +13082,7 @@ msgstr "_Koko nimi:"
 #: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
-msgstr "Lähetä HTML-postia?"
+msgstr "LÃ¤hetÃ¤ HTML-postia?"
 
 #: mail/mail-config.glade.h:158
 msgid "_Identity"
@@ -12787,7 +13095,7 @@ msgstr ""
 #: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
-msgstr "Tee tästä _oletustilini"
+msgstr "Tee tÃ¤stÃ¤ _oletustilini"
 
 #: mail/mail-config.glade.h:161
 #, fuzzy
@@ -12829,19 +13137,18 @@ msgid "_Restore defaults"
 msgstr ""
 
 #: mail/mail-config.glade.h:171
-#, fuzzy
 msgid "_Script:"
-msgstr "Turvalli_suus"
+msgstr "_Komentotiedosto:"
 
 #: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
-msgstr "Lähtevä posti"
+msgstr "LÃ¤htevÃ¤ posti"
 
 #: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
-msgstr "Näytä"
+msgstr "NÃ¤ytÃ¤"
 
 #: mail/mail-config.glade.h:174
 #, fuzzy
@@ -12851,7 +13158,7 @@ msgstr "_HTML-allekirjoitus:"
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
-msgstr "Käytä salattua yhteyttä (_SSL)"
+msgstr "KÃ¤ytÃ¤ salattua yhteyttÃ¤ (_SSL)"
 
 #: mail/mail-config.glade.h:176
 msgid "_Variable-width:"
@@ -12892,219 +13199,227 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:321
+#: mail/mail-display.c:193
+#, fuzzy, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Saman niminen tiedosto on jo olemassa.\n"
+"Kirjoitetaanko sen yli?"
+
+#: mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "Kirjoita tiedoston yli?"
+
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "Tallenna liite"
 
-#: mail/mail-display.c:386
+#: mail/mail-display.c:406
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
-msgstr "Väliaikaishakemistoa ei voitu luoda: %s"
+msgstr "VÃ¤liaikaishakemistoa ei voitu luoda: %s"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:454
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Tallenna liite"
 
-#: mail/mail-display.c:433
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:434
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:494
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:498
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr "Piilota"
 
-#: mail/mail-display.c:519
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr "Ulkoinen katselin"
 
-#: mail/mail-display.c:1319
+#: mail/mail-display.c:1346
 #, fuzzy
 msgid "Downloading images"
 msgstr "Lataa k_uvat"
 
-#: mail/mail-display.c:1496
+#: mail/mail-display.c:1523
 msgid "Loading message content"
-msgstr "Ladataan viestin sisältöä"
+msgstr "Ladataan viestin sisÃ¤ltÃ¶Ã¤"
 
-#: mail/mail-display.c:1783
+#: mail/mail-display.c:1860
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1787
+#: mail/mail-display.c:1864
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:2114
+#: mail/mail-display.c:2215
 msgid "Open Link in Browser"
 msgstr "Avaa linkki selaimessa"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2216
 msgid "Copy Link Location"
 msgstr "Kopioi linkin sijainti"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2218
 msgid "Save Link as (FIXME)"
-msgstr "Tallenna linkki nimellä"
+msgstr "Tallenna linkki nimellÃ¤"
 
-#: mail/mail-display.c:2119
+#: mail/mail-display.c:2220
 msgid "Save Image as..."
-msgstr "Tallenna kuva nimellä..."
+msgstr "Tallenna kuva nimellÃ¤..."
 
-#: mail/mail-folder-cache.c:743
+#: mail/mail-folder-cache.c:744
 #, fuzzy, c-format
 msgid "Pinging %s"
-msgstr "Lähetetään \"%s\""
+msgstr "LÃ¤hetetÃ¤Ã¤n \"%s\""
 
-#: mail/mail-format.c:656
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
-#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
+#: mail/mail-format.c:682 mail/mail-format.c:1337 mail/mail-format.c:1406
+#: mail/mail-format.c:1526 mail/mail-format.c:1650 mail/mail-format.c:1675
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:783 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
-msgstr "Päiväys"
+msgstr "PÃ¤ivÃ¤ys"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:846
 msgid "Bad Address"
-msgstr "Epäkelpo osoite"
+msgstr "EpÃ¤kelpo osoite"
 
-#: mail/mail-format.c:913 mail/message-list.etspec.h:7
-#: mail/message-tags.glade.h:3
+#: mail/mail-format.c:887 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301 mail/message-tags.glade.h:3
 msgid "From"
-msgstr "Lähettäjä"
+msgstr "LÃ¤hettÃ¤jÃ¤"
 
-#: mail/mail-format.c:917
+#: mail/mail-format.c:891
 msgid "Reply-To"
 msgstr "Vastausosoite:"
 
-#: mail/mail-format.c:922 mail/message-list.etspec.h:14
+#: mail/mail-format.c:896 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: mail/mail-format.c:927
+#: mail/mail-format.c:901
 msgid "Cc"
 msgstr "Kopiot:"
 
-#: mail/mail-format.c:932
+#: mail/mail-format.c:906
 #, fuzzy
 msgid "Bcc"
 msgstr "Piilokopiot:"
 
-#: mail/mail-format.c:963
-#, fuzzy
-msgid "Mailer"
-msgstr "_Matkapuhelin"
-
-#: mail/mail-format.c:1848
+#: mail/mail-format.c:1449
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1875
+#: mail/mail-format.c:1477
 #, fuzzy
 msgid "Could not create a PGP verfication context"
-msgstr "Yhdistäminen palvelimeen epäonnistui: %s"
+msgstr "YhdistÃ¤minen palvelimeen epÃ¤onnistui: %s"
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1485
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1892
+#: mail/mail-format.c:1492
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2157
+#: mail/mail-format.c:1756
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2171
+#: mail/mail-format.c:1767
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:1770
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2205
+#: mail/mail-format.c:1797
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2213
+#: mail/mail-format.c:1803
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2218
+#: mail/mail-format.c:1805
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:539 mail/mail-local.c:541
+#: mail/mail-local.c:537 mail/mail-local.c:539
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Paikalliset kansiot"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:667
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Synkronoidaan kansiota"
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:748
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:804
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: mail/mail-local.c:860
-#, fuzzy, c-format
+#: mail/mail-local.c:856
+#, c-format
 msgid "Cannot delete folder metadata %s: %s"
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
+msgstr "Kansion metatietojen poistaminen ei onnistu: %s: %s"
 
 #: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1351
+#: mail/mail-local.c:1354
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1446
+#: mail/mail-local.c:1454
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Synkronoidaan kansiota"
 
-#: mail/mail-local.c:1510
+#: mail/mail-local.c:1518
 msgid "You cannot change the format of a non-local folder."
-msgstr "Et voi muuttaa ei-paikallisen kansion tyyppiä."
+msgstr "Et voi muuttaa ei-paikallisen kansion tyyppiÃ¤."
 
 #: mail/mail-mt.c:257
 #, c-format
@@ -13120,180 +13435,184 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:267
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:553 mail/mail-ops.c:582
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:618
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
-msgstr "Lähetetään \"%s\""
+msgstr "LÃ¤hetetÃ¤Ã¤n \"%s\""
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
-msgstr "Lähetetään viestiä %d / %d"
+msgstr "LÃ¤hetetÃ¤Ã¤n viestiÃ¤ %d / %d"
 
-#: mail/mail-ops.c:757
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:569
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:853
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1051
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
-msgstr "Välitetyt viestit"
+msgstr "VÃ¤litetyt viestit"
 
-#: mail/mail-ops.c:1277
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1349
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1422
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-ops.c:1516
+#: mail/mail-ops.c:1507
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-ops.c:1567
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1594
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1652
+#: mail/mail-ops.c:1643
 #, c-format
 msgid "Retrieving message %s"
-msgstr "Haetaan viestiä %s"
+msgstr "Haetaan viestiÃ¤ %s"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1715
 #, c-format
 msgid "Retrieving %d message(s)"
-msgstr "Haetaan %d viesti(ä)"
+msgstr "Haetaan %d viesti(Ã¤)"
 
-#: mail/mail-ops.c:1810
+#: mail/mail-ops.c:1801
 #, c-format
 msgid "Saving %d messsage(s)"
-msgstr "Tallennetaan %d viesti(ä)"
+msgstr "Tallennetaan %d viesti(Ã¤)"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1916
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1944
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:2018
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: mail/mail-ops.c:2041
+#: mail/mail-ops.c:2035
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2071
+#: mail/mail-ops.c:2065
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2213
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2213
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Hakuasetukset"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
+#: mail/mail-search-dialogue.c:121 widgets/misc/e-search-bar.c:518
 msgid "_Search"
 msgstr "_Etsi"
 
-#: mail/mail-search.c:137
+#: mail/mail-search.c:142
 msgid "(Untitled Message)"
-msgstr "(Nimetön viesti)"
+msgstr "(NimetÃ¶n viesti)"
 
-#: mail/mail-search.c:240
+#: mail/mail-search.c:224
 msgid "Untitled Message"
-msgstr "Nimetön viesti"
+msgstr "NimetÃ¶n viesti"
 
-#: mail/mail-search.c:244
+#: mail/mail-search.c:226
 msgid "Empty Message"
-msgstr "Tyhjä viesti"
+msgstr "TyhjÃ¤ viesti"
 
-#: mail/mail-search.c:291
+#: mail/mail-search.c:274
 msgid "Find in Message"
-msgstr "Hae viestistä"
+msgstr "Hae viestistÃ¤"
 
-#: mail/mail-search.c:321
+#: mail/mail-search.c:277
+msgid "Search"
+msgstr "Etsi"
+
+#: mail/mail-search.c:303
 msgid "Case Sensitive"
-msgstr "Kirjainkoolla on merkitystä"
+msgstr "Kirjainkoolla on merkitystÃ¤"
 
-#: mail/mail-search.c:323
+#: mail/mail-search.c:305
 msgid "Search Forward"
 msgstr ""
 
-#: mail/mail-search.c:343
+#: mail/mail-search.c:325
 msgid "Find:"
 msgstr "Etsi:"
 
-#: mail/mail-search.c:346
+#: mail/mail-search.c:328
 msgid "Matches:"
 msgstr "Osumia:"
 
@@ -13301,118 +13620,121 @@ msgstr "Osumia:"
 msgid "Cancelling..."
 msgstr "Peruutetaan..."
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:248
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Palvelintyyppi: "
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:250
-#, fuzzy, c-format
+#: mail/mail-send-recv.c:252
+#, c-format
 msgid "Type: %s"
-msgstr "Tyyppi:"
+msgstr "Tyyppi: %s"
 
-#: mail/mail-send-recv.c:293
+#: mail/mail-send-recv.c:297
 #, fuzzy
 msgid "Send & Receive Mail"
-msgstr "Lähetä & Vastaanota postia"
+msgstr "LÃ¤hetÃ¤ & Vastaanota postia"
 
-#: mail/mail-send-recv.c:295
-#, fuzzy
+#: mail/mail-send-recv.c:299
 msgid "Cancel All"
-msgstr "Peruuta"
+msgstr "Peruuta kaikki"
 
-#: mail/mail-send-recv.c:355
+#: mail/mail-send-recv.c:378
 msgid "Updating..."
-msgstr "Päivitetään..."
+msgstr "PÃ¤ivitetÃ¤Ã¤n..."
 
-#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
+#: mail/mail-send-recv.c:379 mail/mail-send-recv.c:434
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: mail/mail-session.c:221
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:272
-msgid "_Remember this password"
-msgstr "_Muista tämä salasana"
-
-#: mail/mail-session.c:273
-msgid "_Remember this password for the remainder of this session"
-msgstr ""
-
-#: mail/mail-session.c:330
+#: mail/mail-session.c:258
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:333
+#: mail/mail-session.c:260
 #, fuzzy
 msgid "Enter Password"
 msgstr "Salasana"
 
+#: mail/mail-session.c:282
+msgid "_Remember this password"
+msgstr "_Muista tÃ¤mÃ¤ salasana"
+
+#: mail/mail-session.c:283
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+
 #: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
-msgstr "Allekirjoitustiedoston luonti epäonnistui."
+msgstr "Allekirjoitustiedoston luonti epÃ¤onnistui."
 
-#: mail/mail-signature-editor.c:175
-msgid "Save signature"
-msgstr "Tallenna allekirjoitus"
-
-#: mail/mail-signature-editor.c:181
+#: mail/mail-signature-editor.c:176
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
-"Tätä allekirjoitusta on muutettu, mutta sitä ei ole tallennettu.\n"
+"TÃ¤tÃ¤ allekirjoitusta on muutettu, mutta sitÃ¤ ei ole tallennettu.\n"
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: mail/mail-signature-editor.c:333
+#: mail/mail-signature-editor.c:179
+msgid "_Discard changes"
+msgstr ""
+
+#: mail/mail-signature-editor.c:183
+msgid "Save signature"
+msgstr "Tallenna allekirjoitus"
+
+#: mail/mail-signature-editor.c:328
 #, fuzzy
 msgid "Edit signature"
-msgstr "Lisää ehto"
+msgstr "LisÃ¤Ã¤ ehto"
 
-#: mail/mail-signature-editor.c:372
+#: mail/mail-signature-editor.c:366
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "_HTML-allekirjoitus:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
+#: mail/mail-signature-editor.c:369 my-evolution/e-summary-preferences.c:622
 msgid "Name:"
 msgstr "Nimi:"
 
-#: mail/mail-tools.c:262
+#: mail/mail-tools.c:267
 #, c-format
 msgid "Forwarded message - %s"
-msgstr "Välitetty viesti - %s"
+msgstr "VÃ¤litetty viesti - %s"
 
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:269
 msgid "Forwarded message"
-msgstr "Välitetty viesti"
+msgstr "VÃ¤litetty viesti"
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:429
 msgid "Forwarded Message"
-msgstr "Välitetty viesti"
+msgstr "VÃ¤litetty viesti"
 
-#: mail/mail-vfolder.c:84
-#, fuzzy, c-format
+#: mail/mail-vfolder.c:92
+#, c-format
 msgid "Setting up vfolder: %s"
-msgstr "Poistetaan kansiota %s"
+msgstr "Asetetaan vKansiota: %s"
 
-#: mail/mail-vfolder.c:202
-#, fuzzy, c-format
+#: mail/mail-vfolder.c:210
+#, c-format
 msgid "Updating vfolders for uri: %s"
-msgstr "Poistetaan kansiota %s"
+msgstr "PÃ¤ivitetÃ¤Ã¤n vKansioita URI:lle: %s"
 
-#: mail/mail-vfolder.c:447
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13421,100 +13743,97 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
-#, fuzzy
+#: mail/mail-vfolder.c:777 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
-msgstr "Kansiot"
+msgstr "vKansiot"
 
-#: mail/mail-vfolder.c:819
-#, fuzzy
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
-msgstr "Kansiot"
+msgstr "vKansiot"
 
-#: mail/mail-vfolder.c:861
-#, fuzzy
+#: mail/mail-vfolder.c:875
 msgid "Edit VFolder"
-msgstr "Kansio"
+msgstr "Muokkaa vKansiota"
 
-#: mail/mail-vfolder.c:877
+#: mail/mail-vfolder.c:893
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:931
+#: mail/mail-vfolder.c:946
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:219
 msgid "(No subject)"
 msgstr "(Ei aihetta)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:221
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Viesti"
 
-#: mail/message-list.c:736
+#: mail/message-list.c:740
 msgid "Unseen"
-msgstr "Nähty"
+msgstr "NÃ¤hty"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:741
 msgid "Seen"
-msgstr "Näkemättä"
+msgstr "NÃ¤kemÃ¤ttÃ¤"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:742
 msgid "Answered"
 msgstr "Vastattu"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:743
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:740
+#: mail/message-list.c:744
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:744
+#: mail/message-list.c:748
 msgid "Lowest"
 msgstr "Matalin"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:749
 msgid "Lower"
 msgstr "Matalampi"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:753
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:754
 msgid "Highest"
 msgstr "Korkein"
 
-#: mail/message-list.c:1066
+#: mail/message-list.c:1076
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1073
+#: mail/message-list.c:1083
 msgid "Today %l:%M %p"
-msgstr "Tänään %l:%M %p"
+msgstr "TÃ¤nÃ¤Ã¤n %l:%M %p"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:1092
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l:%M %p"
 
-#: mail/message-list.c:1094
+#: mail/message-list.c:1104
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1102
+#: mail/message-list.c:1112
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1104
+#: mail/message-list.c:1114
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2568
+#: mail/message-list.c:2602
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
@@ -13538,7 +13857,7 @@ msgstr ""
 #: mail/message-list.etspec.h:8
 #, fuzzy
 msgid "Original Location"
-msgstr "Alkuperäinen kontakti:"
+msgstr "AlkuperÃ¤inen kontakti:"
 
 #: mail/message-list.etspec.h:9
 msgid "Received"
@@ -13548,54 +13867,51 @@ msgstr "Otettu vastaan"
 msgid "Size"
 msgstr "Koko"
 
-#: mail/message-tag-followup.c:54
-#, fuzzy
+#: mail/message-tag-followup.c:62
 msgid "Call"
-msgstr "Peruutettu"
+msgstr "Soita"
 
-#: mail/message-tag-followup.c:55
-#, fuzzy
+#: mail/message-tag-followup.c:63
 msgid "Do Not Forward"
-msgstr "Välitä"
+msgstr "Ã„lÃ¤ vÃ¤litÃ¤"
 
-#: mail/message-tag-followup.c:56
+#: mail/message-tag-followup.c:64
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:65
 #, fuzzy
 msgid "For Your Information"
-msgstr "Lähteen tiedot"
+msgstr "LÃ¤hteen tiedot"
 
-#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
-msgstr "Välitä"
+msgstr "VÃ¤litÃ¤"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:67
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Vastaa"
 
-#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:71
 #, fuzzy
 msgid "Review"
 msgstr "Esikatselu:"
 
-#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
+#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr ""
 
 #: mail/message-tags.glade.h:1
-#, fuzzy
 msgid "C_ompleted"
-msgstr "Valmis"
+msgstr "_Valmis"
 
 #: mail/message-tags.glade.h:5
 msgid ""
@@ -13617,55 +13933,49 @@ msgstr ""
 msgid "_Flag:"
 msgstr "Tiedostonimi:"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:232
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:234
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:338
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Kansio"
 
-#: mail/subscribe-dialog.c:1450
+#: mail/subscribe-dialog.c:1427
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Tallenna kansioon..."
 
-#: mail/subscribe-dialog.c:1557
+#: mail/subscribe-dialog.c:1549
 msgid "No server has been selected"
 msgstr "Ei palvelinta valittuna"
 
-#: mail/subscribe-dialog.c:1621
+#: mail/subscribe-dialog.c:1624
 msgid "Please select a server."
 msgstr "Valitse palvelin."
 
-#: mail/subscribe-dialog.glade.h:1
-#, fuzzy
+#: mail/subscribe-dialog.glade.h:4
 msgid "All folders"
-msgstr "Paikalliset kansiot"
+msgstr "Kaikki kansiot"
 
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "Apri file"
-msgstr "Huhtikuu"
-
-#: mail/subscribe-dialog.glade.h:3 ui/evolution-comp-editor.xml.h:2
+#: mail/subscribe-dialog.glade.h:5 ui/evolution-comp-editor.xml.h:2
 #: ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
@@ -13674,99 +13984,79 @@ msgstr "Huhtikuu"
 msgid "Close"
 msgstr "Sulje"
 
-#: mail/subscribe-dialog.glade.h:4
+#: mail/subscribe-dialog.glade.h:6
 #, fuzzy
 msgid "Display Options"
-msgstr "Näytä toinen kansio"
+msgstr "NÃ¤ytÃ¤ toinen kansio"
 
-#: mail/subscribe-dialog.glade.h:5
+#: mail/subscribe-dialog.glade.h:7
 msgid "Folders whose names begin with:"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:6
-#, fuzzy
+#: mail/subscribe-dialog.glade.h:8
 msgid "Manage Subscriptions"
-msgstr "Kuvaus:"
+msgstr "Hallitse tilauksia"
 
-#: mail/subscribe-dialog.glade.h:7 ui/evolution-subscribe.xml.h:3
+#: mail/subscribe-dialog.glade.h:9 ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:10
 #, fuzzy
 msgid "S_elect server: "
 msgstr "Valitse kansio"
 
-#: mail/subscribe-dialog.glade.h:9
-#, fuzzy
-msgid "Salve file"
-msgstr "Valitse tiedosto"
-
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:11
 #, fuzzy
 msgid "_Subscribe"
 msgstr "Tilaa"
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:12
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "Poista tilaus"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 msgid "Configuration control for the Evolution Summary."
 msgstr ""
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr ""
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
 #, fuzzy
 msgid "Evolution Summary component."
-msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+msgstr "Evolutionin sÃ¤hkÃ¶postikomponentin alustus epÃ¤onnistui."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
-msgid "Factory for Evolution Summary's configuration control."
-msgstr ""
-
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
-#, fuzzy
-msgid "Factory for the Evolution Summary component."
-msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
-
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
 #, fuzzy
 msgid "Summary Preferences"
-msgstr "Yhteenveto sisältää"
+msgstr "Yhteenveto sisÃ¤ltÃ¤Ã¤"
 
 #: my-evolution/Locations.h:1
-#, fuzzy
 msgid "Aarhus"
-msgstr "Valko-Venäjä"
+msgstr "Aarhus"
 
 #: my-evolution/Locations.h:2
-#, fuzzy
 msgid "Abakan"
-msgstr "Azerbaidzan"
+msgstr "Abakan"
 
 #: my-evolution/Locations.h:3
 msgid "Abbotsford"
 msgstr ""
 
 #: my-evolution/Locations.h:4
-#, fuzzy
 msgid "Aberdeen"
-msgstr "Osanottaja"
+msgstr "Aberdeen"
 
 #: my-evolution/Locations.h:5
-#, fuzzy
 msgid "Abha"
-msgstr "Aruba"
+msgstr "Abha"
 
 #: my-evolution/Locations.h:6
-#, fuzzy
 msgid "Abilene"
-msgstr "Matkapuhelin"
+msgstr "Abilene"
 
 #: my-evolution/Locations.h:7
 msgid "Abingdon"
@@ -13789,18 +14079,16 @@ msgid "Acapulco"
 msgstr ""
 
 #: my-evolution/Locations.h:12
-#, fuzzy
 msgid "Acarigua"
-msgstr "Nicaragua"
+msgstr "Acarigua"
 
 #: my-evolution/Locations.h:13
 msgid "Adak"
 msgstr ""
 
 #: my-evolution/Locations.h:14
-#, fuzzy
 msgid "Adana"
-msgstr "Edistynyt"
+msgstr "Adana"
 
 #: my-evolution/Locations.h:15
 msgid "Adana/Incirlik"
@@ -13811,14 +14099,12 @@ msgid "Adelaide"
 msgstr ""
 
 #: my-evolution/Locations.h:17
-#, fuzzy
 msgid "Aden"
-msgstr "Ruotsi"
+msgstr "Aden"
 
 #: my-evolution/Locations.h:18
-#, fuzzy
 msgid "Adrar"
-msgstr "Aruba"
+msgstr "Adrar"
 
 #: my-evolution/Locations.h:19
 msgid "Aeroparque"
@@ -13833,23 +14119,20 @@ msgid "Afonsos"
 msgstr ""
 
 #: my-evolution/Locations.h:22
-#, fuzzy
 msgid "Africa"
-msgstr "Etelä-Afrikka"
+msgstr "Afrikka"
 
 #: my-evolution/Locations.h:23
 msgid "Afyon"
 msgstr ""
 
 #: my-evolution/Locations.h:24
-#, fuzzy
 msgid "Agen"
-msgstr "Argentiina"
+msgstr "Agen"
 
 #: my-evolution/Locations.h:25
-#, fuzzy
 msgid "Aguascaliantes"
-msgstr "Australia"
+msgstr "Aguascaliantes"
 
 #: my-evolution/Locations.h:26
 msgid "Ahmadabad"
@@ -13888,9 +14171,8 @@ msgid "Akrotiri"
 msgstr ""
 
 #: my-evolution/Locations.h:35
-#, fuzzy
 msgid "Alabama"
-msgstr "Panama"
+msgstr "Alabama"
 
 #: my-evolution/Locations.h:36
 msgid "Al Ahsa"
@@ -13909,9 +14191,8 @@ msgid "Alamosa"
 msgstr ""
 
 #: my-evolution/Locations.h:40
-#, fuzzy
 msgid "Alaska"
-msgstr "_Tehtävä"
+msgstr "Alaska"
 
 #: my-evolution/Locations.h:41
 msgid "Al Baha"
@@ -13938,9 +14219,8 @@ msgid "Albuquerque"
 msgstr ""
 
 #: my-evolution/Locations.h:48
-#, fuzzy
 msgid "Alderney"
-msgstr "Kansion nimi:"
+msgstr "Alderney"
 
 #: my-evolution/Locations.h:49
 msgid "Alesund"
@@ -13963,9 +14243,8 @@ msgid "Alexandroupolis"
 msgstr ""
 
 #: my-evolution/Locations.h:55
-#, fuzzy
 msgid "Alghero"
-msgstr "Korkeampi"
+msgstr "Alghero"
 
 #: my-evolution/Locations.h:56
 msgid "Algona"
@@ -13992,41 +14271,36 @@ msgid "Allentown"
 msgstr ""
 
 #: my-evolution/Locations.h:62
-#, fuzzy
 msgid "Alliance"
-msgstr "Edistynyt"
+msgstr "Alliance"
 
 #: my-evolution/Locations.h:63
 msgid "Alma"
 msgstr ""
 
 #: my-evolution/Locations.h:64
-#, fuzzy
 msgid "Almeria"
-msgstr "Armenia"
+msgstr "Almeria"
 
 #: my-evolution/Locations.h:65
-#, fuzzy
 msgid "Alpena"
-msgstr "Armenia"
+msgstr "Alpena"
 
 #: my-evolution/Locations.h:66
 msgid "Al Qaysumah"
 msgstr ""
 
 #: my-evolution/Locations.h:67
-#, fuzzy
 msgid "Alta"
-msgstr "Malta"
+msgstr "Alta"
 
 #: my-evolution/Locations.h:68
 msgid "Altamira"
 msgstr ""
 
 #: my-evolution/Locations.h:69
-#, fuzzy
 msgid "Alton"
-msgstr "T_oiminnot"
+msgstr "Alton"
 
 #: my-evolution/Locations.h:70
 msgid "Altoona"
@@ -14049,42 +14323,36 @@ msgid "Amapala"
 msgstr ""
 
 #: my-evolution/Locations.h:75
-#, fuzzy
 msgid "Amarillo"
-msgstr "Sähköposti"
+msgstr "Amarillo"
 
 #: my-evolution/Locations.h:76
 msgid "Amasya"
 msgstr ""
 
 #: my-evolution/Locations.h:77
-#, fuzzy
 msgid "Ambler"
-msgstr "Joulukuu"
+msgstr "Ambler"
 
 #: my-evolution/Locations.h:78
-#, fuzzy
 msgid "Amelia"
-msgstr "Armenia"
+msgstr "Amelia"
 
 #: my-evolution/Locations.h:79
-#, fuzzy
 msgid "Amendola"
-msgstr "Armenia"
+msgstr "Amendola"
 
 #: my-evolution/Locations.h:80
-#, fuzzy
 msgid "Ames"
-msgstr "Suodattimet"
+msgstr "Ames"
 
 #: my-evolution/Locations.h:81
 msgid "Amritsar"
 msgstr ""
 
 #: my-evolution/Locations.h:82
-#, fuzzy
 msgid "Amsterdam"
-msgstr "Itävalta"
+msgstr "Amsterdam"
 
 #: my-evolution/Locations.h:83
 msgid "Anadyr"
@@ -14095,9 +14363,8 @@ msgid "Anaktuvuk"
 msgstr ""
 
 #: my-evolution/Locations.h:85
-#, fuzzy
 msgid "Anapa"
-msgstr "Japani"
+msgstr "Anapa"
 
 #: my-evolution/Locations.h:86
 msgid "Anchorage"
@@ -14108,9 +14375,8 @@ msgid "Anchorage - Elmendorf AFB"
 msgstr ""
 
 #: my-evolution/Locations.h:88
-#, fuzzy
 msgid "Ancona"
-msgstr "Tili"
+msgstr "Ancona"
 
 #: my-evolution/Locations.h:89
 msgid "Andahuayla"
@@ -14137,9 +14403,8 @@ msgid "Angleton"
 msgstr ""
 
 #: my-evolution/Locations.h:95
-#, fuzzy
 msgid "Aniak"
-msgstr "Armenia"
+msgstr "Aniak"
 
 #: my-evolution/Locations.h:96
 msgid "Ankara/Esenboga"
@@ -14166,23 +14431,20 @@ msgid "Anniston"
 msgstr ""
 
 #: my-evolution/Locations.h:102
-#, fuzzy
 msgid "Antalya"
-msgstr "Italia"
+msgstr "Antalya"
 
 #: my-evolution/Locations.h:103
-#, fuzzy
 msgid "Antartica"
-msgstr "Itävalta"
+msgstr "Antarktis"
 
 #: my-evolution/Locations.h:104
 msgid "Antigo"
 msgstr ""
 
 #: my-evolution/Locations.h:105
-#, fuzzy
 msgid "Antigua"
-msgstr "Argentiina"
+msgstr "Antigua"
 
 #: my-evolution/Locations.h:106
 msgid "Antigua and Barbuda"
@@ -14217,43 +14479,36 @@ msgid "Aracaju"
 msgstr ""
 
 #: my-evolution/Locations.h:114
-#, fuzzy
 msgid "Arad"
-msgstr "Aruba"
+msgstr "Arad"
 
 #: my-evolution/Locations.h:115
-#, fuzzy
 msgid "Arar"
-msgstr "Aruba"
+msgstr "Arar"
 
 #: my-evolution/Locations.h:116
-#, fuzzy
 msgid "Araxos"
-msgstr "Laos"
+msgstr "Araxos"
 
 #: my-evolution/Locations.h:117
-#, fuzzy
 msgid "Arcata"
-msgstr "Kroatia"
+msgstr "Arcata"
 
 #: my-evolution/Locations.h:118
 msgid "Ardmore"
 msgstr ""
 
 #: my-evolution/Locations.h:119
-#, fuzzy
 msgid "Arequipa"
-msgstr "Armenia"
+msgstr "Arequipa"
 
 #: my-evolution/Locations.h:121
-#, fuzzy
 msgid "Arica"
-msgstr "Armenia"
+msgstr "Arica"
 
 #: my-evolution/Locations.h:122
-#, fuzzy
 msgid "Arizona"
-msgstr "Argentiina"
+msgstr "Arizona"
 
 #: my-evolution/Locations.h:123
 msgid "Arkansas"
@@ -14264,14 +14519,12 @@ msgid "Arkhangelsk"
 msgstr ""
 
 #: my-evolution/Locations.h:125
-#, fuzzy
 msgid "Arlington"
-msgstr "Suunta"
+msgstr "Arlington"
 
 #: my-evolution/Locations.h:126
-#, fuzzy
 msgid "Artigas"
-msgstr "Argentiina"
+msgstr "Artigas"
 
 #: my-evolution/Locations.h:127
 msgid "Asahikawa Ab"
@@ -14298,58 +14551,48 @@ msgid "Ashiya Ab"
 msgstr ""
 
 #: my-evolution/Locations.h:133
-#, fuzzy
 msgid "Ashland"
-msgstr "Thaimaa"
+msgstr "Ashland"
 
 #: my-evolution/Locations.h:134
-#, fuzzy
 msgid "Asia"
-msgstr "Itävalta"
+msgstr "Aasia"
 
 #: my-evolution/Locations.h:135
-#, fuzzy
 msgid "Aspen"
-msgstr "Avaa"
+msgstr "Aspen"
 
 #: my-evolution/Locations.h:136
 msgid "Asswan"
 msgstr ""
 
 #: my-evolution/Locations.h:137
-#, fuzzy
 msgid "Astoria"
-msgstr "Itävalta"
+msgstr "Astoria"
 
 #: my-evolution/Locations.h:138
-#, fuzzy
 msgid "Astrakhan"
-msgstr "Australia"
+msgstr "Astrakhan"
 
 #: my-evolution/Locations.h:139
-#, fuzzy
 msgid "Asturias"
-msgstr "Itävalta"
+msgstr "Asturias"
 
 #: my-evolution/Locations.h:140
-#, fuzzy
 msgid "Asuncion"
-msgstr "Todennus"
+msgstr "Asuncion"
 
 #: my-evolution/Locations.h:141
-#, fuzzy
 msgid "Athens"
-msgstr "Liitteet"
+msgstr "Ateena"
 
 #: my-evolution/Locations.h:142
-#, fuzzy
 msgid "Athinai"
-msgstr "Kiina"
+msgstr "Athinai"
 
 #: my-evolution/Locations.h:143
-#, fuzzy
 msgid "Atlanta"
-msgstr "Liitä"
+msgstr "Atlanta"
 
 #: my-evolution/Locations.h:144
 msgid "Atlantic"
@@ -14384,12 +14627,12 @@ msgstr "Elokuu"
 #: my-evolution/Locations.h:151
 #, fuzzy
 msgid "Aurora"
-msgstr "Itävalta"
+msgstr "ItÃ¤valta"
 
 #: my-evolution/Locations.h:152
 #, fuzzy
 msgid "Austin"
-msgstr "Itävalta"
+msgstr "ItÃ¤valta"
 
 #: my-evolution/Locations.h:153
 #, fuzzy
@@ -14448,7 +14691,7 @@ msgstr ""
 #: my-evolution/Locations.h:170
 #, fuzzy
 msgid "Ball Mountain"
-msgstr "Sähköposti sisältää"
+msgstr "SÃ¤hkÃ¶posti sisÃ¤ltÃ¤Ã¤"
 
 #: my-evolution/Locations.h:171
 #, fuzzy
@@ -14536,7 +14779,7 @@ msgstr ""
 #: my-evolution/Locations.h:190
 #, fuzzy
 msgid "Barter Island"
-msgstr "Färsaaret"
+msgstr "FÃ¤rsaaret"
 
 #: my-evolution/Locations.h:191
 msgid "Bartlesville"
@@ -14571,12 +14814,12 @@ msgstr ""
 #: my-evolution/Locations.h:198
 #, fuzzy
 msgid "Battle Mountain"
-msgstr "Nimi sisältää"
+msgstr "Nimi sisÃ¤ltÃ¤Ã¤"
 
 #: my-evolution/Locations.h:199
 #, fuzzy
 msgid "Bauru"
-msgstr "Valko-Venäjä"
+msgstr "Valko-VenÃ¤jÃ¤"
 
 #: my-evolution/Locations.h:200
 #, fuzzy
@@ -14632,7 +14875,7 @@ msgstr "Benin"
 #: my-evolution/Locations.h:211
 #, fuzzy
 msgid "Beirut"
-msgstr "Valko-Venäjä"
+msgstr "Valko-VenÃ¤jÃ¤"
 
 #: my-evolution/Locations.h:212
 msgid "Beja"
@@ -14711,7 +14954,7 @@ msgstr ""
 #: my-evolution/Locations.h:231
 #, fuzzy
 msgid "Bergen"
-msgstr "Näkemättä"
+msgstr "NÃ¤kemÃ¤ttÃ¤"
 
 #: my-evolution/Locations.h:232
 msgid "Bergstrom AFB"
@@ -14742,7 +14985,7 @@ msgstr "Benin"
 #: my-evolution/Locations.h:238
 #, fuzzy
 msgid "Bethel"
-msgstr "Säätiedot"
+msgstr "SÃ¤Ã¤tiedot"
 
 #: my-evolution/Locations.h:239
 msgid "Bethlehem Airport"
@@ -14890,7 +15133,7 @@ msgstr ""
 #: my-evolution/Locations.h:274
 #, fuzzy
 msgid "Boone"
-msgstr "Määrittelemätön"
+msgstr "MÃ¤Ã¤rittelemÃ¤tÃ¶n"
 
 #: my-evolution/Locations.h:275
 msgid "Bordeaux"
@@ -14927,7 +15170,7 @@ msgstr "Kansio"
 #: my-evolution/Locations.h:282
 #, fuzzy
 msgid "Bourges"
-msgstr "Lähteet"
+msgstr "LÃ¤hteet"
 
 #: my-evolution/Locations.h:283
 msgid "Bournemouth"
@@ -15293,7 +15536,7 @@ msgstr "Kap Verde"
 #: my-evolution/Locations.h:368
 #, fuzzy
 msgid "Cape Lisburne"
-msgstr "Paperilähde:"
+msgstr "PaperilÃ¤hde:"
 
 #: my-evolution/Locations.h:369
 #, fuzzy
@@ -15328,7 +15571,7 @@ msgstr ""
 #: my-evolution/Locations.h:376
 #, fuzzy
 msgid "Caravelas"
-msgstr "Peruuta tehtävä"
+msgstr "Peruuta tehtÃ¤vÃ¤"
 
 #: my-evolution/Locations.h:377
 #, fuzzy
@@ -15721,7 +15964,7 @@ msgstr ""
 #: my-evolution/Locations.h:468
 #, fuzzy
 msgid "Cleveland"
-msgstr "Grönlanti"
+msgstr "GrÃ¶nlanti"
 
 #: my-evolution/Locations.h:469
 msgid "Cleveland/Cuyahoga"
@@ -15877,7 +16120,7 @@ msgstr "Kongo"
 #: my-evolution/Locations.h:504
 #, fuzzy
 msgid "Constantine"
-msgstr "S_isältää:"
+msgstr "S_isÃ¤ltÃ¤Ã¤:"
 
 #: my-evolution/Locations.h:505
 msgid "Copper Harbor"
@@ -15918,7 +16161,7 @@ msgstr ""
 #: my-evolution/Locations.h:513
 #, fuzzy
 msgid "Corrientes"
-msgstr "_Nykyinen näkymä"
+msgstr "_Nykyinen nÃ¤kymÃ¤"
 
 #: my-evolution/Locations.h:514
 #, fuzzy
@@ -16113,7 +16356,7 @@ msgstr ""
 #: my-evolution/Locations.h:562
 #, fuzzy
 msgid "Dayton"
-msgstr "_Päivä"
+msgstr "_PÃ¤ivÃ¤"
 
 #: my-evolution/Locations.h:563
 msgid "Daytona Beach"
@@ -16126,7 +16369,7 @@ msgstr ""
 #: my-evolution/Locations.h:565
 #, fuzzy
 msgid "Dayton-South Airport"
-msgstr "Älä tuo"
+msgstr "Ã„lÃ¤ tuo"
 
 #: my-evolution/Locations.h:566
 msgid "Dead Horse"
@@ -16196,7 +16439,7 @@ msgstr "Libanon"
 #: my-evolution/Locations.h:582
 #, fuzzy
 msgid "Denver"
-msgstr "Lähettäjä"
+msgstr "LÃ¤hettÃ¤jÃ¤"
 
 #: my-evolution/Locations.h:583
 msgid "Denver-Aurora"
@@ -16219,7 +16462,7 @@ msgstr ""
 msgid "Des Moines"
 msgstr ""
 "\n"
-"Aikavyöhyke: "
+"AikavyÃ¶hyke: "
 
 #: my-evolution/Locations.h:588
 #, fuzzy
@@ -16381,7 +16624,7 @@ msgstr ""
 #: my-evolution/Locations.h:625
 #, fuzzy
 msgid "Dugway"
-msgstr "_Päivä"
+msgstr "_PÃ¤ivÃ¤"
 
 #: my-evolution/Locations.h:626
 #, fuzzy
@@ -16391,7 +16634,7 @@ msgstr "_Oletukset"
 #: my-evolution/Locations.h:627
 #, fuzzy
 msgid "Dundee"
-msgstr "Kesäkuu"
+msgstr "KesÃ¤kuu"
 
 #: my-evolution/Locations.h:628
 msgid "Durango"
@@ -16424,7 +16667,7 @@ msgstr ""
 #: my-evolution/Locations.h:635
 #, fuzzy
 msgid "Eagle"
-msgstr "Käytä"
+msgstr "KÃ¤ytÃ¤"
 
 #: my-evolution/Locations.h:636
 msgid "Eagle Range"
@@ -16617,7 +16860,7 @@ msgstr ""
 #: my-evolution/Locations.h:685
 #, fuzzy
 msgid "Eugene"
-msgstr "Kesäkuu"
+msgstr "KesÃ¤kuu"
 
 #: my-evolution/Locations.h:686
 #, fuzzy
@@ -16653,7 +16896,7 @@ msgstr ""
 #: my-evolution/Locations.h:693
 #, fuzzy
 msgid "Exeter"
-msgstr "Säätiedot"
+msgstr "SÃ¤Ã¤tiedot"
 
 #: my-evolution/Locations.h:694
 msgid "Ezeiza"
@@ -16699,7 +16942,7 @@ msgstr ""
 #: my-evolution/Locations.h:704
 #, fuzzy
 msgid "Fargo"
-msgstr "Lähettäjä"
+msgstr "LÃ¤hettÃ¤jÃ¤"
 
 #: my-evolution/Locations.h:705
 msgid "Farmingdale"
@@ -16717,7 +16960,7 @@ msgstr "Sukunimi"
 #: my-evolution/Locations.h:708
 #, fuzzy
 msgid "Faro"
-msgstr "Lähettäjä"
+msgstr "LÃ¤hettÃ¤jÃ¤"
 
 #: my-evolution/Locations.h:709
 msgid "Fayetteville"
@@ -16801,7 +17044,7 @@ msgstr "Perjantai"
 #: my-evolution/Locations.h:727
 #, fuzzy
 msgid "Floro"
-msgstr "Lähettäjä"
+msgstr "LÃ¤hettÃ¤jÃ¤"
 
 #: my-evolution/Locations.h:728
 msgid "Fond Du Lac"
@@ -16890,7 +17133,7 @@ msgstr ""
 #: my-evolution/Locations.h:748
 #, fuzzy
 msgid "Fort Leonard"
-msgstr "Välitä"
+msgstr "VÃ¤litÃ¤"
 
 #: my-evolution/Locations.h:749
 msgid "Fort Lewis"
@@ -16903,7 +17146,7 @@ msgstr ""
 #: my-evolution/Locations.h:751
 #, fuzzy
 msgid "Fort Meade"
-msgstr "_Välitetä viesti"
+msgstr "_VÃ¤litetÃ¤ viesti"
 
 #: my-evolution/Locations.h:752
 msgid "Fort Myers (Page Field)"
@@ -16932,7 +17175,7 @@ msgstr ""
 #: my-evolution/Locations.h:758
 #, fuzzy
 msgid "Fort Stewart"
-msgstr "Välitä"
+msgstr "VÃ¤litÃ¤"
 
 #: my-evolution/Locations.h:759
 msgid "Fort Stockton"
@@ -17112,7 +17355,7 @@ msgstr "Gambia"
 #: my-evolution/Locations.h:800
 #, fuzzy
 msgid "Gander"
-msgstr "Ylätunniste:"
+msgstr "YlÃ¤tunniste:"
 
 #: my-evolution/Locations.h:801
 msgid "Garden City"
@@ -17139,7 +17382,7 @@ msgstr ""
 #: my-evolution/Locations.h:806
 #, fuzzy
 msgid "Gdansk"
-msgstr "päivää"
+msgstr "pÃ¤ivÃ¤Ã¤"
 
 #: my-evolution/Locations.h:807
 #, fuzzy
@@ -17228,7 +17471,7 @@ msgstr "Puola"
 #: my-evolution/Locations.h:829
 #, fuzzy
 msgid "Goose Bay"
-msgstr "Siirry tähän päivään"
+msgstr "Siirry tÃ¤hÃ¤n pÃ¤ivÃ¤Ã¤n"
 
 #: my-evolution/Locations.h:830
 msgid "Goteborg (Landvetter)"
@@ -17307,7 +17550,7 @@ msgstr "Kreikka"
 #: my-evolution/Locations.h:848
 #, fuzzy
 msgid "Green Bay"
-msgstr "Grönlanti"
+msgstr "GrÃ¶nlanti"
 
 #: my-evolution/Locations.h:849
 msgid "Green River"
@@ -17320,7 +17563,7 @@ msgstr ""
 #: my-evolution/Locations.h:851
 #, fuzzy
 msgid "Greenville"
-msgstr "Grönlanti"
+msgstr "GrÃ¶nlanti"
 
 #: my-evolution/Locations.h:852
 msgid "Greenville-Spartanburg"
@@ -17329,7 +17572,7 @@ msgstr ""
 #: my-evolution/Locations.h:853
 #, fuzzy
 msgid "Greenwood"
-msgstr "Grönlanti"
+msgstr "GrÃ¶nlanti"
 
 #: my-evolution/Locations.h:854
 msgid "Grenoble-Saint-Geoirs"
@@ -17465,7 +17708,7 @@ msgid "Hagerstown"
 msgstr ""
 
 #. HAIL
-#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+#: my-evolution/Locations.h:885 my-evolution/metar.c:218
 msgid "Hail"
 msgstr ""
 
@@ -17594,7 +17837,7 @@ msgstr ""
 #: my-evolution/Locations.h:916
 #, fuzzy
 msgid "Hayden"
-msgstr "Ylätunniste:"
+msgstr "YlÃ¤tunniste:"
 
 #: my-evolution/Locations.h:917
 msgid "Hayes River"
@@ -17603,7 +17846,7 @@ msgstr ""
 #: my-evolution/Locations.h:918
 #, fuzzy
 msgid "Hays"
-msgstr "päivää"
+msgstr "pÃ¤ivÃ¤Ã¤"
 
 #: my-evolution/Locations.h:919
 msgid "Hayward"
@@ -17616,7 +17859,7 @@ msgstr ""
 #: my-evolution/Locations.h:921
 #, fuzzy
 msgid "Helena"
-msgstr "Näkemättä"
+msgstr "NÃ¤kemÃ¤ttÃ¤"
 
 #: my-evolution/Locations.h:922
 msgid "Helsinki"
@@ -17625,7 +17868,7 @@ msgstr ""
 #: my-evolution/Locations.h:923
 #, fuzzy
 msgid "Henderson"
-msgstr "Ylätunniste:"
+msgstr "YlÃ¤tunniste:"
 
 #: my-evolution/Locations.h:924
 msgid "Hengchun"
@@ -17666,12 +17909,12 @@ msgstr ""
 #: my-evolution/Locations.h:933
 #, fuzzy
 msgid "Hobart"
-msgstr "Isäntäpalvelin"
+msgstr "IsÃ¤ntÃ¤palvelin"
 
 #: my-evolution/Locations.h:934
 #, fuzzy
 msgid "Hobbs"
-msgstr "Isäntäpalvelin"
+msgstr "IsÃ¤ntÃ¤palvelin"
 
 #: my-evolution/Locations.h:935
 msgid "Ho Chi Minh"
@@ -17744,7 +17987,7 @@ msgstr ""
 #: my-evolution/Locations.h:953
 #, fuzzy
 msgid "Houlton"
-msgstr "lähtevät"
+msgstr "lÃ¤htevÃ¤t"
 
 #: my-evolution/Locations.h:954
 #, fuzzy
@@ -17961,7 +18204,7 @@ msgstr ""
 #: my-evolution/Locations.h:1008
 #, fuzzy
 msgid "Iron Mountain"
-msgstr "Kommentti sisältää"
+msgstr "Kommentti sisÃ¤ltÃ¤Ã¤"
 
 #: my-evolution/Locations.h:1009
 msgid "Ironwood"
@@ -18120,7 +18363,7 @@ msgstr "Japani"
 #: my-evolution/Locations.h:1050
 #, fuzzy
 msgid "Jujuy"
-msgstr "Heinäkuu"
+msgstr "HeinÃ¤kuu"
 
 #: my-evolution/Locations.h:1051
 #, fuzzy
@@ -18135,7 +18378,7 @@ msgstr "Todennus"
 #: my-evolution/Locations.h:1053
 #, fuzzy
 msgid "Juneau"
-msgstr "Kesäkuu"
+msgstr "KesÃ¤kuu"
 
 #: my-evolution/Locations.h:1054
 msgid "Kadena Ab"
@@ -18214,7 +18457,7 @@ msgstr "Maaliskuu"
 #: my-evolution/Locations.h:1072
 #, fuzzy
 msgid "Karup"
-msgstr "Ryhmän nimi:"
+msgstr "RyhmÃ¤n nimi:"
 
 #: my-evolution/Locations.h:1073
 msgid "Kassel-Calden"
@@ -18253,7 +18496,7 @@ msgstr "Kenia"
 #: my-evolution/Locations.h:1081
 #, fuzzy
 msgid "Keene"
-msgstr "Näkemättä"
+msgstr "NÃ¤kemÃ¤ttÃ¤"
 
 #: my-evolution/Locations.h:1082
 msgid "Kefallinia"
@@ -18639,7 +18882,7 @@ msgstr "Vaaka"
 #: my-evolution/Locations.h:1173
 #, fuzzy
 msgid "Lander"
-msgstr "Ylätunniste:"
+msgstr "YlÃ¤tunniste:"
 
 #: my-evolution/Locations.h:1174
 msgid "Langebaanweg"
@@ -19031,7 +19274,7 @@ msgstr ""
 #: my-evolution/Locations.h:1266
 #, fuzzy
 msgid "Luton"
-msgstr "lähtevät"
+msgstr "lÃ¤htevÃ¤t"
 
 #: my-evolution/Locations.h:1268
 msgid "Luxeuil"
@@ -19196,7 +19439,7 @@ msgstr "Romania"
 #: my-evolution/Locations.h:1305
 #, fuzzy
 msgid "Manistee"
-msgstr "Liitä"
+msgstr "LiitÃ¤"
 
 #: my-evolution/Locations.h:1306
 #, fuzzy
@@ -19284,6427 +19527,6409 @@ msgid "Marion-Wytheville"
 msgstr ""
 
 #: my-evolution/Locations.h:1325
-msgid "Marquette"
-msgstr ""
-
-#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 #, fuzzy
 msgid "Marshall"
 msgstr "Maaliskuu"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshalltown"
 msgstr ""
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 #, fuzzy
 msgid "Marte"
-msgstr "Päiväys"
+msgstr "PÃ¤ivÃ¤ys"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "Merkitse luke_mattomaksi"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Martinsburg"
 msgstr "Reunukset"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsville"
 msgstr "Reunukset"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Maryland"
 msgstr "Irlanti"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 #, fuzzy
 msgid "Masirah"
 msgstr "Malesia"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massena"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Matamoros"
 msgstr ""
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Mattoon"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mayaguez"
 msgstr ""
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayport"
 msgstr "Tuo"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mazatlan"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazu"
 msgstr ""
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 #, fuzzy
 msgid "McCall"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCarthy"
 msgstr "Maaliskuu"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 #, fuzzy
 msgid "McClellan"
 msgstr "Islanti"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 #, fuzzy
 msgid "McComb"
 msgstr "Yrit"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 #, fuzzy
 msgid "Meacham"
 msgstr "Maaliskuu"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Medford"
 msgstr "ennen"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Mehamn"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Melbourne"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 #, fuzzy
 msgid "Melfa"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 #, fuzzy
 msgid "Mendoza"
 msgstr "Maanantai"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 #, fuzzy
 msgid "Merida"
 msgstr "Perjantai"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Merril Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 #, fuzzy
 msgid "Mexicali"
 msgstr "Meksiko"
 
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 #, fuzzy
 msgid "Miami"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 #, fuzzy
 msgid "Middle East"
 msgstr "_Toinen nimi:"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middleton Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 #, fuzzy
 msgid "Middletown"
 msgstr "_Toinen nimi:"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Midland"
 msgstr "Suomi"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 #, fuzzy
 msgid "Miles City"
 msgstr "Tiedoston tyyppi:"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Milford"
 msgstr ""
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 #, fuzzy
 msgid "Milton"
 msgstr "Ma"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minatitlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 #, fuzzy
 msgid "Minchumina"
 msgstr "tulevat"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 #, fuzzy
 msgid "Minnesota"
 msgstr "minuutti"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 #, fuzzy
 msgid "Minot"
 msgstr "ei ole"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 #, fuzzy
 msgid "Missoula"
 msgstr "Neiti"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 #, fuzzy
 msgid "Missouri"
 msgstr "Neiti"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 #, fuzzy
 msgid "Mitchell"
 msgstr "Osumia:"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitilini"
 msgstr ""
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 #, fuzzy
 msgid "Moa"
 msgstr "Ma"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "Matkapuhelin"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 #, fuzzy
 msgid "Mobridge"
 msgstr "Matkapuhelin"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 #, fuzzy
 msgid "Modesto"
 msgstr "Matalin"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 #, fuzzy
 msgid "Mojave"
-msgstr "Siirrä"
+msgstr "SiirrÃ¤"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Molde"
 msgstr "Matkapuhelin"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Moldova"
 msgstr "Maanantai"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 #, fuzzy
 msgid "Molokai"
 msgstr "Malawi"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 #, fuzzy
 msgid "Monclova"
 msgstr "Monaco"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Moncton"
 msgstr "Monaco"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Monida"
 msgstr "Maanantai"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 #, fuzzy
 msgid "Monroe"
 msgstr "Monaco"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Montague"
 msgstr "_Kuukausi"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Montana"
 msgstr "Botswana"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Bisbino"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "Kuukausi"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Montego Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 #, fuzzy
 msgid "Monterey"
 msgstr "_Kuukausi"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterrey"
 msgstr ""
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 #, fuzzy
 msgid "Monticello"
 msgstr "Monaco"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 msgid "Montpelier"
 msgstr "Kuukausi"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 #, fuzzy
 msgid "Montrose"
 msgstr "Kirjasinlajit"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 #, fuzzy
 msgid "Morelia"
 msgstr "Korealainen"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morgantown"
 msgstr "Organisaatio"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Moriarty"
 msgstr "Ensisijainen"
 
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 #, fuzzy
 msgid "Mosinee"
 msgstr "Matkapuhelin"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 #, fuzzy
 msgid "Mountain View"
 msgstr "Kuukausi"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Shasta"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "Kuukausi"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Mullan"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 #, fuzzy
 msgid "Muncie"
-msgstr "Kesäkuu"
+msgstr "KesÃ¤kuu"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 #, fuzzy
 msgid "Murcia"
-msgstr "Itävalta"
+msgstr "ItÃ¤valta"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 #, fuzzy
 msgid "Mus"
 msgstr "Nti."
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Muscatine"
 msgstr ""
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 #, fuzzy
 msgid "Mykonos"
 msgstr "Kirjasinlajit"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 #, fuzzy
 msgid "Najran"
 msgstr "Bahrain"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 #, fuzzy
 msgid "Namsos"
 msgstr "Nimi"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 #, fuzzy
 msgid "Nanning"
 msgstr "Varoitus"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 #, fuzzy
 msgid "Napa"
 msgstr "Japani"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Naples"
 msgstr "Nimi"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Napoli"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Narvik"
 msgstr ""
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 #, fuzzy
 msgid "Natal"
 msgstr "Italia"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 #, fuzzy
 msgid "Natchez"
 msgstr "Osumia:"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 #, fuzzy
 msgid "Nebraska"
-msgstr "Uusi tehtävä"
+msgstr "Uusi tehtÃ¤vÃ¤"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 #, fuzzy
 msgid "Nenana"
 msgstr "Grenada"
 
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 #, fuzzy
 msgid "Nevada"
 msgstr "Grenada"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 #, fuzzy
 msgid "Newark"
-msgstr "Uusi tehtävä"
+msgstr "Uusi tehtÃ¤vÃ¤"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "New Bedford"
 msgstr ""
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "New Bern"
 msgstr "Uusi-Seelanti"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 #, fuzzy
 msgid "Newcastle"
-msgstr "Keskusteluryhmät"
+msgstr "KeskusteluryhmÃ¤t"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "Uusi-Seelanti"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 #, fuzzy
 msgid "Newfoundland"
 msgstr "Uusi-Seelanti"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 #, fuzzy
 msgid "New Haven"
 msgstr "Uusi Kaledonia"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Iberia"
 msgstr "Uusi Kaledonia"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Jersey"
 msgstr "Seuraava viesti"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 #, fuzzy
 msgid "New Mexico"
 msgstr "Meksiko"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 #, fuzzy
 msgid "New Orleans"
 msgstr "Alankomaat"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 #, fuzzy
 msgid "Newport"
 msgstr "Tuo"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 #, fuzzy
 msgid "New River"
 msgstr "_Uusi kansio"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 #, fuzzy
 msgid "Newton"
 msgstr "Uusi"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 #, fuzzy
 msgid "New York"
 msgstr "_Uusi kansio"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 #, fuzzy
 msgid "Nimes-Garons"
 msgstr "Mitat:"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 #, fuzzy
 msgid "Nipawin"
 msgstr "Espanja"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nis"
 msgstr "on"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 #, fuzzy
 msgid "Nogales"
 msgstr "Tavallinen"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "Nome"
 msgstr "Nimi"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 #, fuzzy
 msgid "Norfolk"
 msgstr "Tavallinen"
 
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norrkoping"
 msgstr ""
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "North Adams"
 msgstr ""
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 #, fuzzy
 msgid "North Conway"
 msgstr "Norja"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Dakota"
-msgstr "Syntymäpäivä"
+msgstr "SyntymÃ¤pÃ¤ivÃ¤"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 #, fuzzy
 msgid "North Platte"
-msgstr "Syntymäpäivä"
+msgstr "SyntymÃ¤pÃ¤ivÃ¤"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "Northway"
 msgstr "Norja"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northwest Territories"
 msgstr ""
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 #, fuzzy
 msgid "Norwich"
 msgstr "Norja"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwood"
 msgstr "Norja"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Notodden"
 msgstr ""
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 #, fuzzy
 msgid "Nuevo Laredo"
 msgstr "Ei kortteja"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 #, fuzzy
 msgid "Oakland"
 msgstr "Thaimaa"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 #, fuzzy
 msgid "Oaxaca"
 msgstr "Jamaika"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 #, fuzzy
 msgid "Ocala"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 #, fuzzy
 msgid "Oceanside"
 msgstr "Islanti"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 #, fuzzy
 msgid "Odense"
 msgstr "Avaa"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 #, fuzzy
 msgid "Oelwen"
 msgstr "Avaa"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 msgid "Ogden"
 msgstr "Avaa"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 #, fuzzy
 msgid "Ohrid"
 msgstr "Muut"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 #, fuzzy
 msgid "Ojika Island"
 msgstr "Joulusaaret"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 #, fuzzy
 msgid "Okushiri Island"
 msgstr "Neitsytsaaret"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 #, fuzzy
 msgid "Olathe"
 msgstr "Muut"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 #, fuzzy
 msgid "Olbia"
 msgstr "Kolumbia"
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 #, fuzzy
 msgid "Omaha"
 msgstr "Oman"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 #, fuzzy
 msgid "Omak"
 msgstr "Oman"
 
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Omsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 #, fuzzy
 msgid "Ontario"
 msgstr "Suunta"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Oostende"
 msgstr "Osanottaja"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 #, fuzzy
 msgid "Oran"
 msgstr "Oman"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 #, fuzzy
 msgid "Orange"
 msgstr "Ranska"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 #, fuzzy
 msgid "Oregon"
 msgstr "Alueet"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 #, fuzzy
 msgid "Orland"
 msgstr "Irlanti"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 msgid "Orlando"
 msgstr "Irlanti"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 #, fuzzy
 msgid "Oruro"
 msgstr "Virhe"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 #, fuzzy
 msgid "Oscoda"
 msgstr "sekunti"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 #, fuzzy
 msgid "Ostrava"
 msgstr "Australia"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 #, fuzzy
 msgid "Owyhee"
 msgstr "viikko"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Oxford"
 msgstr ""
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 #, fuzzy
 msgid "Paganella"
 msgstr "Sivu"
 
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Palacios"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 #, fuzzy
 msgid "Palermo"
 msgstr "Paperi"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palmdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 #, fuzzy
 msgid "Palmer"
 msgstr "Paperi"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palm Springs"
-msgstr "_Sähköpostiasetukset..."
+msgstr "_SÃ¤hkÃ¶postiasetukset..."
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Pamplona"
 msgstr ""
 
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 #, fuzzy
 msgid "Panama City"
 msgstr "Panama"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Pantelleria"
 msgstr "Peruutettu"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Papa"
 msgstr "Japani"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Paphos"
 msgstr "Laos"
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 #, fuzzy
 msgid "Paris"
 msgstr "Ensisij"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 #, fuzzy
 msgid "Paris/Orly"
 msgstr "Ensisijainen"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 #, fuzzy
 msgid "Pasco"
 msgstr "Salasana"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 #, fuzzy
 msgid "Patna"
 msgstr "Panama"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 #, fuzzy
 msgid "Paysandu"
 msgstr "Pakistan"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Payson"
-msgstr "päivää"
+msgstr "pÃ¤ivÃ¤Ã¤"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Pellston"
 msgstr "Kysymys"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pelotas"
 msgstr "Lue"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pendleton"
-msgstr "Käännä valinta"
+msgstr "KÃ¤Ã¤nnÃ¤ valinta"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 #, fuzzy
 msgid "Peoria"
 msgstr "Georgia"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 #, fuzzy
 msgid "Perm"
 msgstr "Ensisij"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 #, fuzzy
 msgid "Perth"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 #, fuzzy
 msgid "Perugia"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 #, fuzzy
 msgid "Philip"
 msgstr "Filippiinit"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 #, fuzzy
 msgid "Philipsburg"
 msgstr "Filippiinit"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 #, fuzzy
 msgid "Phillips"
 msgstr "Filippiinit"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 #, fuzzy
 msgid "Pierre"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pikeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pine Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 #, fuzzy
 msgid "Pisa"
 msgstr "Pakistan"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 #, fuzzy
 msgid "Plymouth"
 msgstr "kuukausi"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica Titograd"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 #, fuzzy
 msgid "Point Hope"
 msgstr "Tulosta kirjekuori"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Lay"
 msgstr "Kuvaus"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Mugu"
 msgstr "Tulosta viesti"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 #, fuzzy
 msgid "Poitiers"
 msgstr "Ominaisuudet"
 
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Ponca City"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 #, fuzzy
 msgid "Ponce"
-msgstr "Määrittelemätön"
+msgstr "MÃ¤Ã¤rittelemÃ¤tÃ¶n"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 #, fuzzy
 msgid "Pontiac"
 msgstr "Kontaktit"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 #, fuzzy
 msgid "Poprad"
 msgstr "Puola"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 msgid "Port Alexander"
 msgstr "Tulosta kalenteri"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 #, fuzzy
 msgid "Port Angeles"
 msgstr "Tulosta kirjekuori"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 #, fuzzy
 msgid "Porterville"
 msgstr "Pysty"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Port Hardy"
 msgstr "Tulosta kortti"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Port Hedland"
 msgstr "Puola"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 #, fuzzy
 msgid "Portland"
 msgstr "Puola"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 #, fuzzy
 msgid "Porto"
 msgstr "_Portti:"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto Alegre"
 msgstr ""
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 #, fuzzy
 msgid "Portoroz"
 msgstr "Pysty"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 #, fuzzy
 msgid "Porto Santo"
 msgstr "Pysty"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 #, fuzzy
 msgid "Port Said"
 msgstr "Pysty"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 #, fuzzy
 msgid "Posadas"
 msgstr "Puola"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 #, fuzzy
 msgid "Poza Rica"
 msgstr "Costa Rica"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 #, fuzzy
 msgid "Poznan"
 msgstr "Puola"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Praha"
 msgstr "Paraguay"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Pratica di Mare"
 msgstr ""
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 #, fuzzy
 msgid "Presidente Prudente"
 msgstr "Tulostuksen esikatselu"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 #, fuzzy
 msgid "Pretoria"
 msgstr "Georgia"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 msgid "Preveza"
 msgstr "Esikatselu:"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Price-Carbon"
 msgstr ""
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 #, fuzzy
 msgid "Pristina"
 msgstr "Perinteinen"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Providence"
-msgstr "_Osavaltio/lääni:"
+msgstr "_Osavaltio/lÃ¤Ã¤ni:"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Provincetown"
 msgstr "Esikatselu:"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Provo"
 msgstr "Edellinen"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pucallpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 #, fuzzy
 msgid "Puebla"
 msgstr "Julkinen"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 #, fuzzy
 msgid "Pueblo"
 msgstr "Julkinen"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Puerto Barrios"
 msgstr ""
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Escondido"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Lempira"
 msgstr ""
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "Kysymys"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Montt"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "Kuvaus"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 #, fuzzy
 msgid "Pula"
 msgstr "Puola"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 #, fuzzy
 msgid "Pullman"
 msgstr "Puola"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 #, fuzzy
 msgid "Punta Cana"
 msgstr "Tulosta kalenteri"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 #, fuzzy
 msgid "Quantico"
 msgstr "Kysymys"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Quebec"
 msgstr "Aihe"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Rapid City"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Rawlins"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 #, fuzzy
 msgid "Reading"
 msgstr "Lue"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 #, fuzzy
 msgid "Rebun Island"
-msgstr "Färsaaret"
+msgstr "FÃ¤rsaaret"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 #, fuzzy
 msgid "Recife"
 msgstr "Otettu vastaan"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Redding"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 #, fuzzy
 msgid "Redig"
 msgstr "Lue"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redmond"
 msgstr "Muistutus"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 #, fuzzy
 msgid "Regina"
 msgstr "Alueet"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 #, fuzzy
 msgid "Rennes"
 msgstr "Muistutukset"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 #, fuzzy
 msgid "Reno"
 msgstr "Poista"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Renton"
 msgstr "Libanon"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 #, fuzzy
 msgid "Reus"
-msgstr "Säännöt"
+msgstr "SÃ¤Ã¤nnÃ¶t"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 msgid "Reyes"
 msgstr "vuotta"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 #, fuzzy
 msgid "Reynosa"
 msgstr "Lue"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Rhinelander"
 msgstr "Suomi"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 #, fuzzy
 msgid "Rhode Island"
-msgstr "Färsaaret"
+msgstr "FÃ¤rsaaret"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 #, fuzzy
 msgid "Riberalta"
 msgstr "Gibraltar"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 #, fuzzy
 msgid "Rickenbacker"
 msgstr "Kutsumanimi"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rieti"
 msgstr "Haiti"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rifle"
 msgstr "Rooli"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rijeka"
 msgstr "Lue"
 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1880
 #, fuzzy
 msgid "Rimini"
 msgstr "Romania"
 
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1881
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1882
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1883
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1884
 msgid "Rioja"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1885
 #, fuzzy
 msgid "Rio / Jacarepagua"
 msgstr "Nicaragua"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1886
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1887
 #, fuzzy
 msgid "Rishiri Island"
 msgstr "Neitsytsaaret"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1888
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1889
 #, fuzzy
 msgid "Rivera"
 msgstr "Liberia"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1890
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1891
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1892
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1893
 #, fuzzy
 msgid "Rivne"
 msgstr "Tulosta"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivolto"
 msgstr "Evolution"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1895
 #, fuzzy
 msgid "Riyadh"
 msgstr "Lue"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1896
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1897
 #, fuzzy
 msgid "Roatan"
 msgstr "Kroatia"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1898
 #, fuzzy
 msgid "Robore"
 msgstr "ennen"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1899
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1900
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1901
 #, fuzzy
 msgid "Rockland"
 msgstr "Puola"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1902
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1903
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1904
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1905
 msgid "Rodos"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1906
 #, fuzzy
 msgid "Rogers"
 msgstr "Kansiot"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1907
 #, fuzzy
 msgid "Roma/Ciampino"
 msgstr "Romania"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1908
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1910
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1911
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1912
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1913
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1914
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1915
 #, fuzzy
 msgid "Roros"
 msgstr "tuntia"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1916
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1917
 msgid "Rosario"
 msgstr ""
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1918
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1919
 #, fuzzy
 msgid "Roseglen"
 msgstr "Rooli"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1920
 #, fuzzy
 msgid "Rost"
-msgstr "Isäntäpalvelin"
+msgstr "IsÃ¤ntÃ¤palvelin"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1921
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1922
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1923
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1924
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1925
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1926
 msgid "Rurrenabaque"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1927
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1928
 #, fuzzy
 msgid "Russia"
-msgstr "Itävalta"
+msgstr "ItÃ¤valta"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1929
 #, fuzzy
 msgid "Rutland"
 msgstr "Bhutan"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1930
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1931
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1932
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1933
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1934
 #, fuzzy
 msgid "Sacramento"
 msgstr "Osasto"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1935
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1936
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1937
 #, fuzzy
 msgid "Saginaw"
 msgstr "Espanja"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1938
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1939
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1940
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1941
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1942
 #, fuzzy
 msgid "Saint Mary's"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1943
 #, fuzzy
 msgid "Saint Mawgan"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1944
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1945
 msgid "Saint Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1946
 #, fuzzy
 msgid "Saiq"
 msgstr "Espanja"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1947
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1948
 #, fuzzy
 msgid "Salem"
 msgstr "Tallenna"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1949
 #, fuzzy
 msgid "Salida"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1950
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1951
 #, fuzzy
 msgid "Salina"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salinas"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1953
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1954
 msgid "Salmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1955
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1956
 #, fuzzy
 msgid "Salta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1957
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1958
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1959
 #, fuzzy
 msgid "Salto"
 msgstr "La"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1960
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1961
 #, fuzzy
 msgid "Salvador"
 msgstr "El Salvador"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1962
 msgid "Salzburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1963
 #, fuzzy
 msgid "Samara"
 msgstr "Jamaika"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1964
 #, fuzzy
 msgid "Samos"
 msgstr "Laos"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1965
 #, fuzzy
 msgid "Samsun"
 msgstr "Su"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1966
 msgid "Sana'A"
 msgstr ""
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1967
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1968
 #, fuzzy
 msgid "San Angelo"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1969
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1970
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1971
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1973
 #, fuzzy
 msgid "San Carlos"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1974
 #, fuzzy
 msgid "Sandane"
 msgstr "Sudan"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandberg"
-msgstr "Lähettäjä"
+msgstr "LÃ¤hettÃ¤jÃ¤"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "Sanderson"
-msgstr "Lähettäjä"
+msgstr "LÃ¤hettÃ¤jÃ¤"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1977
 #, fuzzy
 msgid "San Diego"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1978
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1981
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1982
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1983
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1984
 #, fuzzy
 msgid "Sand Point"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1985
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1986
 msgid "Sanford"
 msgstr ""
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1987
 #, fuzzy
 msgid "San Francisco"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1988
 #, fuzzy
 msgid "Sangju"
 msgstr "Varjostus"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1989
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1990
 #, fuzzy
 msgid "San Joaquin"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1991
 #, fuzzy
 msgid "San Jose"
 msgstr "Tallenna ja sulje"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1992
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1993
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1994
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1995
 #, fuzzy
 msgid "San Juan"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1996
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1997
 #, fuzzy
 msgid "Sanliurfa"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1998
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1999
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:2000
 #, fuzzy
 msgid "San Miguel"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2001
 msgid "San Nicholas Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2002
 #, fuzzy
 msgid "San Salvador"
 msgstr "El Salvador"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2003
 #, fuzzy
 msgid "San Sebastian"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2004
 msgid "Santa Ana"
 msgstr ""
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2005
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2006
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2007
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2008
 #, fuzzy
 msgid "Santa Maria"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2009
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2010
 msgid "Santa Monica"
 msgstr ""
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2011
 #, fuzzy
 msgid "Santander"
-msgstr "Lähettäjä"
+msgstr "LÃ¤hettÃ¤jÃ¤"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2012
 #, fuzzy
 msgid "Santarem"
 msgstr "Qatar"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2013
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2015
 msgid "Santiago"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2016
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2017
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2018
 #, fuzzy
 msgid "Santorini"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2019
 #, fuzzy
 msgid "Santos"
 msgstr "Tila"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2020
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2021
 msgid "Sao Luiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2022
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2023
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2024
 msgid "Sarajevo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2025
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2026
 msgid "Sarasota"
 msgstr ""
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2027
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2028
 #, fuzzy
 msgid "Sarzana"
 msgstr "Sri Lanka"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2029
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2030
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2031
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2033
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2034
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2035
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2036
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2037
 #, fuzzy
 msgid "Sayun"
 msgstr "Su"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Scatsta"
 msgstr "Tila"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2039
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2040
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2041
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2042
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2043
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2044
 #, fuzzy
 msgid "Scranton"
 msgstr "Organisaatio"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2045
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2046
 #, fuzzy
 msgid "Seattle-Boeing"
 msgstr "Asetukset"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Sedalia"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Seeb"
-msgstr "Näkemättä"
+msgstr "NÃ¤kemÃ¤ttÃ¤"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2049
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2050
 msgid "Sendai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2051
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2052
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2054
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2055
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2056
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2057
 #, fuzzy
 msgid "Seward"
 msgstr "Etsi"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2058
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2059
 #, fuzzy
 msgid "Shanghai"
 msgstr "Varjostus"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2060
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2061
 #, fuzzy
 msgid "Sharjah"
 msgstr "Etsi"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2062
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2063
 #, fuzzy
 msgid "Sharurah"
 msgstr "Lauantai"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Shawbury"
 msgstr "Lauantai"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2065
 msgid "Shearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2066
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2067
 #, fuzzy
 msgid "Sheldon"
 msgstr "Ruotsi"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2068
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2069
 #, fuzzy
 msgid "Shelton"
-msgstr "Käännä valinta"
+msgstr "KÃ¤Ã¤nnÃ¤ valinta"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2070
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2071
 #, fuzzy
 msgid "Sheridan"
 msgstr "Sudan"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2072
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2073
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2074
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2075
 #, fuzzy
 msgid "Shiraz"
 msgstr "Koko"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2076
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2077
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2078
 msgid "Shoreham"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2079
 #, fuzzy
 msgid "Show Low"
-msgstr "Näytä 1 viikko"
+msgstr "NÃ¤ytÃ¤ 1 viikko"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2080
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2082
 #, fuzzy
 msgid "Sidney"
 msgstr "Tulosta"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2083
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2084
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2085
 #, fuzzy
 msgid "Silver City"
 msgstr "Turvallisuus"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2086
 #, fuzzy
 msgid "Sindal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2088
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2089
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2090
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2091
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2092
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2093
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2094
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2095
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2096
 #, fuzzy
 msgid "Skive"
 msgstr "Koko"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2097
 #, fuzzy
 msgid "Skopje"
-msgstr "Pysäytä"
+msgstr "PysÃ¤ytÃ¤"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2098
 #, fuzzy
 msgid "Skwentna"
-msgstr "Lähetetyt"
+msgstr "LÃ¤hetetyt"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Slana"
 msgstr "Slovakia"
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2102
 #, fuzzy
 msgid "Smithers"
 msgstr "minuutti"
 
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2103
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2104
 msgid "Snowshoe Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2105
 msgid "Sochi"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2106
 msgid "Socorro"
 msgstr ""
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2107
 msgid "Socotra"
 msgstr ""
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2108
 msgid "Soda Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2109
 #, fuzzy
 msgid "Sofia"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2110
 #, fuzzy
 msgid "Sogndal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2111
 msgid "Soldotna"
 msgstr ""
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2112
 msgid "Somerset"
 msgstr ""
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2113
 #, fuzzy
 msgid "Sonderborg"
-msgstr "Lähettäjä"
+msgstr "LÃ¤hettÃ¤jÃ¤"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2114
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2115
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2117
 msgid "Southampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2118
 msgid "South Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2119
 #, fuzzy
 msgid "South Carolina"
-msgstr "Etelä-Afrikka"
+msgstr "EtelÃ¤-Afrikka"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2120
 msgid "South Dakota"
 msgstr ""
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2121
 #, fuzzy
 msgid "Southend"
-msgstr "Lähetä"
+msgstr "LÃ¤hetÃ¤"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2122
 msgid "South Marsh Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2123
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2125
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2126
 #, fuzzy
 msgid "Spencer"
-msgstr "Lähettäjä"
+msgstr "LÃ¤hettÃ¤jÃ¤"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2127
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2128
 #, fuzzy
 msgid "Split"
 msgstr "Espanja"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Spokane"
 msgstr "Espanja"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2130
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2131
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2132
 #, fuzzy
 msgid "Springfield"
 msgstr "Yksinkertaistettu"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2133
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2134
 msgid "State College"
 msgstr ""
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2135
 #, fuzzy
 msgid "Stauning"
 msgstr "Asetukset"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2136
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2137
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2138
 #, fuzzy
 msgid "Staverton"
 msgstr "Asetukset"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Stavropol"
-msgstr "Pysäytä"
+msgstr "PysÃ¤ytÃ¤"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2140
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2141
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2142
 msgid "Stephenville"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2143
 msgid "St. George"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2144
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2145
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2146
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2147
 #, fuzzy
 msgid "St Joseph"
-msgstr "Pysäytä"
+msgstr "PysÃ¤ytÃ¤"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2148
 #, fuzzy
 msgid "St Louis"
-msgstr "Pysäytä lataaminen"
+msgstr "PysÃ¤ytÃ¤ lataaminen"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2149
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2150
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2152
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2153
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2154
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2155
 #, fuzzy
 msgid "Storm Lake"
 msgstr "Sri Lanka"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Stornoway"
 msgstr "Norja"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2157
 #, fuzzy
 msgid "St Paul"
 msgstr "Tila"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2158
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2160
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2161
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2162
 #, fuzzy
 msgid "St Simon's Island"
 msgstr "Joulusaaret"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2163
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2164
 #, fuzzy
 msgid "Sturgeon Bay"
 msgstr "Lauantai"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2165
 msgid "Stuttgart"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2166
 #, fuzzy
 msgid "Sucre"
-msgstr "Lähde"
+msgstr "LÃ¤hde"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sumburgh"
 msgstr "Luxemburg"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2168
 #, fuzzy
 msgid "Sumter"
 msgstr "Kuvaus"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2169
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2170
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2171
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2172
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2174
 #, fuzzy
 msgid "Sutton"
 msgstr "Su"
 
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2175
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2176
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2177
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2179
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2181
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2182
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2183
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2184
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2185
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2186
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2187
 #, fuzzy
 msgid "Tabatinga"
 msgstr "Perinteinen"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2188
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2189
 #, fuzzy
 msgid "Tabuk"
-msgstr "_Tehtävä"
+msgstr "_TehtÃ¤vÃ¤"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2190
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2191
 #, fuzzy
 msgid "Tacna"
 msgstr "Ghana"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2192
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2193
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2194
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2195
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2196
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2197
 #, fuzzy
 msgid "Taejon"
 msgstr "Sitten"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2198
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2199
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2200
 #, fuzzy
 msgid "Taif"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2201
 #, fuzzy
 msgid "Tainan"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2203
 #, fuzzy
 msgid "Taiyuan"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Taiz"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2205
 #, fuzzy
 msgid "Tajima"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2206
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2207
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2208
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2209
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
+#: my-evolution/Locations.h:2210
 #, fuzzy
 msgid "Tallinn"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2211
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2213
 #, fuzzy
 msgid "Tampa"
 msgstr "Japani"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2214
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2215
 #, fuzzy
 msgid "Tampere"
 msgstr "Paperi"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2216
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2217
 #, fuzzy
 msgid "Tanana"
 msgstr "Kanada"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2218
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2219
 #, fuzzy
 msgid "Taos"
 msgstr "Laos"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2220
 #, fuzzy
 msgid "Taoyuan"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2221
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2222
 #, fuzzy
 msgid "Taranto"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Tarbes"
-msgstr "_Tehtävä"
+msgstr "_TehtÃ¤vÃ¤"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2224
 #, fuzzy
 msgid "Tarija"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2225
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2226
 #, fuzzy
 msgid "Tatalina"
 msgstr "Perinteinen"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2227
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2228
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2229
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2230
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2231
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2232
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2233
 #, fuzzy
 msgid "Tela"
 msgstr "Lue"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2234
 #, fuzzy
 msgid "Temple"
 msgstr "Tyyppi"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2235
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2236
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2237
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2238
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2239
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2240
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2241
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2242
 #, fuzzy
 msgid "Texas"
-msgstr "_Tehtävä"
+msgstr "_TehtÃ¤vÃ¤"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2243
 msgid "The Dalles"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2244
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2245
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2246
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2247
 msgid "Thisted"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2248
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2249
 #, fuzzy
 msgid "Thumrait"
 msgstr "Torstai"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Tianjin"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2251
 #, fuzzy
 msgid "Tijuana"
 msgstr "Liettua"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2252
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2253
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2254
 #, fuzzy
 msgid "Tirana"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2255
 #, fuzzy
 msgid "Tiree"
 msgstr "Pe"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2256
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2257
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2258
 msgid "Titusville"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2259
 #, fuzzy
 msgid "Tivat"
-msgstr "Henkilökohtainen"
+msgstr "HenkilÃ¶kohtainen"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2260
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2261
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2262
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2263
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2264
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2265
 #, fuzzy
 msgid "Tokunoshima Island"
 msgstr "Joulusaaret"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2266
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2267
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2268
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2269
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2270
 #, fuzzy
 msgid "Toledo"
-msgstr "Määritä"
+msgstr "MÃ¤Ã¤ritÃ¤"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2271
 msgid "Toluca"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2272
 #, fuzzy
 msgid "Tonopah"
 msgstr "Tonga"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2273
 #, fuzzy
 msgid "Topeka"
-msgstr "Ylä:"
+msgstr "YlÃ¤:"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2274
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2275
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2276
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2277
 msgid "Toronto"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2278
 #, fuzzy
 msgid "Torp"
-msgstr "Ylä:"
+msgstr "YlÃ¤:"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torrance"
 msgstr "Ranska"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Torreon"
 msgstr "Korealainen"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2281
 msgid "Tottori Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2282
 #, fuzzy
 msgid "Toulouse"
 msgstr "Sulje"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2283
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2284
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2285
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2286
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2287
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2288
 #, fuzzy
 msgid "Trabzon"
 msgstr "Gabon"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2289
 #, fuzzy
 msgid "Trapani"
 msgstr "Japani"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2290
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2291
 #, fuzzy
 msgid "Trelew"
 msgstr "Pe"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trenton"
 msgstr "Suunta"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2293
 #, fuzzy
 msgid "Trevico"
 msgstr "Edellinen"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2294
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2295
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2296
 msgid "Trieste"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2297
 msgid "Trinidad"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2298
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2299
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2300
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2301
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2302
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2303
 #, fuzzy
 msgid "Truckee"
 msgstr "Turkki"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2304
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2305
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2306
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2307
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2308
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2309
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2310
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2311
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2312
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2313
 #, fuzzy
 msgid "Tulcea"
 msgstr "Tiistai"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulsa"
 msgstr "Tunisia"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tupelo"
 msgstr "Ti"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Turaif"
 msgstr "Turkkilainen"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Turin"
 msgstr "Turkkilainen"
 
-#: my-evolution/Locations.h:2320
-#, fuzzy
+#: my-evolution/Locations.h:2319
 msgid "Turku"
-msgstr "Turkki"
+msgstr "Turku"
 
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2320
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2321
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2322
 msgid "Twenthe"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2323
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2324
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2325
 #, fuzzy
 msgid "Tyler"
 msgstr "Tyyppi"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2326
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2327
 #, fuzzy
 msgid "Tyumen"
 msgstr "Ti"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2328
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2329
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2330
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2332
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2333
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2334
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2335
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2336
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2337
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2338
 #, fuzzy
 msgid "United Arab Emirates "
 msgstr "Yhdistyneet arabiemiirikunnat"
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2341
 #, fuzzy
 msgid "Unst"
-msgstr "Nähty"
+msgstr "NÃ¤hty"
 
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2342
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2343
 #, fuzzy
 msgid "Uruapan"
 msgstr "Japani"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2344
 #, fuzzy
 msgid "Uruguaiana"
 msgstr "Uruguay"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2346
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2347
 #, fuzzy
 msgid "Utah"
 msgstr "."
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2348
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2349
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2350
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2351
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2352
 msgid "Vadso"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2353
 #, fuzzy
 msgid "Vaerlose"
 msgstr "Sulje"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2354
 #, fuzzy
 msgid "Vagar"
 msgstr "Qatar"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2355
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2356
 #, fuzzy
 msgid "Valdosta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2357
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2358
 #, fuzzy
 msgid "Valencia"
 msgstr "Kalenteri"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2359
 msgid "Valentine"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2360
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2361
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2362
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2363
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2365
 msgid "Van"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2366
 msgid "Vancouver"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2367
 #, fuzzy
 msgid "Vandel"
 msgstr "Peruuta"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2368
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2370
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2371
 #, fuzzy
 msgid "Varadero"
 msgstr "Barbados"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2372
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2373
 #, fuzzy
 msgid "Varna"
 msgstr "Ghana"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2374
 #, fuzzy
 msgid "Vasteras"
-msgstr "jälkeen"
+msgstr "jÃ¤lkeen"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2375
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2376
 #, fuzzy
 msgid "Venezia"
 msgstr "Venezuela"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2378
 #, fuzzy
 msgid "Venice"
 msgstr "Unicode"
 
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2379
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2380
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2381
 #, fuzzy
 msgid "Vermont"
 msgstr "kuukausi"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2382
 #, fuzzy
 msgid "Vernal"
 msgstr "Yleiset"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2383
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2384
 #, fuzzy
 msgid "Vicenza"
 msgstr "Venezuela"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2385
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2387
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2388
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2390
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2391
 #, fuzzy
 msgid "Vilhena"
 msgstr "Tiedostonimi:"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2392
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2393
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2394
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2395
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2396
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2397
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2398
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2399
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2400
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2401
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2402
 #, fuzzy
 msgid "Visalia"
 msgstr "Australia"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2403
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2404
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2405
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2406
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2407
 msgid "Vladivostok"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2408
 #, fuzzy
 msgid "Vlieland"
 msgstr "Suomi"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2409
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2410
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2411
 #, fuzzy
 msgid "Volkel"
 msgstr "Rooli"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2412
 #, fuzzy
 msgid "Volk Field"
-msgstr "_Kopio-kenttä"
+msgstr "_Kopio-kenttÃ¤"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2413
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2414
 msgid "Voslau"
 msgstr ""
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2415
 #, fuzzy
 msgid "Waco"
 msgstr "Monaco"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2416
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2417
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2418
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2419
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2420
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2421
 #, fuzzy
 msgid "Wallops Island"
 msgstr "Falklandsaaret"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2422
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2423
 #, fuzzy
 msgid "Warner Robins"
 msgstr "Varoitus"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2424
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2425
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2426
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2427
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2428
 #, fuzzy
 msgid "Waterbury"
-msgstr "Säätiedot"
+msgstr "SÃ¤Ã¤tiedot"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterloo"
-msgstr "Säätiedot"
+msgstr "SÃ¤Ã¤tiedot"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2430
 #, fuzzy
 msgid "Watertown"
-msgstr "Säätiedot"
+msgstr "SÃ¤Ã¤tiedot"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Waterville"
-msgstr "Ryhmät"
+msgstr "RyhmÃ¤t"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2432
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2433
 msgid "Wausau"
 msgstr ""
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2434
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2435
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2436
 msgid "Webster City"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2437
 #, fuzzy
 msgid "Wejh"
 msgstr "Ke"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2438
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2439
 #, fuzzy
 msgid "Wenatchee"
-msgstr "Säätiedot"
+msgstr "SÃ¤Ã¤tiedot"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wendover"
-msgstr "Lähettäjä"
+msgstr "LÃ¤hettÃ¤jÃ¤"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2441
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2442
 #, fuzzy
 msgid "West Burke"
-msgstr "Länsieurooppalainen"
+msgstr "LÃ¤nsieurooppalainen"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2443
 #, fuzzy
 msgid "Westerland"
 msgstr "Alankomaat"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2444
 msgid "Westfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2445
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2446
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2447
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2448
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2450
 #, fuzzy
 msgid "Wheeling"
 msgstr "Varjostus"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2451
 #, fuzzy
 msgid "Whidbey Island"
 msgstr "Joulusaaret"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2452
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2453
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2454
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2455
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2456
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2457
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2458
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2459
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2460
 msgid "Wick"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2461
 #, fuzzy
 msgid "Wien"
 msgstr "Ke"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2462
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2463
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2464
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2465
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2466
 msgid "Williston"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2467
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2468
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2469
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2470
 #, fuzzy
 msgid "Winchester"
 msgstr "Liechtenstein"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2471
 msgid "Windsor"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2472
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2473
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2474
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2475
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2476
 #, fuzzy
 msgid "Winslow"
 msgstr "nyt"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2477
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2478
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2479
 #, fuzzy
 msgid "Winter Park"
 msgstr "Salasana"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2480
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2481
 #, fuzzy
 msgid "Wisconsin"
 msgstr "sekuntia"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2483
 #, fuzzy
 msgid "Wise"
 msgstr "Ke"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2484
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2485
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2486
 #, fuzzy
 msgid "Woong Cheon"
 msgstr "Hong Kong"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2487
 #, fuzzy
 msgid "Wooster"
 msgstr "Alatunniste:"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Worcester"
-msgstr "Lähteet"
+msgstr "LÃ¤hteet"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worland"
 msgstr "Puola"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2490
 msgid "Worthington"
 msgstr ""
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2491
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2492
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2493
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2494
 #, fuzzy
 msgid "Wyoming"
 msgstr "tulevat"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2495
 #, fuzzy
 msgid "Xiamen"
 msgstr "Nimi"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2496
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2497
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2498
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2499
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2500
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2501
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2502
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2503
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2504
 #, fuzzy
 msgid "Yao Airport"
-msgstr "Älä tuo"
+msgstr "Ã„lÃ¤ tuo"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2505
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2506
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2507
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2508
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2510
 #, fuzzy
 msgid "Yenbo"
 msgstr "Jemen"
 
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2511
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2512
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2513
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2514
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2515
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2516
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2517
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2518
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2519
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2520
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2522
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2523
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2524
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2525
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2526
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2527
 #, fuzzy
 msgid "Zadar"
 msgstr "Kalenteri"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2528
 #, fuzzy
 msgid "Zagreb"
 msgstr "Sivu"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2529
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2530
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2531
 #, fuzzy
 msgid "Zanesville"
 msgstr "Peruutettu"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2532
 #, fuzzy
 msgid "Zaragoza"
 msgstr "Paraguay"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2533
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2534
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2535
 #, fuzzy
 msgid "Zurich"
 msgstr "Turkkilainen"
 
-#: my-evolution/component-factory.c:51
+#: my-evolution/component-factory.c:56
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
+#: my-evolution/e-summary-calendar.c:377 my-evolution/e-summary-calendar.c:397
 msgid "Appointments"
 msgstr "Tapaamiset"
 
-#: my-evolution/e-summary-calendar.c:382
+#: my-evolution/e-summary-calendar.c:378
 msgid "No appointments"
 msgstr "Ei tapaamisia"
 
-#: my-evolution/e-summary-calendar.c:418
-#, fuzzy
+#: my-evolution/e-summary-calendar.c:414
 msgid "%k:%M %d %B"
-msgstr "%A %d %B"
+msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:420
-#, fuzzy
+#: my-evolution/e-summary-calendar.c:416
 msgid "%l:%M %d %B"
-msgstr "%A %d %B"
+msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:438
-#, fuzzy
+#: my-evolution/e-summary-calendar.c:434
 msgid "No description"
-msgstr "Kuvaus:"
+msgstr "Ei kuvausta"
 
-#: my-evolution/e-summary-mail.c:153
+#: my-evolution/e-summary-mail.c:156
 msgid "Mail summary"
 msgstr "Postin yhteenveto"
 
 #: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
-#: shell/e-local-storage.c:1102
+#: shell/e-local-storage.c:1119
 msgid "Local Folders"
 msgstr "Paikalliset kansiot"
 
-#. translators: Put a list of codes for locations you want to see in
-#. My Evolution by default here. You can find the list of all
-#. stations and their codes in Evolution sources.
-#. (evolution/my-evolution/Locations)
-#. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:591
-msgid "KBOS"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:584
+#: my-evolution/e-summary-preferences.c:356
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:602
+#: my-evolution/e-summary-preferences.c:374
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:840
+#: my-evolution/e-summary-preferences.c:612
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:848
+#: my-evolution/e-summary-preferences.c:618
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
 #: my-evolution/e-summary-rdf.c:303
 #, fuzzy
 msgid "Error downloading RDF"
-msgstr "<b>Virhe ladattaessa RDF:ää</b>"
+msgstr "<b>Virhe ladattaessa RDF:Ã¤Ã¤</b>"
 
-#: my-evolution/e-summary-rdf.c:446
+#: my-evolution/e-summary-rdf.c:447
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:519
+#: my-evolution/e-summary-shown.c:518
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:531
-#, fuzzy
+#: my-evolution/e-summary-shown.c:530
 msgid "Add"
-msgstr "Lisää"
+msgstr "LisÃ¤Ã¤"
 
-#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:543 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
-msgstr "Näytä kaikki"
+msgstr "NÃ¤ytÃ¤ kaikki"
 
-#: my-evolution/e-summary-tasks.c:328
+#: my-evolution/e-summary-tasks.c:327
 msgid "No tasks"
-msgstr "Ei tehtäviä"
+msgstr "Ei tehtÃ¤viÃ¤"
 
-#: my-evolution/e-summary-tasks.c:372
-#, fuzzy
+#: my-evolution/e-summary-tasks.c:371
 msgid "(No Description)"
-msgstr "Kuvaus:"
+msgstr "(Ei kuvausta)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:73
 msgid "My Weather"
-msgstr "Säätiedot"
+msgstr "SÃ¤Ã¤tiedot"
 
-#: my-evolution/e-summary-weather.c:268
+#: my-evolution/e-summary-weather.c:269
 msgid "There was an error downloading data for"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:489
+#: my-evolution/e-summary-weather.c:490
 #, fuzzy
 msgid "Weather"
-msgstr "Säätiedot"
+msgstr "SÃ¤Ã¤tiedot"
 
-#: my-evolution/e-summary.c:188
-#, fuzzy
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:592
+msgid "KBOS"
+msgstr ""
+
+#: my-evolution/e-summary.c:197
 msgid "%A, %B %e %Y"
-msgstr "%A, %B %d, %Y"
+msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:504
+#: my-evolution/e-summary.c:523
 #, fuzzy
 msgid "Please wait..."
-msgstr "Odota, ole hyvä"
+msgstr "Odota, ole hyvÃ¤"
 
-#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:593 ui/my-evolution.xml.h:2
 #, fuzzy
 msgid "Print Summary"
 msgstr "Kuvaus"
 
-#: my-evolution/e-summary.c:640
+#: my-evolution/e-summary.c:627
 #, fuzzy
 msgid "Printing of Summary failed"
-msgstr "Viestin tulostus epäonnistui"
-
-#: my-evolution/main.c:68
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr ""
+msgstr "Viestin tulostus epÃ¤onnistui"
 
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 msgid " F"
 msgstr ""
 
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 msgid " C"
 msgstr ""
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 #, fuzzy
 msgid "knots"
 msgstr "Kirjasinlajit"
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 msgid "kph"
 msgstr ""
 
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 #, fuzzy
 msgid "inHg"
-msgstr "Siirretään"
+msgstr "SiirretÃ¤Ã¤n"
 
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 msgid "mmHg"
 msgstr ""
 
-#: my-evolution/metar.c:41
-#, fuzzy
+#: my-evolution/metar.c:42
 msgid "miles"
-msgstr "Suodattimet"
+msgstr "mailia"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 #, fuzzy
 msgid "kilometers"
 msgstr "Suodattimet"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Clear sky"
 msgstr ""
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Broken clouds"
 msgstr ""
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Scattered clouds"
 msgstr ""
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Few clouds"
 msgstr ""
 
-#: my-evolution/metar.c:48
+#: my-evolution/metar.c:49
 msgid "Overcast"
 msgstr ""
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
+#: my-evolution/metar.c:57 my-evolution/metar.c:75 my-evolution/metar.c:486
 msgid "Invalid"
 msgstr ""
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Variable"
 msgstr ""
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North"
 msgstr ""
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North - NorthEast"
 msgstr ""
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Northeast"
 msgstr ""
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - NorthEast"
 msgstr ""
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East"
 msgstr ""
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East - Southeast"
 msgstr ""
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southeast"
 msgstr ""
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southeast"
 msgstr ""
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South"
 msgstr ""
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South - Southwest"
 msgstr ""
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Southwest"
 msgstr ""
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Southwest"
 msgstr ""
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West"
 msgstr ""
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West - Northwest"
 msgstr ""
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "Northwest"
 msgstr ""
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "North - Northwest"
 msgstr ""
 
 #. DRIZZLE
-#: my-evolution/metar.c:127
+#: my-evolution/metar.c:128
 msgid "Drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:128
+#: my-evolution/metar.c:129
 msgid "Drizzle in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:129
+#: my-evolution/metar.c:130
 msgid "Light drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:130
+#: my-evolution/metar.c:131
 msgid "Moderate drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:131
+#: my-evolution/metar.c:132
 msgid "Heavy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:132
+#: my-evolution/metar.c:133
 msgid "Shallow drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:133
+#: my-evolution/metar.c:134
 msgid "Patches of drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:134
+#: my-evolution/metar.c:135
 msgid "Partial drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
+#: my-evolution/metar.c:136 my-evolution/metar.c:151
 msgid "Thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:136
+#: my-evolution/metar.c:137
 msgid "Windy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:137
+#: my-evolution/metar.c:138
 msgid "Showers"
 msgstr ""
 
-#: my-evolution/metar.c:138
+#: my-evolution/metar.c:139
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:139
+#: my-evolution/metar.c:140
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: my-evolution/metar.c:142
+#: my-evolution/metar.c:143
 msgid "Rain"
 msgstr ""
 
-#: my-evolution/metar.c:143
+#: my-evolution/metar.c:144
 msgid "Rain in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:144
+#: my-evolution/metar.c:145
 msgid "Light rain"
 msgstr ""
 
-#: my-evolution/metar.c:145
+#: my-evolution/metar.c:146
 msgid "Moderate rain"
 msgstr ""
 
-#: my-evolution/metar.c:146
+#: my-evolution/metar.c:147
 msgid "Heavy rain"
 msgstr ""
 
-#: my-evolution/metar.c:147
+#: my-evolution/metar.c:148
 msgid "Shallow rain"
 msgstr ""
 
-#: my-evolution/metar.c:148
+#: my-evolution/metar.c:149
 msgid "Patches of rain"
 msgstr ""
 
-#: my-evolution/metar.c:149
+#: my-evolution/metar.c:150
 msgid "Partial rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:151
+#: my-evolution/metar.c:152
 msgid "Blowing rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:152
+#: my-evolution/metar.c:153
 msgid "Rain showers"
 msgstr ""
 
-#: my-evolution/metar.c:153
+#: my-evolution/metar.c:154
 msgid "Drifting rain"
 msgstr ""
 
-#: my-evolution/metar.c:154
+#: my-evolution/metar.c:155
 msgid "Freezing rain"
 msgstr ""
 
 #. SNOW
-#: my-evolution/metar.c:157
+#: my-evolution/metar.c:158
 msgid "Snow"
 msgstr ""
 
-#: my-evolution/metar.c:158
+#: my-evolution/metar.c:159
 msgid "Snow in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:159
+#: my-evolution/metar.c:160
 msgid "Light snow"
 msgstr ""
 
-#: my-evolution/metar.c:160
+#: my-evolution/metar.c:161
 msgid "Moderate snow"
 msgstr ""
 
-#: my-evolution/metar.c:161
+#: my-evolution/metar.c:162
 msgid "Heavy snow"
 msgstr ""
 
-#: my-evolution/metar.c:162
+#: my-evolution/metar.c:163
 msgid "Shallow snow"
 msgstr ""
 
-#: my-evolution/metar.c:163
+#: my-evolution/metar.c:164
 msgid "Patches of snow"
 msgstr ""
 
-#: my-evolution/metar.c:164
+#: my-evolution/metar.c:165
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
+#: my-evolution/metar.c:166 my-evolution/metar.c:181
 msgid "Snowstorm"
 msgstr ""
 
-#: my-evolution/metar.c:166
+#: my-evolution/metar.c:167
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:167
+#: my-evolution/metar.c:168
 msgid "Snow showers"
 msgstr ""
 
-#: my-evolution/metar.c:168
+#: my-evolution/metar.c:169
 msgid "Drifting snow"
 msgstr ""
 
-#: my-evolution/metar.c:169
+#: my-evolution/metar.c:170
 msgid "Freezing snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:172
+#: my-evolution/metar.c:173
 msgid "Snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:173
+#: my-evolution/metar.c:174
 msgid "Snow grains in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:174
+#: my-evolution/metar.c:175
 msgid "Light snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:175
+#: my-evolution/metar.c:176
 msgid "Moderate snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:176
+#: my-evolution/metar.c:177
 msgid "Heavy snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:177
+#: my-evolution/metar.c:178
 msgid "Shallow snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:178
+#: my-evolution/metar.c:179
 msgid "Patches of snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:179
+#: my-evolution/metar.c:180
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:181
+#: my-evolution/metar.c:182
 msgid "Blowing snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:182
+#: my-evolution/metar.c:183
 msgid "Snow grain showers"
 msgstr ""
 
-#: my-evolution/metar.c:183
+#: my-evolution/metar.c:184
 msgid "Drifting snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:184
+#: my-evolution/metar.c:185
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:187
+#: my-evolution/metar.c:188
 msgid "Ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:188
+#: my-evolution/metar.c:189
 msgid "Ice crystals in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:189
+#: my-evolution/metar.c:190
 msgid "Few ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:190
+#: my-evolution/metar.c:191
 msgid "Moderate ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:191
+#: my-evolution/metar.c:192
 msgid "Heavy ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:193
+#: my-evolution/metar.c:194
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:194
+#: my-evolution/metar.c:195
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:195
+#: my-evolution/metar.c:196
 msgid "Ice crystal storm"
 msgstr ""
 
-#: my-evolution/metar.c:196
+#: my-evolution/metar.c:197
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:197
+#: my-evolution/metar.c:198
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:198
+#: my-evolution/metar.c:199
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:199
+#: my-evolution/metar.c:200
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:202
+#: my-evolution/metar.c:203
 msgid "Ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:203
+#: my-evolution/metar.c:204
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:204
+#: my-evolution/metar.c:205
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:205
+#: my-evolution/metar.c:206
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:206
+#: my-evolution/metar.c:207
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:207
+#: my-evolution/metar.c:208
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:208
+#: my-evolution/metar.c:209
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:209
+#: my-evolution/metar.c:210
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:210
+#: my-evolution/metar.c:211
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:211
+#: my-evolution/metar.c:212
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:212
+#: my-evolution/metar.c:213
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:213
+#: my-evolution/metar.c:214
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:214
+#: my-evolution/metar.c:215
 msgid "Freezing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:218
+#: my-evolution/metar.c:219
 msgid "Hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:219 my-evolution/metar.c:234
+#: my-evolution/metar.c:220 my-evolution/metar.c:235
 msgid "Light hail"
 msgstr ""
 
-#: my-evolution/metar.c:220
+#: my-evolution/metar.c:221
 msgid "Moderate hail"
 msgstr ""
 
-#: my-evolution/metar.c:221
+#: my-evolution/metar.c:222
 msgid "Heavy hail"
 msgstr ""
 
-#: my-evolution/metar.c:222
+#: my-evolution/metar.c:223
 msgid "Shallow hail"
 msgstr ""
 
-#: my-evolution/metar.c:223
+#: my-evolution/metar.c:224
 msgid "Patches of hail"
 msgstr ""
 
-#: my-evolution/metar.c:224
+#: my-evolution/metar.c:225
 msgid "Partial hail"
 msgstr ""
 
-#: my-evolution/metar.c:225
+#: my-evolution/metar.c:226
 msgid "Hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:226
+#: my-evolution/metar.c:227
 msgid "Blowing hail"
 msgstr ""
 
-#: my-evolution/metar.c:227
+#: my-evolution/metar.c:228
 msgid "Hail showers"
 msgstr ""
 
-#: my-evolution/metar.c:228
+#: my-evolution/metar.c:229
 msgid "Drifting hail"
 msgstr ""
 
-#: my-evolution/metar.c:229
+#: my-evolution/metar.c:230
 msgid "Freezing hail"
 msgstr ""
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:232
+#: my-evolution/metar.c:233
 msgid "Small hail"
 msgstr ""
 
-#: my-evolution/metar.c:233
+#: my-evolution/metar.c:234
 msgid "Small hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:235
+#: my-evolution/metar.c:236
 msgid "Moderate small hail"
 msgstr ""
 
-#: my-evolution/metar.c:236
+#: my-evolution/metar.c:237
 msgid "Heavy small hail"
 msgstr ""
 
-#: my-evolution/metar.c:237
+#: my-evolution/metar.c:238
 msgid "Shallow small hail"
 msgstr ""
 
-#: my-evolution/metar.c:238
+#: my-evolution/metar.c:239
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:239
+#: my-evolution/metar.c:240
 msgid "Partial small hail"
 msgstr ""
 
-#: my-evolution/metar.c:240
+#: my-evolution/metar.c:241
 msgid "Small hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:241
+#: my-evolution/metar.c:242
 msgid "Blowing small hail"
 msgstr ""
 
-#: my-evolution/metar.c:242
+#: my-evolution/metar.c:243
 msgid "Showers of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:243
+#: my-evolution/metar.c:244
 msgid "Drifting small hail"
 msgstr ""
 
-#: my-evolution/metar.c:244
+#: my-evolution/metar.c:245
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:247
+#: my-evolution/metar.c:248
 msgid "Unknown precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:248
+#: my-evolution/metar.c:249
 msgid "Precipitation in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:249
+#: my-evolution/metar.c:250
 msgid "Light precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:250
+#: my-evolution/metar.c:251
 msgid "Moderate precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:251
+#: my-evolution/metar.c:252
 msgid "Heavy precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:252
+#: my-evolution/metar.c:253
 msgid "Shallow precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:253
+#: my-evolution/metar.c:254
 msgid "Patches of precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:254
+#: my-evolution/metar.c:255
 msgid "Partial precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:255
+#: my-evolution/metar.c:256
 msgid "Unknown thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:256
+#: my-evolution/metar.c:257
 msgid "Blowing precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:257
+#: my-evolution/metar.c:258
 msgid "Showers, type unknown"
 msgstr ""
 
-#: my-evolution/metar.c:258
+#: my-evolution/metar.c:259
 msgid "Drifting precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:259
+#: my-evolution/metar.c:260
 msgid "Freezing precipitation"
 msgstr ""
 
 #. MIST
-#: my-evolution/metar.c:262
+#: my-evolution/metar.c:263
 msgid "Mist"
 msgstr ""
 
-#: my-evolution/metar.c:263
+#: my-evolution/metar.c:264
 msgid "Mist in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:264
+#: my-evolution/metar.c:265
 msgid "Light mist"
 msgstr ""
 
-#: my-evolution/metar.c:265
+#: my-evolution/metar.c:266
 msgid "Moderate mist"
 msgstr ""
 
-#: my-evolution/metar.c:266
+#: my-evolution/metar.c:267
 msgid "Thick mist"
 msgstr ""
 
-#: my-evolution/metar.c:267
+#: my-evolution/metar.c:268
 msgid "Shallow mist"
 msgstr ""
 
-#: my-evolution/metar.c:268
+#: my-evolution/metar.c:269
 msgid "Patches of mist"
 msgstr ""
 
-#: my-evolution/metar.c:269
+#: my-evolution/metar.c:270
 msgid "Partial mist"
 msgstr ""
 
-#: my-evolution/metar.c:271
+#: my-evolution/metar.c:272
 msgid "Mist with wind"
 msgstr ""
 
-#: my-evolution/metar.c:273
+#: my-evolution/metar.c:274
 msgid "Drifting mist"
 msgstr ""
 
-#: my-evolution/metar.c:274
+#: my-evolution/metar.c:275
 msgid "Freezing mist"
 msgstr ""
 
 #. FOG
-#: my-evolution/metar.c:277
+#: my-evolution/metar.c:278
 msgid "Fog"
 msgstr ""
 
-#: my-evolution/metar.c:278
+#: my-evolution/metar.c:279
 msgid "Fog in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:279
+#: my-evolution/metar.c:280
 msgid "Light fog"
 msgstr ""
 
-#: my-evolution/metar.c:280
+#: my-evolution/metar.c:281
 msgid "Moderate fog"
 msgstr ""
 
-#: my-evolution/metar.c:281
+#: my-evolution/metar.c:282
 msgid "Thick fog"
 msgstr ""
 
-#: my-evolution/metar.c:282
+#: my-evolution/metar.c:283
 msgid "Shallow fog"
 msgstr ""
 
-#: my-evolution/metar.c:283
+#: my-evolution/metar.c:284
 msgid "Patches of fog"
 msgstr ""
 
-#: my-evolution/metar.c:284
+#: my-evolution/metar.c:285
 msgid "Partial fog"
 msgstr ""
 
-#: my-evolution/metar.c:286
+#: my-evolution/metar.c:287
 msgid "Fog with wind"
 msgstr ""
 
-#: my-evolution/metar.c:288
+#: my-evolution/metar.c:289
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:289
+#: my-evolution/metar.c:290
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: my-evolution/metar.c:292
+#: my-evolution/metar.c:293
 msgid "Smoke"
 msgstr ""
 
-#: my-evolution/metar.c:293
+#: my-evolution/metar.c:294
 msgid "Smoke in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:294
+#: my-evolution/metar.c:295
 msgid "Thin smoke"
 msgstr ""
 
-#: my-evolution/metar.c:295
+#: my-evolution/metar.c:296
 msgid "Moderate smoke"
 msgstr ""
 
-#: my-evolution/metar.c:296
+#: my-evolution/metar.c:297
 msgid "Thick smoke"
 msgstr ""
 
-#: my-evolution/metar.c:297
+#: my-evolution/metar.c:298
 msgid "Shallow smoke"
 msgstr ""
 
-#: my-evolution/metar.c:298
+#: my-evolution/metar.c:299
 msgid "Patches of smoke"
 msgstr ""
 
-#: my-evolution/metar.c:299
+#: my-evolution/metar.c:300
 msgid "Partial smoke"
 msgstr ""
 
-#: my-evolution/metar.c:300
+#: my-evolution/metar.c:301
 msgid "Thunderous smoke"
 msgstr ""
 
-#: my-evolution/metar.c:301
+#: my-evolution/metar.c:302
 msgid "Smoke with wind"
 msgstr ""
 
-#: my-evolution/metar.c:303
+#: my-evolution/metar.c:304
 msgid "Drifting smoke"
 msgstr ""
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:307
+#: my-evolution/metar.c:308
 msgid "Volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:308
+#: my-evolution/metar.c:309
 msgid "Volcanic ash in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:310
+#: my-evolution/metar.c:311
 msgid "Moderate volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:311
+#: my-evolution/metar.c:312
 msgid "Thick volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:312
+#: my-evolution/metar.c:313
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:313
+#: my-evolution/metar.c:314
 msgid "Patches of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:314
+#: my-evolution/metar.c:315
 msgid "Partial volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:315
+#: my-evolution/metar.c:316
 msgid "Thunderous volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:316
+#: my-evolution/metar.c:317
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:317
+#: my-evolution/metar.c:318
 msgid "Showers of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:318
+#: my-evolution/metar.c:319
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:319
+#: my-evolution/metar.c:320
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:322
+#: my-evolution/metar.c:323
 msgid "Sand"
 msgstr ""
 
-#: my-evolution/metar.c:323
+#: my-evolution/metar.c:324
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:324
+#: my-evolution/metar.c:325
 msgid "Light sand"
 msgstr ""
 
-#: my-evolution/metar.c:325
+#: my-evolution/metar.c:326
 msgid "Moderate sand"
 msgstr ""
 
-#: my-evolution/metar.c:326
+#: my-evolution/metar.c:327
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:328
+#: my-evolution/metar.c:329
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:329
+#: my-evolution/metar.c:330
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:331
+#: my-evolution/metar.c:332
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:333
+#: my-evolution/metar.c:334
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:337
+#: my-evolution/metar.c:338
 msgid "Haze"
 msgstr ""
 
-#: my-evolution/metar.c:338
+#: my-evolution/metar.c:339
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:339
+#: my-evolution/metar.c:340
 msgid "Light haze"
 msgstr ""
 
-#: my-evolution/metar.c:340
+#: my-evolution/metar.c:341
 msgid "Moderate haze"
 msgstr ""
 
-#: my-evolution/metar.c:341
+#: my-evolution/metar.c:342
 msgid "Thick haze"
 msgstr ""
 
-#: my-evolution/metar.c:342
+#: my-evolution/metar.c:343
 msgid "Shallow haze"
 msgstr ""
 
-#: my-evolution/metar.c:343
+#: my-evolution/metar.c:344
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:344
+#: my-evolution/metar.c:345
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:346
+#: my-evolution/metar.c:347
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:348
+#: my-evolution/metar.c:349
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:349
+#: my-evolution/metar.c:350
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:352
+#: my-evolution/metar.c:353
 #, fuzzy
 msgid "Spray"
 msgstr "Lauantai"
 
-#: my-evolution/metar.c:353
+#: my-evolution/metar.c:354
 msgid "Spray in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:354
+#: my-evolution/metar.c:355
 msgid "Light spray"
 msgstr ""
 
-#: my-evolution/metar.c:355
+#: my-evolution/metar.c:356
 msgid "Moderate spray"
 msgstr ""
 
-#: my-evolution/metar.c:356
+#: my-evolution/metar.c:357
 msgid "Heavy spray"
 msgstr ""
 
-#: my-evolution/metar.c:357
+#: my-evolution/metar.c:358
 msgid "Shallow spray"
 msgstr ""
 
-#: my-evolution/metar.c:358
+#: my-evolution/metar.c:359
 msgid "Patches of spray"
 msgstr ""
 
-#: my-evolution/metar.c:359
+#: my-evolution/metar.c:360
 #, fuzzy
 msgid "Partial spray"
 msgstr "Ensisijainen"
 
-#: my-evolution/metar.c:361
+#: my-evolution/metar.c:362
 msgid "Blowing spray"
 msgstr ""
 
-#: my-evolution/metar.c:363
+#: my-evolution/metar.c:364
 msgid "Drifting spray"
 msgstr ""
 
-#: my-evolution/metar.c:364
+#: my-evolution/metar.c:365
 msgid "Freezing spray"
 msgstr ""
 
 #. DUST
-#: my-evolution/metar.c:367
+#: my-evolution/metar.c:368
 msgid "Dust"
 msgstr ""
 
-#: my-evolution/metar.c:368
+#: my-evolution/metar.c:369
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:369
+#: my-evolution/metar.c:370
 msgid "Light dust"
 msgstr ""
 
-#: my-evolution/metar.c:370
+#: my-evolution/metar.c:371
 msgid "Moderate dust"
 msgstr ""
 
-#: my-evolution/metar.c:371
+#: my-evolution/metar.c:372
 msgid "Heavy dust"
 msgstr ""
 
-#: my-evolution/metar.c:373
+#: my-evolution/metar.c:374
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:374
+#: my-evolution/metar.c:375
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:376
+#: my-evolution/metar.c:377
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:378
+#: my-evolution/metar.c:379
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:382
+#: my-evolution/metar.c:383
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:383
+#: my-evolution/metar.c:384
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:384
+#: my-evolution/metar.c:385
 msgid "Light squall"
 msgstr ""
 
-#: my-evolution/metar.c:385
+#: my-evolution/metar.c:386
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:386
+#: my-evolution/metar.c:387
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:389
+#: my-evolution/metar.c:390
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:390
+#: my-evolution/metar.c:391
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:391
+#: my-evolution/metar.c:392
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:393
+#: my-evolution/metar.c:394
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:394
+#: my-evolution/metar.c:395
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:397
+#: my-evolution/metar.c:398
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:398
+#: my-evolution/metar.c:399
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:399
+#: my-evolution/metar.c:400
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:400
+#: my-evolution/metar.c:401
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:401
+#: my-evolution/metar.c:402
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:402
+#: my-evolution/metar.c:403
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:404
+#: my-evolution/metar.c:405
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:405
+#: my-evolution/metar.c:406
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:406
+#: my-evolution/metar.c:407
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:408
+#: my-evolution/metar.c:409
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:409
+#: my-evolution/metar.c:410
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:412
+#: my-evolution/metar.c:413
 msgid "Duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:413
+#: my-evolution/metar.c:414
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:414
+#: my-evolution/metar.c:415
 msgid "Light duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:415
+#: my-evolution/metar.c:416
 msgid "Moderate duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:416
+#: my-evolution/metar.c:417
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:417
+#: my-evolution/metar.c:418
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:419
+#: my-evolution/metar.c:420
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:420
+#: my-evolution/metar.c:421
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:421
+#: my-evolution/metar.c:422
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:423
+#: my-evolution/metar.c:424
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:424
+#: my-evolution/metar.c:425
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:427
+#: my-evolution/metar.c:428
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:428
+#: my-evolution/metar.c:429
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:429
+#: my-evolution/metar.c:430
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:430
+#: my-evolution/metar.c:431
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:431
+#: my-evolution/metar.c:432
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:432
+#: my-evolution/metar.c:433
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:433
+#: my-evolution/metar.c:434
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:434
+#: my-evolution/metar.c:435
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:436
+#: my-evolution/metar.c:437
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:438
+#: my-evolution/metar.c:439
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:442 my-evolution/metar.c:451
+#: my-evolution/metar.c:443 my-evolution/metar.c:452
 msgid "Tornado"
 msgstr ""
 
-#: my-evolution/metar.c:443
+#: my-evolution/metar.c:444
 msgid "Tornado in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:445
+#: my-evolution/metar.c:446
 msgid "Moderate tornado"
 msgstr ""
 
-#: my-evolution/metar.c:446
+#: my-evolution/metar.c:447
 msgid "Raging tornado"
 msgstr ""
 
-#: my-evolution/metar.c:449
+#: my-evolution/metar.c:450
 msgid "Partial tornado"
 msgstr ""
 
-#: my-evolution/metar.c:450
+#: my-evolution/metar.c:451
 msgid "Thunderous tornado"
 msgstr ""
 
-#: my-evolution/metar.c:453
+#: my-evolution/metar.c:454
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:454
+#: my-evolution/metar.c:455
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:457
+#: my-evolution/metar.c:458
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:458
+#: my-evolution/metar.c:459
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:459
+#: my-evolution/metar.c:460
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:460
+#: my-evolution/metar.c:461
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:461
+#: my-evolution/metar.c:462
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:462
+#: my-evolution/metar.c:463
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:463
+#: my-evolution/metar.c:464
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:464
+#: my-evolution/metar.c:465
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:466
+#: my-evolution/metar.c:467
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:468
+#: my-evolution/metar.c:469
 msgid "Drifting dust whirls"
 msgstr ""
 
@@ -25719,11 +25944,11 @@ msgstr ""
 #: my-evolution/my-evolution.glade.h:4
 #, fuzzy
 msgid "Delete news feed"
-msgstr "Poista tämä kansio"
+msgstr "Poista tÃ¤mÃ¤ kansio"
 
 #: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
-msgstr "Kuinka monta päivää kalenterissa näytetään kerrallaan?"
+msgstr "Kuinka monta pÃ¤ivÃ¤Ã¤ kalenterissa nÃ¤ytetÃ¤Ã¤n kerrallaan?"
 
 #: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
@@ -25741,7 +25966,7 @@ msgstr "Yksi kuukausi"
 #: my-evolution/my-evolution.glade.h:9
 #, fuzzy
 msgid "One w_eek"
-msgstr "Yksi ´viikko"
+msgstr "Yksi Å½viikko"
 
 #: my-evolution/my-evolution.glade.h:10
 #, fuzzy
@@ -25756,17 +25981,17 @@ msgstr "Virkistysaika (sekunneissa):"
 #: my-evolution/my-evolution.glade.h:12
 #, fuzzy
 msgid "S_how full path for folders"
-msgstr "Näytä täydet _otsikkotiedot"
+msgstr "NÃ¤ytÃ¤ tÃ¤ydet _otsikkotiedot"
 
 #: my-evolution/my-evolution.glade.h:13
 #, fuzzy
 msgid "Show _all tasks"
-msgstr "Näytä kaikki tehtävät"
+msgstr "NÃ¤ytÃ¤ kaikki tehtÃ¤vÃ¤t"
 
 #: my-evolution/my-evolution.glade.h:14
 #, fuzzy
 msgid "Show _today's tasks"
-msgstr "Näytä tämänpäiväiset tehtävät"
+msgstr "NÃ¤ytÃ¤ tÃ¤mÃ¤npÃ¤ivÃ¤iset tehtÃ¤vÃ¤t"
 
 #: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
@@ -25774,7 +25999,7 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
-msgstr "Tehtävät "
+msgstr "TehtÃ¤vÃ¤t "
 
 #: my-evolution/my-evolution.glade.h:17
 #, fuzzy
@@ -25788,7 +26013,7 @@ msgstr ""
 #: my-evolution/my-evolution.glade.h:19
 #, fuzzy
 msgid "_Five days"
-msgstr "Viisi päivää"
+msgstr "Viisi pÃ¤ivÃ¤Ã¤"
 
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
@@ -25801,7 +26026,7 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
-msgstr "_Yksi päivä"
+msgstr "_Yksi pÃ¤ivÃ¤"
 
 #: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
@@ -25809,92 +26034,73 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
-msgstr "_Säätiedot"
+msgstr "_SÃ¤Ã¤tiedot"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Configuration control for Evolution folder settings."
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 msgid "Configure special folders and offline folder behavior here"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:3
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
 #, fuzzy
 msgid "Folder Settings"
 msgstr "Asetukset"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
 msgid "The Evolution shell."
 msgstr "Evolution-kuori."
 
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
 msgid "Show Details"
-msgstr "Näytä yksityiskohdat"
+msgstr "NÃ¤ytÃ¤ yksityiskohdat"
 
-#: shell/e-activity-handler.c:164
+#: shell/e-activity-handler.c:166
 msgid "Cancel Operation"
 msgstr "Peruuta operaatio"
 
-#: shell/e-folder-dnd-bridge.c:53
+#: shell/e-folder-dnd-bridge.c:55
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
 "%s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
-#, fuzzy, c-format
+#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:127
+#, c-format
 msgid "\"%s\" in \"%s\""
-msgstr "Lähetetään \"%s\""
+msgstr "\"%s\" kohteessa \"%s\""
 
-#: shell/e-folder-list.c:312
-#, fuzzy
+#: shell/e-folder-list.c:338
 msgid "Add a Folder"
-msgstr "Valitse kansio"
+msgstr "LisÃ¤Ã¤ kansio"
 
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:179
 #, fuzzy
 msgid "Drafts"
 msgstr "Luonnos"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
-#: shell/e-shortcuts.c:1055
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:465
+#: shell/e-shell-view.c:469 shell/e-shortcuts.c:1084
 msgid "Inbox"
 msgstr "Saapuneet"
 
-#: shell/e-local-storage.c:180
+#: shell/e-local-storage.c:181
 msgid "Outbox"
-msgstr "Lähtevät"
+msgstr "LÃ¤htevÃ¤t"
 
-#: shell/e-local-storage.c:181
+#: shell/e-local-storage.c:182
 #, fuzzy
 msgid "Sent"
-msgstr "Näkemättä"
+msgstr "NÃ¤kemÃ¤ttÃ¤"
 
-#: shell/e-setup.c:126
-msgid "Evolution installation"
-msgstr "Evolutionin asennus"
-
-#: shell/e-setup.c:130
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Tämän Evolutionin uuden version täytyy asentaa uusia tiedostoja\n"
-"henkilökohtaiseen Evolution-hakemistoosi"
-
-#: shell/e-setup.c:131
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Napsauta \"OK\" asentaaksesi tiedostot, tai \"Peruuta\" lopettaaksesi "
-"asennuksen."
-
-#: shell/e-setup.c:171
+#: shell/e-setup.c:147
 msgid "Could not update files correctly"
-msgstr "Tiedostojen päivitys ei onnistunut"
+msgstr "Tiedostojen pÃ¤ivitys ei onnistunut"
 
-#: shell/e-setup.c:194
+#: shell/e-setup.c:168
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -25905,14 +26111,14 @@ msgstr ""
 "%s\n"
 "Virhe: %s"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:179
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:244
 #, fuzzy, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -25922,7 +26128,7 @@ msgstr ""
 "Hakemistoa %s ei voitu luoda:\n"
 "%s"
 
-#: shell/e-setup.c:300
+#: shell/e-setup.c:262
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -25930,7 +26136,7 @@ msgid ""
 "readable and executable and restart Evolution."
 msgstr ""
 
-#: shell/e-setup.c:306
+#: shell/e-setup.c:268
 #, c-format
 msgid ""
 "File %s\n"
@@ -25938,7 +26144,7 @@ msgid ""
 "Please remove this file and restart Evolution."
 msgstr ""
 
-#: shell/e-setup.c:329
+#: shell/e-setup.c:291
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -25946,16 +26152,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:343
-msgid ""
-"Evolution has detected an old\n"
-"Executive-Summary directory.\n"
-"This needs to be removed before\n"
-"Evolution will run.\n"
-"Do you want me to remove this directory?"
-msgstr ""
-
-#: shell/e-setup.c:368
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25967,89 +26164,90 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-config-autocompletion.c:106
+#: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
-msgstr "Kopioi tämä kansio"
+msgstr "Kopioi tÃ¤mÃ¤ kansio"
 
-#: shell/e-shell-config-default-folders.c:133
+#: shell/e-shell-config-default-folders.c:149
 #, fuzzy
 msgid "Select Default Folder"
 msgstr "Erikoiskansiot"
 
-#: shell/e-shell-config-folder-settings.c:71
+#: shell/e-shell-config-folder-settings.c:70
 #, fuzzy
 msgid "Default Folders"
 msgstr "Erikoiskansiot"
 
-#: shell/e-shell-config-folder-settings.c:74
+#: shell/e-shell-config-folder-settings.c:73
 #, fuzzy
 msgid "Offline Folders"
 msgstr "Erikoiskansiot"
 
-#: shell/e-shell-config-folder-settings.c:77
-#, fuzzy
+#: shell/e-shell-config-folder-settings.c:76
 msgid "Autocompletion Folders"
-msgstr "Kopioi tämä kansio"
+msgstr "Kansioden automaattinen tÃ¤ydennys"
 
-#: shell/e-shell-folder-commands.c:140
-#, fuzzy, c-format
+#: shell/e-shell-folder-commands.c:141
+#, c-format
 msgid "Cannot copy folder: %s"
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
+msgstr "Kansion kopioiminen ei onnistu: %s"
 
 #: shell/e-shell-folder-commands.c:143
 #, fuzzy, c-format
 msgid "Cannot move folder: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:189
 msgid "Cannot move a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:191
 msgid "Cannot copy a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:206
+#: shell/e-shell-folder-commands.c:205
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:321
+#: shell/e-shell-folder-commands.c:320
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:325
+#: shell/e-shell-folder-commands.c:324
 msgid "Copy folder"
 msgstr "Kopioi kansio"
 
-#: shell/e-shell-folder-commands.c:365
+#: shell/e-shell-folder-commands.c:364
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:369
+#: shell/e-shell-folder-commands.c:368
 msgid "Move folder"
-msgstr "Siirä kansio"
+msgstr "SiirÃ¤ kansio"
 
-#: shell/e-shell-folder-commands.c:393
-#, fuzzy, c-format
+#: shell/e-shell-folder-commands.c:392
+#, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
+msgstr ""
+"Kansion poistaminen ei onnistu:\n"
+"%s"
 
 #: shell/e-shell-folder-commands.c:406
 #, fuzzy, c-format
-msgid "Delete \"%s\""
-msgstr "Poista"
-
-#: shell/e-shell-folder-commands.c:407
-#, fuzzy, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:413
+#, fuzzy, c-format
+msgid "Delete \"%s\""
+msgstr "Poista"
+
+#: shell/e-shell-folder-commands.c:486
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -26059,55 +26257,51 @@ msgstr "Kansion hakeminen ei onnistu: %s: %s"
 #: shell/e-shell-folder-commands.c:535
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
-msgstr "Nimeä kansio '%s' uudelleen"
+msgstr "NimeÃ¤ kansio '%s' uudelleen"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:541
 #, fuzzy
 msgid "Rename folder"
-msgstr "Nimeä kansio '%s' uudelleen"
+msgstr "NimeÃ¤ kansio '%s' uudelleen"
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:165
+#: shell/e-shell-folder-commands.c:550
+#: shell/e-shell-folder-creation-dialog.c:169
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:586
+#: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:589
+#: shell/e-shell-folder-commands.c:587
 #, fuzzy, c-format
 msgid ""
 "Cannot remove folder:\n"
 "%s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: shell/e-shell-folder-creation-dialog.c:122
+#: shell/e-shell-folder-creation-dialog.c:126
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:307
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Luo _uusi kansio"
 
-#: shell/e-shell-folder-selection-dialog.c:393
-msgid "New..."
-msgstr "Uusi..."
-
-#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
+#: shell/e-shell-folder-title-bar.c:593 shell/e-shell-folder-title-bar.c:594
 msgid "(Untitled)"
-msgstr "(Nimetön)"
+msgstr "(NimetÃ¶n)"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: shell/e-shell-importer.c:145
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -26116,69 +26310,69 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
+#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:687
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
+#: shell/e-shell-importer.c:247 shell/e-shell-importer.c:278
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:355
+#: shell/e-shell-importer.c:352
 #, fuzzy
 msgid "Select importer"
 msgstr "Valitse kansio"
 
-#: shell/e-shell-importer.c:487
+#: shell/e-shell-importer.c:492
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Kansiota `%s' ei ole olemassa."
 
-#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:493 shell/e-shell-importer.c:510
+#: shell/e-shell-importer.c:557
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:504
+#: shell/e-shell-importer.c:509
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:522
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
-msgstr "Virhe %s:n käynnistyksessä"
+msgstr "Virhe %s:n kÃ¤ynnistyksessÃ¤"
 
-#: shell/e-shell-importer.c:554
+#: shell/e-shell-importer.c:556
 #, c-format
 msgid "Error loading %s"
 msgstr "Virhe %s:n lataamisessa"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:573
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:625
+#: shell/e-shell-importer.c:627
 msgid "Automatic"
 msgstr ""
 
@@ -26190,215 +26384,201 @@ msgstr "Tiedostonimi:"
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:690
 msgid "File type:"
 msgstr "Tiedoston tyyppi:"
 
-#: shell/e-shell-importer.c:716
+#: shell/e-shell-importer.c:715
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:720
+#: shell/e-shell-importer.c:719
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:516
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:788
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:642
 #, fuzzy, c-format
 msgid "From %s:"
-msgstr "Lähettäjä:"
+msgstr "LÃ¤hettÃ¤jÃ¤:"
 
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1082
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1083
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:191
 msgid "Import"
 msgstr "Tuo"
 
-#: shell/e-shell-offline-handler.c:582
+#: shell/e-shell-offline-handler.c:588
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-offline-sync.c:161
+#: shell/e-shell-offline-sync.c:163
 #, fuzzy, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
 "%s"
-msgstr "Virhe %s:n käynnistyksessä"
+msgstr "Virhe %s:n kÃ¤ynnistyksessÃ¤"
 
-#: shell/e-shell-offline-sync.c:239
+#: shell/e-shell-offline-sync.c:232
 #, fuzzy
 msgid "Syncing Folder"
 msgstr "Synkronoidaan kansiota"
 
 #. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:317
+#: shell/e-shell-offline-sync.c:311
 #, c-format
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:326
+#: shell/e-shell-settings-dialog.c:346
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:357
+#: shell/e-shell-shared-folder-picker-dialog.c:340
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Synkronoidaan kansiota"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:364
+#: shell/e-shell-shared-folder-picker-dialog.c:346
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Poistetaan kansiota %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:369
+#: shell/e-shell-shared-folder-picker-dialog.c:351
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
-msgstr "Lähetetään \"%s\""
+msgstr "LÃ¤hetetÃ¤Ã¤n \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:455
+#: shell/e-shell-shared-folder-picker-dialog.c:431
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr ""
-"Tiedoston %s poistaminen epäonnistui:\n"
+"Tiedoston %s poistaminen epÃ¤onnistui:\n"
 "%s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:513
+#: shell/e-shell-shared-folder-picker-dialog.c:484
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:159
-#, fuzzy, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
-
-#: shell/e-shell-startup-wizard.c:169
-#, fuzzy
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
-
-#: shell/e-shell-user-creatable-items-handler.c:579
-#: shell/e-shell-user-creatable-items-handler.c:633
-#: widgets/misc/e-charset-picker.c:104
+#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:636
+#: widgets/misc/e-charset-picker.c:106
 msgid "New"
 msgstr "Uusi"
 
-#: shell/e-shell-utils.c:114
+#: shell/e-shell-utils.c:116
 #, fuzzy
 msgid "No folder name specified."
-msgstr "Vastaanottajia ei ole määritelty"
+msgstr "Vastaanottajia ei ole mÃ¤Ã¤ritelty"
 
-#: shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
 msgstr ""
 
-#: shell/e-shell-utils.c:127
+#: shell/e-shell-utils.c:129
 #, fuzzy
 msgid "Folder name cannot contain slashes."
-msgstr "Tämä kansio ei voi sisältää viestejä."
+msgstr "TÃ¤mÃ¤ kansio ei voi sisÃ¤ltÃ¤Ã¤ viestejÃ¤."
 
-#: shell/e-shell-utils.c:133
+#: shell/e-shell-utils.c:135
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:94
+#: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:102
+#: shell/e-shell-view-menu.c:97
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: shell/e-shell-view-menu.c:196
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug budday ei löytynyt $PATH:istasi."
+#: shell/e-shell-view-menu.c:193
+msgid "Bug buddy is not installed."
+msgstr "Bug buddya ei ole asennettu."
 
-#: shell/e-shell-view-menu.c:204
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy could not be run."
 msgstr "Bug buddya ei voitu ajaa."
 
-#: shell/e-shell-view-menu.c:248
-#, fuzzy
+#: shell/e-shell-view-menu.c:247
 msgid "About Ximian Evolution"
-msgstr "Tietoja Evolutionista..."
+msgstr "Tietoja Ximian Evolutionista"
 
-#: shell/e-shell-view-menu.c:503
+#: shell/e-shell-view-menu.c:502
 msgid "Go to folder..."
 msgstr "Siirry kansioon..."
 
-#: shell/e-shell-view-menu.c:504
+#: shell/e-shell-view-menu.c:503
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:625
+#: shell/e-shell-view-menu.c:617
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Luo uusi kontakti"
 
-#: shell/e-shell-view-menu.c:626
+#: shell/e-shell-view-menu.c:618
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:788
+#: shell/e-shell-view-menu.c:776
 #, fuzzy
 msgid "_Work Online"
-msgstr "Työskentele linjoilla"
+msgstr "TyÃ¶skentele linjoilla"
 
-#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:802 ui/evolution.xml.h:42
 msgid "Work Offline"
-msgstr "Työskentele poissa linjoilta"
+msgstr "TyÃ¶skentele poissa linjoilta"
 
-#: shell/e-shell-view.c:226
+#: shell/e-shell-view.c:232
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1861
+#: shell/e-shell-view.c:1996
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1863
-#, fuzzy
+#: shell/e-shell-view.c:1998
 msgid "(None)"
-msgstr "(Ei nimeä)"
+msgstr "(Ei nimeÃ¤)"
 
-#: shell/e-shell-view.c:1910
+#: shell/e-shell-view.c:2041
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1917
+#: shell/e-shell-view.c:2048
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1923
+#: shell/e-shell-view.c:2054
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:175
+#: shell/e-shell.c:176
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -26406,12 +26586,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:739
+#: shell/e-shell.c:756
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1877
+#: shell/e-shell.c:1829
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26419,150 +26599,144 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2178
+#: shell/e-shell.c:2094
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2180
+#: shell/e-shell.c:2096
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2182
+#: shell/e-shell.c:2098
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2184 shell/e-storage.c:571
+#: shell/e-shell.c:2100 shell/e-storage.c:576
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:80
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:77
+#: shell/e-shortcuts-view.c:81
 msgid "Group name:"
-msgstr "Ryhmän nimi:"
-
-#: shell/e-shortcuts-view.c:173
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
+msgstr "RyhmÃ¤n nimi:"
 
-#: shell/e-shortcuts-view.c:178
-msgid "Don't remove"
-msgstr "Älä poista"
+#: shell/e-shortcuts-view.c:179
+#, fuzzy, c-format
+msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+msgstr "Haluatko todella poistaa kansion '%s'?"
 
-#: shell/e-shortcuts-view.c:208
+#: shell/e-shortcuts-view.c:215
 msgid "Rename Shortcut Group"
-msgstr "Nimeä oikotieryhmä uudelleen"
+msgstr "NimeÃ¤ oikotieryhmÃ¤ uudelleen"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:216
 msgid "Rename selected shortcut group to:"
-msgstr "Oikotieryhmän uusi nimi:"
+msgstr "OikotieryhmÃ¤n uusi nimi:"
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr "_Pienet kuvakkeet"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:249
 msgid "Show the shortcuts as small icons"
-msgstr "Näytä oikotiet pieninä kuvakkeina"
+msgstr "NÃ¤ytÃ¤ oikotiet pieninÃ¤ kuvakkeina"
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:251
 msgid "_Large Icons"
 msgstr "_Suuret kuvakkeet"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:252
 msgid "Show the shortcuts as large icons"
-msgstr "Näytä oikotiet suurina kuvakkeina"
+msgstr "NÃ¤ytÃ¤ oikotiet suurina kuvakkeina"
 
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:263
 msgid "_New Group..."
-msgstr "_Uusi ryhmä..."
+msgstr "_Uusi ryhmÃ¤..."
 
-#: shell/e-shortcuts-view.c:257
+#: shell/e-shortcuts-view.c:264
 msgid "Create a new shortcut group"
-msgstr "Luo uusi oikotieryhmä"
+msgstr "Luo uusi oikotieryhmÃ¤"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:266
 msgid "_Remove this Group..."
-msgstr "Poista tämä _ryhmä..."
+msgstr "Poista tÃ¤mÃ¤ _ryhmÃ¤..."
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 msgid "Remove this shortcut group"
-msgstr "Poista tämä oikotieryhmä"
+msgstr "Poista tÃ¤mÃ¤ oikotieryhmÃ¤"
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:269
 msgid "Re_name this Group..."
-msgstr "_Nimeä tämä ryhmä uudelleen..."
+msgstr "_NimeÃ¤ tÃ¤mÃ¤ ryhmÃ¤ uudelleen..."
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:270
 msgid "Rename this shortcut group"
-msgstr "Nimeä tämä oikotieryhmä uudelleen"
+msgstr "NimeÃ¤ tÃ¤mÃ¤ oikotieryhmÃ¤ uudelleen"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:275
 msgid "_Hide the Shortcut Bar"
 msgstr "_Piilota oikotiepalkki"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:276
 msgid "Hide the shortcut bar"
 msgstr "Piilota oikotiepalkki"
 
-#: shell/e-shortcuts-view.c:274
+#: shell/e-shortcuts-view.c:281
 #, fuzzy
 msgid "Create _Default Shortcuts"
-msgstr "Luo uusi oikotieryhmä"
+msgstr "Luo uusi oikotieryhmÃ¤"
 
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:282
 #, fuzzy
 msgid "Create Default Shortcuts"
-msgstr "Luo uusi oikotieryhmä"
+msgstr "Luo uusi oikotieryhmÃ¤"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:401
 msgid "Rename shortcut"
-msgstr "Nimeä oikotie uudelleen"
+msgstr "NimeÃ¤ oikotie uudelleen"
 
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:402
 msgid "Rename selected shortcut to:"
 msgstr "Oikotien uusi nimi:"
 
-#: shell/e-shortcuts-view.c:408
+#: shell/e-shortcuts-view.c:415
 msgid "Open the folder linked to this shortcut"
-msgstr "Avaa tämän oikotien osoittama kansio"
+msgstr "Avaa tÃ¤mÃ¤n oikotien osoittama kansio"
 
-#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:417 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Avaa uudessa _ikkunassa"
 
-#: shell/e-shortcuts-view.c:410
+#: shell/e-shortcuts-view.c:417
 msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Avaa tämän oikotien osoittama kansio uudessa ikkunassa"
+msgstr "Avaa tÃ¤mÃ¤n oikotien osoittama kansio uudessa ikkunassa"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 #, fuzzy
 msgid "_Rename"
-msgstr "Nimeä uudelleen"
+msgstr "NimeÃ¤ uudelleen"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "Rename this shortcut"
-msgstr "Nimeä tämä oikotie uudelleen"
+msgstr "NimeÃ¤ tÃ¤mÃ¤ oikotie uudelleen"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 #, fuzzy
 msgid "Re_move"
 msgstr "Poista"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Remove this shortcut from the shortcut bar"
-msgstr "Poista tämä oikotie oikotiepalkista"
+msgstr "Poista tÃ¤mÃ¤ oikotie oikotiepalkista"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
-msgstr "Virhe tallennettaessa oikoteitä."
+msgstr "Virhe tallennettaessa oikoteitÃ¤."
 
-#: shell/e-shortcuts.c:1080
+#: shell/e-shortcuts.c:1096
 msgid "Shortcuts"
 msgstr "Oikotiet"
 
@@ -26570,86 +26744,88 @@ msgstr "Oikotiet"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:569
+#: shell/e-storage.c:574
 msgid "No error"
-msgstr "Ei virhettä"
+msgstr "Ei virhettÃ¤"
 
-#: shell/e-storage.c:573
+#: shell/e-storage.c:578
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:575
+#: shell/e-storage.c:580
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:577
+#: shell/e-storage.c:582
 msgid "I/O error"
 msgstr "I/O-virhe"
 
-#: shell/e-storage.c:579
+#: shell/e-storage.c:584
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:581
+#: shell/e-storage.c:586
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:583
+#: shell/e-storage.c:588
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:585
+#: shell/e-storage.c:590
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:589
+#: shell/e-storage.c:594
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:591
+#: shell/e-storage.c:596
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:593
+#: shell/e-storage.c:598
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:595
+#: shell/e-storage.c:600
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:597
-#, fuzzy
+#: shell/e-storage.c:602
 msgid "Cannot create a folder with that name"
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
+msgstr "Kansion luominen tÃ¤llÃ¤ nimellÃ¤ ei onnistu"
 
-#: shell/e-storage.c:599
+#: shell/e-storage.c:604
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
-#: shell/e-task-widget.c:191
+#: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:196
+#: shell/e-task-widget.c:216
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
-#: shell/evolution-folder-selector-button.c:94
+#: shell/evolution-folder-selector-button.c:101
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:124
-#, fuzzy, c-format
+#: shell/evolution-shell-component-utils.c:123
+#, c-format
 msgid ""
 "%s\n"
 "\n"
 "Unknown error."
-msgstr "Tuntematon virhe"
+msgstr ""
+"%s\n"
+"\n"
+"Tuntematon virhe."
 
-#: shell/evolution-shell-component-utils.c:127
+#: shell/evolution-shell-component-utils.c:126
 #, c-format
 msgid ""
 "%s\n"
@@ -26658,7 +26834,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:134
+#: shell/evolution-shell-component-utils.c:133
 #, c-format
 msgid ""
 "%s\n"
@@ -26667,103 +26843,101 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1145
-#, fuzzy
+#: shell/evolution-shell-component.c:1164
 msgid "CORBA error"
-msgstr "I/O-virhe"
+msgstr "CORBA-virhe"
 
-#: shell/evolution-shell-component.c:1147
+#: shell/evolution-shell-component.c:1166
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1149
+#: shell/evolution-shell-component.c:1168
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1151
+#: shell/evolution-shell-component.c:1170
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1153
+#: shell/evolution-shell-component.c:1172
 #, fuzzy
 msgid "No owner"
-msgstr "Määrittelemätön"
+msgstr "MÃ¤Ã¤rittelemÃ¤tÃ¶n"
 
-#: shell/evolution-shell-component.c:1155
+#: shell/evolution-shell-component.c:1174
 msgid "Not found"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1157
+#: shell/evolution-shell-component.c:1176
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Tar_kista tuetut tavat"
 
-#: shell/evolution-shell-component.c:1159
+#: shell/evolution-shell-component.c:1178
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1161
+#: shell/evolution-shell-component.c:1180
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1182
 #, fuzzy
 msgid "Internal error"
 msgstr "I/O-virhe"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1186
 #, fuzzy
 msgid "Exists"
 msgstr "_Poistu"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1188
 msgid "Invalid URI"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1192
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Luonnoskansio:"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1194
 #, fuzzy
 msgid "No space left"
-msgstr "Ei viestejä valittuna"
+msgstr "Ei viestejÃ¤ valittuna"
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1196
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-test-component.c:49
+#: shell/evolution-test-component.c:63
 #, fuzzy
 msgid "Test type"
 msgstr "Tiedoston tyyppi:"
 
+#: shell/evolution-test-component.c:703
+#, fuzzy
+msgid "Evolution Test Component"
+msgstr "Evolutionin sÃ¤hkÃ¶postikomponentin alustus epÃ¤onnistui."
+
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
+msgid "Click OK to close these connections and go offline"
 msgstr ""
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
+msgid "The following connections are currently active:"
 msgstr ""
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "Isäntäpalvelin"
-
-#: shell/glade/e-active-connection-dialog.glade.h:4
-msgid "The following connections are currently active:"
+msgid "dialog1"
 msgstr ""
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
-#, fuzzy
 msgid "C_alendar:"
-msgstr "Kalenteri"
+msgstr "_Kalenteri"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:2
-#, fuzzy
 msgid "_Contacts:"
-msgstr "Ko_ntaktit:"
+msgstr "_Yhteystiedot:"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:3
 #, fuzzy
@@ -26773,17 +26947,17 @@ msgstr "_Matkapuhelin"
 #: shell/glade/e-shell-config-default-folders.glade.h:4
 #, fuzzy
 msgid "_Tasks:"
-msgstr "Tehtävät"
+msgstr "TehtÃ¤vÃ¤t"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder name:"
 msgstr "Kansion nimi:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder type:"
 msgstr "Kansion tyyppi:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr ""
 
@@ -26805,44 +26979,44 @@ msgstr "Kansion nimi:"
 #: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
 #, fuzzy
 msgid "_User:"
-msgstr "Käyttäjät_unnus:"
+msgstr "KÃ¤yttÃ¤jÃ¤t_unnus:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 #, fuzzy
 msgid "Evolution Setup Assistant"
 msgstr "Evolutionin asennus"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 #, fuzzy
 msgid "Importing Files"
 msgstr "Tuo"
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 #, fuzzy
 msgid "Timezone "
 msgstr ""
 "\n"
-"Aikavyöhyke: "
+"AikavyÃ¶hyke: "
 
-#: shell/glade/evolution-startup-wizard.glade.h:9
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:10
+#: shell/glade/evolution-startup-wizard.glade.h:6
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
 "Evolution to connect to your email accounts, and to import\n"
 "files from other applications. \n"
 "\n"
-"Please click the \"Next\" button to continue. "
+"Please click the \"Forward\" button to continue. "
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:15
+#: shell/glade/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
 "\n"
-"Click the \"Finish\" button to save your settings. "
+"Click the \"Apply\" button to save your settings. "
 msgstr ""
 
 #: shell/importer/import.glade.h:1
@@ -26880,32 +27054,32 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:189
 msgid "Importers"
 msgstr ""
 
-#: shell/importer/intelligent.c:196
+#: shell/importer/intelligent.c:195
 msgid "Don't import"
-msgstr "Älä tuo"
+msgstr "Ã„lÃ¤ tuo"
 
-#: shell/importer/intelligent.c:198
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
-msgstr "Älä kysy tätä enää uudelleen"
+msgstr "Ã„lÃ¤ kysy tÃ¤tÃ¤ enÃ¤Ã¤ uudelleen"
 
-#: shell/importer/intelligent.c:208
+#: shell/importer/intelligent.c:207
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:96
+#: shell/main.c:109 shell/main.c:501
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:102
+#: shell/main.c:115
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Evolutionin aseukseni"
 
-#: shell/main.c:227
+#: shell/main.c:214
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -26915,7 +27089,7 @@ msgid ""
 "but some features are either unfinished or don't work properly.\n"
 "\n"
 "If you want a stable version of Evolution, we urge you to uninstall,\n"
-"this version, and install a 1.0.x version instead (1.0.8)\n"
+"this version, and install a 1.2.x version instead (1.2.2)\n"
 "\n"
 "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
@@ -26925,7 +27099,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:250
+#: shell/main.c:235
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -26934,80 +27108,75 @@ msgstr ""
 "Kiitos\n"
 "The Evolution Team\n"
 
-#: shell/main.c:259
+#: shell/main.c:243
 #, fuzzy
 msgid "Don't tell me again"
-msgstr "Älä kysy tätä enää uudelleen"
+msgstr "Ã„lÃ¤ kysy tÃ¤tÃ¤ enÃ¤Ã¤ uudelleen"
 
-#: shell/main.c:394
+#: shell/main.c:330
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:403
+#: shell/main.c:339
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+msgstr "Evolutionin sÃ¤hkÃ¶postikomponentin alustus epÃ¤onnistui."
 
-#: shell/main.c:485
+#: shell/main.c:471
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:487
+#: shell/main.c:473
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Aloita uudelta sivulta"
 
-#: shell/main.c:489
+#: shell/main.c:475
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Aloita uudelta sivulta"
 
-#: shell/main.c:491
+#: shell/main.c:477
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:493
+#: shell/main.c:480
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:505
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:542
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Bonobon komponenttijärjestelmän alustus epäonnistui"
-
-#: tools/evolution-addressbook-abuse.c:80
+#: tools/evolution-addressbook-abuse.c:81
 #: tools/evolution-addressbook-export.c:36
 #: tools/evolution-addressbook-import.c:46
 #, fuzzy
 msgid "Error loading default addressbook."
 msgstr "Virhe avattaessa tiedostoa: %s"
 
-#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-abuse.c:112
 #: tools/evolution-addressbook-import.c:67
 #, fuzzy
 msgid "Input File"
-msgstr "Liitä tiedosto"
+msgstr "LiitÃ¤ tiedosto"
 
 #: tools/evolution-addressbook-export.c:46
 #, fuzzy
 msgid "Output File"
 msgstr "Avaa tiedosto"
 
-#: tools/evolution-addressbook-import.c:80
+#: tools/evolution-addressbook-import.c:82
 #, fuzzy
 msgid "No filename provided."
-msgstr "Vastaanottajia ei ole määritelty"
+msgstr "Vastaanottajia ei ole mÃ¤Ã¤ritelty"
 
 #: ui/evolution-addressbook.xml.h:3
-#, fuzzy
 msgid "Copy Contact(s) to Another Folder..."
-msgstr "Kopioi valitut viestit uuteen kansioon"
+msgstr "Kopioi yhteystiedot toiseen kansioon..."
 
 #: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
@@ -27024,25 +27193,24 @@ msgstr "Leikkaa valinta"
 
 #: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
-msgstr "Poista valitut kontaktit"
+msgstr "Poista valitut yhteystiedot"
 
 #: ui/evolution-addressbook.xml.h:11
-#, fuzzy
 msgid "Move Contact(s) to Another Folder..."
-msgstr "Siirrä valitut viestit toiseen kansioon"
+msgstr "SiirrÃ¤ yhteystiedot toiseen kansioon..."
 
 #: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
-msgstr "_Siirrä kansioon..."
+msgstr "_SiirrÃ¤ kansioon..."
 
 #: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
-msgstr "Liitä leikepöytä"
+msgstr "LiitÃ¤ leikepÃ¶ytÃ¤"
 
 #: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
-msgstr "Esikatselee tulostettavia kontakteja"
+msgstr "Esikatsele tulostettavia yhteystietoja"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
 #: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
@@ -27052,7 +27220,7 @@ msgstr "Tulostuksen esikatselu"
 
 #: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
-msgstr "Tulosta valitut kontaktit"
+msgstr "Tulosta valitut yhteystiedot"
 
 #: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
@@ -27064,7 +27232,7 @@ msgstr "Valitse kaikki"
 
 #: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
-msgstr "Valitse kaikki kontaktit"
+msgstr "Valitse kaikki yhteystiedot"
 
 #: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
@@ -27072,7 +27240,7 @@ msgstr ""
 
 #: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
-msgstr "Lähetä viesti kontaktille"
+msgstr "LÃ¤hetÃ¤ viesti yhteystiedolle"
 
 #: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
@@ -27080,16 +27248,15 @@ msgstr ""
 
 #: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
-msgstr "Pysäytä"
+msgstr "PysÃ¤ytÃ¤"
 
 #: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
-msgstr "Pysäytä lataaminen"
+msgstr "PysÃ¤ytÃ¤ lataaminen"
 
 #: ui/evolution-addressbook.xml.h:28
-#, fuzzy
 msgid "View the current contact"
-msgstr "Tallenna nykyinen tiedosto"
+msgstr "Katsele nykyistÃ¤ yhteystietoa"
 
 #: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
@@ -27102,41 +27269,38 @@ msgid "_Actions"
 msgstr "T_oiminnot"
 
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
-#, fuzzy
 msgid "_Forward Contact..."
-msgstr "_Kontaktit..."
+msgstr "_VÃ¤litÃ¤ yhteystieto..."
 
 #: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
-msgstr "_Siirrä kansioon..."
+msgstr "_SiirrÃ¤ kansioon..."
 
 #: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:40
-#, fuzzy
 msgid "_Search for Contacts"
-msgstr "_Etsi kontakteja"
+msgstr "_Etsi yhteystietoja"
 
 #: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "Valitse k_aikki"
 
 #: ui/evolution-addressbook.xml.h:42
-#, fuzzy
 msgid "_Send Message to Contact..."
-msgstr "Lähetä _viesti kontaktille..."
+msgstr "LÃ¤hetÃ¤ _viesti yhteystiedolle..."
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
 msgid "Day"
-msgstr "_Päivä"
+msgstr "_PÃ¤ivÃ¤"
 
 #: ui/evolution-calendar.xml.h:5
 #, fuzzy
 msgid "Delete the appointment"
-msgstr "Poista tämä tapaaminen"
+msgstr "Poista tÃ¤mÃ¤ tapaaminen"
 
 #: ui/evolution-calendar.xml.h:6
 msgid "Go To"
@@ -27147,9 +27311,8 @@ msgid "Go back"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:8
-#, fuzzy
 msgid "Go forward"
-msgstr "Välitä"
+msgstr "Mene eteenpÃ¤in"
 
 #: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
@@ -27162,7 +27325,7 @@ msgstr ""
 #: ui/evolution-calendar.xml.h:12
 #, fuzzy
 msgid "Go to today"
-msgstr "Siirry tähän päivään"
+msgstr "Siirry tÃ¤hÃ¤n pÃ¤ivÃ¤Ã¤n"
 
 #: ui/evolution-calendar.xml.h:13
 #, fuzzy
@@ -27176,7 +27339,7 @@ msgstr "Esikatselee tulostettavaa kalenteria"
 #: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Print this calendar"
-msgstr "Tulosta tämä kalenteri"
+msgstr "Tulosta tÃ¤mÃ¤ kalenteri"
 
 #: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
@@ -27185,21 +27348,21 @@ msgstr ""
 #: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "Show one day"
-msgstr "Näytä 1 päivä"
+msgstr "NÃ¤ytÃ¤ 1 pÃ¤ivÃ¤"
 
 #: ui/evolution-calendar.xml.h:20
 #, fuzzy
 msgid "Show one month"
-msgstr "Näytä 1 kuukausi"
+msgstr "NÃ¤ytÃ¤ 1 kuukausi"
 
 #: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Show one week"
-msgstr "Näytä 1 viikko"
+msgstr "NÃ¤ytÃ¤ 1 viikko"
 
 #: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
-msgstr "Näytä työviikko"
+msgstr "NÃ¤ytÃ¤ tyÃ¶viikko"
 
 #: ui/evolution-calendar.xml.h:23
 #, fuzzy
@@ -27209,11 +27372,11 @@ msgstr "_Viikko"
 #: ui/evolution-comp-editor.xml.h:3
 #, fuzzy
 msgid "Close this item"
-msgstr "Poista tämä kohta"
+msgstr "Poista tÃ¤mÃ¤ kohta"
 
 #: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 msgid "Delete this item"
-msgstr "Poista tämä kohta"
+msgstr "Poista tÃ¤mÃ¤ kohta"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
 #: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
@@ -27226,7 +27389,7 @@ msgstr "Esikatsele tulostettavaa kohtaa"
 
 #: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
-msgstr "Tulosta tämä kohta"
+msgstr "Tulosta tÃ¤mÃ¤ kohta"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
 #: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
@@ -27235,7 +27398,7 @@ msgstr "Tallenna"
 
 #: ui/evolution-comp-editor.xml.h:13
 msgid "Save As..."
-msgstr "Tallenna nimellä..."
+msgstr "Tallenna nimellÃ¤..."
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
@@ -27269,16 +27432,15 @@ msgstr ""
 #: ui/evolution-contact-list-editor.xml.h:5
 #: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
-msgstr "Tallenna _nimellä..."
+msgstr "Tallenna _nimellÃ¤..."
 
 #: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
-msgstr "Tallenna kontakti ja sulje ikkuna"
+msgstr "Tallenna yhteystieto ja sulje ikkuna"
 
 #: ui/evolution-contact-editor.xml.h:10
-#, fuzzy
 msgid "Send _Message to Contact..."
-msgstr "Lähetä _viesti kontaktille..."
+msgstr "LÃ¤hetÃ¤ _viesti yhteystiedolle..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
@@ -27289,7 +27451,7 @@ msgstr "_Tallenna"
 
 #: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
-msgstr "Poista tämä luettelo"
+msgstr "Poista tÃ¤mÃ¤ luettelo"
 
 #: ui/evolution-contact-list-editor.xml.h:4
 msgid "Delete..."
@@ -27362,7 +27524,7 @@ msgstr ""
 
 #: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
-msgstr "_Tyhjennä roskakori"
+msgstr "_TyhjennÃ¤ roskakori"
 
 #: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
@@ -27393,7 +27555,7 @@ msgstr "Kopioi valitut viestit uuteen kansioon"
 #: ui/evolution-mail-global.xml.h:13
 #, fuzzy
 msgid "S_ubscribe to Folders..."
-msgstr "_Siirrä kansioon..."
+msgstr "_SiirrÃ¤ kansioon..."
 
 #: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
@@ -27432,7 +27594,7 @@ msgstr "Leikkaa"
 #: ui/evolution-mail-list.xml.h:4
 #, fuzzy
 msgid "Cut selected message(s) to the clipboard"
-msgstr "Liitä viesti leikepöydälle"
+msgstr "LiitÃ¤ viesti leikepÃ¶ydÃ¤lle"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -27457,12 +27619,12 @@ msgstr "Merkitse ka_ikki luetuksi"
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
-msgstr "Merkitse kaikki näkyvät viestit luetuiksi"
+msgstr "Merkitse kaikki nÃ¤kyvÃ¤t viestit luetuiksi"
 
 #: ui/evolution-mail-list.xml.h:11
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
-msgstr "Liitä viesti leikepöydälle"
+msgstr "LiitÃ¤ viesti leikepÃ¶ydÃ¤lle"
 
 #: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
@@ -27474,7 +27636,7 @@ msgstr "Valitse _kaikki"
 
 #: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
-msgstr "Valitse _säie"
+msgstr "Valitse _sÃ¤ie"
 
 #: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
@@ -27486,27 +27648,27 @@ msgstr ""
 
 #: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
-msgstr "Valitse kaikki näkyvät viestit"
+msgstr "Valitse kaikki nÃ¤kyvÃ¤t viestit"
 
 #: ui/evolution-mail-list.xml.h:18
 msgid "Sh_ow Hidden Messages"
-msgstr "Näytä piil_otetut viestit"
+msgstr "NÃ¤ytÃ¤ piil_otetut viestit"
 
 #: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
-msgstr "Näytä viestit jotka on väliaikaisesti piilotettu"
+msgstr "NÃ¤ytÃ¤ viestit jotka on vÃ¤liaikaisesti piilotettu"
 
 #: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
-msgstr "Piilota kaikki luetut viestit väliaikaisesti"
+msgstr "Piilota kaikki luetut viestit vÃ¤liaikaisesti"
 
 #: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
-msgstr "Piilota valitut viestit väliaikaisesti"
+msgstr "Piilota valitut viestit vÃ¤liaikaisesti"
 
 #: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
-msgstr "Säikeistetty viesti-ikkuna"
+msgstr "SÃ¤ikeistetty viesti-ikkuna"
 
 #: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
@@ -27518,7 +27680,7 @@ msgstr "_Kansio"
 
 #: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
-msgstr "_Käännä valinta"
+msgstr "_KÃ¤Ã¤nnÃ¤ valinta"
 
 #: ui/evolution-mail-list.xml.h:30
 msgid "_Properties..."
@@ -27526,22 +27688,19 @@ msgstr "_Ominaisuudet..."
 
 #: ui/evolution-mail-list.xml.h:31
 msgid "_Threaded Message List"
-msgstr "Säikeis_tetty viesti-ikkuna"
+msgstr "SÃ¤ikeis_tetty viesti-ikkuna"
 
 #: ui/evolution-mail-message.xml.h:1
-#, fuzzy
 msgid "A_dd Sender to Addressbook"
-msgstr "Lisää lähettäjä osoitekirjaan"
+msgstr "_LisÃ¤Ã¤ lÃ¤hettÃ¤jÃ¤ osoitekirjaan"
 
 #: ui/evolution-mail-message.xml.h:2
-#, fuzzy
 msgid "A_pply Filters"
-msgstr "Toteuta suodattimet"
+msgstr "_Toteuta suodattimet"
 
 #: ui/evolution-mail-message.xml.h:3
-#, fuzzy
 msgid "Add Sender to Addressbook"
-msgstr "Lisää lähettäjä osoitekirjaan"
+msgstr "LisÃ¤Ã¤ lÃ¤hettÃ¤jÃ¤ osoitekirjaan"
 
 #: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
@@ -27557,7 +27716,7 @@ msgstr ""
 
 #: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
-msgstr "Vastaa valitun viestin lähettäjälle"
+msgstr "Vastaa valitun viestin lÃ¤hettÃ¤jÃ¤lle"
 
 #: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
@@ -27605,36 +27764,36 @@ msgstr ""
 
 #: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
-msgstr "Näytä seuraava tärkeä viesti"
+msgstr "NÃ¤ytÃ¤ seuraava tÃ¤rkeÃ¤ viesti"
 
 #: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
-msgstr "Näytä seuraava viesti"
+msgstr "NÃ¤ytÃ¤ seuraava viesti"
 
 #: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
-msgstr "Näytä seuraava lukematon viesti"
+msgstr "NÃ¤ytÃ¤ seuraava lukematon viesti"
 
 #: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
-msgstr "Näytä seuraava lukematon säie"
+msgstr "NÃ¤ytÃ¤ seuraava lukematon sÃ¤ie"
 
 #: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
-msgstr "Näytä edellinen tärkeä viesti"
+msgstr "NÃ¤ytÃ¤ edellinen tÃ¤rkeÃ¤ viesti"
 
 #: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
-msgstr "Näytä edellinen viesti"
+msgstr "NÃ¤ytÃ¤ edellinen viesti"
 
 #: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
-msgstr "Näytä edellinen lukematon viesti"
+msgstr "NÃ¤ytÃ¤ edellinen lukematon viesti"
 
 #: ui/evolution-mail-message.xml.h:28
 #, fuzzy
 msgid "F_orward"
-msgstr "Välitä"
+msgstr "VÃ¤litÃ¤"
 
 #: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
@@ -27642,7 +27801,7 @@ msgstr "Suodata postitus_listan mukaan..."
 
 #: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
-msgstr "Suodata _lähettäjän mukaan..."
+msgstr "Suodata _lÃ¤hettÃ¤jÃ¤n mukaan..."
 
 #: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
@@ -27684,7 +27843,7 @@ msgstr ""
 #: ui/evolution-mail-message.xml.h:41
 #, fuzzy
 msgid "Increase the text size"
-msgstr "Liitä tekstitiedosto..."
+msgstr "LiitÃ¤ tekstitiedosto..."
 
 #: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
@@ -27692,7 +27851,7 @@ msgstr "Lataa k_uvat"
 
 #: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
-msgstr "Merkitse _tärkeäksi"
+msgstr "Merkitse _tÃ¤rkeÃ¤ksi"
 
 #: ui/evolution-mail-message.xml.h:45
 msgid "Mark as U_nread"
@@ -27710,7 +27869,7 @@ msgstr "Merkitse valitut viestit luetuiksi"
 #: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Mark the selected message(s) as important"
-msgstr "Merkitse valitut viestit tärkeiksi"
+msgstr "Merkitse valitut viestit tÃ¤rkeiksi"
 
 #: ui/evolution-mail-message.xml.h:49
 #, fuzzy
@@ -27720,7 +27879,7 @@ msgstr "Merkitse valitut viestit lukemattomiksi"
 #: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
-msgstr "Merkitse valitut viestit tärkeiksi"
+msgstr "Merkitse valitut viestit tÃ¤rkeiksi"
 
 #: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
@@ -27728,12 +27887,12 @@ msgstr "Merkitse valitut viestit poistettaviksi"
 
 #: ui/evolution-mail-message.xml.h:52
 msgid "Move"
-msgstr "Siirrä"
+msgstr "SiirrÃ¤"
 
 #: ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Move selected message(s) to another folder"
-msgstr "Siirrä valitut viestit toiseen kansioon"
+msgstr "SiirrÃ¤ valitut viestit toiseen kansioon"
 
 #: ui/evolution-mail-message.xml.h:54
 msgid "Next"
@@ -27742,12 +27901,12 @@ msgstr "Seuraava"
 #: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Next _Important Message"
-msgstr "Seuraava tärkeä viesti"
+msgstr "Seuraava tÃ¤rkeÃ¤ viesti"
 
 #: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Next _Thread"
-msgstr "Seuraava säie"
+msgstr "Seuraava sÃ¤ie"
 
 #: ui/evolution-mail-message.xml.h:57
 #, fuzzy
@@ -27760,7 +27919,7 @@ msgstr "Avaa valittu viesti uudessa ikkunassa"
 
 #: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
-msgstr "Avaa valittu viesti muokkaimeen uudelleenlähettämistä varten"
+msgstr "Avaa valittu viesti muokkaimeen uudelleenlÃ¤hettÃ¤mistÃ¤ varten"
 
 #: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
@@ -27778,18 +27937,18 @@ msgstr "Vastaa"
 
 #: ui/evolution-mail-message.xml.h:63
 #, fuzzy
-msgid "Post a reply to a message message in a Public folder"
-msgstr "Etsi uusia viestejä kaikista kansioista"
+msgid "Post a reply to a message in a Public folder"
+msgstr "Etsi uusia viestejÃ¤ kaikista kansioista"
 
 #: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Pr_evious Important Message"
-msgstr "Edellinen tärkeä viesti"
+msgstr "Edellinen tÃ¤rkeÃ¤ viesti"
 
 #: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Preview the message to be printed"
-msgstr "Esikatsele tulostettavaa viestiä"
+msgstr "Esikatsele tulostettavaa viestiÃ¤"
 
 #: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
@@ -27797,7 +27956,7 @@ msgstr "Edellinen"
 
 #: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
-msgstr "Tulosta tämä viesti"
+msgstr "Tulosta tÃ¤mÃ¤ viesti"
 
 #: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
@@ -27815,7 +27974,7 @@ msgstr ""
 #: ui/evolution-mail-message.xml.h:77
 #, fuzzy
 msgid "S_earch Message..."
-msgstr "_Etsi viestiä"
+msgstr "_Etsi viestiÃ¤"
 
 #: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
@@ -27840,11 +27999,11 @@ msgstr ""
 
 #: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
-msgstr "Näytä täydet _otsikkotiedot"
+msgstr "NÃ¤ytÃ¤ tÃ¤ydet _otsikkotiedot"
 
 #: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
-msgstr "Näytä viesti normaalimuodossa"
+msgstr "NÃ¤ytÃ¤ viesti normaalimuodossa"
 
 #: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
@@ -27879,9 +28038,8 @@ msgid "VFolder on _Subject..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:94
-#, fuzzy
 msgid "_Attached"
-msgstr "Liitä"
+msgstr "_Liitetty"
 
 #: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
@@ -27889,11 +28047,11 @@ msgstr ""
 
 #: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
-msgstr "_Luo viestistä suodatin"
+msgstr "_Luo viestistÃ¤ suodatin"
 
 #: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
-msgstr "_Välitetä viesti"
+msgstr "_VÃ¤litÃ¤ viesti"
 
 #: ui/evolution-mail-message.xml.h:99
 #, fuzzy
@@ -27903,7 +28061,7 @@ msgstr "Siirry"
 #: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
-msgstr "Työskentele linjoilla"
+msgstr "TyÃ¶skentele linjoilla"
 
 #: ui/evolution-mail-message.xml.h:101
 #, fuzzy
@@ -27916,7 +28074,7 @@ msgstr ""
 
 #: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
-msgstr "_Siirrä kansioon"
+msgstr "_SiirrÃ¤ kansioon"
 
 #: ui/evolution-mail-message.xml.h:104
 #, fuzzy
@@ -27943,11 +28101,11 @@ msgstr ""
 #: ui/evolution-mail-message.xml.h:111
 #, fuzzy
 msgid "_Resend..."
-msgstr "_Nimeä uudelleen..."
+msgstr "_NimeÃ¤ uudelleen..."
 
 #: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
 msgid "_Tools"
-msgstr "T_yökalut"
+msgstr "T_yÃ¶kalut"
 
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
@@ -27955,7 +28113,7 @@ msgstr "_Palauta"
 
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
-msgstr "Sulje tämä ikkuna"
+msgstr "Sulje tÃ¤mÃ¤ ikkuna"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
@@ -27967,11 +28125,15 @@ msgstr "_Sulje"
 #: ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
 msgid "_View"
-msgstr "_Näytä"
+msgstr "_NÃ¤ytÃ¤"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
-msgstr "Liitä"
+msgstr "LiitÃ¤"
+
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "LiitÃ¤ tiedosto"
 
 #: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
@@ -27983,7 +28145,7 @@ msgstr "Poista kaikki paitsi allekirjoitus"
 
 #: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
-msgstr "Salaa tämä viesti PGP:llä"
+msgstr "Salaa tÃ¤mÃ¤ viesti PGP:llÃ¤"
 
 #: ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
@@ -28025,7 +28187,7 @@ msgstr "S/MIME-allekirjoitus"
 
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
-msgstr "Tallenna nimellä"
+msgstr "Tallenna nimellÃ¤"
 
 #: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
@@ -28042,7 +28204,7 @@ msgstr "Tallenna nykyinen tiedosto"
 
 #: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
-msgstr "Tallenna tiedosto uudella nimellä"
+msgstr "Tallenna tiedosto uudella nimellÃ¤"
 
 #: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
@@ -28050,29 +28212,29 @@ msgstr "Tallenna viesti johonkin tiettyyn kansioon"
 
 #: ui/evolution-message-composer.xml.h:24
 msgid "Send"
-msgstr "Lähetä"
+msgstr "LÃ¤hetÃ¤"
 
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
-msgstr "Lähetä viesti HTML-muodossa"
+msgstr "LÃ¤hetÃ¤ viesti HTML-muodossa"
 
 #: ui/evolution-message-composer.xml.h:26
 #, fuzzy
 msgid "Send this message"
-msgstr "Lähetä viesti heti"
+msgstr "LÃ¤hetÃ¤ viesti heti"
 
 #: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
-msgstr "Näytä / piilota liitetiedostot"
+msgstr "NÃ¤ytÃ¤ / piilota liitetiedostot"
 
 #: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
-msgstr "Näytä _liitteet"
+msgstr "NÃ¤ytÃ¤ _liitteet"
 
 #: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
-msgstr "Näytä liitteet"
+msgstr "NÃ¤ytÃ¤ liitteet"
 
 #: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
@@ -28088,15 +28250,15 @@ msgstr ""
 
 #: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
-msgstr "Määrittää näytetäänkö Kopio-kenttä (CC)."
+msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ Kopio-kenttÃ¤ (CC)."
 
 #: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
-msgstr "Määrittää näytetäänkö Lähettäjä-kenttä"
+msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ LÃ¤hettÃ¤jÃ¤-kenttÃ¤"
 
 #: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Määrittää näytetäänkö Vastausosoite-kenttä"
+msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ Vastausosoite-kenttÃ¤"
 
 #: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
@@ -28108,7 +28270,7 @@ msgstr ""
 
 #: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
-msgstr "_Kopio-kenttä"
+msgstr "_Kopio-kenttÃ¤"
 
 #: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
@@ -28121,7 +28283,7 @@ msgstr ""
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
-msgstr "Li_sää"
+msgstr "Li_sÃ¤Ã¤"
 
 #: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
@@ -28129,7 +28291,7 @@ msgstr "_Avaa..."
 
 #: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
-msgstr "_Vastausosoite-kenttä"
+msgstr "_Vastausosoite-kenttÃ¤"
 
 #: ui/evolution-message-composer.xml.h:48
 msgid "_Security"
@@ -28188,12 +28350,11 @@ msgstr ""
 
 #: ui/evolution-task-editor.xml.h:3
 msgid "Cancel Task"
-msgstr "Peruuta tehtävä"
+msgstr "Peruuta tehtÃ¤vÃ¤"
 
 #: ui/evolution-task-editor.xml.h:4
-#, fuzzy
 msgid "Cancel this task"
-msgstr "Peruuta tehtävä"
+msgstr "Peruuta tÃ¤mÃ¤ tehtÃ¤vÃ¤"
 
 #: ui/evolution-task-editor.xml.h:7
 msgid "Obtain the latest task information"
@@ -28205,20 +28366,20 @@ msgstr ""
 
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
-msgstr "Kopioi valittu tehtävä"
+msgstr "Kopioi valittu tehtÃ¤vÃ¤"
 
 #: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
-msgstr "Leikkaa valittu tehtävä"
+msgstr "Leikkaa valittu tehtÃ¤vÃ¤"
 
 #: ui/evolution-tasks.xml.h:6
 #, fuzzy
 msgid "Delete completed tasks"
-msgstr "Poista valitut tehtävät"
+msgstr "Poista valitut tehtÃ¤vÃ¤t"
 
 #: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
-msgstr "Poista valitut tehtävät"
+msgstr "Poista valitut tehtÃ¤vÃ¤t"
 
 #: ui/evolution-tasks.xml.h:8
 #, fuzzy
@@ -28227,7 +28388,7 @@ msgstr "Valmis"
 
 #: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
-msgstr "Liitä tehtävä leikepöydältä"
+msgstr "LiitÃ¤ tehtÃ¤vÃ¤ leikepÃ¶ydÃ¤ltÃ¤"
 
 #: ui/evolution-tasks.xml.h:11
 #, fuzzy
@@ -28237,16 +28398,15 @@ msgstr "Esikatselee tulostettavia kontakteja"
 #: ui/evolution-tasks.xml.h:13
 #, fuzzy
 msgid "Print the list of tasks"
-msgstr "Tulosta tämä viesti"
+msgstr "Tulosta tÃ¤mÃ¤ viesti"
 
 #: ui/evolution.xml.h:1
-#, fuzzy
 msgid "About Ximian Evolution..."
-msgstr "Tietoja Evolutionista..."
+msgstr "Tietoja Ximian Evolutionista..."
 
 #: ui/evolution.xml.h:2
 msgid "Add to _Shortcut Bar"
-msgstr "Lisää _oikotiepalkkiin"
+msgstr "LisÃ¤Ã¤ _oikotiepalkkiin"
 
 #: ui/evolution.xml.h:3
 #, fuzzy
@@ -28255,11 +28415,11 @@ msgstr "Evolution"
 
 #: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
-msgstr "Muuta tämän kansion nimeä"
+msgstr "Muuta tÃ¤mÃ¤n kansion nimeÃ¤"
 
 #: ui/evolution.xml.h:7
 msgid "Copy this folder"
-msgstr "Kopioi tämä kansio"
+msgstr "Kopioi tÃ¤mÃ¤ kansio"
 
 #: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
@@ -28267,7 +28427,7 @@ msgstr "Luo _uusi kansio"
 
 #: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
-msgstr "Luo oikotie tähän kansioon oikotiepalkkiin"
+msgstr "Luo oikotie tÃ¤hÃ¤n kansioon oikotiepalkkiin"
 
 #: ui/evolution.xml.h:10
 msgid "Create a new folder"
@@ -28284,11 +28444,11 @@ msgstr "Luo uusi kansio"
 
 #: ui/evolution.xml.h:13
 msgid "Delete this folder"
-msgstr "Poista tämä kansio"
+msgstr "Poista tÃ¤mÃ¤ kansio"
 
 #: ui/evolution.xml.h:14
 msgid "Display a different folder"
-msgstr "Näytä toinen kansio"
+msgstr "NÃ¤ytÃ¤ toinen kansio"
 
 #: ui/evolution.xml.h:15
 msgid "E_xit"
@@ -28308,7 +28468,7 @@ msgstr ""
 
 #: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
-msgstr "Siirrä tämä kansio toiseen paikkaan"
+msgstr "SiirrÃ¤ tÃ¤mÃ¤ kansio toiseen paikkaan"
 
 #: ui/evolution.xml.h:21
 #, fuzzy
@@ -28330,12 +28490,12 @@ msgstr "Avaa valittu kansio uudessa ikkunassa"
 #: ui/evolution.xml.h:26
 #, fuzzy
 msgid "Pi_lot Settings..."
-msgstr "_Sähköpostiasetukset..."
+msgstr "_SÃ¤hkÃ¶postiasetukset..."
 
 #: ui/evolution.xml.h:27
 #, fuzzy
 msgid "Pilot Con_duit Settings..."
-msgstr "_Sähköpostiasetukset..."
+msgstr "_SÃ¤hkÃ¶postiasetukset..."
 
 #: ui/evolution.xml.h:28
 #, fuzzy
@@ -28344,12 +28504,12 @@ msgstr "Luo _uusi kansio"
 
 #: ui/evolution.xml.h:29
 msgid "Send / Receive"
-msgstr "Lähetä / Vastaanota"
+msgstr "LÃ¤hetÃ¤ / Vastaanota"
 
 #: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Send queued items and retrieve new items"
-msgstr "Lähetä jonossa olevat viestit ja hae uudet viestit"
+msgstr "LÃ¤hetÃ¤ jonossa olevat viestit ja hae uudet viestit"
 
 #: ui/evolution.xml.h:31
 #, fuzzy
@@ -28367,31 +28527,31 @@ msgstr ""
 
 #: ui/evolution.xml.h:34
 msgid "Submit Bug Report"
-msgstr "Lähetä virheraportti"
+msgstr "LÃ¤hetÃ¤ virheraportti"
 
 #: ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
-msgstr "Lähetä _virheraportti"
+msgstr "LÃ¤hetÃ¤ _virheraportti"
 
 #: ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
-msgstr "Lähetä virheraportti käyttäen Bug Buddy:a"
+msgstr "LÃ¤hetÃ¤ virheraportti kÃ¤yttÃ¤en Bug Buddy:a"
 
 #: ui/evolution.xml.h:37
 msgid "Toggle"
-msgstr "Määritä"
+msgstr "MÃ¤Ã¤ritÃ¤"
 
 #: ui/evolution.xml.h:38
 msgid "Toggle whether to show the folder bar"
-msgstr "Määritä, näytetäänkö kansiopalkki"
+msgstr "MÃ¤Ã¤ritÃ¤, nÃ¤ytetÃ¤Ã¤nkÃ¶ kansiopalkki"
 
 #: ui/evolution.xml.h:39
 msgid "Toggle whether to show the shortcut bar"
-msgstr "Määritä, näytetäänkö oikotiepalkki"
+msgstr "MÃ¤Ã¤ritÃ¤, nÃ¤ytetÃ¤Ã¤nkÃ¶ oikotiepalkki"
 
 #: ui/evolution.xml.h:40
 msgid "Toggle whether we are working offline."
-msgstr "Määritä, työskennelläänkö poissa linjoilta."
+msgstr "MÃ¤Ã¤ritÃ¤, tyÃ¶skennellÃ¤Ã¤nkÃ¶ poissa linjoilta."
 
 #: ui/evolution.xml.h:41
 msgid "View the selected folder"
@@ -28431,7 +28591,7 @@ msgstr "_Siirry kansioon..."
 
 #: ui/evolution.xml.h:56
 msgid "_Move..."
-msgstr "_Siirrä..."
+msgstr "_SiirrÃ¤..."
 
 #: ui/evolution.xml.h:57
 msgid "_New"
@@ -28448,11 +28608,11 @@ msgstr "Luo _uusi kansio"
 
 #: ui/evolution.xml.h:60
 msgid "_Rename..."
-msgstr "_Nimeä uudelleen..."
+msgstr "_NimeÃ¤ uudelleen..."
 
 #: ui/evolution.xml.h:61
 msgid "_Send / Receive"
-msgstr "_Lähetä / Vastaanota"
+msgstr "_LÃ¤hetÃ¤ / Vastaanota"
 
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
@@ -28478,9 +28638,8 @@ msgid "Reload the view"
 msgstr ""
 
 #: views/addressbook/galview.xml.h:1
-#, fuzzy
 msgid "By _Company"
-msgstr "Yrityksen mukaan"
+msgstr "_Yrityksen mukaan"
 
 #: views/addressbook/galview.xml.h:2
 #, fuzzy
@@ -28500,7 +28659,7 @@ msgstr "Viikko"
 #: views/calendar/galview.xml.h:2
 #, fuzzy
 msgid "_Day View"
-msgstr "_Näytä"
+msgstr "_NÃ¤ytÃ¤"
 
 #: views/calendar/galview.xml.h:3
 #, fuzzy
@@ -28510,12 +28669,11 @@ msgstr "Kuukausi"
 #: views/calendar/galview.xml.h:4
 #, fuzzy
 msgid "_Work Week View"
-msgstr "Työviikk_o"
+msgstr "TyÃ¶viikk_o"
 
 #: views/mail/galview.xml.h:1
-#, fuzzy
 msgid "As Sent Folder"
-msgstr "Valitse kansio"
+msgstr "Kuten lÃ¤hetÃ¤-kansio"
 
 #: views/mail/galview.xml.h:2
 msgid "By Follow Up Flag"
@@ -28523,7 +28681,7 @@ msgstr ""
 
 #: views/mail/galview.xml.h:3
 msgid "By Sender"
-msgstr "Lähettäjän mukaan"
+msgstr "LÃ¤hettÃ¤jÃ¤n mukaan"
 
 #: views/mail/galview.xml.h:4
 msgid "By Status"
@@ -28540,16 +28698,16 @@ msgstr "Viestit"
 #: views/tasks/galview.xml.h:1
 #, fuzzy
 msgid "With _Category"
-msgstr "Ryhmän mukaan"
+msgstr "RyhmÃ¤n mukaan"
 
 #: views/tasks/galview.xml.h:2
 #, fuzzy
 msgid "_Tasks"
-msgstr "_Tehtävä"
+msgstr "_TehtÃ¤vÃ¤"
 
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:201
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:688
 msgid "UTC"
 msgstr ""
 
@@ -28561,14 +28719,14 @@ msgstr "Valitse tiedosto"
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 #, fuzzy
 msgid "Selection:"
-msgstr "Käännä valinta"
+msgstr "KÃ¤Ã¤nnÃ¤ valinta"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 #, fuzzy
 msgid "Time Zones"
 msgstr ""
 "\n"
-"Aikavyöhyke: "
+"AikavyÃ¶hyke: "
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid ""
@@ -28577,44 +28735,44 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:295
+#: widgets/menus/gal-view-menus.c:288
 msgid "_Current View"
-msgstr "_Nykyinen näkymä"
+msgstr "_Nykyinen nÃ¤kymÃ¤"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:357
+#: widgets/menus/gal-view-menus.c:350
 #, fuzzy
 msgid "Custom View"
-msgstr "_Nykyinen näkymä"
+msgstr "_Nykyinen nÃ¤kymÃ¤"
 
-#: widgets/menus/gal-view-menus.c:366
+#: widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:379
+#: widgets/menus/gal-view-menus.c:372
 msgid "Define Views"
 msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:427
+#: widgets/misc/e-calendar-item.c:434
 msgid "MTWTFSS"
 msgstr "MTKTPLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1070
+#: widgets/misc/e-calendar-item.c:1107
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:436
 msgid "Now"
 msgstr "Nyt"
 
-#: widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:442
 msgid "Today"
-msgstr "Tänään"
+msgstr "TÃ¤nÃ¤Ã¤n"
 
-#: widgets/misc/e-cell-date-edit.c:797
+#: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ajan tulee olla muodossa: %s"
@@ -28623,81 +28781,81 @@ msgstr "Ajan tulee olla muodossa: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr "Balttilainen"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr "Keskieurooppalainen"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr "Kiinalainen"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr "Kyrillinen"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:65
 msgid "Greek"
 msgstr "Kreikkalainen"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Hebrew"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Japanese"
 msgstr "Japanilainen"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr "Korealainen"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr "Turkkilainen"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:70
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:71
 msgid "Western European"
-msgstr "Länsieurooppalainen"
+msgstr "LÃ¤nsieurooppalainen"
 
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr "Perinteinen"
 
-#: widgets/misc/e-charset-picker.c:87 widgets/misc/e-charset-picker.c:88
+#: widgets/misc/e-charset-picker.c:89 widgets/misc/e-charset-picker.c:90
 msgid "Simplified"
 msgstr "Yksinkertaistettu"
 
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr "Ukrainalainen"
 
-#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:97
 #, fuzzy
 msgid "Visual"
-msgstr "Älä käytä"
+msgstr "Ã„lÃ¤ kÃ¤ytÃ¤"
 
-#: widgets/misc/e-charset-picker.c:164
+#: widgets/misc/e-charset-picker.c:185
 #, c-format
 msgid "Unknown character set: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:206
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr "Muut..."
 
-#: widgets/misc/e-charset-picker.c:400
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr ""
 
@@ -28705,11 +28863,11 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:189
+#: widgets/misc/e-filter-bar.c:190
 msgid "Search Editor"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:211
+#: widgets/misc/e-filter-bar.c:212
 msgid "Save Search"
 msgstr "Tallenna haku"
 
@@ -28728,736 +28886,60 @@ msgstr "Tallenna haku"
 msgid "_Advanced..."
 msgstr "Edistyneet..."
 
-#: widgets/misc/e-messagebox.c:152
+#: widgets/misc/e-messagebox.c:154
 msgid "Information"
 msgstr "Tiedoksi"
 
-#: widgets/misc/e-messagebox.c:166
+#: widgets/misc/e-messagebox.c:168
 msgid "Error"
 msgstr "Virhe"
 
-#: widgets/misc/e-messagebox.c:173
+#: widgets/misc/e-messagebox.c:175
 msgid "Question"
 msgstr "Kysymys"
 
-#: widgets/misc/e-messagebox.c:180
+#: widgets/misc/e-messagebox.c:182
 msgid "Message"
 msgstr "Viesti"
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
-msgstr "Älä näytä tätä viestiä uudelleen."
-
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:524
 #, fuzzy
 msgid "_Find Now"
 msgstr "Etsi nyt"
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:525
 #, fuzzy
 msgid "_Clear"
 msgstr "Kalenteri"
 
-#: widgets/misc/e-search-bar.c:895
+#: widgets/misc/e-search-bar.c:826
+msgid "Item ID"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:833
+msgid "Subitem ID"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:840
+#, fuzzy
+msgid "Text"
+msgstr "Seuraava"
+
+#: widgets/misc/e-search-bar.c:918
 #, fuzzy
 msgid "Clear"
 msgstr "Kalenteri"
 
-#: widgets/misc/e-search-bar.c:897
+#: widgets/misc/e-search-bar.c:920
 msgid "Find Now"
 msgstr "Etsi nyt"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr ""
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
-
-#: wombat/wombat.c:199
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): GNOME-VFS:n alustus epäonnistui"
-
-#: wombat/wombat.c:211
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): GNOME:n alustus epäonnistui"
-
-#: wombat/wombat.c:224
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): Bonobon alustus epäonnistui"
-
-#, fuzzy
-#~ msgid "_Configure..."
-#~ msgstr "Palvelimen asetukset"
-
-#, fuzzy
-#~ msgid "_Configure Pilot..."
-#~ msgstr "Palvelimen asetukset"
-
-#, fuzzy
-#~ msgid "en"
-#~ msgstr "Lähetä"
-
-#, fuzzy
-#~ msgid "Select PGP program"
-#~ msgstr "Valitse PGP-ohjelma"
-
-#, fuzzy
-#~ msgid "Signature #1"
-#~ msgstr "Tallenna allekirjoitus"
-
-#, fuzzy
-#~ msgid "Signature #2"
-#~ msgstr "Tallenna allekirjoitus"
-
-#~ msgid "_PGP binary path:"
-#~ msgstr "_PGP-ohjelman polku:"
-
-#~ msgid "Copy selected messages"
-#~ msgstr "Kopioi valitut viestit"
-
-#~ msgid "Cut selected messages"
-#~ msgstr "Leikkaa valitut viestit"
-
-#, fuzzy
-#~ msgid "&lt;- _Remove"
-#~ msgstr "Poista"
-
-#, fuzzy
-#~ msgid "_Add -&gt;"
-#~ msgstr "_Lisää"
-
-#~ msgid "Scanning for new messages"
-#~ msgstr "Etsitään uusia viestejä"
-
-#, fuzzy
-#~ msgid "The folder %s no longer exists"
-#~ msgstr "Kansiota `%s' ei ole olemassa."
-
-#~ msgid "1 byte"
-#~ msgstr "1 tavy"
-
-#~ msgid "%u bytes"
-#~ msgstr "%u tavua"
-
-#, fuzzy
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "Evolutionin asennus"
-
-#, fuzzy
-#~ msgid "_Preferences..."
-#~ msgstr "_Ominaisuudet..."
-
-#, fuzzy
-#~ msgid "Could not parse query string"
-#~ msgstr "URL:n `%s' jäsentäminen epäonnistui"
-
-#, fuzzy
-#~ msgid "Email is"
-#~ msgstr "Sähköposti 2"
-
-#, fuzzy
-#~ msgid "Meeting begins: <b>"
-#~ msgstr "Lähteen tiedot"
-
-#, fuzzy
-#~ msgid "Task begins: <b>"
-#~ msgstr "Valmis"
-
-#, fuzzy
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "Lähteen tiedot"
-
-#, fuzzy
-#~ msgid "Begins: <b>"
-#~ msgstr "Lähteen tiedot"
-
-#, fuzzy
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "Lähteen tiedot"
-
-#, fuzzy
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Lähteen tiedot"
-
-#, fuzzy
-#~ msgid "Task Completed: <b>"
-#~ msgstr "Valmis"
-
-#, fuzzy
-#~ msgid "Task Due: <b>"
-#~ msgstr "Valmis"
-
-#, fuzzy
-#~ msgid "Set as default"
-#~ msgstr " (oletus)"
-
-#, fuzzy
-#~ msgid "Signature hint"
-#~ msgstr "Tallenna allekirjoitus"
-
-#, fuzzy
-#~ msgid "Hide signature hint"
-#~ msgstr "HTML-allekirjoitustiedosto:"
-
-#, fuzzy
-#~ msgid "_Server:"
-#~ msgstr "Palvelimen _nimi: "
-
-#, fuzzy
-#~ msgid "_Browse..."
-#~ msgstr "_Siirrä..."
-
-#~ msgid "_Delete this Appointment"
-#~ msgstr "P_oista tämä tapaaminen"
-
-#, fuzzy
-#~ msgid "I/O Error: %s"
-#~ msgstr "I/O-virhe"
-
-#~ msgid "Insert File"
-#~ msgstr "Liitä tiedosto"
-
-#~ msgid "You have chosen an invalid date."
-#~ msgstr "Olet valinnut epäkelvon päivän."
-
-#~ msgid "Evolution News Editor"
-#~ msgstr "Evolutionin keskusteluryhmämuokkain"
-
-#~ msgid "Are you sure you want to delete this news account?"
-#~ msgstr "Haluatko varmasti poistaa tämän keskusteluryhmätilin?"
-
-#~ msgid "You must configure an account before you can send this email."
-#~ msgstr "Sinun tulee luoda tili ennen kuin voit lähettää tätä viestiä."
-
-#~ msgid "NNTP Server:"
-#~ msgstr "NNTP-palvelin"
-
-#, fuzzy
-#~ msgid "News Servers"
-#~ msgstr "NNTP-palvelin"
-
-#~ msgid "Source"
-#~ msgstr "Lähde"
-
-#~ msgid "Source Information"
-#~ msgstr "Lähteen tiedot"
-
-#, fuzzy
-#~ msgid "View messages..."
-#~ msgstr "Tallenna viesti nimellä..."
-
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Liitä tiedosto viestiin tekstinä"
-
-#~ msgid "Insert text file..."
-#~ msgstr "Liitä tekstitiedosto..."
-
-#~ msgid "Send _Later"
-#~ msgstr "Lähetä _myöhemmin"
-
-#~ msgid "Send _later"
-#~ msgstr "Lähetä _myöhemmin"
-
-#~ msgid "Send the message later"
-#~ msgstr "Lähetä viesti myöhemmin"
-
-#, fuzzy
-#~ msgid "_Pilot Settings..."
-#~ msgstr "_Sähköpostiasetukset..."
-
-#, fuzzy
-#~ msgid "Addressbook Settings"
-#~ msgstr "Osoitekirjalähteet"
-
-#, fuzzy
-#~ msgid "Sta_rt of day:"
-#~ msgstr "Päivän alku:"
-
-#, fuzzy
-#~ msgid "_End of day:"
-#~ msgstr "Päivän loppu:"
-
-#, fuzzy
-#~ msgid "_Other Organizer"
-#~ msgstr "Organisoija:"
-
-#, fuzzy
-#~ msgid "Cannot sign this message: no plaintext to sign"
-#~ msgstr "Viestiä ei voida lähettää: vastaanottajia ei ole määritelty."
-
-#, fuzzy
-#~ msgid "Cannot sign this message: no password provided"
-#~ msgstr "Viestiä ei voida lähettää: lähettäjän osoite on epäkelpo."
-
-#, fuzzy
-#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-#~ msgstr "Putken luominen GPG/PGP:lle epäonnistui: %s"
-
-#, fuzzy
-#~ msgid "Cannot sign this message: no plaintext to clearsign"
-#~ msgstr "Viestiä ei voida lähettää: vastaanottajia ei ole määritelty."
-
-#, fuzzy
-#~ msgid "Cannot verify this message: no plaintext to verify"
-#~ msgstr "Viestiä ei voida lähettää: vastaanottajia ei ole määritelty."
-
-#, fuzzy
-#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-#~ msgstr "Putken luominen GPG/PGP:lle epäonnistui: %s"
-
-#, fuzzy
-#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
-#~ msgstr "Viestiä ei voida lähettää: vastaanottajia ei ole määritelty."
-
-#, fuzzy
-#~ msgid "Cannot encrypt this message: no password provided"
-#~ msgstr "Viestiä ei voida lähettää: lähettäjän osoite on epäkelpo."
-
-#, fuzzy
-#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-#~ msgstr "Putken luominen GPG/PGP:lle epäonnistui: %s"
-
-#, fuzzy
-#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
-#~ msgstr "Viestiä ei voida lähettää: vastaanottajia ei ole määritelty."
-
-#, fuzzy
-#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-#~ msgstr "Putken luominen GPG/PGP:lle epäonnistui: %s"
-
-#~ msgid "No such message: %s"
-#~ msgstr "Ei kyseistä viestiä: %s"
-
-#~ msgid "You cannot copy messages from this trash folder."
-#~ msgstr "Et voi kopioida viestejä tästä roskakorista."
-
-#, fuzzy
-#~ msgid "Could not file: %s: %s"
-#~ msgstr ""
-#~ "Tiedoston %s poistaminen epäonnistui:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Random"
-#~ msgstr "Lue"
-
-#, fuzzy
-#~ msgid " Edit "
-#~ msgstr "_Muokkaa"
-
-#, fuzzy
-#~ msgid " New "
-#~ msgstr "Uusi"
-
-#, fuzzy
-#~ msgid "Advanced Options"
-#~ msgstr "Peruuta operaatio"
-
-#, fuzzy
-#~ msgid "Select a signature script"
-#~ msgstr "Poista kaikki paitsi allekirjoitus"
-
-#~ msgid "_HTML Signature:"
-#~ msgstr "_HTML-allekirjoitus:"
-
-#~ msgid "Moving"
-#~ msgstr "Siirretään"
-
-#~ msgid "Copying"
-#~ msgstr "Kopioidaan"
-
-#, fuzzy
-#~ msgid "Signature name:"
-#~ msgstr "Allekirjoitustiedosto:"
-
-#, fuzzy
-#~ msgid "Riga"
-#~ msgstr "Oikea:"
-
-#, fuzzy
-#~ msgid "Are you sure you want to remove the \"%s\" folder?"
-#~ msgstr "Haluatko todella poistaa kansion '%s'?"
-
-#~ msgid ""
-#~ "\n"
-#~ "Name: "
-#~ msgstr ""
-#~ "\n"
-#~ "Nimi: "
-
-#~ msgid ""
-#~ "\n"
-#~ "  Prefix:     "
-#~ msgstr ""
-#~ "\n"
-#~ "  Etuliite:   "
-
-#~ msgid ""
-#~ "\n"
-#~ "  Given:      "
-#~ msgstr ""
-#~ "\n"
-#~ "  Etunimi:    "
-
-#~ msgid ""
-#~ "\n"
-#~ "  Additional: "
-#~ msgstr ""
-#~ "\n"
-#~ "  Muut nimet: "
-
-#~ msgid ""
-#~ "\n"
-#~ "  Family:     "
-#~ msgstr ""
-#~ "\n"
-#~ "  Sukunimi:   "
-
-#~ msgid ""
-#~ "\n"
-#~ "Birth Date: "
-#~ msgstr ""
-#~ "\n"
-#~ "Syntymäpäivä: "
-
-#~ msgid ""
-#~ "\n"
-#~ "Address:"
-#~ msgstr ""
-#~ "\n"
-#~ "Osoite:"
-
-#~ msgid ""
-#~ "\n"
-#~ "  Postal Box:  "
-#~ msgstr ""
-#~ "\n"
-#~ "  Postilokero: "
-
-#~ msgid ""
-#~ "\n"
-#~ "  Street:      "
-#~ msgstr ""
-#~ "\n"
-#~ "  Katu:        "
-
-#~ msgid ""
-#~ "\n"
-#~ "  City:        "
-#~ msgstr ""
-#~ "\n"
-#~ "  Kaupunki:    "
-
-#~ msgid ""
-#~ "\n"
-#~ "  Postal Code: "
-#~ msgstr ""
-#~ "\n"
-#~ "  Postinumero: "
-
-#~ msgid ""
-#~ "\n"
-#~ "  Country:     "
-#~ msgstr ""
-#~ "\n"
-#~ "  Maa:         "
-
-#~ msgid ""
-#~ "\n"
-#~ "Telephones:\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Puhelimet:\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Telephone:"
-#~ msgstr ""
-#~ "\n"
-#~ "Puhelin:"
-
-#~ msgid ""
-#~ "\n"
-#~ "E-mail:\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Sähköposti:\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "E-mail:"
-#~ msgstr ""
-#~ "\n"
-#~ "Sähköposti:"
-
-#~ msgid ""
-#~ "\n"
-#~ "Time Zone: "
-#~ msgstr ""
-#~ "\n"
-#~ "Aikavyöhyke: "
-
-#~ msgid ""
-#~ "\n"
-#~ "  Name:  "
-#~ msgstr ""
-#~ "\n"
-#~ "  Nimi:  "
-
-#~ msgid ""
-#~ "\n"
-#~ "  Unit:  "
-#~ msgstr ""
-#~ "\n"
-#~ "  Yksikkö: "
-
-#~ msgid ""
-#~ "\n"
-#~ "  Unit2: "
-#~ msgstr ""
-#~ "\n"
-#~ "  Yksikkö2: "
-
-#~ msgid ""
-#~ "\n"
-#~ "  Unit3: "
-#~ msgstr ""
-#~ "\n"
-#~ "  Yksikkö3: "
-
-#~ msgid ""
-#~ "\n"
-#~ "  Unit4: "
-#~ msgstr ""
-#~ "\n"
-#~ "  Yksikkö4: "
-
-#~ msgid ""
-#~ "\n"
-#~ "Categories: "
-#~ msgstr ""
-#~ "\n"
-#~ "Ryhmät: "
-
-#~ msgid ""
-#~ "\n"
-#~ "Public Key: "
-#~ msgstr ""
-#~ "\n"
-#~ "Julkinen avain: "
-
-#~ msgid "New _Contact"
-#~ msgstr "_Uusi kontakti"
-
-#~ msgid "New Contact _List"
-#~ msgstr "Uusi kontakti_luettelo"
-
-#~ msgid "Edit Addressbook"
-#~ msgstr "Muokkaa osoitekirjaa"
-
-#~ msgid "Add Addressbook"
-#~ msgstr "Lisää osoitekirja"
-
-#~ msgid "The information below is required in order to add an addressbook.  "
-#~ msgstr "Allaolevat tiedot vaaditaan osoitekirjan lisäämiseksi.  "
-
-#~ msgid "Co_ntacts:"
-#~ msgstr "Ko_ntaktit:"
-
-#~ msgid "_Message Recipients:"
-#~ msgstr "_Vastaanottajat:"
-
-#~ msgid "B_usiness"
-#~ msgstr "T_yöpaikka"
-
-#~ msgid "Business _Fax"
-#~ msgstr "Työ-_faksi"
-
-#~ msgid "_Business"
-#~ msgstr "_Työ"
-
-#~ msgid "_Home"
-#~ msgstr "_Koti"
-
-#~ msgid "_Mobile"
-#~ msgstr "_Matkapuhelin"
-
-#, fuzzy
-#~ msgid "New _Task"
-#~ msgstr "Uusi tehtävä"
-
-#, fuzzy
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "Luo uusi tapaaminen"
-
-#, fuzzy
-#~ msgid "_Other"
-#~ msgstr "Muut"
-
-#, fuzzy
-#~ msgid "_Delete this Task"
-#~ msgstr "Poista tämä tehtävä"
-
-#~ msgid "Failed to send username to server"
-#~ msgstr "Käyttäjätunnuksen lähetys palvelimelle epäonnistui"
-
-#~ msgid "Could not get group list from server."
-#~ msgstr "Ei saatu ryhmäluetteloa palvelimelta."
-
-#~ msgid "Could not check POP server for new messages: %s"
-#~ msgstr "Uusien viestien haku POP-palvelimelta epäonnistui: %s"
-
-#~ msgid "Could not fetch message: %s"
-#~ msgstr "Viestin hakeminen epäonnistui: %s"
-
-#~ msgid "Could not retrieve message from POP server %s: %s"
-#~ msgstr "Viestiä ei saatu POP-palvelimelta %s: %s"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(tuntematon)"
-
-#~ msgid "Cannot send message: sender address not defined."
-#~ msgstr "Viestiä ei voida lähettää: lähettäjän osoitetta ei ole määritelty."
-
-#~ msgid "Message was received"
-#~ msgstr "Viesti vastaanotettu"
-
-#~ msgid "Message was sent"
-#~ msgstr "Viesti lähetetty"
-
-#, fuzzy
-#~ msgid "New _Mail Message"
-#~ msgstr "Seuraava viesti"
-
-#, fuzzy
-#~ msgid "%s: Inbox"
-#~ msgstr "Saapuneet"
-
-#~ msgid "Composer"
-#~ msgstr "Muokkain"
-
-#~ msgid "Edit..."
-#~ msgstr "Muokkaa..."
-
-#~ msgid "_Email Address:"
-#~ msgstr "Sähköpostiosoit_e:"
-
-#~ msgid "_Organization:"
-#~ msgstr "_Organisaatio:"
-
-#~ msgid "_Send mail in HTML format by default."
-#~ msgstr "Lähetä sähköpostit oletuksena _HTML-muodossa."
-
-#, fuzzy
-#~ msgid "_Server Type: "
-#~ msgstr "Palvelintyyppi: "
-
-#~ msgid "_Signature file:"
-#~ msgstr "Allekirjoitu_stiedosto:"
-
-#~ msgid "seconds."
-#~ msgstr "sekuntia."
-
-#~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
-#~ msgstr "<dd><b>Säätietopalvelimeen ei saatu yhteyttä</b></dd>"
-
-#, fuzzy
-#~ msgid "All _folders:"
-#~ msgstr "Paikalliset kansiot"
-
-#, fuzzy
-#~ msgid "_Display folders:"
-#~ msgstr "Näytä toinen kansio"
-
-#~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-#~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
-
-#~ msgid "(No name)"
-#~ msgstr "(Ei nimeä)"
-
-#, fuzzy
-#~ msgid "Create a New All Day _Event"
-#~ msgstr "Luo uusi koko päivän _tapahtuma"
-
-#, fuzzy
-#~ msgid "Create a New _Task"
-#~ msgstr "Luo uusi tehtävä"
-
-#~ msgid "Create a _New Appointment"
-#~ msgstr "Luo uusi t_apaaminen"
-
-#~ msgid "Create an event for the whole day"
-#~ msgstr "Luo uusi koko päivän tapahtuma"
-
-#~ msgid "_Appointment..."
-#~ msgstr "T_apaaminen..."
-
-#~ msgid "_Calendar Settings..."
-#~ msgstr "_Kalenterin asetukset..."
-
-#, fuzzy
-#~ msgid "_Task..."
-#~ msgstr "_Tehtävä"
-
-#, fuzzy
-#~ msgid "Tasks Settings..."
-#~ msgstr "Tehtävän asetukset"
-
-#, fuzzy
-#~ msgid "Change the settings for the summary"
-#~ msgstr "Muuta tämän kansion nimeä"
-
-#, fuzzy
-#~ msgid "_Summary Settings..."
-#~ msgstr "_Sähköpostiasetukset..."
-
-#~ msgid "Sear_ch"
-#~ msgstr "_Etsi"
-
-#~ msgid "I couldn't remove the item from your calendar file!\n"
-#~ msgstr "En pystynyt poistamaan kohtaa kalenteritiedostostasi!\n"
-
-#, fuzzy
-#~ msgid "%s at an unknown time"
-#~ msgstr "Tuntematon virhe"
-
-#~ msgid "_Confidential"
-#~ msgstr "_Luottamuksellinen"
-
-#, fuzzy
-#~ msgid "Summarising folder"
-#~ msgstr "Synkronoidaan kansiota"
-
-#, fuzzy
-#~ msgid "Could not open folder: %s: summarising from position %ld: %s"
-#~ msgstr "Hakemistoa %s ei voitu uudelleennimetä seuraavaksi: %s: %s"
-
-#~ msgid "Encrypted message not displayed"
-#~ msgstr "Salattua viestiä ei näytetä"
-
-#~ msgid "Encrypted message"
-#~ msgstr "Salattu viesti"
-
-#~ msgid "Click icon to decrypt."
-#~ msgstr "Napsauta kuvaketta salauksen purkamiseksi."
-
-#, fuzzy
-#~ msgid "Cannot copy a folder `%s' to itself"
-#~ msgstr "Kansion hakeminen ei onnistu: %s: %s"
-
-#, fuzzy
-#~ msgid "Folder cannot contain the directory separator."
-#~ msgstr "Välimuistihakemistoa ei voitu avata: %s"
-
-#, fuzzy
-#~ msgid "%s - Ximian Evolution %s"
-#~ msgstr "%s - Evolution %s"
-
-#, fuzzy
-#~ msgid "%s - Ximian Evolution %s [%s]"
-#~ msgstr "%s - Evolution %s [%s]"
author	Sami Pesonen <spesonen@src.gnome.org>	2003-03-03 02:55:26 +0800
committer	Sami Pesonen <spesonen@src.gnome.org>	2003-03-03 02:55:26 +0800
commit	9bcc86b12edbc01f776439b5dc604c04158f727c (patch)
tree	a3f8e897c8d0acfbfa780f85653d6dbc6708eec1
parent	5b3f48071d4c5937c39ef7f8c544c16d0d3446f7 (diff)
download	gsoc2013-evolution-9bcc86b12edbc01f776439b5dc604c04158f727c.tar.gz gsoc2013-evolution-9bcc86b12edbc01f776439b5dc604c04158f727c.tar.zst gsoc2013-evolution-9bcc86b12edbc01f776439b5dc604c04158f727c.zip