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

svn path=/trunk/; revision=20688
author: Sami Pesonen <spesonen@src.gnome.org> 2003-04-07 02:15:01 +0800
committer: Sami Pesonen <spesonen@src.gnome.org> 2003-04-07 02:15:01 +0800
commit: 09e4c2360ab1f2974909a5f371f6ae4c6bf4acdc (patch)
tree: e86c9d17a960871c2b12856cc46e6a25169e749a /po
parent: 15622917811ca7353e6513fe10807a0b6e413a83 (diff)
download: gsoc2013-evolution-09e4c2360ab1f2974909a5f371f6ae4c6bf4acdc.tar
gsoc2013-evolution-09e4c2360ab1f2974909a5f371f6ae4c6bf4acdc.tar.gz
gsoc2013-evolution-09e4c2360ab1f2974909a5f371f6ae4c6bf4acdc.tar.bz2
gsoc2013-evolution-09e4c2360ab1f2974909a5f371f6ae4c6bf4acdc.tar.lz
gsoc2013-evolution-09e4c2360ab1f2974909a5f371f6ae4c6bf4acdc.tar.xz
gsoc2013-evolution-09e4c2360ab1f2974909a5f371f6ae4c6bf4acdc.tar.zst
gsoc2013-evolution-09e4c2360ab1f2974909a5f371f6ae4c6bf4acdc.zip
2 files changed, 2103 insertions, 2213 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 0c49cc3184..ec267867a7 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-06  Sami Pesonen <sampeson@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
 2003-04-06  Marco Ciampa  <ciampix@libero.it>
 
 	* it.po: Updated italian translation.
diff --git a/po/fi.po b/po/fi.po
index 1f133fcaac..3a337b7bd5 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2003-03-02 20:51+0200\n"
-"PO-Revision-Date: 2003-03-02 20:48+0200\n"
+"POT-Creation-Date: 2003-04-06 21:09+0300\n"
+"PO-Revision-Date: 2003-04-06 20:59+0300\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"
@@ -31,13 +31,14 @@ msgid "Imports VCard files into Evolution."
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/backend/ebook/e-card.c:1297
+#: addressbook/backend/ebook/e-card.c:1301
 #: 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/backend/ebook/e-card.c:1315
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
@@ -45,13 +46,13 @@ msgid "Name"
 msgstr "Nimi"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/backend/ebook/e-card.c:1338
+#: addressbook/backend/ebook/e-card.c:1342
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Sähköposti"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1764
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr "Ensisijainen"
 
@@ -61,8 +62,8 @@ msgstr "Ensisij"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/backend/ebook/e-card.c:1400
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/backend/ebook/e-card.c:1404
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr ""
@@ -70,8 +71,8 @@ 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:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/contact-editor/e-contact-editor.c:1821
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
 msgid "Business"
 msgstr "Työ"
 
@@ -81,12 +82,12 @@ msgid "Bus"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr "Yritys"
 
@@ -97,13 +98,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:1756
-#: addressbook/gui/contact-editor/e-contact-editor.c:1822
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Home"
 msgstr "Koti"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/backend/ebook/e-card.c:1358
+#: addressbook/backend/ebook/e-card.c:1362
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organisaatio"
@@ -114,18 +115,18 @@ 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:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Mobile"
 msgstr "Matkapuhelin"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 msgid "Car"
 msgstr "Auto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Työ/faksi"
@@ -135,13 +136,13 @@ msgid "Bus Fax"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: 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:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr "Työ 2"
 
@@ -150,43 +151,43 @@ msgid "Bus 2"
 msgstr "Työ 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Home 2"
 msgstr "Koti 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: 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:1761
-#: addressbook/gui/contact-editor/e-contact-editor.c:1823
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
 msgid "Other"
 msgstr "Muut"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1762
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: 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:1763
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 #: 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:1765
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 #: 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:1766
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr ""
@@ -198,14 +199,14 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:482
-#: addressbook/gui/contact-editor/e-contact-editor.c:1794
+#: addressbook/gui/contact-editor/e-contact-editor.c:1778
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "Sähköposti 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:492
-#: addressbook/gui/contact-editor/e-contact-editor.c:1795
+#: addressbook/gui/contact-editor/e-contact-editor.c:1779
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "Sähköposti 3"
@@ -229,7 +230,7 @@ msgid "Dep"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/backend/ebook/e-card.c:1372
+#: addressbook/backend/ebook/e-card.c:1376
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Asema"
@@ -239,7 +240,7 @@ msgid "Off"
 msgstr "Asm"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/backend/ebook/e-card.c:1379
+#: addressbook/backend/ebook/e-card.c:1383
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr ""
@@ -254,7 +255,7 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/backend/ebook/e-card.c:1393
+#: addressbook/backend/ebook/e-card.c:1397
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr ""
@@ -268,7 +269,7 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/backend/ebook/e-card.c:1407
+#: addressbook/backend/ebook/e-card.c:1411
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Kutsumanimi"
@@ -278,19 +279,19 @@ msgid "Nick"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/backend/ebook/e-card.c:1414
+#: addressbook/backend/ebook/e-card.c:1418
 #: 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/backend/ebook/e-card.c:1459
 #: 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
+#: addressbook/backend/ebook/e-card.c:1438
 msgid "Calendar URI"
 msgstr ""
 
@@ -308,136 +309,149 @@ msgid "FBUrl"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:100
-#: addressbook/backend/ebook/e-card.c:1421
-msgid "Anniversary"
+msgid "Default server calendar"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:100
-msgid "Anniv"
+#, fuzzy
+msgid "icsCalendar"
+msgstr "Kalenteri"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
+msgid "Anniversary"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:101
+msgid "Anniv"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr "Syntymäpäivä"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
-#: addressbook/backend/ebook/e-card.c:1462
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1473
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Ryhmät"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Sukunimi"
 
-#: addressbook/backend/ebook/e-card-simple.c:334
+#: addressbook/backend/ebook/e-card-simple.c:335
 #, fuzzy
 msgid "ECard"
 msgstr "Auto"
 
-#: addressbook/backend/ebook/e-card-simple.c:829
+#: addressbook/backend/ebook/e-card-simple.c:832
 #, c-format
 msgid "%x"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:890
+#: addressbook/backend/ebook/e-card-simple.c:893
 #: addressbook/backend/ebook/e-destination.c:706
 #, fuzzy
 msgid "Unnamed List"
 msgstr "Nimetön kontaktiluettelo"
 
-#: addressbook/backend/ebook/e-card.c:1304
+#: addressbook/backend/ebook/e-card.c:1308
 #: 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/backend/ebook/e-card.c:1321
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
 msgid "Address"
 msgstr "Osoite"
 
-#: addressbook/backend/ebook/e-card.c:1324
+#: addressbook/backend/ebook/e-card.c:1328
 msgid "Address Label"
 msgstr "Osoitteen nimike"
 
-#: addressbook/backend/ebook/e-card.c:1331
+#: addressbook/backend/ebook/e-card.c:1335
 #, fuzzy
 msgid "Phone"
 msgstr "Määrittelemätön"
 
-#: addressbook/backend/ebook/e-card.c:1345
+#: addressbook/backend/ebook/e-card.c:1349
 msgid "Birth date"
 msgstr "Syntymäpäivä"
 
-#: addressbook/backend/ebook/e-card.c:1351
+#: addressbook/backend/ebook/e-card.c:1355
 #: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL:"
 
-#: addressbook/backend/ebook/e-card.c:1365
+#: addressbook/backend/ebook/e-card.c:1369
 #, fuzzy
 msgid "Organizational Unit"
 msgstr "Organisaatio"
 
-#: addressbook/backend/ebook/e-card.c:1386
+#: addressbook/backend/ebook/e-card.c:1390
 #: 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
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
 #, fuzzy
 msgid "Mailer"
 msgstr "_Matkapuhelin"
 
-#: addressbook/backend/ebook/e-card.c:1441
+#: addressbook/backend/ebook/e-card.c:1445
 #, fuzzy
 msgid "Free/Busy URL"
 msgstr "Edellinen viesti"
 
-#: addressbook/backend/ebook/e-card.c:1455
+#: addressbook/backend/ebook/e-card.c:1452
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Kalenteri"
+
+#: addressbook/backend/ebook/e-card.c:1466
 msgid "Related Contacts"
 msgstr "Asiaan liittyvät yhteystiedot"
 
-#: addressbook/backend/ebook/e-card.c:1469
-#, fuzzy
+#: addressbook/backend/ebook/e-card.c:1480
 msgid "Category List"
-msgstr "Ryhmät"
+msgstr "Ryhmäluettelo"
 
-#: addressbook/backend/ebook/e-card.c:1476
+#: addressbook/backend/ebook/e-card.c:1487
 msgid "Wants HTML"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1483
+#: addressbook/backend/ebook/e-card.c:1494
 msgid "Wants HTML set"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1490
+#: addressbook/backend/ebook/e-card.c:1501
 #, fuzzy
 msgid "List"
 msgstr "Pakistan"
 
-#: addressbook/backend/ebook/e-card.c:1497
+#: addressbook/backend/ebook/e-card.c:1508
 #, fuzzy
 msgid "List Show Addresses"
 msgstr "Muu osoite"
 
-#: addressbook/backend/ebook/e-card.c:1504
+#: addressbook/backend/ebook/e-card.c:1515
 msgid "Arbitrary"
 msgstr "Arbitrary"
 
-#: addressbook/backend/ebook/e-card.c:1511
+#: addressbook/backend/ebook/e-card.c:1522
 #, fuzzy
 msgid "ID"
 msgstr "I"
 
-#: addressbook/backend/ebook/e-card.c:1518
+#: addressbook/backend/ebook/e-card.c:1529
 #, fuzzy
 msgid "Last Use"
 msgstr "Liitä"
 
-#: addressbook/backend/ebook/e-card.c:1529
+#: addressbook/backend/ebook/e-card.c:1540
 #, fuzzy
 msgid "Use Score"
 msgstr "Peruuta"
@@ -449,7 +463,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Bonobon alustus ei onnistunut"
 
 #: addressbook/backend/pas/pas-backend-file.c:465
-#: addressbook/backend/pas/pas-backend-ldap.c:3045
+#: addressbook/backend/pas/pas-backend-ldap.c:3046
 msgid "Searching..."
 msgstr "Etsitään..."
 
@@ -457,69 +471,69 @@ msgstr "Etsitään..."
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:597
+#: addressbook/backend/pas/pas-backend-ldap.c:598
 msgid "Using Distinguished Name (DN)"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:601
+#: addressbook/backend/pas/pas-backend-ldap.c:602
 #, fuzzy
 msgid "Using Email Address"
 msgstr "_Tämä on postitusosoite"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:747
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Odotetaan yhteyttä LDAP-palvelimeen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1290
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1401
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1637
-#: addressbook/backend/pas/pas-backend-ldap.c:1640
+#: addressbook/backend/pas/pas-backend-ldap.c:1638
+#: addressbook/backend/pas/pas-backend-ldap.c:1641
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2956
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:3065
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 #, fuzzy
 msgid "Error performing search"
 msgstr "Virhe kortin poistossa"
 
-#: addressbook/conduit/address-conduit.c:292
+#: addressbook/conduit/address-conduit.c:296
 #, fuzzy
 msgid "Default Sync Address:"
 msgstr "Sähköpostiosoite:"
 
-#: addressbook/conduit/address-conduit.c:535
+#: addressbook/conduit/address-conduit.c:539
 msgid "Cursor could not be loaded\n"
 msgstr "Kohdistimen lataaminen epäonnistui\n"
 
-#: addressbook/conduit/address-conduit.c:548
+#: addressbook/conduit/address-conduit.c:552
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1267
-#: calendar/conduits/todo/todo-conduit.c:877
+#: addressbook/conduit/address-conduit.c:1378
+#: calendar/conduits/calendar/calendar-conduit.c:1344
+#: calendar/conduits/todo/todo-conduit.c:886
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1268
-#: calendar/conduits/todo/todo-conduit.c:878
+#: addressbook/conduit/address-conduit.c:1379
+#: calendar/conduits/calendar/calendar-conduit.c:1345
+#: calendar/conduits/todo/todo-conduit.c:887
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1385
-#: addressbook/conduit/address-conduit.c:1388
+#: addressbook/conduit/address-conduit.c:1409
+#: addressbook/conduit/address-conduit.c:1412
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -564,10 +578,10 @@ msgid "Factory for the controls exported by the Evolution Addressbook"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:612
+#: addressbook/gui/component/addressbook-component.c:605
 #: 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
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
 #: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
 msgid "Contacts"
 msgstr "Yhteystiedot"
@@ -592,27 +606,27 @@ msgstr "Julkiset yhteystiedot"
 msgid "Public folder containing contact information"
 msgstr "Yhteystietoja sisältävä julkinen kansio"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Uusi yhteystieto"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "_Yhteystieto"
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Create a new contact"
 msgstr "Luo uusi yhteystieto"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Uusi yhteystietoluettelo"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "_Yhteystietoluettelo"
 
-#: addressbook/gui/component/addressbook-component.c:576
+#: addressbook/gui/component/addressbook-component.c:569
 msgid "Create a new contact list"
 msgstr "Luo uusi yhteystietoluettelo"
 
@@ -634,27 +648,27 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1191
+#: addressbook/gui/component/addressbook-config.c:1193
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1213
+#: addressbook/gui/component/addressbook-config.c:1215
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1221
+#: addressbook/gui/component/addressbook-config.c:1223
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1647
+#: addressbook/gui/component/addressbook-config.c:1637
 msgid "Account Name"
 msgstr "Tilin nimi"
 
-#: addressbook/gui/component/addressbook-config.c:1649
+#: addressbook/gui/component/addressbook-config.c:1639
 msgid "Server Name"
 msgstr "Palvelimen nimi"
 
-#: addressbook/gui/component/addressbook-config.c:1686
+#: addressbook/gui/component/addressbook-config.c:1676
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
@@ -764,7 +778,7 @@ msgstr ""
 
 #. All, unmatched, separator
 #: addressbook/gui/component/addressbook.c:1089
-#: calendar/gui/cal-search-bar.c:352
+#: calendar/gui/cal-search-bar.c:354
 msgid "Any Category"
 msgstr ""
 
@@ -783,7 +797,7 @@ msgstr "(ei nimeä)"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
 msgid "Primary Email"
 msgstr "Ensisijainen sähköposti"
 
@@ -791,33 +805,32 @@ msgstr "Ensisijainen sähköposti"
 msgid "Select an Action"
 msgstr "Valitse toiminto"
 
-#: addressbook/gui/component/e-address-popup.c:615
+#: addressbook/gui/component/e-address-popup.c:616
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Luo uusi yhteystieto \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:630
+#: addressbook/gui/component/e-address-popup.c:632
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Lisää osoite olemassaolevaan yhteystietoon \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:911
+#: addressbook/gui/component/e-address-popup.c:908
 msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:995
+#: addressbook/gui/component/e-address-popup.c:992
 #: 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:1025
+#: addressbook/gui/component/e-address-popup.c:1022
 #: addressbook/gui/component/e-address-widget.c:428
-#: addressbook/gui/component/select-names/e-select-names-popup.c:479
+#: addressbook/gui/component/select-names/e-select-names-popup.c:429
 msgid "Add to Contacts"
 msgstr "Lisää yhteystietoihin"
 
-#: addressbook/gui/component/e-address-popup.c:1068
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr ""
 
@@ -844,73 +857,55 @@ msgstr " Tar_kista tuetut kannat "
 #: 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
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:1 mail/mail-config.glade.h:6
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "*"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:5
-msgid "1234"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "1:00"
 msgstr "1:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:9
-msgid "380"
-msgstr "380"
-
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "666"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:14
-msgid "<- _Remove"
-msgstr "<- _Poista"
-
-#: addressbook/gui/component/ldap-config.glade.h:15
-msgid "<< Fewer Options"
-msgstr "<< Vähemmän vaihtoehtoja"
-
-#: addressbook/gui/component/ldap-config.glade.h:16
-msgid "Add (or Edit) Attribute Mappings"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "Add LDAP Server"
+msgstr "Lisää LDAP-palvelin"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
 msgstr "Osoitekirjalähteet"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:62
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
 #: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Aina"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Anonymously"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
 "Congratulations, you are finished setting up this LDAP server. You\n"
 "are now ready to access this directory.\n"
@@ -919,63 +914,59 @@ msgid ""
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Connecting"
 msgstr "Hakuasetukset"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
-msgid "DN Customization"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "_Poista"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
+msgid "Edit LDAP Server"
+msgstr "LDAP-palvelin"
+
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Email Address:"
 msgstr "Sähköpostiosoite:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Finished"
 msgstr "Etsi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "General"
 msgstr "Yleiset"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "LDAP Configuration Assistant"
 msgstr "Palvelimen asetukset"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-#, fuzzy
-msgid "Mappings"
-msgstr "Reunukset"
-
-#: addressbook/gui/component/ldap-config.glade.h:35 mail/mail-account-gui.c:64
+#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
 #: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Never"
 msgstr "Joka"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -985,62 +976,36 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Objectclasses"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:40
-msgid "Objectclasses Used in Evolution:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:41
-msgid "Objectclasses Used on Server:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr ""
 
-#: 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:45
-msgid "R_estore Defaults"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:46
-msgid "Re_store Defaults"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:34
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "_Etsi viestiä"
 
 #. No time range is set, so don't start a query
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:35
+#: calendar/gui/calendar-model.c:1975 calendar/gui/e-day-view.c:1683
+#: calendar/gui/e-week-view.c:1229
 #, fuzzy
 msgid "Searching"
 msgstr "Etsitään..."
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Selected:"
 msgstr "Poistettu"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:37
 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:52
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -1051,7 +1016,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -1060,46 +1025,46 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:46
 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:61
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Lähteen tiedot"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Yhdistetään LDAP-palvelimeen..."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1107,7 +1072,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1116,7 +1081,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1124,7 +1089,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1134,7 +1099,7 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1144,27 +1109,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:73
 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:88
+#: addressbook/gui/component/ldap-config.glade.h:75
 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:89
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1173,7 +1138,7 @@ msgid ""
 msgstr ""
 "Tätä nimeä käytetään tilisi tunnistamiseksi. Se on vain sinua itseäsi varten"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1181,87 +1146,46 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: 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"
-"Any values that you add to the DN will become required values for any new "
-"contacts\n"
-"that you add to the directory on the LDAP server. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:84
 #, fuzzy
 msgid "Using email address"
 msgstr "_Tämä on postitusosoite"
 
-#: addressbook/gui/component/ldap-config.glade.h:101
-#: mail/mail-account-gui.c:63 mail/mail-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:85 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:86
 #: 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
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Lisää"
 
-#: addressbook/gui/component/ldap-config.glade.h:103
-#, fuzzy
-msgid "_Add ->"
-msgstr "_Lisää"
-
-#: addressbook/gui/component/ldap-config.glade.h:104
-#, fuzzy
-msgid "_Add Mapping"
-msgstr "Lisää toiminto"
-
-#: addressbook/gui/component/ldap-config.glade.h:105
-#, fuzzy
-msgid "_Add to DN"
-msgstr "Lisää toiminto"
-
-#: addressbook/gui/component/ldap-config.glade.h:106
-msgid "_Always"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:107
-#, fuzzy
-msgid "_Delete Mapping"
-msgstr "_Poista kaikki"
-
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Päivä"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
-msgid "_Distinguished Name (DN):"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-msgid "_Don't use SSL/TLS"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:112 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:89 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
@@ -1271,101 +1195,44 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
-#, fuzzy
-msgid "_Edit Mapping"
-msgstr "_Muokkaa tapaamista"
-
-#: addressbook/gui/component/ldap-config.glade.h:114
-#, fuzzy
-msgid "_Evolution attribute:"
-msgstr "Evolution"
-
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_If necessary "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:116
-msgid "_LDAP attribute:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:117
-msgid "_LDAP attributes:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:119
-#, fuzzy
-msgid "_More Options >>"
-msgstr "_Asetukset"
-
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:91
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Portti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_Restore Defaults"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Etsi"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "Palvelimen _nimi: "
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:125
-#, fuzzy
-msgid "account-druid"
-msgstr "Tili"
-
-#: addressbook/gui/component/ldap-config.glade.h:126
-#, fuzzy
-msgid "account-editor"
-msgstr "kontaktinhallinta"
-
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "cards"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Hakuasetukset"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
-msgid "dn-customization-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:130
-msgid "edit_server_window_simple"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:97
 #, fuzzy
 msgid "general-tab"
 msgstr "Yleiset"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
-msgid "mappings-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:133
-msgid "objectclasses-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:98
 #, fuzzy
 msgid "searching-tab"
 msgstr "Etsitään..."
@@ -1378,49 +1245,56 @@ msgstr ""
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:201
+msgid "Remove All"
+msgstr "Poista kaikki"
+
 #. Fixme: Ditto
-#: 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
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+#: addressbook/gui/component/select-names/e-select-names.c:693
+#: composer/e-msg-composer-attachment-bar.c:502
 #: my-evolution/e-summary-shown.c:536
 msgid "Remove"
 msgstr "Poista"
 
-#: 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:215
+#: addressbook/gui/component/select-names/e-select-names-popup.c:352
+#, fuzzy
+msgid "View Contact List"
+msgstr "Uusi yhteystietoluettelo"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:201
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#, fuzzy
+msgid "View Contact Info"
+msgstr "Uusi yhteystieto"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "Send HTML Mail?"
 msgstr "Lähetä HTML-postia?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:399
-msgid "Edit Contact List"
-msgstr "Muokkaa yhteystietoluetteloa"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:417
+#: addressbook/gui/component/select-names/e-select-names-popup.c:370
 msgid "Unnamed Contact List"
 msgstr "Nimetön yhteystietoluettelo"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:434
+#: addressbook/gui/component/select-names/e-select-names-popup.c:387
 #, c-format
 msgid "(%d not shown)"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:500
+#: addressbook/gui/component/select-names/e-select-names-popup.c:450
 msgid "Unnamed Contact"
 msgstr "Nimetön yhteystieto"
 
-#: addressbook/gui/component/select-names/e-select-names-table-model.c:349
+#: addressbook/gui/component/select-names/e-select-names-table-model.c:354
 #: 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:495
+#: addressbook/gui/component/select-names/e-select-names.c:506
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:555
+#: addressbook/gui/component/select-names/e-select-names.c:649
 msgid "Find contact in"
 msgstr "Etsi yhteystieto"
 
@@ -1472,7 +1346,7 @@ msgid "Birthda_y:"
 msgstr "_Syntymäpäivä:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ry_hmät..."
@@ -1483,7 +1357,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1343
+#: addressbook/gui/contact-editor/e-contact-editor.c:1335
 msgid "Contact Editor"
 msgstr "Yhteystiedonhallinta"
 
@@ -1493,7 +1367,7 @@ msgid "D_epartment:"
 msgstr "_Osasto:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:195
+#: calendar/gui/dialogs/task-editor.c:196
 msgid "Details"
 msgstr "Yksityiskohtaiset"
 
@@ -1549,14 +1423,14 @@ msgid "Wants to receive _HTML mail"
 msgstr "Haluaa sähköpostit HTML-muodossa"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: 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
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:700 calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3575
+#: filter/filter.glade.h:15 mail/folder-browser.c:1783
 #: 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
+#: ui/evolution.xml.h:46
 msgid "_Delete"
 msgstr "_Poista"
 
@@ -1586,14 +1460,14 @@ msgstr "_Kotisivun osoite:"
 
 #: 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-editor/e-contact-editor.c:184
 #: 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
+#: addressbook/gui/widgets/e-minicard.c:183
 #, fuzzy
 msgid "Editable"
 msgstr "Käytä"
@@ -2622,53 +2496,50 @@ msgstr ""
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:159
+#: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: 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"
+msgstr "Kirja"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:166
+#: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: 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
+#: addressbook/gui/widgets/e-minicard.c:190
 msgid "Card"
-msgstr "Auto"
+msgstr "Kortti"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:173
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
 #, fuzzy
 msgid "Is New Card"
 msgstr "Uusi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Älä salli kyselyjä"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
 msgid "Changed"
-msgstr "Tsad"
+msgstr "Muutettu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:836
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:844
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
 msgid "This contact belongs to these categories:"
 msgstr "Tämä yhteystieto kuuluu näihin ryhmiin:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1018
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 msgid "Save Contact as VCard"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1064
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2676,7 +2547,7 @@ msgstr ""
 "Haluatko varmasti\n"
 "poistaa nämä yhteystiedot?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1067
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2684,11 +2555,11 @@ msgstr ""
 "Haluatko varmasti\n"
 "poistaa tämän yhteystiedon?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1767
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2371
+#: addressbook/gui/contact-editor/e-contact-editor.c:2362
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -2831,28 +2702,28 @@ msgstr ""
 msgid "_Title:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "List _name:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "Members"
 msgstr "Jäsenet"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 #: 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:9
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "contact-list-editor"
 msgstr "yhteystiedonhallinta"
 
@@ -2915,8 +2786,9 @@ msgid ""
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
+#. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:117
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
@@ -2952,132 +2824,132 @@ msgstr "Virhe %s:n käynnistyksessä"
 msgid "Model"
 msgstr "Matkapuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:143
-#: addressbook/gui/widgets/e-addressbook-util.c:104
-#: addressbook/gui/widgets/e-minicard.c:515
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
+#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-minicard.c:536
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1160
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1163
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:309
 #: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:522 shell/e-shell.c:2102
-#: shell/e-storage.c:606 shell/evolution-shell-component.c:1199
+#: camel/providers/pop3/camel-pop3-store.c:522 shell/e-shell.c:2072
+#: shell/e-storage.c:602 shell/evolution-shell-component.c:1202
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:592
-#: shell/evolution-shell-component.c:1190
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
+#: shell/evolution-shell-component.c:1193
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 #: 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: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/camel-service.c:849 camel/camel-service.c:892
 #: 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
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr "Todennus epäonnistui"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr "Todennus vaaditaan"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Addressbook does not exist"
 msgstr "Osoitekirjaa ei ole olemassa"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Muu virhe"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:74
-#: calendar/gui/dialogs/save-comp.c:49
+#: addressbook/gui/widgets/e-addressbook-util.c:75
+#: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Haluatko tallentaa muutokset?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:77
 #, fuzzy
 msgid "_Discard"
 msgstr "Tulosta kortti"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-util.c:271
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr "Virhe kortin lisäämisessä"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:104
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:114
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:114
-#: addressbook/gui/widgets/e-addressbook-util.c:229
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "Virhe kortin poistossa"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:196
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, 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:327
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 #, fuzzy
 msgid "Move card to"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:329
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 #, fuzzy
 msgid "Copy card to"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:332
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 #, fuzzy
 msgid "Move cards to"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:334
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Ei kortteja"
@@ -3100,13 +2972,13 @@ 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
+#: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Osoitekirja"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:674
 #: addressbook/gui/widgets/e-addressbook-view.c:884
-#: addressbook/gui/widgets/e-addressbook-view.c:1863
+#: addressbook/gui/widgets/e-addressbook-view.c:1859
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
@@ -3188,15 +3060,15 @@ msgstr "Kopioi"
 msgid "Paste"
 msgstr "Liitä"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900 filter/libfilter-i18n.h:10
-#: mail/mail-accounts.c:225 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:900 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:234 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:904
-#: calendar/gui/e-day-view.c:3674 calendar/gui/e-week-view.c:3504
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3540
 #, fuzzy
 msgid "Current View"
 msgstr "_Nykyinen näkymä"
@@ -3217,7 +3089,7 @@ msgstr ""
 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:1343
+#: addressbook/gui/widgets/e-addressbook-view.c:1339
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3299,19 +3171,19 @@ msgid "Save in addressbook"
 msgstr "Tallenna osoitekirjaan"
 
 #: addressbook/gui/widgets/e-minicard-label.c:102
-#: addressbook/gui/widgets/e-minicard.c:142
+#: addressbook/gui/widgets/e-minicard.c:146
 #, fuzzy
 msgid "Width"
 msgstr "Leveys:"
 
 #: addressbook/gui/widgets/e-minicard-label.c:109
-#: addressbook/gui/widgets/e-minicard.c:149
+#: addressbook/gui/widgets/e-minicard.c:153
 #, fuzzy
 msgid "Height"
 msgstr "Korkeus:"
 
 #: addressbook/gui/widgets/e-minicard-label.c:116
-#: addressbook/gui/widgets/e-minicard.c:157
+#: addressbook/gui/widgets/e-minicard.c:161
 msgid "Has Focus"
 msgstr ""
 
@@ -3358,12 +3230,12 @@ msgstr ""
 msgid "Adapter"
 msgstr "Sovitin"
 
-#: addressbook/gui/widgets/e-minicard.c:165
+#: addressbook/gui/widgets/e-minicard.c:169
 #, fuzzy
 msgid "Selected"
 msgstr "Poistettu"
 
-#: addressbook/gui/widgets/e-minicard.c:172
+#: addressbook/gui/widgets/e-minicard.c:176
 msgid "Has Cursor"
 msgstr ""
 
@@ -3559,181 +3431,181 @@ msgstr "Leveys:"
 msgid "_Font..."
 msgstr "_Kirjasin..."
 
-#: calendar/cal-util/cal-component.c:1216
+#: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr ""
 
-#: calendar/cal-util/cal-recur.c:3983 calendar/gui/print.c:478
+#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:478
 msgid "1st"
 msgstr "1."
 
-#: calendar/cal-util/cal-recur.c:3984 calendar/gui/print.c:478
+#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:478
 msgid "2nd"
 msgstr "2."
 
-#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:478
+#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:478
 msgid "3rd"
 msgstr "3."
 
-#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:478
+#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:478
 msgid "4th"
 msgstr "4."
 
-#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:478
+#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:478
 msgid "5th"
 msgstr "5."
 
-#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:479
 msgid "6th"
 msgstr "6."
 
-#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:479
 msgid "7th"
 msgstr "7."
 
-#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:479
 msgid "8th"
 msgstr "8."
 
-#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:479
 msgid "9th"
 msgstr "9."
 
-#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:479
 msgid "10th"
 msgstr "10."
 
-#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:480
 msgid "11th"
 msgstr "11."
 
-#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:480
 msgid "12th"
 msgstr "12."
 
-#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:480
 msgid "13th"
 msgstr "13."
 
-#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:480
 msgid "14th"
 msgstr "14."
 
-#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:480
 msgid "15th"
 msgstr "15."
 
-#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:481
 msgid "16th"
 msgstr "16."
 
-#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:481
 msgid "17th"
 msgstr "17."
 
-#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:481
 msgid "18th"
 msgstr "18."
 
-#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:481
 msgid "19th"
 msgstr "19."
 
-#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:481
 msgid "20th"
 msgstr "20."
 
-#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:482
 msgid "21st"
 msgstr "21."
 
-#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:482
 msgid "22nd"
 msgstr "22."
 
-#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:482
 msgid "23rd"
 msgstr "23."
 
-#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:482
 msgid "24th"
 msgstr "24."
 
-#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:482
 msgid "25th"
 msgstr "25."
 
-#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:483
+#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:483
 msgid "26th"
 msgstr "26."
 
-#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:483
+#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:483
 msgid "27th"
 msgstr "27."
 
-#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:483
+#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:483
 msgid "28th"
 msgstr "28."
 
-#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:483
+#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:483
 msgid "29th"
 msgstr "29."
 
-#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:483
+#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:483
 msgid "30th"
 msgstr "30."
 
-#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:484
+#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:484
 msgid "31st"
 msgstr "31."
 
-#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
+#: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-calendar-table.c:393 mail/message-list.c:752
 msgid "High"
 msgstr "Korkea"
 
-#: 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/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
+#: calendar/gui/calendar-model.c:1701
+#: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
 msgid "Normal"
 msgstr "Tavallinen"
 
-#: calendar/cal-util/cal-util.c:503 calendar/cal-util/cal-util.c:525
+#: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: 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:519
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/cal-util/cal-util.c:570
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 #: calendar/gui/e-calendar-table.c:396
 msgid "Undefined"
 msgstr "Määrittelemätön"
 
-#: calendar/conduits/calendar/calendar-conduit.c:204
+#: calendar/conduits/calendar/calendar-conduit.c:208
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1214
-#: calendar/conduits/todo/todo-conduit.c:823
+#: calendar/conduits/calendar/calendar-conduit.c:1291
+#: calendar/conduits/todo/todo-conduit.c:832
 msgid "Error while communicating with calendar server"
 msgstr "Virhe kommunikoitaessa kalenteripalvelimen kanssa"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1361
-#: calendar/conduits/calendar/calendar-conduit.c:1364
+#: calendar/conduits/calendar/calendar-conduit.c:1442
+#: calendar/conduits/calendar/calendar-conduit.c:1445
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:204
+#: calendar/conduits/todo/todo-conduit.c:208
 #, fuzzy
 msgid "Default Priority:"
 msgstr "_Prioriteetti:"
 
-#: calendar/conduits/todo/todo-conduit.c:939
-#: calendar/conduits/todo/todo-conduit.c:942
+#: calendar/conduits/todo/todo-conduit.c:956
+#: calendar/conduits/todo/todo-conduit.c:959
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -3823,17 +3695,17 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "_Muokkaa tapaamista"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:680
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr ""
 
-#: 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
+#: calendar/gui/alarm-notify/alarm-queue.c:845
+#: calendar/gui/alarm-notify/alarm-queue.c:869
+#: calendar/gui/tasks-control.c:463 widgets/misc/e-messagebox.c:161
 msgid "Warning"
 msgstr "Varoitus"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:746
+#: calendar/gui/alarm-notify/alarm-queue.c:849
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3841,7 +3713,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3852,7 +3724,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:786
+#: calendar/gui/alarm-notify/alarm-queue.c:889
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Älä kysy tätä enää uudelleen"
@@ -3877,7 +3749,7 @@ msgstr "Kuvaus sisältää"
 msgid "Comment contains"
 msgstr "Kommentti sisältää"
 
-#: calendar/gui/cal-search-bar.c:356 mail/mail-ops.c:1106
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
 msgid "Unmatched"
 msgstr ""
 
@@ -3887,8 +3759,8 @@ 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: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
+#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:264
+#: calendar/gui/e-day-view.c:1393 calendar/gui/e-week-view-main-item.c:322
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3906,7 +3778,7 @@ msgstr "%d %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:432
-#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1513
+#: calendar/gui/e-week-view-main-item.c:330 calendar/gui/print.c:1513
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -3915,101 +3787,101 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-component.c:71 calendar/gui/gnome-cal.c:1341
-#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1862
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1341
+#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: 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
+#: calendar/gui/calendar-component.c:71
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:76
+#: calendar/gui/calendar-component.c:75
 #, fuzzy
 msgid "Public Calendar"
 msgstr "Tulosta kalenteri"
 
-#: calendar/gui/calendar-component.c:77
+#: calendar/gui/calendar-component.c:76
 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
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:735
+#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:518
+#: calendar/importers/icalendar-importer.c:645
+#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
+#: my-evolution/e-summary-tasks.c:328 my-evolution/e-summary-tasks.c:339
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Tehtävät"
 
-#: calendar/gui/calendar-component.c:82
+#: calendar/gui/calendar-component.c:81
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:86
+#: calendar/gui/calendar-component.c:85
 #, fuzzy
 msgid "Public Tasks"
 msgstr "Tulosta kortti"
 
-#: calendar/gui/calendar-component.c:87
+#: calendar/gui/calendar-component.c:86
 #, fuzzy
 msgid "Public folder containing to-do items"
 msgstr "Suodata postituslistan mukaan"
 
-#: calendar/gui/calendar-component.c:739
+#: calendar/gui/calendar-component.c:730
 #, fuzzy
 msgid "New appointment"
 msgstr "Uusi tapaaminen"
 
-#: calendar/gui/calendar-component.c:739
+#: calendar/gui/calendar-component.c:730
 #, fuzzy
 msgid "_Appointment"
 msgstr "Tapaaminen"
 
-#: calendar/gui/calendar-component.c:740
+#: calendar/gui/calendar-component.c:731
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/calendar-component.c:744
+#: calendar/gui/calendar-component.c:735
 #, fuzzy
 msgid "New meeting"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/calendar-component.c:744
+#: calendar/gui/calendar-component.c:735
 #, fuzzy
 msgid "_Meeting"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/calendar-component.c:745
+#: calendar/gui/calendar-component.c:736
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Luo uusi tehtävä"
 
-#: calendar/gui/calendar-component.c:749
+#: calendar/gui/calendar-component.c:740
 #, fuzzy
 msgid "New task"
 msgstr "Uusi tehtävä"
 
-#: calendar/gui/calendar-component.c:749
+#: calendar/gui/calendar-component.c:740
 msgid "_Task"
 msgstr "_Tehtävä"
 
-#: calendar/gui/calendar-component.c:750
+#: calendar/gui/calendar-component.c:741
 msgid "Create a new task"
 msgstr "Luo uusi tehtävä"
 
-#: calendar/gui/calendar-component.c:754
+#: calendar/gui/calendar-component.c:745
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Uusi tapaaminen"
 
-#: calendar/gui/calendar-component.c:754
+#: calendar/gui/calendar-component.c:745
 msgid "All _Day Appointment"
 msgstr "Koko _päivän tapaaminen"
 
-#: calendar/gui/calendar-component.c:755
+#: calendar/gui/calendar-component.c:746
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Luo uusi tapaaminen"
@@ -4052,12 +3924,12 @@ msgstr "Pe"
 
 #: 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
+#: shell/evolution-shell-component.c:1187
 msgid "Busy"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:742 calendar/gui/calendar-model.c:1170
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
 msgid "Not Started"
 msgstr ""
@@ -4070,8 +3942,8 @@ msgstr ""
 
 #: 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:468 calendar/gui/e-meeting-model.c:305
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/print.c:2316
+#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:304
+#: calendar/gui/e-meeting-model.c:327 calendar/gui/print.c:2316
 msgid "Completed"
 msgstr ""
 
@@ -4083,32 +3955,32 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: 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
+#: calendar/gui/calendar-model.c:1168 calendar/gui/dialogs/meeting-page.c:322
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2051
+#: mail/folder-browser.c:1745 mail/mail-account-gui.c:1253
+#: mail/mail-account-gui.c:1685 mail/mail-accounts.c:442
 #: mail/mail-config.glade.h:78
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:196
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: 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"
 
-#: calendar/gui/calendar-model.c:1696
+#: calendar/gui/calendar-model.c:1703
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1698
+#: calendar/gui/calendar-model.c:1705
 msgid "Assigned"
 msgstr ""
 
-#: 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/calendar-model.c:1711 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:544
 #: calendar/gui/e-meeting-model.c:838
 msgid "Yes"
 msgstr "Kyllä"
 
-#: calendar/gui/calendar-model.c:1704 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:288
 #: calendar/gui/e-meeting-model.c:839
 msgid "No"
 msgstr "Ei"
@@ -4133,16 +4005,16 @@ msgstr "Viikko"
 msgid "Month View"
 msgstr "Kuukausi"
 
-#: calendar/gui/comp-editor-factory.c:457
+#: calendar/gui/comp-editor-factory.c:456
 #, fuzzy
 msgid "Error while opening the calendar"
 msgstr "Virhe kommunikoitaessa kalenteripalvelimen kanssa"
 
-#: calendar/gui/comp-editor-factory.c:468
+#: calendar/gui/comp-editor-factory.c:467
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:474
+#: calendar/gui/comp-editor-factory.c:473
 msgid "Permission denied to open the calendar"
 msgstr ""
 
@@ -4153,44 +4025,38 @@ msgstr ""
 "Tiedoston %s poistaminen epäonnistui:\n"
 "%s"
 
-#: calendar/gui/control-factory.c:163
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "URI jonka kalenteri näyttää"
 
-#: calendar/gui/control-factory.c:170
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:358
+#: calendar/gui/dialogs/alarm-options.c:486
 msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:367
+#: calendar/gui/dialogs/alarm-options.c:495
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "Vastaanottajat"
 
-#: calendar/gui/dialogs/alarm-options.c:376
+#: calendar/gui/dialogs/alarm-options.c:504
 #, fuzzy
-msgid "Mail Alarm Options"
+msgid "Email Alarm Options"
 msgstr "Näytä asetukset"
 
-#: calendar/gui/dialogs/alarm-options.c:385
+#: calendar/gui/dialogs/alarm-options.c:513
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:394
+#: calendar/gui/dialogs/alarm-options.c:522
 msgid "Unknown Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
-msgid "Alarm Repeat"
-msgstr ""
-
 #: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid ""
-"Evolution does not yet support email notification for reminders.  You will "
-"not be able to edit the options for this reminder."
+msgid "Alarm Repeat"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.glade.h:3
@@ -4199,151 +4065,49 @@ msgid "Message to Display"
 msgstr "Viestit"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Message to Send"
+msgstr "Viestin otsikko"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 #, fuzzy
 msgid "Run program:"
 msgstr "Aja ohjelma"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+#, fuzzy
+msgid "Send To:"
+msgstr "Lähetä"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:68
-#: filter/filter.glade.h:20
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
 msgid "days"
 msgstr "päivää"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
+#: calendar/gui/dialogs/alarm-options.glade.h:11
 #, fuzzy
 msgid "extra times every"
 msgstr "Päivitä joka"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:67
-#: filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:12 filter/filter.glade.h:21
 msgid "hours"
 msgstr "tuntia"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:66
-#: filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minuutti"
 
-#: calendar/gui/dialogs/alarm-page.c:313 calendar/gui/e-alarm-list.c:393
-#, c-format
-msgid "%d days"
-msgstr "%d päivää"
-
-#: calendar/gui/dialogs/alarm-page.c:316 calendar/gui/e-alarm-list.c:396
-msgid "1 day"
-msgstr "1 päivä"
-
-#: calendar/gui/dialogs/alarm-page.c:321 calendar/gui/e-alarm-list.c:401
-#, c-format
-msgid "%d weeks"
-msgstr "%d viikkoa"
-
-#: calendar/gui/dialogs/alarm-page.c:324 calendar/gui/e-alarm-list.c:404
-msgid "1 week"
-msgstr "1 viikko"
-
-#: calendar/gui/dialogs/alarm-page.c:329 calendar/gui/e-alarm-list.c:409
-#, c-format
-msgid "%d hours"
-msgstr "%d tuntia"
-
-#: calendar/gui/dialogs/alarm-page.c:332 calendar/gui/e-alarm-list.c:412
-msgid "1 hour"
-msgstr "1 tunti"
-
-#: calendar/gui/dialogs/alarm-page.c:337 calendar/gui/e-alarm-list.c:417
-#, c-format
-msgid "%d minutes"
-msgstr "%d minuuttia"
-
-#: calendar/gui/dialogs/alarm-page.c:340 calendar/gui/e-alarm-list.c:420
-msgid "1 minute"
-msgstr "1 minuutti"
-
-#: calendar/gui/dialogs/alarm-page.c:345 calendar/gui/e-alarm-list.c:425
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekuntia"
-
-#: calendar/gui/dialogs/alarm-page.c:348 calendar/gui/e-alarm-list.c:428
-msgid "1 second"
-msgstr "1 sekunti"
-
-#: 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: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:385 calendar/gui/e-alarm-list.c:465
-msgid "Send an email"
-msgstr "Lähetä sähköpostia"
-
-#: 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:395 calendar/gui/e-alarm-list.c:475
-msgid "Unknown action to be performed"
-msgstr ""
-
-#: 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 "%s %s ennen tapaamisen alkua"
-
-#: 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 "%s %s tapaamisen alun jälkeen"
-
-#: 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 "%s tapaamisen alussa"
-
-#: 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 "%s %s ennen tapaamisen loppumista"
-
-#: 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 "%s %s tapaamisen päättymisen jälkeen"
-
-#: 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 "%s tapaamisen lopussa"
-
-#: 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:462 calendar/gui/e-alarm-list.c:542
-#, c-format
-msgid "%s for an unknown trigger type"
-msgstr ""
-
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -4355,47 +4119,65 @@ msgstr ""
 msgid "Date/Time:"
 msgstr "Päiväys & Aika"
 
+#: 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.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "Muistutukset"
 
+#: 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.glade.h:7
+#, fuzzy
+msgid "Send an Email"
+msgstr "Lähetä sähköpostia"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kuvaus:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 #, fuzzy
 msgid "_Options..."
 msgstr "_Asetukset"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr "jälkeen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr "ennen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "päivä(ä)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "tunti(a)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minuutti"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr ""
 
@@ -4445,8 +4227,8 @@ msgid "Days"
 msgstr "päivää"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:675
 msgid "Friday"
 msgstr "Perjantai"
 
@@ -4461,8 +4243,8 @@ msgid "Minutes"
 msgstr "minuutti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:671
 msgid "Monday"
 msgstr "Maanantai"
 
@@ -4472,8 +4254,8 @@ msgid "S_un"
 msgstr "Su"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1051
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:676
 msgid "Saturday"
 msgstr "Lauantai"
 
@@ -4487,8 +4269,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Näytä viikkonumerot"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1052
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:670
 msgid "Sunday"
 msgstr "Sunnuntai"
 
@@ -4507,8 +4289,8 @@ msgid "Task List"
 msgstr "Tehtävät"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:674
 msgid "Thursday"
 msgstr "Torstai"
 
@@ -4528,8 +4310,8 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:672
 msgid "Tuesday"
 msgstr "Tiistai"
 
@@ -4538,8 +4320,8 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:673
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
@@ -4636,33 +4418,33 @@ msgstr "Ke"
 msgid "before every appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/dialogs/cancel-comp.c:55
+#: calendar/gui/dialogs/cancel-comp.c:58
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:61
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Haluatko varmasti peruuttaa ja poistaa tämän tapaamisen?"
 
-#: calendar/gui/dialogs/cancel-comp.c:64
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:70
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Haluatko todella peruuttaa ja poistaa tämän tehtävän?"
 
-#: calendar/gui/dialogs/cancel-comp.c:73
+#: calendar/gui/dialogs/cancel-comp.c:76
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:79
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Haluatko varmasti peruuttaa ja poistaa tämän päiväkirjamerkinnän?"
 
@@ -4736,61 +4518,60 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:322
+#: calendar/gui/dialogs/comp-editor.c:328
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Tiedostojen päivitys ei onnistunut"
 
-#: calendar/gui/dialogs/comp-editor.c:325
+#: calendar/gui/dialogs/comp-editor.c:331
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:328
+#: calendar/gui/dialogs/comp-editor.c:334
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:331
+#: calendar/gui/dialogs/comp-editor.c:337
 #, fuzzy
 msgid "Could not update object"
 msgstr "Tiedostojen päivitys ei onnistunut"
 
-#: calendar/gui/dialogs/comp-editor.c:777
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: calendar/gui/dialogs/comp-editor.c:782
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:785
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "Tehtävä - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:788
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:799
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "Ei kuvausta"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1230
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3941
+#: calendar/gui/e-week-view.c:3776 composer/e-msg-composer.c:1159
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
-#: 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"
+#: calendar/gui/dialogs/comp-editor.c:1379
+msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1382
+#: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4863,120 +4644,124 @@ msgid "Recurrence"
 msgstr ""
 
 #: calendar/gui/dialogs/event-editor.c:220
-#: calendar/gui/dialogs/event-editor.c:289
-#: calendar/gui/dialogs/event-editor.c:424
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:434
 #, fuzzy
 msgid "Scheduling"
 msgstr "Varjostus"
 
 #: 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
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:437 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
+#: calendar/gui/dialogs/event-page.c:654 calendar/gui/dialogs/task-page.c:554
 msgid "Start date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:654
+#: calendar/gui/dialogs/event-page.c:664
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:677
+#: calendar/gui/dialogs/event-page.c:687
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "_Alkamisaika:"
 
-#: calendar/gui/dialogs/event-page.c:684
+#: calendar/gui/dialogs/event-page.c:694
 msgid "End time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:2
 msgid "A_ll day event"
 msgstr "_Koko päivän kestävä tapahtuma"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:5
 #: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Luokittelu"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
 msgid "Con_fidential"
 msgstr "Luottamuksellinen"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Päiväys & Aika"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 #, fuzzy
 msgid "F_ree"
 msgstr "_Viikko"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 #, fuzzy
 msgid "L_ocation:"
 msgstr ""
 "\n"
 "Maant. sijainti: "
 
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/event-page.glade.h:10
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Y_ksityinen"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "Ju_lkinen"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/e-calendar-table.etspec.h:13
 #, fuzzy
 msgid "Show Time As"
 msgstr "Näytä"
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/event-page.glade.h:13
 #: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "K_uvaus:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:14
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Yhteystiedot..."
 
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: calendar/gui/dialogs/meeting-page.c:396
+#: calendar/gui/dialogs/meeting-page.c:425
+msgid "The organizer selected no longer has an account."
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:431
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:446
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:575
+#: calendar/gui/dialogs/meeting-page.c:616
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:696
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Poista..."
@@ -5020,14 +4805,14 @@ msgid "Member"
 msgstr "Joulukuu"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.c:1177
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
 #: 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:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Tila"
@@ -5047,55 +4832,80 @@ msgstr "Organisoija:"
 msgid "_Invite Others..."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:550
+#: calendar/gui/dialogs/recur-comp.c:50
+msgid "You are modifying a recurring event, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:54
+msgid "You are modifying a recurring task, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:58
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:72
+msgid "This Instance Only"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:75
+msgid "This and Future Instances"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:77
+msgid "All Instances"
+msgstr "Kaikki tahot"
+
+#: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:824
-msgid "Recurrent date is wrong"
+#: calendar/gui/dialogs/recurrence-page.c:806
+msgid "Recurrence date is invalid"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:929
+#: calendar/gui/dialogs/recurrence-page.c:916
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:977
 #, fuzzy
 msgid "first"
 msgstr "_Etunimi:"
 
-#: calendar/gui/dialogs/recurrence-page.c:991 filter/filter-datespec.c:65
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "second"
 msgstr "sekunti"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "third"
 msgstr "kolmas"
 
-#: calendar/gui/dialogs/recurrence-page.c:993
+#: calendar/gui/dialogs/recurrence-page.c:980
 #, fuzzy
 msgid "fourth"
 msgstr "tunti"
 
-#: calendar/gui/dialogs/recurrence-page.c:994
+#: calendar/gui/dialogs/recurrence-page.c:981
 #, fuzzy
 msgid "last"
 msgstr "Liitä"
 
-#: calendar/gui/dialogs/recurrence-page.c:1017
+#: calendar/gui/dialogs/recurrence-page.c:1004
 #, fuzzy
 msgid "Other Date"
 msgstr "Muu faksi"
 
-#: calendar/gui/dialogs/recurrence-page.c:1045 filter/filter-datespec.c:68
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr "päivä"
 
-#: calendar/gui/dialogs/recurrence-page.c:1182
+#: calendar/gui/dialogs/recurrence-page.c:1169
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1367
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr ""
 
@@ -5160,23 +4970,23 @@ msgstr "viikkoa"
 msgid "year(s)"
 msgstr "vuotta"
 
-#: calendar/gui/dialogs/send-comp.c:55
+#: calendar/gui/dialogs/send-comp.c:58
 msgid "The meeting information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:61
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:65
+#: calendar/gui/dialogs/send-comp.c:68
 msgid "The task assignment information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:69
+#: calendar/gui/dialogs/send-comp.c:72
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:398
+#: calendar/gui/dialogs/task-details-page.c:397
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Valmis"
@@ -5191,37 +5001,30 @@ msgstr "% Valmis"
 msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: 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"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:630
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:633
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "_Prioriteetti:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Tila:"
 
-#: calendar/gui/dialogs/task-editor.c:188
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:202
-#: calendar/gui/dialogs/task-editor.c:247
-#: calendar/gui/dialogs/task-editor.c:373
+#: calendar/gui/dialogs/task-editor.c:203
+#: calendar/gui/dialogs/task-editor.c:251
+#: calendar/gui/dialogs/task-editor.c:385
 msgid "Assignment"
 msgstr "Tapaaminen"
 
@@ -5229,7 +5032,7 @@ msgstr "Tapaaminen"
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1034
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1105
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:44
 msgid "Description:"
@@ -5243,6 +5046,99 @@ msgstr "_Alkamispäivä:"
 msgid "_Due Date:"
 msgstr ""
 
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d päivää"
+
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr "1 päivä"
+
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr "%d viikkoa"
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 viikko"
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr "%d tuntia"
+
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr "1 tunti"
+
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr "%d minuuttia"
+
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr "1 minuutti"
+
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekuntia"
+
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr "1 sekunti"
+
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr "Lähetä sähköpostia"
+
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "%s %s ennen tapaamisen alkua"
+
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "%s %s tapaamisen alun jälkeen"
+
+#: calendar/gui/e-alarm-list.c:495
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "%s tapaamisen alussa"
+
+#: calendar/gui/e-alarm-list.c:504
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "%s %s ennen tapaamisen loppumista"
+
+#: calendar/gui/e-alarm-list.c:507
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "%s %s tapaamisen päättymisen jälkeen"
+
+#: calendar/gui/e-alarm-list.c:512
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "%s tapaamisen lopussa"
+
+#: calendar/gui/e-alarm-list.c:536
+#, c-format
+msgid "%s at %s"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
 #: calendar/gui/e-calendar-table.c:415
 msgid "0%"
 msgstr "0%"
@@ -5287,81 +5183,81 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2824
-#: calendar/gui/e-week-view.c:1901
+#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2838
+#: calendar/gui/e-week-view.c:1906
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Poista valitut kontaktit"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-week-view.c:3557 mail/folder-browser.c:1756
 #: shell/e-shortcuts-view.c:415 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Avaa"
 
-#: calendar/gui/e-calendar-table.c:950
+#: calendar/gui/e-calendar-table.c:951
 #, fuzzy
 msgid "_Save as..."
 msgstr "Tallenna nimellä..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-week-view.c:3532 calendar/gui/e-week-view.c:3559
 #: 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:955 calendar/gui/e-day-view.c:3703
-#: calendar/gui/e-week-view.c:3528 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3712
+#: calendar/gui/e-week-view.c:3564 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:956 calendar/gui/e-day-view.c:3704
-#: calendar/gui/e-week-view.c:3529 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3713
+#: calendar/gui/e-week-view.c:3565 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: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
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3678
+#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3536
+#: calendar/gui/e-week-view.c:3566 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ä"
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:962
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:962
+#: calendar/gui/e-calendar-table.c:963
 msgid "_Forward as iCalendar"
 msgstr "_Välitä iCalendar-muodossa"
 
-#: calendar/gui/e-calendar-table.c:963
+#: calendar/gui/e-calendar-table.c:964
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-calendar-table.c:964
+#: calendar/gui/e-calendar-table.c:965
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-calendar-table.c:970
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Poista tehtävä"
 
-#: calendar/gui/e-calendar-table.c:1239 calendar/gui/e-day-view.c:7551
-#: calendar/gui/e-week-view.c:4215
+#: calendar/gui/e-calendar-table.c:1244 calendar/gui/e-day-view.c:7635
+#: calendar/gui/e-week-view.c:4265
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1322
+#: calendar/gui/e-calendar-table.c:1327
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
@@ -5400,7 +5296,7 @@ msgid "Start Date"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:56 shell/e-shell.c:765
+#: my-evolution/component-factory.c:56 shell/e-shell.c:747
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Kuvaus"
@@ -5432,586 +5328,585 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:531
+#: calendar/gui/e-day-view-time-item.c:529
 #, 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:262 calendar/gui/e-day-view.c:1373
-#: calendar/gui/e-week-view-main-item.c:303 calendar/gui/print.c:1529
+#: calendar/gui/e-day-view-top-item.c:260 calendar/gui/e-day-view.c:1376
+#: calendar/gui/e-week-view-main-item.c:313 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:270 calendar/gui/e-day-view.c:1400
-#: calendar/gui/e-week-view-main-item.c:326
+#: calendar/gui/e-day-view-top-item.c:268 calendar/gui/e-day-view.c:1409
+#: calendar/gui/e-week-view-main-item.c:336
 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:610 calendar/gui/e-week-view.c:344
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:343
 #: 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:613 calendar/gui/e-week-view.c:347
+#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:346
 #: calendar/gui/print.c:815
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3653
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr "Uusi t_apaaminen"
 
-#: calendar/gui/e-day-view.c:3655 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3526
 msgid "New All Day _Event"
 msgstr "Uusi koko pä_ivän tapahtuma"
 
-#: calendar/gui/e-day-view.c:3657 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3527
 #, fuzzy
 msgid "New Meeting"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-day-view.c:3659 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3528
 msgid "New Task"
 msgstr "Uusi tehtävä"
 
-#: calendar/gui/e-day-view.c:3664 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3673 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Tulosta..."
 
-#: calendar/gui/e-day-view.c:3676 calendar/gui/e-week-view.c:3506
+#: calendar/gui/e-day-view.c:3685 calendar/gui/e-week-view.c:3542
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3678 calendar/gui/e-week-view.c:3507
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3543
 msgid "_Go to Date..."
 msgstr "Siirry _päivään..."
 
-#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3511
+#: calendar/gui/e-day-view.c:3692 calendar/gui/e-week-view.c:3547
 #: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-day-view.c:3688 calendar/gui/e-week-view.c:3515
-#: ui/evolution.xml.h:62
+#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3551
+#: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Settings..."
 msgstr "_Sähköpostiasetukset..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3558
+#: mail/folder-browser.c:1758 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Tallenna _nimellä..."
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3534
+#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3570
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Varjostus"
 
-#: calendar/gui/e-day-view.c:3710 calendar/gui/e-week-view.c:3535
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3571
 msgid "_Forward as iCalendar..."
 msgstr "_Välitä iCalendar-muodossa..."
 
-#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3540
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3576
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3716 calendar/gui/e-week-view.c:3541
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3577
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3578
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:637
+#: calendar/gui/e-itip-control.c:704
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:716
 #, fuzzy
 msgid "Every day"
 msgstr "Joka"
 
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:718
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr " %d päivää"
 
-#: calendar/gui/e-itip-control.c:657
+#: calendar/gui/e-itip-control.c:724
 #, fuzzy
 msgid "Every week"
 msgstr "Joka"
 
-#: calendar/gui/e-itip-control.c:659
+#: calendar/gui/e-itip-control.c:726
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr " %d viikkoa"
 
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:729
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:731
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr " %d viikkoa"
 
-#: calendar/gui/e-itip-control.c:672
+#: calendar/gui/e-itip-control.c:739
 msgid " and "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:679
+#: calendar/gui/e-itip-control.c:746
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:759
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:764
 #, fuzzy
 msgid "every month"
 msgstr "Yksi kuukausi"
 
-#: calendar/gui/e-itip-control.c:702
+#: calendar/gui/e-itip-control.c:769
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:708
+#: calendar/gui/e-itip-control.c:775
 #, fuzzy
 msgid "Every year"
 msgstr "Joka"
 
-#: calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:722
+#: calendar/gui/e-itip-control.c:789
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:797
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:754
+#: calendar/gui/e-itip-control.c:821
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:831
 msgid "<b>Ends:</b> "
 msgstr "<b>Loppuu:</b> "
 
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:851
 msgid "<b>Completed:</b> "
 msgstr "<b>Valmis:</b> "
 
-#: calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:861
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:881
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:951
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "Pakolliset tiedot"
 
 #. Title
-#: calendar/gui/e-itip-control.c:846
+#: calendar/gui/e-itip-control.c:913
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Kalenteri"
 
-#: 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
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:1009 calendar/gui/e-itip-control.c:1026
 msgid "An unknown person"
 msgstr "Tuntematon henkilö"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:963
+#: calendar/gui/e-itip-control.c:1033
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:978
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:988
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Location:"
 msgstr ""
 "\n"
 "Maant. sijainti: "
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1073
 #, fuzzy
 msgid "Status:"
 msgstr "_Tila:"
 
-#: 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
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-meeting-model.c:296
+#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:852
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Hyväksytty"
 
-#: calendar/gui/e-itip-control.c:1011 calendar/gui/itip-utils.c:395
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-itip-control.c:1086 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:853
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 #, fuzzy
 msgid "Declined"
 msgstr "Poistettu"
 
-#: 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:345
-#: mail/mail-display.c:931 widgets/misc/e-charset-picker.c:60
+#: calendar/gui/e-itip-control.c:1090 calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:267
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:810
+#: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1534
+#: camel/camel-gpg-context.c:1584 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:226 mail/folder-browser.c:345
+#: mail/mail-display.c:950 widgets/misc/e-charset-picker.c:60
 #: widgets/misc/e-charset-picker.c:510
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: 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
+#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225 calendar/gui/e-itip-control.c:1238
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Valitse toiminto"
 
-#: calendar/gui/e-itip-control.c:1073
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "Päivitä"
 
-#: 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
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: shell/e-shell.c:2062 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1174
 msgid "Accept"
 msgstr "Hyväksy"
 
-#: calendar/gui/e-itip-control.c:1102
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Decline"
 msgstr "Poistettu"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1200
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Lähteen tiedot"
 
-#: calendar/gui/e-itip-control.c:1140
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1153
+#: calendar/gui/e-itip-control.c:1226
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Tiedoksi"
 
-#: 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
+#: calendar/gui/e-itip-control.c:1239 calendar/gui/itip-utils.c:434
+#: shell/evolution-shell-component.c:1165 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: calendar/gui/e-itip-control.c:1247
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> on julkaissut tapaamistietonsa."
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1321
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> pyytää %s läsnäoloa tapaamisessa."
 
-#: calendar/gui/e-itip-control.c:1255
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1256
+#: calendar/gui/e-itip-control.c:1329
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1334
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> toivoo saavansa viimeisimmät tapaamistiedot."
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1339
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> on vastannut tapaamispyyntöön."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1347
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> on peruuttanut tapaamisen."
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1355
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Valitse toiminto"
 
-#: calendar/gui/e-itip-control.c:1289 calendar/gui/e-itip-control.c:1356
-#: calendar/gui/e-itip-control.c:1391
+#: calendar/gui/e-itip-control.c:1362 calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Huono tapaaminen-sanoma"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> on julkaissut tehtävätietonsa."
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1388
 #, fuzzy
 msgid "Task Information"
 msgstr "Tiedoksi"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> pyytää %s tekemään työtehtävän."
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1396
 #, fuzzy
 msgid "Task Proposal"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1401
 #, fuzzy
 msgid "Task Update"
 msgstr "Tehtävät"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> toivoo saavansa viimeisimmät työtehtävätiedot."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1406
 #, fuzzy
 msgid "Task Update Request"
 msgstr "Tehtävät"
 
-#: calendar/gui/e-itip-control.c:1340
+#: calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> on vastannut työtehtävän antoon."
 
-#: calendar/gui/e-itip-control.c:1341
+#: calendar/gui/e-itip-control.c:1414
 #, fuzzy
 msgid "Task Reply"
 msgstr "Vastaa"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1421
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1422
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Peruuta operaatio"
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "Huono tehtävä-sanoma"
 
-#: calendar/gui/e-itip-control.c:1376
+#: calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> on julkaissut vapaa/kiireinen-tietonsa."
 
-#: calendar/gui/e-itip-control.c:1377
+#: calendar/gui/e-itip-control.c:1450
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Lähteen tiedot"
 
-#: calendar/gui/e-itip-control.c:1381
+#: calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pyytää sinun vapaa/varattu -tietoja."
 
-#: calendar/gui/e-itip-control.c:1382
+#: calendar/gui/e-itip-control.c:1455
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Edellinen viesti"
 
-#: calendar/gui/e-itip-control.c:1386
+#: calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> on vastannut vapaa/varattu -kyselyyn."
 
-#: calendar/gui/e-itip-control.c:1387
+#: calendar/gui/e-itip-control.c:1460
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Edellinen viesti"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Huono vapaa/kiireinen -viesti"
 
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1541
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1556 calendar/gui/e-itip-control.c:1562
+#: calendar/gui/e-itip-control.c:1635 calendar/gui/e-itip-control.c:1641
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1587
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1807 calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1907 calendar/gui/e-itip-control.c:1999
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1810 calendar/gui/e-itip-control.c:1902
+#: calendar/gui/e-itip-control.c:1910 calendar/gui/e-itip-control.c:2002
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1813 calendar/gui/e-itip-control.c:1905
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:2005
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Bug buddya ei voitu ajaa."
 
-#: calendar/gui/e-itip-control.c:1816
+#: calendar/gui/e-itip-control.c:1916
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr ""
 "Tiedoston %s poistaminen epäonnistui:\n"
 "%s"
 
-#: calendar/gui/e-itip-control.c:1819
+#: calendar/gui/e-itip-control.c:1919
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:1822
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenteritiedostoa ei voitu päivittää!\n"
 
-#: calendar/gui/e-itip-control.c:1851 calendar/gui/e-itip-control.c:1917
+#: calendar/gui/e-itip-control.c:1951 calendar/gui/e-itip-control.c:2017
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1872
+#: calendar/gui/e-itip-control.c:1972
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1884
+#: calendar/gui/e-itip-control.c:1984
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1908
+#: calendar/gui/e-itip-control.c:2008
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 "Tiedoston %s poistaminen epäonnistui:\n"
 "%s"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1914
-#, fuzzy
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
-msgstr "Kohdistimen lataaminen epäonnistui\n"
+msgstr "Osallistujan tilan päivitys epäonnistui!\n"
 
-#: calendar/gui/e-itip-control.c:1949
+#: calendar/gui/e-itip-control.c:2049
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:1979 calendar/gui/e-itip-control.c:2029
+#: calendar/gui/e-itip-control.c:2079 calendar/gui/e-itip-control.c:2129
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Lähetetty"
 
-#: calendar/gui/e-itip-control.c:1981 calendar/gui/e-itip-control.c:2033
+#: calendar/gui/e-itip-control.c:2081 calendar/gui/e-itip-control.c:2133
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2106
+#: calendar/gui/e-itip-control.c:2206
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Valitse kansio"
 
-#: calendar/gui/e-itip-control.c:2113
+#: calendar/gui/e-itip-control.c:2213
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Valitse kansio"
@@ -6053,80 +5948,85 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:81
-#, fuzzy
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
-msgstr "Autopuhelin"
+msgstr "Toimi puheenjohtajana"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1736
+#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1695
 #, fuzzy
 msgid "Required Participants"
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:82
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:83
 #, fuzzy
 msgid "Resources"
 msgstr "Paperilähde:"
 
-#: 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
+#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:806
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:210 calendar/gui/e-meeting-model.c:227
+#: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:226
 #: calendar/gui/e-meeting-model.c:807
 #, fuzzy
 msgid "Group"
 msgstr "Ryhmän nimi:"
 
-#: calendar/gui/e-meeting-model.c:212 calendar/gui/e-meeting-model.c:229
+#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:228
 #: calendar/gui/e-meeting-model.c:808
 #, fuzzy
 msgid "Resource"
 msgstr "Paperilähde:"
 
-#: calendar/gui/e-meeting-model.c:214 calendar/gui/e-meeting-model.c:231
+#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:230
 #: calendar/gui/e-meeting-model.c:809
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:243 calendar/gui/e-meeting-model.c:260
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
 #: calendar/gui/e-meeting-model.c:822
 msgid "Chair"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:247 calendar/gui/e-meeting-model.c:264
+#: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:263
 #: calendar/gui/e-meeting-model.c:824
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:249 calendar/gui/e-meeting-model.c:266
+#: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:265
 #: calendar/gui/e-meeting-model.c:825
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:301 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:550 calendar/gui/e-meeting-model.c:851
+#, fuzzy
+msgid "Needs Action"
+msgstr "Lisää toiminto"
+
+#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
 #: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:407
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:303 calendar/gui/e-meeting-model.c:326
+#: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:325
 #: calendar/gui/e-meeting-model.c:855
 #, fuzzy
 msgid "Delegated"
 msgstr "Poistettu"
 
-#: calendar/gui/e-meeting-model.c:307 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
 #, fuzzy
 msgid "In Process"
 msgstr "Ammatti"
@@ -6134,14 +6034,14 @@ 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:452
-#: calendar/gui/e-meeting-time-sel.c:2077
+#: calendar/gui/e-meeting-time-sel.c:2085
 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:456
-#: calendar/gui/e-meeting-time-sel.c:2107 e-util/e-time-utils.c:189
+#: calendar/gui/e-meeting-time-sel.c:2118 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"
@@ -6213,30 +6113,30 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:356 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/e-tasks.c:357 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:385 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:386 calendar/gui/tasks-control.c:199
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:400
+#: calendar/gui/e-tasks.c:401
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:414 calendar/gui/gnome-cal.c:1531
+#: calendar/gui/e-tasks.c:415 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"
 "%s"
 
-#: calendar/gui/e-tasks.c:482 calendar/gui/gnome-cal.c:1735
+#: calendar/gui/e-tasks.c:483 calendar/gui/gnome-cal.c:1735
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6256,7 +6156,7 @@ msgstr "Poista valitut kontaktit"
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3489
+#: calendar/gui/e-week-view.c:3525
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
@@ -6357,63 +6257,64 @@ msgstr "Lokakuu"
 msgid "September"
 msgstr "Syyskuu"
 
-#: calendar/gui/itip-utils.c:250 calendar/gui/itip-utils.c:321
+#: calendar/gui/itip-utils.c:263 calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:343
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:285
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:364 calendar/gui/itip-utils.c:473
+#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
 #, fuzzy
 msgid "Event information"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:475
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
 #, fuzzy
 msgid "Task information"
 msgstr "Tiedoksi"
 
-#: calendar/gui/itip-utils.c:368 calendar/gui/itip-utils.c:477
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 #, fuzzy
 msgid "Journal information"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/itip-utils.c:370 calendar/gui/itip-utils.c:494
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:519
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Lähteen tiedot"
 
-#: calendar/gui/itip-utils.c:372
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "Kalenteritiedot"
 
-#: calendar/gui/itip-utils.c:408
+#: calendar/gui/itip-utils.c:430
 #, fuzzy
 msgid "Updated"
 msgstr "Tehtävät"
 
-#: calendar/gui/itip-utils.c:416
+#: calendar/gui/itip-utils.c:438
 #, fuzzy
 msgid "Refresh"
 msgstr "vuotta"
 
-#: calendar/gui/itip-utils.c:420
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:488
+#: calendar/gui/itip-utils.c:513
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Lähteen tiedot"
 
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:525
 #, fuzzy
 msgid "iCalendar information"
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/itip-utils.c:648
+#: calendar/gui/itip-utils.c:671
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6504,19 +6405,17 @@ msgid "URL: %s"
 msgstr "URL: %s"
 
 #: calendar/gui/print.c:2384
-#, fuzzy, c-format
+#, c-format
 msgid "Categories: %s"
-msgstr ""
-"\n"
-"Ryhmät: "
+msgstr "Ryhmät: %s"
 
 #: calendar/gui/print.c:2395
 msgid "Contacts: "
 msgstr "Yhteystiedot: "
 
 #: 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
+#: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:617
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
 
@@ -6532,7 +6431,7 @@ msgstr "Tulostusasetukset"
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:465
+#: calendar/gui/tasks-control.c:472
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6540,45 +6439,17 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:472
+#: calendar/gui/tasks-control.c:479
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Älä kysy tätä enää uudelleen"
 
-#: calendar/gui/tasks-control.c:608
+#: calendar/gui/tasks-control.c:615
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Tulosta kortti"
 
-#: calendar/gui/tasks-migrate.c:105
-msgid ""
-"Evolution has taken the tasks that were in your calendar folder and "
-"automatically migrated them to the new tasks folder."
-msgstr ""
-
-#: calendar/gui/tasks-migrate.c:108
-msgid ""
-"Evolution has tried to take the tasks that were in your calendar folder and "
-"migrate them to the new tasks folder.\n"
-"Some of the tasks could not be migrated, so this process may be attempted "
-"again in the future."
-msgstr ""
-
-#: calendar/gui/tasks-migrate.c:120
-#, c-format
-msgid ""
-"Could not open `%s'; no items from the calendar folder will be migrated to "
-"the tasks folder."
-msgstr ""
-
-#: calendar/gui/tasks-migrate.c:133
-#, c-format
-msgid ""
-"The method required to load `%s' is not supported; no items from the "
-"calendar folder will be migrated to the tasks folder."
-msgstr ""
-
-#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:379
+#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:388
 msgid "SMTWTFS"
 msgstr "SMTKTPL"
 
@@ -6594,26 +6465,16 @@ msgstr ""
 msgid "Imports vCalendar files into Evolution"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:172
-#, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr "Tallennuspaikkaluettelon haku rekisteristä epäonnistui: %s"
-
-#: calendar/importers/icalendar-importer.c:184
-#, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
-msgstr "Kutsu getFolderAtPath-tallennuspaikkaan epäonnistui: %s"
-
-#: calendar/importers/icalendar-importer.c:487
+#: calendar/importers/icalendar-importer.c:404
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Muistutus"
 
-#: calendar/importers/icalendar-importer.c:701
+#: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr "Kalenteritapahtumat"
 
-#: calendar/importers/icalendar-importer.c:726
+#: calendar/importers/icalendar-importer.c:663
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6622,12 +6483,12 @@ msgstr ""
 "Evolution löysi Pinen sähköpostitiedostoja.\n"
 "Haluatko tuoda nämä Evolutioniin?"
 
-#: calendar/importers/icalendar-importer.c:733
+#: calendar/importers/icalendar-importer.c:670
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Kalenteri"
 
-#: calendar/pcs/cal-backend-file.c:301
+#: calendar/pcs/cal-backend-file.c:311
 msgid "Can't save calendar data: Malformed URI."
 msgstr ""
 
@@ -7826,54 +7687,44 @@ msgid "Atlantic/Stanley"
 msgstr ""
 
 #: calendar/zones.h:277
-#, fuzzy
 msgid "Australia/Adelaide"
-msgstr "Australia"
+msgstr "Australia/Adelaide"
 
 #: calendar/zones.h:278
-#, fuzzy
 msgid "Australia/Brisbane"
-msgstr "Australia"
+msgstr "Australia/Brisbane"
 
 #: calendar/zones.h:279
-#, fuzzy
 msgid "Australia/Broken_Hill"
-msgstr "Australia"
+msgstr "Australia/Broken_Hill"
 
 #: calendar/zones.h:280
-#, fuzzy
 msgid "Australia/Darwin"
-msgstr "Australia"
+msgstr "Australia/Darwin"
 
 #: calendar/zones.h:281
-#, fuzzy
 msgid "Australia/Hobart"
-msgstr "Australia"
+msgstr "Australia/Hobart"
 
 #: calendar/zones.h:282
-#, fuzzy
 msgid "Australia/Lindeman"
-msgstr "Australia"
+msgstr "Australia/Lindeman"
 
 #: calendar/zones.h:283
-#, fuzzy
 msgid "Australia/Lord_Howe"
-msgstr "Australia"
+msgstr "Australia/Lord_Howe"
 
 #: calendar/zones.h:284
-#, fuzzy
 msgid "Australia/Melbourne"
-msgstr "Australia"
+msgstr "Australia/Melbourne"
 
 #: calendar/zones.h:285
-#, fuzzy
 msgid "Australia/Perth"
-msgstr "Australia"
+msgstr "Australia/Perth"
 
 #: calendar/zones.h:286
-#, fuzzy
 msgid "Australia/Sydney"
-msgstr "Australia"
+msgstr "Australia/Sydney"
 
 #: calendar/zones.h:287
 msgid "Europe/Amsterdam"
@@ -8311,11 +8162,11 @@ msgstr ""
 msgid "You may not export keys with this cipher"
 msgstr ""
 
-#: camel/camel-data-cache.c:137
+#: camel/camel-data-cache.c:133
 msgid "Unable to create cache path"
 msgstr ""
 
-#: camel/camel-data-cache.c:375
+#: camel/camel-data-cache.c:370
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Välimuistihakemistoa ei voitu avata: %s"
@@ -8350,11 +8201,13 @@ msgid "You must be working online to complete this operation"
 msgstr ""
 
 #: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-process.c:48
 #, 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
+#: camel/camel-process.c:92
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Viestin salauksen purkaminen epäonnistui."
@@ -8503,9 +8356,9 @@ msgid ""
 "user: \"%s\""
 msgstr ""
 
-#: 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
+#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1249
+#: camel/camel-gpg-context.c:1356 camel/camel-gpg-context.c:1431
+#: camel/camel-gpg-context.c:1488 mail/mail-send-recv.c:565
 msgid "Cancelled."
 msgstr "Peruutettu."
 
@@ -8528,7 +8381,7 @@ msgstr "Vastaanottajia ei ole määritelty"
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Viestiä ei voida lähettää: vastaanottajia ei ole määritelty."
 
-#: camel/camel-gpg-context.c:1122
+#: camel/camel-gpg-context.c:1125
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8536,28 +8389,30 @@ msgid ""
 "%.*s"
 msgstr "Viestin salauksen purkaminen epäonnistui."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1131
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Viestin salauksen purkaminen epäonnistui."
 
-#: camel/camel-gpg-context.c:1237 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1580
+#: camel/camel-gpg-context.c:1240 camel/camel-gpg-context.c:1533
+#: camel/camel-gpg-context.c:1583
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Viestin salauksen purkaminen epäonnistui."
 
-#: 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
+#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1348
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1452
+#: camel/camel-gpg-context.c:1479 camel/camel-gpg-context.c:1509
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Viestin salauksen purkaminen epäonnistui."
 
-#: camel/camel-gpg-context.c:1330
-#, fuzzy, c-format
+#: camel/camel-gpg-context.c:1333
+#, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "Väliaikaistiedostoa ei voitu luoda: %s"
+msgstr ""
+"Viestin allekirjoitusta ei voida varmentaa: väliaikaistiedostoa ei voitu "
+"luoda: %s"
 
 #: camel/camel-lock-client.c:111
 #, c-format
@@ -8768,87 +8623,91 @@ msgstr ""
 msgid "Server response does not match\n"
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:40
+#: camel/camel-sasl-gssapi.c:48
 msgid "GSSAPI"
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:42
+#: camel/camel-sasl-gssapi.c:50
 #, 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
+#: camel/camel-sasl-gssapi.c:148
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:138
+#: camel/camel-sasl-gssapi.c:153
 msgid "The provided target_name parameter was ill-formed."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:141
+#: camel/camel-sasl-gssapi.c:156
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:145
+#: camel/camel-sasl-gssapi.c:160
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:150
+#: camel/camel-sasl-gssapi.c:165
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:154
+#: camel/camel-sasl-gssapi.c:169
 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."
+#: camel/camel-sasl-gssapi.c:174
+msgid "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."
+#: camel/camel-sasl-gssapi.c:177
+msgid "The consistency checks performed on the input_token failed."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:167
+#: camel/camel-sasl-gssapi.c:180
 msgid "The consistency checks performed on the credential failed."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:170
+#: camel/camel-sasl-gssapi.c:183
 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/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
+#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
+#: camel/camel-sasl-kerberos4.c:219
 #: camel/providers/imap/camel-imap-store.c:1052
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:281
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "Viestin salauksen purkaminen epäonnistui."
+
+#: camel/camel-sasl-gssapi.c:299
 #, fuzzy
 msgid "Unsupported security layer."
 msgstr "Tar_kista tuetut tavat"
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-kerberos4.c:41
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:42
+#: camel/camel-sasl-kerberos4.c:43
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -8929,31 +8788,31 @@ msgstr ""
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:773 camel/camel-service.c:885
+#: camel/camel-service.c:773 camel/camel-service.c:887
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
 #, fuzzy
 msgid "Resolving address"
 msgstr "Poistetaan kansiota %s"
 
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -9017,133 +8876,133 @@ msgid "Failed to verify certificates."
 msgstr ""
 
 #: camel/camel-store.c:214
-#, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
+msgstr ""
+"Kansion hakeminen ei onnistu: virheellinen toiminto tässä tallennuspaikassa"
 
 #: camel/camel-store.c:268
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kansion luominen ei onnistu: virheellinen tapahtuma tallennuspaikassa"
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 msgid "Unable to get issuer's certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:575
 msgid "Unable to decrypt certificate signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:581
 #, fuzzy
 msgid "Certificate signature failure"
 msgstr "Allekirjoitustiedosto:"
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:587
 msgid "Certificate has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:596
 #, fuzzy
 msgid "Error in CRL"
 msgstr "Virhe %s:n lataamisessa"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 msgid "Out of memory"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:606
 msgid "Unable to verify leaf signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:610
 msgid "Certificate Revoked"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:616
 msgid "Invalid purpose"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 msgid "Certificate untrusted"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Certificate rejected"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:811
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9152,15 +9011,15 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:817
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:817
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9173,7 +9032,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:821
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9183,35 +9042,35 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:865
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:917
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:935
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:952
+#: camel/camel-tcp-stream-ssl.c:964
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL:n `%s' jäsentäminen epäonnistui"
@@ -9226,34 +9085,34 @@ msgstr "Virhe %s:n käynnistyksessä"
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Viestien kopioiminen tai siirtäminen ei onnistu virtuaalisiin kansioihin"
 
-#: camel/camel-vee-store.c:272
+#: camel/camel-vee-store.c:261
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kansion poistaminen ei onnistu: %s: Virheellinen tapahtuma"
 
-#: camel/camel-vee-store.c:291
-#, fuzzy, c-format
+#: camel/camel-vee-store.c:280
+#, c-format
 msgid "Cannot delete folder: %s: No such folder"
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
+msgstr "Kansion poistaminen ei onnistu: %s: Kansiota ei ole"
 
-#: camel/camel-vee-store.c:304
-#, fuzzy, c-format
+#: camel/camel-vee-store.c:293
+#, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
+msgstr "Kansion nimeäminen ei onnistu: %s: virheellinen toiminto"
 
-#: camel/camel-vee-store.c:312
-#, fuzzy, c-format
+#: camel/camel-vee-store.c:301
+#, c-format
 msgid "Cannot rename folder: %s: No such folder"
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
+msgstr "Kansion nimeäminen ei onnistu: %s: kansiota ei löydy"
 
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
-#: camel/providers/imap/camel-imap-command.c:452
+#: camel/providers/imap/camel-imap-command.c:453
 #: camel/providers/imap/camel-imap-store.c:2642
 msgid "Operation cancelled"
 msgstr ""
@@ -9284,16 +9143,16 @@ msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP-komento epäonnistui: %s"
 
-#: camel/providers/imap/camel-imap-command.c:462
+#: camel/providers/imap/camel-imap-command.c:463
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:654
+#: camel/providers/imap/camel-imap-command.c:655
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:690
+#: camel/providers/imap/camel-imap-command.c:691
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
@@ -9383,7 +9242,7 @@ msgstr "Tarkastetaan onko uutta sähköpostia"
 msgid "Check for new messages in all folders"
 msgstr "Etsi uusia viestejä kaikista kansioista"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1133
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1176
 msgid "Folders"
 msgstr "Kansiot"
 
@@ -9441,7 +9300,7 @@ msgstr "Yhteys peruutettu"
 
 #: camel/providers/imap/camel-imap-store.c:590
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:275
+#: camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -9469,7 +9328,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:1085
-#: camel/providers/smtp/camel-smtp-transport.c:485
+#: camel/providers/smtp/camel-smtp-transport.c:484
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
@@ -9659,7 +9518,7 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9669,14 +9528,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:168
+#: camel/providers/local/camel-spool-store.c:167
 #, 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:173
+#: camel/providers/local/camel-spool-store.c:172
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9700,8 +9559,8 @@ msgid "not a maildir directory"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:287
-#: camel/providers/local/camel-spool-store.c:317
+#: camel/providers/local/camel-spool-store.c:286
+#: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -9713,9 +9572,8 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-summary.c:541
-#, fuzzy
 msgid "Checking folder consistency"
-msgstr "Tarkastetaan onko uutta sähköpostia"
+msgstr "Tarkastetaan kansion yhdenmukaisuutta"
 
 #: camel/providers/local/camel-maildir-summary.c:644
 #, fuzzy
@@ -9723,10 +9581,10 @@ msgid "Checking for new messages"
 msgstr "Etsitään uusia viestejä"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:588
-#: camel/providers/local/camel-mbox-summary.c:679
-#: camel/providers/local/camel-spool-summary.c:145
+#: camel/providers/local/camel-mbox-summary.c:337
+#: camel/providers/local/camel-mbox-summary.c:510
+#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-spool-summary.c:137
 #, fuzzy
 msgid "Storing folder"
 msgstr "Synkronoidaan kansiota"
@@ -9803,81 +9661,81 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:351
+#: camel/providers/local/camel-mbox-summary.c:343
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 "Tiedoston %s poistaminen epäonnistui:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:399
+#: camel/providers/local/camel-mbox-summary.c:391
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:455
+#: camel/providers/local/camel-mbox-summary.c:447
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kansion tarkistus ei onnistu: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:593
-#: camel/providers/local/camel-mbox-summary.c:684
-#: camel/providers/local/camel-spool-summary.c:150
+#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-spool-summary.c:142
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 "Tiedoston %s poistaminen epäonnistui:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:605
-#: camel/providers/local/camel-spool-summary.c:170
+#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:618
-#: camel/providers/local/camel-mbox-summary.c:780
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:702
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:627
+#: camel/providers/local/camel-mbox-summary.c:549
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:638
+#: camel/providers/local/camel-mbox-summary.c:560
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: 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
+#: camel/providers/local/camel-mbox-summary.c:644
+#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:855
-#: camel/providers/local/camel-spool-summary.c:342
+#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Tuntematon virhe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:890
+#: camel/providers/local/camel-mbox-summary.c:812
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr ""
 "Tiedoston %s poistaminen epäonnistui:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:984
-#: camel/providers/local/camel-mbox-summary.c:1010
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:1001
+#: camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
@@ -9912,53 +9770,53 @@ msgstr ""
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "`%s' ei ole tavallinen tiedosto."
 
-#: camel/providers/local/camel-spool-store.c:154
+#: camel/providers/local/camel-spool-store.c:153
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Kansiota `%s/%s' ei ole olemassa."
 
-#: camel/providers/local/camel-spool-store.c:181
+#: camel/providers/local/camel-spool-store.c:180
 #, fuzzy, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "`%s' ei ole tavallinen tiedosto."
 
-#: camel/providers/local/camel-spool-store.c:198
+#: camel/providers/local/camel-spool-store.c:197
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "Poistetaan kansiota %s"
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:226
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:183
-#: camel/providers/local/camel-spool-summary.c:193
-#: camel/providers/local/camel-spool-summary.c:203
+#: camel/providers/local/camel-spool-summary.c:175
+#: camel/providers/local/camel-spool-summary.c:185
+#: camel/providers/local/camel-spool-summary.c:195
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Väliaikaishakemistoa %s ei voitu synkronoida: %s"
 
-#: camel/providers/local/camel-spool-summary.c:219
+#: camel/providers/local/camel-spool-summary.c:211
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:250
-#: camel/providers/local/camel-spool-summary.c:269
-#: camel/providers/local/camel-spool-summary.c:282
+#: camel/providers/local/camel-spool-summary.c:242
+#: camel/providers/local/camel-spool-summary.c:261
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -10043,9 +9901,9 @@ msgid "User cancelled"
 msgstr "Peruutettu"
 
 #: camel/providers/pop3/camel-pop3-folder.c:265
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot get POP summary: %s"
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
+msgstr "POP-yhteenvedon hakeminen ei onnistu: %s"
 
 #: camel/providers/pop3/camel-pop3-folder.c:308
 msgid "Expunging deleted messages"
@@ -10067,9 +9925,9 @@ msgstr "Haetaan POP-viestiä %d"
 #: 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
+#, c-format
 msgid "Cannot get message %s: %s"
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
+msgstr "Viestin %s hakeminen ei onnistu: %s"
 
 #: camel/providers/pop3/camel-pop3-folder.c:500
 #, fuzzy
@@ -10179,46 +10037,46 @@ msgid ""
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:109
+#: camel/providers/sendmail/camel-sendmail-transport.c:113
 #, fuzzy
 msgid "Could not parse recipient list"
 msgstr "URL:n `%s' jäsentäminen epäonnistui"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:140
+#: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Viestin lähettäminen epäonnistui: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
+#: camel/providers/sendmail/camel-sendmail-transport.c:233
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:227
+#: camel/providers/sendmail/camel-sendmail-transport.c:240
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:232
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:246
+#: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:248
+#: camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
@@ -10230,140 +10088,140 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr "Todennus vaaditaan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:298
+#: camel/providers/smtp/camel-smtp-transport.c:297
 msgid "Welcome response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:342
-#: camel/providers/smtp/camel-smtp-transport.c:381
+#: camel/providers/smtp/camel-smtp-transport.c:341
+#: camel/providers/smtp/camel-smtp-transport.c:380
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Yhdistäminen palvelimeen epäonnistui: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:342
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:356
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:372
+#: camel/providers/smtp/camel-smtp-transport.c:371
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:475
+#: camel/providers/smtp/camel-smtp-transport.c:474
 #, 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:513
+#: camel/providers/smtp/camel-smtp-transport.c:512
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:532
+#: camel/providers/smtp/camel-smtp-transport.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10371,89 +10229,88 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:664
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:667
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "Cannot send message: sender address not valid."
 msgstr "Viestiä ei voida lähettää: lähettäjän osoite on epäkelpo."
 
-#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:613
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
-#: camel/providers/smtp/camel-smtp-transport.c:705
+#: camel/providers/smtp/camel-smtp-transport.c:704
 msgid "Cannot send message: no recipients defined."
 msgstr "Viestiä ei voida lähettää: vastaanottajia ei ole määritelty."
 
-#: camel/providers/smtp/camel-smtp-transport.c:714
-#, fuzzy
+#: camel/providers/smtp/camel-smtp-transport.c:713
 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ää: yksi tai useampi viallinen vastaanottaja"
 
-#: camel/providers/smtp/camel-smtp-transport.c:882
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:928
+#: camel/providers/smtp/camel-smtp-transport.c:924
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:950
+#: camel/providers/smtp/camel-smtp-transport.c:946
 #, fuzzy
 msgid "HELO response error"
 msgstr "Muu virhe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1016
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "SMTP Authentication"
 msgstr "SMTP-todennus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
-#: camel/providers/smtp/camel-smtp-transport.c:1051
+#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1047
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1146
+#: camel/providers/smtp/camel-smtp-transport.c:1142
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1166
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1190
+#: camel/providers/smtp/camel-smtp-transport.c:1186
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1212
+#: camel/providers/smtp/camel-smtp-transport.c:1208
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1253
+#: camel/providers/smtp/camel-smtp-transport.c:1247
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -10461,67 +10318,67 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1273
+#: camel/providers/smtp/camel-smtp-transport.c:1267
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1314
-#: camel/providers/smtp/camel-smtp-transport.c:1337
+#: camel/providers/smtp/camel-smtp-transport.c:1308
+#: camel/providers/smtp/camel-smtp-transport.c:1331
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1357
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1380
+#: camel/providers/smtp/camel-smtp-transport.c:1374
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1400
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1423
+#: camel/providers/smtp/camel-smtp-transport.c:1417
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1443
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:102
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:367 mail/mail-display.c:223
+#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:223
 msgid "attachment"
 msgstr "liite"
 
-#: composer/e-msg-composer-attachment-bar.c:508
+#: composer/e-msg-composer-attachment-bar.c:503
 msgid "Remove selected items from the attachment list"
 msgstr "Poista seuraavat tiedostot liiteluettelosta"
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr "Lisää liite..."
 
-#: composer/e-msg-composer-attachment-bar.c:539
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr "Lisää viestiin liitetiedoston"
 
@@ -10568,45 +10425,45 @@ msgstr ""
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:511
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Vastausosoite:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:522
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Lähettäjä:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:528
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Vastaanottaja:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:546
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Kopiot:"
 
-#: composer/e-msg-composer-hdrs.c:547
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Anna osoitteet joihin lähetetään kopio viestistä (Cc)"
 
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Piilokopiot:"
 
-#: composer/e-msg-composer-hdrs.c:551
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10617,12 +10474,12 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:558
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "_Portti:"
 
-#: composer/e-msg-composer-hdrs.c:560
+#: composer/e-msg-composer-hdrs.c:549
 #, fuzzy
 msgid "Posting destination"
 msgstr "Kuvaus:"
@@ -10632,12 +10489,12 @@ msgstr "Kuvaus:"
 msgid "Attach file(s)"
 msgstr "Liitä tiedosto(t)"
 
-#: composer/e-msg-composer.c:526
+#: composer/e-msg-composer.c:530
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Allekirjoitustiedoston luonti epäonnistui."
 
-#: composer/e-msg-composer.c:805
+#: composer/e-msg-composer.c:809
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10646,51 +10503,51 @@ msgstr ""
 "Tiedoston %s lukeminen epäonnistui:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1168
+#: composer/e-msg-composer.c:1172
 msgid "File exists, overwrite?"
 msgstr "Tiedosto on jo olemassa, kirjoitetaanko yli?"
 
-#: composer/e-msg-composer.c:1186
+#: composer/e-msg-composer.c:1190
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1209
+#: composer/e-msg-composer.c:1213
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Virhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1244
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1259
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1259
+#: composer/e-msg-composer.c:1266
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1266
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1275
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1284
+#: composer/e-msg-composer.c:1291
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10699,7 +10556,7 @@ msgstr ""
 "Virhe tallennettaessa tiedostoa automaattisesti: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1385
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10707,7 +10564,7 @@ msgstr ""
 "Ximian Evolution on löytänyt tallentamattomia tiedostoja edelliseltä \n"
 "istunnolta. Haluatko koettaa niiden palauttamista?"
 
-#: composer/e-msg-composer.c:1540
+#: composer/e-msg-composer.c:1547
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10718,38 +10575,39 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: composer/e-msg-composer.c:1545
+#: composer/e-msg-composer.c:1552
 msgid "_Discard Changes"
 msgstr ""
 
-#: composer/e-msg-composer.c:1549
+#: composer/e-msg-composer.c:1556
 msgid "Warning: Modified Message"
 msgstr "Varoitus: Muutettu viesti"
 
-#: composer/e-msg-composer.c:1581
+#: composer/e-msg-composer.c:1588
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:1939
+#: composer/e-msg-composer.c:2012
 #, fuzzy
 msgid "Signature:"
 msgstr "Tallenna allekirjoitus"
 
-#: composer/e-msg-composer.c:1979 mail/mail-account-gui.c:1255
+#: composer/e-msg-composer.c:2052 mail/mail-account-gui.c:1254
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2158 composer/e-msg-composer.c:2757
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2908
+#: composer/e-msg-composer.c:2909
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: composer/e-msg-composer.c:2788
+#: composer/e-msg-composer.c:2940
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2814
+#: composer/e-msg-composer.c:2966
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10760,7 +10618,7 @@ msgstr ""
 "Viestimuokkain -ikkunan luominen epäonnistui:\n"
 "HTML-muokkainkomponentin käynnistys ei onnistunut."
 
-#: composer/e-msg-composer.c:2874
+#: composer/e-msg-composer.c:3026
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10768,23 +10626,12 @@ msgstr ""
 "Viestimuokkain -ikkunan luominen epäonnistui:\n"
 "HTML-muokkainkomponentin käynnistys ei onnistunut."
 
-#: composer/e-msg-composer.c:3890
+#: composer/e-msg-composer.c:4039
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: 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:432
-#, fuzzy
-msgid "Cannot initialize the Evolution composer."
-msgstr "Evolutionin muokkaimen alustus ei onnistunut."
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr ""
@@ -10934,7 +10781,7 @@ msgid ""
 "ping_timeout_callback: could not determine if the CORBA object is nil or not"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:230
+#: e-util/e-dialog-utils.c:247
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10942,11 +10789,15 @@ msgstr ""
 "Saman niminen tiedosto on jo olemassa.\n"
 "Kirjoitetaanko sen yli?"
 
-#: e-util/e-passwords.c:345
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "Kirjoita tiedoston yli?"
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Muista tämä salasana"
 
-#: e-util/e-passwords.c:347
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -11045,42 +10896,68 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr ""
 
-#: filter/filter-datespec.c:65 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:181
-msgid "seconds"
-msgstr "sekuntia"
+#: filter/filter-datespec.c:65
+msgid "1 second ago"
+msgstr "1 sekunti sitten"
+
+#: filter/filter-datespec.c:65
+#, c-format
+msgid "%d seconds ago"
+msgstr "%d sekuntia sitten"
 
 #: filter/filter-datespec.c:66
-msgid "minute"
-msgstr "minuutti"
+msgid "1 minute ago"
+msgstr "1 minuutti sitten"
+
+#: filter/filter-datespec.c:66
+#, c-format
+msgid "%d minutes ago"
+msgstr "%d minuuttia sitten"
 
 #: filter/filter-datespec.c:67
-msgid "hour"
-msgstr "tunti"
+msgid "1 hour ago"
+msgstr "1 tunti sitten"
+
+#: filter/filter-datespec.c:67
+#, c-format
+msgid "%d hours ago"
+msgstr "%d tuntia sitten"
+
+#: filter/filter-datespec.c:68
+msgid "1 day ago"
+msgstr "1 päivä sitten"
+
+#: filter/filter-datespec.c:68
+#, c-format
+msgid "%d days ago"
+msgstr "%d päivää sitten"
 
 #: filter/filter-datespec.c:69
-msgid "week"
-msgstr "viikko"
+msgid "1 week ago"
+msgstr "1 viikko sitten"
 
-#: filter/filter-datespec.c:69 filter/filter.glade.h:29
-msgid "weeks"
-msgstr "viikkoa"
+#: filter/filter-datespec.c:69
+#, c-format
+msgid "%d weeks ago"
+msgstr "%d viikkoa sitten"
 
 #: filter/filter-datespec.c:70
-msgid "month"
-msgstr "kuukausi"
+msgid "1 month ago"
+msgstr "kuukausi sitten"
 
-#: filter/filter-datespec.c:70 filter/filter.glade.h:23
-msgid "months"
-msgstr "kuukautta"
+#: filter/filter-datespec.c:70
+#, c-format
+msgid "%d months ago"
+msgstr "%d kuukautta sitten"
 
 #: filter/filter-datespec.c:71
-msgid "year"
-msgstr "vuosi"
+msgid "1 year ago"
+msgstr ""
 
-#: filter/filter-datespec.c:71 filter/filter.glade.h:33
-msgid "years"
-msgstr "vuotta"
+#: filter/filter-datespec.c:71
+#, c-format
+msgid "%d years ago"
+msgstr "%d vuotta sitten"
 
 #: filter/filter-datespec.c:176
 #, fuzzy
@@ -11100,13 +10977,7 @@ msgstr "nyt"
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#. 1 (minute|day|...) ago (singular time ago)
-#: filter/filter-datespec.c:298 filter/filter-datespec.c:301
-#, c-format
-msgid "%d %s ago"
-msgstr ""
-
-#: filter/filter-datespec.c:417
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Valitse aika johon verrataan"
 
@@ -11124,7 +10995,7 @@ msgstr "Tyylin nimi:"
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "`%s' ei ole hakemisto."
 
-#: filter/filter-file.c:293
+#: filter/filter-file.c:298
 #, fuzzy
 msgid "Choose a file"
 msgstr "Valitse toiminto"
@@ -11140,7 +11011,7 @@ msgid "You must specify a folder."
 msgstr "Tyylin nimi:"
 
 #: filter/filter-folder.c:243 filter/vfolder-rule.c:408
-#: mail/mail-account-gui.c:1500 mail/mail-account-gui.c:1514
+#: mail/mail-account-gui.c:1503 mail/mail-account-gui.c:1517
 msgid "Select Folder"
 msgstr ""
 
@@ -11151,32 +11022,34 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:68
-#: mail/mail-config.glade.h:64
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1279
 msgid "Important"
 msgstr ""
 
 #. red
 #: filter/filter-label.c:122 mail/mail-config.c:69
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1280
 #, fuzzy
 msgid "Work"
 msgstr "Työviikk_o"
 
 #. orange
 #: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:87
+#: shell/e-config-upgrade.c:1281
 msgid "Personal"
 msgstr ""
 
 #. forest green
 #: filter/filter-label.c:124 mail/mail-config.c:71
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1282
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
 #: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:68
+#: shell/e-config-upgrade.c:1283
 #, fuzzy
 msgid "Later"
 msgstr "jälkeen"
@@ -11273,6 +11146,14 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr "kuukautta"
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:181
+msgid "seconds"
+msgstr "sekuntia"
+
 #: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr ""
@@ -11289,6 +11170,10 @@ msgstr ""
 msgid "vFolder Sources"
 msgstr ""
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "viikkoa"
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr ""
@@ -11301,6 +11186,10 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "vuotta"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11319,241 +11208,241 @@ msgid "Attachments"
 msgstr "Liitteet"
 
 #: filter/libfilter-i18n.h:6
-#, fuzzy
 msgid "Beep"
-msgstr "Belize"
+msgstr "Piippaus"
 
 #: 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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Otettu vastaan"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Lähetetty"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Poistettu"
 
-#: filter/libfilter-i18n.h:12
-msgid "Do Not Exist"
-msgstr ""
-
 #: filter/libfilter-i18n.h:13
-msgid "Draft"
-msgstr "Luonnos"
+msgid "does not contain"
+msgstr "ei sisällä"
 
 #: filter/libfilter-i18n.h:14
-msgid "Exist"
-msgstr ""
+msgid "does not end with"
+msgstr "ei lopu merkkijonoon"
 
 #: filter/libfilter-i18n.h:15
-msgid "Expression"
-msgstr ""
+msgid "does not exist"
+msgstr "ei ole olemassa"
 
 #: filter/libfilter-i18n.h:16
-msgid "Follow Up"
-msgstr ""
+#, fuzzy
+msgid "does not return"
+msgstr "ei ole olemassa"
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1778
-msgid "Label"
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
 msgstr ""
 
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
+msgstr "ei ala merkkijonolla"
+
 #: filter/libfilter-i18n.h:19
-msgid "Mailing list"
+msgid "Do Not Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "Message Body"
-msgstr ""
+msgid "Draft"
+msgstr "Luonnos"
 
 #: filter/libfilter-i18n.h:21
-msgid "Message Header"
-msgstr "Viestin otsikko"
+msgid "ends with"
+msgstr "loppuu merkkijonoon"
 
 #: filter/libfilter-i18n.h:22
-msgid "Move to Folder"
-msgstr "Siirrä kansioon"
+msgid "Exist"
+msgstr ""
 
 #: filter/libfilter-i18n.h:23
-#, fuzzy
-msgid "Pipe Message to Shell Command"
-msgstr "Lähetä viesti kontaktille"
+msgid "exists"
+msgstr ""
 
 #: filter/libfilter-i18n.h:24
-#, fuzzy
-msgid "Play Sound"
-msgstr "Puola"
-
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
-msgid "Read"
-msgstr "Lue"
+msgid "Expression"
+msgstr ""
 
-#: filter/libfilter-i18n.h:26
-msgid "Recipients"
-msgstr "Vastaanottajat"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "Regex Match"
-msgstr ""
+msgid "is"
+msgstr "on"
 
 #: filter/libfilter-i18n.h:28
-msgid "Replied to"
-msgstr ""
+#, fuzzy
+msgid "is after"
+msgstr "jälkeen"
 
-#: 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:29
+#, fuzzy
+msgid "is before"
+msgstr "ennen"
 
-#: filter/libfilter-i18n.h:30 mail/mail-callbacks.c:1809
-msgid "Sender"
-msgstr "Lähettäjä"
+#: filter/libfilter-i18n.h:30
+msgid "is Flagged"
+msgstr ""
 
 #: filter/libfilter-i18n.h:31
-msgid "Set Status"
-msgstr ""
+msgid "is greater than"
+msgstr "on suurempi kuin"
 
 #: filter/libfilter-i18n.h:32
-#, fuzzy
-msgid "Shell Command"
-msgstr "Yritys"
+msgid "is less than"
+msgstr "on pienempi kuin"
 
 #: filter/libfilter-i18n.h:33
-msgid "Size (kB)"
-msgstr "Koko (kt)"
+msgid "is not"
+msgstr "ei ole"
 
 #: filter/libfilter-i18n.h:34
-msgid "Source Account"
+#, fuzzy
+msgid "is not Flagged"
+msgstr "ei ole"
+
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
+msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
-msgid "Specific header"
+#: filter/libfilter-i18n.h:36
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "Stop Processing"
+msgid "Message Body"
 msgstr ""
 
-#: 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:38
+msgid "Message Header"
+msgstr "Viestin otsikko"
 
 #: filter/libfilter-i18n.h:39
-#, fuzzy
-msgid "Unset Status"
-msgstr "Yhdysvallat"
+msgid "Move to Folder"
+msgstr "Siirrä kansioon"
 
 #: filter/libfilter-i18n.h:40
-msgid "contains"
-msgstr "sisältää"
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Lähetä viesti kontaktille"
 
 #: filter/libfilter-i18n.h:41
-msgid "does not contain"
-msgstr "ei sisällä"
+#, fuzzy
+msgid "Play Sound"
+msgstr "Puola"
 
-#: filter/libfilter-i18n.h:42
-msgid "does not end with"
-msgstr "ei lopu merkkijonoon"
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
+msgid "Read"
+msgstr "Lue"
 
 #: filter/libfilter-i18n.h:43
-msgid "does not exist"
-msgstr "ei ole olemassa"
+msgid "Recipients"
+msgstr "Vastaanottajat"
 
 #: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "does not return"
-msgstr "ei ole olemassa"
+msgid "Regex Match"
+msgstr ""
 
 #: filter/libfilter-i18n.h:45
-msgid "does not sound like"
+msgid "Replied to"
 msgstr ""
 
 #: filter/libfilter-i18n.h:46
-msgid "does not start with"
-msgstr "ei ala merkkijonolla"
+#, fuzzy
+msgid "returns"
+msgstr "Burundi"
 
 #: filter/libfilter-i18n.h:47
-msgid "ends with"
-msgstr "loppuu merkkijonoon"
+#, fuzzy
+msgid "returns greater than"
+msgstr "on suurempi kuin"
 
 #: filter/libfilter-i18n.h:48
-msgid "exists"
-msgstr ""
+#, fuzzy
+msgid "returns less than"
+msgstr "on pienempi kuin"
 
-#: filter/libfilter-i18n.h:49
-msgid "is Flagged"
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
-#, fuzzy
-msgid "is after"
-msgstr "jälkeen"
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
+msgid "Sender"
+msgstr "Lähettäjä"
 
 #: filter/libfilter-i18n.h:51
-#, fuzzy
-msgid "is before"
-msgstr "ennen"
+msgid "Set Status"
+msgstr ""
 
 #: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr "on suurempi kuin"
+#, fuzzy
+msgid "Shell Command"
+msgstr "Yritys"
 
 #: filter/libfilter-i18n.h:53
-msgid "is less than"
-msgstr "on pienempi kuin"
+msgid "Size (kB)"
+msgstr "Koko (kt)"
 
 #: filter/libfilter-i18n.h:54
-#, fuzzy
-msgid "is not Flagged"
-msgstr "ei ole"
+msgid "sounds like"
+msgstr ""
 
 #: filter/libfilter-i18n.h:55
-msgid "is not"
-msgstr "ei ole"
+msgid "Source Account"
+msgstr ""
 
 #: filter/libfilter-i18n.h:56
-msgid "is"
-msgstr "on"
+msgid "Specific header"
+msgstr ""
 
 #: filter/libfilter-i18n.h:57
-#, fuzzy
-msgid "returns greater than"
-msgstr "on suurempi kuin"
-
-#: filter/libfilter-i18n.h:58
-#, fuzzy
-msgid "returns less than"
-msgstr "on pienempi kuin"
+msgid "starts with"
+msgstr "alkaa merkkijonolla"
 
 #: filter/libfilter-i18n.h:59
-#, fuzzy
-msgid "returns"
-msgstr "Burundi"
-
-#: filter/libfilter-i18n.h:60
-msgid "sounds like"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "alkaa merkkijonolla"
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: mail/message-tags.glade.h:4
+msgid "Subject"
+msgstr "Aihe"
 
-#: filter/rule-editor.c:170
-msgid "Rules"
-msgstr "Säännöt"
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Yhdysvallat"
 
-#: filter/rule-editor.c:241 filter/rule-editor.c:325
+#: filter/rule-context.c:661 filter/rule-editor.c:241 filter/rule-editor.c:325
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
+#: filter/rule-editor.c:170
+msgid "Rules"
+msgstr "Säännöt"
+
 #: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Lisää sääntö"
@@ -11579,48 +11468,48 @@ msgstr "Muuta tämän vKansion nimeä"
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:492
+#: filter/vfolder-rule.c:499
 msgid "VFolder source"
 msgstr "vKansion lähde"
 
-#: importers/elm-importer.c:95 mail/importers/elm-importer.c:103
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
 #: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101 mail/importers/elm-importer.c:104
-#: mail/importers/netscape-importer.c:1237 mail/importers/pine-importer.c:114
+#: importers/pine-importer.c:101 mail/importers/elm-importer.c:106
+#: mail/importers/netscape-importer.c:1238 mail/importers/pine-importer.c:115
 msgid "Importing..."
 msgstr "Tuodaan..."
 
 #: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103 mail/importers/elm-importer.c:106
-#: mail/importers/netscape-importer.c:1239 mail/importers/pine-importer.c:116
+#: importers/pine-importer.c:103 mail/importers/elm-importer.c:108
+#: mail/importers/netscape-importer.c:1240 mail/importers/pine-importer.c:117
 msgid "Please wait"
 msgstr "Odota, ole hyvä"
 
 #: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365 mail/importers/elm-importer.c:183
-#: mail/importers/netscape-importer.c:1794 mail/importers/pine-importer.c:330
+#: importers/pine-importer.c:365 mail/importers/elm-importer.c:157
+#: mail/importers/netscape-importer.c:1759 mail/importers/pine-importer.c:288
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
 #: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471 mail/importers/elm-importer.c:389
-#: mail/importers/netscape-importer.c:1906 mail/importers/pine-importer.c:439
+#: importers/pine-importer.c:471 mail/importers/elm-importer.c:392
+#: mail/importers/netscape-importer.c:1887 mail/importers/pine-importer.c:425
 #, 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: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
+#: importers/pine-importer.c:637 mail/component-factory.c:114
+#: mail/folder-browser-ui.c:359 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
 msgid "Mail"
 msgstr ""
 
-#: importers/elm-importer.c:545 mail/importers/elm-importer.c:544
+#: importers/elm-importer.c:545 mail/importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -11628,7 +11517,7 @@ msgstr ""
 "Evolution löysi Elmin sähköpostitiedostoja.\n"
 "Haluatko tuoda nämä Evolutioniin?"
 
-#: importers/elm-importer.c:574 mail/importers/elm-importer.c:565
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Elm"
 
@@ -11640,12 +11529,12 @@ msgstr ""
 "Evolution löysi GnomeCardin tiedostoja.\n"
 "Haluatko tuoda nämä Evolutioniin?"
 
-#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:74
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
 msgstr "_Prioriteetti:"
 
-#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:662
+#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:663
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -11660,7 +11549,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:686
+#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:687
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -11668,7 +11557,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:703
+#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:704
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -11677,41 +11566,41 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1236
+#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1861
+#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
 #: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Roskakori"
 
-#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:2014
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 #, 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
+#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2034
-#: shell/e-shell-startup-wizard.c:519
+#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2109
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "Asetukset"
 
-#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2114
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Suodattimet"
 
-#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2119
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11719,11 +11608,11 @@ msgstr ""
 "Evolution löysi Netscapen sähköpostitiedostoja.\n"
 "Haluatko tuoda nämä Evolutioniin?"
 
-#: importers/pine-importer.c:100 mail/importers/pine-importer.c:113
+#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: importers/pine-importer.c:663 mail/importers/pine-importer.c:613
+#: importers/pine-importer.c:663 mail/importers/pine-importer.c:599
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -11731,7 +11620,7 @@ msgstr ""
 "Evolution löysi Pinen sähköpostitiedostoja.\n"
 "Haluatko tuoda nämä Evolutioniin?"
 
-#: importers/pine-importer.c:691 mail/importers/pine-importer.c:632
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
 #, fuzzy
 msgid "Pine"
 msgstr "Tulosta"
@@ -11810,118 +11699,103 @@ msgstr ""
 msgid "Mail configuration interface"
 msgstr ""
 
-#: mail/component-factory.c:113
+#: mail/component-factory.c:114
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Suodata postituslistan mukaan"
 
-#: mail/component-factory.c:114
+#: mail/component-factory.c:115
 #, fuzzy
 msgid "Public Mail"
 msgstr "Julkinen"
 
-#: mail/component-factory.c:114
+#: mail/component-factory.c:115
 #, fuzzy
 msgid "Public folder containing mail"
 msgstr "Suodata postituslistan mukaan"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:116
 msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:116
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:143
+#: mail/component-factory.c:144
 msgid "This folder cannot contain messages."
 msgstr "Tämä kansio ei voi sisältää viestejä."
 
-#: mail/component-factory.c:437
+#: mail/component-factory.c:438
 msgid "Properties..."
 msgstr "Ominaisuudet..."
 
-#: mail/component-factory.c:437
+#: mail/component-factory.c:438
 msgid "Change this folder's properties"
 msgstr "Muuta tämän kansion ominaisuuksia"
 
-#: mail/component-factory.c:821
+#: mail/component-factory.c:816
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:988
+#: mail/component-factory.c:996
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:1012
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:1052
+#: mail/component-factory.c:1060
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Seuraava viesti"
 
-#: mail/component-factory.c:1052
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:1053
+#: mail/component-factory.c:1061
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Kirjoita viesti"
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "New Message Post"
 msgstr "Seuraava viesti"
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "_Post Message"
 msgstr "Edellinen viesti"
 
-#: mail/component-factory.c:1062
+#: mail/component-factory.c:1070
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Seuraava viesti"
 
-#: mail/component-factory.c:1090
-#, fuzzy
-msgid "Cannot initialize the Evolution mail component."
-msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
-
-#: mail/component-factory.c:1099
-#, fuzzy
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
-
-#: mail/component-factory.c:1105
-#, fuzzy
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
-
-#: mail/component-factory.c:1349 mail/component-factory.c:1379
+#: mail/component-factory.c:1353
 #, fuzzy
 msgid "Connecting..."
 msgstr "Peruutetaan..."
 
-#: mail/component-factory.c:1390
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:483
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Kansion \"%s\" ominaisuudet"
 
-#: mail/folder-browser-ui.c:485
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:920
+#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:939
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Väliaikaishakemistoa ei voitu luoda: %s"
@@ -11966,138 +11840,138 @@ msgstr "%d lähetetty"
 msgid "%d total"
 msgstr "%d yhteensä"
 
-#: mail/folder-browser.c:1167
+#: mail/folder-browser.c:1182
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "_Luo viestistä suodatin"
 
-#: mail/folder-browser.c:1714
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1715
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1716
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: mail/folder-browser.c:1722
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "Suodata _lähettäjän mukaan"
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: mail/folder-browser.c:1724 mail/folder-browser.c:2048
+#: mail/folder-browser.c:1739 mail/folder-browser.c:2063
 msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "Tulosta viesti..."
 
-#: mail/folder-browser.c:1744
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: mail/folder-browser.c:1748 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1763 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1764 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: mail/folder-browser.c:1750 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: mail/folder-browser.c:1755
+#: mail/folder-browser.c:1770
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1756
+#: mail/folder-browser.c:1771
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Valmis"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1772
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Kalenteri"
 
 #. separator here?
-#: mail/folder-browser.c:1761 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1776 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1777
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: mail/folder-browser.c:1763
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "Merkitse tärkeäks_i"
 
-#: mail/folder-browser.c:1764
+#: mail/folder-browser.c:1779
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Merkitse tärkeäks_i"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1784
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Palauta"
 
-#: mail/folder-browser.c:1773
+#: mail/folder-browser.c:1788
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: mail/folder-browser.c:1774 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1789 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: mail/folder-browser.c:1782
+#: mail/folder-browser.c:1797
 msgid "Add Sender to Address_book"
 msgstr "Lisää lähettäjä _osoitekirjaan"
 
-#: mail/folder-browser.c:1786
+#: mail/folder-browser.c:1801
 msgid "Appl_y Filters"
 msgstr "Toteuta _suodattimet"
 
-#: mail/folder-browser.c:1790
+#: mail/folder-browser.c:1805
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "_Luo viestistä sääntö"
 
-#: mail/folder-browser.c:2049
+#: mail/folder-browser.c:2064
 msgid "VFolder on M_ailing List"
 msgstr "Suodata vKansio _postituslistan mukaan"
 
-#: mail/folder-browser.c:2051
+#: mail/folder-browser.c:2066
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Suodata postituslistan mukaan (%s)"
 
-#: mail/folder-browser.c:2052
+#: mail/folder-browser.c:2067
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Suodata vKansio _postituslistan mukaan (%s)"
@@ -12169,57 +12043,57 @@ msgstr "Et ole täyttänyt kaikkia tarvittavia kohtia."
 msgid "Evolution Account Editor"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-account-gui.c:752 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Isäntäpalvelin:"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:127
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "Käyttäjät_unnus:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Polku:"
 
-#: mail/mail-account-gui.c:1877
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Are you sure you want to delete this account?"
 msgstr "Haluatko varmasti poistaa tämän tilin?"
 
-#: mail/mail-accounts.c:230
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr "Älä poista"
 
-#: mail/mail-accounts.c:303 mail/mail-accounts.c:341
-#: mail/mail-composer-prefs.c:657 mail/mail-composer-prefs.c:675
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:668
 msgid "Disable"
 msgstr "Älä käytä"
 
-#: mail/mail-accounts.c:303 mail/mail-accounts.c:343
-#: mail/mail-composer-prefs.c:657 mail/mail-composer-prefs.c:675
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:668
 msgid "Enable"
 msgstr "Käytä"
 
 #. translators: default account indicator
-#: mail/mail-accounts.c:383
+#: mail/mail-accounts.c:433
 #, fuzzy
 msgid "[Default]"
 msgstr "_Oletukset"
 
-#: mail/mail-accounts.c:427 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:818
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:680 mail/mail-composer-prefs.c:836
 msgid "Enabled"
 msgstr "Käytä"
 
-#: mail/mail-accounts.c:432 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Tilin nimi"
 
-#: mail/mail-accounts.c:434 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
@@ -12260,11 +12134,11 @@ msgid ""
 msgstr ""
 
 #. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:102 widgets/misc/e-messagebox.c:226
+#: mail/mail-callbacks.c:100 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
+#: mail/mail-callbacks.c:189
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -12276,38 +12150,38 @@ msgstr ""
 "vastaanottaa tai kirjoittaa viestejä.\n"
 "Haluatko tehdä asetukset nyt?"
 
-#: mail/mail-callbacks.c:213
+#: mail/mail-callbacks.c:211
 #, 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
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:234
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:256
+#: mail/mail-callbacks.c:254
 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:268
+#: mail/mail-callbacks.c:266
 #, fuzzy
 msgid "Send anyway?"
 msgstr "Lähetä sähköpostia"
 
-#: mail/mail-callbacks.c:289
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -12315,57 +12189,57 @@ msgstr ""
 "Viestillä ei ole aihetta.\n"
 "Lähetetäänkö toedella?"
 
-#: mail/mail-callbacks.c:315
+#: mail/mail-callbacks.c:313
 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:319
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:324
+#: mail/mail-callbacks.c:322
 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:458
+#: mail/mail-callbacks.c:470
 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ä."
 
-#: mail/mail-callbacks.c:713
+#: mail/mail-callbacks.c:722
 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:1178
+#: mail/mail-callbacks.c:1187
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Tuntematon virhe"
 
-#: mail/mail-callbacks.c:1182
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1689 mail/message-browser.c:143
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
 msgid "Move message(s) to"
 msgstr "Siirrä viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:1691 mail/message-browser.c:145
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
 msgid "Copy message(s) to"
 msgstr "Kopioi viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:2335
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2351
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12373,7 +12247,7 @@ msgstr ""
 "Voit muokata vain Luonnokset\n"
 "-kansiossa olevia viestejä."
 
-#: mail/mail-callbacks.c:2384
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12381,23 +12255,25 @@ msgstr ""
 "Voit lähettää uudelleen vain\n"
 "\"Lähetetyt\"-kansiossa olevia viestejä."
 
-#: mail/mail-callbacks.c:2394
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Haluatko todella lähettää kaikki %d viestiä uudelleen?"
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "Ei viestejä valittuna"
 
-#: mail/mail-callbacks.c:2456
-#, fuzzy, c-format
+#: mail/mail-callbacks.c:2465
+#, c-format
 msgid ""
 "Cannot save to `%s'\n"
 " %s"
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
+msgstr ""
+"Tallentaminen ei onnistu \"%s\"\n"
+"%s"
 
-#: mail/mail-callbacks.c:2461
+#: mail/mail-callbacks.c:2470
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12406,15 +12282,15 @@ msgstr ""
 "Saman niminen tiedosto on jo olemassa.\n"
 "Kirjoitetaanko sen yli?"
 
-#: mail/mail-callbacks.c:2502
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "Tallenna viesti nimellä..."
 
-#: mail/mail-callbacks.c:2504
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "Tallenna viestit nimellä..."
 
-#: mail/mail-callbacks.c:2672
+#: mail/mail-callbacks.c:2687
 msgid ""
 "This operation will permanently erase all messages marked as\n"
 "deleted. If you continue, you will not be able to recover these messages.\n"
@@ -12422,70 +12298,59 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2758
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2766
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Suodattimet"
 
-#: mail/mail-callbacks.c:2808
+#: mail/mail-callbacks.c:2831
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Haetaan viestiä %d / %d"
 
-#: mail/mail-callbacks.c:2864
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/mail-callbacks.c:2931
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr "Viestin tulostus epäonnistui"
 
-#: mail/mail-callbacks.c:3121
+#: mail/mail-callbacks.c:3146
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:226
-msgid ""
-"Please specify signature filename\n"
-"in Advanced section of signature settings."
-msgstr ""
-
-#: 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
+#: mail/mail-composer-prefs.c:225 mail/mail-composer-prefs.c:328
+#: mail/mail-config.c:1220
 #, fuzzy
-msgid "Unnamed [script]"
-msgstr "Nimetön kontaktiluettelo"
+msgid "Unnamed"
+msgstr "Nimetön kontakti"
 
-#: mail/mail-composer-prefs.c:327
+#: mail/mail-composer-prefs.c:313
 msgid "You must specify a valid script name."
 msgstr "Määrittele kelvollinen komentotiedoston nimi."
 
-#: mail/mail-composer-prefs.c:342 mail/mail-config.c:1218
-#, fuzzy
-msgid "Unnamed"
-msgstr "Nimetön kontakti"
+#: mail/mail-composer-prefs.c:369 mail/mail-composer-prefs.c:431
+msgid "[script]"
+msgstr "[komentotiedosto]"
 
-#: mail/mail-composer-prefs.c:822
+#: mail/mail-composer-prefs.c:840
 #, fuzzy
 msgid "Language(s)"
 msgstr "Lataa k_uvat"
 
-#: mail/mail-composer-prefs.c:866
+#: mail/mail-composer-prefs.c:882
 msgid "Add script signature"
 msgstr "Lisää allekirjoituskomentotiedosto"
 
-#: mail/mail-composer-prefs.c:885
+#: mail/mail-composer-prefs.c:902
 #, fuzzy
 msgid "Signature(s)"
 msgstr "_HTML-allekirjoitus:"
@@ -12540,11 +12405,11 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:922
+#: mail/mail-config.c:924
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1000 mail/mail-config.c:1004
+#: mail/mail-config.c:1002 mail/mail-config.c:1006
 msgid "Connecting to server..."
 msgstr ""
 
@@ -13208,10 +13073,6 @@ 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"
@@ -13248,37 +13109,37 @@ msgstr "Piilota"
 msgid "External Viewer"
 msgstr "Ulkoinen katselin"
 
-#: mail/mail-display.c:1346
+#: mail/mail-display.c:1365
 #, fuzzy
 msgid "Downloading images"
 msgstr "Lataa k_uvat"
 
-#: mail/mail-display.c:1523
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr "Ladataan viestin sisältöä"
 
-#: mail/mail-display.c:1860
+#: mail/mail-display.c:1879
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1864
+#: mail/mail-display.c:1883
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:2215
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "Avaa linkki selaimessa"
 
-#: mail/mail-display.c:2216
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Kopioi linkin sijainti"
 
-#: mail/mail-display.c:2218
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "Tallenna linkki nimellä"
 
-#: mail/mail-display.c:2220
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "Tallenna kuva nimellä..."
 
@@ -13292,85 +13153,84 @@ msgstr "Lähetetään \"%s\""
 msgid "%s attachment"
 msgstr ""
 
-#: 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
+#: mail/mail-format.c:682 mail/mail-format.c:1339 mail/mail-format.c:1408
+#: mail/mail-format.c:1528 mail/mail-format.c:1652 mail/mail-format.c:1677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:759 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Päiväys"
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:845
 msgid "Bad Address"
 msgstr "Epäkelpo osoite"
 
-#: mail/mail-format.c:887 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 #: mail/message-tag-followup.c:301 mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Lähettäjä"
 
-#: mail/mail-format.c:891
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Vastausosoite:"
 
-#: mail/mail-format.c:896 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: mail/mail-format.c:901
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Kopiot:"
 
-#: mail/mail-format.c:906
-#, fuzzy
+#: mail/mail-format.c:905
 msgid "Bcc"
-msgstr "Piilokopiot:"
+msgstr "Piilokopiot"
 
-#: mail/mail-format.c:1449
+#: mail/mail-format.c:1451
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1477
+#: mail/mail-format.c:1479
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Yhdistäminen palvelimeen epäonnistui: %s"
 
-#: mail/mail-format.c:1485
+#: mail/mail-format.c:1487
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1492
+#: mail/mail-format.c:1494
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1756
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1767
+#: mail/mail-format.c:1769
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1770
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1797
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1803
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1805
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr ""
 
@@ -13385,16 +13245,18 @@ msgid "Reconfiguring folder"
 msgstr "Synkronoidaan kansiota"
 
 #: mail/mail-local.c:748
-#, fuzzy, c-format
+#, 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"
+msgstr ""
+"Kansion metatietojen tallentaminen ei onnistu; tämän kansion\n"
+"avaaminen saattaa olla jatkossa mahdotonta: %s: %s"
 
 #: mail/mail-local.c:804
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot save folder metainfo to %s: %s"
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
+msgstr "Kansion metatietojen tallennus ei onnistu %s: %s"
 
 #: mail/mail-local.c:856
 #, c-format
@@ -13536,83 +13398,79 @@ msgstr "Haetaan %d viesti(ä)"
 msgid "Saving %d messsage(s)"
 msgstr "Tallennetaan %d viesti(ä)"
 
-#: mail/mail-ops.c:1916
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2065
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2213
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2213
+#: mail/mail-ops.c:2146
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Hakuasetukset"
 
-#: mail/mail-search-dialogue.c:121 widgets/misc/e-search-bar.c:518
-msgid "_Search"
-msgstr "_Etsi"
-
-#: mail/mail-search.c:142
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr "(Nimetön viesti)"
 
-#: mail/mail-search.c:224
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr "Nimetön viesti"
 
-#: mail/mail-search.c:226
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr "Tyhjä viesti"
 
-#: mail/mail-search.c:274
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr "Hae viestistä"
 
-#: mail/mail-search.c:277
+#: mail/mail-search.c:285
 msgid "Search"
 msgstr "Etsi"
 
-#: mail/mail-search.c:303
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr "Kirjainkoolla on merkitystä"
 
-#: mail/mail-search.c:305
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr ""
 
-#: mail/mail-search.c:325
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "Etsi:"
 
-#: mail/mail-search.c:328
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr "Osumia:"
 
@@ -13666,20 +13524,20 @@ msgstr ""
 msgid "Enter Password"
 msgstr "Salasana"
 
-#: mail/mail-session.c:282
+#: mail/mail-session.c:280
 msgid "_Remember this password"
 msgstr "_Muista tämä salasana"
 
-#: mail/mail-session.c:283
+#: mail/mail-session.c:281
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
-#: mail/mail-signature-editor.c:81
+#: mail/mail-signature-editor.c:80
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Allekirjoitustiedoston luonti epäonnistui."
 
-#: mail/mail-signature-editor.c:176
+#: mail/mail-signature-editor.c:226
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13689,38 +13547,38 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: mail/mail-signature-editor.c:179
+#: mail/mail-signature-editor.c:229
 msgid "_Discard changes"
 msgstr ""
 
-#: mail/mail-signature-editor.c:183
+#: mail/mail-signature-editor.c:233
 msgid "Save signature"
 msgstr "Tallenna allekirjoitus"
 
-#: mail/mail-signature-editor.c:328
+#: mail/mail-signature-editor.c:389
 #, fuzzy
 msgid "Edit signature"
 msgstr "Lisää ehto"
 
-#: mail/mail-signature-editor.c:366
+#: mail/mail-signature-editor.c:429
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "_HTML-allekirjoitus:"
 
-#: mail/mail-signature-editor.c:369 my-evolution/e-summary-preferences.c:622
+#: mail/mail-signature-editor.c:432 my-evolution/e-summary-preferences.c:625
 msgid "Name:"
 msgstr "Nimi:"
 
-#: mail/mail-tools.c:267
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Välitetty viesti - %s"
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr "Välitetty viesti"
 
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr "Välitetty viesti"
 
@@ -13743,7 +13601,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:777 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "vKansiot"
 
@@ -13751,24 +13609,24 @@ msgstr "vKansiot"
 msgid "vFolders"
 msgstr "vKansiot"
 
-#: mail/mail-vfolder.c:875
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "Muokkaa vKansiota"
 
-#: mail/mail-vfolder.c:893
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:946
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-browser.c:219
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr "(Ei aihetta)"
 
-#: mail/message-browser.c:221
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Viesti"
@@ -13833,7 +13691,7 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2602
+#: mail/message-list.c:2610
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
@@ -13933,49 +13791,45 @@ msgstr ""
 msgid "_Flag:"
 msgstr "Tiedostonimi:"
 
-#: mail/subscribe-dialog.c:232
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:234
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:332
+#: mail/subscribe-dialog.c:331
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:333
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1246 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Kansio"
 
-#: mail/subscribe-dialog.c:1427
+#: mail/subscribe-dialog.c:1356
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Tallenna kansioon..."
 
-#: mail/subscribe-dialog.c:1549
+#: mail/subscribe-dialog.c:1470
 msgid "No server has been selected"
 msgstr "Ei palvelinta valittuna"
 
-#: mail/subscribe-dialog.c:1624
+#: mail/subscribe-dialog.c:1545
 msgid "Please select a server."
 msgstr "Valitse palvelin."
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "All folders"
-msgstr "Kaikki kansiot"
-
-#: mail/subscribe-dialog.glade.h:5 ui/evolution-comp-editor.xml.h:2
+#: mail/subscribe-dialog.glade.h:3 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
@@ -13984,34 +13838,25 @@ msgstr "Kaikki kansiot"
 msgid "Close"
 msgstr "Sulje"
 
-#: mail/subscribe-dialog.glade.h:6
-#, fuzzy
-msgid "Display Options"
-msgstr "Näytä toinen kansio"
-
-#: mail/subscribe-dialog.glade.h:7
-msgid "Folders whose names begin with:"
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:4
 msgid "Manage Subscriptions"
 msgstr "Hallitse tilauksia"
 
-#: mail/subscribe-dialog.glade.h:9 ui/evolution-subscribe.xml.h:3
+#: mail/subscribe-dialog.glade.h:5 ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:6
 #, fuzzy
 msgid "S_elect server: "
 msgstr "Valitse kansio"
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:7
 #, fuzzy
 msgid "_Subscribe"
 msgstr "Tilaa"
 
-#: mail/subscribe-dialog.glade.h:12
+#: mail/subscribe-dialog.glade.h:8
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "Poista tilaus"
@@ -14611,33 +14456,28 @@ msgid "Auburn"
 msgstr ""
 
 #: my-evolution/Locations.h:148
-#, fuzzy
 msgid "Auckland"
-msgstr "Islanti"
+msgstr "Auckland"
 
 #: my-evolution/Locations.h:149
 msgid "Augsburg"
 msgstr ""
 
 #: my-evolution/Locations.h:150
-#, fuzzy
 msgid "Augusta"
-msgstr "Elokuu"
+msgstr "Augusta"
 
 #: my-evolution/Locations.h:151
-#, fuzzy
 msgid "Aurora"
-msgstr "Itävalta"
+msgstr "Aurora"
 
 #: my-evolution/Locations.h:152
-#, fuzzy
 msgid "Austin"
-msgstr "Itävalta"
+msgstr "Austin"
 
 #: my-evolution/Locations.h:153
-#, fuzzy
 msgid "Australasia"
-msgstr "Australia"
+msgstr "Australasia"
 
 #: my-evolution/Locations.h:156
 msgid "Avalon"
@@ -14652,9 +14492,8 @@ msgid "Ayacucho"
 msgstr ""
 
 #: my-evolution/Locations.h:159
-#, fuzzy
 msgid "Bage"
-msgstr "Sivu"
+msgstr "Bage"
 
 #: my-evolution/Locations.h:160
 msgid "Bagotville"
@@ -14689,37 +14528,32 @@ msgid "Balikesir/Bandirma"
 msgstr ""
 
 #: my-evolution/Locations.h:170
-#, fuzzy
 msgid "Ball Mountain"
-msgstr "Sähköposti sisältää"
+msgstr "Ball Mountain"
 
 #: my-evolution/Locations.h:171
-#, fuzzy
 msgid "Baltimore"
-msgstr "Balttilainen"
+msgstr "Baltimore"
 
 #: my-evolution/Locations.h:172
 msgid "Baltimore-Glen Burnie"
 msgstr ""
 
 #: my-evolution/Locations.h:173
-#, fuzzy
 msgid "Banak"
-msgstr "Botswana"
+msgstr "Banak"
 
 #: my-evolution/Locations.h:174
-#, fuzzy
 msgid "Bandarabbass"
-msgstr "Barbados"
+msgstr "Bandarabbass"
 
 #: my-evolution/Locations.h:175
 msgid "Bangor"
 msgstr ""
 
 #: my-evolution/Locations.h:176
-#, fuzzy
 msgid "Baracoa"
-msgstr "Barbados"
+msgstr "Baracoa"
 
 #: my-evolution/Locations.h:177
 msgid "Barbers Point"
@@ -14730,27 +14564,24 @@ msgid "Barcelona"
 msgstr ""
 
 #: my-evolution/Locations.h:179
-#, fuzzy
 msgid "Bardufoss"
-msgstr "Barbados"
+msgstr "Bardufoss"
 
 #: my-evolution/Locations.h:180
 msgid "Bar Harbor"
 msgstr ""
 
 #: my-evolution/Locations.h:181
-#, fuzzy
 msgid "Bari"
-msgstr "Bahrain"
+msgstr "Bari"
 
 #: my-evolution/Locations.h:182
 msgid "Bariloche"
 msgstr ""
 
 #: my-evolution/Locations.h:183
-#, fuzzy
 msgid "Barinas"
-msgstr "Bahrain"
+msgstr "Barinas"
 
 #: my-evolution/Locations.h:184
 msgid "Barking Sand"
@@ -14777,9 +14608,8 @@ msgid "Barrow"
 msgstr ""
 
 #: my-evolution/Locations.h:190
-#, fuzzy
 msgid "Barter Island"
-msgstr "Färsaaret"
+msgstr "Barter Island"
 
 #: my-evolution/Locations.h:191
 msgid "Bartlesville"
@@ -14790,18 +14620,16 @@ msgid "Bartow"
 msgstr ""
 
 #: my-evolution/Locations.h:193
-#, fuzzy
 msgid "Bastia"
-msgstr "Latvia"
+msgstr "Bastia"
 
 #: my-evolution/Locations.h:194
 msgid "Batesville"
 msgstr ""
 
 #: my-evolution/Locations.h:195
-#, fuzzy
 msgid "Batman"
-msgstr "Bhutan"
+msgstr "Batman"
 
 #: my-evolution/Locations.h:196
 msgid "Baton Rouge"
@@ -14812,37 +14640,32 @@ msgid "Battle Creek"
 msgstr ""
 
 #: my-evolution/Locations.h:198
-#, fuzzy
 msgid "Battle Mountain"
-msgstr "Nimi sisältää"
+msgstr "Battle Mountain"
 
 #: my-evolution/Locations.h:199
-#, fuzzy
 msgid "Bauru"
-msgstr "Valko-Venäjä"
+msgstr "Bauru"
 
 #: my-evolution/Locations.h:200
-#, fuzzy
 msgid "Bayamo"
-msgstr "Bahamasaaret"
+msgstr "Bayamo"
 
 #: my-evolution/Locations.h:201
 msgid "Bayreuth"
 msgstr ""
 
 #: my-evolution/Locations.h:202
-#, fuzzy
 msgid "Beatrice"
-msgstr "Balttilainen"
+msgstr "Beatrice"
 
 #: my-evolution/Locations.h:203
 msgid "Beaufort"
 msgstr ""
 
 #: my-evolution/Locations.h:204
-#, fuzzy
 msgid "Beaumont"
-msgstr "kuukausi"
+msgstr "Beaumont"
 
 #: my-evolution/Locations.h:205
 msgid "Beaumont-Port Arthur"
@@ -14853,38 +14676,32 @@ msgid "Beauvais-Tille"
 msgstr ""
 
 #: my-evolution/Locations.h:207
-#, fuzzy
 msgid "Beauvechain"
-msgstr "Bahrain"
+msgstr "Beauvechain"
 
 #: my-evolution/Locations.h:208
-#, fuzzy
 msgid "Beckley"
-msgstr "Belize"
+msgstr "Beckley"
 
 #: my-evolution/Locations.h:209
-#, fuzzy
 msgid "Bedford"
-msgstr "ennen"
+msgstr "Bedford"
 
 #: my-evolution/Locations.h:210
-#, fuzzy
 msgid "Beijing"
-msgstr "Benin"
+msgstr "Peking"
 
 #: my-evolution/Locations.h:211
-#, fuzzy
 msgid "Beirut"
-msgstr "Valko-Venäjä"
+msgstr "Beirut"
 
 #: my-evolution/Locations.h:212
 msgid "Beja"
 msgstr ""
 
 #: my-evolution/Locations.h:213
-#, fuzzy
 msgid "Belem"
-msgstr "Belize"
+msgstr "Belem"
 
 #: my-evolution/Locations.h:214
 msgid "Belfast/Aldergrove"
@@ -14899,9 +14716,8 @@ msgid "Belgorod"
 msgstr ""
 
 #: my-evolution/Locations.h:219
-#, fuzzy
 msgid "Belleville"
-msgstr "Belize"
+msgstr "Belleville"
 
 #: my-evolution/Locations.h:220
 msgid "Bellingham"
@@ -14912,9 +14728,8 @@ msgid "Belmar-Farmingdale"
 msgstr ""
 
 #: my-evolution/Locations.h:222
-#, fuzzy
 msgid "Belo Horizonte"
-msgstr "Belize"
+msgstr "Belo Horizonte"
 
 #: my-evolution/Locations.h:223
 msgid "Belo Horizonte Apt"
@@ -14925,14 +14740,12 @@ msgid "Bemidji"
 msgstr ""
 
 #: my-evolution/Locations.h:225
-#, fuzzy
 msgid "Benbecula"
-msgstr "Venezuela"
+msgstr "Benbecula"
 
 #: my-evolution/Locations.h:226
-#, fuzzy
 msgid "Benina"
-msgstr "Benin"
+msgstr "Benina"
 
 #: my-evolution/Locations.h:227
 msgid "Benton Harbor"
@@ -14943,18 +14756,16 @@ msgid "Bentonville"
 msgstr ""
 
 #: my-evolution/Locations.h:229
-#, fuzzy
 msgid "Beograd"
-msgstr "Lue"
+msgstr "Beograd"
 
 #: my-evolution/Locations.h:230
 msgid "Bergamo"
 msgstr ""
 
 #: my-evolution/Locations.h:231
-#, fuzzy
 msgid "Bergen"
-msgstr "Näkemättä"
+msgstr "Bergen"
 
 #: my-evolution/Locations.h:232
 msgid "Bergstrom AFB"
@@ -14965,9 +14776,8 @@ msgid "Berlevag"
 msgstr ""
 
 #: my-evolution/Locations.h:234
-#, fuzzy
 msgid "Berlin"
-msgstr "Benin"
+msgstr "Berliini"
 
 #: my-evolution/Locations.h:235
 msgid "Berlin-Tegel"
@@ -14978,28 +14788,24 @@ msgid "Berlin-Tempelhof"
 msgstr ""
 
 #: my-evolution/Locations.h:237
-#, fuzzy
 msgid "Bern"
-msgstr "Benin"
+msgstr "Bern"
 
 #: my-evolution/Locations.h:238
-#, fuzzy
 msgid "Bethel"
-msgstr "Säätiedot"
+msgstr "Bethel"
 
 #: my-evolution/Locations.h:239
 msgid "Bethlehem Airport"
 msgstr ""
 
 #: my-evolution/Locations.h:240
-#, fuzzy
 msgid "Bettles"
-msgstr "Belize"
+msgstr "Bettles"
 
 #: my-evolution/Locations.h:241
-#, fuzzy
 msgid "Beverly"
-msgstr "Joka"
+msgstr "Beverly"
 
 #: my-evolution/Locations.h:242
 msgid "Biarritz-Bayonne"
@@ -15014,9 +14820,8 @@ msgid "Biggin Hill"
 msgstr ""
 
 #: my-evolution/Locations.h:245
-#, fuzzy
 msgid "Big Piney"
-msgstr "Tulosta"
+msgstr "Big Piney"
 
 #: my-evolution/Locations.h:246
 msgid "Big River Lake"
@@ -15063,14 +14868,12 @@ msgid "Blagoveschensk"
 msgstr ""
 
 #: my-evolution/Locations.h:257
-#, fuzzy
 msgid "Blanding"
-msgstr "Varjostus"
+msgstr "Blanding"
 
 #: my-evolution/Locations.h:258
-#, fuzzy
 msgid "Block Island"
-msgstr "Falklandsaaret"
+msgstr "Block Island"
 
 #: my-evolution/Locations.h:259
 msgid "Bloemfontein J. B. M. Hertzog "
@@ -15113,36 +14916,32 @@ msgid "Bogota/Eldorado"
 msgstr ""
 
 #: my-evolution/Locations.h:269
-#, fuzzy
 msgid "Boise"
-msgstr "Sulje"
+msgstr "Boise"
 
 #: my-evolution/Locations.h:271
 msgid "Bologna"
 msgstr ""
 
 #: my-evolution/Locations.h:272
-#, fuzzy
 msgid "Bolzano"
-msgstr "Puola"
+msgstr "Bolzano"
 
 #: my-evolution/Locations.h:273
 msgid "Bombay/Santacruz"
 msgstr ""
 
 #: my-evolution/Locations.h:274
-#, fuzzy
 msgid "Boone"
-msgstr "Määrittelemätön"
+msgstr "Boone"
 
 #: my-evolution/Locations.h:275
 msgid "Bordeaux"
 msgstr ""
 
 #: my-evolution/Locations.h:276
-#, fuzzy
 msgid "Borger"
-msgstr "_Suuret kuvakkeet"
+msgstr "Borger"
 
 #: my-evolution/Locations.h:277
 msgid "Bornholm"
@@ -15153,24 +14952,20 @@ msgid "Boscombe Down"
 msgstr ""
 
 #: my-evolution/Locations.h:279
-#, fuzzy
 msgid "Bosnia-Herzegovina"
 msgstr "Bosnia-Hertsegovina"
 
 #: my-evolution/Locations.h:280
-#, fuzzy
 msgid "Boston"
-msgstr "Viro"
+msgstr "Boston"
 
 #: my-evolution/Locations.h:281
-#, fuzzy
 msgid "Boulmer"
-msgstr "Kansio"
+msgstr "Boulmer"
 
 #: my-evolution/Locations.h:282
-#, fuzzy
 msgid "Bourges"
-msgstr "Lähteet"
+msgstr "Bourges"
 
 #: my-evolution/Locations.h:283
 msgid "Bournemouth"
@@ -15181,23 +14976,20 @@ msgid "Bowling Green"
 msgstr ""
 
 #: my-evolution/Locations.h:285
-#, fuzzy
 msgid "Bozeman"
-msgstr "Korealainen"
+msgstr "Bozeman"
 
 #: my-evolution/Locations.h:286
-#, fuzzy
 msgid "Bradford"
-msgstr "Barbados"
+msgstr "Bradford"
 
 #: my-evolution/Locations.h:287
 msgid "Bradshaw Field"
 msgstr ""
 
 #: my-evolution/Locations.h:288
-#, fuzzy
 msgid "Brainerd"
-msgstr "Bahrain"
+msgstr "Brainerd"
 
 #: my-evolution/Locations.h:289
 msgid "Brasilia"
@@ -15212,18 +15004,16 @@ msgid "Bratislava"
 msgstr ""
 
 #: my-evolution/Locations.h:292
-#, fuzzy
 msgid "Bratsk"
-msgstr "Luonnokset"
+msgstr "Bratsk"
 
 #: my-evolution/Locations.h:293
 msgid "Braunschweig"
 msgstr ""
 
 #: my-evolution/Locations.h:295
-#, fuzzy
 msgid "Bremen"
-msgstr "Jemen"
+msgstr "Bremen"
 
 #: my-evolution/Locations.h:296
 msgid "Bremerton"
@@ -15238,9 +15028,8 @@ msgid "Bridgeport"
 msgstr ""
 
 #: my-evolution/Locations.h:299
-#, fuzzy
 msgid "Brindisi"
-msgstr "Burundi"
+msgstr "Brindisi"
 
 #: my-evolution/Locations.h:300
 msgid "Brisbane"
@@ -15259,9 +15048,8 @@ msgid "Brno"
 msgstr ""
 
 #: my-evolution/Locations.h:304
-#, fuzzy
 msgid "Broadus"
-msgstr "Barbados"
+msgstr "Broadus"
 
 #: my-evolution/Locations.h:305
 msgid "Broken Bow"
@@ -15280,18 +15068,16 @@ msgid "Brooksville"
 msgstr ""
 
 #: my-evolution/Locations.h:309
-#, fuzzy
 msgid "Broome"
-msgstr "Ala:"
+msgstr "Broome"
 
 #: my-evolution/Locations.h:310
 msgid "Brownsville"
 msgstr ""
 
 #: my-evolution/Locations.h:311
-#, fuzzy
 msgid "Brunswick"
-msgstr "Burundi"
+msgstr "Brunswick"
 
 #: my-evolution/Locations.h:312
 msgid "Brussels-National Airport"
@@ -15302,9 +15088,8 @@ msgid "Bryansk"
 msgstr ""
 
 #: my-evolution/Locations.h:314
-#, fuzzy
 msgid "Bryce Canyon"
-msgstr "Yrityksen mukaan"
+msgstr "Bryce Canyon"
 
 #: my-evolution/Locations.h:315
 msgid "Bucaramanga/Palonegro"
@@ -15331,37 +15116,32 @@ msgid "Bullfrog"
 msgstr ""
 
 #: my-evolution/Locations.h:322
-#, fuzzy
 msgid "Burbank"
-msgstr "Bhutan"
+msgstr "Burbank"
 
 #: my-evolution/Locations.h:323
 msgid "Burgas"
 msgstr ""
 
 #: my-evolution/Locations.h:324
-#, fuzzy
 msgid "Burley"
-msgstr "Turkki"
+msgstr "Burley"
 
 #: my-evolution/Locations.h:325
 msgid "Burlington"
 msgstr ""
 
 #: my-evolution/Locations.h:326
-#, fuzzy
 msgid "Burnet"
-msgstr "Burundi"
+msgstr "Burnet"
 
 #: my-evolution/Locations.h:327
-#, fuzzy
 msgid "Burns"
-msgstr "Burundi"
+msgstr "Burns"
 
 #: my-evolution/Locations.h:328
-#, fuzzy
 msgid "Bursa"
-msgstr "Bulgaria"
+msgstr "Bursa"
 
 #: my-evolution/Locations.h:329
 msgid "Burwell"
@@ -15376,19 +15156,16 @@ msgid "Caen-Carpiquet"
 msgstr ""
 
 #: my-evolution/Locations.h:332
-#, fuzzy
 msgid "Cagliari"
-msgstr "Kalenteri"
+msgstr "Cagliari"
 
 #: my-evolution/Locations.h:333
-#, fuzzy
 msgid "Cairns"
-msgstr "Auto"
+msgstr "Cairns"
 
 #: my-evolution/Locations.h:334
-#, fuzzy
 msgid "Cairo"
-msgstr "Auto"
+msgstr "Cairo"
 
 #: my-evolution/Locations.h:335
 msgid "Calabozo"
@@ -15403,32 +15180,28 @@ msgid "Caldwell"
 msgstr ""
 
 #: my-evolution/Locations.h:338
-#, fuzzy
 msgid "Calgary"
-msgstr "Kalenteri"
+msgstr "Calgary"
 
 #: my-evolution/Locations.h:339
 msgid "Cali/Alfonso Bonillaaragon"
 msgstr ""
 
 #: my-evolution/Locations.h:340
-#, fuzzy
 msgid "Caliente"
-msgstr "Kalenteri"
+msgstr "Caliente"
 
 #: my-evolution/Locations.h:341
-#, fuzzy
 msgid "California"
-msgstr "Uusi Kaledonia"
+msgstr "Kalifornia"
 
 #: my-evolution/Locations.h:342
 msgid "Calvi-Ste-Catherine"
 msgstr ""
 
 #: my-evolution/Locations.h:343
-#, fuzzy
 msgid "Camaguey"
-msgstr "Paraguay"
+msgstr "Camaguey"
 
 #: my-evolution/Locations.h:344
 msgid "Camarillo"
@@ -15439,43 +15212,36 @@ msgid "Cambridge"
 msgstr ""
 
 #: my-evolution/Locations.h:346
-#, fuzzy
 msgid "Cameron"
 msgstr "Kamerun"
 
 #: my-evolution/Locations.h:347
-#, fuzzy
 msgid "Camiri"
-msgstr "Auto"
+msgstr "Camiri"
 
 #: my-evolution/Locations.h:348
-#, fuzzy
 msgid "Campeche"
-msgstr "Valmis"
+msgstr "Campeche"
 
 #: my-evolution/Locations.h:349
-#, fuzzy
 msgid "Campinas"
-msgstr "Kambodza"
+msgstr "Campinas"
 
 #: my-evolution/Locations.h:350
-#, fuzzy
 msgid "Campo"
-msgstr "Yrit"
+msgstr "Campo"
 
 #: my-evolution/Locations.h:351
-#, fuzzy
 msgid "Campo Grande"
-msgstr "Kap Verde"
+msgstr "Campo Grande"
 
 #: my-evolution/Locations.h:352
 msgid "Camp Stanley/H-207"
 msgstr ""
 
 #: my-evolution/Locations.h:353
-#, fuzzy
 msgid "Canaan"
-msgstr "Kanada"
+msgstr "Canaan"
 
 #: my-evolution/Locations.h:355
 msgid "Canarias/Fuerteventura"
@@ -15510,38 +15276,32 @@ msgid "Canberra"
 msgstr ""
 
 #: my-evolution/Locations.h:363
-#, fuzzy
 msgid "Cancun"
-msgstr "Peruuta"
+msgstr "Cancun"
 
 #: my-evolution/Locations.h:364
 msgid "Cannes-Mandelieu"
 msgstr ""
 
 #: my-evolution/Locations.h:365
-#, fuzzy
 msgid "Cantwell"
-msgstr "Peruuta"
+msgstr "Cantwell"
 
 #: my-evolution/Locations.h:366
-#, fuzzy
 msgid "Cape Girardeau"
-msgstr "Kap Verde"
+msgstr "Cape Girardeau"
 
 #: my-evolution/Locations.h:367
-#, fuzzy
 msgid "Cape Hatteras"
-msgstr "Kap Verde"
+msgstr "Cape Hatteras"
 
 #: my-evolution/Locations.h:368
-#, fuzzy
 msgid "Cape Lisburne"
-msgstr "Paperilähde:"
+msgstr "Cape Lisburne"
 
 #: my-evolution/Locations.h:369
-#, fuzzy
 msgid "Cape Newenham"
-msgstr "Kap Verde"
+msgstr "Cape Newenham"
 
 #: my-evolution/Locations.h:370
 msgid "Cape Romanzoff"
@@ -15556,9 +15316,8 @@ msgid "Capitan Corbeta"
 msgstr ""
 
 #: my-evolution/Locations.h:373
-#, fuzzy
 msgid "Capo Mele"
-msgstr "Kap Verde"
+msgstr "Capo Mele"
 
 #: my-evolution/Locations.h:374
 msgid "Caracas La Carlota"
@@ -15569,39 +15328,32 @@ msgid "Caracas Maiquetia"
 msgstr ""
 
 #: my-evolution/Locations.h:376
-#, fuzzy
 msgid "Caravelas"
-msgstr "Peruuta tehtävä"
+msgstr "Caravelas"
 
 #: my-evolution/Locations.h:377
-#, fuzzy
 msgid "Carbondale"
-msgstr "Kambodza"
+msgstr "Carbondale"
 
 #: my-evolution/Locations.h:378
-#, fuzzy
 msgid "Cardiff"
-msgstr "Kortti: "
+msgstr "Cardiff"
 
 #: my-evolution/Locations.h:379
-#, fuzzy
 msgid "Caribou"
-msgstr "Auto"
+msgstr "Caribou"
 
 #: my-evolution/Locations.h:380
-#, fuzzy
 msgid "Carlisle"
-msgstr "Chile"
+msgstr "Carlisle"
 
 #: my-evolution/Locations.h:381
-#, fuzzy
 msgid "Carlsbad"
-msgstr "Barbados"
+msgstr "Carlsbad"
 
 #: my-evolution/Locations.h:382
-#, fuzzy
 msgid "Carroll"
-msgstr "Auto"
+msgstr "Carroll"
 
 #: my-evolution/Locations.h:383
 msgid "Cartagena/Rafael Nunez"
@@ -15612,24 +15364,20 @@ msgid "Casa Granda"
 msgstr ""
 
 #: my-evolution/Locations.h:385
-#, fuzzy
 msgid "Cascade"
-msgstr "Vaaka"
+msgstr "Cascade"
 
 #: my-evolution/Locations.h:386
-#, fuzzy
 msgid "Casper"
-msgstr "Paperi"
+msgstr "Casper"
 
 #: my-evolution/Locations.h:387
-#, fuzzy
 msgid "Catacamas"
-msgstr "Bahamasaaret"
+msgstr "Catacamas"
 
 #: my-evolution/Locations.h:388
-#, fuzzy
 msgid "Catania"
-msgstr "Kroatia"
+msgstr "Catania"
 
 #: my-evolution/Locations.h:390
 msgid "Cayo Largo del Sur"
@@ -15656,61 +15404,52 @@ msgid "Central and South America"
 msgstr ""
 
 #: my-evolution/Locations.h:396
-#, fuzzy
 msgid "Cervia"
-msgstr "Kroatia"
+msgstr "Cervia"
 
 #: my-evolution/Locations.h:397
 msgid "Chacarita"
 msgstr ""
 
 #: my-evolution/Locations.h:398
-#, fuzzy
 msgid "Chadron"
-msgstr "Tsad"
+msgstr "Chadron"
 
 #: my-evolution/Locations.h:399
 msgid "Challis"
 msgstr ""
 
 #: my-evolution/Locations.h:400
-#, fuzzy
 msgid "Chamberlain"
-msgstr "Kamerun"
+msgstr "Chamberlain"
 
 #: my-evolution/Locations.h:401
-#, fuzzy
 msgid "Chambery"
-msgstr "Kamerun"
+msgstr "Chambery"
 
 #: my-evolution/Locations.h:402
-#, fuzzy
 msgid "Champaign"
-msgstr "Yritys"
+msgstr "Champaign"
 
 #: my-evolution/Locations.h:403
 msgid "Chandalar Lake"
 msgstr ""
 
 #: my-evolution/Locations.h:404
-#, fuzzy
 msgid "Chandler"
-msgstr "Tsad"
+msgstr "Chandler"
 
 #: my-evolution/Locations.h:405
-#, fuzzy
 msgid "Chania"
-msgstr "Kiina"
+msgstr "Chania"
 
 #: my-evolution/Locations.h:406
-#, fuzzy
 msgid "Chanute"
-msgstr "Peruuta"
+msgstr "Chanute"
 
 #: my-evolution/Locations.h:407
-#, fuzzy
 msgid "Chariton"
-msgstr "Kamerun"
+msgstr "Chariton"
 
 #: my-evolution/Locations.h:408
 msgid "Charleroi-Brussels South"
@@ -15721,9 +15460,8 @@ msgid "Charles City"
 msgstr ""
 
 #: my-evolution/Locations.h:410
-#, fuzzy
 msgid "Charleston"
-msgstr "Autopuhelin"
+msgstr "Charleston"
 
 #: my-evolution/Locations.h:411
 msgid "Charlotte"
@@ -24638,32 +24376,32 @@ msgstr "Turkkilainen"
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:377 my-evolution/e-summary-calendar.c:397
+#: my-evolution/e-summary-calendar.c:380
 msgid "Appointments"
 msgstr "Tapaamiset"
 
-#: my-evolution/e-summary-calendar.c:378
-msgid "No appointments"
+#: my-evolution/e-summary-calendar.c:388
+#, fuzzy
+msgid "No appointments."
 msgstr "Ei tapaamisia"
 
-#: my-evolution/e-summary-calendar.c:414
+#: my-evolution/e-summary-calendar.c:405
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:416
-msgid "%l:%M %d %B"
-msgstr "%l:%M %d %B"
+#: my-evolution/e-summary-calendar.c:407
+msgid "%l:%M%P %d %B"
+msgstr "%l:%M%P %d %B"
 
-#: my-evolution/e-summary-calendar.c:434
+#: my-evolution/e-summary-calendar.c:425
 msgid "No description"
 msgstr "Ei kuvausta"
 
-#: my-evolution/e-summary-mail.c:156
+#: my-evolution/e-summary-mail.c:188
 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:1119
+#: my-evolution/e-summary-mail.c:443 shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Paikalliset kansiot"
 
@@ -24675,20 +24413,20 @@ msgstr ""
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:612
+#: my-evolution/e-summary-preferences.c:615
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:618
+#: my-evolution/e-summary-preferences.c:621
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>Virhe ladattaessa RDF:ää</b>"
 
-#: my-evolution/e-summary-rdf.c:447
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr ""
 
@@ -24706,11 +24444,11 @@ msgstr "Lisää"
 msgid "Shown"
 msgstr "Näytä kaikki"
 
-#: my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr "Ei tehtäviä"
 
-#: my-evolution/e-summary-tasks.c:371
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr "(Ei kuvausta)"
 
@@ -24718,11 +24456,11 @@ msgstr "(Ei kuvausta)"
 msgid "My Weather"
 msgstr "Säätiedot"
 
-#: my-evolution/e-summary-weather.c:269
+#: my-evolution/e-summary-weather.c:262
 msgid "There was an error downloading data for"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:490
+#: my-evolution/e-summary-weather.c:480
 #, fuzzy
 msgid "Weather"
 msgstr "Säätiedot"
@@ -24731,25 +24469,25 @@ msgstr "Säätiedot"
 #. 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
+#: my-evolution/e-summary-weather.c:584
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary.c:197
+#: my-evolution/e-summary.c:198
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:523
+#: my-evolution/e-summary.c:524
 #, fuzzy
 msgid "Please wait..."
 msgstr "Odota, ole hyvä"
 
-#: my-evolution/e-summary.c:593 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:590 ui/my-evolution.xml.h:2
 #, fuzzy
 msgid "Print Summary"
 msgstr "Kuvaus"
 
-#: my-evolution/e-summary.c:627
+#: my-evolution/e-summary.c:624
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "Viestin tulostus epäonnistui"
@@ -26062,13 +25800,15 @@ msgid "Cancel Operation"
 msgstr "Peruuta operaatio"
 
 #: shell/e-folder-dnd-bridge.c:55
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Cannot transfer folder:\n"
 "%s"
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
+msgstr ""
+"Kansion välittäminen ei onnistu:\n"
+"%s"
 
-#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:127
+#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
 #, c-format
 msgid "\"%s\" in \"%s\""
 msgstr "\"%s\" kohteessa \"%s\""
@@ -26082,8 +25822,8 @@ msgstr "Lisää kansio"
 msgid "Drafts"
 msgstr "Luonnos"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:465
-#: shell/e-shell-view.c:469 shell/e-shortcuts.c:1084
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:486
+#: shell/e-shell-view.c:490 shell/e-shortcuts.c:1084
 msgid "Inbox"
 msgstr "Saapuneet"
 
@@ -26096,11 +25836,11 @@ msgstr "Lähtevät"
 msgid "Sent"
 msgstr "Näkemättä"
 
-#: shell/e-setup.c:147
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr "Tiedostojen päivitys ei onnistunut"
 
-#: shell/e-setup.c:168
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -26111,14 +25851,14 @@ msgstr ""
 "%s\n"
 "Virhe: %s"
 
-#: shell/e-setup.c:179
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:244
+#: shell/e-setup.c:243
 #, fuzzy, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -26128,7 +25868,7 @@ msgstr ""
 "Hakemistoa %s ei voitu luoda:\n"
 "%s"
 
-#: shell/e-setup.c:262
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -26136,7 +25876,7 @@ msgid ""
 "readable and executable and restart Evolution."
 msgstr ""
 
-#: shell/e-setup.c:268
+#: shell/e-setup.c:267
 #, c-format
 msgid ""
 "File %s\n"
@@ -26144,7 +25884,7 @@ msgid ""
 "Please remove this file and restart Evolution."
 msgstr ""
 
-#: shell/e-setup.c:291
+#: shell/e-setup.c:290
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -26152,7 +25892,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:300
+#: shell/e-setup.c:299
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -26188,47 +25928,47 @@ msgstr "Erikoiskansiot"
 msgid "Autocompletion Folders"
 msgstr "Kansioden automaattinen täydennys"
 
-#: shell/e-shell-folder-commands.c:141
+#: shell/e-shell-folder-commands.c:140
 #, c-format
 msgid "Cannot copy folder: %s"
 msgstr "Kansion kopioiminen ei onnistu: %s"
 
-#: shell/e-shell-folder-commands.c:143
-#, fuzzy, c-format
+#: shell/e-shell-folder-commands.c:142
+#, c-format
 msgid "Cannot move folder: %s"
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
+msgstr "Kansion siirto ei onnistu: %s"
 
-#: shell/e-shell-folder-commands.c:189
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:191
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot copy a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:205
+#: shell/e-shell-folder-commands.c:204
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:320
+#: shell/e-shell-folder-commands.c:319
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:324
+#: shell/e-shell-folder-commands.c:323
 msgid "Copy folder"
 msgstr "Kopioi kansio"
 
-#: shell/e-shell-folder-commands.c:364
+#: shell/e-shell-folder-commands.c:363
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr "Siirä kansio"
 
-#: shell/e-shell-folder-commands.c:392
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -26237,58 +25977,62 @@ msgstr ""
 "Kansion poistaminen ei onnistu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:406
+#: shell/e-shell-folder-commands.c:405
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: shell/e-shell-folder-commands.c:413
+#: shell/e-shell-folder-commands.c:412
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Poista"
 
-#: shell/e-shell-folder-commands.c:486
-#, fuzzy, c-format
+#: shell/e-shell-folder-commands.c:485
+#, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
+msgstr ""
+"Kansion nimeäminen ei onnistu:\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:535
+#: shell/e-shell-folder-commands.c:534
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeä kansio '%s' uudelleen"
 
-#: shell/e-shell-folder-commands.c:541
+#: shell/e-shell-folder-commands.c:540
 #, fuzzy
 msgid "Rename folder"
 msgstr "Nimeä kansio '%s' uudelleen"
 
-#: shell/e-shell-folder-commands.c:550
-#: shell/e-shell-folder-creation-dialog.c:169
+#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-creation-dialog.c:170
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:584
+#: shell/e-shell-folder-commands.c:583
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:587
-#, fuzzy, c-format
+#: shell/e-shell-folder-commands.c:586
+#, c-format
 msgid ""
 "Cannot remove folder:\n"
 "%s"
-msgstr "Kansion hakeminen ei onnistu: %s: %s"
+msgstr ""
+"Kansion poisto ei onnistu:\n"
+"%s"
 
-#: shell/e-shell-folder-creation-dialog.c:126
+#: shell/e-shell-folder-creation-dialog.c:127
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:307
+#: shell/e-shell-folder-creation-dialog.c:308
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Luo _uusi kansio"
@@ -26310,7 +26054,7 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:687
+#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
@@ -26321,7 +26065,7 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:351
 #, fuzzy
 msgid "Select importer"
 msgstr "Valitse kansio"
@@ -26332,7 +26076,7 @@ msgid "File %s does not exist"
 msgstr "Kansiota `%s' ei ole olemassa."
 
 #: shell/e-shell-importer.c:493 shell/e-shell-importer.c:510
-#: shell/e-shell-importer.c:557
+#: shell/e-shell-importer.c:552
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
@@ -26360,70 +26104,70 @@ msgstr ""
 msgid "Error starting %s"
 msgstr "Virhe %s:n käynnistyksessä"
 
-#: shell/e-shell-importer.c:556
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "Virhe %s:n lataamisessa"
 
-#: shell/e-shell-importer.c:573
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:627
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "Tiedostonimi:"
 
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: shell/e-shell-importer.c:690
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Tiedoston tyyppi:"
 
-#: shell/e-shell-importer.c:715
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:719
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:516
+#: shell/e-shell-importer.c:780 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:788
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:642
+#: shell/e-shell-importer.c:907 shell/e-shell-startup-wizard.c:664
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "Lähettäjä:"
 
-#: shell/e-shell-importer.c:1082
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: shell/e-shell-importer.c:1083
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:191
+#: shell/e-shell-importer.c:1212 shell/importer/intelligent.c:191
 msgid "Import"
 msgstr "Tuo"
 
-#: shell/e-shell-offline-handler.c:588
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr ""
 
@@ -26445,34 +26189,42 @@ msgstr "Synkronoidaan kansiota"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:345
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:340
+#. It would be nice to insensitivize the OK button appropriately
+#. instead of doing this, but unfortunately we can't do this for the
+#. Bonobo control.
+#: shell/e-shell-shared-folder-picker-dialog.c:281
+#, fuzzy
+msgid "Please select a user."
+msgstr "Valitse palvelin."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Synkronoidaan kansiota"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:346
+#: shell/e-shell-shared-folder-picker-dialog.c:380
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Poistetaan kansiota %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:351
+#: shell/e-shell-shared-folder-picker-dialog.c:385
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Lähetetään \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:431
+#: shell/e-shell-shared-folder-picker-dialog.c:465
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr ""
 "Tiedoston %s poistaminen epäonnistui:\n"
 "%s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:484
+#: shell/e-shell-shared-folder-picker-dialog.c:518
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
@@ -26493,10 +26245,15 @@ msgstr ""
 
 #: shell/e-shell-utils.c:129
 #, fuzzy
-msgid "Folder name cannot contain slashes."
+msgid "Folder name cannot contain the character \"/\"."
 msgstr "Tämä kansio ei voi sisältää viestejä."
 
 #: shell/e-shell-utils.c:135
+#, fuzzy
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "Tämä kansio ei voi sisältää viestejä."
+
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
@@ -26538,47 +26295,47 @@ msgstr "Luo uusi kontakti"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:776
+#: shell/e-shell-view-menu.c:769
 #, fuzzy
 msgid "_Work Online"
 msgstr "Työskentele linjoilla"
 
-#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:782 ui/evolution.xml.h:65
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:802 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:795 ui/evolution.xml.h:40
 msgid "Work Offline"
 msgstr "Työskentele poissa linjoilta"
 
-#: shell/e-shell-view.c:232
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1996
+#: shell/e-shell-view.c:2045
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1998
+#: shell/e-shell-view.c:2047
 msgid "(None)"
 msgstr "(Ei nimeä)"
 
-#: shell/e-shell-view.c:2041
+#: shell/e-shell-view.c:2091
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:2048
+#: shell/e-shell-view.c:2098
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:2054
+#: shell/e-shell-view.c:2104
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:176
+#: shell/e-shell.c:175
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -26586,12 +26343,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:756
+#: shell/e-shell.c:738
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1829
+#: shell/e-shell.c:1799
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26599,19 +26356,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2094
+#: shell/e-shell.c:2064
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2096
+#: shell/e-shell.c:2066
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2098
+#: shell/e-shell.c:2068
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2100 shell/e-storage.c:576
+#: shell/e-shell.c:2070 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
@@ -26744,59 +26501,59 @@ msgstr "Oikotiet"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:574
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr "Ei virhettä"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr "I/O-virhe"
 
-#: shell/e-storage.c:584
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:582
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:588
+#: shell/e-storage.c:584
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:590
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:594
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:596
+#: shell/e-storage.c:592
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:598
+#: shell/e-storage.c:594
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:600
+#: shell/e-storage.c:596
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:602
+#: shell/e-storage.c:598
 msgid "Cannot create a folder with that name"
 msgstr "Kansion luominen tällä nimellä ei onnistu"
 
-#: shell/e-storage.c:604
+#: shell/e-storage.c:600
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -26810,11 +26567,11 @@ msgstr ""
 msgid "%s (%d%% complete)"
 msgstr ""
 
-#: shell/evolution-folder-selector-button.c:101
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:123
+#: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -26825,7 +26582,7 @@ msgstr ""
 "\n"
 "Tuntematon virhe."
 
-#: shell/evolution-shell-component-utils.c:126
+#: shell/evolution-shell-component-utils.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -26834,7 +26591,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:133
+#: shell/evolution-shell-component-utils.c:134
 #, c-format
 msgid ""
 "%s\n"
@@ -26843,69 +26600,69 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1164
+#: shell/evolution-shell-component.c:1167
 msgid "CORBA error"
 msgstr "CORBA-virhe"
 
-#: shell/evolution-shell-component.c:1166
+#: shell/evolution-shell-component.c:1169
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1168
+#: shell/evolution-shell-component.c:1171
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1170
+#: shell/evolution-shell-component.c:1173
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1172
+#: shell/evolution-shell-component.c:1175
 #, fuzzy
 msgid "No owner"
 msgstr "Määrittelemätön"
 
-#: shell/evolution-shell-component.c:1174
+#: shell/evolution-shell-component.c:1177
 msgid "Not found"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1176
+#: shell/evolution-shell-component.c:1179
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Tar_kista tuetut tavat"
 
-#: shell/evolution-shell-component.c:1178
+#: shell/evolution-shell-component.c:1181
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1180
+#: shell/evolution-shell-component.c:1183
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1182
+#: shell/evolution-shell-component.c:1185
 #, fuzzy
 msgid "Internal error"
 msgstr "I/O-virhe"
 
-#: shell/evolution-shell-component.c:1186
+#: shell/evolution-shell-component.c:1189
 #, fuzzy
 msgid "Exists"
 msgstr "_Poistu"
 
-#: shell/evolution-shell-component.c:1188
+#: shell/evolution-shell-component.c:1191
 msgid "Invalid URI"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1192
+#: shell/evolution-shell-component.c:1195
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Luonnoskansio:"
 
-#: shell/evolution-shell-component.c:1194
+#: shell/evolution-shell-component.c:1197
 #, fuzzy
 msgid "No space left"
 msgstr "Ei viestejä valittuna"
 
-#: shell/evolution-shell-component.c:1196
+#: shell/evolution-shell-component.c:1199
 msgid "Old owner has died"
 msgstr ""
 
@@ -27070,26 +26827,27 @@ msgstr "Älä kysy tätä enää uudelleen"
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:109 shell/main.c:501
+#: shell/main.c:110 shell/main.c:556
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:116
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Evolutionin aseukseni"
 
-#: shell/main.c:214
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:264
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Ximian Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It's getting close,\n"
-"but some features are either unfinished or don't work properly.\n"
+"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
 "\n"
-"If you want a stable version of Evolution, we urge you to uninstall,\n"
-"this version, and install a 1.2.x version instead (1.2.2)\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\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"
@@ -27099,7 +26857,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:235
+#: shell/main.c:288
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -27108,43 +26866,43 @@ msgstr ""
 "Kiitos\n"
 "The Evolution Team\n"
 
-#: shell/main.c:243
+#: shell/main.c:296
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Älä kysy tätä enää uudelleen"
 
-#: shell/main.c:330
+#: shell/main.c:385
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:339
-#, fuzzy, c-format
+#: shell/main.c:394
+#, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+msgstr "Ximian Evolutionin kuoren alustus epäonnistui: %s"
 
-#: shell/main.c:471
+#: shell/main.c:526
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:473
+#: shell/main.c:528
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Aloita uudelta sivulta"
 
-#: shell/main.c:475
+#: shell/main.c:530
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Aloita uudelta sivulta"
 
-#: shell/main.c:477
+#: shell/main.c:532
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:480
+#: shell/main.c:535
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr ""
 
-#: shell/main.c:505
+#: shell/main.c:560
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -27152,7 +26910,7 @@ msgid ""
 msgstr ""
 
 #: tools/evolution-addressbook-abuse.c:81
-#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-export.c:41
 #: tools/evolution-addressbook-import.c:46
 #, fuzzy
 msgid "Error loading default addressbook."
@@ -27164,7 +26922,7 @@ msgstr "Virhe avattaessa tiedostoa: %s"
 msgid "Input File"
 msgstr "Liitä tiedosto"
 
-#: tools/evolution-addressbook-export.c:46
+#: tools/evolution-addressbook-export.c:51
 #, fuzzy
 msgid "Output File"
 msgstr "Avaa tiedosto"
@@ -27174,6 +26932,31 @@ msgstr "Avaa tiedosto"
 msgid "No filename provided."
 msgstr "Vastaanottajia ei ole määritelty"
 
+#: tools/evolution-launch-composer.c:324
+msgid "An attachment to add."
+msgstr "Lisättävä liite."
+
+#: tools/evolution-launch-composer.c:325
+msgid "Content type of the attachment."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:326
+msgid "The filename to display in the mail."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:327
+#, fuzzy
+msgid "Description of the attachment."
+msgstr "Kuvaus sisältää"
+
+#: tools/evolution-launch-composer.c:328
+msgid "Mark attachment to be shown inline by default."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:329
+msgid "Default subject for the message."
+msgstr ""
+
 #: ui/evolution-addressbook.xml.h:3
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Kopioi yhteystiedot toiseen kansioon..."
@@ -27264,7 +27047,7 @@ msgstr "Katsele nykyistä yhteystietoa"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:43
 msgid "_Actions"
 msgstr "T_oiminnot"
 
@@ -27392,7 +27175,7 @@ msgid "Print this item"
 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
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save"
 msgstr "Tallenna"
 
@@ -27420,7 +27203,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "_Tiedosto"
 
@@ -27674,7 +27457,7 @@ msgstr "Säikeistetty viesti-ikkuna"
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:48
 msgid "_Folder"
 msgstr "_Kansio"
 
@@ -28103,7 +27886,7 @@ msgstr ""
 msgid "_Resend..."
 msgstr "_Nimeä uudelleen..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "T_yökalut"
 
@@ -28118,12 +27901,12 @@ msgstr "Sulje tämä ikkuna"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:44
 msgid "_Close"
 msgstr "_Sulje"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
 msgid "_View"
 msgstr "_Näytä"
 
@@ -28307,7 +28090,7 @@ msgstr "HTML"
 msgid "Save the current file and close the window"
 msgstr "Tallenna luettelo ja sulje ikkuna"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:52
 msgid "_Help"
 msgstr "_Ohje"
 
@@ -28409,9 +28192,8 @@ msgid "Add to _Shortcut Bar"
 msgstr "Lisää _oikotiepalkkiin"
 
 #: ui/evolution.xml.h:3
-#, fuzzy
 msgid "Change Evolution's settings"
-msgstr "Evolution"
+msgstr "Muuta Evolutionin asetuksia"
 
 #: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
@@ -28494,131 +28276,121 @@ msgstr "_Sähköpostiasetukset..."
 
 #: ui/evolution.xml.h:27
 #, fuzzy
-msgid "Pilot Con_duit Settings..."
-msgstr "_Sähköpostiasetukset..."
-
-#: ui/evolution.xml.h:28
-#, fuzzy
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr "Luo _uusi kansio"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr "Lähetä / Vastaanota"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Lähetä jonossa olevat viestit ja hae uudet viestit"
 
-#: ui/evolution.xml.h:31
-#, fuzzy
-msgid "Set up Pilot conduit configuration"
-msgstr "Palvelimen asetukset"
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Palvelimen asetukset"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Lähetä virheraportti"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "Lähetä _virheraportti"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Lähetä virheraportti käyttäen Bug Buddy:a"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr "Määritä"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr "Määritä, näytetäänkö kansiopalkki"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Määritä, näytetäänkö oikotiepalkki"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr "Määritä, työskennelläänkö poissa linjoilta."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "_Tietoja Evolutionista..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr "_Kopioi..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Kansiopalkki"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Kansio"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "_Siirry kansioon..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 #, fuzzy
 msgid "_Import..."
 msgstr "_Siirry kansioon..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr "_Siirrä..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr "_Uusi"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
 msgid "_New Folder"
 msgstr "_Uusi kansio"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_Remove Other User's Folder"
 msgstr "Luo _uusi kansio"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "_Nimeä uudelleen..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr "_Lähetä / Vastaanota"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr "_Oikotiepalkki"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Oikotie"
@@ -28705,9 +28477,8 @@ msgstr "Ryhmän mukaan"
 msgid "_Tasks"
 msgstr "_Tehtävä"
 
-#. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:201
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:688
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
 msgid "UTC"
 msgstr ""
 
@@ -28755,12 +28526,12 @@ 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:434
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "MTKTPLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1107
+#: widgets/misc/e-calendar-item.c:1102
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -28863,11 +28634,12 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:190
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:212
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr "Tallenna haku"
 
@@ -28902,35 +28674,39 @@ msgstr "Kysymys"
 msgid "Message"
 msgstr "Viesti"
 
-#: widgets/misc/e-search-bar.c:524
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "_Etsi"
+
+#: widgets/misc/e-search-bar.c:537
 #, fuzzy
 msgid "_Find Now"
 msgstr "Etsi nyt"
 
-#: widgets/misc/e-search-bar.c:525
+#: widgets/misc/e-search-bar.c:538
 #, fuzzy
 msgid "_Clear"
 msgstr "Kalenteri"
 
-#: widgets/misc/e-search-bar.c:826
+#: widgets/misc/e-search-bar.c:839
 msgid "Item ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:833
+#: widgets/misc/e-search-bar.c:846
 msgid "Subitem ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:840
+#: widgets/misc/e-search-bar.c:853
 #, fuzzy
 msgid "Text"
 msgstr "Seuraava"
 
-#: widgets/misc/e-search-bar.c:918
+#: widgets/misc/e-search-bar.c:931
 #, fuzzy
 msgid "Clear"
 msgstr "Kalenteri"
 
-#: widgets/misc/e-search-bar.c:920
+#: widgets/misc/e-search-bar.c:933
 msgid "Find Now"
 msgstr "Etsi nyt"
 
@@ -28943,3 +28719,113 @@ msgstr ""
 #: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
+
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:3
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:3
+msgid "Wombat InterfaceCheck interface"
+msgstr ""
+
+#~ msgid "380"
+#~ msgstr "380"
+
+#~ msgid "<- _Remove"
+#~ msgstr "<- _Poista"
+
+#~ msgid "<< Fewer Options"
+#~ msgstr "<< Vähemmän vaihtoehtoja"
+
+#, fuzzy
+#~ msgid "Mappings"
+#~ msgstr "Reunukset"
+
+#, fuzzy
+#~ msgid "_Add ->"
+#~ msgstr "_Lisää"
+
+#, fuzzy
+#~ msgid "_Add Mapping"
+#~ msgstr "Lisää toiminto"
+
+#, fuzzy
+#~ msgid "_Add to DN"
+#~ msgstr "Lisää toiminto"
+
+#, fuzzy
+#~ msgid "_Delete Mapping"
+#~ msgstr "_Poista kaikki"
+
+#, fuzzy
+#~ msgid "_Edit Mapping"
+#~ msgstr "_Muokkaa tapaamista"
+
+#, fuzzy
+#~ msgid "_Evolution attribute:"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "_More Options >>"
+#~ msgstr "_Asetukset"
+
+#, fuzzy
+#~ msgid "account-druid"
+#~ msgstr "Tili"
+
+#, fuzzy
+#~ msgid "account-editor"
+#~ msgstr "kontaktinhallinta"
+
+#~ msgid "Edit Contact List"
+#~ msgstr "Muokkaa yhteystietoluetteloa"
+
+#~ msgid "Can't get storage list from registry: %s"
+#~ msgstr "Tallennuspaikkaluettelon haku rekisteristä epäonnistui: %s"
+
+#~ msgid "Can't call getFolderAtPath on storage: %s"
+#~ msgstr "Kutsu getFolderAtPath-tallennuspaikkaan epäonnistui: %s"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr "Evolutionin muokkaimen alustus ei onnistunut."
+
+#~ msgid "minute"
+#~ msgstr "minuutti"
+
+#~ msgid "hour"
+#~ msgstr "tunti"
+
+#~ msgid "week"
+#~ msgstr "viikko"
+
+#~ msgid "year"
+#~ msgstr "vuosi"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "Evolutionin sähköpostikomponentin alustus epäonnistui."
+
+#, fuzzy
+#~ msgid "Unnamed [script]"
+#~ msgstr "Nimetön kontaktiluettelo"
+
+#~ msgid "All folders"
+#~ msgstr "Kaikki kansiot"
+
+#, fuzzy
+#~ msgid "Display Options"
+#~ msgstr "Näytä toinen kansio"
+
+#, fuzzy
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "_Sähköpostiasetukset..."
+
+#, fuzzy
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "Palvelimen asetukset"
author	Sami Pesonen <spesonen@src.gnome.org>	2003-04-07 02:15:01 +0800
committer	Sami Pesonen <spesonen@src.gnome.org>	2003-04-07 02:15:01 +0800
commit	09e4c2360ab1f2974909a5f371f6ae4c6bf4acdc (patch)
tree	e86c9d17a960871c2b12856cc46e6a25169e749a /po
parent	15622917811ca7353e6513fe10807a0b6e413a83 (diff)
download	gsoc2013-evolution-09e4c2360ab1f2974909a5f371f6ae4c6bf4acdc.tar gsoc2013-evolution-09e4c2360ab1f2974909a5f371f6ae4c6bf4acdc.tar.gz gsoc2013-evolution-09e4c2360ab1f2974909a5f371f6ae4c6bf4acdc.tar.bz2 gsoc2013-evolution-09e4c2360ab1f2974909a5f371f6ae4c6bf4acdc.tar.lz gsoc2013-evolution-09e4c2360ab1f2974909a5f371f6ae4c6bf4acdc.tar.xz gsoc2013-evolution-09e4c2360ab1f2974909a5f371f6ae4c6bf4acdc.tar.zst gsoc2013-evolution-09e4c2360ab1f2974909a5f371f6ae4c6bf4acdc.zip