[evolution/gnome-2-28] Updated Finnish translation

From: Ilkka Tuohela <ituohela src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [evolution/gnome-2-28] Updated Finnish translation
Date: Sun, 13 Sep 2009 09:09:45 +0000 (UTC)
commit d5c309161a816e40ed072fedc8535dd21ce1d26c
Author: Ilkka Tuohela <hile iki fi>
Date:   Sun Sep 13 12:09:35 2009 +0300

    Updated Finnish translation

 po/fi.po |10545 ++++++++++++++++++++++++++++----------------------------------
 1 files changed, 4762 insertions(+), 5783 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 3b40529..36b909f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,12 +8,12 @@
 # Huomautus: PIM ei ole suomennettu, evolution on suomeksi
 # yksinkertaisesti sÃ¤hkÃ¶postiohjelma. Saa ehdottaa nimeÃ¤.
 #
-#: ../shell/main.c:603
+#: ../shell/main.c:631
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-10 16:11+0300\n"
+"POT-Creation-Date: 2009-09-13 11:48+0300\n"
 "PO-Revision-Date: 2009-02-10 16:15+0300\n"
 "Last-Translator: Ilkka Tuohela <hile iki fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu lists sourceforge net>\n"
@@ -24,21 +24,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution address book"
 msgstr "evolutionin osoitekirja"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:208
 msgid "New Contact"
 msgstr "Uusi yhteystieto"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:216
 msgid "New Contact List"
 msgstr "Uusi yhteystietoluettelo"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -61,32 +61,32 @@ msgstr "Yhteystiedot: "
 msgid "evolution minicard"
 msgstr "Evolutionin minikortti"
 
-#: ../a11y/calendar/ea-cal-view-event.c:265
+#: ../a11y/calendar/ea-cal-view-event.c:263
 msgid "It has alarms."
 msgstr "SisÃ¤ltÃ¤Ã¤ hÃ¤lytyksiÃ¤."
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has recurrences."
 msgstr "SisÃ¤ltÃ¤Ã¤ toistuvuuksia."
 
-#: ../a11y/calendar/ea-cal-view-event.c:271
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It is a meeting."
 msgstr "SisÃ¤ltÃ¤Ã¤ kokouksen."
 
-#: ../a11y/calendar/ea-cal-view-event.c:277
+#: ../a11y/calendar/ea-cal-view-event.c:275
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalenteritapahtuma, yhteenveto aiheesta: %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:279
+#: ../a11y/calendar/ea-cal-view-event.c:277
 msgid "Calendar Event: It has no summary."
 msgstr "Kalenteritapahtuma, ei yhteenvetoa."
 
-#: ../a11y/calendar/ea-cal-view-event.c:299
+#: ../a11y/calendar/ea-cal-view-event.c:297
 msgid "calendar view event"
 msgstr "kalenterinÃ¤kymÃ¤n tapahtuma"
 
-#: ../a11y/calendar/ea-cal-view-event.c:527
+#: ../a11y/calendar/ea-cal-view-event.c:525
 msgid "Grab Focus"
 msgstr "Ota kohdistin"
 
@@ -110,8 +110,8 @@ msgstr "Siirry tÃ¤hÃ¤n pÃ¤ivÃ¤Ã¤n"
 msgid "Go to Date"
 msgstr "Siirry pÃ¤ivÃ¤Ã¤n"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:301
-#: ../a11y/calendar/ea-week-view-main-item.c:298
+#: ../a11y/calendar/ea-day-view-main-item.c:300
+#: ../a11y/calendar/ea-week-view-main-item.c:297
 msgid "a table to view and select the current time range"
 msgstr "taulukko, josta voi nÃ¤hdÃ¤ ja valita nykyisen aika-alueen"
 
@@ -155,7 +155,7 @@ msgid "calendar view for one or more days"
 msgstr "Kalenteri nÃ¤kymÃ¤ yhdelle tai useammalle pÃ¤ivÃ¤lle"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:821
+#: ../calendar/gui/calendar-component.c:771
 msgid "%A %d %b %Y"
 msgstr "%A %d. %Bta %Y"
 
@@ -166,18 +166,18 @@ msgstr "%A %d. %Bta %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:824
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1601
-#: ../calendar/gui/e-week-view-main-item.c:335
+#: ../calendar/gui/calendar-component.c:774
+#: ../calendar/gui/e-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1593
+#: ../calendar/gui/e-week-view-main-item.c:368
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:826
-#: ../calendar/gui/calendar-component.c:831
-#: ../calendar/gui/calendar-component.c:833
+#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:783
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -185,10 +185,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:845
-#: ../calendar/gui/calendar-component.c:852
-#: ../calendar/gui/calendar-component.c:858
-#: ../calendar/gui/calendar-component.c:860
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:802
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:810
 msgid "%d %b %Y"
 msgstr "%d. %Bta %Y"
 
@@ -198,15 +198,15 @@ msgstr "%d. %Bta %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:850
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1617
-#: ../calendar/gui/e-week-view-main-item.c:349
+#: ../calendar/gui/calendar-component.c:800
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1609
+#: ../calendar/gui/e-week-view-main-item.c:382
 msgid "%d %b"
 msgstr "%d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/importers/icalendar-importer.c:782
 msgid "Gnome Calendar"
 msgstr "Gnome kalenteri"
 
@@ -218,11 +218,11 @@ msgstr "hakupalkki"
 msgid "evolution calendar search bar"
 msgstr "evolutionin kalenterin hakupalkki"
 
-#: ../a11y/calendar/ea-jump-button.c:147
+#: ../a11y/calendar/ea-jump-button.c:146
 msgid "Jump button"
 msgstr "HyppÃ¤yspainike"
 
-#: ../a11y/calendar/ea-jump-button.c:156
+#: ../a11y/calendar/ea-jump-button.c:155
 msgid "Click here, you can find more events."
 msgstr "napsauta tÃ¤stÃ¤, voit lÃ¶ytÃ¤Ã¤ lisÃ¤Ã¤ tapahtumia."
 
@@ -253,50 +253,50 @@ msgstr "ponnahdusikkuna"
 msgid "popup a child"
 msgstr "Ponnauta lapsi"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
 msgid "edit"
 msgstr "muokkaa"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:617
 msgid "begin editing this cell"
 msgstr "muokkaa tÃ¤tÃ¤ solua"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:169
 msgid "toggle"
 msgstr "vaihtele"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
 msgid "toggle the cell"
 msgstr "Vaihtele solun nÃ¤kyvyyttÃ¤"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:210
 msgid "expand"
 msgstr "laajenna"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:211
 msgid "expands the row in the ETree containing this cell"
 msgstr "laajentaa tÃ¤mÃ¤n solun sisÃ¤ltÃ¤vÃ¤n rivin ETreessÃ¤"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:216
 msgid "collapse"
 msgstr "piilota"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:217
 msgid "collapses the row in the ETree containing this cell"
 msgstr "piilota tÃ¤mÃ¤n solun sisÃ¤ltÃ¤vÃ¤ ETreen rivi"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:121
+#: ../a11y/e-table/gal-a11y-e-cell.c:120
 msgid "Table Cell"
 msgstr "Taulukon solu"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
-#: ../widgets/table/e-table-click-to-add.c:580
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:58
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/e-table-click-to-add.c:578
 msgid "click to add"
 msgstr "lisÃ¤Ã¤ napsauttamalla"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:67
 msgid "click"
 msgstr "napsauta"
 
@@ -330,14 +330,6 @@ msgstr "KÃ¤ytÃ¤ oletuksia"
 msgid "Popup Menu"
 msgstr "Ponnahdusvalikko"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "NÃ¤ytÃ¤ tai piilota liitepalkki"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "ota kÃ¤yttÃ¶Ã¶n"
-
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
@@ -391,13 +383,13 @@ msgstr "Osoitekirjaa ei voitu poistaa."
 
 #: ../addressbook/addressbook.error.xml.h:11
 msgid ""
-"Currently you can access only GroupWise System Address Book from Evolution. "
-"Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and GroupWise Personal Contacts folders."
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr ""
 "Voit tÃ¤llÃ¤ hetkellÃ¤ kÃ¤yttÃ¤Ã¤ vain GroupWisen jÃ¤rjestelmÃ¤osoitekirjaa "
 "Evolutionista. KÃ¤ytÃ¤ jotain toista GroupWise-asiakasta kerran, jotta saat "
-"GroupWisen \"Toistuvat yhteystiedot\"- ja \"HenkilÃ¶kohtaiset yhteystiedot\"-"
+"GroupWisen \"YleisimmÃ¤t yhteystiedot\"- ja \"HenkilÃ¶kohtaiset yhteystiedot\"-"
 "kansiot kÃ¤yttÃ¶Ã¶si."
 
 #: ../addressbook/addressbook.error.xml.h:12
@@ -418,7 +410,7 @@ msgstr "LDAP-palvelimelle tunnistautuminen epÃ¤onnistui."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1745
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1752
 msgid "Failed to delete contact"
 msgstr "Yhteystiedon poisto epÃ¤onnistui"
 
@@ -438,7 +430,7 @@ msgstr "Palvelimen versio"
 #: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr ""
-"Jotkut ominaisuudet eivÃ¤t vÃ¤lttÃ¤mÃ¤ttÃ¤ toimi oikein palvelimesi nykyisen "
+"Jotkut ominaisuudet eivÃ¤t vÃ¤lttÃ¤mÃ¤ttÃ¤ toimi oikein palvelimen tÃ¤mÃ¤nhetkisen "
 "version kanssa"
 
 #: ../addressbook/addressbook.error.xml.h:21
@@ -572,104 +564,93 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:491
+#: ../addressbook/conduit/address-conduit.c:590
 msgid "Default Sync Address:"
 msgstr "Synkronoinnin oletusosoite:"
 
-#: ../addressbook/conduit/address-conduit.c:1521
-#: ../addressbook/conduit/address-conduit.c:1522
+#: ../addressbook/conduit/address-conduit.c:1613
+#: ../addressbook/conduit/address-conduit.c:1614
 msgid "Could not load address book"
 msgstr "Osoitekirjaa ei voitu ladata"
 
-#: ../addressbook/conduit/address-conduit.c:1599
-#: ../addressbook/conduit/address-conduit.c:1602
+#: ../addressbook/conduit/address-conduit.c:1691
+#: ../addressbook/conduit/address-conduit.c:1694
 msgid "Could not read pilot's Address application block"
 msgstr "Pilotin osoitekirjan ohjelmalohkoa ei voi lukea"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#: ../addressbook/gui/component/autocompletion-config.c:173
-msgid "Autocompletion"
-msgstr "Automaattinen tÃ¤ydennys"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
 msgstr "_Yhteystiedot"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Certificates"
 msgstr "Varmenteet"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configure autocomplete here"
-msgstr "MÃ¤Ã¤rittele automaattinen tÃ¤ydennys"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Configure contacts and autocompletion here"
+msgstr "MÃ¤Ã¤rittele yhteystiedot ja automaattinen tÃ¤ydennys"
 
-#. ensure the group name is in current locale, not read from configuration
 #. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:316
-#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:582
+#: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:395
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:579
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Evolution Address Book"
 msgstr "Evolutionin osoitekirja"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Address Book address popup"
 msgstr "Evolutionin osoitekirjan osoiteponnahdusikkuna"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Address Book address viewer"
 msgstr "Evolutionin osoitekirjan osoitteiden katselin"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book card viewer"
 msgstr "Evolutionin osoitekirjan kortinkatselin"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Address Book component"
 msgstr "Evolutionin osoitekirjan komponentti"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution S/MIME Certificate Management Control"
 msgstr "Evolution S/MIME-varmenteiden hallintatyÃ¶kalu"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution folder settings configuration control"
 msgstr "Evolution kansioasetusten mÃ¤Ã¤rittelyjen ohjain"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Manage your S/MIME certificates here"
 msgstr "Hallitse S/Mime-varmenteita"
 
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:142
-#: ../addressbook/gui/component/addressbook-component.c:146
-#: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:243
-#: ../calendar/gui/calendar-component.c:247
-#: ../calendar/gui/memos-component.c:197 ../calendar/gui/memos-component.c:201
-#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
-#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
-#: ../calendar/gui/tasks-component.c:198 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2990
-#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
-#: ../mail/message-list.c:1517
+#: ../addressbook/gui/component/addressbook-component.c:97
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../calendar/gui/calendar-component.c:192
+#: ../calendar/gui/memos-component.c:151 ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:576 ../calendar/gui/migration.c:1090
+#: ../calendar/gui/tasks-component.c:148 ../mail/em-folder-tree-model.c:191
+#: ../mail/em-folder-tree-model.c:193 ../mail/em-migrate.c:2890
+#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217
+#: ../mail/message-list.c:1515
 msgid "On This Computer"
 msgstr "TÃ¤llÃ¤ tietokoneella"
 
+#. Create the LDAP source group
+#: ../addressbook/gui/component/addressbook-component.c:98
+#: ../addressbook/gui/component/addressbook-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "LDAP-palvelimilla"
+
 #. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. ensure the source name is in current locale, not read from configuration
@@ -681,144 +662,193 @@ msgstr "TÃ¤llÃ¤ tietokoneella"
 #. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:154
-#: ../addressbook/gui/component/addressbook-component.c:157
-#: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
-#: ../calendar/gui/calendar-component.c:255
-#: ../calendar/gui/calendar-component.c:261
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memos-component.c:213
-#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
-#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../addressbook/gui/component/addressbook-component.c:135
+#: ../addressbook/gui/component/addressbook-component.c:138
+#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../calendar/gui/calendar-component.c:232
+#: ../calendar/gui/calendar-component.c:238
+#: ../calendar/gui/memos-component.c:189 ../calendar/gui/memos-component.c:193
+#: ../calendar/gui/migration.c:484 ../calendar/gui/migration.c:584
+#: ../calendar/gui/migration.c:1098 ../calendar/gui/tasks-component.c:186
+#: ../calendar/gui/tasks-component.c:190 ../mail/em-migrate.c:960
+#: ../plugins/email-custom-header/email-custom-header.c:337
 msgid "Personal"
 msgstr "HenkilÃ¶kohtainen"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:168
-#: ../addressbook/gui/component/addressbook-component.c:171
-#: ../addressbook/gui/component/addressbook-migrate.c:518
-msgid "On LDAP Servers"
-msgstr "LDAP-palvelimilla"
-
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:209
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Yhteystieto"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:210
 msgid "Create a new contact"
 msgstr "Luo uusi yhteystieto"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:217
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Yhteystieto_luettelo"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:218
 msgid "Create a new contact list"
 msgstr "Luo uusi yhteystietoluettelo"
 
-#: ../addressbook/gui/component/addressbook-component.c:253
-#: ../addressbook/gui/component/addressbook-config.c:1223
+#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../addressbook/gui/component/addressbook-config.c:1245
 msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
-#: ../addressbook/gui/component/addressbook-component.c:254
+#: ../addressbook/gui/component/addressbook-component.c:225
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Osoitekirja"
 
-#: ../addressbook/gui/component/addressbook-component.c:255
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new address book"
 msgstr "Luo uusi osoitekirja"
 
-#: ../addressbook/gui/component/addressbook-component.c:418
+#: ../addressbook/gui/component/addressbook-component.c:389
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Osoitekirjan asetusten tai kansioiden pÃ¤ivitys epÃ¤onnistui."
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:217
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"TÃ¤mÃ¤n vaihtoehdon valinta tarkoittaa, ettÃ¤ Evolution ottaa yhteyttÃ¤ LDAP-"
+"palvelimeen vain, jos se tukee SSL-salausta."
+
+#: ../addressbook/gui/component/addressbook-config.c:219
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"TÃ¤mÃ¤n vaihtoehdon valinta tarkoittaa, ettÃ¤ Evolution ottaa yhteyttÃ¤ LDAP-"
+"palvelimeen vain, jos se tukee TLS-salausta."
+
+#: ../addressbook/gui/component/addressbook-config.c:221
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+"TÃ¤mÃ¤n vaihtoehdon valinta tarkoittaa, ettei palvelin tue SSL- tai TLS-"
+"salausta. TÃ¤mÃ¤ tarkoittaa, ettÃ¤ yhteytesi on turvaton ja ettÃ¤ olet "
+"haavoittuvainen yhteyden turvaan kohdistuville hyÃ¶kkÃ¤yksille."
+
+#: ../addressbook/gui/component/addressbook-config.c:346
 msgid "Base"
 msgstr "Kanta"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:170
+#: ../addressbook/gui/component/addressbook-config.c:547
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "_Tyyppi:"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../addressbook/gui/component/addressbook-config.c:648
 msgid "Copy _book content locally for offline operation"
 msgstr "Kopioi _kirjan sisÃ¤ltÃ¶ yhteydettÃ¶mÃ¤Ã¤n kÃ¤yttÃ¶Ã¶n"
 
-#: ../addressbook/gui/component/addressbook-config.c:998
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90
-#: ../plugins/itip-formatter/itip-formatter.c:2532
+#: ../addressbook/gui/component/addressbook-config.c:759
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr ""
+"Portti LDAP-palvelimella, johon Evolution yrittÃ¤Ã¤ ottaa yhteyttÃ¤. Tarjolla "
+"on lista yleisistÃ¤ porteista. Kysy tarvittaessa jÃ¤rjestelmÃ¤si yllÃ¤pitÃ¤jÃ¤ltÃ¤ "
+"mitÃ¤ porttia sinun tulisi kÃ¤yttÃ¤Ã¤."
+
+#: ../addressbook/gui/component/addressbook-config.c:837
+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 ""
+"TÃ¤mÃ¤ on menetelmÃ¤, jota evolution kÃ¤yttÃ¤Ã¤ tunnistamiseesi. Huomaa, ettÃ¤ "
+"asettaminen arvoon \"SÃ¤hkÃ¶postiosoite\" vaatii anonyymiÃ¤ pÃ¤Ã¤syÃ¤ LDAP-"
+"palvelimellesi."
+
+#: ../addressbook/gui/component/addressbook-config.c:916
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr ""
+"Haun kattavuus mÃ¤Ã¤rittelee, kuinka syvÃ¤lle hakemistopuuhun haluat hakusi "
+"menevÃ¤n. Kattavuus \"Ali\" kattaa kaikki kentÃ¤t hakupohjasi alla ja sen "
+"alipuissa, kun taas kattavuus \"Yksi\" kattaa kentÃ¤t yhden tason "
+"hakupohjastasi alaspÃ¤in."
+
+#: ../addressbook/gui/component/addressbook-config.c:1020
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:95
+#: ../plugins/itip-formatter/itip-formatter.c:2558
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Yleiset"
 
-#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/component/addressbook-config.c:1021
 #: ../addressbook/gui/widgets/e-addressbook-view.c:554
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Osoitekirja"
 
-#: ../addressbook/gui/component/addressbook-config.c:1003
+#: ../addressbook/gui/component/addressbook-config.c:1025
 msgid "Server Information"
 msgstr "Palvelimen tiedot"
 
-#: ../addressbook/gui/component/addressbook-config.c:1005
+#: ../addressbook/gui/component/addressbook-config.c:1027
 msgid "Authentication"
 msgstr "Kirjautuminen"
 
-#: ../addressbook/gui/component/addressbook-config.c:1008
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/addressbook-config.c:1030
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Yksityiskohtaiset"
 
-#: ../addressbook/gui/component/addressbook-config.c:1009
-#: ../mail/em-folder-browser.c:1000
+#: ../addressbook/gui/component/addressbook-config.c:1031
+#: ../mail/em-folder-browser.c:1021
 msgid "Searching"
 msgstr "EtsitÃ¤Ã¤n"
 
-#: ../addressbook/gui/component/addressbook-config.c:1011
+#: ../addressbook/gui/component/addressbook-config.c:1033
 msgid "Downloading"
 msgstr "Noudetaan"
 
-#: ../addressbook/gui/component/addressbook-config.c:1221
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/addressbook-config.c:1243
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "Osoitekirjan ominaisuudet"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1209
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1109
 msgid "Migrating..."
 msgstr "SiirretÃ¤Ã¤n..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1268
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168
 #, c-format
 msgid "Migrating '%s':"
 msgstr "SiirretÃ¤Ã¤n  \"%s\":"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:646
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "LDAP-palvelimet"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:761
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
 msgstr "Automaattisen tÃ¤ydennyksen asetukset"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1137
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -830,7 +860,7 @@ msgstr ""
 "\n"
 "Odota kÃ¤rsivÃ¤llisesti, kun Evolution siirtÃ¤Ã¤ kansioitasi..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1151
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -840,7 +870,7 @@ msgstr ""
 "\n"
 "Odota kÃ¤rsivÃ¤llisesti, kun Evolution muuntaa kansioitasi..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1160
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -850,7 +880,7 @@ msgstr ""
 "\n"
 "Odota kÃ¤rsivÃ¤llisesti kun Evolution muuntaa kansioitasi..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1170
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -862,18 +892,18 @@ msgstr ""
 "Odota kÃ¤rsivÃ¤llisesti kun Evolution muuntaa Pilotin synkronointitietojasi..."
 
 #: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:448
+#: ../mail/em-folder-utils.c:453
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "NimeÃ¤ \"%s\" uudestaan: "
 
 #: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:450
+#: ../mail/em-folder-utils.c:455
 msgid "Rename Folder"
 msgstr "NimeÃ¤ kansio uudestaan"
 
 #: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:456
+#: ../mail/em-folder-utils.c:461
 msgid "Folder names cannot contain '/'"
 msgstr "Kansion nimi ei voi sisÃ¤ltÃ¤Ã¤ merkkiÃ¤ '/'"
 
@@ -886,19 +916,19 @@ msgid "Save As vCard..."
 msgstr "Tallenna vCard-muodossa..."
 
 #: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:678
-#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:501
-#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
+#: ../calendar/gui/calendar-component.c:628
+#: ../calendar/gui/memos-component.c:479 ../calendar/gui/tasks-component.c:472
+#: ../mail/em-folder-tree.c:2122 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_NimeÃ¤ uudestaan..."
 
 #: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:681
-#: ../calendar/gui/e-calendar-table.c:1609
-#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:939
-#: ../calendar/gui/memos-component.c:512 ../calendar/gui/tasks-component.c:504
-#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1342
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/calendar-component.c:631
+#: ../calendar/gui/e-calendar-table.c:1613
+#: ../calendar/gui/e-calendar-view.c:1828 ../calendar/gui/e-memo-table.c:949
+#: ../calendar/gui/memos-component.c:482 ../calendar/gui/tasks-component.c:475
+#: ../mail/em-folder-tree.c:2119 ../mail/em-folder-view.c:1340
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -906,11 +936,10 @@ msgid "_Delete"
 msgstr "_Poista"
 
 #: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:686
-#: ../calendar/gui/dialogs/comp-editor.c:2092
-#: ../calendar/gui/memos-component.c:517 ../calendar/gui/tasks-component.c:509
-#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+#: ../calendar/gui/calendar-component.c:636
+#: ../calendar/gui/memos-component.c:487 ../calendar/gui/tasks-component.c:480
+#: ../mail/em-folder-tree.c:2127 ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Ominaisuudet..."
 
@@ -923,20 +952,20 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Otetaan yhteyttÃ¤ LDAP-palvelimeen anonyymisti"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
 msgid "Failed to authenticate.\n"
 msgstr "Kirjautuminen epÃ¤onnistui.\n"
 
 #: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "SyÃ¶tÃ¤ salasana palvelulle %s (kÃ¤yttÃ¤jÃ¤ %s)"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:422
-#: ../plugins/publish-calendar/publish-calendar.c:191
+#: ../plugins/google-account-setup/google-source.c:519
+#: ../plugins/publish-calendar/publish-calendar.c:216
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "SyÃ¶tÃ¤ salasana"
@@ -986,7 +1015,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "Viimeksi nimien valinta-ikkunassa valitun kansion URI"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Vertical pane position"
 msgstr "Vaakapaneelin sijainti"
 
@@ -1003,10 +1032,23 @@ msgid "Whether to show the preview pane."
 msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ esikatselupaneeli."
 
 #: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Autocompletion"
+msgstr "Automaattinen tÃ¤ydennys"
+
+#: ../addressbook/gui/component/autocompletion-config.c:177
 msgid "Always _show address of the autocompleted contact"
 msgstr "NÃ¤ytÃ¤ _aina automaattitÃ¤ydennetyn yhteystiedon osoite"
 
-#: ../addressbook/gui/component/autocompletion-config.c:180
+#: ../addressbook/gui/component/autocompletion-config.c:182
+msgid "Date/Time Format"
+msgstr "PÃ¤ivÃ¤ys/aika -muotoilu"
+
+#: ../addressbook/gui/component/autocompletion-config.c:185
+#: ../mail/em-mailer-prefs.c:1456
+msgid "Table column:"
+msgstr "Taulun sarake:"
+
+#: ../addressbook/gui/component/autocompletion-config.c:187
 msgid "Look up in address books"
 msgstr "_Etsi osoitekirjoista"
 
@@ -1015,21 +1057,19 @@ msgid "1"
 msgstr "1"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:3
-msgid "389"
-msgstr "389"
+msgid ""
+"389\n"
+"636\n"
+"3268"
+msgstr ""
+"389\n"
+"636\n"
+"3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "636"
-msgstr "636"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "<b>Authentication</b>"
 msgstr "<b>Todennus</b>"
@@ -1042,147 +1082,75 @@ msgstr "<b>Noudetaan</b>"
 msgid "<b>Searching</b>"
 msgstr "<b>EtsitÃ¤Ã¤n</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
-msgid "<b>Type:</b>"
-msgstr "<b>Tyyppi:</b>"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "Add Address Book"
-msgstr "LisÃ¤Ã¤ osoitekirja"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:760
-msgid "Always"
-msgstr "Aina"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:13
-msgid "Anonymously"
-msgstr "Anonyymisti"
+msgid ""
+"Anonymously\n"
+"Using email address\n"
+"Using distinguished name (DN)"
+msgstr ""
+"Anonyymi\n"
+"kÃ¤ytÃ¤ sÃ¤hkÃ¶postiosoitetta\n"
+"kÃ¤ytÃ¤ yksilÃ¶llistÃ¤ nimeÃ¤ (DN)"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "B_rowse this book until limit reached"
 msgstr "S_elaa tÃ¤tÃ¤ kirjaa, kunnes raja tulee vastaan"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Basic"
-msgstr "YleistÃ¤"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid "Distinguished name"
-msgstr "YksikÃ¤sitteinen nimi"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:19
-msgid "Email address"
-msgstr "SÃ¤hkÃ¶postiosoite"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution kÃ¤yttÃ¤Ã¤ tÃ¤tÃ¤ sÃ¤hkÃ¶postiosoitetta sinun todentamiseksesi "
 "palvelimelle."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid "Find Possible Search Bases"
-msgstr "Etsi mahdolliset hakupohjat"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Lo_gin:"
 msgstr "_Kirjautuminen:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:759
-msgid "Never"
-msgstr "Ei koskaan"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:287
-msgid "No encryption"
-msgstr "Ei salausta"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "One"
-msgstr "Yksi"
+#: ../addressbook/gui/component/ldap-config.glade.h:19
+msgid ""
+"One\n"
+"Sub"
+msgstr ""
+"Yksi taso\n"
+"Alipuu"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:295
-msgid "SSL encryption"
-msgstr "SSL-salattu"
+#: ../addressbook/gui/component/ldap-config.glade.h:21
+msgid ""
+"SSL encryption\n"
+"TLS encryption\n"
+"No encryption"
+msgstr ""
+"SSL-salsus\n"
+"TLS-salaus\n"
+"Ei salausta"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "Search Filter"
 msgstr "Hakusuodatin"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 msgid "Search _base:"
 msgstr "Haku_pohja:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "Search _filter:"
 msgstr "Hakusuodatin:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid "Search filter"
-msgstr "Hakusuodatin"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid ""
-"Search filter is the type of the objects searched for, while performing the "
-"search. If this is not modified, by  default search will be performed on "
-"objectclass of the type \"person\"."
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
 msgstr ""
 "Hakusuodatin mÃ¤Ã¤rittÃ¤Ã¤ etsittÃ¤vien kohteiden tyypin hakua varten. Jos "
 "asetusta ei muuteta, etsitÃ¤Ã¤n oletuksena \"person\"-tyypin kohderyhmÃ¤stÃ¤."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"TÃ¤mÃ¤n vaihtoehdon valinta tarkoittaa, ettÃ¤ Evolution ottaa yhteyttÃ¤ LDAP-"
-"palvelimeen vain, jos se tukee SSL-salausta."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"TÃ¤mÃ¤n vaihtoehdon valinta tarkoittaa, ettÃ¤ Evolution ottaa yhteyttÃ¤ LDAP-"
-"palvelimeen vain, jos se tukee TLS-salausta."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:35
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"TÃ¤mÃ¤n vaihtoehdon valinta tarkoittaa, ettei palvelimesi tue SSL- tai TLS-"
-"salausta. TÃ¤mÃ¤ tarkoittaa, ettÃ¤ yhteytesi on turvaton ja ettÃ¤ olet "
-"haavoittuvainen yhteyden turvaan kohdistuville hyÃ¶kkÃ¤yksille."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-msgid "Sub"
-msgstr "Ali"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Supported Search Bases"
 msgstr "Tuetut hakupohjat"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:291
-msgid "TLS encryption"
-msgstr "TLS-salattu"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
@@ -1191,27 +1159,14 @@ msgstr ""
 "Hakupohja on yksilÃ¶llinen nimi (DN) kentÃ¤lle, josta hakusi alkavat. Jos "
 "jÃ¤tÃ¤t tÃ¤mÃ¤n tyhjÃ¤ksi, haku alkaa hakemistopuun juuresta."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"Haun kattavuus mÃ¤Ã¤rittelee, kuinka syvÃ¤lle hakemistopuuhun haluat hakusi "
-"menevÃ¤n. Kattavuus \"Ali\" kattaa kaikki kentÃ¤t hakupohjasi alla ja sen "
-"alipuissa, kun taas kattavuus \"Yksi\" kattaa kentÃ¤t yhden tason "
-"hakupohjastasi alaspÃ¤in."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
-"TÃ¤mÃ¤ kenttÃ¤ on LDAP-palvelimesi koko nimi, esimerkiksi \"ldap.mycompany.com"
-"\"."
+"TÃ¤mÃ¤ kenttÃ¤ on LDAP-palvelimen koko nimi, esimerkiksi \"ldap.mycompany.com\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1219,17 +1174,7 @@ msgstr ""
 "Suurin sallittu noudettavien korttien mÃ¤Ã¤rÃ¤ noutokertaa kohti. TÃ¤mÃ¤n arvon "
 "asettaminen liian suureksi hidastaa osoitekirjan kÃ¤yttÃ¶Ã¤."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
-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 ""
-"TÃ¤mÃ¤ on menetelmÃ¤, jota evolution kÃ¤yttÃ¤Ã¤ tunnistamiseesi. Huomaa, ettÃ¤ "
-"asettaminen arvoon \"SÃ¤hkÃ¶postiosoite\" vaatii anonyymiÃ¤ pÃ¤Ã¤syÃ¤ LDAP-"
-"palvelimellesi."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1237,87 +1182,61 @@ msgstr ""
 "TÃ¤mÃ¤ on nimi, jolla tÃ¤mÃ¤ palvelin nÃ¤kyy Evolutionin kansiolistoissa. SitÃ¤ "
 "kÃ¤ytetÃ¤Ã¤n ainoastaan listoilla nÃ¤yttÃ¤miseen."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"Portti LDAP-palvelimella, johon Evolution yrittÃ¤Ã¤ ottaa yhteyttÃ¤. Tarjolla "
-"on lista yleisistÃ¤ porteista. Kysy tarvittaessa jÃ¤rjestelmÃ¤si yllÃ¤pitÃ¤jÃ¤ltÃ¤ "
-"mitÃ¤ porttia sinun tulisi kÃ¤yttÃ¤Ã¤."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:46
-msgid "Using distinguished name (DN)"
-msgstr "KÃ¤ytetÃ¤Ã¤n yksilÃ¶llistÃ¤ nimeÃ¤ (DN)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-msgid "Using email address"
-msgstr "KÃ¤ytetÃ¤Ã¤n sÃ¤hkÃ¶postiosoitetta"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:48
-msgid "Whenever Possible"
-msgstr "Milloin mahdollista"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:49
-msgid "_Add Address Book"
-msgstr "_LisÃ¤Ã¤ osoitekirja"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid "_Download limit:"
 msgstr "_Haun rajoitus:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "_Find Possible Search Bases"
 msgstr "Etsi mahdolliset hakupohjat"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "_Login method:"
 msgstr "_KirjautumismenetelmÃ¤:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:178
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid "_Search scope:"
 msgstr "_Hakualue:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:187
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../mail/mail-config.glade.h:184
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Server:"
 msgstr "_Palvelin: "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "_Timeout:"
 msgstr "_Aikakatkaisu:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "_Use secure connection:"
 msgstr "_KÃ¤ytÃ¤ salattua yhteyttÃ¤:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid "cards"
 msgstr "kortteja"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/caldav/caldav-source.c:430
-#: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:652
-#: ../plugins/google-account-setup/google-contacts-source.c:366
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-file/calendar-file.c:293
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:523
+#: ../plugins/google-account-setup/google-source.c:740
+#: ../plugins/google-account-setup/google-contacts-source.c:330
 msgid "minutes"
 msgstr "minuutti"
 
@@ -1342,44 +1261,42 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Sekalaiset</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+msgid "<b>Notes</b>"
+msgstr "<b>Muistilaput</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Muuta</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>Puhelin</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>WWW-osoitteet</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>TyÃ¶</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
-msgid "AIM"
-msgstr "AIM"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:7
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ry_hmÃ¤t..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:199
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Yhteystieto"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:543
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
 msgid "Contact Editor"
 msgstr "Yhteystietojen muokkain"
 
@@ -1388,1280 +1305,259 @@ msgid "Full _Name..."
 msgstr "_Koko nimi..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../composer/e-msg-composer.c:2473
 msgid "Image"
 msgstr "Kuva"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Postitusosoite"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Nic_kname:"
 msgstr "_Lempinimi:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "Novell Groupwise"
-msgstr "Novell Groupwise"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../calendar/gui/migration.c:1225
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+msgid "Notes"
+msgstr "Muistilaput"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "Personal Information"
 msgstr "HenkilÃ¶kohtaiset tiedot"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Telephone"
 msgstr "Puhelin"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
-#: ../mail/em-migrate.c:1057
-msgid "Work"
-msgstr "TyÃ¶"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Address:"
 msgstr "_Osoite:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Anniversary:"
 msgstr "_VuosipÃ¤ivÃ¤:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Assistant:"
 msgstr "_Apulainen:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Birthday:"
 msgstr "_SyntymÃ¤pÃ¤ivÃ¤:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../calendar/gui/dialogs/event-page.c:792
-#: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1909
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../calendar/gui/dialogs/event-page.c:820
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../plugins/itip-formatter/itip-view.c:1910
 msgid "_Calendar:"
 msgstr "_Kalenteri:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_City:"
 msgstr "_Kaupunki:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Company:"
 msgstr "_Yritys:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Country:"
 msgstr "_Maa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Department:"
 msgstr "_Osasto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_File under:"
 msgstr "_NÃ¤ytÃ¤ nimellÃ¤:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Free/Busy:"
 msgstr "_Vapaa/varattu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Home Page:"
 msgstr "K_otisivu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager:"
 msgstr "_Esimies:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
-msgid "_Notes:"
-msgstr "_Huomioita:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "_Toimisto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_PO Box:"
 msgstr "_Postilokero:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Profession:"
 msgstr "_Ammatti:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Spouse:"
 msgstr "_Puoliso:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_State/Province:"
 msgstr "_Osavaltio/lÃ¤Ã¤ni:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fullname.glade.h:19
 msgid "_Title:"
 msgstr "_Titteli:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Video Chat:"
 msgstr "_Videokeskustelu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Wants to receive HTML mail"
 msgstr "Haluaa sÃ¤hkÃ¶postit _HTML-muodossa"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Web Log:"
 msgstr "_Web-lokin osoite:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_MissÃ¤: "
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Zip/Postal Code:"
 msgstr "_Postinumero:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-msgid "Address"
-msgstr "Osoite"
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
+#: ../mail/em-mailer-prefs.c:473
+#: ../plugins/exchange-operations/exchange-delegates.c:951
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
+#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../widgets/menus/gal-define-views-dialog.c:344
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../widgets/menus/gal-view-new-dialog.c:61
+msgid "Name"
+msgstr "Nimi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:325
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:165
+#: ../addressbook/gui/widgets/e-addressbook-model.c:324
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:192
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3688
-#: ../widgets/text/e-text.c:3689
+#: ../widgets/table/e-cell-text.c:1816 ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3675
 msgid "Editable"
 msgstr "Muokattava"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
-msgid "United States"
-msgstr "Yhdysvallat"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
-msgid "Afghanistan"
-msgstr "Afganistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
-msgid "Albania"
-msgstr "Albania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
-msgid "Algeria"
-msgstr "Algeria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
-msgid "American Samoa"
-msgstr "Amerikkalainen Samoa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
-msgid "Andorra"
-msgstr "Andorra"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
-msgid "Angola"
-msgstr "Angola"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
-msgid "Anguilla"
-msgstr "Anguilla"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
-msgid "Antarctica"
-msgstr "EtelÃ¤manner"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
-msgid "Antigua And Barbuda"
-msgstr "Antigua ja Barbuda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
-msgid "Argentina"
-msgstr "Argentiina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
-msgid "Armenia"
-msgstr "Armenia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
-msgid "Aruba"
-msgstr "Aruba"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
-msgid "Australia"
-msgstr "Australia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
-msgid "Austria"
-msgstr "ItÃ¤valta"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
-msgid "Azerbaijan"
-msgstr "Azerbaidzan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
-msgid "Bahamas"
-msgstr "Bahamasaaret"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
-msgid "Bahrain"
-msgstr "Bahrain"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
-msgid "Bangladesh"
-msgstr "Bangladesh"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
-msgid "Barbados"
-msgstr "Barbados"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
-msgid "Belarus"
-msgstr "Valko-VenÃ¤jÃ¤"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
-msgid "Belgium"
-msgstr "Belgia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
-msgid "Belize"
-msgstr "Belize"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
-msgid "Benin"
-msgstr "Benin"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
-msgid "Bermuda"
-msgstr "Bermudasaaret"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
-msgid "Bhutan"
-msgstr "Bhutan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
-msgid "Bolivia"
-msgstr "Bolivia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
-msgid "Bosnia And Herzegowina"
-msgstr "Bosnia-Hertsegovina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
-msgid "Botswana"
-msgstr "Botswana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
-msgid "Bouvet Island"
-msgstr "Bouvet-saari"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
-msgid "Brazil"
-msgstr "Brasilia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
-msgid "British Indian Ocean Territory"
-msgstr "BrittilÃ¤inen Intian valtameren alue"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
-msgid "Brunei Darussalam"
-msgstr "Brunei Darussalam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
-msgid "Bulgaria"
-msgstr "Bulgaria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
-msgid "Burkina Faso"
-msgstr "Burkina Faso"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
-msgid "Burundi"
-msgstr "Burundi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
-msgid "Cambodia"
-msgstr "Kambodza"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
-msgid "Cameroon"
-msgstr "Kamerun"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
-msgid "Canada"
-msgstr "Kanada"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
-msgid "Cape Verde"
-msgstr "Kap Verde"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
-msgid "Cayman Islands"
-msgstr "Caymansaaret"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
-msgid "Central African Republic"
-msgstr "Keski-Afrikan Tasavalta"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
-msgid "Chad"
-msgstr "Tsad"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
-msgid "Chile"
-msgstr "Chile"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
-msgid "China"
-msgstr "Kiina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
-msgid "Christmas Island"
-msgstr "Joulusaaret"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
-msgid "Cocos (Keeling) Islands"
-msgstr "Kookos(Keeling)-saaret"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
-msgid "Colombia"
-msgstr "Kolumbia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
-msgid "Comoros"
-msgstr "Komorit"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
-msgid "Congo"
-msgstr "Kongo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
-msgid "Congo, The Democratic Republic Of The"
-msgstr "Kongon demokraattinen tasavalta"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
-msgid "Cook Islands"
-msgstr "Cookinsaaret"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
-msgid "Costa Rica"
-msgstr "Costa Rica"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
-msgid "Cote d'Ivoire"
-msgstr "Norsunluurannikko"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
-msgid "Croatia"
-msgstr "Kroatia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
-msgid "Cuba"
-msgstr "Kuuba"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
-msgid "Cyprus"
-msgstr "Kypros"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
-msgid "Czech Republic"
-msgstr "TÅ¡ekki"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
-msgid "Denmark"
-msgstr "Tanska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
-msgid "Djibouti"
-msgstr "Djibouti"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
-msgid "Dominica"
-msgstr "Dominica"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
-msgid "Dominican Republic"
-msgstr "Dominikaaninen Tasavalta"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
-msgid "Ecuador"
-msgstr "Ecuador"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
-msgid "Egypt"
-msgstr "Egypti"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
-msgid "El Salvador"
-msgstr "El Salvador"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
-msgid "Equatorial Guinea"
-msgstr "PÃ¤ivÃ¤ntasaajan Guinea"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
-msgid "Eritrea"
-msgstr "Eritrea"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
-msgid "Estonia"
-msgstr "Viro"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
-msgid "Ethiopia"
-msgstr "Etiopia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
-msgid "Falkland Islands"
-msgstr "Falklandsaaret"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
-msgid "Faroe Islands"
-msgstr "FÃ¤rsaaret"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
-msgid "Fiji"
-msgstr "Fidzi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
-msgid "Finland"
-msgstr "Suomi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
-msgid "France"
-msgstr "Ranska"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
-msgid "French Guiana"
-msgstr "Ranskan Guiana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
-msgid "French Polynesia"
-msgstr "Polynesia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
-msgid "French Southern Territories"
-msgstr "Ranskan etelÃ¤iset alueet"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
-msgid "Gabon"
-msgstr "Gabon"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
-msgid "Gambia"
-msgstr "Gambia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
-msgid "Georgia"
-msgstr "Georgia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
-msgid "Germany"
-msgstr "Saksa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
-msgid "Ghana"
-msgstr "Ghana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
-msgid "Gibraltar"
-msgstr "Gibraltar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
-msgid "Greece"
-msgstr "Kreikka"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
-msgid "Greenland"
-msgstr "GrÃ¶nlanti"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
-msgid "Grenada"
-msgstr "Grenada"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
-msgid "Guadeloupe"
-msgstr "Guadeloupe"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
-msgid "Guam"
-msgstr "Guam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
-msgid "Guatemala"
-msgstr "Guatemala"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
-msgid "Guernsey"
-msgstr "Guernsey"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
-msgid "Guinea"
-msgstr "Guinea"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
-msgid "Guinea-Bissau"
-msgstr "Guinea Bissau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
-msgid "Guyana"
-msgstr "Guyana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
-msgid "Haiti"
-msgstr "Haiti"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
-msgid "Heard And McDonald Islands"
-msgstr "Heard ja McDonaldinsaaret"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
-msgid "Holy See"
-msgstr "PyhÃ¤ meri"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
-msgid "Honduras"
-msgstr "Honduras"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Hong Kong"
-msgstr "Hong Kong"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
-msgid "Hungary"
-msgstr "Unkari"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
-msgid "Iceland"
-msgstr "Islanti"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
-msgid "India"
-msgstr "Intia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
-msgid "Indonesia"
-msgstr "Indonesia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
-msgid "Iran"
-msgstr "Iran"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
-msgid "Iraq"
-msgstr "Irak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
-msgid "Ireland"
-msgstr "Irlanti"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
-msgid "Isle of Man"
-msgstr "Mansaari"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
-msgid "Israel"
-msgstr "Israel"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
-msgid "Italy"
-msgstr "Italia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
-msgid "Jamaica"
-msgstr "Jamaika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
-msgid "Japan"
-msgstr "Japani"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
-msgid "Jersey"
-msgstr "Jersey"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
-msgid "Jordan"
-msgstr "Jordania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
-msgid "Kazakhstan"
-msgstr "Kazakstan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
-msgid "Kenya"
-msgstr "Kenia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
-msgid "Kiribati"
-msgstr "Kiribati"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
-msgid "Korea, Democratic People's Republic Of"
-msgstr "Korean demokraattinen kansantasavalta"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
-msgid "Korea, Republic Of"
-msgstr "Korean tasavalta"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
-msgid "Kuwait"
-msgstr "Kuwait"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
-msgid "Kyrgyzstan"
-msgstr "Kirgisia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
-msgid "Laos"
-msgstr "Laos"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
-msgid "Latvia"
-msgstr "Latvia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
-msgid "Lebanon"
-msgstr "Libanon"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
-msgid "Lesotho"
-msgstr "Lesotho"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
-msgid "Liberia"
-msgstr "Liberia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
-msgid "Libya"
-msgstr "Libya"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
-msgid "Liechtenstein"
-msgstr "Liechtenstein"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
-msgid "Lithuania"
-msgstr "Liettua"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
-msgid "Luxembourg"
-msgstr "Luxemburg"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
-msgid "Macao"
-msgstr "Macao"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
-msgid "Macedonia"
-msgstr "Makedonia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
-msgid "Madagascar"
-msgstr "Madagaskar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
-msgid "Malawi"
-msgstr "Malawi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
-msgid "Malaysia"
-msgstr "Malesia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
-msgid "Maldives"
-msgstr "Malediivit"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
-msgid "Mali"
-msgstr "Mali"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
-msgid "Malta"
-msgstr "Malta"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
-msgid "Marshall Islands"
-msgstr "Marshallinsaaret"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
-msgid "Martinique"
-msgstr "Martinique"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
-msgid "Mauritania"
-msgstr "Mauritania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
-msgid "Mauritius"
-msgstr "Mauritius"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
-msgid "Mayotte"
-msgstr "Mayotte"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
-msgid "Mexico"
-msgstr "Meksiko"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
-msgid "Micronesia"
-msgstr "Mikronesia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
-msgid "Moldova, Republic Of"
-msgstr "Moldova"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
-msgid "Monaco"
-msgstr "Monaco"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
-msgid "Mongolia"
-msgstr "Mongolia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
-msgid "Montserrat"
-msgstr "Montserrat"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
-msgid "Morocco"
-msgstr "Marokko"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
-msgid "Mozambique"
-msgstr "Mosambik"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
-msgid "Myanmar"
-msgstr "Myanmar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
-msgid "Namibia"
-msgstr "Namibia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
-msgid "Nauru"
-msgstr "Nauru"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
-msgid "Nepal"
-msgstr "Nepali"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
-msgid "Netherlands"
-msgstr "Alankomaat"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
-msgid "Netherlands Antilles"
-msgstr "Alankomaiden Antillit"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
-msgid "New Caledonia"
-msgstr "Uusi Kaledonia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
-msgid "New Zealand"
-msgstr "Uusi-Seelanti"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
-msgid "Nicaragua"
-msgstr "Nicaragua"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
-msgid "Niger"
-msgstr "Niger"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
-msgid "Nigeria"
-msgstr "Nigeria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
-msgid "Niue"
-msgstr "Niue"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
-msgid "Norfolk Island"
-msgstr "Norfolkinsaari"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
-msgid "Northern Mariana Islands"
-msgstr "Pohjois-Mariaanit"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
-msgid "Norway"
-msgstr "Norja"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
-msgid "Oman"
-msgstr "Oman"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
-msgid "Pakistan"
-msgstr "Pakistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
-msgid "Palau"
-msgstr "Palau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
-msgid "Palestinian Territory"
-msgstr "Palestiinalainen alue"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
-msgid "Panama"
-msgstr "Panama"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
-msgid "Papua New Guinea"
-msgstr "Papua Uusi-Guinea"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
-msgid "Paraguay"
-msgstr "Paraguay"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
-msgid "Peru"
-msgstr "Peru"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
-msgid "Philippines"
-msgstr "Filippiinit"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
-msgid "Pitcairn"
-msgstr "Pitcairn"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
-msgid "Poland"
-msgstr "Puola"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
-msgid "Portugal"
-msgstr "Portugal"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
-msgid "Puerto Rico"
-msgstr "Puerto Rico"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
-msgid "Qatar"
-msgstr "Qatar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
-msgid "Reunion"
-msgstr "RÃ©union"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
-msgid "Romania"
-msgstr "Romania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
-msgid "Russian Federation"
-msgstr "VenÃ¤jÃ¤"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
-msgid "Rwanda"
-msgstr "Ruanda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
-msgid "Saint Kitts And Nevis"
-msgstr "Saint Kitts ja Nevis"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
-msgid "Saint Lucia"
-msgstr "Saint Lucia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
-msgid "Saint Vincent And The Grenadines"
-msgstr "Saint Vincent ja Grenadiinit"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
-msgid "Samoa"
-msgstr "Samoa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
-msgid "San Marino"
-msgstr "San Marino"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
-msgid "Sao Tome And Principe"
-msgstr "SÃ£o TomÃ© ja Principe"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
-msgid "Saudi Arabia"
-msgstr "Saudi Arabia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
-msgid "Senegal"
-msgstr "Senegal"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
-msgid "Serbia And Montenegro"
-msgstr "Serbia ja Montenegro"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
-msgid "Seychelles"
-msgstr "Seychillit"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
-msgid "Sierra Leone"
-msgstr "Sierra Leone"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
-msgid "Singapore"
-msgstr "Singapore"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
-msgid "Slovakia"
-msgstr "Slovakia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
-msgid "Slovenia"
-msgstr "Slovenia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
-msgid "Solomon Islands"
-msgstr "Salomonsaaret"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
-msgid "Somalia"
-msgstr "Somalia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
-msgid "South Africa"
-msgstr "EtelÃ¤-Afrikka"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
-msgid "South Georgia And The South Sandwich Islands"
-msgstr "EtelÃ¤-Georgia ja EtelÃ¤iset Sandwichsaaret"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
-msgid "Spain"
-msgstr "Espanja"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
-msgid "Sri Lanka"
-msgstr "Sri Lanka"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
-msgid "St. Helena"
-msgstr "Saint Helena"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
-msgid "St. Pierre And Miquelon"
-msgstr "Saint-Pierre ja Miquelon"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
-msgid "Sudan"
-msgstr "Sudan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
-msgid "Suriname"
-msgstr "Surinam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
-msgid "Svalbard And Jan Mayen Islands"
-msgstr "Svalbard ja Jan Mayen"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
-msgid "Swaziland"
-msgstr "Swazimaa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
-msgid "Sweden"
-msgstr "Ruotsi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
-msgid "Switzerland"
-msgstr "Sveitsi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
-msgid "Syria"
-msgstr "Syyria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
-msgid "Taiwan"
-msgstr "Taiwan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
-msgid "Tajikistan"
-msgstr "Tadkistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
-msgid "Tanzania, United Republic Of"
-msgstr "Tansania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
-msgid "Thailand"
-msgstr "Thaimaa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
-msgid "Timor-Leste"
-msgstr "Timor-Leste"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
-msgid "Togo"
-msgstr "Togo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
-msgid "Tokelau"
-msgstr "Tokelau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
-msgid "Tonga"
-msgstr "Tonga"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
-msgid "Trinidad And Tobago"
-msgstr "Trinidad ja Tobago"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
-msgid "Tunisia"
-msgstr "Tunisia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
-msgid "Turkey"
-msgstr "Turkki"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
-msgid "Turkmenistan"
-msgstr "Turkmenistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
-msgid "Turks And Caicos Islands"
-msgstr "Turks- ja Caicossaaret"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
-msgid "Tuvalu"
-msgstr "Tuvalu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
-msgid "Uganda"
-msgstr "Uganda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
-msgid "Ukraine"
-msgstr "Ukraina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
-msgid "United Arab Emirates"
-msgstr "Yhdistyneet arabiemiirikunnat"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
-msgid "United Kingdom"
-msgstr "Iso-Britannia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
-msgid "United States Minor Outlying Islands"
-msgstr "Yhdysvaltain pienet erillissaaret"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
-msgid "Uruguay"
-msgstr "Uruguay"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
-msgid "Uzbekistan"
-msgstr "Uzbekistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
-msgid "Vanuatu"
-msgstr "Vanuatu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
-msgid "Venezuela"
-msgstr "Venezuela"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
-msgid "Viet Nam"
-msgstr "Vietnam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
-msgid "Virgin Islands, British"
-msgstr "BrittilÃ¤iset Neitsytsaaret"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
-msgid "Virgin Islands, U.S."
-msgstr "Yhdysvaltain Neitsytsaaret"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
-msgid "Wallis And Futuna Islands"
-msgstr "Wallis ja Futuna"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
-msgid "Western Sahara"
-msgstr "LÃ¤nsi-Sahara"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
-msgid "Yemen"
-msgstr "Jemen"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
-msgid "Zambia"
-msgstr "Sambia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
-msgid "Zimbabwe"
-msgstr "Zimbabwe"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:467
-#: ../plugins/exchange-operations/exchange-delegates.c:954
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
-#: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:351
-#: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:63
-msgid "Name"
-msgstr "Nimi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
-msgid "AOL Instant Messenger"
-msgstr "AOL pikaviestin"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:603
+msgid "AIM"
+msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-msgid "Yahoo Messenger"
-msgstr "Yahoo -pikaviestin"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
+msgid "Yahoo"
+msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
-msgid "Gadu-Gadu Messenger"
-msgstr "Gadu-Gadu -pikaviestin"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:607
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:612
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
+msgid "GroupWise"
+msgstr "Groupwise"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
-msgid "Service"
-msgstr "Palvelu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
-#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:694
-#: ../plugins/save-calendar/csv-format.c:376
-msgid "Location"
-msgstr "Sijainti"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
-msgid "Username"
-msgstr "KÃ¤yttÃ¤jÃ¤tunnus"
+#. red
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../mail/em-migrate.c:959
+msgid "Work"
+msgstr "TyÃ¶"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Koti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-#: ../calendar/gui/e-calendar-view.c:2259
+#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../calendar/gui/e-calendar-view.c:2289
 msgid "Other"
 msgstr "Muut"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
-msgid "MSN"
-msgstr "MSN"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
-msgid "GroupWise"
-msgstr "Groupwise"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
 msgid "Source Book"
 msgstr "LÃ¤hdekirja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
 msgid "Target Book"
 msgstr "Kohdekirja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
 msgid "Is New Contact"
 msgstr "Uusi yhteystieto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
 msgid "Writable Fields"
 msgstr "Muokattavat kentÃ¤t"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
 msgid "Required Fields"
 msgstr "Vaaditut kentÃ¤t"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Changed"
 msgstr "Muutettu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Yhteystietojen muokkain - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
 msgid "Please select an image for this contact"
 msgstr "Valitse kuva tÃ¤lle henkilÃ¶lle"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2833
 msgid "_No image"
 msgstr "_Ei kuvaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2669,43 +1565,43 @@ msgstr ""
 "Yhteystieto on virheellinen:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' sisÃ¤ltÃ¤Ã¤ virheellisen muotoilun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' sisÃ¤ltÃ¤Ã¤ virheellisen muotoilun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3126
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' on tyhjÃ¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3154
 msgid "Invalid contact."
 msgstr "Virheellinen yhteystieto."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
 msgid "Contact Quick-Add"
 msgstr "Yhteystiedon pikalisÃ¤ys"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
 msgid "_Edit Full"
 msgstr "Muokkaa _kaikkia tietoja"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
 msgid "_Full name"
 msgstr "_Koko nimi"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
 msgid "E_mail"
 msgstr "SÃ¤hkÃ¶_posti"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
 msgid "_Select Address Book"
 msgstr "_Valitse osoitekirja"
 
@@ -2714,16 +1610,14 @@ msgstr "_Valitse osoitekirja"
 msgid ""
 "Are you sure you want\n"
 "to delete contact list (%s)?"
-msgstr ""
-"Haluatko varmasti poistaa \n"
-"yhteystietolistan (%s)?"
+msgstr "Haluatko varmasti\n"
+"poistaa tÃ¤mÃ¤n yhteystietolistan (%s)?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:326
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
-msgstr ""
-"Haluatko varmasti\n"
+msgstr "Haluatko varmasti\n"
 "poistaa nÃ¤mÃ¤ yhteystietolistat?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:331
@@ -2731,123 +1625,71 @@ msgstr ""
 msgid ""
 "Are you sure you want\n"
 "to delete contact (%s)?"
-msgstr ""
-"Haluatko varmasti\n"
-"poistaa yhteystiedon (%s)?"
+msgstr "Haluatko varmasti\n"
+"poistaa tÃ¤mÃ¤n yhteystiedon (%s)?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:334
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
-msgstr ""
-"Haluatko varmasti\n"
+msgstr "Haluatko varmasti\n"
 "poistaa nÃ¤mÃ¤ yhteystiedot?"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Osoite _2:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Ci_ty:"
-msgstr "_Kaupunki:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Countr_y:"
-msgstr "M_aa:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
-msgid "Full Address"
-msgstr "_Osoite:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
-msgid "_ZIP Code:"
-msgstr "Po_stinumero:"
-
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid "Dr."
-msgstr "Tr."
+msgid ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
+msgstr ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
-msgid "Esq."
-msgstr "Esq."
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+msgid ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
+msgstr ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "Jr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "Neiti"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "Hra."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "Rva."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "Nti."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "Hr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_First:"
 msgstr "_Etunimi:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Last:"
 msgstr "_Sukunimi:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Middle:"
 msgstr "_Toinen nimi:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Suffix:"
 msgstr "_PÃ¤Ã¤te:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-msgid "Add IM Account"
-msgstr "LisÃ¤Ã¤ pikaviestitili"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:2
-msgid "_Account name:"
-msgstr "_Tilin nimi:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:3
-msgid "_IM Service:"
-msgstr "_Pikaviestipalvelu:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:372
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
-msgid "_Location:"
-msgstr "_Sijainti:"
-
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "<b>Members</b>"
 msgstr "<b>JÃ¤senet</b>"
@@ -2858,9 +1700,9 @@ msgid "Contact List Editor"
 msgstr "Yhteystietolistojen muokkain"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
-#: ../calendar/gui/e-day-view-time-item.c:815
-#: ../calendar/gui/e-timezone-entry.c:121
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:212
+#: ../calendar/gui/e-day-view-time-item.c:812
+#: ../calendar/gui/e-timezone-entry.c:118
 msgid "Select..."
 msgstr "Valitse..."
 
@@ -2886,11 +1728,11 @@ msgid "_Members"
 msgstr "_JÃ¤senet"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:311
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
 #: ../addressbook/gui/widgets/e-addressbook-view.c:211
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:531
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "Kirja"
 
@@ -2936,27 +1778,27 @@ msgstr ""
 "Haluatko lisÃ¤tÃ¤ joka tapauksessa?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:214
+#: ../addressbook/gui/merging/eab-contact-merging.c:213
 msgid "_Merge"
 msgstr "_YhdistÃ¤"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:199
+#: ../addressbook/gui/merging/eab-contact-merging.c:198
 msgid "Merge Contact"
 msgstr "YhdistÃ¤ yhteystieto"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:267
+#: ../addressbook/gui/merging/eab-contact-merging.c:266
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
-#: ../addressbook/gui/widgets/eab-contact-display.c:871
-#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:868
+#: ../plugins/groupwise-features/junk-settings.c:420 ../smime/lib/e-cert.c:808
 msgid "Email"
 msgstr "SÃ¤hkÃ¶posti"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:160
-#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/cal-search-bar.c:79 ../calendar/gui/caltypes.xml.h:2
 #: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "MikÃ¤ tahansa kenttÃ¤ sisÃ¤ltÃ¤Ã¤"
@@ -2970,35 +1812,35 @@ msgstr "SÃ¤hkÃ¶posti alkaa"
 msgid "Name contains"
 msgstr "Nimi sisÃ¤ltÃ¤Ã¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "Ei yhteystietoja"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#: ../addressbook/gui/widgets/e-addressbook-model.c:165
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d yhteystieto"
 msgstr[1] "%d yhteystietoa"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:318
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
 #: ../addressbook/gui/widgets/e-addressbook-view.c:225
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:538
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Kysely"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:461
+#: ../addressbook/gui/widgets/e-addressbook-model.c:460
 msgid "Error getting book view"
 msgstr "Virhe ladattaessa kirjanÃ¤kymÃ¤Ã¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
-#: ../widgets/table/e-table-click-to-add.c:509
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
+#: ../widgets/table/e-table-click-to-add.c:507
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3354
-#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3552
-#: ../widgets/text/e-text.c:3553
+#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3542
 msgid "Model"
 msgstr "Malli"
 
@@ -3015,105 +1857,103 @@ msgid "Source"
 msgstr "LÃ¤hde"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:565
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:564
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
 msgid "Type"
 msgstr "Tyyppi"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1971
 msgid "Save as vCard..."
 msgstr "Tallenna vCard-muodossa..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2090
-#: ../calendar/gui/e-calendar-table.c:1587
-#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:922
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-view.c:1806 ../calendar/gui/e-memo-table.c:932
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Avaa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
 msgid "_New Contact..."
 msgstr "_Uusi yhteystieto..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "New Contact _List..."
 msgstr "Uusi yhteystieto_luettelo..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
 msgid "_Save as vCard..."
 msgstr "_Tallenna vCard-muodossa..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Forward Contact"
 msgstr "_VÃ¤litÃ¤ yhteystieto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contacts"
 msgstr "_VÃ¤litÃ¤ yhteystiedot"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "Send _Message to Contact"
 msgstr "LÃ¤hetÃ¤ _viesti henkilÃ¶lle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to List"
 msgstr "LÃ¤hetÃ¤ _viesti listalle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contacts"
 msgstr "LÃ¤hetÃ¤ _viesti henkilÃ¶ille"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
 msgid "Cop_y to Address Book..."
 msgstr "_Kopioi osoitekirjaan..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Mo_ve to Address Book..."
 msgstr "_SiirrÃ¤ osoitekirjaan..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
 msgid "Cu_t"
 msgstr "_Leikkaa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:487
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:930
-#: ../composer/e-msg-composer.c:2051 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1327 ../mail/message-list.c:2105
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../calendar/gui/e-calendar-table.c:1599
+#: ../calendar/gui/e-calendar-view.c:1813 ../calendar/gui/e-memo-table.c:940
+#: ../mail/em-folder-tree.c:991 ../mail/em-folder-view.c:1325
+#: ../mail/message-list.c:2109 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "P_aste"
 msgstr "L_iitÃ¤"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1527
-#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1534
+#: ../calendar/gui/cal-search-bar.c:624 ../calendar/gui/cal-search-bar.c:667
+#: ../calendar/gui/cal-search-bar.c:686
 msgid "Any Category"
 msgstr "MikÃ¤ tahansa luokka"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1530
-#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
-#: ../calendar/gui/cal-search-bar.c:694
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Unmatched"
 msgstr "TÃ¤smÃ¤Ã¤mÃ¤ttÃ¶mÃ¤t"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Assistant"
 msgstr "Apulainen"
 
@@ -3142,8 +1982,8 @@ msgid "Car Phone"
 msgstr "Autopuhelin"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:138
+#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3151,7 +1991,7 @@ msgid "Categories"
 msgstr "RyhmÃ¤t"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Company"
 msgstr "Yritys"
 
@@ -3200,22 +2040,22 @@ msgid "Journal"
 msgstr "PÃ¤ivÃ¤kirja"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Manager"
 msgstr "Johtaja"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../addressbook/gui/widgets/eab-contact-display.c:644
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "Note"
 msgstr "Huomautus"
 
@@ -3244,14 +2084,14 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:577
+#: ../calendar/gui/e-meeting-list-view.c:576
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "Rooli"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Spouse"
 msgstr "Puoliso"
 
@@ -3281,55 +2121,53 @@ msgstr "YksikkÃ¶"
 msgid "Web Site"
 msgstr "Kotisivu"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:116
-#: ../addressbook/gui/widgets/e-minicard.c:155
-#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
-#: ../widgets/table/e-table-click-to-add.c:523
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
+#: ../widgets/misc/e-reflow.c:1421 ../widgets/misc/e-reflow.c:1422
+#: ../widgets/table/e-table-click-to-add.c:521
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:654
-#: ../widgets/table/e-table-group-container.c:992
-#: ../widgets/table/e-table-group-container.c:993
-#: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-group-leaf.c:638
-#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
-#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-container.c:995
+#: ../widgets/table/e-table-group-leaf.c:642
+#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Width"
 msgstr "Leveys"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:123
-#: ../addressbook/gui/widgets/e-minicard.c:162
-#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
-#: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:661
-#: ../widgets/table/e-table-group-container.c:985
-#: ../widgets/table/e-table-group-container.c:986
-#: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-group-leaf.c:631
-#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
-#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
+#: ../widgets/misc/e-reflow.c:1428 ../widgets/misc/e-reflow.c:1429
+#: ../widgets/table/e-table-click-to-add.c:528
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-container.c:988
+#: ../widgets/table/e-table-group-leaf.c:635
+#: ../widgets/table/e-table-group-leaf.c:636
+#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Height"
 msgstr "Korkeus"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:130
-#: ../addressbook/gui/widgets/e-minicard.c:170
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "On kohdistettu"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:137
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "KenttÃ¤"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:144
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "KentÃ¤n nimi"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:151
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "Tekstimalli"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:158
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "KentÃ¤n maksimipituus"
 
@@ -3337,7 +2175,7 @@ msgstr "KentÃ¤n maksimipituus"
 msgid "Column Width"
 msgstr "Sarakkeen leveys"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:178
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
 msgid ""
 "\n"
 "\n"
@@ -3347,7 +2185,7 @@ msgstr ""
 "\n"
 "EtsitÃ¤Ã¤n yhteystietoja..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3361,7 +2199,7 @@ msgstr ""
 "\n"
 "tai luo uusi yhteystieto kaksoisnapsautuksella."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3375,7 +2213,7 @@ msgstr ""
 "\n"
 "Luo uusi yhteystieto kaksoisnapsautuksella."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3385,7 +2223,7 @@ msgstr ""
 "\n"
 "Etsi yhteystietoja."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3395,41 +2233,41 @@ msgstr ""
 "\n"
 "NÃ¤kymÃ¤ssÃ¤ ei ole mitÃ¤Ã¤n nÃ¤ytettÃ¤vÃ¤Ã¤."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:524
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Sovitin"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "TyÃ¶sÃ¤hkÃ¶posti"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "HenkilÃ¶kohtainen sÃ¤hkÃ¶posti"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
-#: ../addressbook/gui/widgets/e-minicard.c:831
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:825
 msgid "Other Email"
 msgstr "Muu sÃ¤hkÃ¶posti"
 
-#: ../addressbook/gui/widgets/e-minicard.c:178
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Valittu"
 
-#: ../addressbook/gui/widgets/e-minicard.c:185
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "On kohdistin"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2757
+#: ../mail/em-folder-view.c:2694
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
 msgid "_Send New Message To..."
 msgstr "LÃ¤hetÃ¤ uusi _viesti..."
 
@@ -3438,96 +2276,101 @@ msgstr "LÃ¤hetÃ¤ uusi _viesti..."
 msgid "Copy _Email Address"
 msgstr "Kopioi sÃ¤hkÃ¶postiosoite"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:287
-#: ../addressbook/gui/widgets/eab-contact-display.c:361
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:286
+#: ../addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "(map)"
 msgstr "(kartta)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:297
-#: ../addressbook/gui/widgets/eab-contact-display.c:381
-#: ../addressbook/gui/widgets/eab-contact-display.c:393
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:391
 msgid "map"
 msgstr "kartta"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:478
-#: ../addressbook/gui/widgets/eab-contact-display.c:838
+#: ../addressbook/gui/widgets/eab-contact-display.c:475
+#: ../addressbook/gui/widgets/eab-contact-display.c:835
 msgid "List Members"
 msgstr "Listan jÃ¤senet"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Department"
 msgstr "Osasto"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Profession"
 msgstr "Ammatti"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Position"
 msgstr "Asema"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Video Chat"
 msgstr "Videokeskustelu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
-#: ../calendar/gui/calendar-commands.c:90
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2512
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:576
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
-#: ../plugins/hula-account-setup/camel-hula-listener.c:377
-#: ../plugins/hula-account-setup/camel-hula-listener.c:406
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../calendar/gui/calendar-commands.c:89
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/gnome-cal.c:2548
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:572
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
+#: ../plugins/hula-account-setup/camel-hula-listener.c:372
+#: ../plugins/hula-account-setup/camel-hula-listener.c:400
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Kalenteri"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Vapaa/Varattu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:642
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
+msgid "Address"
+msgstr "Osoite"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
 msgid "Home Page"
 msgstr "Kotisivu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
 msgid "Web Log"
 msgstr "Web-loki"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
-#: ../calendar/gui/e-calendar-view.c:2538
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../calendar/gui/e-calendar-view.c:2580
 msgid "Birthday"
 msgstr "SyntymÃ¤pÃ¤ivÃ¤"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
-#: ../calendar/gui/e-calendar-view.c:2539
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../calendar/gui/e-calendar-view.c:2581
 msgid "Anniversary"
 msgstr "VuosipÃ¤ivÃ¤"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:856
+#: ../addressbook/gui/widgets/eab-contact-display.c:853
 msgid "Job Title"
 msgstr "TehtÃ¤vÃ¤nimike"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:892
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
 msgid "Home page"
 msgstr "Kotisivu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:897
 msgid "Blog"
 msgstr "Blog"
 
@@ -3582,12 +2425,11 @@ msgstr "Protokolla ei ole tuettu"
 
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:364
-#: ../calendar/gui/e-cal-model-tasks.c:681
-#: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2564
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-model-tasks.c:363
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2548
 msgid "Canceled"
 msgstr "Peruutettu"
 
@@ -3598,13 +2440,13 @@ msgstr "Ei voi perua"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../calendar/gui/comp-editor-factory.c:432
 msgid "Authentication Failed"
 msgstr "Todennus epÃ¤onnistui"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:426
 msgid "Authentication Required"
 msgstr "Todennus vaaditaan"
 
@@ -3646,8 +2488,8 @@ msgid ""
 "load the address book once in online mode to download its contents."
 msgstr ""
 "TÃ¤tÃ¤ osoitekirjaa ei voitu avata. Joko tÃ¤mÃ¤ osoitekirja ei ole merkitty "
-"yhteydettÃ¶mÃ¤Ã¤n kÃ¤yttÃ¶Ã¶n tai sitÃ¤ ei ole vielÃ¤ ladattu yhteydettÃ¶mÃ¤Ã¤n tilaan. "
-"Nouda osoitekirjan sisÃ¤ltÃ¶ ollessasi yhteydellisessÃ¤ tilassa."
+"verkottomaan kÃ¤yttÃ¶Ã¶n tai sitÃ¤ ei ole vielÃ¤ ladattu yhteydettÃ¶mÃ¤Ã¤n tilaan. "
+"Nouda osoitekirjan sisÃ¤ltÃ¶ ollessasi verkottomassa tilassa."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:119
 #, c-format
@@ -3719,7 +2561,7 @@ msgid "Error adding list"
 msgstr "Virhe lisÃ¤ttÃ¤essÃ¤ listalle"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:687
+#: ../addressbook/gui/widgets/eab-gui-util.c:685
 msgid "Error adding contact"
 msgstr "Virhe lisÃ¤ttÃ¤essÃ¤ yhteystietoa"
 
@@ -3736,12 +2578,11 @@ msgid "Error removing list"
 msgstr "Virhe poistettaessa listaa"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:637
+#: ../addressbook/gui/widgets/eab-gui-util.c:635
 msgid "Error removing contact"
 msgstr "Virhe poistettaessa yhteystietoa"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:316
-#, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
 "Do you really want to display this contact?"
@@ -3749,11 +2590,11 @@ msgid_plural ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr[0] ""
-"%d yhteystiedon avaaminen avaa myÃ¶s %d uuden ikkunan.\n"
+"%d yhteystiedon avaaminen avaa myÃ¶s %d uutta ikkunaa.\n"
 "Haluatko varmasti nÃ¤yttÃ¤Ã¤ tÃ¤mÃ¤n yhteystiedon?"
 msgstr[1] ""
 "%d yhteystiedon avaaminen avaa myÃ¶s %d uutta ikkunaa.\n"
-"Haluatko varmasti nÃ¤yttÃ¤Ã¤ kaikki nÃ¤mÃ¤ yhteystiedot?"
+"Haluatko varmasti nÃ¤yttÃ¤Ã¤ tÃ¤mÃ¤n yhteystiedon?"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:324
 msgid "_Don't Display"
@@ -3764,7 +2605,7 @@ msgid "Display _All Contacts"
 msgstr "NÃ¤ytÃ¤ k_aikki yhteystiedot"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:351
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3773,46 +2614,46 @@ msgstr ""
 "%s on jo olemassa\n"
 "Haluatko ylikirjoittaa?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
+#: ../addressbook/gui/widgets/eab-gui-util.c:354
 msgid "Overwrite"
 msgstr "Kirjoita yli"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:396
-#: ../addressbook/gui/widgets/eab-gui-util.c:399
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "Yhteystieto"
 msgstr[1] "Yhteystiedot"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:445
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "card.vcf"
 msgstr "kortti.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:482
+#: ../addressbook/gui/widgets/eab-gui-util.c:480
 msgid "Select Address Book"
 msgstr "Valitse osoitekirja"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:746
 msgid "Move contact to"
 msgstr "Siirry yhteystieto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Copy contact to"
 msgstr "Kopioi yhteystieto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Move contacts to"
 msgstr "SiirrÃ¤ yhteystiedot"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Copy contacts to"
 msgstr "Kopioi yhteystiedot"
 
@@ -3836,300 +2677,101 @@ msgstr "Yhteystiedot"
 msgid "Contact information for %s"
 msgstr "%s yhteystiedot"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:293
+#: ../addressbook/gui/widgets/eab-popup-control.c:291
 msgid "Querying Address Book..."
 msgstr "EtsitÃ¤Ã¤n osoitekirjasta..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:141
-#, c-format
-msgid "There is one other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "Yksi muu yhteystieto."
-msgstr[1] "%d muuta yhteystietoa."
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:226
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
-msgid "Show Full vCard"
-msgstr "NÃ¤ytÃ¤ koko vCardin"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:230
-msgid "Show Compact vCard"
-msgstr "NÃ¤ytÃ¤ tiivistetty vCard"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:282
-msgid "Save in address book"
-msgstr "Tallenna osoitekirjaan"
-
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "KorttinÃ¤kymÃ¤"
 
-#: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-csv-importer.c:660
+#: ../addressbook/importers/evolution-ldif-importer.c:512
 #: ../addressbook/importers/evolution-vcard-importer.c:252
-#: ../calendar/importers/icalendar-importer.c:308
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
+#: ../calendar/importers/icalendar-importer.c:310
+#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Tuodaan..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:863
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlookin CSV tai Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:864
+#: ../addressbook/importers/evolution-csv-importer.c:862
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlookin CSV- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-csv-importer.c:872
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozillan CVS tai Tab (.cvs, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:873
+#: ../addressbook/importers/evolution-csv-importer.c:871
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozillan CVS- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-csv-importer.c:881
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolutionin CSV tai Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:882
+#: ../addressbook/importers/evolution-csv-importer.c:880
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolutionin CSV- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:679
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP-tiedostonvaihtomuoto (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:681
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "Evolution LDIF importer"
 msgstr "Evolutionin LDIF-tuoja"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:550
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "Evolution vCard Importer"
 msgstr "Evolutionin vCard-tuoja"
 
-#: ../addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "TyhjiÃ¤ kaavakkeita lopussa:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Runko"
-
-#: ../addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Ala:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Mitat:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:7
-msgid "F_ont..."
-msgstr "_Kirjasin..."
-
-#: ../addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Kirjasinlajit"
-
-#: ../addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Alatunniste:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "Muoto"
-
-#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:433 ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:647
-#: ../widgets/table/e-table-field-chooser.c:80
-#: ../widgets/table/e-table-header-item.c:1907
-#: ../widgets/table/e-table-selection-model.c:309
-msgid "Header"
-msgstr "YlÃ¤tunniste:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "YlÃ¤-/Alatunniste"
-
-#: ../addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Otsakkeet"
-
-#: ../addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "Joka kirjeen otsakkeet"
-
-#: ../addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "Korkeus:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Seuraa vÃ¤littÃ¶mÃ¤sti toisiaan"
-
-#: ../addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "SisÃ¤istÃ¤:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Vaaka"
-
-#: ../addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "Vasen:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "Kirje tabulaattorit sivulla"
-
-#: ../addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Reunukset"
-
-#: ../addressbook/printing/e-contact-print.glade.h:22
-msgid "Number of columns:"
-msgstr "Sarakkeiden mÃ¤Ã¤rÃ¤:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Asetukset"
-
-#: ../addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "Suunta"
-
-#: ../addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "Sivu"
-
-#: ../addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "Sivun asetukset:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Paperi"
-
-#: ../addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "PaperilÃ¤hde:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "Pysty"
-
-#: ../addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Esikatselu:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Tulosta kÃ¤yttÃ¤en harmaata varjostusta"
-
-#: ../addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Peilikuvareunukset"
-
-#: ../addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "Oikea:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Osiot:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "Varjostus"
-
-#. FIXME: Take care of i18n
-#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1141
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:222
-msgid "Size:"
-msgstr "Koko:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "Aloita uudelta sivulta"
-
-#: ../addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Tyylin nimi:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "YlÃ¤:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:154
-msgid "Type:"
-msgstr "Tyyppi:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "Leveys:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:42
-msgid "_Font..."
-msgstr "_Kirjasin..."
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
 msgstr "Tiedostoa ei voi avata"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
 msgid "Couldn't get list of address books"
 msgstr "Luetteloa osoitekirjoista ei lÃ¶ytynyt"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
 msgid "failed to open book"
 msgstr "Kirjaa ei voi avata"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:48
+#: ../addressbook/tools/evolution-addressbook-export.c:45
 msgid "Specify the output file instead of standard output"
 msgstr "MÃ¤Ã¤rittele tulostiedosto oletusulostulon sijaan"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:46
 msgid "OUTPUTFILE"
 msgstr "TULOSTIEDOSTO"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "List local address book folders"
 msgstr "NÃ¤ytÃ¤ paikalliset osoitekirjakansiot"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:55
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "Show cards as vcard or csv file"
 msgstr "NÃ¤mÃ¤ kortit vcard- tai cvs-tiedostoina"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "[vcard|csv]"
 msgstr "[vcard|cvs]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Export in asynchronous mode"
 msgstr "Vie asynkronisesti"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
@@ -4137,29 +2779,29 @@ msgstr ""
 "Yhden tulostiedoston sisÃ¤ltÃ¤mien korttien lukumÃ¤Ã¤rÃ¤ kÃ¤ytettÃ¤essÃ¤ "
 "asynkronista tilaa. Oletusarvo on 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:64
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "NUMERO"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
+#: ../addressbook/tools/evolution-addressbook-export.c:99
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Virhe komentoriviparametreissa, kÃ¤ytÃ¤ optiota --help nÃ¤hdÃ¤ksesi kÃ¤yttÃ¶ohjeet."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:113
 msgid "Only support csv or vcard format."
 msgstr "Vain cvs ja vcard ovat tuettuja muotoja."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:122
 msgid "In async mode, output must be file."
 msgstr "Asynkronisessa tilassa ulostulon tÃ¤ytyy olla tiedosto."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:130
 msgid "In normal mode, there is no need for the size option."
 msgstr "Normaalitilassa kokoa ei pitÃ¤isi tarvita antaa."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:161
 msgid "Unhandled error"
 msgstr "KÃ¤sittelemÃ¤tÃ¶n virhe"
 
@@ -4565,7 +3207,7 @@ msgstr ""
 msgid "_Discard Changes"
 msgstr "_HylkÃ¤Ã¤ muutokset"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:343
 msgid "_Save"
 msgstr "_Tallenna"
 
@@ -4588,56 +3230,56 @@ msgstr "_LÃ¤hetÃ¤ huomautus"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:258
+#: ../calendar/conduits/calendar/calendar-conduit.c:248
 msgid "Split Multi-Day Events:"
 msgstr "Jaa usean pÃ¤ivÃ¤n tapahtumat:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1523
-#: ../calendar/conduits/calendar/calendar-conduit.c:1524
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1019
-#: ../calendar/conduits/todo/todo-conduit.c:1020
+#: ../calendar/conduits/calendar/calendar-conduit.c:1513
+#: ../calendar/conduits/calendar/calendar-conduit.c:1514
+#: ../calendar/conduits/memo/memo-conduit.c:807
+#: ../calendar/conduits/memo/memo-conduit.c:808
+#: ../calendar/conduits/todo/todo-conduit.c:1007
+#: ../calendar/conduits/todo/todo-conduit.c:1008
 msgid "Could not start evolution-data-server"
 msgstr "Evolutionin tietopalvelimen kÃ¤ynnistys epÃ¤onnistui"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1631
-#: ../calendar/conduits/calendar/calendar-conduit.c:1634
+#: ../calendar/conduits/calendar/calendar-conduit.c:1621
+#: ../calendar/conduits/calendar/calendar-conduit.c:1624
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilotin kalenterin ohjelmalohkoa ei voi lukea"
 
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
+#: ../calendar/conduits/memo/memo-conduit.c:901
+#: ../calendar/conduits/memo/memo-conduit.c:904
 msgid "Could not read pilot's Memo application block"
 msgstr "Pilotin muistilappujen ohjelmalohkoa ei voi lukea"
 
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
+#: ../calendar/conduits/memo/memo-conduit.c:948
+#: ../calendar/conduits/memo/memo-conduit.c:951
 msgid "Could not write pilot's Memo application block"
 msgstr "Pilotin muistilappujen ohjelmalohkoa ei voi lukea"
 
-#: ../calendar/conduits/todo/todo-conduit.c:241
+#: ../calendar/conduits/todo/todo-conduit.c:227
 msgid "Default Priority:"
 msgstr "Prioriteetin oletusarvo:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1103
-#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1091
+#: ../calendar/conduits/todo/todo-conduit.c:1094
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilotin tehtÃ¤vÃ¤listan ohjelmalohkoa ei voi lukea"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1148
-#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1136
+#: ../calendar/conduits/todo/todo-conduit.c:1139
 msgid "Could not write pilot's ToDo application block"
 msgstr "Pilotin tehtÃ¤vÃ¤listan ohjelmalohkoa ei voi kirjoittaa"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2523
+#: ../plugins/itip-formatter/itip-formatter.c:2549
 msgid "Calendar and Tasks"
 msgstr "Kalenteri ja tehtÃ¤vÃ¤t"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:869
-#: ../calendar/gui/calendar-component.c:1291
+#: ../calendar/gui/calendar-component.c:819
+#: ../calendar/gui/calendar-component.c:1238
 msgid "Calendars"
 msgstr "Kalenterit"
 
@@ -4678,24 +3320,24 @@ msgid "Memo_s"
 msgstr "Mui_stilaput"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1133
-#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:594
-#: ../calendar/gui/memos-component.c:912 ../calendar/gui/memos-control.c:350
-#: ../calendar/gui/memos-control.c:366
+#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1123
+#: ../calendar/gui/gnome-cal.c:1846 ../calendar/gui/memos-component.c:564
+#: ../calendar/gui/memos-component.c:882 ../calendar/gui/memos-control.c:386
+#: ../calendar/gui/memos-control.c:402
 msgid "Memos"
 msgstr "Muistilaput"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1437
-#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
-#: ../calendar/gui/tasks-component.c:586 ../calendar/gui/tasks-component.c:908
-#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
+#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1426
+#: ../calendar/gui/gnome-cal.c:1714 ../calendar/gui/print.c:1973
+#: ../calendar/gui/tasks-component.c:557 ../calendar/gui/tasks-component.c:879
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 #: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:588
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
+#: ../calendar/importers/icalendar-importer.c:751
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "TehtÃ¤vÃ¤t"
@@ -4706,7 +3348,7 @@ msgstr "_Kalenterit"
 
 #. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:328 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_TehtÃ¤vÃ¤t"
 
@@ -4714,27 +3356,28 @@ msgstr "_TehtÃ¤vÃ¤t"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolutionin kalenterin hÃ¤lytyspalvelu"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:100
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuutti"
 msgstr[1] "minuuttia"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/caldav/caldav-source.c:431
-#: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:653
-#: ../plugins/google-account-setup/google-contacts-source.c:367
+#: ../calendar/gui/dialogs/event-page.glade.h:23
+#: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/calendar-file/calendar-file.c:294
+#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:741
+#: ../plugins/google-account-setup/google-contacts-source.c:331
+#, 
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "tunti"
 msgstr[1] "tuntia"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
 msgid "Start time"
 msgstr "Alkamisaika"
 
@@ -4749,10 +3392,10 @@ msgstr "HylkÃ¤Ã¤ _kaikki"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1608
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1614
-#: ../calendar/gui/e-itip-control.c:1167
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1588
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Location:"
 msgstr "Sijainti:"
 
@@ -4765,11 +3408,11 @@ msgid "_Dismiss"
 msgstr "_HylkÃ¤Ã¤"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1382
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
+#: ../calendar/gui/dialogs/comp-editor.c:1038
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
@@ -4785,32 +3428,32 @@ msgstr "_Torku"
 msgid "location of appointment"
 msgstr "tapaamisen sijainti"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1441
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1565
 msgid "No summary available."
 msgstr "Ei yhteenvetoa saatavilla"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1450
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1452
 msgid "No description available."
 msgstr "Ei kuvausta saatavilla"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1460
 msgid "No location information available."
 msgstr "Ei sijaintitietoja saatavilla"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1505
 #, c-format
 msgid "You have %d alarms"
 msgstr "Sinulla on %d hÃ¤lytystÃ¤"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1665
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1693
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4822,7 +3465,7 @@ msgstr ""
 "lÃ¤hettÃ¤mÃ¤Ã¤n sÃ¤hkÃ¶postia. Evolution nÃ¤yttÃ¤Ã¤ sen sijaan\n"
 "tavallisen huomautusikkunan."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4839,7 +3482,7 @@ msgstr ""
 "\n"
 "Haluatko varmasti suorittaa tÃ¤mÃ¤n ohjelman?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1713
 msgid "Do not ask me about this program again."
 msgstr "Ã?lÃ¤ kysy tÃ¤stÃ¤ ohjelmasta enÃ¤Ã¤ uudestaan"
 
@@ -4913,121 +3556,133 @@ msgid "Calendars to run alarms for"
 msgstr "Kalenterit, joille suoritetaan hÃ¤lytyksiÃ¤"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+msgid "Check this to use system timezone in Evolution."
+msgstr "Aseta tÃ¤mÃ¤, jos haluat kÃ¤yttÃ¤Ã¤ jÃ¤rjestelmÃ¤n aikavyÃ¶hykettÃ¤."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "VÃ¤ri, jolla Marcus Bains-viiva piirretÃ¤Ã¤n aikajanassa (tyhjÃ¤ oletuksena)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Marcus Bains-viivan vÃ¤ri pÃ¤ivÃ¤nÃ¤kymÃ¤ssÃ¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Compress weekends in month view"
 msgstr "TiivistÃ¤ viikonloput kuukausinÃ¤kymÃ¤ssÃ¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Confirm expunge"
 msgstr "Varmista siivottaessa poistetut lopullisesti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+msgid "Count of default recurrence for a new event. -1 means forever."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "PÃ¤ivÃ¤t, joina tyÃ¶tuntien alku ja loppu nÃ¤ytetÃ¤Ã¤n kalenterissa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "Tapaamisen oletusmuistutus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+msgid "Default recurrence count"
+msgstr "Toistumiskertojen oletusmÃ¤Ã¤rÃ¤"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder units"
 msgstr "Muistutusten oletusyksikkÃ¶"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Default reminder value"
 msgstr "Muistutuksen oletusarvo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Directory for saving alarm audio files"
 msgstr "Kansio, johon Ã¤Ã¤nimerkkien tiedostot tallennetaan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Gradient"
 msgstr "Tapahtuman vÃ¤riliuku"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Event Transparency"
 msgstr "Tapahtuman lÃ¤pinÃ¤kyvyys"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy server URLs"
 msgstr "Vapaa/varattu palvelinten URLit"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Free/busy template URL"
 msgstr "Vapaa/varattu-mallin URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Gradient of the events in calendar views."
 msgstr "Tapahtumien vÃ¤riliuku kalenterinÃ¤kymissÃ¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide completed tasks"
 msgstr "Piilota valmistuneet tehtÃ¤vÃ¤t"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task units"
 msgstr "Piilota tehtÃ¤vien yksikÃ¶t"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Hide task value"
 msgstr "Piilota tehtÃ¤vÃ¤n arvo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Horizontal pane position"
 msgstr "Vaakapaneelin sijainti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Tunti jona tyÃ¶pÃ¤ivÃ¤ pÃ¤Ã¤ttyy 24-tunnin muodossa, vÃ¤liltÃ¤ 0-23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Tunti jona tyÃ¶pÃ¤ivÃ¤ alkaa 24-tunnin muodossa, vÃ¤liltÃ¤ 0-23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "PÃ¤ivÃ¤- ja viikkonÃ¤kymissÃ¤ nÃ¤ytettÃ¤vÃ¤t aikavÃ¤lit minuutteina."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Last alarm time"
 msgstr "Viimeisen hÃ¤lytyksen aika"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Level beyond which the message should be logged."
 msgstr "Taso, jonka jÃ¤lkeen viesti lokitetaan."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "List of recently used second time zones in a Day View."
 msgstr "Luettelo Ã¤skettÃ¤in valituista toissijaisista aikavyÃ¶hykkeistÃ¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of server URLs for free/busy publishing."
 msgstr "Osoitteet URLeista, joissa julkaistaan vapaa/varattu tietoja."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains-viiva"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains-viivan vÃ¤ri - pÃ¤ivÃ¤nÃ¤kymÃ¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains-viivan vÃ¤ri - aikajana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -5035,39 +3690,39 @@ msgstr ""
 "EnimmÃ¤ismÃ¤Ã¤rÃ¤ Ã¤skettÃ¤in valittuja toissijaisia aikavyÃ¶hykkeitÃ¤ avaimen "
 "\"day_second_zones\" luettelossa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Maximum number of recently used timezones to remember."
 msgstr "Kuinka monta Ã¤skettÃ¤in valittua aikavyÃ¶hykettÃ¤ muistetaan."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minuutti, jona tyÃ¶pÃ¤ivÃ¤ loppuu, vÃ¤liltÃ¤ 0-59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuutti, jona tyÃ¶pÃ¤ivÃ¤ alkaa, vÃ¤liltÃ¤ 0-59"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Month view horizontal pane position"
 msgstr "KuukausinÃ¤kymÃ¤n vaakapanelin sijainti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view vertical pane position"
 msgstr "KuukausinÃ¤kymÃ¤n pystypaneelin sijainti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Number of units for determining a default reminder."
 msgstr "Kuinka monta yksikkÃ¶Ã¤ mÃ¤Ã¤rittelee oletusmuistutuksen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Number of units for determining when to hide tasks."
 msgstr "Kuinka monta yksikkÃ¶Ã¤ tarvitaan, jotta tehtÃ¤vÃ¤t piilotetaan."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Overdue tasks color"
 msgstr "ErÃ¤pÃ¤ivÃ¤n ylittÃ¤neiden tehtÃ¤vien vÃ¤ri"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -5075,7 +3730,7 @@ msgstr ""
 "Vaakapaneelin sijainti pikseleinÃ¤, kalenteriselaimen ja tehtÃ¤vÃ¤listan "
 "vÃ¤lissÃ¤ jos ei olla kuukausinÃ¤kymÃ¤ssÃ¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5083,7 +3738,7 @@ msgstr ""
 "Vaakapaneelin sijainti pikseleinÃ¤, kalenteriselaimen ja tehtÃ¤vÃ¤listan "
 "vÃ¤lissÃ¤ kÃ¤ytettÃ¤essÃ¤ kuukausinÃ¤kymÃ¤Ã¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -5091,7 +3746,7 @@ msgstr ""
 "Vaakapaneelin sijainti pikseleinÃ¤ , kalenterin listojen ja pÃ¤ivÃ¤mÃ¤Ã¤rien "
 "selausnÃ¤kymÃ¤n vÃ¤lissÃ¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -5099,7 +3754,7 @@ msgstr ""
 "Vaakapaneelin sijainti pikseleinÃ¤, tehtÃ¤vÃ¤listan ja tehtÃ¤vÃ¤n esikatselun "
 "vÃ¤lissÃ¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5107,7 +3762,7 @@ msgstr ""
 "Pystypaneelin sijainti pikseleinÃ¤, nÃ¤kymÃ¤n ja kalenteriselaimen sekÃ¤ "
 "tehtÃ¤vÃ¤listan vÃ¤lissÃ¤ kÃ¤ytettÃ¤essÃ¤ kuukausinÃ¤kymÃ¤Ã¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -5115,69 +3770,85 @@ msgstr ""
 "Pystypaneelin sijainti pikseleinÃ¤, nÃ¤kymÃ¤n ja kalenteriselaimen sekÃ¤ "
 "tehtÃ¤vÃ¤listan vÃ¤lissÃ¤ kun ei kÃ¤ytetÃ¤ kuukausinÃ¤kymÃ¤Ã¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+msgid "Primary calendar"
+msgstr "Ensisijainen kalenteri"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+msgid "Primary memo list"
+msgstr "Ensisijainen muistilappulista"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+msgid "Primary task list"
+msgstr "Ensisijainen tehtÃ¤vÃ¤lista"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Ohjelmat, joita voidaan suorittaa hÃ¤lytyksistÃ¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Recently used second time zones in a Day View"
 msgstr "PÃ¤ivÃ¤nÃ¤kymÃ¤ssÃ¤ Ã¤skettÃ¤in kÃ¤ytetyt toissijaiset aikavyÃ¶hykkeet"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Save directory for alarm audio"
 msgstr "Ã?Ã¤nihÃ¤lytysten tiedostojen tallennuskansio"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+msgid "Scroll Month View by a week"
+msgstr "VieritÃ¤ kuukausinÃ¤kymÃ¤Ã¤ viikoittain"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "NÃ¤ytÃ¤ RSVP-kenttÃ¤ tapahtuman, tehtÃ¤vÃ¤n tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "NÃ¤ytÃ¤ roolikenttÃ¤ tapahtuman, tehtÃ¤vÃ¤n tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Show appointment end times in week and month views"
 msgstr "NÃ¤ytÃ¤ tapaamisten loppumisajat viikko- ja kuukausinÃ¤kymissÃ¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "NÃ¤ytÃ¤ luokkakenttÃ¤ tapahtuman, tehtÃ¤vÃ¤n tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show display alarms in notification tray"
 msgstr "NÃ¤ytÃ¤ nÃ¤kyvÃ¤t hÃ¤lytykset ilmoitusalueella"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Show status field in the event/task/meeting editor"
 msgstr "NÃ¤ytÃ¤ tilakenttÃ¤ tapahtuman, tehtÃ¤vÃ¤n tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show the \"Preview\" pane"
 msgstr "NÃ¤ytÃ¤ \"Esikatselu\"-paneeli"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show the \"Preview\" pane."
 msgstr "NÃ¤ytÃ¤ esikatselupaneeli"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show timezone field in the event/meeting editor"
 msgstr "NÃ¤ytÃ¤ aikavyÃ¶hyke tapahtuman tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show type field in the event/task/meeting editor"
 msgstr "NÃ¤ytÃ¤ tyyppikenttÃ¤ tapahtuman, tehtÃ¤vÃ¤n tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show week number in Day and Work Week View"
 msgstr "NÃ¤ytÃ¤ viikkonumerot pÃ¤ivÃ¤- ja tyÃ¶viikkonÃ¤kymissÃ¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show week numbers in date navigator"
 msgstr "NÃ¤ytÃ¤ viikkonumerot pÃ¤ivÃ¤mÃ¤Ã¤rÃ¤selaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
@@ -5185,15 +3856,15 @@ msgstr ""
 "NÃ¤yttÃ¤Ã¤ toissijaisen aikavyÃ¶hykkeen aikanÃ¤kymÃ¤ssÃ¤, jos asetettu. Arvo on "
 "samanlainen kuin avaimessa \"timezone\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Tasks due today color"
 msgstr "TÃ¤nÃ¤Ã¤n erÃ¤Ã¤ntyvien tehtÃ¤vien vÃ¤ri"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Tasks vertical pane position"
-msgstr "TehtÃ¤vÃ¤paneelin pystysijainti"
+msgstr "TehtÃ¤vÃ¤paneelin vaakasijainti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5202,7 +3873,7 @@ msgstr ""
 "URL-malli, jota kÃ¤ytetÃ¤Ã¤n vapaa/varattu tiedon varaosoitteena. %u korvataan "
 "sÃ¤hkÃ¶postiosoitteen kÃ¤yttÃ¤jÃ¤osalla ja %d aluenimellÃ¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5211,11 +3882,11 @@ msgstr ""
 "kÃ¤Ã¤ntÃ¤mÃ¤tÃ¶n Olsenin aikavyÃ¶hyketietokantamuoto, esimerkiksi \"Finland/"
 "Helsinki\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "The second timezone for a Day View"
 msgstr "PÃ¤ivÃ¤nÃ¤kymÃ¤n toissijainen aikavyÃ¶hyke"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -5223,20 +3894,19 @@ msgstr ""
 "TÃ¤llÃ¤ asetuksella voi olla kolme arvoa: \"0\" (ei virheitÃ¤), \"1"
 "\" (varoitukset) tai \"2\" (vianetsintÃ¤viestit)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Time divisions"
 msgstr "Aikajaot"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Time the last alarm ran, in time_t."
 msgstr "ViimeisimmÃ¤n hÃ¤lytyksen suoritusaika, time_t yksikkÃ¶nÃ¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
-#: ../plugins/startup-wizard/startup-wizard.c:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Timezone"
 msgstr "AikavyÃ¶hyke"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -5244,42 +3914,62 @@ msgstr ""
 "Tapahtumien lÃ¤pinÃ¤kyvyys kalenterinÃ¤kymissÃ¤. Arvo on vÃ¤liltÃ¤ 0 (lÃ¤pinÃ¤kyvÃ¤) "
 "ja 1 (peittÃ¤vÃ¤)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Twenty four hour time format"
 msgstr "24-tunnin kello"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+msgid "URI of the highlighted (\"primary\") calendar"
+msgstr "Korostetun ensisijaisen kalenterin URI"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid "URI of the highlighted (\"primary\") memo list"
+msgstr "Korostetun ensisijaisen muistilappuluettelon URI"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid "URI of the highlighted (\"primary\") task list"
+msgstr "Korostetun ensisijaisen tehtÃ¤vÃ¤listan URI"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Oletusmuistutusten yksikkÃ¶, \"minutes\", \"hours\" tai \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "YksikkÃ¶, jonka avulla pÃ¤Ã¤tetÃ¤Ã¤n milloin tehtÃ¤viÃ¤ piilotetaan. Arvot \"minutes"
 "\", \"hours\" tai \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+msgid "Use system timezone"
+msgstr "KÃ¤ytÃ¤ jÃ¤rjestelmÃ¤n aikavyÃ¶hykettÃ¤"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr "KÃ¤ytÃ¤ jÃ¤rjestelmÃ¤n aikavyÃ¶hykettÃ¤ Evolutionista valitun sijasta."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Week start"
 msgstr "Viikon alku"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "ViikonpÃ¤ivÃ¤ josta viikko alkaa, sunnuntaista (0) lauantaihin (6)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "KÃ¤ytetÃ¤Ã¤nkÃ¶ ilmoitusaluetta hÃ¤lytysten nÃ¤yttÃ¤miseen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "KysytÃ¤Ã¤nkÃ¶ vahvistusta poistettaessa tapaamista tai tehtÃ¤vÃ¤Ã¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "KysytÃ¤Ã¤nkÃ¶ vahvistusta siivottaessa tapaamisia tai tehtÃ¤viÃ¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5287,146 +3977,146 @@ msgstr ""
 "Pakataanko viikonloput kuukausinÃ¤kymÃ¤ssÃ¤. TÃ¤mÃ¤ tiivistÃ¤Ã¤ lauantain ja "
 "sunnuntain yhden viikonpÃ¤ivÃ¤n kokoisiksi."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ tapahtumien loppumisaika viikko- ja kuukausinÃ¤kymissÃ¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "PiirretÃ¤Ã¤nkÃ¶ Marcus Bains-viiva (viiva nykyhetkessÃ¤) kalenteriin."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Piilotetaanko valmistuneet tehtÃ¤vÃ¤t tehtÃ¤vÃ¤nÃ¤kymistÃ¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr "SiirrytÃ¤Ã¤nkÃ¶ kuukausinÃ¤kymÃ¤ssÃ¤ viikoittain vai kuukausittain."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Whether to set a default reminder for appointments."
 msgstr "Asetetaanko tapaamisille oletusmuistutus."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "NÃ¤ytetÃ¤Ã¤nkÃ¶ RSVP-kenttÃ¤ tapahtuman, tehtÃ¤vÃ¤n tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ luokkakenttÃ¤ tapahtuman tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "NÃ¤ytetÃ¤Ã¤nkÃ¶ roolikenttÃ¤ tapahtuman, tehtÃ¤vÃ¤n tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ tilakenttÃ¤ tapahtuman, tehtÃ¤vÃ¤t tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ kello 24 tunnin vai am/pm muodossa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ aikavyÃ¶hykekenttÃ¤ tapahtuman tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 "NÃ¤ytetÃ¤Ã¤nkÃ¶ tyyppikenttÃ¤ tapahtuman, tehtÃ¤vÃ¤n tai kokouksen muokkaimessa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ viikkonumerot pÃ¤ivÃ¤mÃ¤Ã¤rÃ¤- ja tyÃ¶viikkonÃ¤kymissÃ¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to show week numbers in the date navigator."
 msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ viikkonumerot pÃ¤ivÃ¤mÃ¤Ã¤rÃ¤selaimessa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid "Whether to use daylight savings time while displaying events."
-msgstr "KÃ¤ytetÃ¤Ã¤nkÃ¶ kesÃ¤aikaa nÃ¤ytettÃ¤essÃ¤ tapahtumia."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Work days"
 msgstr "TyÃ¶pÃ¤ivÃ¤t"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Workday end hour"
 msgstr "TyÃ¶pÃ¤ivÃ¤n pÃ¤Ã¤ttymistunti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Workday end minute"
 msgstr "TyÃ¶pÃ¤ivÃ¤n pÃ¤Ã¤ttymisminuutti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Workday start hour"
 msgstr "TyÃ¶pÃ¤ivÃ¤n alkamistunti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Workday start minute"
 msgstr "TyÃ¶pÃ¤ivÃ¤n alkamisminuutti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
-msgid "daylight savings time"
-msgstr "kesÃ¤aika"
+#: ../calendar/gui/cal-editor-utils.c:100
+msgid "Invalid object"
+msgstr "Virheellinen olio"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Summary contains"
 msgstr "Yhteenveto sisÃ¤ltÃ¤Ã¤"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Description contains"
 msgstr "Kuvaus sisÃ¤ltÃ¤Ã¤"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Category is"
 msgstr "Luokka on"
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Comment contains"
 msgstr "Kommentti sisÃ¤ltÃ¤Ã¤"
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Location contains"
 msgstr "Sijainti sisÃ¤ltÃ¤Ã¤"
 
-#: ../calendar/gui/cal-search-bar.c:640
+#: ../calendar/gui/cal-search-bar.c:636
 msgid "Next 7 Days' Tasks"
 msgstr "Seuraavien 7 pÃ¤ivÃ¤n tehtÃ¤vÃ¤t"
 
-#: ../calendar/gui/cal-search-bar.c:644
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Active Tasks"
 msgstr "Aktiiviset tehtÃ¤vÃ¤t"
 
-#: ../calendar/gui/cal-search-bar.c:648
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Overdue Tasks"
 msgstr "Vanhentuneet tehtÃ¤vÃ¤t"
 
-#: ../calendar/gui/cal-search-bar.c:652
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Completed Tasks"
 msgstr "Valmistuneet tehtÃ¤vÃ¤t"
 
-#: ../calendar/gui/cal-search-bar.c:656
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Tasks with Attachments"
 msgstr "TehtÃ¤vÃ¤t, joissa on liitteitÃ¤"
 
-#: ../calendar/gui/cal-search-bar.c:702
+#: ../calendar/gui/cal-search-bar.c:698
 msgid "Active Appointments"
 msgstr "Aktiiviset tapaamiset"
 
-#: ../calendar/gui/cal-search-bar.c:706
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Next 7 Days' Appointments"
 msgstr "Seuraavien 7 pÃ¤ivÃ¤n tapaamiset"
 
-#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
+#: ../calendar/gui/calendar-commands.c:89 ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:71
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Tulosta"
 
-#: ../calendar/gui/calendar-commands.c:315
+#: ../calendar/gui/calendar-commands.c:331
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5435,138 +4125,127 @@ msgstr ""
 "TÃ¤mÃ¤ toimenpide poistaa kaikki tapahtumat, jotka ovat vanhempia kuin valittu "
 "aika. Jos jatkat, et voi palauttaa nÃ¤itÃ¤ tapahtumia."
 
-#: ../calendar/gui/calendar-commands.c:321
+#: ../calendar/gui/calendar-commands.c:337
 msgid "Purge events older than"
 msgstr "Poista vanhemmat tapahtumat kuin"
 
-#: ../calendar/gui/calendar-commands.c:326
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/caldav/caldav-source.c:432
-#: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:654
-#: ../plugins/google-account-setup/google-contacts-source.c:368
+#: ../calendar/gui/calendar-commands.c:342
+#: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-file/calendar-file.c:295
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:742
+#: ../plugins/google-account-setup/google-contacts-source.c:332
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "pÃ¤ivÃ¤"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the On the web source group
-#. ensure the group name is in current locale, not read from configuration
-#. Create the source group
 #. Create the Webcal source group
-#. Create the LDAP source group
-#. ensure the group name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:287
-#: ../calendar/gui/calendar-component.c:290
-#: ../calendar/gui/memos-component.c:240 ../calendar/gui/memos-component.c:243
-#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
-#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
-#: ../calendar/gui/tasks-component.c:243
+#: ../calendar/gui/calendar-component.c:194
+#: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:504
+#: ../calendar/gui/migration.c:603 ../calendar/gui/migration.c:1117
+#: ../calendar/gui/tasks-component.c:149
 msgid "On The Web"
 msgstr "Verkossa"
 
-#. ensure the source name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:331
-#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
-msgid "Birthdays & Anniversaries"
-msgstr "SyntymÃ¤- ja vuosipÃ¤ivÃ¤t"
-
-#. ensure the group name is in current locale, not read from configuration
-#. Create the weather group
-#: ../calendar/gui/calendar-component.c:346
-#: ../calendar/gui/calendar-component.c:349
+#: ../calendar/gui/calendar-component.c:195
 #: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "SÃ¤Ã¤"
 
-#: ../calendar/gui/calendar-component.c:676
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:289
+#: ../calendar/gui/calendar-component.c:291 ../calendar/gui/migration.c:398
+msgid "Birthdays & Anniversaries"
+msgstr "SyntymÃ¤- ja vuosipÃ¤ivÃ¤t"
+
+#: ../calendar/gui/calendar-component.c:626
 msgid "_New Calendar"
 msgstr "_Uusi kalenteri"
 
-#: ../calendar/gui/calendar-component.c:677
-#: ../calendar/gui/memos-component.c:508 ../calendar/gui/tasks-component.c:500
-#: ../mail/em-folder-tree.c:2124
+#: ../calendar/gui/calendar-component.c:627
+#: ../calendar/gui/memos-component.c:478 ../calendar/gui/tasks-component.c:471
+#: ../mail/em-folder-tree.c:2114
 msgid "_Copy..."
 msgstr "_Kopioi..."
 
-#: ../calendar/gui/calendar-component.c:682
-#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:505
+#: ../calendar/gui/calendar-component.c:632
+#: ../calendar/gui/memos-component.c:483 ../calendar/gui/tasks-component.c:476
 msgid "_Make available for offline use"
 msgstr "_Kopioi kÃ¤ytettÃ¤vÃ¤ksi yhteydettÃ¶mÃ¤ssÃ¤ tilassa"
 
-#: ../calendar/gui/calendar-component.c:683
-#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:506
+#: ../calendar/gui/calendar-component.c:633
+#: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:477
 msgid "_Do not make available for offline use"
 msgstr "_Ã?lÃ¤ kopioi kÃ¤ytettÃ¤vÃ¤ksi yhteydettÃ¶mÃ¤ssÃ¤ tilassa"
 
-#: ../calendar/gui/calendar-component.c:1013
+#: ../calendar/gui/calendar-component.c:961
 msgid "Failed upgrading calendars."
 msgstr "Kalenterien pÃ¤ivitys epÃ¤onnistui."
 
-#: ../calendar/gui/calendar-component.c:1142
+#: ../calendar/gui/calendar-component.c:1089
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Kalenterin \"%s\" avaus tehtÃ¤vien ja kokousten luontia varten epÃ¤onnistui"
 
-#: ../calendar/gui/calendar-component.c:1158
+#: ../calendar/gui/calendar-component.c:1105
 msgid "There is no calendar available for creating events and meetings"
 msgstr "TehtÃ¤vien ja kokousten luontia varten ei lÃ¶ydy kalenteria"
 
-#: ../calendar/gui/calendar-component.c:1271
+#: ../calendar/gui/calendar-component.c:1218
 msgid "Calendar Source Selector"
 msgstr "KalenterilÃ¤hteen valinta"
 
-#: ../calendar/gui/calendar-component.c:1487
+#: ../calendar/gui/calendar-component.c:1433
 msgid "New appointment"
 msgstr "Uusi tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1488
+#: ../calendar/gui/calendar-component.c:1434
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1489
+#: ../calendar/gui/calendar-component.c:1435
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1495
+#: ../calendar/gui/calendar-component.c:1441
 msgid "New meeting"
 msgstr "Uusi tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1496
+#: ../calendar/gui/calendar-component.c:1442
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Kokous"
 
-#: ../calendar/gui/calendar-component.c:1497
+#: ../calendar/gui/calendar-component.c:1443
 msgid "Create a new meeting request"
 msgstr "Luo uusi kokouskutsu"
 
-#: ../calendar/gui/calendar-component.c:1503
+#: ../calendar/gui/calendar-component.c:1449
 msgid "New all day appointment"
 msgstr "Uusi koko pÃ¤ivÃ¤n tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1504
+#: ../calendar/gui/calendar-component.c:1450
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Koko pÃ¤ivÃ¤n tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1505
+#: ../calendar/gui/calendar-component.c:1451
 msgid "Create a new all-day appointment"
 msgstr "Luo uusi koko pÃ¤ivÃ¤n tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1511
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New calendar"
 msgstr "Uusi kalenteri"
 
-#: ../calendar/gui/calendar-component.c:1512
+#: ../calendar/gui/calendar-component.c:1458
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_Kalenteri"
 
-#: ../calendar/gui/calendar-component.c:1513
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new calendar"
 msgstr "Luo uusi kalenteri"
 
@@ -5608,20 +4287,20 @@ msgid "Category"
 msgstr "Luokka"
 
 #: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
-#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "Luokittelu"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:557
+#: ../calendar/gui/e-cal-model.c:370 ../calendar/gui/e-calendar-table.c:565
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:340
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../widgets/misc/e-attachment-tree-view.c:496
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "Kuvaus"
@@ -5641,21 +4320,27 @@ msgstr "Ei ole olemassa"
 msgid "Exist"
 msgstr "On olemassa"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
+#: ../calendar/gui/caltypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:722
+#: ../plugins/save-calendar/csv-format.c:371
+msgid "Location"
+msgstr "Sijainti"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "JÃ¤rjestÃ¤jÃ¤:"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:556
+#: ../calendar/gui/e-cal-model.c:368 ../calendar/gui/e-calendar-table.c:564
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "HenkilÃ¶kohtainen"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
-#: ../calendar/gui/e-calendar-table.c:555 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:359 ../calendar/gui/e-cal-model.c:366
+#: ../calendar/gui/e-calendar-table.c:563 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Julkinen"
 
@@ -5665,11 +4350,11 @@ msgid "Recurrence"
 msgstr "Toistuvuus"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:357
 msgid "Summary"
 msgstr "Kuvaus"
 
@@ -5689,35 +4374,55 @@ msgid "does not contain"
 msgstr "ei sisÃ¤llÃ¤"
 
 #: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "on"
 
 #: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "ei ole"
 
-#: ../calendar/gui/comp-editor-factory.c:409
+#: ../calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Virhe avattaessa kalenteria"
 
-#: ../calendar/gui/comp-editor-factory.c:415
+#: ../calendar/gui/comp-editor-factory.c:414
 msgid "Method not supported when opening the calendar"
 msgstr "MenetelmÃ¤ ei ollut tuettu avattaessa kalenteria"
 
-#: ../calendar/gui/comp-editor-factory.c:421
+#: ../calendar/gui/comp-editor-factory.c:420
 msgid "Permission denied to open the calendar"
 msgstr "Kalenterin avaamiseen ei ollut tarvittavia oikeuksia"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
+#: ../calendar/gui/comp-editor-factory.c:438 ../shell/e-shell.c:1261
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:601
+#: ../calendar/gui/dialogs/alarm-dialog.c:611
 msgid "Edit Alarm"
 msgstr "Muokkaa hÃ¤lytystÃ¤"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:796
+#: ../calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr "Ponnahdusikkuna hÃ¤lytykselle"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:797
+#: ../calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "Soita Ã¤Ã¤ni"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:798
+#: ../calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "Suorita ohjelma"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:799
+#: ../calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "LÃ¤hetÃ¤ sÃ¤hkÃ¶postia"
+
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>HÃ¤lytys</b>"
@@ -5747,83 +4452,68 @@ msgid "Mes_sage:"
 msgstr "_Viesti:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
-msgid "Play a sound"
-msgstr "Soita Ã¤Ã¤ni"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
-msgid "Pop up an alert"
-msgstr "Ponnahdusikkuna hÃ¤lytykselle"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
-msgid "Run a program"
-msgstr "Suorita ohjelma"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Select A File"
 msgstr "Valitse tiedosto"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
 msgid "Send To:"
 msgstr "LÃ¤hetÃ¤:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:452
-msgid "Send an email"
-msgstr "LÃ¤hetÃ¤ sÃ¤hkÃ¶postia"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
 msgid "_Arguments:"
 msgstr "_Argumentit:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "_Program:"
 msgstr "_Ohjelma:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "_Repeat the alarm"
 msgstr "_Toista hÃ¤lytys"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Sound:"
 msgstr "_Ã?Ã¤ni:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
-msgid "after"
-msgstr "jÃ¤lkeen"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
-msgid "before"
-msgstr "ennen"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "day(s)"
-msgstr "pÃ¤ivÃ¤"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
-msgid "end of appointment"
-msgstr "tapaamisen pÃ¤Ã¤ttymistÃ¤"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+msgid ""
+"before\n"
+"after"
+msgstr ""
+"ennen\n"
+"jÃ¤lkeen"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "extra times every"
 msgstr "ylimÃ¤Ã¤rÃ¤istÃ¤ kertaa joka"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-msgid "hour(s)"
-msgstr "tunti(a)"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+msgid ""
+"minute(s)\n"
+"hour(s)\n"
+"day(s)"
+msgstr ""
+"minuuttia\n"
+"tuntia\n"
+"pÃ¤ivÃ¤Ã¤"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-msgid "minute(s)"
-msgstr "minuutti(a)"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+msgid ""
+"minutes\n"
+"hours\n"
+"days"
+msgstr ""
+"minuuttia\n"
+"tuntia\n"
+"pÃ¤ivÃ¤Ã¤"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
-msgid "start of appointment"
-msgstr "tapaamisen alkua"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid ""
+"start of appointment\n"
+"end of appointment"
+msgstr ""
+"tapaamisen alku\n"
+"tapaamisen loppu"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
@@ -5834,47 +4524,54 @@ msgid "A_dd"
 msgstr "_LisÃ¤Ã¤"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "HÃ¤lytykset"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
-#: ../composer/e-composer-actions.c:62
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:553
 msgid "_Suggest automatic display of attachment"
 msgstr "_Ehdota liitteen automaattista nÃ¤yttÃ¤mistÃ¤"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
 msgid "Attach file(s)"
 msgstr "LiitÃ¤ tiedosto(t)"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/event-page.c:2955
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-day-view-time-item.c:788
-#: ../calendar/gui/e-itip-control.c:1153 ../filter/filter-rule.c:945
-#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:136
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:185
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/event-page.c:2993
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-day-view-time-item.c:785
+#: ../calendar/gui/e-itip-control.c:1150 ../filter/filter-rule.c:942
+#: ../mail/em-account-editor.c:717 ../mail/em-account-editor.c:1451
+#: ../mail/em-account-prefs.c:435 ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:333
 #: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:395
-#: ../plugins/exchange-operations/exchange-delegates-user.c:195
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2179
-#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
-#: ../widgets/misc/e-dateedit.c:1725
+#: ../plugins/email-custom-header/email-custom-header.c:394
+#: ../plugins/exchange-operations/exchange-delegates-user.c:179
+#: ../plugins/itip-formatter/itip-formatter.c:2208
+#: ../widgets/misc/e-cell-date-edit.c:312 ../widgets/misc/e-dateedit.c:1463
+#: ../widgets/misc/e-dateedit.c:1674
 #: ../widgets/misc/e-signature-combo-box.c:74
 msgid "None"
 msgstr "MÃ¤Ã¤rittelemÃ¤tÃ¶n"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:648
 msgid "Selected Calendars for Alarms"
 msgstr "Valitse kalenterit hÃ¤lytyksille"
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
+msgid "Time and date:"
+msgstr "PÃ¤ivÃ¤ys ja aika:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:866
+msgid "Date only:"
+msgstr "Vain pÃ¤ivÃ¤ys:"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "(Shown in a Day View)"
 msgstr "(NÃ¤ytetÃ¤Ã¤n pÃ¤ivÃ¤nÃ¤kymÃ¤ssÃ¤)"
@@ -5901,51 +4598,60 @@ msgstr ""
 "<i>%u ja %d korvataan kÃ¤yttÃ¤jÃ¤llÃ¤ ja aluenimellÃ¤ sÃ¤hkÃ¶postiosoitteesta.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Alerts</span>"
+msgid "<span weight=\"bold\">Alarms</span>"
 msgstr "<span weight=\"bold\">HÃ¤lytykset</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../mail/mail-config.glade.h:9
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr "<span weight=\"bold\">HÃ¤lytykset</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../mail/mail-config.glade.h:13
+msgid "<span weight=\"bold\">Date/Time Format</span>"
+msgstr "<span weight=\"bold\">PÃ¤ivÃ¤ys- ja aikamuotoilu</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">Vapaa/varattu-tietojen oletuspalvelin</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">YleistÃ¤</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">TehtÃ¤vÃ¤lista</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">Aika</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">TyÃ¶viikko</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Adjust for daylight sa_ving time"
-msgstr "SÃ¤Ã¤dÃ¤ _kesÃ¤ajan mukaan"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Day _ends:"
 msgstr "PÃ¤ivÃ¤ _pÃ¤Ã¤ttyy:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Display"
 msgstr "NÃ¤ytÃ¤"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
-#: ../calendar/gui/e-itip-control.c:733
+msgid "Display alarms in _notification area only"
+msgstr "NÃ¤ytÃ¤ hÃ¤lytykset vain _ilmoitusalueella"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "Perjantai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5955,13 +4661,13 @@ msgstr ""
 "tuntia\n"
 "pÃ¤ivÃ¤Ã¤"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "Maanantai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5979,215 +4685,231 @@ msgstr ""
 "lauantai\n"
 "sunnuntai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../mail/mail-config.glade.h:114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../mail/mail-config.glade.h:118
 msgid "Pick a color"
 msgstr "Valitse vÃ¤ri"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "S_un"
 msgstr "_Su"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Sc_roll Month View by a week"
+msgstr "Vie_ritÃ¤ kuukausinÃ¤kymÃ¤Ã¤ viikoittain"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Se_cond zone:"
 msgstr "_Toinen aikavyÃ¶hyke:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Select the calendars for alarm notification"
 msgstr "Valitse kalenterit, joiden hÃ¤lytykset lÃ¤hetetÃ¤Ã¤n"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Sh_ow a reminder"
 msgstr "NÃ¤ytÃ¤ muistutus"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show a _reminder"
 msgstr "NÃ¤ytÃ¤ _muistutus"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Show week _numbers in date navigator"
 msgstr "NÃ¤ytÃ¤ _viikkonumerot"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "NÃ¤ytÃ¤ viikkonumero pÃ¤ivÃ¤- ja tyÃ¶viikkonÃ¤kymissÃ¤"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "T_asks due today:"
 msgstr "_TÃ¤nÃ¤Ã¤n erÃ¤Ã¤ntyvÃ¤t tehtÃ¤vÃ¤t:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "T_hu"
 msgstr "_To"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Template:"
 msgstr "Pohja:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "Torstai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "Time _zone:"
 msgstr "AikavyÃ¶hyke: "
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Time format:"
 msgstr "Ajan muoto:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "Tiistai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+msgid "Use s_ystem time zone"
+msgstr "NÃ¤ytÃ¤ _jÃ¤rjestelmÃ¤n aikavyÃ¶hyke"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Wee_k starts on:"
 msgstr "Viikon ensimmÃ¤inen pÃ¤ivÃ¤:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "Work days:"
 msgstr "TyÃ¶pÃ¤ivÃ¤t:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_12 hour (AM/PM)"
 msgstr "_12 tuntia (am/pm)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_24 hour"
 msgstr "_24 tuntia"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Ask for confirmation when deleting items"
 msgstr "PyydÃ¤ _vahvistusta poistettaessa"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Compress weekends in month view"
 msgstr "_TiivistÃ¤ viikonloput kuukausinÃ¤kymÃ¤ssÃ¤"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Day begins:"
 msgstr "_PÃ¤ivÃ¤ alkaa:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Fri"
 msgstr "_Pe"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Hide completed tasks after"
 msgstr "Piilota _poistetut viestit kun on kulunut"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
 msgid "_Mon"
 msgstr "_Ma"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Overdue tasks:"
 msgstr "_ErÃ¤pÃ¤ivÃ¤n ylittÃ¤neet tehtÃ¤vÃ¤t:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Sat"
 msgstr "_La"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
 msgid "_Show appointment end times in week and month view"
 msgstr "_NÃ¤ytÃ¤ tapaamisten loppumisajat viikko- ja kuukausinÃ¤kymissÃ¤"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "_Time divisions:"
 msgstr "_Aikajaot:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
 msgid "_Tue"
 msgstr "_Ti"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
 msgid "_Wed"
 msgstr "_Ke"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
 msgid "before every anniversary/birthday"
 msgstr "ennen joka vuosipÃ¤ivÃ¤Ã¤ ja syntymÃ¤pÃ¤ivÃ¤Ã¤"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
 msgid "before every appointment"
 msgstr "ennen tapaamista"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:271
+#: ../calendar/gui/dialogs/calendar-setup.c:153
+msgid "Type:"
+msgstr "Tyyppi:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "_Kopioi kalenterin sisÃ¤ltÃ¶ paikallisesti yhteydettÃ¶mÃ¤Ã¤n kÃ¤yttÃ¶Ã¶n"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:273
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "_Kopioi tehtÃ¤vÃ¤listan sisÃ¤ltÃ¶ paikallisesti yhteydettÃ¶mÃ¤Ã¤n kÃ¤yttÃ¶Ã¶n"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:275
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "_Kopioi muistilappujen sisÃ¤ltÃ¶ paikallisesti yhteydettÃ¶mÃ¤Ã¤n kÃ¤yttÃ¶Ã¶n"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:345
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "VÃ¤_ri:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "TehtÃ¤vÃ¤lista"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Muistilappulista"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "Kalenterin ominaisuudet"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "Uusi kalenteri"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "TehtÃ¤vÃ¤listan ominaisuudet"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
 msgstr "Uusi tehtÃ¤vÃ¤lista"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
 msgstr "Muistilappulistan ominaisuudet"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "Uusi muistilappulista"
 
@@ -6240,297 +4962,237 @@ msgstr "%s Et tehnyt muutoksia, suljetaanko muokkain?"
 msgid "Validation error: %s"
 msgstr "Tarkistusvirhe: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2365
+#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2349
 msgid " to "
 msgstr " - "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2353
 msgid " (Completed "
 msgstr " (Valmis "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2355
 msgid "Completed "
 msgstr "Valmis"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2360
 msgid " (Due "
 msgstr "(erÃ¤Ã¤ntyy "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2362
 msgid "Due "
 msgstr "ErÃ¤Ã¤ntyy "
 
-#: ../calendar/gui/dialogs/comp-editor.c:239
-#, c-format
-msgid "Attached message - %s"
-msgstr "Liitetty viesti - %s"
-
-#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:244
-#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1765
-#: ../composer/e-msg-composer.c:1984
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "Liitetty viesti"
-msgstr[1] "%d liitettyÃ¤ viestiÃ¤"
-
-#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2052
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1188 ../mail/message-list.c:2106
-msgid "_Move"
-msgstr "_SiirrÃ¤"
+#: ../calendar/gui/dialogs/comp-editor.c:224
+msgid "Could not save attachments"
+msgstr "LiitteitÃ¤ ei voitu tallentaa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2054
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2108
-msgid "Cancel _Drag"
-msgstr "Peruuta _raahaus"
-
-#: ../calendar/gui/dialogs/comp-editor.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:3315 ../mail/em-utils.c:373
-#: ../plugins/prefer-plain/prefer-plain.c:91
-#: ../widgets/misc/e-attachment-bar.c:453
-msgid "attachment"
-msgstr "liite"
-
-#: ../calendar/gui/dialogs/comp-editor.c:849
+#: ../calendar/gui/dialogs/comp-editor.c:487
 msgid "Could not update object"
 msgstr "Kohdetta ei voi pÃ¤ivittÃ¤Ã¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:582
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:589
 #, c-format
 msgid "Meeting - %s"
 msgstr "Kokous - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:591
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:597
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "TehtÃ¤vÃ¤nanto - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:955
+#: ../calendar/gui/dialogs/comp-editor.c:599
 #, c-format
 msgid "Task - %s"
 msgstr "TehtÃ¤vÃ¤ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
+#: ../calendar/gui/dialogs/comp-editor.c:604
 #, c-format
 msgid "Memo - %s"
 msgstr "Muistilappu - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:620
 msgid "No Summary"
 msgstr "Ei yhteenvetoa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:762
 msgid "Keep original item?"
 msgstr "SÃ¤ilytÃ¤ alkuperÃ¤inen?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1312
+#: ../calendar/gui/dialogs/comp-editor.c:968
 msgid "Click here to close the current window"
 msgstr "Sulje nykyinen ikkuna napsauttamalla tÃ¤stÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1319
+#: ../calendar/gui/dialogs/comp-editor.c:975
 msgid "Copy selected text to the clipboard"
 msgstr "Kopioi valittu teksti leikepÃ¶ydÃ¤lle"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../calendar/gui/dialogs/comp-editor.c:982
 msgid "Cut selected text to the clipboard"
 msgstr "_Kopioi valittu teksti leikepÃ¶ydÃ¤lle"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../calendar/gui/dialogs/comp-editor.c:989
 msgid "Click here to view help available"
 msgstr "Napsauta tÃ¤stÃ¤ nÃ¤yttÃ¤Ã¤ksesi ohje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1340
+#: ../calendar/gui/dialogs/comp-editor.c:996
 msgid "Paste text from the clipboard"
 msgstr "LiitÃ¤ tekstiÃ¤ leikepÃ¶ydÃ¤ltÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1017
 msgid "Click here to save the current window"
 msgstr "Tallenna nykyinen ikkuna napsauttamalla tÃ¤stÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../calendar/gui/dialogs/comp-editor.c:1024
 msgid "Select all text"
 msgstr "Valitse kaikki teksti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1375
+#: ../calendar/gui/dialogs/comp-editor.c:1031
 msgid "_Classification"
 msgstr "Lu_okittelu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
-#: ../mail/mail-signature-editor.c:208
+#: ../calendar/gui/dialogs/comp-editor.c:1045
+#: ../mail/mail-signature-editor.c:209
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1052
 #: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "O_hje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1059
 msgid "_Insert"
 msgstr "L_isÃ¤Ã¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1066
 msgid "_Options"
 msgstr "_Asetukset"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
+#: ../calendar/gui/dialogs/comp-editor.c:1073 ../mail/em-folder-tree.c:2106
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_NÃ¤ytÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
-#: ../composer/e-composer-actions.c:469
+#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../composer/e-composer-actions.c:315
 msgid "_Attachment..."
 msgstr "_Liite..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1085
 msgid "Click here to attach a file"
 msgstr "LiitÃ¤ tiedosta napsauttamalla tÃ¤stÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1093
 msgid "_Categories"
 msgstr "_Luokat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1095
 msgid "Toggles whether to display categories"
 msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ luokat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1101
 msgid "Time _Zone"
 msgstr "_AikavyÃ¶hyke"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "Toggles whether the time zone is displayed"
 msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ aikavyÃ¶hykekenttÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1112
 msgid "Pu_blic"
 msgstr "J_ulkinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1458
+#: ../calendar/gui/dialogs/comp-editor.c:1114
 msgid "Classify as public"
 msgstr "Luokittele julkiseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1463
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 msgid "_Private"
 msgstr "_Yksityinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "Classify as private"
 msgstr "Luokittele yksityiseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1470
+#: ../calendar/gui/dialogs/comp-editor.c:1126
 msgid "_Confidential"
 msgstr "_Luottamuksellinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1472
+#: ../calendar/gui/dialogs/comp-editor.c:1128
 msgid "Classify as confidential"
 msgstr "Luokittele luottamukselliseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1480
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "R_ole Field"
 msgstr "R_oolikenttÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1482
+#: ../calendar/gui/dialogs/comp-editor.c:1138
 msgid "Toggles whether the Role field is displayed"
 msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ roolikenttÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1488
+#: ../calendar/gui/dialogs/comp-editor.c:1144
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1146
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ RSVP-kenttÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1496
+#: ../calendar/gui/dialogs/comp-editor.c:1152
 msgid "_Status Field"
 msgstr "_TilakenttÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1498
+#: ../calendar/gui/dialogs/comp-editor.c:1154
 msgid "Toggles whether the Status field is displayed"
 msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ tilakenttÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1504
+#: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "_Type Field"
 msgstr "T_yyppikenttÃ¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1506
+#: ../calendar/gui/dialogs/comp-editor.c:1162
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ lÃ¤snÃ¤olijan tyyppi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1828
-#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
+#: ../calendar/gui/dialogs/comp-editor.c:1186
+#: ../composer/e-composer-private.c:67
 msgid "Recent _Documents"
 msgstr "ViimeisimmÃ¤t _asiakirjat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1847
-#: ../composer/e-composer-actions.c:696
+#: ../calendar/gui/dialogs/comp-editor.c:1615
+#: ../composer/e-composer-actions.c:518
 msgid "Attach"
 msgstr "LiitÃ¤ tiedosto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1942
-#, c-format
-msgid "<b>%d</b> Attachment"
-msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "<b>%d</b> liite"
-msgstr[1] "<b>%d</b> liitettÃ¤"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1974
-msgid "Hide Attachment _Bar"
-msgstr "Piilota _liitepalkki"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1977
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-msgid "Show Attachment _Bar"
-msgstr "NÃ¤ytÃ¤ _liitepalkki"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/event-page.c:1877
-#: ../calendar/gui/dialogs/task-page.c:1201 ../composer/e-msg-composer.c:1039
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "_Remove"
-msgstr "_Poista"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2094
-#: ../composer/e-msg-composer.c:1042
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Add attachment..."
-msgstr "_LisÃ¤Ã¤ liite..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:2302
-#: ../mail/em-format-html-display.c:2381
-msgid "Show Attachments"
-msgstr "NÃ¤ytÃ¤ liitteet"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2303
-msgid "Press space key to toggle attachment bar"
-msgstr "NÃ¤ytÃ¤ tai piilota liitepalkki vÃ¤lilyÃ¶nnillÃ¤"
+#: ../calendar/gui/dialogs/comp-editor.c:1670
+msgid "Save"
+msgstr "Tallenna"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2448
-#: ../calendar/gui/dialogs/comp-editor.c:2496
-#: ../calendar/gui/dialogs/comp-editor.c:3348
+#: ../calendar/gui/dialogs/comp-editor.c:1924
+#: ../calendar/gui/dialogs/comp-editor.c:1973
+#: ../calendar/gui/dialogs/comp-editor.c:2833
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "TÃ¤hÃ¤n kohtaan tehdyt muutokset voidaan hylÃ¤tÃ¤, jos pÃ¤ivitys saapuu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3377
+#: ../calendar/gui/dialogs/comp-editor.c:2801 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:91
+msgid "attachment"
+msgstr "liite"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2862
 msgid "Unable to use current version!"
 msgstr "NykyistÃ¤ versiota ei voi kÃ¤yttÃ¤Ã¤!"
 
@@ -6603,7 +5265,7 @@ msgid "Contacts..."
 msgstr "Yhteystiedot..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To:"
 msgstr "Valtuuta:"
 
@@ -6631,7 +5293,7 @@ msgstr "Muuta tÃ¤mÃ¤ tapahtuma toistuvaksi"
 #: ../calendar/gui/dialogs/event-editor.c:216
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Send Options"
 msgstr "LÃ¤hetysasetukset"
 
@@ -6668,199 +5330,229 @@ msgstr "Kysy vapaa/varattu-tietoja osanottajilta"
 msgid "Appoint_ment"
 msgstr "Tapaa_minen"
 
-#: ../calendar/gui/dialogs/event-page.c:736
-#: ../calendar/gui/dialogs/event-page.c:2725
+#: ../calendar/gui/dialogs/event-page.c:748
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr "Tapahtumaa ei voi muokata, koska valittu kalenteri on vain luettavissa"
+
+#: ../calendar/gui/dialogs/event-page.c:752
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr "Tapahtumaa ei voi muokata kokonaan, koska et ole sen jÃ¤rjestÃ¤jÃ¤"
+
+#: ../calendar/gui/dialogs/event-page.c:764
+#: ../calendar/gui/dialogs/event-page.c:2769
 msgid "This event has alarms"
 msgstr "Tapahtumassa on hÃ¤lytyksiÃ¤"
 
-#: ../calendar/gui/dialogs/event-page.c:799
-#: ../calendar/gui/dialogs/event-page.glade.h:10
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.c:827
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "_JÃ¤rjestÃ¤jÃ¤:"
 
-#: ../calendar/gui/dialogs/event-page.c:845
+#: ../calendar/gui/dialogs/event-page.c:874
 msgid "_Delegatees"
 msgstr "_Valtuutetut"
 
-#: ../calendar/gui/dialogs/event-page.c:847
+#: ../calendar/gui/dialogs/event-page.c:876
 msgid "Atte_ndees"
 msgstr "_Osanottajat"
 
-#: ../calendar/gui/dialogs/event-page.c:1031
+#: ../calendar/gui/dialogs/event-page.c:1062
 msgid "Event with no start date"
 msgstr "Tapahtuma ilman alkupÃ¤ivÃ¤mÃ¤Ã¤rÃ¤Ã¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1034
+#: ../calendar/gui/dialogs/event-page.c:1065
 msgid "Event with no end date"
 msgstr "Tapahtuma ilman pÃ¤Ã¤ttymispÃ¤ivÃ¤Ã¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1203
-#: ../calendar/gui/dialogs/memo-page.c:641
-#: ../calendar/gui/dialogs/task-page.c:813
+#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/memo-page.c:654
+#: ../calendar/gui/dialogs/task-page.c:830
 msgid "Start date is wrong"
 msgstr "AloituspÃ¤ivÃ¤ys on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1213
+#: ../calendar/gui/dialogs/event-page.c:1246
 msgid "End date is wrong"
 msgstr "LopetuspÃ¤ivÃ¤ys on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/event-page.c:1269
 msgid "Start time is wrong"
 msgstr "Alkamisaika on vÃ¤Ã¤rin"
 
-#: ../calendar/gui/dialogs/event-page.c:1243
+#: ../calendar/gui/dialogs/event-page.c:1276
 msgid "End time is wrong"
 msgstr "Lopetusaika on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1406
-#: ../calendar/gui/dialogs/memo-page.c:682
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/event-page.c:1438
+#: ../calendar/gui/dialogs/memo-page.c:695
+#: ../calendar/gui/dialogs/task-page.c:890
 msgid "The organizer selected no longer has an account."
 msgstr "Valitulla jÃ¤rjestÃ¤jÃ¤llÃ¤ ei enÃ¤Ã¤ ole kÃ¤yttÃ¤jÃ¤tiliÃ¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1412
-#: ../calendar/gui/dialogs/memo-page.c:688
-#: ../calendar/gui/dialogs/task-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:1444
+#: ../calendar/gui/dialogs/memo-page.c:701
+#: ../calendar/gui/dialogs/task-page.c:896
 msgid "An organizer is required."
 msgstr "JÃ¤rjestÃ¤jÃ¤ vaaditaan."
 
-#: ../calendar/gui/dialogs/event-page.c:1437
-#: ../calendar/gui/dialogs/task-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:1469
+#: ../calendar/gui/dialogs/task-page.c:920
 msgid "At least one attendee is required."
 msgstr "VÃ¤hintÃ¤Ã¤n yksi lÃ¤snÃ¤olija vaaditaan."
 
-#: ../calendar/gui/dialogs/event-page.c:1878
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/event-page.c:1912
+#: ../calendar/gui/dialogs/task-page.c:1219
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:21
+msgid "_Remove"
+msgstr "_Poista"
+
+#: ../calendar/gui/dialogs/event-page.c:1913
+#: ../calendar/gui/dialogs/task-page.c:1220
 msgid "_Add "
 msgstr "_LisÃ¤Ã¤ "
 
-#: ../calendar/gui/dialogs/event-page.c:2601
+#: ../calendar/gui/dialogs/event-page.c:2639
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kalenteria \"%s\" ei voi avata"
 
-#: ../calendar/gui/dialogs/event-page.c:2645
-#: ../calendar/gui/dialogs/memo-page.c:896
-#: ../calendar/gui/dialogs/task-page.c:1806
+#. Translators: This string is used when we are creating an Event
+#. (meeting or appointment)  on behalf of some other user
+#. Translators: This string is used when we are creating a Memo
+#. on behalf of some other user
+#. Translators: This string is used when we are creating a Task
+#. on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:2683
+#: ../calendar/gui/dialogs/memo-page.c:910
+#: ../calendar/gui/dialogs/task-page.c:1825
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Toimit henkilÃ¶n %s puolesta"
 
-#: ../calendar/gui/dialogs/event-page.c:2925
+#: ../calendar/gui/dialogs/event-page.c:2967
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d pÃ¤ivÃ¤ ennen tapaamista"
 msgstr[1] "%d pÃ¤ivÃ¤Ã¤ ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.c:2931
+#: ../calendar/gui/dialogs/event-page.c:2973
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d tunti ennen tapaamista"
 msgstr[1] "%d tuntia ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.c:2937
+#: ../calendar/gui/dialogs/event-page.c:2979
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuutti ennen tapaamista"
 msgstr[1] "%d minuuttia ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.c:2950
+#: ../calendar/gui/dialogs/event-page.c:2992
 msgid "Customize"
 msgstr "Muokkaa"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid "1 day before appointment"
-msgstr "Yksi pÃ¤ivÃ¤ ennen tapaamista"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:2
-msgid "1 hour before appointment"
-msgstr "Yksi tunti ennen tapaamista"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "15 minutes before appointment"
-msgstr "15 minuuttia ennen tapaamista"
+msgid ""
+"15 minutes before appointment\n"
+"1 hour before appointment\n"
+"1 day before appointment"
+msgstr ""
+"15 minuuttia ennen tapaamista\n"
+"1 tunti ennen tapaamista\n"
+"1 pÃ¤ivÃ¤ ennen tapaamista"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "Attendee_s..."
 msgstr "O_sanottajat..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/e-meeting-list-view.c:151
+msgid "Attendees"
+msgstr "Osanottajat"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Custom Alarm:"
 msgstr "Oma hÃ¤lytys:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Tapahtuman kuvaus:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 #: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "_Yhteenveto:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Alarm"
 msgstr "_HÃ¤lytys"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../calendar/gui/dialogs/memo-page.glade.h:6
 #: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "K_uvaus:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../plugins/calendar-weather/calendar-weather.c:372
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
+msgid "_Location:"
+msgstr "_Sijainti:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:18
 msgid "_Time:"
 msgstr "_Aika:"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
-msgid "for"
-msgstr "kesto"
+#: ../calendar/gui/dialogs/event-page.glade.h:19
+#: ../calendar/gui/dialogs/memo-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../mail/mail-config.glade.h:192 ../mail/mail-dialogs.glade.h:21
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:49
+msgid ""
+"a\n"
+"b"
+msgstr ""
+"a\n"
+"b"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/event-page.glade.h:21
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
-msgid "until"
-msgstr "kunnes"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:1
-msgid "<b>Att_endees</b>"
-msgstr "<b>_LÃ¤snÃ¤olijat</b>"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "C_hange Organizer"
-msgstr "Vaihda _jÃ¤rjestÃ¤jÃ¤Ã¤"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "_Yhteystiedot..."
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
-msgid "Organizer:"
-msgstr "JÃ¤rjestÃ¤jÃ¤:"
+msgid ""
+"for\n"
+"until"
+msgstr ""
+"toista\n"
+"kunnes"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2469
 msgid "Memo"
 msgstr "Muistilappu"
 
-#: ../calendar/gui/dialogs/memo-page.c:857
+#: ../calendar/gui/dialogs/memo-page.c:347
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr "Muistilappua ei voi muokata, koska valittu muistilappuluettelo on vain luettavissa"
+
+#: ../calendar/gui/dialogs/memo-page.c:351
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr "Muistilappua ei voi muokata kokonaan, koska et ole sen jÃ¤rjestÃ¤jÃ¤"
+
+#: ../calendar/gui/dialogs/memo-page.c:871
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Muistilappuja kohteesta '%s' ei voi avata."
 
-#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1564
-#: ../mail/em-format-html.c:1622 ../mail/em-format-html.c:1648
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
+#: ../calendar/gui/dialogs/memo-page.c:1031 ../mail/em-format-html.c:1566
+#: ../mail/em-format-html.c:1624 ../mail/em-format-html.c:1649
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:925
+#: ../mail/em-mailer-prefs.c:78 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "Vastaanottaja"
 
@@ -6874,7 +5566,7 @@ msgid "T_o:"
 msgstr "Vastaan_ottajat:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:365
+#: ../calendar/gui/dialogs/task-page.c:380
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_RyhmÃ¤:"
@@ -6899,23 +5591,23 @@ msgstr "Olet muokkaamassa toistuvaa tehtÃ¤vÃ¤Ã¤. MitÃ¤ haluat muokata?"
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Olet muokkaamassa toistuvaa muistilappua. MitÃ¤ haluat muokata?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:88
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "Vain tÃ¤tÃ¤ kertaa"
 
-#: ../calendar/gui/dialogs/recur-comp.c:92
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "TÃ¤tÃ¤ ja edellisiÃ¤ kertoja"
 
-#: ../calendar/gui/dialogs/recur-comp.c:98
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "TÃ¤tÃ¤ ja tulevia kertoja"
 
-#: ../calendar/gui/dialogs/recur-comp.c:103
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "Kaikki kerrat"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:562
+#: ../calendar/gui/dialogs/recurrence-page.c:563
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "TÃ¤mÃ¤ tapaaminen sisÃ¤ltÃ¤Ã¤ toistuvuuksia, joita Evolution ei voi muokata."
@@ -6938,7 +5630,7 @@ msgstr " "
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "ensimmÃ¤inen"
 
@@ -6947,7 +5639,7 @@ msgstr "ensimmÃ¤inen"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "toinen"
 
@@ -6955,7 +5647,7 @@ msgstr "toinen"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "kolmas"
 
@@ -6963,21 +5655,29 @@ msgstr "kolmas"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "neljÃ¤s"
 
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
+msgid "fifth"
+msgstr "viides"
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "last"
 msgstr "viimeinen"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Toinen pÃ¤ivÃ¤ys"
 
@@ -6985,7 +5685,7 @@ msgstr "Toinen pÃ¤ivÃ¤ys"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "1. - 10."
 
@@ -6993,7 +5693,7 @@ msgstr "1. - 10."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "11. - 20."
 
@@ -7001,45 +5701,45 @@ msgstr "11. - 20."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "21. - 31."
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "pÃ¤ivÃ¤"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "  "
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1410
 msgid "occurrences"
 msgstr "tapahtumiskertaa"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2120
+#: ../calendar/gui/dialogs/recurrence-page.c:2105
 msgid "Add exception"
 msgstr "LisÃ¤Ã¤ poikkeus"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2161
+#: ../calendar/gui/dialogs/recurrence-page.c:2146
 msgid "Could not get a selection to modify."
 msgstr "Valintaa ei voi hakea muokattavaksi."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2152
 msgid "Modify exception"
 msgstr "Muokkaa poikkeusta"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2211
+#: ../calendar/gui/dialogs/recurrence-page.c:2196
 msgid "Could not get a selection to delete."
 msgstr "Valintaa ei voitu hakea poistettavaksi."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2335
+#: ../calendar/gui/dialogs/recurrence-page.c:2320
 msgid "Date/Time"
 msgstr "PÃ¤ivÃ¤ys/aika"
 
@@ -7048,7 +5748,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Poikkeukset</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
 msgid "<b>Preview</b>"
 msgstr "<b>Esikatselu</b>"
 
@@ -7056,50 +5756,56 @@ msgstr "<b>Esikatselu</b>"
 msgid "<b>Recurrence</b>"
 msgstr "<b>Toistuvuus</b>"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Every"
 msgstr "Joka"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "This appointment rec_urs"
 msgstr "Tapaaminen on _toistuva"
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
-msgid "forever"
-msgstr "ikuisesti"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
-msgid "month(s)"
-msgstr "kuukausi"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid ""
+"day(s)\n"
+"week(s)\n"
+"month(s)\n"
+"year(s)"
+msgstr ""
+"pÃ¤ivÃ¤Ã¤\n"
+"viikkoa\n"
+"kuukautta\n"
+"vuotta"
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
-msgid "week(s)"
-msgstr "viikko"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
-msgid "year(s)"
-msgstr "vuosi"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid ""
+"for\n"
+"until\n"
+"forever"
+msgstr ""
+"toista\n"
+"kunnes\n"
+"pysyvÃ¤sti"
 
-#: ../calendar/gui/dialogs/send-comp.c:116
+#: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
 msgstr "LÃ¤hetÃ¤ hÃ¤lytys tÃ¤lle tapahtumalle"
 
-#: ../calendar/gui/dialogs/task-details-page.c:377
-#: ../calendar/gui/dialogs/task-details-page.c:397
+#: ../calendar/gui/dialogs/send-comp.c:162
+msgid "Notify new attendees _only"
+msgstr "Muistuta uusia osallistuja _vain"
+
+#: ../calendar/gui/dialogs/task-details-page.c:376
+#: ../calendar/gui/dialogs/task-details-page.c:396
 msgid "Completed date is wrong"
 msgstr "ValmistumispÃ¤ivÃ¤ on vÃ¤Ã¤rin"
 
-#: ../calendar/gui/dialogs/task-details-page.c:482
+#: ../calendar/gui/dialogs/task-details-page.c:481
 msgid "Web Page"
 msgstr "WWW-sivu"
 
@@ -7111,74 +5817,38 @@ msgstr "<span weight=\"bold\">LisÃ¤asetukset</span>"
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">Tila</span>"
 
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-model-tasks.c:362
-#: ../calendar/gui/e-cal-model-tasks.c:679
-#: ../calendar/gui/e-calendar-table.c:237
-#: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/e-itip-control.c:941
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/print.c:2561 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:366
-msgid "Completed"
-msgstr "Valmis"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-calendar-table.c:577 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1065
-msgid "High"
-msgstr "Korkea"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:244
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-cal-model-tasks.c:754
-#: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2558
-msgid "In Progress"
-msgstr "TyÃ¶n alla"
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+msgid ""
+"High\n"
+"Normal\n"
+"Low\n"
+"Undefined"
+msgstr ""
+"Korkea\n"
+"Tavallinen\n"
+"Matala\n"
+"Ei mÃ¤Ã¤ritelty"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:270
-#: ../calendar/gui/e-calendar-table.c:579 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1063
-msgid "Low"
-msgstr "Matala"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-cal-model.c:1006 ../calendar/gui/e-calendar-table.c:578
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1064
-msgid "Normal"
-msgstr "Tavallinen"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2555
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "Ei aloitettu"
+msgid ""
+"Not Started\n"
+"In Progress\n"
+"Completed\n"
+"Canceled"
+msgstr ""
+"Ei aloitettu\n"
+"Kesken\n"
+"Valmis\n"
+"Peruttu"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "P_ercent complete:"
 msgstr "Pros_enttia valmiina:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Stat_us:"
 msgstr "_Tila:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:580 ../calendar/gui/tasktypes.xml.h:24
-msgid "Undefined"
-msgstr "MÃ¤Ã¤rittelemÃ¤tÃ¶n"
-
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
 msgstr "_ValmistumispÃ¤ivÃ¤:"
@@ -7201,7 +5871,7 @@ msgid "Click to change or view the status details of the task"
 msgstr "Napsauta jos haluat muuttaa tai nÃ¤yttÃ¤Ã¤ tehtÃ¤vÃ¤n tilan yksityiskohtia"
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:525
+#: ../composer/e-composer-actions.c:371
 msgid "_Send Options"
 msgstr "_LÃ¤hetysasetukset"
 
@@ -7213,16 +5883,25 @@ msgstr "_TehtÃ¤vÃ¤"
 msgid "Task Details"
 msgstr "TehtÃ¤vÃ¤n yksityiskohdat"
 
-#: ../calendar/gui/dialogs/task-page.c:373
+#: ../calendar/gui/dialogs/task-page.c:336
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr ""
+"TehtÃ¤vÃ¤Ã¤ ei voi muokata, koska valittu tehtÃ¤vÃ¤lista on vain luettavissa"
+
+#: ../calendar/gui/dialogs/task-page.c:340
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "TehtÃ¤vÃ¤Ã¤ ei voi muokata kokonaan, koska et ole tehtÃ¤vÃ¤n jÃ¤rjestÃ¤jÃ¤"
+
+#: ../calendar/gui/dialogs/task-page.c:388
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "_JÃ¤rjestÃ¤jÃ¤:"
 
-#: ../calendar/gui/dialogs/task-page.c:786
+#: ../calendar/gui/dialogs/task-page.c:803
 msgid "Due date is wrong"
 msgstr "ErÃ¤pÃ¤ivÃ¤ on virheellinen"
 
-#: ../calendar/gui/dialogs/task-page.c:1763
+#: ../calendar/gui/dialogs/task-page.c:1782
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "TehtÃ¤viÃ¤ kohteesta '%s' ei voi avata."
@@ -7319,80 +5998,161 @@ msgstr "%s %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s tuntemattomalle liipasintyypille"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:69
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3273
+#: ../calendar/gui/e-attachment-handler-calendar.c:258
+msgid "I_mport"
+msgstr "_Tuo"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:340
+msgid "Select a Calendar"
+msgstr "Valitse kalenteri"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:367
+msgid "Select a Task List"
+msgstr "Valitse tehtÃ¤vÃ¤lista"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:377
+msgid "I_mport to Calendar"
+msgstr "Tuo _kalenteriin"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:384
+msgid "I_mport to Tasks"
+msgstr "_Tuo t_ehtÃ¤viin"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:68
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3210
 #, c-format
 msgid "Click to open %s"
 msgstr "Napsauta avataksesi %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:129
-#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
+#: ../calendar/gui/e-cal-component-memo-preview.c:127
+#: ../calendar/gui/e-cal-component-preview.c:170 ../filter/filter-rule.c:859
 msgid "Untitled"
 msgstr "NimetÃ¶n"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:181
-#: ../calendar/gui/e-cal-component-preview.c:211
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-memo-preview.c:178
+#: ../calendar/gui/e-cal-component-preview.c:209
+#: ../calendar/gui/e-cal-component-preview.c:220
 msgid "Start Date:"
 msgstr "AlkamispÃ¤ivÃ¤:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-memo-preview.c:191
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1213
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
-#: ../widgets/misc/e-attachment.glade.h:2
+#: ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:75
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-memo-preview.c:215
 #: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "WWW-sivu:"
 
-#: ../calendar/gui/e-cal-component-preview.c:204
-#: ../calendar/gui/e-itip-control.c:1157
+#: ../calendar/gui/e-cal-component-preview.c:202
+#: ../calendar/gui/e-itip-control.c:1154
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Kuvaus:"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:231
 msgid "Due Date:"
 msgstr "ErÃ¤pÃ¤ivÃ¤:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:240
-#: ../calendar/gui/e-itip-control.c:1181
-#: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1052
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-itip-control.c:1178
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Status:"
 msgstr "Tila:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-cal-component-preview.c:242
+#: ../calendar/gui/e-cal-model-tasks.c:359
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-cal-model-tasks.c:752
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/print.c:2542
+msgid "In Progress"
+msgstr "TyÃ¶n alla"
+
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-model-tasks.c:361
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/e-itip-control.c:939
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/print.c:2545 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Completed"
+msgstr "Valmis"
+
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model-tasks.c:357
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-calendar-table.c:232
+#: ../calendar/gui/e-calendar-table.c:658 ../calendar/gui/print.c:2539
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "Ei aloitettu"
+
+#: ../calendar/gui/e-cal-component-preview.c:262
 msgid "Priority:"
 msgstr "Prioriteetti:"
 
+#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-calendar-table.c:585 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
+msgid "High"
+msgstr "Korkea"
+
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-cal-model.c:1076 ../calendar/gui/e-calendar-table.c:586
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
+msgid "Normal"
+msgstr "Tavallinen"
+
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-calendar-table.c:587 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
+msgid "Low"
+msgstr "Matala"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../plugins/save-calendar/csv-format.c:362
+msgid "Created"
+msgstr "Luotu"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 msgid "End Date"
 msgstr "PÃ¤Ã¤ttymispÃ¤ivÃ¤"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:4
+msgid "Last modified"
+msgstr "Viimeksi muokattu"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "AloituspÃ¤ivÃ¤"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:629
+#: ../calendar/gui/e-calendar-table.c:637
 msgid "Free"
 msgstr "Vapaa"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:630
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-calendar-table.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../calendar/gui/e-cal-model-tasks.c:627
+#: ../calendar/gui/e-cal-model-tasks.c:625
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7402,225 +6162,200 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
 #: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:745
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/e-meeting-store.c:742
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "KyllÃ¤"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
 #: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:163
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Ei"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
-#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
-#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-cal-model.c:372 ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-itip-control.c:1333
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984
-#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1342
-#: ../plugins/itip-formatter/itip-formatter.c:447
-#: ../plugins/itip-formatter/itip-formatter.c:2204
+#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/print.c:978
+#: ../calendar/gui/print.c:995 ../mail/em-utils.c:1339
+#: ../plugins/itip-formatter/itip-formatter.c:449
+#: ../plugins/itip-formatter/itip-formatter.c:2233
 #: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../calendar/gui/e-cal-model.c:1008
+#: ../calendar/gui/e-cal-model.c:1078
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../calendar/gui/e-cal-model.c:1010
+#: ../calendar/gui/e-cal-model.c:1080
 msgid "Assigned"
 msgstr "Annettu tehtÃ¤vÃ¤ksi"
 
-#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
-msgid "Save As..."
-msgstr "Tallenna nimellÃ¤..."
-
-#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2214
-msgid "Select folder to save selected attachments..."
-msgstr "Valitse kansio, johon valitut liitteet tallennetaan..."
-
-#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
-#, c-format
-msgid "untitled_image.%s"
-msgstr "nimetÃ¶n_kuva.%s"
-
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1589
-#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:924
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:559 ../mail/em-popup.c:570
-msgid "_Save As..."
-msgstr "Tallenna _nimellÃ¤..."
-
-#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
-#: ../mail/em-popup.c:571
-msgid "Set as _Background"
-msgstr "Aseta _taustaksi"
-
-#: ../calendar/gui/e-cal-popup.c:288
-msgid "_Save Selected"
-msgstr "Tallenna _valitut"
-
-#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:828
-#, c-format
-msgid "Open in %s..."
-msgstr "Avaa ohjelmassa %s..."
-
-#: ../calendar/gui/e-calendar-table.c:337
+#: ../calendar/gui/e-calendar-table.c:335
 msgid "* No Summary *"
 msgstr "* Ei yhteenvetoa *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-table.c:373
-#: ../calendar/gui/e-calendar-view.c:2399
+#: ../calendar/gui/e-calendar-table.c:371
+#: ../calendar/gui/e-calendar-view.c:2429
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "JÃ¤rjestÃ¤jÃ¤: %s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:376
-#: ../calendar/gui/e-calendar-view.c:2403
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2433
 #, c-format
 msgid "Organizer: %s"
 msgstr "JÃ¤rjestÃ¤jÃ¤: %s"
 
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:405
 msgid "Start: "
 msgstr "Alkaa:"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "Due: "
 msgstr "ErÃ¤Ã¤ntyy:"
 
-#: ../calendar/gui/e-calendar-table.c:599
+#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:24
+msgid "Undefined"
+msgstr "MÃ¤Ã¤rittelemÃ¤tÃ¶n"
+
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:600
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:601
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:602
+#: ../calendar/gui/e-calendar-table.c:610
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:603
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:604
+#: ../calendar/gui/e-calendar-table.c:612
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:605
+#: ../calendar/gui/e-calendar-table.c:613
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:606
+#: ../calendar/gui/e-calendar-table.c:614
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:607
+#: ../calendar/gui/e-calendar-table.c:615
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:608
+#: ../calendar/gui/e-calendar-table.c:616
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:609
+#: ../calendar/gui/e-calendar-table.c:617
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:889
-#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:437
+#: ../calendar/gui/e-calendar-table.c:897
+#: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:449
 msgid "Deleting selected objects"
 msgstr "Poistetaan valitut kohteet"
 
-#: ../calendar/gui/e-calendar-table.c:1172
-#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:642
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-memo-table.c:654
 msgid "Updating objects"
 msgstr "PÃ¤ivitetÃ¤Ã¤n olioita"
 
-#: ../calendar/gui/e-calendar-table.c:1360
-#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:818
-#: ../composer/e-composer-actions.c:275
+#: ../calendar/gui/e-calendar-table.c:1364
+#: ../calendar/gui/e-calendar-view.c:1333 ../calendar/gui/e-memo-table.c:828
+#: ../composer/e-composer-actions.c:219
 msgid "Save as..."
 msgstr "Tallenna nimellÃ¤..."
 
-#: ../calendar/gui/e-calendar-table.c:1584
-#: ../calendar/gui/e-calendar-view.c:1758
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "New _Task"
 msgstr "Uusi _tehtÃ¤vÃ¤"
 
-#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:923
+#: ../calendar/gui/e-calendar-table.c:1592 ../calendar/gui/e-memo-table.c:933
 msgid "Open _Web Page"
 msgstr "_Avaa www-sivu"
 
-#: ../calendar/gui/e-calendar-table.c:1590
-#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1593
+#: ../calendar/gui/e-calendar-view.c:1807 ../calendar/gui/e-memo-table.c:934
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:494
+msgid "_Save As..."
+msgstr "Tallenna _nimellÃ¤..."
+
+#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-view.c:1792 ../calendar/gui/e-memo-table.c:935
 msgid "P_rint..."
 msgstr "T_ulosta..."
 
-#: ../calendar/gui/e-calendar-table.c:1594
-#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:929
+#: ../calendar/gui/e-calendar-table.c:1598
+#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:939
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "L_eikkaa"
 
-#: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1764
-#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1600
+#: ../calendar/gui/e-calendar-view.c:1795
+#: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:941
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "L_iitÃ¤"
 
-#: ../calendar/gui/e-calendar-table.c:1600 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1604 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Anna tehtÃ¤vÃ¤ksi"
 
-#: ../calendar/gui/e-calendar-table.c:1601 ../calendar/gui/e-memo-table.c:935
+#: ../calendar/gui/e-calendar-table.c:1605 ../calendar/gui/e-memo-table.c:945
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_VÃ¤litÃ¤ iCalendar-muodossa"
 
-#: ../calendar/gui/e-calendar-table.c:1602
+#: ../calendar/gui/e-calendar-table.c:1606
 msgid "_Mark as Complete"
 msgstr "_Merkitse valmiiksi"
 
-#: ../calendar/gui/e-calendar-table.c:1603
+#: ../calendar/gui/e-calendar-table.c:1607
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merkitse valitut tehtÃ¤vÃ¤t valmiiksi"
 
-#: ../calendar/gui/e-calendar-table.c:1604
+#: ../calendar/gui/e-calendar-table.c:1608
 msgid "_Mark as Incomplete"
 msgstr "_Merkitse keskenerÃ¤iseksi"
 
-#: ../calendar/gui/e-calendar-table.c:1605
+#: ../calendar/gui/e-calendar-table.c:1609
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Merkitse valitut tehtÃ¤vÃ¤t keskenerÃ¤isiksi"
 
-#: ../calendar/gui/e-calendar-table.c:1610
+#: ../calendar/gui/e-calendar-table.c:1614
 msgid "_Delete Selected Tasks"
 msgstr "_Poista valitut tehtÃ¤vÃ¤t"
 
-#: ../calendar/gui/e-calendar-table.c:1847
+#: ../calendar/gui/e-calendar-table.c:1849
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "LisÃ¤Ã¤ tehtÃ¤vÃ¤ tÃ¤stÃ¤"
@@ -7638,167 +6373,167 @@ msgstr "Valmis"
 msgid "Completion date"
 msgstr "ValmistumispÃ¤ivÃ¤"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due date"
 msgstr "ErÃ¤pÃ¤ivÃ¤"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Priority"
 msgstr "Prioriteetti"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:11
 msgid "Start date"
 msgstr "AloituspÃ¤ivÃ¤"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-calendar-view.c:2307
-#: ../calendar/gui/e-meeting-list-view.c:602
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:2337
+#: ../calendar/gui/e-meeting-list-view.c:601
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Tila"
 
-#: ../calendar/gui/e-calendar-view.c:1444
+#: ../calendar/gui/e-calendar-view.c:1478
 msgid "Moving items"
 msgstr "SiirretÃ¤Ã¤n kohteita"
 
-#: ../calendar/gui/e-calendar-view.c:1446
+#: ../calendar/gui/e-calendar-view.c:1480
 msgid "Copying items"
 msgstr "Kopioidaan kohteita"
 
-#: ../calendar/gui/e-calendar-view.c:1755
+#: ../calendar/gui/e-calendar-view.c:1786
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: ../calendar/gui/e-calendar-view.c:1756
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "New All Day _Event"
-msgstr "Uusi koko pÃ¤_ivÃ¤n tapahtuma"
+msgstr "Uusi koko pÃ¤ivÃ¤n _tapahtuma"
 
-#: ../calendar/gui/e-calendar-view.c:1757
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "New _Meeting"
 msgstr "Uusi _kokous"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1768
+#: ../calendar/gui/e-calendar-view.c:1799
 msgid "_Current View"
 msgstr "_Nykyinen nÃ¤kymÃ¤"
 
-#: ../calendar/gui/e-calendar-view.c:1770
+#: ../calendar/gui/e-calendar-view.c:1801
 msgid "Select T_oday"
 msgstr "Valitse _tÃ¤mÃ¤ pÃ¤ivÃ¤"
 
-#: ../calendar/gui/e-calendar-view.c:1771
+#: ../calendar/gui/e-calendar-view.c:1802
 msgid "_Select Date..."
 msgstr "_Valitse pÃ¤ivÃ¤ys..."
 
-#: ../calendar/gui/e-calendar-view.c:1777
+#: ../calendar/gui/e-calendar-view.c:1808
 msgid "Pri_nt..."
 msgstr "T_ulosta..."
 
-#: ../calendar/gui/e-calendar-view.c:1787
+#: ../calendar/gui/e-calendar-view.c:1818
 msgid "Cop_y to Calendar..."
 msgstr "_Kopioi kalenteriin..."
 
-#: ../calendar/gui/e-calendar-view.c:1788
+#: ../calendar/gui/e-calendar-view.c:1819
 msgid "Mo_ve to Calendar..."
 msgstr "_SiirrÃ¤ kalenteriin..."
 
-#: ../calendar/gui/e-calendar-view.c:1789
+#: ../calendar/gui/e-calendar-view.c:1820
 msgid "_Delegate Meeting..."
 msgstr "_Delegoi kokous..."
 
-#: ../calendar/gui/e-calendar-view.c:1790
+#: ../calendar/gui/e-calendar-view.c:1821
 msgid "_Schedule Meeting..."
 msgstr "_JÃ¤rjestÃ¤ kokous..."
 
-#: ../calendar/gui/e-calendar-view.c:1791
+#: ../calendar/gui/e-calendar-view.c:1822
 msgid "_Forward as iCalendar..."
 msgstr "_VÃ¤litÃ¤ iCalendar-muodossa..."
 
-#: ../calendar/gui/e-calendar-view.c:1792
+#: ../calendar/gui/e-calendar-view.c:1823
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1332
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../calendar/gui/e-calendar-view.c:1824
+#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: ../calendar/gui/e-calendar-view.c:1798
+#: ../calendar/gui/e-calendar-view.c:1829
 msgid "Make this Occurrence _Movable"
 msgstr "Muuta tÃ¤mÃ¤ kerta _siirrettÃ¤vÃ¤ksi"
 
-#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1830 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Poista tÃ¤mÃ¤ _tapahtumakerta"
 
-#: ../calendar/gui/e-calendar-view.c:1800
+#: ../calendar/gui/e-calendar-view.c:1831
 msgid "Delete _All Occurrences"
 msgstr "Poista _kaikki tapahtumakerrat"
 
-#: ../calendar/gui/e-calendar-view.c:2254
-#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-calendar-view.c:2284
+#: ../calendar/gui/e-itip-control.c:1183
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../plugins/itip-formatter/itip-formatter.c:2192
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../plugins/itip-formatter/itip-formatter.c:2221
 msgid "Accepted"
 msgstr "HyvÃ¤ksytty"
 
-#: ../calendar/gui/e-calendar-view.c:2255
-#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-calendar-view.c:2285
+#: ../calendar/gui/e-itip-control.c:1191
 #: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../plugins/itip-formatter/itip-formatter.c:2198
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../plugins/itip-formatter/itip-formatter.c:2227
 msgid "Declined"
 msgstr "HylÃ¤tty"
 
-#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-calendar-view.c:2286
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-meeting-time-sel.c:390
 msgid "Tentative"
 msgstr "Alustava"
 
-#: ../calendar/gui/e-calendar-view.c:2257
+#: ../calendar/gui/e-calendar-view.c:2287
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../plugins/itip-formatter/itip-formatter.c:2201
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../plugins/itip-formatter/itip-formatter.c:2230
 msgid "Delegated"
 msgstr "Valtuutettu"
 
-#: ../calendar/gui/e-calendar-view.c:2258
+#: ../calendar/gui/e-calendar-view.c:2288
 msgid "Needs action"
 msgstr "Vaatii toimenpiteitÃ¤"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-view.c:2449 ../calendar/gui/print.c:2501
 #, c-format
 msgid "Location: %s"
 msgstr "Sijainti: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2453
+#: ../calendar/gui/e-calendar-view.c:2480
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aika: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:109
+#: ../calendar/gui/e-cell-date-edit-text.c:102
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:112
+#: ../calendar/gui/e-cell-date-edit-text.c:105
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I.%M.%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:120
+#: ../calendar/gui/e-cell-date-edit-text.c:113
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7811,12 +6546,12 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:750
+#: ../calendar/gui/e-day-view-time-item.c:747
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minuutin vÃ¤lein"
 
-#: ../calendar/gui/e-day-view-time-item.c:771
+#: ../calendar/gui/e-day-view-time-item.c:768
 msgid "Show the second time zone"
 msgstr "NÃ¤ytÃ¤ toinen aikavyÃ¶hyke"
 
@@ -7826,48 +6561,48 @@ msgstr "NÃ¤ytÃ¤ toinen aikavyÃ¶hyke"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1584
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
+#: ../calendar/gui/e-day-view-top-item.c:840 ../calendar/gui/e-day-view.c:1576
+#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1666
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
 #: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
-#: ../calendar/gui/print.c:828
+#: ../calendar/gui/print.c:825
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
-#: ../calendar/gui/print.c:830
+#: ../calendar/gui/print.c:827
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2322
+#: ../calendar/gui/e-day-view.c:2309
 #, c-format
 msgid "Week %d"
 msgstr "Viikko %d"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:758
 msgid "Yes. (Complex Recurrence)"
 msgstr "KyllÃ¤ (monimutkainen toistuvuus)"
 
-#: ../calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Joka pÃ¤ivÃ¤"
 msgstr[1] "Joka %d:s pÃ¤ivÃ¤"
 
-#: ../calendar/gui/e-itip-control.c:790
+#: ../calendar/gui/e-itip-control.c:788
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Joka kerta"
 msgstr[1] "Joka %d:s kerta"
 
-#: ../calendar/gui/e-itip-control.c:797
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7875,35 +6610,35 @@ msgstr[0] "Joka viikko "
 msgstr[1] "Joka %d:s viikko "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:806
 msgid " and "
 msgstr " ja "
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:815
 #, c-format
 msgid "The %s day of "
 msgstr "%s:s pÃ¤ivÃ¤"
 
-#: ../calendar/gui/e-itip-control.c:833
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s"
 
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:842
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "kerran kuussa"
 msgstr[1] "kerran %d:s kuu"
 
-#: ../calendar/gui/e-itip-control.c:856
+#: ../calendar/gui/e-itip-control.c:854
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Joka vuosi"
 msgstr[1] "Joka %d:s vuosi"
 
-#: ../calendar/gui/e-itip-control.c:869
+#: ../calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -7911,36 +6646,36 @@ msgstr[0] " kaikkiaan %d kerran"
 msgstr[1] " kaikkiaan %d kertaa"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:880
+#: ../calendar/gui/e-itip-control.c:878
 msgid ", ending on "
 msgstr ", pÃ¤Ã¤ttyen"
 
-#. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:902
+#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
+#: ../calendar/gui/e-itip-control.c:900
 msgid "Starts"
 msgstr "Alkaa"
 
-#. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:916
+#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
+#: ../calendar/gui/e-itip-control.c:914
 msgid "Ends"
 msgstr "PÃ¤Ã¤ttyy"
 
-#: ../calendar/gui/e-itip-control.c:956
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../calendar/gui/e-itip-control.c:954
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Due"
 msgstr "ErÃ¤Ã¤ntyy "
 
-#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:995 ../calendar/gui/e-itip-control.c:1052
 msgid "iCalendar Information"
 msgstr "iCalendarin tiedot"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1015
+#: ../calendar/gui/e-itip-control.c:1012
 msgid "iCalendar Error"
 msgstr "iCalendarin virhe"
 
-#: ../calendar/gui/e-itip-control.c:1087 ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.c:1114 ../calendar/gui/e-itip-control.c:1131
+#: ../calendar/gui/e-itip-control.c:1084 ../calendar/gui/e-itip-control.c:1100
+#: ../calendar/gui/e-itip-control.c:1111 ../calendar/gui/e-itip-control.c:1128
 #: ../plugins/itip-formatter/itip-view.c:346
 #: ../plugins/itip-formatter/itip-view.c:347
 #: ../plugins/itip-formatter/itip-view.c:434
@@ -7951,285 +6686,285 @@ msgid "An unknown person"
 msgstr "Tuntematon henkilÃ¶"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1138
+#: ../calendar/gui/e-itip-control.c:1135
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Tarkista seuraavat tiedot ja valitse toimenpide allaolevasta valikosta"
 
-#: ../calendar/gui/e-itip-control.c:1190
-#: ../plugins/itip-formatter/itip-formatter.c:2195
+#: ../calendar/gui/e-itip-control.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:2224
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyvÃ¤ksytty"
 
-#: ../calendar/gui/e-itip-control.c:1278
+#: ../calendar/gui/e-itip-control.c:1274
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "Kokous on peruttu, mutta sitÃ¤ ei lÃ¶ytynyt kalentereistasi"
 
-#: ../calendar/gui/e-itip-control.c:1280
+#: ../calendar/gui/e-itip-control.c:1276
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "TehtÃ¤vÃ¤ on peruttu, mutta sitÃ¤ ei lÃ¶ytynyt tehtÃ¤vÃ¤listoiltasi"
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1353
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> on julkaissut tapaamistietonsa."
 
-#: ../calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Meeting Information"
 msgstr "Kokouksen tiedot"
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1360
 #, 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:1367
+#: ../calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> pyytÃ¤Ã¤ lÃ¤snÃ¤oloasi kokouksessa."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1363
 msgid "Meeting Proposal"
 msgstr "Kokousehdotus"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> toivoo liittÃ¤mistÃ¤Ã¤n olemassaolevaan kokoukseen."
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Update"
 msgstr "Kokouksen pÃ¤ivitys"
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
 #, 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:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update Request"
 msgstr "Kokouksen pÃ¤ivityspyyntÃ¶"
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1382
 #, 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:1388
+#: ../calendar/gui/e-itip-control.c:1383
 msgid "Meeting Reply"
 msgstr "Vastaus kokouspyyntÃ¶Ã¶n"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> perui kokouksen."
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Cancelation"
 msgstr "Kokouksen peruminen"
 
-#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1401 ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> lÃ¤hetti jÃ¤rjettÃ¶mÃ¤n viestin."
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1402
 msgid "Bad Meeting Message"
 msgstr "Huono tapaaminen-sanoma"
 
-#: ../calendar/gui/e-itip-control.c:1434
+#: ../calendar/gui/e-itip-control.c:1429
 #, 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:1435
+#: ../calendar/gui/e-itip-control.c:1430
 msgid "Task Information"
 msgstr "TehtÃ¤vÃ¤n tiedot"
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1437
 #, 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:1444
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> pyytÃ¤Ã¤ sinua suorittamaan tehtÃ¤vÃ¤n."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Proposal"
 msgstr "TehtÃ¤vÃ¤ehdotus"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1446
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> toivoo lisÃ¤ystÃ¤Ã¤n olemassaolevaan tehtÃ¤vÃ¤Ã¤n."
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1447
 msgid "Task Update"
 msgstr "TehtÃ¤vÃ¤n pÃ¤ivitys"
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
 #, 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:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update Request"
 msgstr "TehtÃ¤vÃ¤n pÃ¤ivityspyyntÃ¶"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1459
 #, 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:1465
+#: ../calendar/gui/e-itip-control.c:1460
 msgid "Task Reply"
 msgstr "Vastaus tehtÃ¤vÃ¤Ã¤n"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> perui tehtÃ¤vÃ¤n."
 
-#: ../calendar/gui/e-itip-control.c:1473
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Cancelation"
 msgstr "TehtÃ¤vÃ¤n peruminen"
 
-#: ../calendar/gui/e-itip-control.c:1484
+#: ../calendar/gui/e-itip-control.c:1479
 msgid "Bad Task Message"
 msgstr "Huono tehtÃ¤vÃ¤-sanoma"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1503
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> on julkaissut vapaa/varattu-tietonsa."
 
-#: ../calendar/gui/e-itip-control.c:1509
+#: ../calendar/gui/e-itip-control.c:1504
 msgid "Free/Busy Information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, 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:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Request"
 msgstr "Vapaa/varattu-tiedustelu"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1513
 #, 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:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Reply"
 msgstr "Vapaa/varattu-vastaus"
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Bad Free/Busy Message"
 msgstr "Huono vapaa/kiireinen -viesti"
 
-#: ../calendar/gui/e-itip-control.c:1600
+#: ../calendar/gui/e-itip-control.c:1595
 msgid "The message does not appear to be properly formed"
 msgstr "Viesti ei nÃ¤ytÃ¤ olevan kunnolla muotoiltu."
 
-#: ../calendar/gui/e-itip-control.c:1659
+#: ../calendar/gui/e-itip-control.c:1654
 msgid "The message contains only unsupported requests."
 msgstr "Viesti sisÃ¤ltÃ¤Ã¤ vain pyyntÃ¶jÃ¤, jotka eivÃ¤t ole tuettu."
 
-#: ../calendar/gui/e-itip-control.c:1692
+#: ../calendar/gui/e-itip-control.c:1687
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Liite ei sisÃ¤llÃ¤ kelvollista kalenteriviestiÃ¤"
 
-#: ../calendar/gui/e-itip-control.c:1730
+#: ../calendar/gui/e-itip-control.c:1725
 msgid "The attachment has no viewable calendar items"
 msgstr "LiitteessÃ¤ ei ole nÃ¤ytettÃ¤viÃ¤ kalenteriviestejÃ¤"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1967
 msgid "Update complete\n"
 msgstr "PÃ¤ivitys valmis\n"
 
-#: ../calendar/gui/e-itip-control.c:2009
+#: ../calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Kohde on virheellinen eikÃ¤ sitÃ¤ voi pÃ¤ivittÃ¤Ã¤\n"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2018
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Vastaus ei ole tÃ¤mÃ¤nhetkiseltÃ¤ lÃ¤snÃ¤olijalta. LisÃ¤Ã¤ lÃ¤snÃ¤olijaksi?"
 
-#: ../calendar/gui/e-itip-control.c:2044
+#: ../calendar/gui/e-itip-control.c:2036
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "LÃ¤snÃ¤olon tilaa ei voi pÃ¤ivittÃ¤Ã¤ virheellisen tilan takia!\n"
 
-#: ../calendar/gui/e-itip-control.c:2068
+#: ../calendar/gui/e-itip-control.c:2060
 msgid "Attendee status updated\n"
 msgstr "LÃ¤snÃ¤olon tila pÃ¤ivitetty\n"
 
-#: ../calendar/gui/e-itip-control.c:2075
-#: ../plugins/itip-formatter/itip-formatter.c:1379
+#: ../calendar/gui/e-itip-control.c:2067
+#: ../plugins/itip-formatter/itip-formatter.c:1385
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "LÃ¤snÃ¤olon tilaa ei voi pÃ¤ivittÃ¤Ã¤, koska kohdetta ei enÃ¤Ã¤ ole olemassa"
 
-#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2098 ../calendar/gui/e-itip-control.c:2155
 msgid "Item sent!\n"
 msgstr "LÃ¤hetetty\n"
 
-#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
+#: ../calendar/gui/e-itip-control.c:2104 ../calendar/gui/e-itip-control.c:2163
 msgid "The item could not be sent!\n"
 msgstr "Kohdetta ei voi lÃ¤hettÃ¤Ã¤!\n"
 
-#: ../calendar/gui/e-itip-control.c:2251
+#: ../calendar/gui/e-itip-control.c:2281
 msgid "Choose an action:"
 msgstr "Valitse toiminto:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2280
-#: ../calendar/gui/e-meeting-list-view.c:590
+#: ../calendar/gui/e-itip-control.c:2310
+#: ../calendar/gui/e-meeting-list-view.c:589
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "KuittauspyyntÃ¶"
 
-#: ../calendar/gui/e-itip-control.c:2322
+#: ../calendar/gui/e-itip-control.c:2350
 msgid "Update"
 msgstr "PÃ¤ivitÃ¤"
 
-#: ../calendar/gui/e-itip-control.c:2350
-#: ../plugins/groupwise-features/process-meeting.c:51
+#: ../calendar/gui/e-itip-control.c:2374
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept"
 msgstr "HyvÃ¤ksy"
 
-#: ../calendar/gui/e-itip-control.c:2351
+#: ../calendar/gui/e-itip-control.c:2375
 msgid "Tentatively accept"
 msgstr "HyvÃ¤ksy alustavasti"
 
-#: ../calendar/gui/e-itip-control.c:2352
-#: ../plugins/groupwise-features/process-meeting.c:53
+#: ../calendar/gui/e-itip-control.c:2376
+#: ../plugins/groupwise-features/process-meeting.c:54
 msgid "Decline"
 msgstr "HylkÃ¤Ã¤"
 
-#: ../calendar/gui/e-itip-control.c:2381
+#: ../calendar/gui/e-itip-control.c:2401
 msgid "Send Free/Busy Information"
 msgstr "LÃ¤hetÃ¤ vapaa/varattu-tiedot"
 
-#: ../calendar/gui/e-itip-control.c:2409
+#: ../calendar/gui/e-itip-control.c:2425
 msgid "Update respondent status"
 msgstr "PÃ¤ivitÃ¤ vastaajan tila"
 
-#: ../calendar/gui/e-itip-control.c:2437
+#: ../calendar/gui/e-itip-control.c:2449
 msgid "Send Latest Information"
 msgstr "LÃ¤hetÃ¤ viimeisimmÃ¤t tiedot"
 
-#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2473 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -8253,6 +6988,10 @@ msgstr "Ladataan kalenteria"
 msgid "Loading calendar..."
 msgstr "Ladataan kalenteria..."
 
+#: ../calendar/gui/e-itip-control.glade.h:7
+msgid "Organizer:"
+msgstr "JÃ¤rjestÃ¤jÃ¤:"
+
 #: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "Palvelinviesti:"
@@ -8273,77 +7012,73 @@ msgstr "Vapaaehtoiset lÃ¤snÃ¤olijat"
 msgid "Resources"
 msgstr "Resurssit"
 
-#: ../calendar/gui/e-meeting-list-view.c:151
-msgid "Attendees"
-msgstr "Osanottajat"
-
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
-#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
+#: ../calendar/gui/e-meeting-store.c:84 ../calendar/gui/e-meeting-store.c:101
+#: ../calendar/gui/e-meeting-store.c:736 ../calendar/gui/print.c:974
 msgid "Individual"
 msgstr "HenkilÃ¶"
 
 #: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/print.c:975 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "RyhmÃ¤"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:976
 msgid "Resource"
 msgstr "Resurssi"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:977
 msgid "Room"
 msgstr "Huone"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:997
+#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/print.c:991
 msgid "Chair"
 msgstr "Puheenjohtaja"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:992
 msgid "Required Participant"
 msgstr "Vaadittu lÃ¤snÃ¤olija"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/print.c:993
 msgid "Optional Participant"
 msgstr "Vapaaehtoinen lÃ¤snÃ¤olija"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:994
 msgid "Non-Participant"
 msgstr "Ei lÃ¤snÃ¤"
 
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
-#: ../calendar/gui/e-meeting-store.c:752
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:749
 msgid "Needs Action"
 msgstr "Vaatii toimenpiteitÃ¤"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:544
 msgid "Attendee                          "
 msgstr "Osallistuja                       "
 
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
 msgid "In Process"
 msgstr "TyÃ¶n alla"
 
 #. 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:467
-#: ../calendar/gui/e-meeting-time-sel.c:2124
+#: ../calendar/gui/e-meeting-time-sel-item.c:458
+#: ../calendar/gui/e-meeting-time-sel.c:2083
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -8351,78 +7086,78 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. 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:471
-#: ../calendar/gui/e-meeting-time-sel.c:2155
+#: ../calendar/gui/e-meeting-time-sel-item.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:2114
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:475
+#: ../calendar/gui/e-meeting-time-sel-item.c:466
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "Poissa konttorilta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:401
+#: ../calendar/gui/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "Ei tietoa"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416
+#: ../calendar/gui/e-meeting-time-sel.c:408
 msgid "A_ttendees..."
 msgstr "_Osanottajat..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:437
+#: ../calendar/gui/e-meeting-time-sel.c:429
 msgid "O_ptions"
 msgstr "_Asetukset"
 
-#: ../calendar/gui/e-meeting-time-sel.c:454
+#: ../calendar/gui/e-meeting-time-sel.c:446
 msgid "Show _only working hours"
 msgstr "NÃ¤ytÃ¤ vain _tyÃ¶tunnit"
 
-#: ../calendar/gui/e-meeting-time-sel.c:464
+#: ../calendar/gui/e-meeting-time-sel.c:456
 msgid "Show _zoomed out"
 msgstr "NÃ¤ytÃ¤ _etÃ¤Ã¤npÃ¤Ã¤"
 
-#: ../calendar/gui/e-meeting-time-sel.c:479
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "_Update free/busy"
 msgstr "_PÃ¤ivitÃ¤ vapaa/varattu"
 
-#: ../calendar/gui/e-meeting-time-sel.c:494
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:512
+#: ../calendar/gui/e-meeting-time-sel.c:504
 msgid "_Autopick"
 msgstr "_Automaattinen valinta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:536
 msgid "_All people and resources"
 msgstr "_Kaikki henkilÃ¶t ja resurssit"
 
-#: ../calendar/gui/e-meeting-time-sel.c:553
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "All _people and one resource"
 msgstr "Kaikki _henkilÃ¶t ja yksi resurssi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:554
 msgid "_Required people"
 msgstr "_Vaaditut henkilÃ¶t"
 
-#: ../calendar/gui/e-meeting-time-sel.c:571
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Required people and _one resource"
 msgstr "Vaaditut henkilÃ¶t ja _yksi resurssi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:607
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:626
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
@@ -8450,182 +7185,162 @@ msgstr "Kieli"
 msgid "Member"
 msgstr "JÃ¤sen"
 
-#: ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-memo-table.c:950
 msgid "_Delete Selected Memos"
 msgstr "_Poista valitut muistilaput"
 
-#: ../calendar/gui/e-memo-table.c:1091 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1099 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "LisÃ¤Ã¤ muistilappu tÃ¤stÃ¤"
 
-#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/e-memos.c:754 ../calendar/gui/e-tasks.c:902
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
-"Virhe %s:ssÃ¤:\n"
+"Virhe kohteessa %s:\n"
 "%s"
 
-#: ../calendar/gui/e-memos.c:812
+#: ../calendar/gui/e-memos.c:806
 msgid "Loading memos"
 msgstr "Ladataan muistilappuja"
 
-#: ../calendar/gui/e-memos.c:903
+#: ../calendar/gui/e-memos.c:897
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Avataan muistilappuja sijainnista %s"
 
-#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/e-memos.c:1066 ../calendar/gui/e-tasks.c:1318
 msgid "Deleting selected objects..."
-msgstr "Valtuutetaan seuraavat tehtÃ¤vÃ¤t...."
+msgstr "Poistetaan valitut kohteet..."
 
-#: ../calendar/gui/e-tasks.c:963
+#: ../calendar/gui/e-tasks.c:955
 msgid "Loading tasks"
 msgstr "Ladataan tehtÃ¤viÃ¤"
 
-#: ../calendar/gui/e-tasks.c:1061
+#: ../calendar/gui/e-tasks.c:1052
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avataan tehtÃ¤vÃ¤t %s"
 
-#: ../calendar/gui/e-tasks.c:1306
+#: ../calendar/gui/e-tasks.c:1295
 msgid "Completing tasks..."
 msgstr "ViimeistellÃ¤Ã¤n tehtÃ¤viÃ¤..."
 
-#: ../calendar/gui/e-tasks.c:1356
+#: ../calendar/gui/e-tasks.c:1345
 msgid "Expunging"
 msgstr "Poistetaan poistettuja"
 
-#: ../calendar/gui/e-timezone-entry.c:127
+#: ../calendar/gui/e-timezone-entry.c:124
 msgid "Select Timezone"
 msgstr "Valitse aikavyÃ¶hyke"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1659
+#: ../calendar/gui/e-week-view-main-item.c:376 ../calendar/gui/print.c:1647
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2637
+#: ../calendar/gui/gnome-cal.c:2673
 msgid "_Custom View"
 msgstr "_Oma nÃ¤kymÃ¤"
 
-#: ../calendar/gui/gnome-cal.c:2638
+#: ../calendar/gui/gnome-cal.c:2674
 msgid "_Save Custom View"
 msgstr "_Tallenna oma nÃ¤kymÃ¤"
 
-#: ../calendar/gui/gnome-cal.c:2643
+#: ../calendar/gui/gnome-cal.c:2679
 msgid "_Define Views..."
 msgstr "_MÃ¤Ã¤rittele nÃ¤kymÃ¤t..."
 
-#: ../calendar/gui/gnome-cal.c:2880
+#: ../calendar/gui/gnome-cal.c:2916
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Ladataan tapaamisia %s"
 
-#: ../calendar/gui/gnome-cal.c:2895
+#: ../calendar/gui/gnome-cal.c:2931
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Ladataan tehtÃ¤viÃ¤ %s"
 
-#: ../calendar/gui/gnome-cal.c:2904
+#: ../calendar/gui/gnome-cal.c:2940
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Ladataan muistilappuja lÃ¤hteestÃ¤ %s"
 
-#: ../calendar/gui/gnome-cal.c:3016
+#: ../calendar/gui/gnome-cal.c:3052
 #, c-format
 msgid "Opening %s"
 msgstr "Avataan %s"
 
-#: ../calendar/gui/gnome-cal.c:3984
+#: ../calendar/gui/gnome-cal.c:4018
 msgid "Purging"
 msgstr "TyhjennetÃ¤Ã¤n"
 
 #: ../calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "Huhtikuu"
-
-#: ../calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "Elokuu"
-
-#: ../calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "Joulukuu"
-
-#: ../calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "Helmikuu"
-
-#: ../calendar/gui/goto-dialog.glade.h:5
-msgid "January"
-msgstr "Tammikuu"
-
-#: ../calendar/gui/goto-dialog.glade.h:6
-msgid "July"
-msgstr "HeinÃ¤kuu"
-
-#: ../calendar/gui/goto-dialog.glade.h:7
-msgid "June"
-msgstr "KesÃ¤kuu"
-
-#: ../calendar/gui/goto-dialog.glade.h:8
-msgid "March"
-msgstr "Maaliskuu"
-
-#: ../calendar/gui/goto-dialog.glade.h:9
-msgid "May"
-msgstr "Toukokuu"
-
-#: ../calendar/gui/goto-dialog.glade.h:10
-msgid "November"
-msgstr "Marraskuu"
-
-#: ../calendar/gui/goto-dialog.glade.h:11
-msgid "October"
-msgstr "Lokakuu"
+msgid ""
+"January\n"
+"February\n"
+"March\n"
+"April\n"
+"May\n"
+"June\n"
+"July\n"
+"August\n"
+"September\n"
+"October\n"
+"November\n"
+"December"
+msgstr ""
+"Tammikuu\n"
+"Helmikuu\n"
+"Maaliskuu\n"
+"Huhtikuu\n"
+"Toukokuu\n"
+"KesÃ¤kuu\n"
+"HeinÃ¤kuu\n"
+"Elokuu\n"
+"Syyskuu\n"
+"Lokakuu\n"
+"Marraskuu\n"
+"Joulukuu"
 
-#: ../calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "Select Date"
 msgstr "Valitse pÃ¤ivÃ¤mÃ¤Ã¤rÃ¤"
 
-#: ../calendar/gui/goto-dialog.glade.h:13
-msgid "September"
-msgstr "Syyskuu"
-
 #: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "_Valitse tÃ¤mÃ¤ pÃ¤ivÃ¤"
 
-#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:553
 msgid "An organizer must be set."
 msgstr "JÃ¤rjestÃ¤jÃ¤ tulee asettaa."
 
-#: ../calendar/gui/itip-utils.c:454
+#: ../calendar/gui/itip-utils.c:453
 msgid "At least one attendee is necessary"
 msgstr "VÃ¤hintÃ¤Ã¤n yksi lÃ¤snÃ¤olija on vÃ¤lttÃ¤mÃ¤tÃ¶n."
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:781
 msgid "Event information"
 msgstr "Tapahtuman tiedot"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:784
 msgid "Task information"
 msgstr "TehtÃ¤vÃ¤n tiedot"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:787
 msgid "Memo information"
 msgstr "Muistilapun tiedot"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:805
 msgid "Free/Busy information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: ../calendar/gui/itip-utils.c:640
+#: ../calendar/gui/itip-utils.c:643
 msgid "Calendar information"
 msgstr "Kalenteritiedot"
 
@@ -8633,7 +7348,7 @@ msgstr "Kalenteritiedot"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:674
+#: ../calendar/gui/itip-utils.c:677
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "HyvÃ¤ksytty"
@@ -8642,7 +7357,7 @@ msgstr "HyvÃ¤ksytty"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:681
+#: ../calendar/gui/itip-utils.c:684
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyvÃ¤ksytty"
@@ -8654,7 +7369,7 @@ msgstr "Alustavasti hyvÃ¤ksytty"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:688 ../calendar/gui/itip-utils.c:736
+#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:739
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "HylÃ¤tty"
@@ -8663,7 +7378,7 @@ msgstr "HylÃ¤tty"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:695
+#: ../calendar/gui/itip-utils.c:698
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Valtuutettu"
@@ -8671,7 +7386,7 @@ msgstr "Valtuutettu"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:708
+#: ../calendar/gui/itip-utils.c:711
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "PÃ¤ivitetty"
@@ -8679,7 +7394,7 @@ msgstr "PÃ¤ivitetty"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:715
+#: ../calendar/gui/itip-utils.c:718
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Peru"
@@ -8687,7 +7402,7 @@ msgstr "Peru"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:722
+#: ../calendar/gui/itip-utils.c:725
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "PÃ¤ivitÃ¤"
@@ -8695,101 +7410,101 @@ msgstr "PÃ¤ivitÃ¤"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:729
+#: ../calendar/gui/itip-utils.c:732
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Vastaehdotus"
 
-#: ../calendar/gui/itip-utils.c:799
+#: ../calendar/gui/itip-utils.c:802
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vapaa/varattu-tiedot (%s - %s)"
 
-#: ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:810
 msgid "iCalendar information"
 msgstr "iCalendarin tiedot"
 
-#: ../calendar/gui/itip-utils.c:978
+#: ../calendar/gui/itip-utils.c:981
 msgid "You must be an attendee of the event."
 msgstr "Sinun tÃ¤ytyy osallistua tapahtumaan."
 
-#: ../calendar/gui/memos-component.c:507
+#: ../calendar/gui/memos-component.c:477
 msgid "_New Memo List"
 msgstr "_Uusi muistilappulista"
 
-#: ../calendar/gui/memos-component.c:590
+#: ../calendar/gui/memos-component.c:560
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d muistilappu"
 msgstr[1] "%d muistilappua"
 
-#: ../calendar/gui/memos-component.c:592 ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/memos-component.c:562 ../calendar/gui/tasks-component.c:555
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d valittu"
 msgstr[1] ", %d valittua"
 
-#: ../calendar/gui/memos-component.c:639
+#: ../calendar/gui/memos-component.c:609
 msgid "Failed upgrading memos."
 msgstr "Muistilappujen pÃ¤ivitys epÃ¤onnistui."
 
-#: ../calendar/gui/memos-component.c:769
+#: ../calendar/gui/memos-component.c:739
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "Muistilappulistaa '%s' ei voi avata uusien tapahtumien ja kokousten "
 "lisÃ¤Ã¤mistÃ¤ varten"
 
-#: ../calendar/gui/memos-component.c:782
+#: ../calendar/gui/memos-component.c:752
 msgid "There is no calendar available for creating memos"
 msgstr "Muistilappujen luomiseen tarvittavaa kalenteria ei ole saatavilla"
 
-#: ../calendar/gui/memos-component.c:892
+#: ../calendar/gui/memos-component.c:862
 msgid "Memo Source Selector"
-msgstr "Muistilappujen lÃ¤hteen valinta"
+msgstr "MuistilappulÃ¤hteen lÃ¤hdevalinta"
 
-#: ../calendar/gui/memos-component.c:1071
+#: ../calendar/gui/memos-component.c:1041
 msgid "New memo"
 msgstr "Uusi muistilappu"
 
-#: ../calendar/gui/memos-component.c:1072
+#: ../calendar/gui/memos-component.c:1042
 msgctxt "New"
 msgid "Mem_o"
 msgstr "_Muistilappu"
 
-#: ../calendar/gui/memos-component.c:1073
+#: ../calendar/gui/memos-component.c:1043
 msgid "Create a new memo"
 msgstr "Luo uusi muistilappu"
 
-#: ../calendar/gui/memos-component.c:1079
+#: ../calendar/gui/memos-component.c:1049
 msgid "New shared memo"
 msgstr "Uusi jaettu muistilappu"
 
-#: ../calendar/gui/memos-component.c:1080
+#: ../calendar/gui/memos-component.c:1050
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "_Jaettu muistilappu"
 
-#: ../calendar/gui/memos-component.c:1081
+#: ../calendar/gui/memos-component.c:1051
 msgid "Create a shared new memo"
 msgstr "Luo uusi jaettu muistilappu"
 
-#: ../calendar/gui/memos-component.c:1087
+#: ../calendar/gui/memos-component.c:1057
 msgid "New memo list"
 msgstr "Uusi muistilappulista"
 
-#: ../calendar/gui/memos-component.c:1088
+#: ../calendar/gui/memos-component.c:1058
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "Muistilappu_lista"
 
-#: ../calendar/gui/memos-component.c:1089
+#: ../calendar/gui/memos-component.c:1059
 msgid "Create a new memo list"
 msgstr "Luo uusi muistilappulista"
 
-#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
+#: ../calendar/gui/memos-control.c:386 ../calendar/gui/memos-control.c:402
 msgid "Print Memos"
 msgstr "Tulosta muistilaput"
 
@@ -8818,300 +7533,292 @@ msgstr ""
 "Odota kÃ¤rsivÃ¤llisesti, kun Evolution konvertoi kansioitasi..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
+#: ../calendar/gui/migration.c:774 ../calendar/gui/migration.c:942
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 "Vanhojen asetusten siirto ei onnistunut tiedostosta evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:804
+#: ../calendar/gui/migration.c:803
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Kalenterin '%s' muunnos epÃ¤onnistui"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:972
+#: ../calendar/gui/migration.c:971
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "TehtÃ¤vien '%s' muunnos epÃ¤onnistui"
 
-#: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
-msgid "Notes"
-msgstr "Muistilaput"
-
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "31st"
 msgstr "31."
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Su"
 msgstr "Su"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "Ma"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "Ti"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "Ke"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "To"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "Pe"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "La"
 
-#: ../calendar/gui/print.c:2481
+#: ../calendar/gui/print.c:2465
 msgid "Appointment"
 msgstr "Tapaaminen"
 
-#: ../calendar/gui/print.c:2483
+#: ../calendar/gui/print.c:2467
 msgid "Task"
 msgstr "TehtÃ¤vÃ¤"
 
-#: ../calendar/gui/print.c:2508
+#: ../calendar/gui/print.c:2492
 #, c-format
 msgid "Summary: %s"
 msgstr "Yhteenveto: %s"
 
-#: ../calendar/gui/print.c:2531
+#: ../calendar/gui/print.c:2515
 msgid "Attendees: "
 msgstr "Osanottajat:"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2555
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: ../calendar/gui/print.c:2588
+#: ../calendar/gui/print.c:2569
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteetti: %s"
 
-#: ../calendar/gui/print.c:2600
+#: ../calendar/gui/print.c:2584
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %i"
 
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2595
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2625
+#: ../calendar/gui/print.c:2608
 #, c-format
 msgid "Categories: %s"
 msgstr "RyhmÃ¤t: %s"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2619
 msgid "Contacts: "
 msgstr "Yhteystiedot: "
 
-#: ../calendar/gui/tasks-component.c:499
+#: ../calendar/gui/tasks-component.c:470
 msgid "_New Task List"
 msgstr "_Uusi tehtÃ¤vÃ¤lista"
 
-#: ../calendar/gui/tasks-component.c:582
+#: ../calendar/gui/tasks-component.c:553
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tehtÃ¤vÃ¤"
 msgstr[1] "%d tehtÃ¤vÃ¤Ã¤"
 
-#: ../calendar/gui/tasks-component.c:631
+#: ../calendar/gui/tasks-component.c:602
 msgid "Failed upgrading tasks."
 msgstr "TehtÃ¤vÃ¤listan pÃ¤ivitys epÃ¤onnistui."
 
-#: ../calendar/gui/tasks-component.c:764
+#: ../calendar/gui/tasks-component.c:735
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "TehtÃ¤vÃ¤listaa '%s' ei voi avata uusien tehtÃ¤vien ja tapaamisten tekemistÃ¤ "
 "varten"
 
-#: ../calendar/gui/tasks-component.c:777
+#: ../calendar/gui/tasks-component.c:748
 msgid "There is no calendar available for creating tasks"
 msgstr "TehtÃ¤vien luomiseen tarvittavaa kalenteria ei ole saatavilla"
 
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:859
 msgid "Task Source Selector"
-msgstr "TehtÃ¤vien lÃ¤hteen valinta"
+msgstr "YhteystietolÃ¤hteiden valinta"
 
-#: ../calendar/gui/tasks-component.c:1142
+#: ../calendar/gui/tasks-component.c:1113
 msgid "New task"
 msgstr "Uusi tehtÃ¤vÃ¤"
 
-#: ../calendar/gui/tasks-component.c:1143
+#: ../calendar/gui/tasks-component.c:1114
 msgctxt "New"
 msgid "_Task"
 msgstr "_TehtÃ¤vÃ¤"
 
-#: ../calendar/gui/tasks-component.c:1144
+#: ../calendar/gui/tasks-component.c:1115
 msgid "Create a new task"
 msgstr "Luo uusi tehtÃ¤vÃ¤"
 
-#: ../calendar/gui/tasks-component.c:1150
+#: ../calendar/gui/tasks-component.c:1121
 msgid "New assigned task"
 msgstr "Uusi tehtÃ¤vÃ¤ksianto"
 
-#: ../calendar/gui/tasks-component.c:1151
+#: ../calendar/gui/tasks-component.c:1122
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "TehtÃ¤vÃ¤ksi_anto"
 
-#: ../calendar/gui/tasks-component.c:1152
+#: ../calendar/gui/tasks-component.c:1123
 msgid "Create a new assigned task"
 msgstr "Luo uusi tehtÃ¤vÃ¤ksianto"
 
-#: ../calendar/gui/tasks-component.c:1158
+#: ../calendar/gui/tasks-component.c:1129
 msgid "New task list"
 msgstr "Uusi tehtÃ¤vÃ¤lista"
 
-#: ../calendar/gui/tasks-component.c:1159
+#: ../calendar/gui/tasks-component.c:1130
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "_TehtÃ¤vÃ¤lista"
 
-#: ../calendar/gui/tasks-component.c:1160
+#: ../calendar/gui/tasks-component.c:1131
 msgid "Create a new task list"
 msgstr "Luo uusi tehtÃ¤vÃ¤lista"
 
-#: ../calendar/gui/tasks-control.c:442
+#: ../calendar/gui/tasks-control.c:484
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -9123,11 +7830,11 @@ msgstr ""
 "\n"
 "Valmis poistaa nÃ¤mÃ¤ tehtÃ¤vÃ¤t?"
 
-#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1128
+#: ../calendar/gui/tasks-control.c:487 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
-msgstr "Ã?lÃ¤ kysy enÃ¤Ã¤ uudestaan"
+msgstr "Ã?lÃ¤ kysy uudestaan."
 
-#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 msgid "Print Tasks"
 msgstr "Tulosta tehtÃ¤vÃ¤t"
 
@@ -9144,11 +7851,11 @@ msgstr "Peruttu"
 msgid "In progress"
 msgstr "Kesken"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "on suurempi kuin"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "on vÃ¤hemmÃ¤n kuin"
 
@@ -9156,37 +7863,37 @@ msgstr "on vÃ¤hemmÃ¤n kuin"
 msgid "Appointments and Meetings"
 msgstr "Tapaamiset ja kokoukset"
 
-#: ../calendar/importers/icalendar-importer.c:333
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1723
+#: ../calendar/importers/icalendar-importer.c:335
+#: ../calendar/importers/icalendar-importer.c:630
+#: ../plugins/itip-formatter/itip-formatter.c:1728
 msgid "Opening calendar"
 msgstr "Avataan kalenteria"
 
-#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:442
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar tiedostot (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:441
+#: ../calendar/importers/icalendar-importer.c:443
 msgid "Evolution iCalendar importer"
 msgstr "Evolutionin iCalendar-tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:529
+#: ../calendar/importers/icalendar-importer.c:531
 msgid "Reminder!"
 msgstr "Muistutus!"
 
-#: ../calendar/importers/icalendar-importer.c:581
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar tiedostot (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution vCalendar importer"
 msgstr "Evolutionin vCalendar-tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:746
 msgid "Calendar Events"
 msgstr "Kalenteritapahtumat"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:783
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution kalenterin Ã¤lykÃ¤s tuoja"
 
@@ -10739,217 +9446,190 @@ msgstr "Tyyni_Valtameri/Wallis"
 msgid "Pacific/Yap"
 msgstr "Tyyni_Valtameri/Yap"
 
-#: ../composer/e-composer-autosave.c:273
-msgid "Could not open autosave file"
-msgstr "Automaattitallennuksen tiedostoa ei voi avata"
-
-#: ../composer/e-composer-autosave.c:280
+#: ../composer/e-composer-autosave.c:445
 msgid "Unable to retrieve message from editor"
 msgstr "ViestiÃ¤ ei voi hakea muokkaimelta"
 
-#: ../composer/e-composer-actions.c:45
-msgid "Insert Attachment"
-msgstr "LisÃ¤Ã¤ liite"
-
-#: ../composer/e-composer-actions.c:49
-msgid "A_ttach"
-msgstr "Lii_tÃ¤"
-
-#: ../composer/e-composer-actions.c:140
+#: ../composer/e-composer-actions.c:84
 msgid "Untitled Message"
 msgstr "NimeÃ¤mÃ¤tÃ¶n viesti"
 
-#: ../composer/e-composer-actions.c:471
+#: ../composer/e-composer-actions.c:317
+#: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "LiitÃ¤ tiedosto viestiin"
 
-#: ../composer/e-composer-actions.c:476 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:322 ../mail/mail-signature-editor.c:195
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_Sulje"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:324
 msgid "Close the current file"
 msgstr "Sulje nykyinen tiedosto"
 
-#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1339
+#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1337
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "T_ulosta..."
 
-#: ../composer/e-composer-actions.c:490 ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../composer/e-composer-actions.c:336 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:72
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Tulostuksen esikatselu"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:345
 msgid "Save the current file"
 msgstr "Tallenna nykyinen tiedosto"
 
-#: ../composer/e-composer-actions.c:504
+#: ../composer/e-composer-actions.c:350
 msgid "Save _As..."
 msgstr "Tallenna _nimellÃ¤..."
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:352
 msgid "Save the current file with a different name"
 msgstr "Tallenna tiedosto uudella nimellÃ¤"
 
-#: ../composer/e-composer-actions.c:511
+#: ../composer/e-composer-actions.c:357
 msgid "Save as _Draft"
 msgstr "Tallenna luonnoksena"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:359
 msgid "Save as draft"
 msgstr "Tallenna luonnoksena"
 
-#: ../composer/e-composer-actions.c:518
+#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:191
 msgid "S_end"
 msgstr "_LÃ¤hetÃ¤"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:366
 msgid "Send this message"
 msgstr "LÃ¤hetÃ¤ viesti heti"
 
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:373
 msgid "Insert Send options"
 msgstr "LisÃ¤Ã¤ lÃ¤hetysvaihtoehtoja"
 
-#: ../composer/e-composer-actions.c:532
+#: ../composer/e-composer-actions.c:378
 msgid "New _Message"
 msgstr "Uusi _viesti"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:380
 msgid "Open New Message window"
 msgstr "Avaa uuden viestin luonti-ikkuna"
 
-#: ../composer/e-composer-actions.c:541
+#: ../composer/e-composer-actions.c:387
 msgid "Character _Encoding"
 msgstr "M_erkistÃ¶n koodaus"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:394
 msgid "_Security"
 msgstr "Turvalli_suus"
 
-#: ../composer/e-composer-actions.c:558
+#: ../composer/e-composer-actions.c:404
 msgid "PGP _Encrypt"
 msgstr "PGP-_salaus"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:406
 msgid "Encrypt this message with PGP"
 msgstr "Salaa tÃ¤mÃ¤ viesti PGP:llÃ¤"
 
-#: ../composer/e-composer-actions.c:566
+#: ../composer/e-composer-actions.c:412
 msgid "PGP _Sign"
 msgstr "PGP-_allekirjoitus"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:414
 msgid "Sign this message with your PGP key"
 msgstr "Allekirjoita viesti PGP-avaimellasi"
 
-#: ../composer/e-composer-actions.c:574
+#: ../composer/e-composer-actions.c:420
 msgid "_Prioritize Message"
 msgstr "_Aseta viestin prioriteetti"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:422
 msgid "Set the message priority to high"
 msgstr "Aseta viestille korkea prioriteetti"
 
-#: ../composer/e-composer-actions.c:582
+#: ../composer/e-composer-actions.c:428
 msgid "Re_quest Read Receipt"
 msgstr "PyydÃ¤ luku_kuittausta"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:430
 msgid "Get delivery notification when your message is read"
 msgstr "PyydÃ¤ lÃ¤hettÃ¤mÃ¤Ã¤n kuittaus, kun viestisi on luettu"
 
-#: ../composer/e-composer-actions.c:590
+#: ../composer/e-composer-actions.c:436
 msgid "S/MIME En_crypt"
 msgstr "S/_MIME-salaus"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:438
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Salaa viesti S/MIME salausvarmenteellasi"
 
-#: ../composer/e-composer-actions.c:598
+#: ../composer/e-composer-actions.c:444
 msgid "S/MIME Sig_n"
 msgstr "S/MIME-a_llekirjoitus"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:446
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Allekirjoita tÃ¤mÃ¤ viesti S/MIME allekirjoitusvarmenteellasi"
 
-#: ../composer/e-composer-actions.c:606
+#: ../composer/e-composer-actions.c:452
 msgid "_Bcc Field"
 msgstr "_BCC-kenttÃ¤"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:454
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Vaihtelee nÃ¤ytetÃ¤Ã¤nkÃ¶ BCC-kenttÃ¤"
 
-#: ../composer/e-composer-actions.c:614
+#: ../composer/e-composer-actions.c:460
 msgid "_Cc Field"
 msgstr "_Kopio-kenttÃ¤"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:462
 msgid "Toggles whether the CC field is displayed"
 msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ Kopio-kenttÃ¤ (CC)."
 
-#: ../composer/e-composer-actions.c:622
+#: ../composer/e-composer-actions.c:468
 msgid "_From Field"
 msgstr "_LÃ¤hettÃ¤jÃ¤-kenttÃ¤"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:470
 msgid "Toggles whether the From chooser is displayed"
 msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ LÃ¤hettÃ¤jÃ¤-kenttÃ¤"
 
-#: ../composer/e-composer-actions.c:630
-msgid "_Post-To Field"
-msgstr "_Postitusosoite-kenttÃ¤ (Post-To)"
-
-#: ../composer/e-composer-actions.c:632
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ Postitusosoite-kenttÃ¤"
-
-#: ../composer/e-composer-actions.c:638
+#: ../composer/e-composer-actions.c:476
 msgid "_Reply-To Field"
 msgstr "_Vastausosoite-kenttÃ¤"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:478
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ Vastausosoite-kenttÃ¤"
 
-#: ../composer/e-composer-actions.c:646
-msgid "_Subject Field"
-msgstr "Ot_sikko-kenttÃ¤"
-
-#: ../composer/e-composer-actions.c:648
-msgid "Toggles whether the Subject field is displayed"
-msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ otsikkokenttÃ¤"
-
-#: ../composer/e-composer-actions.c:654
-msgid "_To Field"
-msgstr "_Vastaanottaja-kenttÃ¤"
-
-#: ../composer/e-composer-actions.c:656
-msgid "Toggles whether the To field is displayed"
-msgstr "MÃ¤Ã¤rittÃ¤Ã¤ nÃ¤ytetÃ¤Ã¤nkÃ¶ Vastaanottaja-kenttÃ¤"
-
-#: ../composer/e-composer-actions.c:699
+#: ../composer/e-composer-actions.c:521
 msgid "Save Draft"
 msgstr "Tallenna luonnos"
 
-#: ../composer/e-composer-header-table.c:64
+#: ../composer/e-composer-header.c:120
+msgid "Show"
+msgstr "NÃ¤ytÃ¤"
+
+#: ../composer/e-composer-header.c:123
+msgid "Hide"
+msgstr "Piilota"
+
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "SyÃ¶tÃ¤ viestin vastaanottajat"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Anna osoitteet joihin lÃ¤hetetÃ¤Ã¤n kopio viestistÃ¤ (Cc)"
 
-#: ../composer/e-composer-header-table.c:69
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -10957,39 +9637,53 @@ msgstr ""
 "Anna osoitteet, joihin lÃ¤hetetÃ¤Ã¤n kopiot viestistÃ¤ ilman ettÃ¤ muut "
 "vastaanottajat nÃ¤kevÃ¤t vastaanottajia"
 
-#: ../composer/e-composer-header-table.c:643
+#: ../composer/e-composer-header-table.c:945
 msgid "Fr_om:"
 msgstr "_LÃ¤hettÃ¤jÃ¤:"
 
-#: ../composer/e-composer-header-table.c:652
+#: ../composer/e-composer-header-table.c:945 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:923 ../mail/em-mailer-prefs.c:76
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:296
+msgid "From"
+msgstr "LÃ¤hettÃ¤jÃ¤"
+
+#: ../composer/e-composer-header-table.c:954
 msgid "_Reply-To:"
 msgstr "_Vastausosoite:"
 
-#: ../composer/e-composer-header-table.c:656
+#: ../composer/e-composer-header-table.c:959
 msgid "_To:"
 msgstr "Vastaan_ottaja:"
 
-#: ../composer/e-composer-header-table.c:661
+#: ../composer/e-composer-header-table.c:965
 msgid "_Cc:"
 msgstr "_Kopiot:"
 
-#: ../composer/e-composer-header-table.c:666
+#: ../composer/e-composer-header-table.c:965 ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
+
+#: ../composer/e-composer-header-table.c:971
 msgid "_Bcc:"
 msgstr "_Piilokopiot:"
 
-#: ../composer/e-composer-header-table.c:671
+#: ../composer/e-composer-header-table.c:971 ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
+
+#: ../composer/e-composer-header-table.c:976
 msgid "_Post To:"
 msgstr "_Postita:"
 
-#: ../composer/e-composer-header-table.c:675
+#: ../composer/e-composer-header-table.c:980
 msgid "S_ubject:"
 msgstr "_Aihe:"
 
-#: ../composer/e-composer-header-table.c:684
+#: ../composer/e-composer-header-table.c:989
 msgid "Si_gnature:"
 msgstr "_Allekirjoitus:"
 
-#: ../composer/e-composer-name-header.c:115
+#: ../composer/e-composer-name-header.c:116
 msgid "Click here for the address book"
 msgstr "Avaa osoitekirja tÃ¤stÃ¤"
 
@@ -11005,18 +9699,18 @@ msgstr "Valitse kansio johon viesti postitetaan:"
 msgid "Click here to select folders to post to"
 msgstr "Valitse tÃ¤stÃ¤ kansiot, joihin postituksia lÃ¤hetetÃ¤Ã¤n"
 
-#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1552
-msgid "Show _Attachment Bar"
-msgstr "NÃ¤ytÃ¤ _liitepalkki"
+#: ../composer/e-composer-private.c:208
+msgid "Save draft"
+msgstr "Tallenna luonnos"
 
-#: ../composer/e-msg-composer.c:866
+#: ../composer/e-msg-composer.c:808
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "LÃ¤htevÃ¤Ã¤ viestiÃ¤ ei voi allekirjoittaa: allekirjoitusvarmennetta ei ole "
 "asetettu tÃ¤lle tilille"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:815
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -11024,23 +9718,11 @@ msgstr ""
 "LÃ¤htevÃ¤Ã¤ viestiÃ¤ ei voi salata: Salausvarmennetta ei ole asetettu tÃ¤lle "
 "tilille"
 
-#: ../composer/e-msg-composer.c:1494 ../mail/em-format-html-display.c:1949
-#: ../mail/em-format-html-display.c:2597 ../mail/mail-config.glade.h:45
-#: ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "Liite"
-msgstr[1] "Liitteet"
-
-#: ../composer/e-msg-composer.c:1550
-msgid "Hide _Attachment Bar"
-msgstr "Piilota _liitepalkki"
-
-#: ../composer/e-msg-composer.c:1567 ../composer/e-msg-composer.c:2792
+#: ../composer/e-msg-composer.c:1351 ../composer/e-msg-composer.c:2190
 msgid "Compose Message"
 msgstr "Uusi viesti"
 
-#: ../composer/e-msg-composer.c:4093
+#: ../composer/e-msg-composer.c:3348
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11206,7 +9888,7 @@ msgstr "Tallenna _luonnos"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution-sÃ¤hkÃ¶posti ja -kalenteri"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:947
 msgid "Groupware Suite"
 msgstr "RyhmÃ¤tyÃ¶ohjelmisto"
 
@@ -11222,6 +9904,40 @@ msgstr "osoitekortti"
 msgid "calendar information"
 msgstr "Kalenterin tietoja"
 
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:193 ../plugins/itip-formatter/itip-view.c:191
+#: ../ui/evolution-calendar.xml.h:34 ../widgets/misc/e-cell-date-edit.c:304
+msgid "Today"
+msgstr "TÃ¤nÃ¤Ã¤n"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:219
+msgid "Tomorrow"
+msgstr "Huomenna"
+
+#: ../e-util/e-datetime-format.c:204
+msgid "Yesterday"
+msgstr "Eilen"
+
+#: ../e-util/e-datetime-format.c:207
+#, c-format
+msgid "%d days from now"
+msgstr "%d pÃ¤ivÃ¤n pÃ¤Ã¤stÃ¤"
+
+#: ../e-util/e-datetime-format.c:209
+#, c-format
+msgid "%d days ago"
+msgstr "%d pÃ¤ivÃ¤Ã¤ sitten"
+
+#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
+#: ../e-util/e-datetime-format.c:302
+msgid "Use locale default"
+msgstr "KÃ¤ytÃ¤ oletusaikavyÃ¶hykettÃ¤"
+
+#: ../e-util/e-datetime-format.c:496
+msgid "Format:"
+msgstr "Muoto:"
+
 #: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "Evolutionin virhe"
@@ -11239,7 +9955,7 @@ msgid "Evolution Query"
 msgstr "Evolutionin kysely"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:444
+#: ../e-util/e-error.c:448
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "SisÃ¤inen virhe, tuntematonta virhettÃ¤ \"%s\" pyydettiin"
@@ -11250,69 +9966,69 @@ msgstr "Komponentti"
 
 #: ../e-util/e-logger.c:162
 msgid "Name of the component being logged"
-msgstr "Lokitettavan komponentin nimi"
+msgstr "Lokitetun komponentin nimi"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:190
+#: ../e-util/e-non-intrusive-error-dialog.c:191
 msgid "Debug Logs"
 msgstr "VianetsintÃ¤lokit"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:204
+#: ../e-util/e-non-intrusive-error-dialog.c:205
 msgid "Show _errors in the status bar for"
 msgstr "NÃ¤ytÃ¤ _viestit tilarivillÃ¤"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:222
+#: ../e-util/e-non-intrusive-error-dialog.c:223
 msgid "second(s)."
 msgstr "sekunnin ajan."
 
-#: ../e-util/e-non-intrusive-error-dialog.c:228
+#: ../e-util/e-non-intrusive-error-dialog.c:229
 msgid "Log Messages:"
 msgstr "Lokita viestit:"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:273
+#: ../e-util/e-non-intrusive-error-dialog.c:274
 msgid "Log Level"
 msgstr "Lokituksen taso"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:281
-#: ../widgets/misc/e-dateedit.c:389
+#: ../e-util/e-non-intrusive-error-dialog.c:282
+#: ../widgets/misc/e-dateedit.c:380
 msgid "Time"
 msgstr "Aika"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2523
+#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2527
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Viestit"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:300
+#: ../e-util/e-non-intrusive-error-dialog.c:301
 #: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Sulje tÃ¤mÃ¤ ikkuna"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Error"
 msgstr "Virhe"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Errors"
 msgstr "Virheet"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warnings and Errors"
 msgstr "Varoitukset ja virheet"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Debug"
 msgstr "VianetsintÃ¤"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Error, Warnings and Debug messages"
 msgstr "Virheet, varoitukset ja vianetsintÃ¤viestit"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
+#: ../mail/em-account-prefs.c:477 ../mail/em-composer-prefs.c:957
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:690
+#: ../plugins/publish-calendar/publish-calendar.c:718
 msgid "Enabled"
 msgstr "kÃ¤ytÃ¶ssÃ¤"
 
@@ -11333,6 +10049,10 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "TulostusjÃ¤rjestelmÃ¤ ei kertonut tarkempia tietoja virheestÃ¤."
 
+#: ../e-util/e-signature.c:695
+msgid "Autogenerated"
+msgstr "Automaattisesti luotu"
+
 #: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
 msgid "Because \"{1}\"."
 msgstr "Syy: \"{1}\"."
@@ -11361,55 +10081,55 @@ msgstr "Kirjoita tiedoston yli?"
 msgid "_Overwrite"
 msgstr "_Ylikirjoita"
 
-#: ../e-util/e-util.c:127
+#: ../e-util/e-util.c:133
 msgid "Could not open the link."
 msgstr "LinkkiÃ¤ ei voitu avata."
 
-#: ../e-util/e-util.c:174
+#: ../e-util/e-util.c:183
 msgid "Could not display help for Evolution."
 msgstr "Evolutionin ohjetta ei voitu nÃ¤yttÃ¤Ã¤."
 
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:45
 msgid "I_mportant"
 msgstr "TÃ¤rk_eÃ¤"
 
 #. red
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:46
 msgid "_Work"
 msgstr "_TyÃ¶"
 
 #. orange
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:47
 msgid "_Personal"
 msgstr "_HenkilÃ¶kohtainen"
 
 #. green
-#: ../e-util/e-util-labels.c:42
+#: ../e-util/e-util-labels.c:48
 msgid "_To Do"
 msgstr "Te_htÃ¤vÃ¤Ã¤"
 
 #. blue
-#: ../e-util/e-util-labels.c:43
+#: ../e-util/e-util-labels.c:49
 msgid "_Later"
 msgstr "_MyÃ¶hemmin"
 
-#: ../e-util/e-util-labels.c:315
+#: ../e-util/e-util-labels.c:320
 msgid "Label _Name:"
-msgstr "MerkinnÃ¤n _nimi:"
+msgstr "_Otsakkeen nimi:"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Edit Label"
 msgstr "Muokkaa merkintÃ¤Ã¤"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Add Label"
 msgstr "LisÃ¤Ã¤ merkintÃ¤"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:362
 msgid "Label name cannot be empty."
 msgstr "MerkinnÃ¤lle tÃ¤ytyy antaa nimi."
 
-#: ../e-util/e-util-labels.c:362
+#: ../e-util/e-util-labels.c:367
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
@@ -11417,190 +10137,190 @@ msgstr ""
 "Samanniminen merkintÃ¤ on jo tallennettu palvelimelle. NimeÃ¤ merkintÃ¤ "
 "uudestaan."
 
-#: ../e-util/gconf-bridge.c:1221
+#: ../e-util/gconf-bridge.c:1222
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf-virhe: %s"
 
-#: ../e-util/gconf-bridge.c:1231
+#: ../e-util/gconf-bridge.c:1233
 msgid "All further errors shown only on terminal."
 msgstr "Kaikki virheet tÃ¤stÃ¤ eteenpÃ¤in nÃ¤kyvÃ¤t vain pÃ¤Ã¤tteessÃ¤."
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 sekunti sitten"
 msgstr[1] "%d sekuntia sitten"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 sekunti tulevaisuudessa"
 msgstr[1] "%d sekuntia tulevaisuudessa"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minuutti sitten"
 msgstr[1] "%d minuuttia sitten"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "yhden minuutin pÃ¤Ã¤ssÃ¤"
 msgstr[1] "%d minuutin pÃ¤Ã¤ssÃ¤"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 tunti sitten"
 msgstr[1] "%d tuntia sitten"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 tunti tulevaisuudessa"
 msgstr[1] "%d tuntia tulevaisuudessa"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 pÃ¤ivÃ¤ sitten"
 msgstr[1] "%d pÃ¤ivÃ¤Ã¤ sitten"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "yhden pÃ¤ivÃ¤n pÃ¤Ã¤ssÃ¤"
 msgstr[1] "%d pÃ¤ivÃ¤n pÃ¤Ã¤ssÃ¤"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 viikko sitten"
 msgstr[1] "%d viikkoa sitten"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 viikko tulevaisuudessa"
 msgstr[1] "%d viikkoa tulevaisuudessa"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 kuukausi sitten"
 msgstr[1] "%d kuukautta sitten"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "yhden kuukauden pÃ¤Ã¤ssÃ¤"
 msgstr[1] "%d kuukauden pÃ¤Ã¤ssÃ¤"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 vuosi sitten"
 msgstr[1] "%d vuotta sitten"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "yhden vuoden pÃ¤Ã¤ssÃ¤"
 msgstr[1] "%d vuoden pÃ¤Ã¤ssÃ¤"
 
-#: ../filter/filter-datespec.c:288
+#: ../filter/filter-datespec.c:294
 msgid "<click here to select a date>"
 msgstr "<napsauta valitaksesi pÃ¤ivÃ¤ys>"
 
-#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
-#: ../filter/filter-datespec.c:313
+#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308
+#: ../filter/filter-datespec.c:319
 msgid "now"
 msgstr "nyt"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:298
+#: ../filter/filter-datespec.c:304
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:452
+#: ../filter/filter-datespec.c:447
 msgid "Select a time to compare against"
 msgstr "Valitse aika johon verrataan"
 
-#: ../filter/filter-file.c:284
+#: ../filter/filter-file.c:281
 msgid "Choose a file"
 msgstr "Valitse tiedosto"
 
-#: ../filter/filter-part.c:532
+#: ../filter/filter-part.c:528
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Testi"
 
-#: ../filter/filter-rule.c:853
+#: ../filter/filter-rule.c:854
 msgid "R_ule name:"
 msgstr "_SÃ¤Ã¤nnÃ¶n nimi:"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:882
 msgid "Find items that meet the following conditions"
 msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 
-#: ../filter/filter-rule.c:915
+#: ../filter/filter-rule.c:916
 msgid "A_dd Condition"
 msgstr "LisÃ¤Ã¤ _ehto"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "If all conditions are met"
 msgstr "jos kaikki ehdot tÃ¤ytetÃ¤Ã¤n"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "If any conditions are met"
 msgstr "jos joku ehdoista tÃ¤yttyy"
 
-#: ../filter/filter-rule.c:923
+#: ../filter/filter-rule.c:924
 msgid "_Find items:"
 msgstr "_Etsi kohteita:"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "All related"
 msgstr "Kaikki tÃ¤hÃ¤n liittyvÃ¤t"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "Replies"
 msgstr "Vastaukset"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "Replies and parents"
 msgstr "Vastaukset ja vanhemmat"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "No reply or parent"
 msgstr "Ei vastasta tai vanhempaa"
 
-#: ../filter/filter-rule.c:947
+#: ../filter/filter-rule.c:944
 msgid "I_nclude threads"
 msgstr "O_ta myÃ¶s sÃ¤ikeet mukaan"
 
-#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1038 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "Tulevat"
 
-#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:311
+#: ../filter/filter-rule.c:1038 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "LÃ¤htevÃ¤t"
 
@@ -11686,54 +10406,50 @@ msgstr ""
 "suodatus tapahtuu."
 
 #: ../filter/filter.glade.h:12
-msgid "a time relative to the current time"
-msgstr "Aika suhteessa tÃ¤mÃ¤nhetkiseen aikaan"
-
-#: ../filter/filter.glade.h:13
-msgid "ago"
-msgstr "sitten"
-
-#: ../filter/filter.glade.h:16
-msgid "in the future"
-msgstr "tulevaisuudessa"
-
-#: ../filter/filter.glade.h:18
-msgid "months"
-msgstr "kuukautta"
-
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
-msgid "seconds"
-msgstr "sekuntia"
+msgid ""
+"ago\n"
+"in the future"
+msgstr ""
+"sitten\n"
+"tulevaisuudessa"
 
-#: ../filter/filter.glade.h:20
-msgid "the current time"
-msgstr "tÃ¤mÃ¤nhetkinen aika"
+#: ../filter/filter.glade.h:14
+msgid ""
+"seconds\n"
+"minutes\n"
+"hours\n"
+"days\n"
+"weeks\n"
+"months\n"
+"years"
+msgstr ""
+"sekuntia\n"
+"minuuttia\n"
+"tuntia\n"
+"pÃ¤ivÃ¤Ã¤\n"
+"viikkoa\n"
+"kuukautta\n"
+"vuotta"
 
 #: ../filter/filter.glade.h:21
-msgid "the time you specify"
-msgstr "mÃ¤Ã¤rittelemÃ¤si aika"
-
-#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:527
-#: ../plugins/google-account-setup/google-source.c:655
-#: ../plugins/google-account-setup/google-contacts-source.c:369
-msgid "weeks"
-msgstr "viikkoa"
-
-#: ../filter/filter.glade.h:23
-msgid "years"
-msgstr "vuotta"
+msgid ""
+"the current time\n"
+"the time you specify\n"
+"a time relative to the current time"
+msgstr ""
+"tÃ¤mÃ¤nhetkinen aika\n"
+"antamasi aika\n"
+"aika suhteessa tÃ¤mÃ¤nhetkiseen aikaan"
 
-#: ../filter/rule-editor.c:382
+#: ../filter/rule-editor.c:381
 msgid "Add Rule"
 msgstr "LisÃ¤Ã¤ sÃ¤Ã¤ntÃ¶"
 
-#: ../filter/rule-editor.c:463
+#: ../filter/rule-editor.c:462
 msgid "Edit Rule"
 msgstr "Muokkaa sÃ¤Ã¤ntÃ¶Ã¤"
 
-#: ../filter/rule-editor.c:809
+#: ../filter/rule-editor.c:808
 msgid "Rule name"
 msgstr "SÃ¤Ã¤nnÃ¶n nimi"
 
@@ -11789,21 +10505,21 @@ msgstr "Evolutionin sÃ¤hkÃ¶postin asetukset"
 msgid "Evolution Network configuration control"
 msgstr "Evolutionin verkkoyhteyden asetukset"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:604
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
-#: ../mail/mail-component.c:767
+#: ../mail/mail-component.c:620 ../mail/mail-component.c:621
+#: ../mail/mail-component.c:793
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "SÃ¤hkÃ¶posti"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:490
 msgid "Mail Accounts"
 msgstr "SÃ¤hkÃ¶postitilit"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:108
 msgid "Mail Preferences"
 msgstr "SÃ¤hkÃ¶postin asetukset"
 
@@ -11812,16 +10528,114 @@ msgid "Network Preferences"
 msgstr "Verkkoasetukset"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../plugins/pst-import/pst-importer.c:297
 msgid "_Mail"
 msgstr "_SÃ¤hkÃ¶posti"
 
-#: ../mail/em-account-editor.c:386
+#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1331
+#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105
+msgid "_Forward"
+msgstr "_VÃ¤litÃ¤"
+
+#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1329
+#: ../ui/evolution-mail-message.xml.h:123
+msgid "_Reply to Sender"
+msgstr "_Vastaa lÃ¤hettÃ¤jÃ¤lle"
+
+#. Translators: This is only for multiple messages.
+#: ../mail/e-attachment-handler-mail.c:334
+#, c-format
+msgid "%d attached messages"
+msgstr "%d liitetty viesti"
+
+#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1642
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:147
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Liite"
+msgstr[1] "Liitteet"
+
+#: ../mail/e-mail-attachment-bar.c:615
+#: ../widgets/misc/e-attachment-paned.c:607
+msgid "Icon View"
+msgstr "KuvakenÃ¤kymÃ¤"
+
+#: ../mail/e-mail-attachment-bar.c:616
+#: ../widgets/misc/e-attachment-paned.c:608
+msgid "List View"
+msgstr "LuettelonÃ¤kymÃ¤"
+
+#: ../mail/e-mail-search-bar.c:76
+#, c-format
+msgid "Matches: %d"
+msgstr "Osumia: %d"
+
+#: ../mail/e-mail-search-bar.c:520
+msgid "Close the find bar"
+msgstr "Sulje hakupalkki"
+
+#: ../mail/e-mail-search-bar.c:528
+msgid "Fin_d:"
+msgstr "Et_si:"
+
+#: ../mail/e-mail-search-bar.c:540
+msgid "Clear the search"
+msgstr "TyhjennÃ¤ hakukenttÃ¤"
+
+#: ../mail/e-mail-search-bar.c:559
+msgid "_Previous"
+msgstr "_Edellinen"
+
+#: ../mail/e-mail-search-bar.c:565
+msgid "Find the previous occurrence of the phrase"
+msgstr "Etsi lauseen edellinen esiintymÃ¤"
+
+#: ../mail/e-mail-search-bar.c:573
+msgid "_Next"
+msgstr "_Seuraava"
+
+#: ../mail/e-mail-search-bar.c:579
+msgid "Find the next occurrence of the phrase"
+msgstr "Etsi lauseen seuraava esiintymÃ¤"
+
+#: ../mail/e-mail-search-bar.c:587
+msgid "Mat_ch case"
+msgstr "Huomioi _kirjainkoko"
+
+#: ../mail/e-mail-search-bar.c:615
+msgid "Reached bottom of page, continued from top"
+msgstr "Saavutettin sivun loppu, jatketaan alusta"
+
+#: ../mail/e-mail-search-bar.c:637
+msgid "Reached top of page, continued from bottom"
+msgstr "Saavutettiin sivun alku, jatketaan lopusta"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../mail/em-account-editor.c:309
+msgid "No encryption"
+msgstr "Ei salausta"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../mail/em-account-editor.c:313
+msgid "TLS encryption"
+msgstr "TLS-salattu"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../mail/em-account-editor.c:317
+msgid "SSL encryption"
+msgstr "SSL-salattu"
+
+#: ../mail/em-account-editor.c:408
 #, c-format
 msgid "%s License Agreement"
 msgstr "Lisenssisopimus ohjelmalle %s"
 
-#: ../mail/em-account-editor.c:393
+#: ../mail/em-account-editor.c:415
 #, c-format
 msgid ""
 "\n"
@@ -11834,107 +10648,111 @@ msgstr ""
 "ohjelmalle %s\n"
 "ja ruksita laatikko, jos hyvÃ¤ksyt lisenssin\n"
 
-#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-account-editor.c:487 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Valitse kansio"
 
-#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
-#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
-msgid "Autogenerated"
-msgstr "Automaattisesti luotu"
+#: ../mail/em-account-editor.c:797
+msgid "Never"
+msgstr "Ei koskaan"
+
+#: ../mail/em-account-editor.c:798
+msgid "Always"
+msgstr "Aina"
 
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:799
 msgid "Ask for each message"
 msgstr "Kysy jokaisen viestin osalta"
 
-#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
+#: ../mail/em-account-editor.c:1877 ../mail/mail-config.glade.h:100
 msgid "Identity"
 msgstr "Omat tiedot"
 
-#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:1928 ../mail/mail-config.glade.h:127
 msgid "Receiving Email"
 msgstr "Vastaanotto"
 
-#: ../mail/em-account-editor.c:2130
+#: ../mail/em-account-editor.c:2216
 msgid "Check for _new messages every"
 msgstr "T_arkista uudet viestit joka"
 
-#: ../mail/em-account-editor.c:2138
+#: ../mail/em-account-editor.c:2224
 msgid "minu_tes"
 msgstr "minuutti"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
+#: ../mail/em-account-editor.c:2420 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "LÃ¤hetys"
 
-#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2479 ../mail/mail-config.glade.h:73
 msgid "Defaults"
 msgstr "Oletusasetukset"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
-#: ../plugins/exchange-operations/exchange-account-setup.c:332
+#: ../mail/em-account-editor.c:2545 ../mail/mail-config.glade.h:133
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
 msgid "Security"
 msgstr "Turvallisuus"
 
+#. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
+#: ../mail/em-account-editor.c:2582 ../mail/em-account-editor.c:2677
 msgid "Receiving Options"
 msgstr "Vastaanottoasetukset"
 
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2583 ../mail/em-account-editor.c:2678
 msgid "Checking for New Messages"
 msgstr "Uusien viestien etsintÃ¤"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3145 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Tilimuokkain"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
+#: ../mail/em-account-editor.c:3145 ../mail/mail-config.glade.h:89
 msgid "Evolution Account Assistant"
 msgstr "Evolutionin sÃ¤hkÃ¶postitilien apulainen"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:429
+#: ../mail/em-account-prefs.c:426
 msgid "[Default]"
 msgstr "[Oletus]"
 
-#: ../mail/em-account-prefs.c:488
+#: ../mail/em-account-prefs.c:483
 msgid "Account name"
-msgstr "Tilin nimi"
+msgstr "Tilin nimi:"
 
-#: ../mail/em-account-prefs.c:490
+#: ../mail/em-account-prefs.c:485
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1190 ../mail/mail-signature-editor.c:478
+#: ../mail/em-composer-prefs.c:318 ../mail/em-composer-prefs.c:452
+#: ../mail/mail-config.c:1160 ../mail/mail-signature-editor.c:481
 msgid "Unnamed"
 msgstr "NimeÃ¤mÃ¤tÃ¶n"
 
-#: ../mail/em-composer-prefs.c:970
+#: ../mail/em-composer-prefs.c:961
 msgid "Language(s)"
 msgstr "Kielet"
 
-#: ../mail/em-composer-prefs.c:1019
+#: ../mail/em-composer-prefs.c:994
 msgid "Add signature script"
 msgstr "LisÃ¤Ã¤ allekirjoitus-skripti"
 
-#: ../mail/em-composer-prefs.c:1061
+#: ../mail/em-composer-prefs.c:1036
 msgid "Signature(s)"
 msgstr "Allekirjoitukset"
 
-#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
+#: ../mail/em-composer-utils.c:1132 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "------- VÃ¤litetty viesti ---------"
 
-#: ../mail/em-composer-utils.c:1602
+#: ../mail/em-composer-utils.c:1585
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "Kohdeosoitetta ei annettu, viestin edelleenlÃ¤hetys on peruttu."
 
-#: ../mail/em-composer-utils.c:1608
+#: ../mail/em-composer-utils.c:1591
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "KÃ¤ytettÃ¤vÃ¤Ã¤ tiliÃ¤ ei lÃ¶ydy, viestin edelleenlÃ¤hetys on peruttu."
 
@@ -11957,7 +10775,7 @@ msgstr ""
 msgid "-----Original Message-----"
 msgstr "-----AlkuperÃ¤inen viesti-----"
 
-#: ../mail/em-filter-editor.c:156
+#: ../mail/em-filter-editor.c:172
 msgid "_Filter Rules"
 msgstr "_SuodatinsÃ¤Ã¤nnÃ¶t"
 
@@ -11974,18 +10792,10 @@ msgstr "Aseta vÃ¤ri"
 msgid "Assign Score"
 msgstr "Aseta pistemÃ¤Ã¤rÃ¤"
 
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "BCC"
-
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Piippaa"
 
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "CC"
-
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "Valmistui"
@@ -12003,7 +10813,7 @@ msgid "Date sent"
 msgstr "LÃ¤hetetty"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:768
+#: ../plugins/groupwise-features/share-folder.c:765
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
@@ -12054,226 +10864,234 @@ msgstr "Lauseke"
 msgid "Follow Up"
 msgstr "LÃ¤hetÃ¤ edelleen"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:29
+msgid "Forward to"
+msgstr "VÃ¤litÃ¤"
+
+#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:958
 msgid "Important"
 msgstr "TÃ¤rkeÃ¤"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "on jÃ¤lkeen"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:33
 msgid "is before"
 msgstr "on ennen"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:34
 msgid "is Flagged"
 msgstr "on merkitty"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:38
 msgid "is not Flagged"
 msgstr "ei ole merkitty"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:39
 msgid "is not set"
 msgstr "ei ole asetettu"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:40
 msgid "is set"
 msgstr "on asetettu"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:102
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Roskaposti"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:42
 msgid "Junk Test"
 msgstr "Roskapostitesti"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:43
 msgid "Label"
 msgstr "MerkintÃ¤"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:44
 msgid "Mailing list"
 msgstr "Postituslista"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:45
 msgid "Match All"
 msgstr "Kaikki kÃ¤yvÃ¤t"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Body"
 msgstr "Viestin runko"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:47
 msgid "Message Header"
 msgstr "Viestin otsakkeet"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is Junk"
 msgstr "Viesti on roskapostia"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:49
 msgid "Message is not Junk"
 msgstr "Viesti ei ole roskapostia"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:50
+msgid "Message Location"
+msgstr "Viestin sijainti"
+
+#: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "SiirrÃ¤ kansioon"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "VÃ¤litÃ¤ putkessa ohjelmalle"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:53
 msgid "Play Sound"
 msgstr "Soita Ã¤Ã¤ni"
 
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
+#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
 msgid "Read"
 msgstr "Luettu"
 
-#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Vastaanottajat"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:56
 msgid "Regex Match"
 msgstr "Regex-osuma"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:57
 msgid "Replied to"
 msgstr "Vastaus viestiin"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:58
 msgid "returns"
 msgstr "palauttaa"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:59
 msgid "returns greater than"
 msgstr "palauttaa enemmÃ¤n kuin"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:60
 msgid "returns less than"
 msgstr "palauttaa vÃ¤hemmÃ¤n kuin"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:61
 msgid "Run Program"
 msgstr "Suorita ohjelma"
 
-#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "PistemÃ¤Ã¤rÃ¤"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "LÃ¤hettÃ¤jÃ¤"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:64
 msgid "Sender or Recipients"
 msgstr "LÃ¤hettÃ¤jÃ¤ tai vastaanottajat"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:65
 msgid "Set Label"
 msgstr "Aseta merkintÃ¤"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:66
 msgid "Set Status"
 msgstr "Aseta tila"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:67
 msgid "Size (kB)"
 msgstr "Koko (kB)"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:68
 msgid "sounds like"
 msgstr "kuulostaa samalta kuin"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:69
 msgid "Source Account"
 msgstr "LÃ¤hteen yhteystieto"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:70
 msgid "Specific header"
 msgstr "Annettu otsake"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:71
 msgid "starts with"
 msgstr "alkaa"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:73
 msgid "Stop Processing"
 msgstr "PysÃ¤ytÃ¤ kÃ¤sittely"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
+#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:300
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1115
+#: ../smime/lib/e-cert.c:1112
 msgid "Subject"
 msgstr "Aihe"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "Poista tilan asetus"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:522
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "sitten"
 
-#: ../mail/em-filter-rule.c:550
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "LisÃ¤Ã¤ _toiminto"
 
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:194
 msgid "C_reate Search Folder From Search..."
 msgstr "Luo _hakunÃ¤kymÃ¤ haun perusteella..."
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:219
 msgid "All Messages"
 msgstr "Kaikki viestit"
 
-#: ../mail/em-folder-browser.c:219
+#: ../mail/em-folder-browser.c:220
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../mail/em-folder-browser.c:221
+#: ../mail/em-folder-browser.c:222
 msgid "No Label"
 msgstr "Ei merkintÃ¤Ã¤"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Read Messages"
 msgstr "Luetut viestit"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Recent Messages"
 msgstr "ViimeisimmÃ¤t viestit"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:231
 msgid "Last 5 Days' Messages"
 msgstr "Viimeisten viiden pÃ¤ivÃ¤n viestit"
 
-#: ../mail/em-folder-browser.c:231
+#: ../mail/em-folder-browser.c:232
 msgid "Messages with Attachments"
 msgstr "Viestit, joissa on liitteitÃ¤"
 
-#: ../mail/em-folder-browser.c:232
+#: ../mail/em-folder-browser.c:233
 msgid "Important Messages"
 msgstr "TÃ¤rkeÃ¤t viestit"
 
-#: ../mail/em-folder-browser.c:233
+#: ../mail/em-folder-browser.c:234
 msgid "Messages Not Junk"
 msgstr "Viestit, jotka eivÃ¤t ole roskapostia"
 
-#: ../mail/em-folder-browser.c:1188
+#: ../mail/em-folder-browser.c:1194
 msgid "Account Search"
 msgstr "Haku tileiltÃ¤"
 
-#: ../mail/em-folder-browser.c:1241
+#: ../mail/em-folder-browser.c:1256
 msgid "All Account Search"
 msgstr "Etsi kaikilta tileiltÃ¤"
 
@@ -12303,11 +11121,11 @@ msgid "Quota usage"
 msgstr "Levytilan kÃ¤yttÃ¶"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
-#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164
-#: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:594
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:517
+#: ../mail/em-folder-tree.c:2602 ../mail/mail-component.c:168
+#: ../mail/mail-component.c:608
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "Saapuneet"
 
@@ -12320,369 +11138,338 @@ msgstr "Kansion ominaisuudet"
 msgid "<click here to select a folder>"
 msgstr "<Valitse kansio tÃ¤stÃ¤>"
 
-#: ../mail/em-folder-selector.c:254
+#: ../mail/em-folder-selector.c:249
 msgid "C_reate"
 msgstr "_Luo"
 
-#: ../mail/em-folder-selector.c:258
+#: ../mail/em-folder-selector.c:253
 msgid "Folder _name:"
 msgstr "Kansion _nimi:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
+#: ../mail/em-folder-tree-model.c:195 ../mail/em-folder-tree-model.c:197
+#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1028
 msgid "Search Folders"
 msgstr "HakunÃ¤kymÃ¤t"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
 msgid "UNMATCHED"
 msgstr "EI VASTAAVAA"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:169
 msgid "Drafts"
 msgstr "Luonnokset"
 
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../mail/em-folder-tree-model.c:513 ../mail/mail-component.c:172
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "Pohjat"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
+#: ../mail/em-folder-tree-model.c:520 ../mail/mail-component.c:170
 msgid "Outbox"
 msgstr "LÃ¤htevÃ¤t"
 
-#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
+#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:171
 msgid "Sent"
 msgstr "LÃ¤hetetyt"
 
-#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
+#: ../mail/em-folder-tree-model.c:580 ../mail/em-folder-tree-model.c:889
 msgid "Loading..."
 msgstr "Ladataan..."
 
 #. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
+#. * folder names in folder trees. The first "%s" will be
+#. * replaced by the folder's name and "%u" will be replaced
+#. * with the number of unread messages in the folder. The
+#. * second %s will be replaced with a "+" letter for collapsed
+#. * folders with unread messages in some subfolder too,
+#. * or with an empty string for other cases.
 #. *
-#. * Most languages should translate this as "%s (%u)". The
+#. * Most languages should translate this as "%s (%u%s)". The
 #. * languages that use localized digits (like Persian) may
 #. * need to replace "%u" with "%Iu". Right-to-left languages
 #. * (like Arabic and Hebrew) may need to add bidirectional
 #. * formatting codes to take care of the cases the folder
 #. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:380
+#: ../mail/em-folder-tree.c:318
 #, c-format
 msgctxt "folder-display"
-msgid "%s (%u)"
-msgstr "%s (%u)"
+msgid "%s (%u%s)"
+msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:741
+#: ../mail/em-folder-tree.c:727
 msgid "Mail Folder Tree"
 msgstr "SÃ¤hkÃ¶postikansioiden puu"
 
-#: ../mail/em-folder-tree.c:900
+#: ../mail/em-folder-tree.c:886
 #, c-format
 msgid "Moving folder %s"
 msgstr "SiirretÃ¤Ã¤n kansiota %s"
 
-#: ../mail/em-folder-tree.c:902
+#: ../mail/em-folder-tree.c:888
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopioidaan kansiota %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2014
+#: ../mail/em-folder-tree.c:895 ../mail/message-list.c:2018
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "SiirretÃ¤Ã¤n viestejÃ¤ kansioon %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2016
+#: ../mail/em-folder-tree.c:897 ../mail/message-list.c:2020
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejÃ¤ kansioon %s"
 
-#: ../mail/em-folder-tree.c:926
+#: ../mail/em-folder-tree.c:912
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ViestiÃ¤ ei voi tiputtaa ylÃ¤tason taltioon"
 
-#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:989 ../ui/evolution-mail-message.xml.h:100
 msgid "_Copy to Folder"
 msgstr "_Kopioi kansioon"
 
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
+#: ../mail/em-folder-tree.c:990 ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "_SiirrÃ¤ kansioon"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
+#: ../mail/em-folder-tree.c:992 ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2110
+msgid "_Move"
+msgstr "_SiirrÃ¤"
+
+#: ../mail/em-folder-tree.c:994 ../mail/message-list.c:2112
+msgid "Cancel _Drag"
+msgstr "Peruuta _raahaus"
+
+#: ../mail/em-folder-tree.c:1702 ../mail/mail-ops.c:1063
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "EtsitÃ¤Ã¤n kansioita kohteessa \"%s\""
 
-#: ../mail/em-folder-tree.c:2117
+#: ../mail/em-folder-tree.c:2107
 msgid "Open in _New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2122
+#: ../mail/em-folder-tree.c:2112
 msgid "_New Folder..."
 msgstr "_Uusi kansio..."
 
-#: ../mail/em-folder-tree.c:2125
+#: ../mail/em-folder-tree.c:2115
 msgid "_Move..."
 msgstr "_SiirrÃ¤..."
 
-#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
+#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "Vi_rkistÃ¤"
 
-#: ../mail/em-folder-tree.c:2134
+#: ../mail/em-folder-tree.c:2124
 msgid "Fl_ush Outbox"
 msgstr "T_yhjennÃ¤ lÃ¤htevien kansio"
 
-#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2129 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_TyhjennÃ¤ roskakori"
 
-#: ../mail/em-folder-tree.c:2243
+#: ../mail/em-folder-tree.c:2232
 msgid "_Unread Search Folder"
 msgstr "_Lukemattomien hakukansio"
 
-#: ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Kopioidaan %s paikkaan %s"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1188
-#: ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "_Kopioi"
 
-#: ../mail/em-folder-utils.c:532
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:537
+#: ../plugins/groupwise-features/share-folder-common.c:144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Luodaan kansiota %s"
 
-#: ../mail/em-folder-utils.c:690
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "Luo uusi kansio"
 
-#: ../mail/em-folder-utils.c:690
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "MÃ¤Ã¤rittele mihin kansio luodaan:"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1089 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "SÃ¤hkÃ¶postin poisto epÃ¤onnistui"
 
-#: ../mail/em-folder-view.c:1092 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Oikeutesi eivÃ¤t riitÃ¤ tÃ¤mÃ¤n sÃ¤hkÃ¶postin poistamiseen."
 
-#: ../mail/em-folder-view.c:1331 ../ui/evolution-mail-message.xml.h:127
-msgid "_Reply to Sender"
-msgstr "_Vastaa lÃ¤hettÃ¤jÃ¤lle"
-
-#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:566 ../mail/em-popup.c:577
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Forward"
-msgstr "_VÃ¤litÃ¤"
-
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1337 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:102
 msgid "_Edit as New Message..."
 msgstr "_Muokkaa uutena viestinÃ¤..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "_Palauta"
 
-#: ../mail/em-folder-view.c:1344
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "_SiirrÃ¤ kansioon..."
 
-#: ../mail/em-folder-view.c:1345
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Merkitse _tÃ¤rkeÃ¤ksi"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "Merkitse yhden_tekevÃ¤ksi"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "Luokittele _roskapostiksi"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "Luokittele _ei-roskapostiksi"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "_Merkitse _edelleen lÃ¤hetettÃ¤vÃ¤ksi..."
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "_MerkintÃ¤"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1357 ../widgets/misc/e-dateedit.c:478
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:469
 msgid "_None"
 msgstr "_Ei mitÃ¤Ã¤n"
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "_uusi merkintÃ¤"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "_Poista merkki"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "_Luo viestistÃ¤ sÃ¤Ã¤ntÃ¶"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "HakunÃ¤kymÃ¤ _aiheen perusteella"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "HakunÃ¤kymÃ¤ _lÃ¤hettÃ¤jÃ¤n perusteella"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "HakunÃ¤kymÃ¤ _vastaanottajien perusteella"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
-msgstr "HakunÃ¤kymÃ¤ _postituslistan perusteella"
+msgstr "HakunÃ¤kymÃ¤ _postilistasta..."
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "Suodata _lÃ¤hettÃ¤jÃ¤n mukaan"
 
-#: ../mail/em-folder-view.c:1380
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: ../mail/em-folder-view.c:1381
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2257 ../mail/em-folder-view.c:2300
-#: ../plugins/google-account-setup/google-source.c:232
-#: ../plugins/google-account-setup/google-source.c:510
-#: ../plugins/google-account-setup/google-source.c:708
+#: ../mail/em-folder-view.c:2232 ../mail/em-folder-view.c:2275
+#: ../plugins/google-account-setup/google-source.c:304
+#: ../plugins/google-account-setup/google-source.c:613
+#: ../plugins/google-account-setup/google-source.c:784
 msgid "Default"
 msgstr "Oletukset"
 
-#: ../mail/em-folder-view.c:2518
+#: ../mail/em-folder-view.c:2493
 msgid "Unable to retrieve message"
 msgstr "ViestiÃ¤ ei voi hakea"
 
-#: ../mail/em-folder-view.c:2537
-msgid "Retrieving Message..."
-msgstr "Noudetaan viestiÃ¤..."
-
-#: ../mail/em-folder-view.c:2756
-msgid "C_all To..."
-msgstr "_Soita..."
-
-#: ../mail/em-folder-view.c:2759
+#: ../mail/em-folder-view.c:2696
 msgid "Create _Search Folder"
-msgstr "Luo uusi hakunÃ¤kymÃ¤"
+msgstr "Luo _hakunÃ¤kymÃ¤"
 
-#: ../mail/em-folder-view.c:2760
+#: ../mail/em-folder-view.c:2697
 msgid "_From this Address"
 msgstr "_TÃ¤stÃ¤ osoitteesta"
 
-#: ../mail/em-folder-view.c:2761
+#: ../mail/em-folder-view.c:2698
 msgid "_To this Address"
-msgstr "_Osoitteeseen:"
+msgstr "_TÃ¤hÃ¤n osoitteeseen"
 
-#: ../mail/em-folder-view.c:3254
+#: ../mail/em-folder-view.c:3191
 #, c-format
 msgid "Click to mail %s"
 msgstr "Napsauta lÃ¤hettÃ¤Ã¤ksesi %s"
 
-#: ../mail/em-folder-view.c:3266
+#: ../mail/em-folder-view.c:3203
 #, c-format
 msgid "Click to call %s"
 msgstr "Soita numeroon %s napsauttamalla"
 
-#: ../mail/em-folder-view.c:3271
+#: ../mail/em-folder-view.c:3208
 msgid "Click to hide/unhide addresses"
 msgstr "Napsauta piilottaaksesi tai nÃ¤yttÃ¤Ã¤ksesi osoitteet"
 
-#. message-search popup match count string
-#: ../mail/em-format-html-display.c:474
-#, c-format
-msgid "Matches: %d"
-msgstr "Osumia: %d"
-
-#: ../mail/em-format-html-display.c:618
-msgid "Fin_d:"
-msgstr "Et_si:"
-
-#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:642
-msgid "_Previous"
-msgstr "_Edellinen"
-
-#: ../mail/em-format-html-display.c:647
-msgid "_Next"
-msgstr "_Seuraava"
-
-#: ../mail/em-format-html-display.c:652
-msgid "M_atch case"
-msgstr "TÃ¤smÃ¤Ã¤ _kirjainkoko"
-
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:560 ../mail/em-format-html.c:654
 msgid "Unsigned"
 msgstr "Allekirjoittamaton"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:560
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12690,11 +11477,11 @@ msgstr ""
 "Viesti ei ole allekirjoitettu. Ei ole varmaa, ettÃ¤ viestin lÃ¤hettÃ¤jÃ¤ on "
 "varmasti se, jolta viesti nÃ¤yttÃ¤Ã¤ olevan."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:561 ../mail/em-format-html.c:655
 msgid "Valid signature"
 msgstr "HyvÃ¤ksytty allekirjoitus"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:561
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12702,11 +11489,11 @@ msgstr ""
 "TÃ¤mÃ¤ viesti on allekirjoitettu ja varmennettu. Viesti on hyvin "
 "todennÃ¤kÃ¶isesti aito."
 
-#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:562 ../mail/em-format-html.c:656
 msgid "Invalid signature"
 msgstr "HylÃ¤tty allekirjoitus"
 
-#: ../mail/em-format-html-display.c:953
+#: ../mail/em-format-html-display.c:562
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12714,11 +11501,11 @@ msgstr ""
 "TÃ¤mÃ¤n viestin allekirjoitusta ei voi tarkistaa, se on ehkÃ¤ muuttunut siirron "
 "aikana."
 
-#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:563 ../mail/em-format-html.c:657
 msgid "Valid signature, but cannot verify sender"
 msgstr "Allekirjoitus on kelvollinen, mutta lÃ¤hettÃ¤jÃ¤Ã¤ ei voi varmistaa"
 
-#: ../mail/em-format-html-display.c:954
+#: ../mail/em-format-html-display.c:563
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12726,11 +11513,11 @@ msgstr ""
 "TÃ¤mÃ¤ viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lÃ¤hettÃ¤jÃ¤Ã¤ ei voi varmistaa."
 
-#: ../mail/em-format-html-display.c:955 ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:564 ../mail/em-format-html.c:658
 msgid "Signature exists, but need public key"
 msgstr "Allekirjoitus lÃ¶ytyi, mutta tarvitsee julkisen avaimen"
 
-#: ../mail/em-format-html-display.c:955
+#: ../mail/em-format-html-display.c:564
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12738,11 +11525,11 @@ msgstr ""
 "TÃ¤mÃ¤ viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lÃ¤hettÃ¤jÃ¤n julkista avainta ei lÃ¶ydy."
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:664
 msgid "Unencrypted"
 msgstr "Salaamaton"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:571
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12750,11 +11537,11 @@ msgstr ""
 "Viesti ei ole salattu. Viestin sisÃ¤ltÃ¶Ã¤ voidaan tutkia sen kulkiessa "
 "Internetin lÃ¤pi."
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:665
 msgid "Encrypted, weak"
 msgstr "Heikosti salattu"
 
-#: ../mail/em-format-html-display.c:963
+#: ../mail/em-format-html-display.c:572
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12764,11 +11551,11 @@ msgstr ""
 "mahdotonta, ettÃ¤ ulkopuolinen pystyy purkamaan ja katsomaan viestin sisÃ¤llÃ¶n "
 "melko lyhyessÃ¤ ajassa."
 
-#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:664
+#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:666
 msgid "Encrypted"
 msgstr "Salattu"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:573
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12776,11 +11563,11 @@ msgstr ""
 "Viesti on salattu. Ulkopuolisen on vaikea avata viestin sisÃ¤ltÃ¶ "
 "luettavakseen."
 
-#: ../mail/em-format-html-display.c:965 ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:574 ../mail/em-format-html.c:667
 msgid "Encrypted, strong"
 msgstr "Salattu vahvalla algoritmilla"
 
-#: ../mail/em-format-html-display.c:965
+#: ../mail/em-format-html-display.c:574
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12790,87 +11577,58 @@ msgstr ""
 "vaikea purkaa salausta ja nÃ¤hdÃ¤ tÃ¤mÃ¤n viestin sisÃ¤ltÃ¶Ã¤ missÃ¤Ã¤n "
 "kÃ¤ytÃ¤nnÃ¶llisessÃ¤ ajassa."
 
-#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:675 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_NÃ¤ytÃ¤ varmenne"
 
-#: ../mail/em-format-html-display.c:1081
+#: ../mail/em-format-html-display.c:690
 msgid "This certificate is not viewable"
 msgstr "TÃ¤tÃ¤ varmennetta ei voi nÃ¤yttÃ¤Ã¤"
 
-#: ../mail/em-format-html-display.c:1407
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "Valmistui %B %d, %Y, %l.%M %p"
+#: ../mail/em-format-html-display.c:980
+msgid "Completed on"
+msgstr "Valmistui"
 
-#: ../mail/em-format-html-display.c:1415
+#: ../mail/em-format-html-display.c:988
 msgid "Overdue:"
 msgstr "ErÃ¤pÃ¤ivÃ¤ ylitetty:"
 
-#: ../mail/em-format-html-display.c:1418
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "kirjoittanut %d %l.%M %p"
+#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
+#: ../mail/em-format-html-display.c:992
+msgid "by"
+msgstr "mennessÃ¤"
 
-#: ../mail/em-format-html-display.c:1496
+#: ../mail/em-format-html-display.c:1071
+#: ../widgets/misc/e-attachment-view.c:357
 msgid "_View Inline"
 msgstr "NÃ¤ytÃ¤ _sisÃ¤kkÃ¤isesti"
 
-#: ../mail/em-format-html-display.c:1497
+#: ../mail/em-format-html-display.c:1072
+#: ../widgets/misc/e-attachment-view.c:350
 msgid "_Hide"
 msgstr "_Piilota"
 
-#: ../mail/em-format-html-display.c:1498
+#: ../mail/em-format-html-display.c:1073
 msgid "_Fit to Width"
 msgstr "Sovita _leveyteen"
 
-#: ../mail/em-format-html-display.c:1499
+#: ../mail/em-format-html-display.c:1074
 msgid "Show _Original Size"
 msgstr "NÃ¤ytÃ¤ alkuperÃ¤inen k_oko"
 
-#: ../mail/em-format-html-display.c:2168
-msgid "Save attachment as"
-msgstr "Tallenna liite nimellÃ¤"
-
-#: ../mail/em-format-html-display.c:2172
-msgid "Select folder to save all attachments"
-msgstr "Valitse kansio, johon kaikki liitteet tallennetaan"
-
-#: ../mail/em-format-html-display.c:2223
-msgid "_Save Selected..."
-msgstr "_Tallenna valinta..."
-
-#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2290
-#, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "%d lii_te"
-msgstr[1] "%d lii_tettÃ¤"
-
-#: ../mail/em-format-html-display.c:2297 ../mail/em-format-html-display.c:2387
-msgid "S_ave"
-msgstr "T_allenna"
-
-#: ../mail/em-format-html-display.c:2308
-msgid "S_ave All"
-msgstr "Tallenna _kaikki"
-
-#: ../mail/em-format-html-display.c:2383
-msgid "No Attachment"
-msgstr "Ei liitteitÃ¤"
-
-#: ../mail/em-format-html-display.c:2530 ../mail/em-format-html-display.c:2569
+#: ../mail/em-format-html-display.c:1575 ../mail/em-format-html-display.c:1614
 msgid "View _Unformatted"
 msgstr "NÃ¤ytÃ¤ _muotoilematon"
 
-#: ../mail/em-format-html-display.c:2532
+#: ../mail/em-format-html-display.c:1577
 msgid "Hide _Unformatted"
 msgstr "Piilota _muotoilematon"
 
-#: ../mail/em-format-html-display.c:2589
+#: ../mail/em-format-html-display.c:1634
 msgid "O_pen With"
 msgstr "Avaa _ohjelmalla"
 
-#: ../mail/em-format-html-display.c:2665
+#: ../mail/em-format-html-display.c:1711
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12884,248 +11642,241 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Sivu  %d / %d"
 
-#: ../mail/em-format-html.c:506 ../mail/em-format-html.c:515
+#: ../mail/em-format-html.c:505 ../mail/em-format-html.c:514
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Noudetaan \"%s\""
 
-#: ../mail/em-format-html.c:927
+#: ../mail/em-format-html.c:929
 msgid "Unknown external-body part."
 msgstr "Tuntematon ulkopuolinen viestin osa."
 
-#: ../mail/em-format-html.c:935
+#: ../mail/em-format-html.c:937
 msgid "Malformed external-body part."
 msgstr "VÃ¤Ã¤rin muotoilut rungon ulkopuolinen viestin osa."
 
-#: ../mail/em-format-html.c:965
+#: ../mail/em-format-html.c:967
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Osoitin FTP-palvelimelle (%s)"
 
-#: ../mail/em-format-html.c:976
+#: ../mail/em-format-html.c:978
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Osoitin paikalliseen tiedostoon (%s) palvelimella \"%s\""
 
-#: ../mail/em-format-html.c:978
+#: ../mail/em-format-html.c:980
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Osoitin paikalliseen tiedostoon (%s)"
 
-#: ../mail/em-format-html.c:999
+#: ../mail/em-format-html.c:1001
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Osoitin muulla palvelimella olevaan tietoon (%s)"
 
-#: ../mail/em-format-html.c:1010
+#: ../mail/em-format-html.c:1012
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 "Osoitin tuntemattomaan muulla palvelimella olevaan tietoon (tyyppiÃ¤ \"%s\")"
 
-#: ../mail/em-format-html.c:1238
+#: ../mail/em-format-html.c:1240
 msgid "Formatting message"
 msgstr "Muotoillaan viestiÃ¤"
 
-#: ../mail/em-format-html.c:1412
+#: ../mail/em-format-html.c:1414
 msgid "Formatting Message..."
 msgstr "Muotoillaan viestiÃ¤..."
 
-#: ../mail/em-format-html.c:1565 ../mail/em-format-html.c:1629
-#: ../mail/em-format-html.c:1651 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:78
+#: ../mail/em-format-html.c:1567 ../mail/em-format-html.c:1631
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:79
 msgid "Cc"
 msgstr "Kopiot"
 
-#: ../mail/em-format-html.c:1566 ../mail/em-format-html.c:1635
-#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:79
+#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1637
+#: ../mail/em-format-html.c:1655 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:80
 msgid "Bcc"
 msgstr "Piilokopiot"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1746 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1451
+#: ../mail/em-format-html.c:1747 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1435
 msgid "Mailer"
 msgstr "Postittaja"
 
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1773
-msgid " (%a, %R %Z)"
-msgstr " (%a. %R %Z)"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1778
-msgid " (%R %Z)"
-msgstr " (%R %Z)"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1914
+#: ../mail/em-format-html.c:1910
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "TÃ¤mÃ¤ viesti lÃ¤hetettiin <b>%s</b> kÃ¤yttÃ¤jÃ¤n <b>%s</b> puolesta"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
-#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:307
-msgid "From"
-msgstr "LÃ¤hettÃ¤jÃ¤"
-
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:76
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:924
+#: ../mail/em-mailer-prefs.c:77
 msgid "Reply-To"
 msgstr "Vastausosoite"
 
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
-#: ../widgets/misc/e-dateedit.c:347
+#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:82
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:316
+#: ../widgets/misc/e-dateedit.c:338
 msgid "Date"
 msgstr "PÃ¤ivÃ¤ys"
 
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:82
+#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:83
 msgid "Newsgroups"
 msgstr "UutisryhmÃ¤t"
 
-#: ../mail/em-format.c:893 ../mail/em-mailer-prefs.c:83
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:84
+#: ../plugins/face/org-gnome-face.eplug.xml.h:4
 msgid "Face"
 msgstr "Kasvokuva"
 
-#: ../mail/em-format.c:1160
+#: ../mail/em-format.c:1201
 #, c-format
 msgid "%s attachment"
 msgstr "Liite: %s"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1239
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME viestin tulkitseminen epÃ¤onnistui: tuntematon virhe"
 
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1376 ../mail/em-format.c:1533
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME-viestin tulkitseminen epÃ¤onnistui, nÃ¤ytetÃ¤Ã¤n lÃ¤hdekoodi"
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1384
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tuntematon salausmuoto muodolle multipart/encrypted"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message"
 msgstr "PGP/MIME-viestiÃ¤ ei voitu tulkita"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "PGP/MIME-viestiÃ¤ ei voitu tulkita: tuntematon virhe"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1552
 msgid "Unsupported signature format"
 msgstr "Allekirjoituksen muoto ei ole tuettu"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1698
 msgid "Error verifying signature"
 msgstr "Virhe tarkistettaessa allekirjoitusta"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1689 ../mail/em-format.c:1698
 msgid "Unknown error verifying signature"
 msgstr "Tuntematon virhe tarkistettaessa allekirjoitusta"
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message"
 msgstr "PGP-viestiÃ¤ ei voitu tulkita"
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP-viestiÃ¤ ei voitu tulkita: tuntematon virhe"
 
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Every time"
 msgstr "Joka kerta"
 
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per day"
 msgstr "Kerran pÃ¤ivÃ¤ssÃ¤"
 
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per week"
 msgstr "Kerran viikossa"
 
-#: ../mail/em-mailer-prefs.c:97
+#: ../mail/em-mailer-prefs.c:98
 msgid "Once per month"
 msgstr "Kerran kuussa"
 
-#: ../mail/em-mailer-prefs.c:327
+#: ../mail/em-mailer-prefs.c:332
 msgid "Add Custom Junk Header"
 msgstr "LisÃ¤Ã¤ oma roskapostiotsake"
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:336
 msgid "Header Name:"
 msgstr "_Otsakkeen nimi:"
 
-#: ../mail/em-mailer-prefs.c:332
+#: ../mail/em-mailer-prefs.c:337
 msgid "Header Value Contains:"
 msgstr "Otsakkeen arvo sisÃ¤ltÃ¤Ã¤:"
 
-#: ../mail/em-mailer-prefs.c:437
+#: ../mail/em-mailer-prefs.c:438 ../widgets/table/e-table-click-to-add.c:500
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "YlÃ¤tunniste:"
+
+#: ../mail/em-mailer-prefs.c:442
 msgid "Contains Value"
 msgstr "SisÃ¤ltÃ¤Ã¤ arvon"
 
-#: ../mail/em-mailer-prefs.c:459
+#: ../mail/em-mailer-prefs.c:465
 msgid "Color"
 msgstr "VÃ¤ri"
 
-#: ../mail/em-mailer-prefs.c:462
+#: ../mail/em-mailer-prefs.c:468
 msgid "Tag"
 msgstr "MerkintÃ¤"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
+#: ../mail/em-mailer-prefs.c:1063 ../mail/em-mailer-prefs.c:1117
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s-lisÃ¤osa on kÃ¤ytettÃ¤vissÃ¤ ja ohjelma on asennettu."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
+#: ../mail/em-mailer-prefs.c:1071 ../mail/em-mailer-prefs.c:1126
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "%s-lisÃ¤osa ei ole kÃ¤ytettÃ¤vissÃ¤. Tarkista ettÃ¤ sen paketti on asennettu."
 
-#: ../mail/em-mailer-prefs.c:1108
+#: ../mail/em-mailer-prefs.c:1092
 msgid "No Junk plugin available"
 msgstr "RoskapostilisÃ¤osaa ei ole saatavilla"
 
+#: ../mail/em-mailer-prefs.c:1455
+msgid "Date header:"
+msgstr "PÃ¤ivÃ¤mÃ¤Ã¤rÃ¤otsikko:"
+
 #. green
-#: ../mail/em-migrate.c:1059
+#: ../mail/em-migrate.c:961
 msgid "To Do"
 msgstr "TehtÃ¤vÃ¤Ã¤"
 
 #. blue
-#: ../mail/em-migrate.c:1060
+#: ../mail/em-migrate.c:962
 msgid "Later"
 msgstr "MyÃ¶hemmin"
 
-#: ../mail/em-migrate.c:1228
+#: ../mail/em-migrate.c:1128
 msgid "Migration"
 msgstr "Siirto"
 
-#: ../mail/em-migrate.c:1673
+#: ../mail/em-migrate.c:1573
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Kansiota '%s' ei voi luoda: %s"
 
-#: ../mail/em-migrate.c:1699
+#: ../mail/em-migrate.c:1599
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Kansiota %s ei voi kopioidaan kohtaan %s: %s"
 
-#: ../mail/em-migrate.c:1884
+#: ../mail/em-migrate.c:1784
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "SÃ¤hkÃ¶postin lÃ¤pikÃ¤ynti kohteesta '%s' epÃ¤onnistui: %s"
 
-#: ../mail/em-migrate.c:1889
+#: ../mail/em-migrate.c:1789
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13137,31 +11888,31 @@ msgstr ""
 "\n"
 "Odota kÃ¤rsivÃ¤llisesti, ettÃ¤ Evolution muuntaa kansioitasi..."
 
-#: ../mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:1990
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Vanhaa POP keep-on-server tietoa '%s' ei voi avata: %s"
 
-#: ../mail/em-migrate.c:2104
+#: ../mail/em-migrate.c:2004
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "POP3 keep-on-server tietojen hakemistoa '%s' ei voi luoda: %s"
 
-#: ../mail/em-migrate.c:2133
+#: ../mail/em-migrate.c:2033
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 keep-on-server tietoa `%s' ei voi kopioida: %s"
 
-#: ../mail/em-migrate.c:2604 ../mail/em-migrate.c:2616
+#: ../mail/em-migrate.c:2504 ../mail/em-migrate.c:2516
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Paikallista sÃ¤hkÃ¶postitilaa '%s' ei voi luoda: %s"
 
-#: ../mail/em-migrate.c:2974
+#: ../mail/em-migrate.c:2874
 msgid "Migrating Folders"
 msgstr "SiirretÃ¤Ã¤n kansiota"
 
-#: ../mail/em-migrate.c:2974
+#: ../mail/em-migrate.c:2874
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -13173,12 +11924,12 @@ msgstr ""
 "\n"
 "Odota kÃ¤rsivÃ¤llisesti, ettÃ¤ Evolution muuntaa kansioiden tietoja..."
 
-#: ../mail/em-migrate.c:3056
+#: ../mail/em-migrate.c:2955
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Paikallisia sÃ¤hkÃ¶postikansioita ei voi luoda paikkaan '%s': %s"
 
-#: ../mail/em-migrate.c:3075
+#: ../mail/em-migrate.c:2974
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -13186,74 +11937,91 @@ msgstr ""
 "Asetuksia ei voi lukea aikaisemmasta Evolutionin asennuksesta, evolution/"
 "config.xmldb' on joko vaurioitunut tai puuttuu."
 
-#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../mail/em-popup.c:364
+msgid "Save As..."
+msgstr "Tallenna nimellÃ¤..."
+
+#: ../mail/em-popup.c:389
+#, c-format
+msgid "untitled_image.%s"
+msgstr "nimetÃ¶n_kuva.%s"
+
+#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "Aseta _taustakuvaksi"
+
+#: ../mail/em-popup.c:497
 msgid "_Reply to sender"
 msgstr "_Vastaa lÃ¤hettÃ¤jÃ¤lle"
 
-#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
-#: ../ui/evolution-mail-message.xml.h:83
+#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:79
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
 #. make it first item
-#: ../mail/em-popup.c:625 ../mail/em-popup.c:849
+#: ../mail/em-popup.c:547 ../mail/em-popup.c:746
 msgid "_Add to Address Book"
-msgstr "_LisÃ¤Ã¤ osoitekirjaan"
+msgstr "_LisÃ¤Ã¤ osoitekirjaan..."
 
-#: ../mail/em-subscribe-editor.c:600
+#: ../mail/em-popup.c:725
+#, c-format
+msgid "Open in %s..."
+msgstr "Avaa ohjelmassa %s"
+
+#: ../mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "TÃ¤mÃ¤ varasto ei tue tilaamista tai tilaukset eivÃ¤t ole kÃ¤ytÃ¶ssÃ¤."
 
-#: ../mail/em-subscribe-editor.c:633
+#: ../mail/em-subscribe-editor.c:639
 msgid "Subscribed"
 msgstr "Tilattu"
 
-#: ../mail/em-subscribe-editor.c:637
+#: ../mail/em-subscribe-editor.c:643
 msgid "Folder"
 msgstr "Kansio"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:839
+#: ../mail/em-subscribe-editor.c:858
 msgid "Please select a server."
 msgstr "Valitse palvelin."
 
-#: ../mail/em-subscribe-editor.c:860
+#: ../mail/em-subscribe-editor.c:894
 msgid "No server has been selected"
 msgstr "Ei palvelinta valittuna"
 
 #. Check buttons
-#: ../mail/em-utils.c:122
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:129
 msgid "_Do not show this message again."
 msgstr "Ã?lÃ¤ _nÃ¤ytÃ¤ tÃ¤tÃ¤ viestiÃ¤ uudestaan."
 
-#: ../mail/em-utils.c:318
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "Viestisuodattimet"
 
-#: ../mail/em-utils.c:371
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "viesti"
 
-#: ../mail/em-utils.c:655
+#: ../mail/em-utils.c:652
 msgid "Save Message..."
 msgstr "Tallenna viesti..."
 
-#: ../mail/em-utils.c:705
+#: ../mail/em-utils.c:702
 msgid "Add address"
 msgstr "LisÃ¤Ã¤ osoite"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1226
+#: ../mail/em-utils.c:1223
 #, c-format
 msgid "Messages from %s"
 msgstr "Viestit %s:ltÃ¤"
 
-#: ../mail/em-vfolder-editor.c:115
+#: ../mail/em-vfolder-editor.c:114
 msgid "Search _Folders"
 msgstr "_HakunÃ¤kymÃ¤t"
 
-#: ../mail/em-vfolder-rule.c:593
+#: ../mail/em-vfolder-rule.c:592
 msgid "Search Folder source"
 msgstr "HakunÃ¤kymÃ¤n lÃ¤hde"
 
@@ -13474,38 +12242,44 @@ msgid "Empty all Trash folders when exiting Evolution."
 msgstr "TyhjennÃ¤ kaikki roskakorit kun Evolution suljetaan"
 
 #: ../mail/evolution-mail.schemas.in.h:47
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+"NÃ¤ytÃ¤ animoidut kuvat HTML-viesteissÃ¤. Monista kÃ¤yttÃ¤jistÃ¤ animoidut kuvat "
+"ovat Ã¤rsyttÃ¤viÃ¤ ja he haluavat nÃ¤hdÃ¤ kuvat ilman animaatioita."
+
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Kytke caret-tila, jolloin nÃ¤et kursorin lukiessasi sÃ¤hkÃ¶postia."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable magic space bar"
 msgstr "KÃ¤ytetÃ¤Ã¤nkÃ¶ maagista vÃ¤lilyÃ¶ntinÃ¤ppÃ¤intÃ¤"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ kehto merkittÃ¤essÃ¤ useita viestejÃ¤."
+
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable or disable type ahead search feature"
 msgstr "KÃ¤ytetÃ¤Ã¤nkÃ¶ kirjoituksenaikaista hakua"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Enable search folders"
 msgstr "ota hakunÃ¤kymÃ¤t kÃ¤yttÃ¶Ã¶n"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Enable search folders on startup."
 msgstr "Ota hakunÃ¤kymÃ¤t kÃ¤yttÃ¶Ã¶n kÃ¤ynnistettÃ¤essÃ¤."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
 msgstr ""
-"Ota kÃ¤yttÃ¶Ã¶n sivupalkin hakutoiminto, jonka avulla voit aloittaa "
-"interaktiivisen haun kirjoittamalla etsittÃ¤vÃ¤n tekstin. Voit kÃ¤yttÃ¤Ã¤ tÃ¤tÃ¤ "
-"etsimÃ¤Ã¤n kansioita sivupaneelista kirjoittamalla kansion nimi, jolloin valinta "
-"hyppÃ¤Ã¤ suoraan kansion kohdalle."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -13513,42 +12287,43 @@ msgstr ""
 "kÃ¤ytÃ¤ tÃ¤tÃ¤, jos kaluat kÃ¤yttÃ¤Ã¤ vÃ¤lilyntÃ¶nÃ¤ppÃ¤intÃ¤ siirtyÃ¤ksesi viestin "
 "esikatselussa, viestiluettelossa ja kansioluettelossa."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable to render message text part of limited size."
 msgstr "Ota kÃ¤yttÃ¶Ã¶n viestin tekstiosan rajoitettu nÃ¤yttÃ¶koko."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable/disable caret mode"
 msgstr "Kytke/poista caret-tila"
 
-#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+#: ../mail/evolution-mail.schemas.in.h:58 ../mail/mail-config.glade.h:86
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Muotoile tiedostonimet outlookin ja gmailin tapaan."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
-"Encode file names in the mail headers same as Outlook or GMail does, to let "
-"them understand localized file names sent by Evolution, because they do not "
-"follow the RFC 2231, but uses incorrect RFC 2047 standard."
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
 msgstr ""
 "Koodaa tiedostonimet postiotsakkeissa samalla tavalla kuin Outlook ja Gmail, "
-"jotta ne pystyvÃ¤t tunnistamaan Evolution lÃ¤hettÃ¤mÃ¤t tiedostonimet. NÃ¤mÃ¤ "
-"ohjelmat eivÃ¤t noudata standardia RFC 2231, vaan kÃ¤yttÃ¤vÃ¤t virheellistÃ¤ "
-"standardia RFC 2047."
+"jotta ne pystyvÃ¤t tunnistamaan Evolution lÃ¤hettÃ¤mÃ¤t tiedostonimet, joissa on "
+"UTF-8 merkistÃ¶n merkkejÃ¤. NÃ¤mÃ¤ ohjelmat eivÃ¤t noudata standardia RFC 2231, "
+"vaan kÃ¤yttÃ¤vÃ¤t virheellistÃ¤ standardia RFC 2047."
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Height of the message-list pane"
 msgstr "Viestiluettelon korkeus"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Height of the message-list pane."
 msgstr "Viestiluettelopaneelin korkeus."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Piilottaa kansiokohtaisen esikatselun ja poistaa valinnan"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -13556,7 +12331,7 @@ msgstr ""
 "Jos yritÃ¤t avata 10 tai useampia viestejÃ¤ kerralla, kysytÃ¤Ã¤n haluatko "
 "todella tehdÃ¤ sen."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -13564,17 +12339,18 @@ msgstr ""
 "Jos \"Esikatselu\"-paneeli on kÃ¤ytÃ¶ssÃ¤, se nÃ¤ytetÃ¤Ã¤n viestiluettelon "
 "vieressÃ¤ eikÃ¤ alapuolella."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
 "in GNOME's MIME type database may be used for displaying content."
 msgstr ""
-"Jos jollekin MIME-tyypille ei ole sisÃ¤Ã¤nrakennettua katselinta Evolutionissa, "
-"voidaan kÃ¤yttÃ¤Ã¤ mitÃ¤ tahansa Gnomen MIME-tyyppientietokannassa mÃ¤Ã¤riteltyÃ¤ "
-"bonobo-komponentin katselinta viestin nÃ¤yttÃ¤miseen."
+"Jos jollekin MIME-tyypille ei ole sisÃ¤Ã¤nrakennettua katselinta "
+"Evolutionissa, voidaan kÃ¤yttÃ¤Ã¤ mitÃ¤ tahansa Gnomen MIME-"
+"tyyppientietokannassa mÃ¤Ã¤riteltyÃ¤ bonobo-komponentin katselinta viestin "
+"nÃ¤yttÃ¤miseen."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -13582,7 +12358,7 @@ msgstr ""
 "\"LÃ¤hetÃ¤ ja vastaanota sÃ¤hkÃ¶postia\"-ikkunan aloituskorkeus. Arvo muuttuu, "
 "jos kÃ¤yttÃ¤jÃ¤ muuttaa ikkunan korkeutta."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13595,7 +12371,7 @@ msgstr ""
 "evolution ei kÃ¤ytÃ¤ tÃ¤tÃ¤ arvoa, koska kyseinen ikkuna ei ole "
 "suurennettavissa. Avain on olemassa vain teknisten yksityiskohtien takia."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -13603,11 +12379,7 @@ msgstr ""
 "\"LÃ¤hetÃ¤ ja vastaanota sÃ¤hkÃ¶postia\"-ikkunan aloitusleveys. Arvo muuttuu, "
 "jos kÃ¤yttÃ¤jÃ¤ muuttaa ikkunan leveyttÃ¤."
 
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ vahvistusikkuna merkittÃ¤essÃ¤ useita viestejÃ¤."
-
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -13615,7 +12387,7 @@ msgstr ""
 "Poistaa kÃ¤ytÃ¶stÃ¤ ominaisuuden, joka kysyy useita kertoja vaaditaanko "
 "synkronointia yhteydettÃ¶mÃ¤Ã¤n tilaan siirryttÃ¤essÃ¤."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -13624,31 +12396,31 @@ msgstr ""
 "MÃ¤Ã¤rittÃ¤Ã¤ annetaanko toistuvia  varoituksia viestien poistosta hakunÃ¤kymistÃ¤ "
 "ja siitÃ¤, ettÃ¤ viesti poistetaan pysyvÃ¤sti, ei vain hakutuloksista."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Last time empty junk was run"
 msgstr "Viimeisin kerta, kun roskapostikansiot tyhjennettiin"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Last time empty trash was run"
 msgstr "Roskakori tyhjennettiin viimeksi"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of Labels and their associated colors"
 msgstr "MerkinnÃ¤t ja niihin liittyvÃ¤t vÃ¤rit"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "Luettelo MIME-tyypeistÃ¤, joista etsitÃ¤Ã¤n bonobo-komponenttikatselimia"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accepted licenses"
 msgstr "HyvÃ¤ksytyt lisenssit"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of accounts"
 msgstr "Luettelo tileistÃ¤"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13657,15 +12429,15 @@ msgstr ""
 "merkkijonoja, jotka nimeÃ¤vÃ¤t alihakemistoja hakemiston/apps/evolution/mail/"
 "accounts alla."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of custom headers and whether they are enabled."
 msgstr "Luettelo omista otsakkeista ja tieto siitÃ¤ ovatko ne kÃ¤ytÃ¶ssÃ¤."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Luettelo oikoluvun kÃ¤yttÃ¤mistÃ¤ sanaston kielikoodeista."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -13673,125 +12445,125 @@ msgstr ""
 "Evolutionin sÃ¤hkÃ¶postiosan tuntemat etiketit. Luettelo sisÃ¤ltÃ¤Ã¤ nimi:vÃ¤ri "
 "pareja, joissa vÃ¤ri on mÃ¤Ã¤ritelty HTML-vÃ¤rien heksadesimaalisessa muodossa."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "List of protocol names whose license has been accepted."
 msgstr "Luettelo protokollista, joiden lisenssi on hyvÃ¤ksytty."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Load images for HTML messages over HTTP"
 msgstr "Lataa HTML-viestien kuvat kÃ¤yttÃ¤en HTTP:ta"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
 "contacts. \"2\" - Always load images off the net."
 msgstr ""
-"Lataa HTML-viestien kuvia HTTP(S):n yli. Mahdolliset arvot ovat: \"0\" "
-"- Ã¤lÃ¤ koskaan lataa kuvia verkosta, \"1\" - lataa kuvat, jos lÃ¤hettÃ¤jÃ¤ on "
+"Lataa HTML-viestien kuvia HTTP(S):n yli. Mahdolliset arvot ovat: \"0\" - Ã¤lÃ¤ "
+"koskaan lataa kuvia verkosta, \"1\" - lataa kuvat, jos lÃ¤hettÃ¤jÃ¤ on "
 "osoitekirjassa ja \"2\" - lataa kuvat aina verkosta."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions"
 msgstr "Kirjaa suodatintoimenpiteet"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Log filter actions to the specified log file."
 msgstr "Kirjaa suodattimien toimenpiteet mÃ¤Ã¤riteltyyn lokitiedostoon."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions"
 msgstr "Lokitiedosto suodattimien toimenpiteille"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Logfile to log filter actions."
 msgstr "Lokitiedosto suodattimien toimenpiteille."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout"
 msgstr "Merkitse nÃ¤hdyksi mÃ¤Ã¤ritellyn viiveen jÃ¤lkeen"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark as Seen after specified timeout."
 msgstr "Merkitse nÃ¤hdyksi mÃ¤Ã¤ritellyn viiveen jÃ¤lkeen."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\""
 msgstr "Merkitse lainaukset viestin \"esikatselussa\""
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Merkitse lainaukset viestin \"esikatselussa\"."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default height"
 msgstr "Viesti-ikkunan oletuskorkeus"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message Window default width"
 msgstr "Viestiikkunan oletusleveys"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Viestin nÃ¤yttÃ¶tyyli (\"normal\", \"full headers\" tai \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Lyhin aika pÃ¤ivinÃ¤, jonka kuluttua roskapostit poistetaan suljettaessa"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Lyhin aika pÃ¤ivinÃ¤, jonka kuluttua roskakori tyhjennetÃ¤Ã¤n suljettaessa"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Lyhin aika jonka kuluttua roskapostit poistetaan suljettaessa, arvo pÃ¤ivinÃ¤."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "VÃ¤himmÃ¤isaika roskakorin tyhjennysten vÃ¤lillÃ¤ (pÃ¤iviÃ¤)."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "To-, Cc- ja Bcc-osoitteiden nÃ¤ytettÃ¤vÃ¤ lukumÃ¤Ã¤rÃ¤"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt on empty subject"
 msgstr "Kysy vahvistus, jos viestin aihe on tyhjÃ¤"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Kysy vahvistus, kun kansioista siivotaan pysyvÃ¤sti poistettuja viestejÃ¤."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Kysy vahvistus, jos yritetÃ¤Ã¤n lÃ¤hettÃ¤Ã¤ viestiÃ¤ tyhjÃ¤llÃ¤ aihe-otsakkeella."
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "Kysy vahvistus haluaako kÃ¤yttÃ¤jÃ¤ siirtyÃ¤ yhteydettÃ¶mÃ¤Ã¤n tilaan heti"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when deleting messages in search folder"
 msgstr "Kysy poistettaessa viestejÃ¤ hakukansiosta"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user expunges"
 msgstr "Kysy vahvistus, kun kÃ¤yttÃ¤jÃ¤ siivoaa poistettuja"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user only fills Bcc"
 msgstr "Kysy vahvistus, jos kÃ¤yttÃ¤jÃ¤ syÃ¶ttÃ¤Ã¤ ainoastaan Bcc-kentÃ¤n"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Kysy kun kÃ¤yttÃ¤jÃ¤ yrittÃ¤Ã¤ avata kymmenen tai useampia kerralla"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13799,136 +12571,208 @@ msgstr ""
 "Kysy vahvistus, kun ollaan lÃ¤hettÃ¤mÃ¤ssÃ¤ HTML-viestiÃ¤ vastaanottajille, jotka "
 "eivÃ¤t sellaista halua vastaanottaa."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Varmista, kun kÃ¤yttÃ¤jÃ¤ yrittÃ¤Ã¤ lÃ¤hettÃ¤Ã¤ viestiÃ¤ ilman Vastaanottaja tai Cc-"
 "kenttiÃ¤"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Kysy vahvistus, jos yritetÃ¤Ã¤n lÃ¤hteÃ¤ ei-toivottua HTML-postia"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Prompt while marking multiple messages"
 msgstr "Kysy vahvistus merkittÃ¤essÃ¤ useita viestejÃ¤"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid "Put personalized signatures at the top of replies"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Put the cursor at the bottom of replies"
+msgstr "Aseta osoitin viestin loppuun vastattaessa"
+
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Tunnista hymiÃ¶t tekstissÃ¤ ja korvaa ne kuvilla."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Recognize links in text and replace them."
 msgstr "Tunnista linkit tekstissÃ¤ ja korvaa ne linkillÃ¤"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Run junk test on incoming mail."
 msgstr "Suorita roskapostitarkistus saapuvalle postille."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Save directory"
 msgstr "Tallenna kansio"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Search for the sender photo in local address books"
 msgstr "Etsi lÃ¤hettÃ¤jÃ¤n valokuvaa paikallisista osoitekirjoista"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Send HTML mail by default"
 msgstr "LÃ¤hetÃ¤ oletuksena HTML-sÃ¤hkÃ¶postia"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Send HTML mail by default."
 msgstr "LÃ¤hetÃ¤ HTML-postia oletuksena."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Sender email-address column in the message list"
 msgstr "NÃ¤ytÃ¤ lÃ¤hettÃ¤jÃ¤n sÃ¤hkÃ¶posti viestiluettelossa"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Server synchronization interval"
 msgstr "Palvelimen synkronoinnin aikavÃ¤li"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Show \"From\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Show Animations"
 msgstr "NÃ¤ytÃ¤ animaatiot"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Show animated images as animations."
 msgstr "NÃ¤ytÃ¤ animoidut kuvat animaatioina"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "NÃ¤ytÃ¤ poistetut viestit yliviivattuna viestiluettelossa."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Show deleted messages in the message-list"
 msgstr "NÃ¤ytÃ¤ poistetut viestit viestiluettelossa"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "Show image animations"
+msgstr "NÃ¤ytÃ¤ kuvien animaatiot"
+
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Show photo of the sender"
 msgstr "NÃ¤ytÃ¤ lÃ¤hettÃ¤jÃ¤n valokuva"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:136
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid ""
+"Show the \"From\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr ""
 "NÃ¤ytÃ¤ lÃ¤hettÃ¤jÃ¤n sÃ¤hkÃ¶postiosoite viestiluettelossa erillisessÃ¤ sarakkeessa."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "NÃ¤ytÃ¤ lÃ¤hettÃ¤jÃ¤n kuva viesti-ikkunan lukupaneelissa"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Spell check inline"
 msgstr "Oikolue kirjoitettaessa"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Spell checking color"
 msgstr "Oikoluvun vÃ¤ri"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Spell checking languages"
 msgstr "Oikoluvun kielet"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Subscribe dialog default height"
 msgstr "Tilausikkunan oletuskorkeus"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Subscribe dialog default width"
 msgstr "Tilausikkunan oletusleveys"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Terminal font"
 msgstr "PÃ¤Ã¤tteen kirjasin"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Text message part limit"
 msgstr "Tekstin viestiosan kokoraja"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "The default plugin for Junk hook"
 msgstr "RoskapostikÃ¤sittelijÃ¤n oletuslisÃ¤osa"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "ViimeisimmÃ¤n roskapostien poistokerran unix-aikaleima."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "ViimeisimmÃ¤n roskakorin tyhjennyksen unix-aikaleima."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "The terminal font for mail display."
 msgstr "PÃ¤Ã¤tekirjasin viestejÃ¤ nÃ¤ytettÃ¤essÃ¤."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "The variable width font for mail display."
 msgstr "Vaihtelevan levyinen kirjasin viestejÃ¤ nÃ¤ytettÃ¤essÃ¤."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -13936,7 +12780,7 @@ msgstr ""
 "TÃ¤llÃ¤ asetuksella voi olla kolme arvoa: \"0\" (ei virheitÃ¤), \"1"
 "\" (varoitukset) tai \"2\" (vianetsintÃ¤viestit)."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
@@ -13944,7 +12788,7 @@ msgstr ""
 "MÃ¤Ã¤rittÃ¤Ã¤ evolutionin muotoileman viestin tekstiosan enimmÃ¤iskoon. "
 "Oletusarvo on 4096kt ja arvo mÃ¤Ã¤ritellÃ¤Ã¤ kilotavuina."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13954,7 +12798,7 @@ msgstr ""
 "Jos oletuslisÃ¤osaei ole kÃ¤ytÃ¶ssÃ¤, ei palata kÃ¤yttÃ¤mÃ¤Ã¤n muita kÃ¤ytÃ¶ssÃ¤ olevia "
 "lisÃ¤osia."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -13963,7 +12807,7 @@ msgstr ""
 "jÃ¤lkeen.  TÃ¤mÃ¤ peruu sÃ¤hkÃ¶postin valinnan luettelosta ja poistaa esikatselun "
 "kansiolta."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13974,7 +12818,7 @@ msgstr ""
 "otsakkeita ja sen, nÃ¤ytetÃ¤Ã¤nkÃ¶ niitÃ¤. XML-rakenteen muoto on &lt;header "
 "enabled&gt; - mÃ¤Ã¤rittele enabled, jos otsake halutaan nÃ¤yttÃ¤Ã¤ postinÃ¤kymÃ¤ssÃ¤."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -13984,11 +12828,11 @@ msgstr ""
 "mÃ¤Ã¤rittÃ¤mÃ¤Ã¤n, etsitÃ¤Ã¤nkÃ¶ paikallisesta osoitekirjasta tunnettuja osoitteita, "
 "joille ei tehdÃ¤ roskapostisuodatusta."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "This option would help in improving the speed of fetching."
 msgstr "TÃ¤mÃ¤ ominaisuus helpottaa noudon nopeuden parantamista."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13996,7 +12840,7 @@ msgstr ""
 "TÃ¤mÃ¤ asettaa viestiluettelon oletusnÃ¤kymÃ¤ssÃ¤ nÃ¤ytettÃ¤vien viestin "
 "lukumÃ¤Ã¤rÃ¤n, jonka jÃ¤lkeen nÃ¤ytetÃ¤Ã¤n '...'."
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -14004,7 +12848,7 @@ msgstr ""
 "TÃ¤mÃ¤ asetus mÃ¤Ã¤rittÃ¤Ã¤, laajennetaanko vai supistetaanko sÃ¤ikeet oletuksena. "
 "Muutos vaatii Evolutionin uudelleenkÃ¤ynnistyksen."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -14014,117 +12858,91 @@ msgstr ""
 "mukaan viestin pÃ¤ivÃ¤yksen sijasta. Muutos vaatii Evolutionin "
 "uudelleenkÃ¤ynnistyksen."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Thread the message list."
 msgstr "SÃ¤ikeistÃ¤ viestiluettelo"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Thread the message-list"
 msgstr "SÃ¤ikeistÃ¤ viestiluettelo"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Thread the message-list based on Subject"
 msgstr "SÃ¤ikeistÃ¤ viestiluettelo aiheen perusteella"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Timeout for marking message as seen"
 msgstr "Aikakatkaisu merkittÃ¤essÃ¤ viestejÃ¤ nÃ¤hdyiksi"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Timeout for marking message as seen."
 msgstr "Aikakatkaisu merkittÃ¤essÃ¤ viestejÃ¤ nÃ¤hdyiksi."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "UID string of the default account."
 msgstr "Oletustilin UID-merkkijono."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 "VÃ¤Ã¤rinkirjoitettujen sanojen alleviivauksen vÃ¤ri kÃ¤ytettÃ¤essÃ¤ kirjoituksen "
 "aikaista oikolukua."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Use SpamAssassin daemon and client"
 msgstr "KÃ¤ytÃ¤ Spamassassin-palvelinta ja -asiakasta"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "KÃ¤ytÃ¤ Spamassassin-palvelinta ja -asiakasta (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Use custom fonts"
 msgstr "KÃ¤ytÃ¤ omia kirjasimia"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Use custom fonts for displaying mail."
 msgstr "KÃ¤ytÃ¤ omia kirjasimia nÃ¤ytettÃ¤essÃ¤ viestejÃ¤."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Use only local spam tests."
 msgstr "KÃ¤ytÃ¤ ainoastaan paikallisia roskapostin tarkistuksia"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Use only the local spam tests (no DNS)."
 msgstr "KÃ¤ytÃ¤ ainoastaan paikallisia roskapostin tarkistuksia (ei DNS:Ã¤Ã¤)."
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Use side-by-side or wide layout"
 msgstr "NÃ¤ytÃ¤ vierekkÃ¤istÃ¤, leveÃ¤Ã¤ asettelua"
 
-#: ../mail/evolution-mail.schemas.in.h:166
-msgid "Variable width font"
-msgstr "Vaihtuvanlevyinen kirjasin"
-
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "View/Bcc menu item is checked"
-msgstr "NÃ¤ytÃ¤/Bcc on valittu"
-
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "View/Bcc menu item is checked."
-msgstr "NÃ¤ytÃ¤/Bcc on valittu."
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "View/Cc menu item is checked"
-msgstr "NÃ¤ytÃ¤/Cc on valittu"
-
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "View/Cc menu item is checked."
-msgstr "NÃ¤ytÃ¤/Cc on valittu."
-
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "View/From menu item is checked"
-msgstr "NÃ¤ytÃ¤/LÃ¤hettÃ¤jÃ¤ on valittu."
-
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "View/From menu item is checked."
-msgstr "NÃ¤ytÃ¤/LÃ¤hettÃ¤jÃ¤ on valittu."
-
-#: ../mail/evolution-mail.schemas.in.h:173
-msgid "View/PostTo menu item is checked"
-msgstr "NÃ¤ytÃ¤/LÃ¤hetÃ¤ ryhmÃ¤Ã¤n on valittu"
-
-#: ../mail/evolution-mail.schemas.in.h:174
-msgid "View/PostTo menu item is checked."
-msgstr "NÃ¤ytÃ¤/LÃ¤hetÃ¤ ryhmÃ¤Ã¤n on valittu"
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "View/ReplyTo menu item is checked"
-msgstr "NÃ¤ytÃ¤/Vastausosoite on valittu"
+#: ../mail/evolution-mail.schemas.in.h:183
+msgid ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "View/ReplyTo menu item is checked."
-msgstr "NÃ¤ytÃ¤/Vastausosoite on valittu"
+#: ../mail/evolution-mail.schemas.in.h:184
+msgid "Variable width font"
+msgstr "Vaihtuvanlevyinen kirjasin"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "LisÃ¤tÃ¤Ã¤nkÃ¶ kaikkiin viesteihin oletuksena kuittauspyyntÃ¶."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "Onko kansionimien typistys sivupalkissa poistettu kÃ¤ytÃ¶stÃ¤."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -14132,15 +12950,15 @@ msgstr ""
 "Palataanko viestien sÃ¤ikeistÃ¤miseen otsikon perusteella, jos otsakkeet eivÃ¤t "
 "sisÃ¤llÃ¤ In-Reply-To tai References-otsakkeita."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "JÃ¤rjestetÃ¤Ã¤nkÃ¶ sÃ¤ikeet sÃ¤ikeen viimeisen viestin mukaan"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Width of the message-list pane"
 msgstr "Viestiluettelopaneelin leveys"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Width of the message-list pane."
 msgstr "Viestiluettelopaneelin leveys."
 
@@ -14157,12 +12975,12 @@ msgid "Import mail from Elm."
 msgstr "Tuodaan sÃ¤hkÃ¶postit ElmistÃ¤."
 
 #: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:312
+#: ../plugins/pst-import/pst-importer.c:309
 msgid "Destination folder:"
 msgstr "Kohdekansio:"
 
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder to import into"
 msgstr "Valitse kansio, johon tuodaan"
 
@@ -14180,8 +12998,8 @@ msgstr "Tuodaan kansiota"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:231
-#: ../plugins/pst-import/pst-importer.c:457
-#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:512
+#: ../plugins/pst-import/pst-importer.c:454
+#: ../plugins/pst-import/pst-importer.c:560 ../shell/e-shell-importer.c:555
 #, c-format
 msgid "Importing `%s'"
 msgstr "Tuodaan '%s'"
@@ -14208,152 +13026,148 @@ msgstr "Tuo sÃ¤hkÃ¶postit PinestÃ¤."
 msgid "Mail to %s"
 msgstr "Viesti %s:lle"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:235 ../mail/mail-autofilter.c:274
 #, c-format
 msgid "Mail from %s"
 msgstr "Viesti %s:ltÃ¤"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:258
 #, c-format
 msgid "Subject is %s"
 msgstr "Aihe on %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s postilista"
 
-#: ../mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "LisÃ¤Ã¤ suodatussÃ¤Ã¤ntÃ¶"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d valittu, "
 msgstr[1] "%d valittua, "
 
-#: ../mail/mail-component.c:554
+#: ../mail/mail-component.c:577
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d poistettu"
 msgstr[1] "%d poistettua"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:584
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d roskaposti"
 msgstr[1] "%d roskapostia"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:587
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d luonnos"
 msgstr[1] "%d luonnosta"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:589
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d lÃ¤hetetty"
 msgstr[1] "%d lÃ¤hetettyÃ¤"
 
-#: ../mail/mail-component.c:568
+#: ../mail/mail-component.c:591
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d lÃ¤hettÃ¤mÃ¤tÃ¶n"
 msgstr[1] "%d lÃ¤hettÃ¤mÃ¤tÃ¶ntÃ¤"
 
-#: ../mail/mail-component.c:574
+#: ../mail/mail-component.c:597
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d lukematon, "
 msgstr[1] "%d lukematonta, "
 
-#: ../mail/mail-component.c:575
+#: ../mail/mail-component.c:598
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d viesti"
 msgstr[1] "%d viestiÃ¤"
 
-#: ../mail/mail-component.c:927
+#: ../mail/mail-component.c:952
 msgid "New Mail Message"
 msgstr "Uusi viesti"
 
-#: ../mail/mail-component.c:928
+#: ../mail/mail-component.c:953
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_SÃ¤hkÃ¶postiviesti"
 
-#: ../mail/mail-component.c:929
+#: ../mail/mail-component.c:954
 msgid "Compose a new mail message"
 msgstr "Kirjoita uusi viesti"
 
-#: ../mail/mail-component.c:935
+#: ../mail/mail-component.c:960
 msgid "New Mail Folder"
 msgstr "Uusi sÃ¤hkÃ¶postikansio"
 
-#: ../mail/mail-component.c:936
+#: ../mail/mail-component.c:961
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "SÃ¤hkÃ¶posti_kansio"
 
-#: ../mail/mail-component.c:937
+#: ../mail/mail-component.c:962
 msgid "Create a new mail folder"
 msgstr "Luo uusi sÃ¤hkÃ¶postikansio"
 
-#: ../mail/mail-component.c:1084
+#: ../mail/mail-component.c:1109
 msgid "Failed upgrading Mail settings or folders."
 msgstr "SÃ¤hkÃ¶postin asetusten tai kansioiden pÃ¤ivitys epÃ¤onnistui."
 
 #: ../mail/mail-config.glade.h:1
-msgid " Ch_eck for Supported Types "
-msgstr "Tar_kista tuetut tyypit"
-
-#: ../mail/mail-config.glade.h:2
 msgid "(Note: Requires restart of the application)"
 msgstr "(Huomautus: Vaatii ohjelman uudelleenkÃ¤ynnistÃ¤misen)"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:3
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL ei ole tuettu tÃ¤ssÃ¤ Evolutionin kÃ¤Ã¤nnÃ¶ksessÃ¤</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:4
 msgid "<b>Sender Photograph</b>"
 msgstr "<b>LÃ¤hettÃ¤jÃ¤n valokuva</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>Alle_kirjoitukset</b>"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:6
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>YlÃ¤postituksen valinta</b> (ei suositeltu)"
 
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>Kielet</b>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Tilin tiedot</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Tunnistus</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Viestien kirjoitus</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Asetukset</span>"
 
@@ -14474,59 +13288,82 @@ msgstr "Salaa _aina myÃ¶s itselle lÃ¤hetettÃ¤essÃ¤ salattu viesti"
 msgid "Always request rea_d receipt"
 msgstr "PyydÃ¤ aina vastaanoton _kuittausta"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:45
+msgid ""
+"Attachment\n"
+"Inline\n"
+"Quoted"
+msgstr ""
+"Liite\n"
+"SisÃ¤kkÃ¤inen\n"
+"Lainattu"
+
+#: ../mail/mail-config.glade.h:48
+msgid ""
+"Attachment\n"
+"Inline (Outlook style)\n"
+"Quoted\n"
+"Do not quote"
+msgstr ""
+"Liite\n"
+"SisÃ¤kkÃ¤inen (Outlookin tapaan)\n"
+"Lainattu\n"
+"Ã?lÃ¤ lainaa"
+
+#: ../mail/mail-config.glade.h:52
 msgid "Automatically insert _emoticon images"
 msgstr "LisÃ¤Ã¤ _hymiÃ¶t kuvina automaattisesti"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:53
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balttilainen (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:54
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balttilainen (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:55
 msgid "C_haracter set:"
 msgstr "_MerkistÃ¶:"
 
-#: ../mail/mail-config.glade.h:50
-msgid "Ch_eck for Supported Types "
+#: ../mail/mail-config.glade.h:56
+#: ../plugins/exchange-operations/exchange-account-setup.c:1015
+msgid "Ch_eck for Supported Types"
 msgstr "Tar_kista tuetut tyypit"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:57
 msgid "Check cu_stom headers for junk"
 msgstr "KÃ¤ytÃ¤ _omia roskpostiotsakkeita"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:58
 msgid "Check incoming _messages for junk"
 msgstr "Etsi roskapostia _saapuvasta viesteistÃ¤"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:59
 msgid "Check spelling while I _type"
 msgstr "Tarkista _oikeinkirjoitus kirjoitettaessa"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:60
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Etsi roskapostia saapuneiden viestien joukosta"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:61
 msgid "Cle_ar"
 msgstr "_TyhjennÃ¤"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:62
 msgid "Clea_r"
 msgstr "_TyhjennÃ¤"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:63
 msgid "Color for _misspelled words:"
 msgstr "_VÃ¤Ã¤rin kirjoitettujen sanojen vÃ¤ri:"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:64
 msgid "Confirm _when expunging a folder"
 msgstr "_Varmista viestien lopullinen siivous kansiosta"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:65
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14537,190 +13374,190 @@ msgid ""
 msgstr ""
 "Onneksi olkoon, sÃ¤hkÃ¶postiasetuksesi ovat nyt valmiit.\n"
 "\n"
-"Voit nyt lÃ¤hettÃ¤Ã¤ ja vastaanottaa sÃ¤hkÃ¶postia\n"
-"Evolutionin avulla.\n"
+"Voit nyt lÃ¤hettÃ¤Ã¤ ja vastaanottaa sÃ¤hkÃ¶postia Evolutionilla.\n"
 "\n"
 "Tallenna asetuksesi napsauttamalla painiketta \"Toteuta\""
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:71
 msgid "De_fault"
 msgstr "_Oletustili"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:72
 msgid "Default character e_ncoding:"
 msgstr "MerkistÃ¶n _oletuskoodaus:"
 
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.glade.h:74
 msgid "Delete junk messages on e_xit"
 msgstr "Poista roskapostit _suljettaessa"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:76
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "_Allekirjoita lÃ¤htevÃ¤t viestit sÃ¤hkÃ¶isesti (oletuksena)"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:77
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "Ã?lÃ¤ muotoile viestiÃ¤, jos viestin _koko on suurempi kuin"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:78
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Ã?lÃ¤ merkitse viestejÃ¤ _roskapostiksi, jos lÃ¤hettÃ¤jÃ¤ on osoitekirjassa"
 
-#: ../mail/mail-config.glade.h:73
-msgid "Do not quote"
-msgstr "Ã?lÃ¤ lainaa"
-
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:79
 msgid "Done"
 msgstr "Valmis"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:80
 msgid "Drafts _Folder:"
 msgstr "_Luonnosten kansio:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:81
 msgid "Email Accounts"
 msgstr "SÃ¤hkÃ¶postitilit"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:82
 msgid "Email _Address:"
 msgstr "SÃ¤hkÃ¶posti_osoite:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:83
 msgid "Empty trash folders on e_xit"
 msgstr "Tyhj_ennÃ¤ roskakorit lopetettaessa"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:84
 msgid "Enable Magic S_pacebar"
 msgstr "KÃ¤ytÃ¤ maagista _vÃ¤lilyÃ¶ntiÃ¤"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:85
 msgid "Enable Sea_rch Folders"
 msgstr "KÃ¤ytÃ¤ _hakunÃ¤kymiÃ¤"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:87
 msgid "Encry_ption certificate:"
 msgstr "_Salausvarmenne:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:88
 msgid "Encrypt out_going messages (by default)"
 msgstr "Salaa lÃ¤htevÃ¤t viestit oletuksena"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:90
 msgid "Fi_xed-width:"
 msgstr "_Tasalevyinen:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:91
 msgid "Fix_ed width Font:"
 msgstr "_Tasalevyinen kirjasin:"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:92
 msgid "Font Properties"
 msgstr "Kirjasimen ominaisuudet"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:93
 msgid "Format messages in _HTML"
 msgstr "Muotoile viestit HTML:nÃ¤"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:94
 msgid "Full Nam_e:"
 msgstr "_Koko nimi:"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:96
 msgid "HTML Messages"
 msgstr "HTML-viestit"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:97
 msgid "H_TTP Proxy:"
 msgstr "H_TTP-vÃ¤lipalvelin:"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:98
 msgid "Headers"
 msgstr "Otsakkeet"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:99
 msgid "Highlight _quotations with"
 msgstr "_Lainausten korostukseen kÃ¤ytetty vÃ¤ri"
 
-#: ../mail/mail-config.glade.h:96
-msgid "Inline"
-msgstr "SisÃ¤kkÃ¤isesti"
+#: ../mail/mail-config.glade.h:101
+msgid ""
+"If the server uses a non-standard port then specify the server address as "
+"\"server-name:port-number\""
+msgstr ""
+"Jos palvelin kÃ¤yttÃ¤Ã¤ epÃ¤standardia porttia, voit mÃ¤Ã¤ritellÃ¤ palvelimen "
+"osoitteen muodossa \"palvelin:porttinumero\""
 
-#: ../mail/mail-config.glade.h:97
-msgid "Inline (Outlook style)"
-msgstr "SisÃ¤kkÃ¤inen alkuperÃ¤isviesti (Outlookin tapaan)"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:103
 msgid "KB"
 msgstr "kt"
 
-#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:104 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "MerkinnÃ¤t"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:105
 msgid "Languages Table"
 msgstr "Kielitaulukko"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:106
 msgid "Mail Configuration"
 msgstr "SÃ¤hkÃ¶postiasetukset"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:107
 msgid "Mail Headers Table"
 msgstr "SÃ¤hkÃ¶posti otsikkotaulu"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:109
 msgid "Mailbox location"
 msgstr "Postilaatikon sijainti"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:110
 msgid "Message Composer"
 msgstr "Viestin muokkain"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:111
 msgid "No _Proxy for:"
 msgstr "Ei _vÃ¤lipalvelinta seuraaville:"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:112
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
 "Huomautus: Alaviivaa merkinnÃ¤n nimessÃ¤ kÃ¤ytetÃ¤Ã¤n valikon pikavalintana."
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Huomio: salasanaa ei kysytÃ¤ ennen kuin otat ensimmÃ¤istÃ¤ kertaa yhteyttÃ¤"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:114
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Valitsin ohitetaan, jos tÃ¤smÃ¤Ã¤vÃ¤ oma sÃ¤hkÃ¶postn roskapostiotsake lÃ¶ydetÃ¤Ã¤n."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:115
 msgid "Or_ganization:"
 msgstr "Organi_saatio:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:116
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _avaimen ID:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:117
 msgid "Pass_word:"
 msgstr "_Salasana:"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:119
+msgid "Please configure the following account settings."
+msgstr "MÃ¤Ã¤rittele seuraavat tiliasetukset."
+
+#: ../mail/mail-config.glade.h:120
 msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
+"Please enter a descriptive name for this account in the space below. This "
+"name will be used for display purposes only."
 msgstr ""
-"SyÃ¶tÃ¤ kuvaava nimi tÃ¤lle tilille allaolevaan kenttÃ¤Ã¤n.\n"
-"TÃ¤tÃ¤ nimeÃ¤ kÃ¤ytetÃ¤Ã¤n ainoastaan ohjelman sisÃ¤isesti tilin nÃ¤yttÃ¶Ã¶n."
+"SyÃ¶tÃ¤ kuvaava nimi tÃ¤lle tilille allaolevaan kenttÃ¤Ã¤n. TÃ¤tÃ¤ nimeÃ¤ kÃ¤ytetÃ¤Ã¤n "
+"ainoastaan ohjelman sisÃ¤isesti tilin nÃ¤yttÃ¶Ã¶n."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:121
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14729,7 +13566,7 @@ msgstr ""
 "asetuksista, kysy jÃ¤rjestelmÃ¤si yllÃ¤pitÃ¤jÃ¤ltÃ¤ tai Internet-"
 "palveluntarjoajaltasi."
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:122
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14739,59 +13576,43 @@ msgstr ""
 "kentÃ¤t eivÃ¤t ole pakollisia, jollet halua sisÃ¤ltÃ¤Ã¤ nÃ¤itÃ¤ tietoja "
 "lÃ¤hettÃ¤miisi sÃ¤hkÃ¶postiviesteihin."
 
-#: ../mail/mail-config.glade.h:119
-msgid "Please select among the following options"
-msgstr "Valitse joku seuraavista vaihtoehdoista"
-
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:123
 msgid "Port:"
 msgstr "Portti:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:124
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Vahvista viestin lÃ¤hetys, jos ainoastaan Bcc-vastaanottajia on mÃ¤Ã¤ritelty"
 
-#: ../mail/mail-config.glade.h:122
-msgid "Quoted"
-msgstr "Lainattu"
-
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:125
 msgid "Re_member password"
 msgstr "Muista _salasana"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:126
 msgid "Re_ply-To:"
 msgstr "_Vastausosoite:"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:128
 msgid "Remember _password"
 msgstr "Muista _salasana"
 
-#: ../mail/mail-config.glade.h:127
-msgid "S_OCKS Host:"
-msgstr "S_OCKS-palvelin:"
-
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Et_si lÃ¤hettÃ¤jÃ¤n valokuvaa vain paikallisista osoitekirjoista"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_elect..."
 msgstr "_Valitse..."
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_end message receipts:"
 msgstr "LÃ¤h_etÃ¤ viestin kuittaus:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "S_tandard Font:"
 msgstr "_Oletuskirjaisin:"
 
-#: ../mail/mail-config.glade.h:133
-msgid "Select Drafts Folder"
-msgstr "Valitse luonnosten kansio"
-
 #: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "Valitse HTML-viestin tasalevyinen kirjasin"
@@ -14808,55 +13629,51 @@ msgstr "Valitse HTML-viestin vaihtuvalevyinen kirjasin"
 msgid "Select HTML variable width font for printing"
 msgstr "Valitse HTML-viestin vaihtuvalevyinen kirjasin tulostusta varten"
 
-#: ../mail/mail-config.glade.h:138
-msgid "Select Sent Folder"
-msgstr "Valitse lÃ¤hetettyjen kansio"
-
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "LÃ¤htevÃ¤ posti"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr "LÃ¤hetettyjen _viestien kansio:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: ../mail/mail-config.glade.h:143
-msgid "Server _Type: "
-msgstr "Palvelintyyppi: "
+#: ../mail/mail-config.glade.h:142
+msgid "Server _Type:"
+msgstr "_Palvelintyyppi: "
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "_Allekirjoitusvarmenne:"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "_Allekirjoitus:"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "Allekirjoitukset"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr "Allekirjoitusten taulu"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "Oikoluku"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
 msgstr "Aloita _kirjoittaminen lopusta vastattaessa"
 
-#: ../mail/mail-config.glade.h:150
-msgid "T_ype: "
+#: ../mail/mail-config.glade.h:149
+msgid "T_ype:"
 msgstr "_Tyyppi:"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:150
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14864,17 +13681,15 @@ msgstr ""
 "Luettelo kÃ¤ytettÃ¤vissÃ¤ olevista kielistÃ¤ riippuu ainoastaan siitÃ¤, mille "
 "kielille sinulla on sanastoja asennettuna."
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
+"signature. The name you specify will be used for display purposes only."
 msgstr ""
-"TÃ¤mÃ¤n komennon tulosta kÃ¤ytetÃ¤Ã¤n allekirjoituksenasi. \n"
-"Valitsemasi nimi on kÃ¤ytÃ¶ssÃ¤ ainoastaan tÃ¤ssÃ¤ listassa\n"
-"nÃ¤ytettÃ¤essÃ¤."
+"TÃ¤mÃ¤n komennon tulostetta kÃ¤ytetÃ¤Ã¤n allekirjoituksenasi. \n"
+"Valitsemasi nimi on kÃ¤ytÃ¶ssÃ¤ ainoastaan tÃ¤ssÃ¤ listassa nÃ¤ytettÃ¤essÃ¤."
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:153
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14882,156 +13697,156 @@ msgstr ""
 "Anna nimi jolla haluaisit kutsua tÃ¤tÃ¤ sÃ¤hkÃ¶postitiliÃ¤.\n"
 "Esimerkiksi \"TyÃ¶\" tai \"HenkilÃ¶kohtaista\""
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:155
 msgid "Us_ername:"
 msgstr "KÃ¤yttÃ¤jÃ¤t_unnus:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:156
 msgid "Use Authe_ntication"
 msgstr "KÃ¤ytÃ¤ _tunnistautumista"
 
-#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
-#: ../plugins/google-account-setup/google-source.c:615
-#: ../plugins/google-account-setup/google-contacts-source.c:316
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:348
+#: ../mail/mail-config.glade.h:157 ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-source.c:701
+#: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "KÃ¤yttÃ¤jÃ¤t_unnus:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:158
 msgid "V_ariable-width:"
 msgstr "_Vaihtuva leveys:"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:159
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Forward\" to begin. "
+"Click \"Forward\" to begin."
 msgstr ""
-"Tervetuloa Evolutionin sÃ¤hkÃ¶postitilin mÃ¤Ã¤rittelyn apulaiseen.\n"
+"Tervetuloa Evolutionin sÃ¤hkÃ¶postitilin asetusapulaiseen.\n"
 "\n"
-"Valitse \"EteenpÃ¤in\" aloittaaksesi."
+"Aloita napista \"Seuraava\"."
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:162
 msgid "_Add Signature"
 msgstr "_LisÃ¤Ã¤ allekirjoitus:"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:163
 msgid "_Always load images from the Internet"
 msgstr "Lataa _aina kuvat verkosta"
 
-#: ../mail/mail-config.glade.h:166
-msgid "_Automatic proxy configuration URL:"
-msgstr "_Automaattisten vÃ¤lipalvelinasetusten URL:"
-
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "_Roskapostin oletuslisÃ¤osa"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
 msgstr "_Suora yhteys Internettiin"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Ã?lÃ¤ allekirjoita kokouskutsuja (Outlook-yhteensopivuus)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "_VÃ¤litÃ¤ tyyli:"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "_PidÃ¤ allekirjoitus alkuperÃ¤isen viestin yllÃ¤ vastattaessa"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "_Lataa viestin kuvat, jos yhteystieto on osoitekirjassa"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:171
 msgid "_Lookup in local address book only"
 msgstr "_Etsi vain paikallisesta osoitekirjasta"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "Tee tÃ¤stÃ¤ _oletustilini"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:173
 msgid "_Manual proxy configuration:"
 msgstr "_VÃ¤lipalvelimen kÃ¤sin asettaminen:"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_Merkitse viestit luetuiksi kun on kulunut"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "_Ã?lÃ¤ koskaan lataa kuvia verkosta"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Polku:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:178
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Kysy vahvistus HTML-viesteistÃ¤ henkilÃ¶ille, jotka eivÃ¤t niitÃ¤ halua"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Kysy vahvistus lÃ¤hetettÃ¤essÃ¤ viestejÃ¤ tyhjÃ¤llÃ¤ Aihe-otsakkella"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "_Vastaustyyli:"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Skripti:"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
 msgstr "_HTTPS-vÃ¤lipalvelin:"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "_Valitse..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "NÃ¤ytÃ¤ kuvien animaatiot"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_NÃ¤ytÃ¤ lÃ¤hettÃ¤jÃ¤n valokuva sÃ¤hkÃ¶postin esikatselussa"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Rajaa To-, Cc- ja Bcc-otsakkeet lukumÃ¤Ã¤rÃ¤Ã¤n "
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "_KÃ¤ytÃ¤ salattua yhteyttÃ¤:"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:190
 msgid "_Use system defaults"
 msgstr "KÃ¤ytÃ¤ jÃ¤rjestelmÃ¤n olet_uksia"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "KÃ¤ytÃ¤ samoja _kirjasimia kuin muut ohjelmat"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "osoitteet"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr " vÃ¤ri"
 
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "kuvaus"
 
+#: ../mail/mail-config.glade.h:197
+msgid "seconds"
+msgstr "sekuntia"
+
 #: ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr " "
@@ -15061,50 +13876,34 @@ msgid "All local folders"
 msgstr "Kaikki paikalliset kansiot"
 
 #: ../mail/mail-dialogs.glade.h:8
-msgid "Case _sensitive"
-msgstr "Kirjain_koolla on merkitystÃ¤"
-
-#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "_Valmis"
 
-#: ../mail/mail-dialogs.glade.h:10
-msgid "F_ind:"
-msgstr "_Etsi:"
-
-#: ../mail/mail-dialogs.glade.h:11
-msgid "Find in Message"
-msgstr "Etsi viestistÃ¤"
-
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
+#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:270
 msgid "Flag to Follow Up"
 msgstr "Merkitse edelleenlÃ¤hetettÃ¤vÃ¤ksi"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Folder Subscriptions"
 msgstr "Tilatut kansiot"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "License Agreement"
 msgstr "Lisenssisopimus"
 
-#: ../mail/mail-dialogs.glade.h:15
-msgid "None Selected"
-msgstr "Ei mitÃ¤Ã¤n valittuna"
-
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:12
 msgid "S_erver:"
 msgstr "_Palvelin: "
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Security Information"
 msgstr "Turvatiedot"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:14
 msgid "Specific folders"
 msgstr "Tietyt kansiot"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:15
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -15112,19 +13911,19 @@ msgstr ""
 "Viestit jotka olet valinnut lÃ¤hetettÃ¤viksi edelleen on listattu alla.\n"
 "Valitse tehtÃ¤vÃ¤ uudelleenlÃ¤hetys \"Merkki\" valikosta."
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:17
 msgid "_Accept License"
 msgstr "_HyvÃ¤ksy lisenssi"
 
-#: ../mail/mail-dialogs.glade.h:22
+#: ../mail/mail-dialogs.glade.h:18
 msgid "_Due By:"
 msgstr "_ErÃ¤Ã¤ntyy:"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Flag:"
 msgstr "_Merkki:"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Tick this to accept the license agreement"
 msgstr "_Laita tÃ¤hÃ¤n rasti, jos hyvÃ¤ksyt lisenssiehdot"
 
@@ -15133,21 +13932,21 @@ msgstr "_Laita tÃ¤hÃ¤n rasti, jos hyvÃ¤ksyt lisenssiehdot"
 msgid "Pinging %s"
 msgstr "Pingataan %s"
 
-#: ../mail/mail-ops.c:106
+#: ../mail/mail-ops.c:107
 msgid "Filtering Selected Messages"
 msgstr "Suodatetaan valittuja viestejÃ¤"
 
-#: ../mail/mail-ops.c:265
+#: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
 msgstr "Noudetaan viestejÃ¤"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:561
+#: ../mail/mail-ops.c:562
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Virhe kÃ¤ytettÃ¤essÃ¤ lÃ¤htevÃ¤n postin suodattimia: %s"
 
-#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
+#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15156,123 +13955,123 @@ msgstr ""
 "LisÃ¤ys '%s':Ã¤Ã¤n epÃ¤onnistui: %s\n"
 "LisÃ¤tÃ¤Ã¤n paikalliseen 'LÃ¤hetetyt' kansioon."
 
-#: ../mail/mail-ops.c:619
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Viestin lisÃ¤ys paikalliseen 'LÃ¤hetetyt'-kansioon epÃ¤onnistui: %s"
 
-#: ../mail/mail-ops.c:725
+#: ../mail/mail-ops.c:724 ../mail/mail-ops.c:805
 msgid "Sending message"
 msgstr "LÃ¤hetetÃ¤Ã¤n viestiÃ¤"
 
-#: ../mail/mail-ops.c:735
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "LÃ¤hetetÃ¤Ã¤n viestiÃ¤ %d / %d"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:761
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%d viestin %d:stÃ¤ epÃ¤onnistui"
 
-#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:701
 msgid "Canceled."
 msgstr "Peruttu."
 
-#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:703
 msgid "Complete."
 msgstr "Valmis."
 
-#: ../mail/mail-ops.c:872
+#: ../mail/mail-ops.c:877
 msgid "Saving message to folder"
 msgstr "Tallennetaan viestiÃ¤ kansioon"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Moving messages to %s"
 msgstr "SiirretÃ¤Ã¤n viestejÃ¤ kohteeseen %s"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopioidaan viestejÃ¤ kohteeseen %s"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1171
 msgid "Forwarded messages"
 msgstr "VÃ¤litetyt viestit"
 
-#: ../mail/mail-ops.c:1208
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Avataan kansiota %s"
 
-#: ../mail/mail-ops.c:1273
+#: ../mail/mail-ops.c:1277
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Noudetaan kansion %s levytilatietoja"
 
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Avataan tallennustilaa %s"
 
-#: ../mail/mail-ops.c:1413
+#: ../mail/mail-ops.c:1417
 #, c-format
 msgid "Removing folder %s"
 msgstr "Poistetaan kansiota %s"
 
-#: ../mail/mail-ops.c:1531
+#: ../mail/mail-ops.c:1535
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Tallennetaan kansiota %s"
 
-#: ../mail/mail-ops.c:1594
+#: ../mail/mail-ops.c:1598
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Siivotaan ja tallennetaan tiliÃ¤ '%s'"
 
-#: ../mail/mail-ops.c:1595
+#: ../mail/mail-ops.c:1599
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Tallennetaan tiliÃ¤ %s"
 
-#: ../mail/mail-ops.c:1649
+#: ../mail/mail-ops.c:1653
 msgid "Refreshing folder"
 msgstr "VirkistetÃ¤Ã¤n kansiota"
 
-#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
+#: ../mail/mail-ops.c:1693 ../mail/mail-ops.c:1743
 msgid "Expunging folder"
 msgstr "Poistetaan poistettuja kansiosta"
 
-#: ../mail/mail-ops.c:1736
+#: ../mail/mail-ops.c:1740
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "TyhjennetÃ¤Ã¤n roskakoria '%s'"
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1741
 msgid "Local Folders"
 msgstr "Paikalliset kansiot"
 
-#: ../mail/mail-ops.c:1818
+#: ../mail/mail-ops.c:1822
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Noudetaan viestiÃ¤ %s"
 
-#: ../mail/mail-ops.c:1925
+#: ../mail/mail-ops.c:1931
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Noudetaan %d viesti"
 msgstr[1] "Noudetaan %d viestiÃ¤"
 
-#: ../mail/mail-ops.c:2010
+#: ../mail/mail-ops.c:2016
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Tallennetaan %d viesti"
 msgstr[1] "Tallennetaan %d viestiÃ¤"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2096
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15281,11 +14080,11 @@ msgstr ""
 "Virhe tallennettaessa viestejÃ¤: %s:\n"
 "%s"
 
-#: ../mail/mail-ops.c:2160
+#: ../mail/mail-ops.c:2168
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
+#: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15294,27 +14093,27 @@ msgstr ""
 "Tulostiedostoa ei voi luoda: %s:\n"
 "%s"
 
-#: ../mail/mail-ops.c:2201
+#: ../mail/mail-ops.c:2209
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Tietoa ei voi kirjoittaa: %s"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "YhteyttÃ¤ %s katkaistaan"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Otetaan uudestaan yhteyttÃ¤ kohteeseen %s"
 
-#: ../mail/mail-ops.c:2443
+#: ../mail/mail-ops.c:2450
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Valmistellaan tiliÃ¤ \"%s\" yhteydettÃ¶mÃ¤Ã¤n tilaan"
 
-#: ../mail/mail-ops.c:2529
+#: ../mail/mail-ops.c:2536
 msgid "Checking Service"
 msgstr "Tarkistetaan palvelua"
 
@@ -15338,43 +14137,43 @@ msgstr "PÃ¤ivitetÃ¤Ã¤n..."
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:814
 #, c-format
 msgid "Checking for new mail"
 msgstr "Tarkistetaan onko uusia viestejÃ¤"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:210
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Anna salasana tunnukselle %s"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:212
 msgid "Enter Passphrase"
 msgstr "Anna salasana"
 
-#: ../mail/mail-session.c:217
-#: ../plugins/exchange-operations/exchange-config-listener.c:708
+#: ../mail/mail-session.c:215
+#: ../plugins/exchange-operations/exchange-config-listener.c:705
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Anna salasana tunnukselle %s"
 
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:217
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: ../mail/mail-session.c:261
+#: ../mail/mail-session.c:259
 msgid "User canceled operation."
 msgstr "KÃ¤yttÃ¤jÃ¤ perui toimenpiteen."
 
-#: ../mail/mail-signature-editor.c:201
+#: ../mail/mail-signature-editor.c:202
 msgid "_Save and Close"
 msgstr "_Tallenna ja sulje"
 
-#: ../mail/mail-signature-editor.c:355
+#: ../mail/mail-signature-editor.c:356
 msgid "Edit Signature"
 msgstr "Muokkaa allekirjoitusta"
 
-#: ../mail/mail-signature-editor.c:370
+#: ../mail/mail-signature-editor.c:371
 msgid "_Signature Name:"
 msgstr "Allekirjoituk_sen nimi:"
 
@@ -15407,21 +14206,21 @@ msgstr "Virheellinen kansio: ' %s'"
 msgid "Setting up Search Folder: %s"
 msgstr "MÃ¤Ã¤ritellÃ¤Ã¤n hakunÃ¤kymÃ¤Ã¤: %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:234
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "PÃ¤ivitetÃ¤Ã¤n hakunÃ¤kymÃ¤Ã¤ \"%s:%s\""
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:241
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "PÃ¤ivitetÃ¤Ã¤n hakunÃ¤kymÃ¤Ã¤ \"%s\""
 
-#: ../mail/mail-vfolder.c:1086
+#: ../mail/mail-vfolder.c:1067
 msgid "Edit Search Folder"
 msgstr "Muokkaa hakunÃ¤kymÃ¤Ã¤"
 
-#: ../mail/mail-vfolder.c:1175
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Uusi hakunÃ¤kymÃ¤"
 
@@ -15850,7 +14649,7 @@ msgstr "Synkronoi"
 
 #: ../mail/mail.error.xml.h:96
 msgid "Synchronize folders locally for offline usage?"
-msgstr "Synkronoidaanko kansiot paikalliset yhteydetÃ¶ntÃ¤ tilaa varten?"
+msgstr "Synkronoidaanko kansiot levylle verkkoyhteydetÃ¶ntÃ¤ kÃ¤yttÃ¶Ã¤ varten?"
 
 #: ../mail/mail.error.xml.h:97
 msgid ""
@@ -16039,79 +14838,78 @@ msgstr "_Poista pysyvÃ¤sti"
 msgid "_Open Messages"
 msgstr "_Avaa viestit"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "NÃ¤hty"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "NÃ¤kemÃ¤ttÃ¤"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Vastattu"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "VÃ¤litetty"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Useita lukemattomia viestejÃ¤"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Useita viestejÃ¤"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Matalin"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Matalampi"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Korkein"
 
-#: ../mail/message-list.c:1656 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1654 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1663 ../plugins/itip-formatter/itip-view.c:205
-#: ../widgets/table/e-cell-date.c:70
+#: ../mail/message-list.c:1661 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "TÃ¤nÃ¤Ã¤n %l.%M %p"
 
-#: ../mail/message-list.c:1672 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1670
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l.%M %p"
 
-#: ../mail/message-list.c:1684 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1682
 msgid "%a %l:%M %p"
 msgstr "%a %l.%M %p"
 
-#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1690
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l.%M %p"
 
-#: ../mail/message-list.c:1694 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1692
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3985 ../mail/message-list.c:4450
+#: ../mail/message-list.c:3987 ../mail/message-list.c:4462
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
-#: ../mail/message-list.c:4289
+#: ../mail/message-list.c:4299
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -16119,7 +14917,13 @@ msgstr ""
 "MikÃ¤Ã¤n viesti ei vastaa hakuehtojasi. TyhjennÃ¤ hakukenttÃ¤ valikon kohdasta "
 "Haku -> TyhjennÃ¤ tai muuta hakua."
 
-#: ../mail/message-list.c:4291
+#: ../mail/message-list.c:4301
+msgid ""
+"There are only hidden messages in this folder. Use View->Show Hidden "
+"Messages to show them."
+msgstr ""
+
+#: ../mail/message-list.c:4303
 msgid "There are no messages in this folder."
 msgstr "TÃ¤ssÃ¤ kansiossa ei ole viestejÃ¤."
 
@@ -16149,6 +14953,7 @@ msgstr "LÃ¤hetetyt viestit"
 
 #: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
+#: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "Koko"
 
@@ -16156,39 +14961,39 @@ msgstr "Koko"
 msgid "Subject - Trimmed"
 msgstr "Otsikko - rajattu"
 
-#: ../mail/message-tag-followup.c:55
+#: ../mail/message-tag-followup.c:54
 msgid "Call"
 msgstr "Soita"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr "Ã?lÃ¤ vÃ¤litÃ¤"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr "LÃ¤hetÃ¤ edelleen"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "For Your Information"
 msgstr "Tiedoksesi"
 
-#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:58 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "VÃ¤litÃ¤"
 
-#: ../mail/message-tag-followup.c:60
+#: ../mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr "Vastaus ei vÃ¤lttÃ¤mÃ¤tÃ¶n"
 
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:62 ../ui/evolution-mail-message.xml.h:76
 msgid "Reply"
 msgstr "Vastaa"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:77
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
-#: ../mail/message-tag-followup.c:65
+#: ../mail/message-tag-followup.c:64
 msgid "Review"
 msgstr "Arvio"
 
@@ -16213,20 +15018,24 @@ msgid "Subject contains"
 msgstr "Otsikko sisÃ¤ltÃ¤Ã¤"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Addresses contains"
+msgstr "Aihe tai lÃ¤hettÃ¤jÃ¤t sisÃ¤ltÃ¤vÃ¤t"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Recipients contains"
 msgstr "Aihe tai vastaanottaja sisÃ¤ltÃ¤Ã¤"
 
-#: ../mail/searchtypes.xml.h:7
+#: ../mail/searchtypes.xml.h:8
 msgid "Subject or Sender contains"
 msgstr "Aihe tai lÃ¤hettÃ¤jÃ¤ sisÃ¤ltÃ¤Ã¤"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "Paikalliset osoitekirjat"
+msgid "Add local address books to Evolution."
+msgstr "LisÃ¤Ã¤ paikallisia osoitekirjoja Evolutioniin."
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Provides core functionality for local address books."
-msgstr "Tarjoaa paikallisten osoitekirjojen perustoiminnot."
+msgid "Local Address Books"
+msgstr "Paikalliset osoitekirjat"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
 msgid ""
@@ -16240,8 +15049,8 @@ msgid ""
 "body."
 msgstr "Luettelo vihjeistÃ¤, joita liitemuistuttaja etsii viestin rungosta."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
-#: ../plugins/templates/templates.c:390
+#: ../plugins/attachment-reminder/attachment-reminder.c:476
+#: ../plugins/templates/templates.c:389
 msgid "Keywords"
 msgstr "Avainsanat"
 
@@ -16251,12 +15060,8 @@ msgid "Attachment Reminder"
 msgstr "Liitemuistuttaja"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid ""
-"Looks for clues in a message for mention of attachments and warns if the "
-"attachment is missing"
+msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr ""
-"Tunnistaa viesteistÃ¤ viitteitÃ¤ liitetiedostoista, ja varoittaa puuttuvista "
-"liitetiedostoista"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
@@ -16270,23 +15075,23 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "ViestissÃ¤ ei ole liitteitÃ¤"
 
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Add attachment..."
+msgstr "_LisÃ¤Ã¤ liite..."
+
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Edit Message"
 msgstr "_Muokkaa viestiÃ¤"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid ""
-"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from Evolution."
-msgstr ""
-"MuotoilulisÃ¤osa, joka esittÃ¤Ã¤ Ã¤Ã¤niliitteet sisÃ¤kkÃ¤isesti ja sallii niiden "
-"soittamisen suoraan Evolutionista."
+msgid "Audio Inline"
+msgstr "Ã?Ã¤net sisÃ¤kkisesti"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Audio inline plugin"
-msgstr "Ã?Ã¤nensoiton lisÃ¤osa"
+msgid "Play audio attachments directly from Evolution."
+msgstr "Soita Ã¤Ã¤niliitteet suoraan sÃ¤hkÃ¶postiviesteistÃ¤."
 
-#: ../plugins/backup-restore/backup-restore.c:138
+#: ../plugins/backup-restore/backup-restore.c:139
 msgid "Select name of the Evolution backup file"
 msgstr "Valitse Evolutionin varmuuskopiotiedoston nimi"
 
@@ -16309,137 +15114,138 @@ msgstr "Palauta varmuuskopio"
 #: ../plugins/backup-restore/backup-restore.c:289
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. \n"
-"It also restores all your personal settings, mail filters etc."
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
 msgstr ""
 "Voit palauttaa evolutionin varmuuskopioista. NÃ¤in pystyt palauttamaan kaikki "
-"sÃ¤hkÃ¶postit, kalenterit, tehtÃ¤vÃ¤t, muistiot ja osoitekirjat.\n"
+"sÃ¤hkÃ¶postit, kalenterit, tehtÃ¤vÃ¤t, muistiot ja osoitekirjat. "
 "Palautus palauttaa myÃ¶s kaikki asetukset, sÃ¤hkÃ¶postisuotimet jne."
 
-#: ../plugins/backup-restore/backup-restore.c:295
+#: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
 msgstr "_Palauta Evolution varmuuskopiotiedostosta"
 
-#: ../plugins/backup-restore/backup-restore.c:302
+#: ../plugins/backup-restore/backup-restore.c:304
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Valitse palautettava Evolution-varmuuskopio:"
 
-#: ../plugins/backup-restore/backup-restore.c:305
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Choose a file to restore"
 msgstr "Valitse palautettava tiedosto"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
 msgstr "Varmuuskopioi Evolutionin hakemisto"
 
-#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:64
 msgid "Restore Evolution directory"
 msgstr "Palauta Evolutionin hakemisto"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:66
 msgid "Check Evolution Backup"
 msgstr "Tarkista evolutionin varmuuskopio"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restart Evolution"
 msgstr "KÃ¤ynnistÃ¤ Evolution uudestaan"
 
-#: ../plugins/backup-restore/backup.c:73
+#: ../plugins/backup-restore/backup.c:70
 msgid "With Graphical User Interface"
 msgstr "Graafisen kÃ¤yttÃ¶liittymÃ¤n kanssa"
 
-#: ../plugins/backup-restore/backup.c:124
-#: ../plugins/backup-restore/backup.c:257
+#: ../plugins/backup-restore/backup.c:188
+#: ../plugins/backup-restore/backup.c:250
 msgid "Shutting down Evolution"
 msgstr "Sammutetaan Evolutionia"
 
-#: ../plugins/backup-restore/backup.c:131
+#: ../plugins/backup-restore/backup.c:195
 msgid "Backing Evolution accounts and settings"
 msgstr "Varmuuskopioidaan Evolutionin tilejÃ¤ ja asetuksia"
 
-#: ../plugins/backup-restore/backup.c:135
+#: ../plugins/backup-restore/backup.c:201
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Varmuuskopioidaan Evolutionin tietoja (viestejÃ¤, yhteystietoja, "
 "kalentereita, tehtÃ¤viÃ¤ ja muistioita)"
 
-#: ../plugins/backup-restore/backup.c:146
+#: ../plugins/backup-restore/backup.c:212
 msgid "Backup complete"
 msgstr "Varmuuskopio on valmis"
 
-#: ../plugins/backup-restore/backup.c:151
-#: ../plugins/backup-restore/backup.c:338
+#: ../plugins/backup-restore/backup.c:217
+#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:284
 msgid "Restarting Evolution"
 msgstr "KÃ¤ynnistetÃ¤Ã¤n Evolution uudestaan"
 
-#: ../plugins/backup-restore/backup.c:261
+#: ../plugins/backup-restore/backup.c:254
 msgid "Backup current Evolution data"
 msgstr "Varmuuskopioi tÃ¤mÃ¤nhetkiset Evolutionin tiedot"
 
-#: ../plugins/backup-restore/backup.c:266
+#: ../plugins/backup-restore/backup.c:259
 msgid "Extracting files from backup"
 msgstr "Puretaan tiedostoja varmuuskopiosta"
 
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:266
 msgid "Loading Evolution settings"
 msgstr "Ladataan Evolutionin asetuksia"
 
-#: ../plugins/backup-restore/backup.c:277
+#: ../plugins/backup-restore/backup.c:273
 msgid "Removing temporary backup files"
 msgstr "Poistetaan varmuuskopioinnin vÃ¤liaikaistiedostoja"
 
-#: ../plugins/backup-restore/backup.c:284
+#: ../plugins/backup-restore/backup.c:280
 msgid "Ensuring local sources"
 msgstr "Tarkistetaan paikalliset lÃ¤hteet"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:429
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Varmuuskopioidaan kansioon %s"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:434
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Palautetaan kansiosta %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Backup"
 msgstr "Evolutionin varmuuskopiointi"
 
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Restore"
 msgstr "Evolutionin palautus"
 
-#: ../plugins/backup-restore/backup.c:513
+#: ../plugins/backup-restore/backup.c:489
 msgid "Backing up Evolution Data"
 msgstr "Varmuuskopioidaan Evolutionin tietoja"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:490
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Odota, ettÃ¤ Evolution ottaa varmuuskopion tiedoistasi."
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:492
 msgid "Restoring Evolution Data"
 msgstr "Palautetaan Evolutionin tietoja"
 
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:493
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Odota, ettÃ¤ Evolution palauttaa tietosi."
 
-#: ../plugins/backup-restore/backup.c:535
+#: ../plugins/backup-restore/backup.c:511
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "TÃ¤mÃ¤ saattaa kestÃ¤Ã¤ hetken, riippuen tilillÃ¤si olevien tietojen mÃ¤Ã¤rÃ¤stÃ¤."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
-msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr "Varmuuskopioi ja palauta Evolutionin tietoja ja asetuksia."
-
 #. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+msgid "Backup and Restore"
+msgstr "Varmuuskopiointi ja palautus"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore plugin"
-msgstr "Varmuuskopioinnin ja palautuksen lisÃ¤osa"
+msgid "Backup and restore your Evolution data and settings."
+msgstr "Varmuuskopioi ja palauta Evolutionin tietoja ja asetuksia."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
@@ -16505,73 +15311,77 @@ msgstr "_Palauta asetukset..."
 msgid "_Backup Settings..."
 msgstr "_Varmuuskopioi asetukset..."
 
-#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
+#: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automaattiset yhteystiedot"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:639
-msgid "_Auto-create address book entries when replying to messages"
-msgstr "LisÃ¤Ã¤ lÃ¤hettÃ¤jÃ¤ _automaattisesti osoitekirjaan vastattaessa viestiin"
+#: ../plugins/bbdb/bbdb.c:646
+msgid "Create _address book entries when sending mails"
+msgstr "LisÃ¤Ã¤ lÃ¤hettÃ¤jÃ¤ _osoitekirjaan lÃ¤hetettÃ¤essÃ¤ viestejÃ¤"
 
-#: ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:652
 msgid "Select Address book for Automatic Contacts"
 msgstr "Valitse osoitekirja automaattisille yhteystiedoille"
 
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:667
 msgid "Instant Messaging Contacts"
 msgstr "PikaviestinnÃ¤n yhteystiedot"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:675
+#: ../plugins/bbdb/bbdb.c:682
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "YhdistÃ¤ yhteystiedot ja kuvat pidginin tuttavalistasta"
 
-#: ../plugins/bbdb/bbdb.c:681
+#: ../plugins/bbdb/bbdb.c:688
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Valitse osoitekirja Pigdinin tuttavalistalle"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:692
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Synchronize with _buddy list now"
 msgstr "YhdistÃ¤ tiedot _tuttavalistasta"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
 "Automatically fills your address book with names and email addresses as you "
-"reply to messages. Also fills in IM contact information from your buddy "
+"reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
+"Huolehtii tylsistÃ¤ osoitekirjan hallintatehtÃ¤vistÃ¤.\n"
+"\n"
 "LisÃ¤Ã¤ nimet ja sÃ¤hkÃ¶postiosoitteet automaattisesti osoitekirjaan, kun "
 "vastaat viesteihin. LiittÃ¤Ã¤ myÃ¶s IM-yhteystiedot tuttavalistoiltasi."
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-msgid "BBDB"
-msgstr "BBDB"
-
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Tapahtui virhe kÃ¤ynnistettÃ¤essÃ¤ %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilter-lapsiprosessi ei vastaa, tapetaan..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Bogofilter-lapsiprosessin odotus keskeytettiin, lopetetaan..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Putki bogofilterille epÃ¤onnistui, virhekoodi: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
 msgid "Convert message text to _Unicode"
 msgstr "Muunna viestin teksti _Unicode-muotoon"
 
@@ -16588,73 +15398,109 @@ msgstr ""
 "merkinnÃ¤t eivÃ¤t eroa merkistÃ¶jen vÃ¤lillÃ¤."
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Options"
-msgstr "Bogofilter-asetukset"
+msgid "Bogofilter Junk Filter"
+msgstr "Bogofilter-roskapostisuodatin"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter junk plugin"
-msgstr "Bogofilter-roskapostilisÃ¤osa"
+msgid "Bogofilter Options"
+msgstr "Bogofilter-asetukset"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filters junk messages using Bogofilter."
-msgstr "Suodattaa roskaposteja kÃ¤yttÃ¤en bogofilteriÃ¤."
+msgid "Filter junk messages using Bogofilter."
+msgstr "Suodata roskaposteja bogofilterillÃ¤."
 
-#. we found the group, change the name based on the actual language
-#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
+#: ../plugins/caldav/caldav-source.c:64
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:348
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/caldav/caldav-source.c:366
+#: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:372
-#: ../plugins/google-account-setup/google-source.c:608
-#: ../plugins/google-account-setup/google-contacts-source.c:339
+#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "KÃ¤ytÃ¤ _SSLÃ¤Ã¤"
 
 #. add refresh option
-#: ../plugins/caldav/caldav-source.c:415
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:509
-#: ../plugins/google-account-setup/google-source.c:632
-#: ../plugins/google-account-setup/google-contacts-source.c:358
+#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-file/calendar-file.c:274
+#: ../plugins/calendar-http/calendar-http.c:308
+#: ../plugins/calendar-weather/calendar-weather.c:508
+#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-contacts-source.c:322
 msgid "Re_fresh:"
 msgstr "Vi_rkistÃ¤:"
 
+#: ../plugins/caldav/caldav-source.c:451
+#: ../plugins/calendar-file/calendar-file.c:296
+#: ../plugins/calendar-http/calendar-http.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:743
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+msgid "weeks"
+msgstr "viikkoa"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Calendar sources"
-msgstr "CalDAV-kalenterien lÃ¤hteet"
+msgid "Add CalDAV support to Evolution."
+msgstr "LisÃ¤Ã¤ CalDAV-tuki Evolutioniin."
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "CalDAV sources"
-msgstr "CalDAV-lÃ¤hteet"
+msgid "CalDAV Support"
+msgstr "CalDAV-tuki"
+
+#: ../plugins/calendar-file/calendar-file.c:208
+msgid "_Customize options"
+msgstr "_Muokkausvalinnat"
+
+#: ../plugins/calendar-file/calendar-file.c:227
+msgid "File _name:"
+msgstr "_Tiedostonimi:"
+
+#: ../plugins/calendar-file/calendar-file.c:231
+msgid "Choose calendar file"
+msgstr "Valitse kalenteritiedosto"
+
+#: ../plugins/calendar-file/calendar-file.c:279
+msgid "On open"
+msgstr "Avattaessa"
+
+#: ../plugins/calendar-file/calendar-file.c:280
+msgid "On file change"
+msgstr "Tiedoston muuttuessa"
+
+#: ../plugins/calendar-file/calendar-file.c:281
+msgid "Periodically"
+msgstr "Toistuvasti"
+
+#: ../plugins/calendar-file/calendar-file.c:308
+msgid "Force read _only"
+msgstr "Pakota vain _luku"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "Paikalliset kalenterit"
+msgid "Add local calendars to Evolution."
+msgstr "LisÃ¤Ã¤ paikallisia kalentereita Evolutioniin."
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Provides core functionality for local calendars."
-msgstr "Tarjoaa paikallisten kalenterien perustoiminnot."
+msgid "Local Calendars"
+msgstr "Paikalliset kalenterit"
 
-#: ../plugins/calendar-http/calendar-http.c:332
+#: ../plugins/calendar-http/calendar-http.c:369
 msgid "_Secure connection"
 msgstr "_Salattu yhteys"
 
-#: ../plugins/calendar-http/calendar-http.c:397
+#: ../plugins/calendar-http/calendar-http.c:455
 msgid "Userna_me:"
 msgstr "KÃ¤yttÃ¤jÃ¤t_unnus:"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "HTTP Calendars"
-msgstr "HTTP-kalenterit"
+msgid "Add web calendars to Evolution."
+msgstr "LisÃ¤Ã¤ web-kalentereita Evolutioniin."
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Provides core functionality for webcal and http calendars."
-msgstr "Tarjoaa webcal- ja http-kalentereiden perustoiminnot."
+msgid "Web Calendars"
+msgstr "Web-kalenterit"
 
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
@@ -16696,37 +15542,33 @@ msgstr "SÃ¤Ã¤: ukkosmyrskyjÃ¤"
 msgid "Select a location"
 msgstr "Valitse sijainti"
 
-#: ../plugins/calendar-weather/calendar-weather.c:615
+#: ../plugins/calendar-weather/calendar-weather.c:606
 msgid "_Units:"
 msgstr "_YksikkÃ¶:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:622
+#: ../plugins/calendar-weather/calendar-weather.c:613
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metrinen (Celsiusta, cm jne.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:623
+#: ../plugins/calendar-weather/calendar-weather.c:614
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperial (Fahrenheitia, tuumia jne.)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Provides core functionality for weather calendars."
-msgstr "Tarjoaa sÃ¤Ã¤kalentereiden perustoiminnot."
+msgid "Add weather calendars to Evolution."
+msgstr "LisÃ¤Ã¤ sÃ¤Ã¤kalenterit Evolutioniin."
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "SÃ¤Ã¤kalenterit"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a popup menu plugin which lets you copy "
-"things to the clipboard."
-msgstr ""
-"TestilisÃ¤osa, joka tarjoaa ponnahdusikkunan jolla voit kopioida asioita "
-"leikepÃ¶ydÃ¤lle."
+msgid "Copy Tool"
+msgstr "KopiointityÃ¶kalu"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy tool"
-msgstr "KopiointityÃ¶kalu"
+msgid "Copy things to the clipboard."
+msgstr "Kopioi asioita leikepÃ¶ydÃ¤lle"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
@@ -16739,35 +15581,35 @@ msgstr ""
 "Tarkista aina Evolutionin kÃ¤ynnistyessÃ¤ onko se sÃ¤hkÃ¶postin oletusohjelma."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Checks whether Evolution is the default mail client on startup."
-msgstr "Tarkistaa kÃ¤ynnistettÃ¤essÃ¤ onko evolution sÃ¤hkÃ¶postin oletusohjelma."
+msgid "Check whether Evolution is the default mail client on startup."
+msgstr "Tarkista kÃ¤ynnistettÃ¤essÃ¤, onko Evolution sÃ¤hkÃ¶postin oletusohjelma."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client "
-msgstr "SÃ¤hkÃ¶postin oletusasiakas "
+msgid "Default Mail Client"
+msgstr "SÃ¤hkÃ¶postin oletusohjelma"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Haluatko kÃ¤yttÃ¤Ã¤ Evolutionia oletuksena sÃ¤hkÃ¶postin kÃ¤sittelyyn?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:599
+#: ../shell/main.c:627
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../plugins/default-source/default-source.c:82
+#: ../plugins/default-source/default-source.c:80
 msgid "Mark as _default address book"
 msgstr "Merkitse _oletusosoitekirjaksi"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:101
 msgid "Mark as _default calendar"
 msgstr "Merkitse _oletuskalenteriksi"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:102
 msgid "Mark as _default task list"
 msgstr "Merkitse _oletustehtÃ¤vÃ¤listaksi"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default memo list"
 msgstr "Merkitse _oletusmuistiolistaksi"
 
@@ -16776,34 +15618,30 @@ msgid "Default Sources"
 msgstr "OletuslÃ¤hteet"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid ""
-"Provides functionality for marking a calendar or an address book as the "
-"default one."
-msgstr ""
-"Tarjoaa toiminallisuuden kalenterien tai osoitekirjojen merkitsemiseksi "
-"oletusvalinnaksi."
+msgid "Mark your preferred address book and calendar as default."
+msgstr "Merkitse haluamasi osoitekirja ja kalenteri oletusarvoisiksi."
 
-#: ../plugins/email-custom-header/email-custom-header.c:334
+#: ../plugins/email-custom-header/email-custom-header.c:333
 msgid "Security:"
 msgstr "Turvallisuus:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:338
 msgid "Unclassified"
 msgstr "Ei luokiteltu"
 
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:339
 msgid "Protected"
 msgstr "Suojattu"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:341
 msgid "Secret"
 msgstr "Salainen"
 
-#: ../plugins/email-custom-header/email-custom-header.c:343
+#: ../plugins/email-custom-header/email-custom-header.c:342
 msgid "Top secret"
 msgstr "ErittÃ¤in salainen"
 
-#: ../plugins/email-custom-header/email-custom-header.c:585
+#: ../plugins/email-custom-header/email-custom-header.c:584
 msgid "_Custom Header"
 msgstr "_Omat otsakkeet"
 
@@ -16812,7 +15650,7 @@ msgid "Key"
 msgstr "Avaimet"
 
 #: ../plugins/email-custom-header/email-custom-header.c:917
-#: ../plugins/templates/templates.c:396
+#: ../plugins/templates/templates.c:395
 msgid "Values"
 msgstr "Arvot"
 
@@ -16831,8 +15669,8 @@ msgstr "Omat sÃ¤hkÃ¶postiotsakkeet"
 
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
-msgid "Adds custom header to outgoing messages."
-msgstr "LisÃ¤Ã¤ oman otsakkeen lÃ¤hteviin viesteihin."
+msgid "Add custom headers to outgoing mail messages."
+msgstr "LisÃ¤Ã¤ oma otsake lÃ¤hteviin viesteihin."
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 msgid "Custom Header"
@@ -16891,11 +15729,11 @@ msgid ""
 msgstr ""
 "YhdistÃ¤ Exchange-palvelimelle kÃ¤yttÃ¤en tavallista selvÃ¤kielistÃ¤ salasanaa."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
+#: ../plugins/exchange-operations/exchange-account-setup.c:271
 msgid "Out Of Office"
 msgstr "Poissa konttorilta"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16903,90 +15741,93 @@ msgstr ""
 "Alla mÃ¤Ã¤ritelty viesti lÃ¤hetÃ¤Ã¤n automaattisesti jokaiselle \n"
 "henkilÃ¶lle, joka lÃ¤hettÃ¤Ã¤ sÃ¤hkÃ¶postia sinulle kun et ole tavoitettavissa."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:296
+#: ../plugins/exchange-operations/exchange-account-setup.c:290
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am out of the office"
 msgstr "En ole tavoitettavissa"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:292
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:294
 msgid "I am in the office"
 msgstr "Olen tavoitettavissa"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:343
+#: ../plugins/exchange-operations/exchange-account-setup.c:340
 msgid "Change the password for Exchange account"
 msgstr "SyÃ¶tÃ¤ Exchange-tilin salasana"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
+#: ../plugins/exchange-operations/exchange-account-setup.c:342
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Vaihda salasana"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:350
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Muokkaa Exchange-tilin valtuutusasetuksia"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:352
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "Delegation Assistant"
 msgstr "Valtuutuksen apulainen"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Miscelleneous"
 msgstr "Sekalaiset"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:374
+#: ../plugins/exchange-operations/exchange-account-setup.c:371
 msgid "View the size of all Exchange folders"
 msgstr "NÃ¤ytÃ¤ kaikkien Exchange-kansioiden koko"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:376
+#: ../plugins/exchange-operations/exchange-account-setup.c:373
 msgid "Folders Size"
 msgstr "Kansioiden koko"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:383
+#: ../plugins/exchange-operations/exchange-account-setup.c:380
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchangen asetukset"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:730
+#: ../plugins/exchange-operations/exchange-account-setup.c:726
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:756
+#: ../plugins/exchange-operations/exchange-account-setup.c:752
 msgid "A_uthenticate"
 msgstr "K_irjautuminen"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:777
-msgid "S_pecify the mailbox name"
-msgstr "_Anna sÃ¤hkÃ¶postikansion nimi"
+#: ../plugins/exchange-operations/exchange-account-setup.c:774
+msgid "Mailbox name is _different than user name"
+msgstr "SÃ¤hkÃ¶postikansion _nimi on eri kuin kÃ¤yttÃ¤jÃ¤tunnus."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:790
+#: ../plugins/exchange-operations/exchange-account-setup.c:787
 msgid "_Mailbox:"
 msgstr "_SÃ¤hkÃ¶postikansio:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1005
+#: ../plugins/exchange-operations/exchange-account-setup.c:1001
 msgid "_Authentication Type"
 msgstr "_Tunnistautumistapa"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1019
-msgid "Ch_eck for Supported Types"
-msgstr "Tar_kista tuetut tyypit"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1134
+#: ../plugins/exchange-operations/exchange-account-setup.c:1130
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s kt"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1136
+#: ../plugins/exchange-operations/exchange-account-setup.c:1132
 #: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 kt"
 
+#. FIXME: Take care of i18n
+#: ../plugins/exchange-operations/exchange-account-setup.c:1137
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
+msgid "Size:"
+msgstr "Koko:"
+
 #: ../plugins/exchange-operations/exchange-calendar.c:196
 #: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
@@ -16994,7 +15835,7 @@ msgid ""
 "Please switch to online mode for such operations."
 msgstr ""
 "Evolution on yhteydettÃ¶mÃ¤ssÃ¤ tilassa. Et voi luoda tai muokata kansioita.\n"
-"Vaihda yhteydelliseen tilaan, jotta voit suorittaa nÃ¤itÃ¤ toimintoja."
+"Avaa verkkoyhteydet, jotta voit suorittaa nÃ¤itÃ¤ toimintoja."
 
 #. User entered a wrong existing
 #. * password. Prompt him again.
@@ -17027,38 +15868,35 @@ msgstr "Uusi salasana:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "Salasanasi on vanhentunut. Ole hyvÃ¤ ja vaihda salasanasi nyt."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:660
+#: ../plugins/exchange-operations/exchange-config-listener.c:657
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Salasanasi vanhenee seuraavan %d pÃ¤ivÃ¤n kuluessa"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:154
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
+#: ../plugins/exchange-operations/exchange-delegates-user.c:142
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
 msgid "Custom"
 msgstr "Oma nÃ¤kymÃ¤"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:184
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates-user.c:168
 msgid "Editor (read, create, edit)"
 msgstr "Muokkaaja (kirjoita, luo, muokkaa)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:188
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+#: ../plugins/exchange-operations/exchange-delegates-user.c:172
 msgid "Author (read, create)"
 msgstr "Kirjoittaja (lue, luo)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:192
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+#: ../plugins/exchange-operations/exchange-delegates-user.c:176
 msgid "Reviewer (read-only)"
 msgstr "Tarkastaja (vain luku)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:242
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates-user.c:225
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Delegate Permissions"
 msgstr "Valtuutettujen oikeudet"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:253
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
+#: ../plugins/exchange-operations/exchange-delegates-user.c:236
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "Oikeudet kÃ¤yttÃ¤jÃ¤lle %s"
@@ -17066,7 +15904,7 @@ msgstr "Oikeudet kÃ¤yttÃ¤jÃ¤lle %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:343
+#: ../plugins/exchange-operations/exchange-delegates-user.c:326
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -17076,84 +15914,96 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:348
+#: ../plugins/exchange-operations/exchange-delegates-user.c:331
 msgid "You have been given the following permissions on my folders:"
 msgstr "Sinulle on annettu seuraavat oikeudet kansioihini:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:366
+#: ../plugins/exchange-operations/exchange-delegates-user.c:351
 msgid "You are also permitted to see my private items."
 msgstr "Sinulla on myÃ¶s lupa katsoa yksityisiÃ¤ tietojani."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:373
+#: ../plugins/exchange-operations/exchange-delegates-user.c:358
 msgid "However you are not permitted to see my private items."
 msgstr "Sinulla ei kuitenkaan ole lupaa katsoa yksityisiÃ¤ tietojani."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:405
+#: ../plugins/exchange-operations/exchange-delegates-user.c:390
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Sinut on nimetty kÃ¤yttÃ¤jÃ¤n %s valtuutetuksi"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To"
 msgstr "Valtuuta henkilÃ¶"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:582
+#: ../plugins/exchange-operations/exchange-delegates.c:581
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Poistetaanko valtuutus %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:700
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "Active Directorya ei voi avata"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:712
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "Omia tietoja ei lÃ¶ytynyt Active DirectorystÃ¤"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:725
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Valtuutettua %s ei lÃ¶ytynyt Active DirectorystÃ¤"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:737
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Valtuutettua %s ei voi poista"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "Valtuutettujen listaa ei voi pÃ¤ivittÃ¤Ã¤."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:815
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Valtuutettua %s ei voi lisÃ¤tÃ¤"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:983
+#: ../plugins/exchange-operations/exchange-delegates.c:980
 msgid "Error reading delegates list."
 msgstr "Virhe luettaessa listaa valtuutetuista."
 
 #. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
 msgid "C_alendar:"
 msgstr "K_alenteri:"
 
 #. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
 msgid "Co_ntacts:"
 msgstr "Y_hteystiedot: "
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegates"
 msgstr "Valtuutetut"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+msgid ""
+"None\n"
+"Reviewer (read-only)\n"
+"Author (read, create)\n"
+"Editor (read, create, edit)"
+msgstr ""
+"Ei mitÃ¤Ã¤n\n"
+"Tarkistaja (vain luku)\n"
+"Kirjoittaja (lue, kirjoita)\n"
+"Muokkaaja (lue, kirjoita, muokkaa)"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Permissions for"
 msgstr "Oikeudet kohteelle"
 
@@ -17180,6 +16030,7 @@ msgstr "_Yhteenveto oikeuksista"
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:20
+#: ../plugins/itip-formatter/itip-view.c:1912
 msgid "_Tasks:"
 msgstr "_TehtÃ¤vÃ¤t:"
 
@@ -17197,11 +16048,11 @@ msgid "Folder Size"
 msgstr "Kansion koko"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
 msgid "User"
 msgstr "KÃ¤yttÃ¤jÃ¤"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:321
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Tilaa muiden kÃ¤yttÃ¤jien kansioita"
@@ -17210,20 +16061,20 @@ msgstr "Tilaa muiden kÃ¤yttÃ¤jien kansioita"
 msgid "Exchange Folder Tree"
 msgstr "Exchangen kansiopuu"
 
-#: ../plugins/exchange-operations/exchange-folder.c:67
-#: ../plugins/exchange-operations/exchange-folder.c:236
-#: ../plugins/exchange-operations/exchange-folder.c:246
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:243
 msgid "Unsubscribe Folder..."
 msgstr "Peru kansion tilaus..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:466
-#: ../plugins/exchange-operations/exchange-folder.c:521
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:518
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Perutaanko todella kansion \"%s\" tilaus?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:478
-#: ../plugins/exchange-operations/exchange-folder.c:533
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:530
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Peru \"%s\" tilaus"
@@ -17288,18 +16139,18 @@ msgstr "Salasanasi vanhenee seuraavan 7 pÃ¤ivÃ¤n kuluessa..."
 msgid "_Change Password"
 msgstr "_Vaihda salasana"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(Lupa evÃ¤tty.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 msgid "Add User:"
 msgstr "LisÃ¤Ã¤ kÃ¤yttÃ¤jÃ¤:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:937
-#: ../plugins/groupwise-features/share-folder.c:716
+#: ../plugins/groupwise-features/proxy.c:932
+#: ../plugins/groupwise-features/share-folder.c:713
 msgid "Add User"
 msgstr "LisÃ¤Ã¤ kÃ¤yttÃ¤jÃ¤"
 
@@ -17417,11 +16268,11 @@ msgstr "_Herkkyys: "
 msgid "_User"
 msgstr "_KÃ¤yttÃ¤jÃ¤"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:136
+#: ../plugins/exchange-operations/exchange-user-dialog.c:134
 msgid "Select User"
 msgstr "Valitse kÃ¤yttÃ¤jÃ¤"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:174
+#: ../plugins/exchange-operations/exchange-user-dialog.c:172
 msgid "Address Book..."
 msgstr "Osoitekirja..."
 
@@ -17434,12 +16285,8 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Tilaa toisen kÃ¤yttÃ¤jÃ¤n kalenteri"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid ""
-"A plugin that manages a collection of Exchange account specific operations "
-"and features."
-msgstr ""
-"LisÃ¤osa, jolla voidaan hallita tiettyjÃ¤ Exchange-tiliin liittyviÃ¤ toimintoja "
-"ja ominaisuuksia."
+msgid "Activates the Evolution-Exchange extension package."
+msgstr "Ottaa Evolutionin Exchange-laajennuspaketin kÃ¤yttÃ¶Ã¶n."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -17586,7 +16433,7 @@ msgid "Folder offline"
 msgstr "Kansio on yhteydettÃ¶mÃ¤ssÃ¤ tilassa"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1269
+#: ../shell/e-shell.c:1259
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
@@ -17684,7 +16531,7 @@ msgid ""
 "\n"
 "Or you might have just typed your password wrong."
 msgstr ""
-"TÃ¤mÃ¤ luultavasti tarkoittaa, ettÃ¤ palvelimesi vaatii\n"
+"TÃ¤mÃ¤ luultavasti tarkoittaa, ettÃ¤ palvelin vaatii\n"
 "sinua syÃ¶ttÃ¤mÃ¤Ã¤n Windowsin aluenimen\n"
 "osana kÃ¤yttÃ¤jÃ¤tunnusta (esim. &quot;ALUENIMI\\kÃ¤yttÃ¤jÃ¤&quot;).\n"
 "Voi myÃ¶s olla ettÃ¤ syÃ¶tit vÃ¤Ã¤rÃ¤n salasanan."
@@ -17706,7 +16553,9 @@ msgid "Unknown error looking up {0}"
 msgstr "Tuntematon virhe etsittÃ¤essÃ¤ {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:521
+#: ../plugins/google-account-setup/google-source.c:624
+#: ../plugins/mail-to-task/mail-to-task.c:599
+#: ../plugins/mail-to-task/mail-to-task.c:821
 msgid "Unknown error."
 msgstr "Tuntematon virhe."
 
@@ -17791,36 +16640,39 @@ msgid "Check folder permissions"
 msgstr "Tarkista kansion oikeudet"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Automatically launch editor when key is pressed in the mail composer"
+msgstr "KÃ¤ynnistÃ¤ muokkain automaattisesti, kun nappia painetaa viestin muokkaimessa"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/external-editor.c:120
+msgid "Automatically launch when a new mail is edited"
+msgstr "KÃ¤ynnistÃ¤ automaattisesti uutta viestiÃ¤ muokattaessa"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 msgid "Default External Editor"
 msgstr "Ulkoisen muokkaimen oletuskomento"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
 msgid "The default command that must be used as the editor."
 msgstr "Oletuskomento, jota kÃ¤ytetÃ¤Ã¤n ulkoisena muokkaimena."
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
-msgid ""
-"A plugin for using an external editor as the composer. You can send only "
-"plain-text messages."
-msgstr ""
-"LisÃ¤osa, jonka avulla voit kÃ¤yttÃ¤Ã¤ ulkoista muokkainta viestien "
-"kirjoittamiseen. Voit lÃ¤hettÃ¤Ã¤ tÃ¤llÃ¤ vain muotoilematonta tekstiÃ¤ (ei HTML-"
-"viestejÃ¤)."
-
-#. the path to the shared library
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
 msgid "External Editor"
 msgstr "Ulkoinen muokkain"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+msgid "Use an external editor to compose plain-text mail messages."
+msgstr "Kirjoita tekstimuotoiset viestit ulkoisessa muokkaimessa."
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
 msgstr "VÃ¤liaikaista tiedostoa ei voi luoda"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid "Editor not launchable"
 msgstr "Muokkainta ei voi kÃ¤ynnistÃ¤Ã¤"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
@@ -17828,7 +16680,17 @@ msgstr ""
 "Evolution ei voinut luoda vÃ¤liaikaistiedostoa viestin tallentamiseksi. YritÃ¤ "
 "myÃ¶hemmin uudestaan."
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+msgid "External editor still running"
+msgstr "Ulkoinen muokkain on edelleen kÃ¤ynnissÃ¤"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
@@ -17836,25 +16698,22 @@ msgstr ""
 "LisÃ¤osien asetuksissa mÃ¤Ã¤riteltyÃ¤ ulkoista muokkainta ei voi kÃ¤ynnistÃ¤Ã¤. "
 "YritÃ¤ kÃ¤yttÃ¤Ã¤ muuta komentoa."
 
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in _External Editor"
-msgstr "_Kirjoita viestit ulkoisessa muokkaimessa"
-
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
-msgid "Compose messages using an external editor"
-msgstr "Kirjoita viestit kÃ¤yttÃ¤en ulkoista muokkainta"
-
-#: ../plugins/external-editor/external-editor.c:114
+#: ../plugins/external-editor/external-editor.c:109
 msgid "Command to be executed to launch the editor: "
 msgstr "Ulkoisen muokkaimen kÃ¤ynnistyskomento: "
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:110
 msgid ""
 "For Emacs use \"xemacs\"\n"
-"For VI use \"gvim\""
+"For VI use \"gvim -f\""
 msgstr ""
 "Emacsia varten kÃ¤ytÃ¤ arvoa \"xemacs\"\n"
-"VI:tÃ¤ varten kÃ¤ytÃ¤ arvoa \"gvim\""
+"VI:tÃ¤ varten kÃ¤ytÃ¤ arvoa \"gvim -f\""
+
+#: ../plugins/external-editor/external-editor.c:354
+#: ../plugins/external-editor/external-editor.c:356
+msgid "Compose in External Editor"
+msgstr "Kirjoita viestit ulkoisessa muokkaimessa"
 
 #: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
@@ -17870,39 +16729,47 @@ msgstr "_Kasvokuva"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid ""
-"Attach Face header to outgoing messages. First time the user needs to "
-"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
-"faces This will be used in messages that are sent further."
+"Attach a small picture of your face to outgoing messages.\n"
+"\n"
+"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+"sent messages."
 msgstr ""
-"LiittÃ¤Ã¤ kasvokuvaotsakkeen lÃ¤hteviin viesteihin. KÃ¤yttÃ¤jien tÃ¤ytyy ensin "
-"mÃ¤Ã¤ritellÃ¤ 48x48-pisteen png-kuva. Kuva tallennetaan base64-muodossa ja "
-"tallennetaan tiedostoon ~/.evolution/faces. TÃ¤tÃ¤ kuvaa kÃ¤ytetÃ¤Ã¤n jatkossa "
-"lÃ¤hetettÃ¤vissÃ¤ viesteissÃ¤."
+"LiitÃ¤ pieni kuva kasviostasi lÃ¤hteviin viesteihin.\n"
+"\n"
+"KÃ¤yttÃ¤jien tÃ¤ytyy ensin mÃ¤Ã¤ritellÃ¤ 48x48-pisteen png-kuva. Kuva tallennetaan "
+"base64-muodossa ja tallennetaan tiedostoon ~/.evolution/faces. TÃ¤tÃ¤ kuvaa "
+"kÃ¤ytetÃ¤Ã¤n jatkossa lÃ¤hetettÃ¤vissÃ¤ viesteissÃ¤."
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Peru kansion \"%s\" tilaus"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the side bar context menu."
-msgstr ""
-"Sallii postikansioiden tilauksen perumisen sivupalkin kontekstivalikosta."
-
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
 msgstr "Peru kansioiden tilauksia"
 
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+msgid ""
+"Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
+msgstr ""
+
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "_Peru tilaus"
 
-#: ../plugins/google-account-setup/google-source.c:421
+#: ../plugins/google-account-setup/google-source.c:82
+#: ../plugins/google-account-setup/google-contacts-source.c:51
+msgid "Google"
+msgstr "Google"
+
+#: ../plugins/google-account-setup/google-source.c:518
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "SyÃ¶tÃ¤ salasana kÃ¤yttÃ¤jÃ¤lle %s tilattujen kalentereiden kÃ¤yttÃ¶Ã¤ varten."
 
-#: ../plugins/google-account-setup/google-source.c:521
+#: ../plugins/google-account-setup/google-source.c:624
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17911,45 +16778,40 @@ msgstr ""
 "Ei voi lukea tietoja Googlen palvelimelta.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:683
+#: ../plugins/google-account-setup/google-source.c:759
 msgid "Cal_endar:"
 msgstr "_Kalenteri:"
 
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-source.c:794
 msgid "Retrieve _list"
 msgstr "Nouda _luettelo"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:69
-#: ../plugins/google-account-setup/google-contacts-source.c:71
-msgid "Google"
-msgstr "Google"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:306
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:325
+#: ../plugins/google-account-setup/google-contacts-source.c:270
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
 msgid "<b>Server</b>"
 msgstr "<b>Palvelin</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup Google Calendar and Contacts."
-msgstr "Google-kalenterin ja yhteystietojen lisÃ¤osa."
+msgid "Add Google Calendars to Evolution."
+msgstr "LisÃ¤Ã¤ google-kalentereita Evolutioniin."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Google sources"
-msgstr "Google-lÃ¤hteet"
+msgid "Google Calendars"
+msgstr "Google-kalenterit"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
 msgid "Checklist"
 msgstr "Muistilista"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup GroupWise calendar and contacts sources."
-msgstr "Groupwise-kalenterien ja yhteystietolÃ¤hteiden lisÃ¤osa."
+msgid "Add Novell GroupWise support to Evolution."
+msgstr ""
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "GroupWise Account Setup"
 msgstr "Groupwise-tilin mÃ¤Ã¤rittely"
 
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17971,13 +16833,13 @@ msgstr ""
 "%s\n"
 "\n"
 "\n"
-"Asenna jaettu kansio napsauttamalla \"VÃ¤litÃ¤\"\n"
+"Asenna jaettu kansio napsauttamalla \"Seuraava\"\n"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:224
 msgid "Install the shared folder"
 msgstr "Asenna jaettu kansio"
 
-#: ../plugins/groupwise-features/install-shared.c:227
+#: ../plugins/groupwise-features/install-shared.c:226
 msgid "Shared Folder Installation"
 msgstr "Jaetun kansion asennus"
 
@@ -18015,11 +16877,11 @@ msgstr "_KÃ¤ytÃ¤"
 msgid "_Junk List"
 msgstr "_Roskapostilista"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
+#: ../plugins/groupwise-features/mail-retract.c:52
 msgid "Message Retract"
 msgstr "Viestin peruminen"
 
-#: ../plugins/groupwise-features/mail-retract.c:58
+#: ../plugins/groupwise-features/mail-retract.c:57
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this ?"
@@ -18027,11 +16889,11 @@ msgstr ""
 "Viestin peruminen voi poistaa sen vastaanottajan postilaatikosta. Haluatko "
 "varmasti yrittÃ¤Ã¤ perua viestin?"
 
-#: ../plugins/groupwise-features/mail-retract.c:77
+#: ../plugins/groupwise-features/mail-retract.c:76
 msgid "Message retracted successfully"
 msgstr "Viestin peruminen onnistui"
 
-#: ../plugins/groupwise-features/mail-retract.c:87
+#: ../plugins/groupwise-features/mail-retract.c:86
 msgid "Retract Mail"
 msgstr "Peru viesti"
 
@@ -18040,90 +16902,120 @@ msgid "Add Send Options to GroupWise messages"
 msgstr "LisÃ¤Ã¤ lÃ¤hetysvalintoja groupwise-viesteihin"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in GroupWise accounts."
-msgstr "LisÃ¤osa GroupWise-tilien ominaisuuksille."
+msgid "Fine-tune your GroupWise accounts."
+msgstr "SÃ¤Ã¤dÃ¤ GroupWise-tilien asetuksia."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "GroupWise Features"
 msgstr "Groupwisen ominaisuudet"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
 msgid "Message retract failed"
 msgstr "Viestin peruminen epÃ¤onnistui"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
 msgid "The server did not allow the selected message to be retracted."
 msgstr "Palvelin ei sallinut valitun viestin perumista."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "Tili &quot;{1}&quot; on jo olemassa. Tarkista kansiopuusi."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+msgid "Account Already Exists"
+msgstr "Tili on jo olemassa"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
 msgid "Invalid user"
 msgstr "EpÃ¤kelpo kÃ¤yttÃ¤jÃ¤"
 
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+"VÃ¤lipalvelimelle kirjautuminen kÃ¤yttÃ¤jÃ¤nÃ¤ &quot;{0}&quot; epÃ¤onnistui. "
+"Tarkista sÃ¤hkÃ¶postiosoitteesi ja yritÃ¤ uudestaan."
+
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "VÃ¤lipalvelinyhteyttÃ¤ ei voi avata kÃ¤yttÃ¤jÃ¤lle &quot;{0}&quot;"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
 msgid "Specify User"
 msgstr "Valitse kÃ¤yttÃ¤jÃ¤"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
 msgid "You have already given proxy permissions to this user."
 msgstr "TÃ¤lle kÃ¤yttÃ¤jÃ¤lle on jo annettu vÃ¤lipalvelinasetukset."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:8
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr ""
 "VÃ¤lipalvelinoikeuksien mÃ¤Ã¤rittely vaatii kelvollisen kÃ¤yttÃ¤jÃ¤tunnuksen."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "Tili &quot;{1}&quot; on jo olemassa. Tarkista kansiopuusi."
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "Et voi jakaa tÃ¤tÃ¤ kansiota annetun kÃ¤yttÃ¤jÃ¤n &quot;{0}&quot; kanssa"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
-msgid "Account Already Exists"
-msgstr "Tili on jo olemassa"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
+msgid "You have to specify a user name which you want to add to the list"
+msgstr "Sinun tÃ¤ytyy mÃ¤Ã¤rittÃ¤Ã¤ kÃ¤yttÃ¤jÃ¤, jonka haluat lisÃ¤tÃ¤ luetteloon"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"VÃ¤lipalvelimelle kirjautuminen kÃ¤yttÃ¤jÃ¤nÃ¤ &quot;{0}&quot; epÃ¤onnistui. "
-"Tarkista sÃ¤hkÃ¶postiosoitteesi ja yritÃ¤ uudestaan."
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
+msgid "Do you want to resend the meeting ?"
+msgstr "Haluatko lÃ¤hettÃ¤Ã¤ tapaamisen uudestaan?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
+msgid "Do you want to resend the recurring meeting ?"
+msgstr "Haluatko lÃ¤hettÃ¤Ã¤ toistuvan tapaamisen uudestaan?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
+msgid "Do you want to retract the original item ?"
+msgstr "Haluatko vetÃ¤Ã¤ pois alkuperÃ¤isen kohteen?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
+msgid "The original will be removed from the recipient's mailbox."
+msgstr "AlkuperÃ¤inen kohde poistetaan vastaanottajien postikansioista."
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
 msgid "This is a recurring meeting"
 msgstr "TÃ¤mÃ¤ on toistuva tapaaminen"
 
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
+msgid "This will create a new meeting using the existing meeting details."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
+msgid ""
+"This will create a new meeting with the existing meeting details. The "
+"recurrence rule needs to be re-entered."
+msgstr ""
+
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
 msgid "Would you like to accept it?"
 msgstr "Haluatko hyvÃ¤ksyÃ¤ tÃ¤mÃ¤n?"
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
 msgid "Would you like to decline it?"
 msgstr "Haluatko estÃ¤Ã¤ tÃ¤mÃ¤n?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
-msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr "Et voi jakaa tÃ¤tÃ¤ kansiota annetun kÃ¤yttÃ¤jÃ¤n &quot;{0}&quot; kanssa"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
-msgid "You have to specify a user name which you want to add to the list"
-msgstr "Sinun tÃ¤ytyy mÃ¤Ã¤rittÃ¤Ã¤ kÃ¤yttÃ¤jÃ¤, jonka haluat lisÃ¤tÃ¤ luetteloon"
-
-#: ../plugins/groupwise-features/process-meeting.c:52
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Accept Tentatively"
 msgstr "HyvÃ¤ksy alustavasti"
 
+#: ../plugins/groupwise-features/process-meeting.c:319
+msgid "Rese_nd Meeting..."
+msgstr "LÃ¤hetÃ¤ kokous uudestaan..."
+
 #: ../plugins/groupwise-features/properties.glade.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>KÃ¤yttÃ¤jÃ¤t:</b>"
@@ -18137,7 +17029,7 @@ msgid "Con_tacts..."
 msgstr "_Yhteystiedot..."
 
 #: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:516
+#: ../widgets/table/e-table-click-to-add.c:514
 msgid "Message"
 msgstr "Viesti"
 
@@ -18220,10 +17112,10 @@ msgstr "<b>Tilin nimi</b>"
 msgid "Proxy Login"
 msgstr "VÃ¤limuistiin kirjautuminen"
 
-#: ../plugins/groupwise-features/proxy-login.c:206
-#: ../plugins/groupwise-features/proxy-login.c:248
-#: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:207
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:488
+#: ../plugins/groupwise-features/send-options.c:86
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSyÃ¶tÃ¤ salasana palvelulle %s (kÃ¤yttÃ¤jÃ¤ %s)"
@@ -18231,19 +17123,19 @@ msgstr "%sSyÃ¶tÃ¤ salasana palvelulle %s (kÃ¤yttÃ¤jÃ¤ %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:510
+#: ../plugins/groupwise-features/proxy-login.c:512
 msgid "_Proxy Login..."
 msgstr "VÃ¤limuistin kirjautuminen..."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
-"VÃ¤limuistin vÃ¤lilehti on kÃ¤ytettÃ¤vissÃ¤ vain jos tili on yhteydellisessÃ¤ "
-"tilassa."
+"VÃ¤limuistin vÃ¤lilehti on kÃ¤ytettÃ¤vissÃ¤ vain, jos tilin verkkoyhteydet ovat "
+"auki."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "VÃ¤limuisti on kÃ¤ytettÃ¤vissÃ¤ vain jos tili on kÃ¤ytÃ¶ssÃ¤."
 
@@ -18251,101 +17143,101 @@ msgstr "VÃ¤limuisti on kÃ¤ytettÃ¤vissÃ¤ vain jos tili on kÃ¤ytÃ¶ssÃ¤."
 msgid "Advanced send options"
 msgstr "LÃ¤hetyksen lisÃ¤asetukset"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:751
+#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder.c:748
 msgid "Users"
 msgstr "KÃ¤yttÃ¤jÃ¤t"
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
+#: ../plugins/groupwise-features/share-folder-common.c:321
 msgid "Enter the users and set permissions"
 msgstr "SyÃ¶tÃ¤ kÃ¤yttÃ¤jÃ¤t ja aseta oikeudet"
 
-#: ../plugins/groupwise-features/share-folder-common.c:341
+#: ../plugins/groupwise-features/share-folder-common.c:340
 msgid "New _Shared Folder..."
 msgstr "Uusi _jaettu kansio..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:449
+#: ../plugins/groupwise-features/share-folder-common.c:447
 msgid "Sharing"
 msgstr "Jakaminen"
 
-#: ../plugins/groupwise-features/share-folder.c:534
+#: ../plugins/groupwise-features/share-folder.c:531
 msgid "Custom Notification"
 msgstr "Oma huomautus"
 
-#: ../plugins/groupwise-features/share-folder.c:756
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Add   "
 msgstr "LisÃ¤Ã¤ "
 
-#: ../plugins/groupwise-features/share-folder.c:762
+#: ../plugins/groupwise-features/share-folder.c:759
 msgid "Modify"
 msgstr "Muokkaa"
 
-#: ../plugins/groupwise-features/status-track.c:97
+#: ../plugins/groupwise-features/status-track.c:94
 msgid "Message Status"
 msgstr "Viestin tila"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:111
+#: ../plugins/groupwise-features/status-track.c:108
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: ../plugins/groupwise-features/status-track.c:125
+#: ../plugins/groupwise-features/status-track.c:122
 msgid "From:"
 msgstr "LÃ¤hettÃ¤jÃ¤:"
 
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Creation date:"
 msgstr "LuontipÃ¤ivÃ¤:"
 
-#: ../plugins/groupwise-features/status-track.c:179
+#: ../plugins/groupwise-features/status-track.c:176
 msgid "Recipient: "
 msgstr "Vastaanottaja: "
 
-#: ../plugins/groupwise-features/status-track.c:186
+#: ../plugins/groupwise-features/status-track.c:183
 msgid "Delivered: "
 msgstr "Toimitettu: "
 
-#: ../plugins/groupwise-features/status-track.c:192
+#: ../plugins/groupwise-features/status-track.c:189
 msgid "Opened: "
 msgstr "Avattu: "
 
-#: ../plugins/groupwise-features/status-track.c:197
+#: ../plugins/groupwise-features/status-track.c:194
 msgid "Accepted: "
 msgstr "HyvÃ¤ksytty: "
 
-#: ../plugins/groupwise-features/status-track.c:202
+#: ../plugins/groupwise-features/status-track.c:199
 msgid "Deleted: "
 msgstr "Poistettu: "
 
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:204
 msgid "Declined: "
 msgstr "HylÃ¤tty: "
 
-#: ../plugins/groupwise-features/status-track.c:212
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Completed: "
 msgstr "Valmistunut: "
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:214
 msgid "Undelivered: "
 msgstr "Ei lÃ¤hetetty: "
 
-#: ../plugins/groupwise-features/status-track.c:241
+#: ../plugins/groupwise-features/status-track.c:238
 msgid "Track Message Status..."
 msgstr "Seuraa viestin tilaa..."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "A plugin to setup hula calendar sources."
-msgstr "Hula-kalenterien lÃ¤hteiden mÃ¤Ã¤rittelyn lisÃ¤osa."
+msgid "Add Hula support to Evolution."
+msgstr ""
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Account Setup"
-msgstr "Hula-tilin asetukset"
+msgid "Hula Support"
+msgstr ""
 
-#: ../plugins/imap-features/imap-headers.c:320
+#: ../plugins/imap-features/imap-headers.c:332
 msgid "Custom Headers"
 msgstr "Omat otsakkeet"
 
-#: ../plugins/imap-features/imap-headers.c:333
+#: ../plugins/imap-features/imap-headers.c:345
 msgid "IMAP Headers"
 msgstr "IMAP-otsakkeet"
 
@@ -18362,10 +17254,6 @@ msgid "Basic and _Mailing List Headers (Default)"
 msgstr "Tavalliset ja _postituslistojen otsakkeet (oletus)"
 
 #: ../plugins/imap-features/imap-headers.glade.h:4
-msgid "Fetch A_ll Headers"
-msgstr "Nouda _kaikki otsakkeet"
-
-#: ../plugins/imap-features/imap-headers.glade.h:5
 msgid ""
 "Give the extra headers that you need to fetch in addition to the above "
 "standard headers. \n"
@@ -18375,7 +17263,7 @@ msgstr ""
 "lisÃ¤ksi.\n"
 "Voit ohittaa tÃ¤mÃ¤n, jos valitset \"Kaikki otsakkeet\"."
 
-#: ../plugins/imap-features/imap-headers.glade.h:7
+#: ../plugins/imap-features/imap-headers.glade.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -18383,7 +17271,7 @@ msgstr ""
 "Valitse IMAP-otsakkeiden asetukset.\n"
 "MitÃ¤ enemmÃ¤n otsakkeita noudat, sitÃ¤ kauemmin niiden nouto kestÃ¤Ã¤."
 
-#: ../plugins/imap-features/imap-headers.glade.h:9
+#: ../plugins/imap-features/imap-headers.glade.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -18391,53 +17279,23 @@ msgstr ""
 "_Perusotsakkeet (nopein)\n"
 "KÃ¤ytÃ¤ tÃ¤tÃ¤, jos sinulla ei ole otsakkeisiin perustuvia postituslistasuotimia"
 
+#: ../plugins/imap-features/imap-headers.glade.h:10
+msgid "_Fetch All Headers"
+msgstr "Nouda _kaikki otsakkeet"
+
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "A plugin for the features in the IMAP accounts."
-msgstr "LisÃ¤osa IMAP-tilien ominaisuuksille."
+msgid "Fine-tune your IMAP accounts."
+msgstr ""
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
 msgid "IMAP Features"
 msgstr "IMAP-ominaisuudet"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:78
-msgid "_Import to Calendar"
-msgstr "_Tuo kalenteriin"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:83
-msgid "_Import to Tasks"
-msgstr "_Tuo tehtÃ¤viin"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:201
-msgid "Import ICS"
-msgstr "Tuo ICS-tiedosto"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:224
-msgid "Select Task List"
-msgstr "Valitse tehtÃ¤vÃ¤lista"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:228
-msgid "Select Calendar"
-msgstr "Valitse kalenteri"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:260
-#: ../shell/e-shell-importer.c:696
-msgid "_Import"
-msgstr "_Tuo"
-
-#. the path to the shared library
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
-msgid "Import to Calendar"
-msgstr "Tuo kalenteriin"
-
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
-msgid "Imports ICS attachments to calendar."
-msgstr "Tuo ICS-liitteitÃ¤ kalenteriin."
-
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "Laitteistorajapinta HAL ei ole ladattu"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -18445,7 +17303,7 @@ msgstr ""
 "Palvelu \"hald\" vaaditaan, mutta se ei ole pÃ¤Ã¤llÃ¤. Ota palvelu kÃ¤yttÃ¶Ã¶n ja "
 "aja ohjelma uudestaan, tai ota yhteyttÃ¤ yllÃ¤pitÃ¤jÃ¤Ã¤si."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
 msgid "Search for an iPod failed"
 msgstr "iPodia ei lÃ¶ytynyt"
 
@@ -18463,144 +17321,145 @@ msgid "iCalendar format (.ics)"
 msgstr "iCalendar muoto (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid ""
-"Synchronize the selected task/memo/calendar/address book with Apple iPod"
-msgstr ""
-"Synkronoi valitut tehtÃ¤vÃ¤t, muistilaput, kalenterit tai osoitekirjat Apple "
-"iPodiin"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
 msgstr "_Synkronoi iPod"
 
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+msgid "Synchronize your data with your Apple iPod."
+msgstr "_Synkronoi tietosi Apple iPodiin."
+
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
 msgstr "iPod-synkronointi"
 
-#: ../plugins/itip-formatter/itip-formatter.c:481
-#: ../plugins/itip-formatter/itip-formatter.c:606
+#: ../plugins/itip-formatter/itip-formatter.c:482
+#: ../plugins/itip-formatter/itip-formatter.c:607
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Kalenterin \"%s\" lataus epÃ¤onnistui"
 
-#: ../plugins/itip-formatter/itip-formatter.c:626
+#: ../plugins/itip-formatter/itip-formatter.c:627
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr ""
 "Kalenterin \"%s\" sisÃ¤ltÃ¤mÃ¤ tapaaminen on ristiriidassa tÃ¤mÃ¤n kokouksen "
 "kanssa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:662
+#: ../plugins/itip-formatter/itip-formatter.c:663
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Tapaaminen lÃ¶ytyi kalenterista \"%s\""
 
-#: ../plugins/itip-formatter/itip-formatter.c:752
+#: ../plugins/itip-formatter/itip-formatter.c:753
 msgid "Unable to find any calendars"
 msgstr "YhtÃ¤kÃ¤Ã¤n kalenteria ei lÃ¶ydy"
 
-#: ../plugins/itip-formatter/itip-formatter.c:759
+#: ../plugins/itip-formatter/itip-formatter.c:760
 msgid "Unable to find this meeting in any calendar"
 msgstr "TÃ¤tÃ¤ kokousta ei lÃ¶ydy mistÃ¤Ã¤n kalenterista"
 
-#: ../plugins/itip-formatter/itip-formatter.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:764
 msgid "Unable to find this task in any task list"
 msgstr "TÃ¤tÃ¤ tehtÃ¤vÃ¤Ã¤ ei lÃ¶ydy mistÃ¤Ã¤n tehtÃ¤vÃ¤listasta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:767
+#: ../plugins/itip-formatter/itip-formatter.c:768
 msgid "Unable to find this memo in any memo list"
 msgstr "TÃ¤tÃ¤ muistilappua ei lÃ¶ydy mistÃ¤Ã¤n muistilappuluettelosta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:838
+#: ../plugins/itip-formatter/itip-formatter.c:839
+msgid "Opening the calendar. Please wait.."
+msgstr "Avataan kalenteria, odota hetki..."
+
+#: ../plugins/itip-formatter/itip-formatter.c:842
 msgid "Searching for an existing version of this appointment"
 msgstr "EtsitÃ¤Ã¤n olemassaolevia versioita tapaamisesta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 msgid "Unable to parse item"
 msgstr "Kohdetta ei voi tulkita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1107
+#: ../plugins/itip-formatter/itip-formatter.c:1111
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kohtaa ei voi lÃ¤hettÃ¤Ã¤ kalenteriin \"%s\". %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1119
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "LÃ¤hetetty kalenteriin \"%s\" hyvÃ¤ksyttynÃ¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1127
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "LÃ¤hetetty kalenteriin \"%s\" alustavana"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "LÃ¤hetetty kalenteriin \"%s\" hylÃ¤ttynÃ¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1137
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "LÃ¤hetetty kalenteriin \"%s\" peruttuna"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1227
+#: ../plugins/itip-formatter/itip-formatter.c:1231
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "JÃ¤rjestÃ¤jÃ¤ on poistanut valtuutuksen %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1238
 msgid "Sent a cancelation notice to the delegate"
 msgstr "LÃ¤hetettiin perumisilmoitus valtuutetulle"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1236
+#: ../plugins/itip-formatter/itip-formatter.c:1240
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Perumisilmoitusta ei voi lÃ¤hettÃ¤Ã¤ valtuutetulle"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1348
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "LÃ¤snÃ¤olon tilaa ei voi pÃ¤ivittÃ¤Ã¤ virheellisen tilan takia"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1371
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "LÃ¤snÃ¤olijaa ei voi pÃ¤ivittÃ¤Ã¤. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1381
 msgid "Attendee status updated"
 msgstr "LÃ¤snÃ¤olon tila pÃ¤ivitetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1401
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Meeting information sent"
 msgstr "Kokouksen tiedot lÃ¤hetetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1404
+#: ../plugins/itip-formatter/itip-formatter.c:1410
 msgid "Task information sent"
 msgstr "TehtÃ¤vÃ¤n tiedot lÃ¤hetetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1413
 msgid "Memo information sent"
 msgstr "Muistilapun tiedot lÃ¤hetetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kokoustietoja ei voitu lÃ¤hettÃ¤Ã¤, koska kokousta ei lÃ¶ydy"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1425
 msgid "Unable to send task information, the task does not exist"
 msgstr "TehtÃ¤vÃ¤n tietoja ei voitu lÃ¤hettÃ¤Ã¤, koska tehtÃ¤vÃ¤Ã¤ ei lÃ¶ydy"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1428
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Muistilapun tietoja ei voitu lÃ¤hettÃ¤Ã¤, koska muistilappua ei lÃ¶ydy"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1491
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#: ../plugins/itip-formatter/itip-formatter.c:1496
+#: ../plugins/itip-formatter/itip-formatter.c:1507
 msgid "The calendar attached is not valid"
 msgstr "Liitetty kalenteri ei ole kelvollinen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1492
-#: ../plugins/itip-formatter/itip-formatter.c:1503
+#: ../plugins/itip-formatter/itip-formatter.c:1497
+#: ../plugins/itip-formatter/itip-formatter.c:1508
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18608,15 +17467,15 @@ msgstr ""
 "Viesti vÃ¤ittÃ¤Ã¤ sisÃ¤ltÃ¤vÃ¤nsÃ¤ kalenterin, mutta kalenteri ei ole kelvollinen "
 "iCalendar-tiedosto."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1543
-#: ../plugins/itip-formatter/itip-formatter.c:1571
-#: ../plugins/itip-formatter/itip-formatter.c:1663
+#: ../plugins/itip-formatter/itip-formatter.c:1548
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 msgid "The item in the calendar is not valid"
 msgstr "Kalenterin sisÃ¤ltÃ¶ ei ole kelvollinen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1544
-#: ../plugins/itip-formatter/itip-formatter.c:1572
-#: ../plugins/itip-formatter/itip-formatter.c:1664
+#: ../plugins/itip-formatter/itip-formatter.c:1549
+#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../plugins/itip-formatter/itip-formatter.c:1669
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18624,11 +17483,11 @@ msgstr ""
 "Viesti sisÃ¤ltÃ¤Ã¤ kalenterin, mutta kalenterissa ei ole tapahtumia, tehtÃ¤viÃ¤ "
 "tai vapaa/varattu-tietoja."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1583
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "The calendar attached contains multiple items"
 msgstr "LiitetyssÃ¤ kalenterissa on useita kohtia"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1584
+#: ../plugins/itip-formatter/itip-formatter.c:1589
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18636,40 +17495,34 @@ msgstr ""
 "Jos haluat kÃ¤sitellÃ¤ kaikki nÃ¤mÃ¤ kohdat, tiedosto tÃ¤ytyy tallentaa ja avata "
 "tuomalla tiedosto kalenteriin"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2306
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "This meeting recurs"
 msgstr "Tapaaminen on _toistuva"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2309
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 msgid "This task recurs"
 msgstr "TehtÃ¤vÃ¤ on toistuva"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2312
+#: ../plugins/itip-formatter/itip-formatter.c:2341
 msgid "This memo recurs"
 msgstr "Muistilappu on toistuva"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2548
+#: ../plugins/itip-formatter/itip-formatter.c:2574
 msgid "_Delete message after acting"
 msgstr "_Poista viesti, kun toimenpide on suoritettu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2558
-#: ../plugins/itip-formatter/itip-formatter.c:2590
+#: ../plugins/itip-formatter/itip-formatter.c:2584
+#: ../plugins/itip-formatter/itip-formatter.c:2617
 msgid "Conflict Search"
 msgstr "Ristiriitaisuuksien haku"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2573
+#: ../plugins/itip-formatter/itip-formatter.c:2599
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Valitse kalenterit, joista etsitÃ¤Ã¤n pÃ¤Ã¤llekkÃ¤isiÃ¤ kokouksia"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:297
-msgid "Today"
-msgstr "TÃ¤nÃ¤Ã¤n"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:196
@@ -18688,11 +17541,6 @@ msgstr "TÃ¤nÃ¤Ã¤n %H.%M.%S"
 msgid "Today %l:%M:%S %p"
 msgstr "TÃ¤nÃ¤Ã¤n %l.%M.%S %p"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:219
-msgid "Tomorrow"
-msgstr "Huomenna"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:224
@@ -19036,110 +17884,107 @@ msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> on perunut seuraavan jaetun muistilapun:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:823
 msgid "_Open Calendar"
 msgstr "_Avaa kalenteri"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
-msgid "_Decline"
-msgstr "_HylkÃ¤Ã¤"
-
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:829
 #: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:839
 #: ../plugins/itip-formatter/itip-view.c:856
 #: ../plugins/itip-formatter/itip-view.c:861
+msgid "_Decline"
+msgstr "_HylkÃ¤Ã¤"
+
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:863
 msgid "_Accept"
 msgstr "H_yvÃ¤ksy"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:833
 msgid "_Decline all"
 msgstr "_HylkÃ¤Ã¤ kaikki"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:834
 msgid "_Tentative all"
 msgstr "Kaikki _alustavasti"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:862
 msgid "_Tentative"
 msgstr "_Alustavasti"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:835
 msgid "_Accept all"
 msgstr "_HyvÃ¤ksy kaikki"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Send Information"
 msgstr "_LÃ¤hetÃ¤ tiedot"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update Attendee Status"
 msgstr "_PÃ¤ivitÃ¤ lÃ¤snÃ¤olijan tila"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Update"
 msgstr "_PÃ¤ivitÃ¤"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:1033
 msgid "Start time:"
 msgstr "Alkamisaika:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1042
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "End time:"
 msgstr "Loppumisaika:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1062
-#: ../plugins/itip-formatter/itip-view.c:1116
+#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1118
 msgid "Comment:"
 msgstr "Kommentti:"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1103
 msgid "Send _reply to sender"
 msgstr "_Vastaa lÃ¤hettÃ¤jÃ¤lle"
 
-#: ../plugins/itip-formatter/itip-view.c:1131
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Send _updates to attendees"
 msgstr "LÃ¤hetÃ¤ _pÃ¤ivitykset osallistujille"
 
-#: ../plugins/itip-formatter/itip-view.c:1140
+#: ../plugins/itip-formatter/itip-view.c:1142
 msgid "_Apply to all instances"
 msgstr "Toteuta _kaikkiin tapahtumakertoihin"
 
-#: ../plugins/itip-formatter/itip-view.c:1149
+#: ../plugins/itip-formatter/itip-view.c:1151
 msgid "Show time as _free"
 msgstr "NÃ¤ytÃ¤ aika _vapaana"
 
-#: ../plugins/itip-formatter/itip-view.c:1152
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "_Preserve my reminder"
 msgstr "_SÃ¤ilytÃ¤ oma muistitus"
 
-#: ../plugins/itip-formatter/itip-view.c:1157
+#. To Translators: This is a check box to inherit a reminder.
+#: ../plugins/itip-formatter/itip-view.c:1160
 msgid "_Inherit reminder"
 msgstr "_Peri muistututs"
 
-#: ../plugins/itip-formatter/itip-view.c:1911
-msgid "_Tasks :"
-msgstr "_TehtÃ¤vÃ¤t :"
-
-#: ../plugins/itip-formatter/itip-view.c:1913
-msgid "Memos :"
-msgstr "Muistilaput :"
+#: ../plugins/itip-formatter/itip-view.c:1914
+msgid "_Memos:"
+msgstr "_Muistilaput:"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Displays text/calendar parts in messages."
-msgstr "NÃ¤ytÃ¤ kalenterin text/calendar-osia."
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "NÃ¤ytÃ¤ \"text/calendar\" MIME-osat viesteissÃ¤."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
@@ -19168,13 +18013,13 @@ msgid "Proxy _Logout"
 msgstr "Kirjaudu _pois vÃ¤limuistista"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Allows disabling of accounts."
-msgstr "Mahdollistaa tilien poistamisen kÃ¤ytÃ¶stÃ¤."
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
 msgid "Disable Account"
 msgstr "Poista tili kÃ¤ytÃ¶stÃ¤"
 
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+msgid "Disable an account by right-clicking on it in the folder tree."
+msgstr ""
+
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "Piippaa tai soita Ã¤Ã¤nitiedosto."
@@ -19244,20 +18089,20 @@ msgstr "Vilkkuuko uudesta sÃ¤hkÃ¶postista ilmoittava kuvake."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Huomautetaanko uusista viesteistÃ¤ vain saapuvien kansiossa."
 
-#: ../plugins/mail-notification/mail-notification.c:256
+#: ../plugins/mail-notification/mail-notification.c:245
 msgid "Generate a _D-Bus message"
 msgstr "Luo D-Bus-viesti"
 
-#: ../plugins/mail-notification/mail-notification.c:379
+#: ../plugins/mail-notification/mail-notification.c:368
 msgid "Evolution's Mail Notification"
 msgstr "Evolutionin viestihuomautus"
 
-#: ../plugins/mail-notification/mail-notification.c:400
+#: ../plugins/mail-notification/mail-notification.c:389
 msgid "Mail Notification Properties"
 msgstr "SÃ¤hkÃ¶postihuomautuksen ominaisuudet"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:498
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19272,91 +18117,162 @@ msgstr[1] ""
 "%d uutta viestiÃ¤\n"
 "kansiossa %s."
 
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:503
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "%d uusi viesti vastaanotettu."
 msgstr[1] "%d uutta viestiÃ¤ vastaanotettu."
 
-#: ../plugins/mail-notification/mail-notification.c:501
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:520
+#: ../plugins/mail-notification/mail-notification.c:525
 msgid "New email"
 msgstr "Uusi sÃ¤hkÃ¶posti"
 
-#: ../plugins/mail-notification/mail-notification.c:566
+#: ../plugins/mail-notification/mail-notification.c:588
 msgid "Show icon in _notification area"
 msgstr "NÃ¤ytÃ¤ kuvake _ilmoitusalueella"
 
-#: ../plugins/mail-notification/mail-notification.c:569
+#: ../plugins/mail-notification/mail-notification.c:591
 msgid "B_link icon in notification area"
 msgstr "_Vilkuta kuvaketta ilmoitusalueella"
 
-#: ../plugins/mail-notification/mail-notification.c:571
+#: ../plugins/mail-notification/mail-notification.c:593
 msgid "Popup _message together with the icon"
 msgstr "NÃ¤ytÃ¤ viesti _ponnahdusikkunassa kuvakkeen lisÃ¤ksi"
 
-#: ../plugins/mail-notification/mail-notification.c:752
+#: ../plugins/mail-notification/mail-notification.c:774
 msgid "_Play sound when new messages arrive"
 msgstr "_Soita Ã¤Ã¤niÃ¤ uuden sÃ¤hkÃ¶postin saapuessa"
 
-#: ../plugins/mail-notification/mail-notification.c:758
+#: ../plugins/mail-notification/mail-notification.c:780
 msgid "_Beep"
 msgstr "_Piippaa"
 
-#: ../plugins/mail-notification/mail-notification.c:759
+#: ../plugins/mail-notification/mail-notification.c:781
 msgid "Play _sound file"
 msgstr "So_ita Ã¤Ã¤nitiedosto"
 
-#: ../plugins/mail-notification/mail-notification.c:770
+#: ../plugins/mail-notification/mail-notification.c:792
 msgid "Specify _filename:"
 msgstr "Anna _tiedostonimi:"
 
-#: ../plugins/mail-notification/mail-notification.c:771
+#: ../plugins/mail-notification/mail-notification.c:793
 msgid "Select sound file"
 msgstr "Valitse Ã¤Ã¤nitiedosto"
 
-#: ../plugins/mail-notification/mail-notification.c:772
+#: ../plugins/mail-notification/mail-notification.c:794
 msgid "Pl_ay"
 msgstr "_Soita"
 
-#: ../plugins/mail-notification/mail-notification.c:829
+#: ../plugins/mail-notification/mail-notification.c:851
 msgid "Notify new messages for _Inbox only"
 msgstr "Huomauta uusista viesteistÃ¤ _vain saapuvien kansiossa"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+msgid "Mail Notification"
+msgstr "Huomautus uusista viesteistÃ¤"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Notifies you when new mail messages arrive."
+msgstr "Huomauttaa uusien viestien saapumisesta."
+
+#: ../plugins/mail-to-task/mail-to-task.c:376
+#, c-format
 msgid ""
-"Generates a D-Bus message or notifies the user with an icon in notification "
-"area and a notification message whenever a new message has arrived."
+"Selected calendar contains event '%s' already. Would you like to edit the "
+"old event?"
 msgstr ""
-"Luo D-Bus-viestin, tai huomauttaa kÃ¤yttÃ¤jÃ¤Ã¤ ilmoitusalueen kuvakkeella sekÃ¤ "
-"huomautusviestillÃ¤, kun uusia viestejÃ¤ saapuu."
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
-msgid "Mail Notification"
-msgstr "Huomautus uusista viesteistÃ¤"
+#: ../plugins/mail-to-task/mail-to-task.c:379
+#, c-format
+msgid ""
+"Selected task list contains task '%s' already. Would you like to edit the "
+"old task?"
+msgstr ""
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:382
+#, c-format
 msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
 msgstr ""
-"LisÃ¤osa, jonka avulla voidaan luoda tapaamisia viestin sisÃ¤llÃ¶n perusteella."
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-msgid "Con_vert to Meeting"
-msgstr "_Muuta kokoukseksi"
+#: ../plugins/mail-to-task/mail-to-task.c:399
+msgid ""
+"Selected calendar contains some events for the given mails already. Would "
+"you like to create new events anyway?"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:402
+msgid ""
+"Selected task list contains some tasks for the given mails already. Would "
+"you like to create new tasks anyway?"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:405
+msgid ""
+"Selected memo list contains some memos for the given mails already. Would "
+"you like to create new memos anyway?"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:423
+msgid ""
+"Selected calendar contains an event for the given mail already. Would you "
+"like to create new event anyway?"
+msgid_plural ""
+"Selected calendar contains events for the given mails already. Would you "
+"like to create new events anyway?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:429
+msgid ""
+"Selected task list contains a task for the given mail already. Would you "
+"like to create new task anyway?"
+msgid_plural ""
+"Selected task list contains tasks for the given mails already. Would you "
+"like to create new tasks anyway?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-msgid "Mail to meeting"
-msgstr "SÃ¤hkÃ¶posti kokoukselle"
+#: ../plugins/mail-to-task/mail-to-task.c:435
+msgid ""
+"Selected memo list contains a memo for the given mail already. Would you "
+"like to create new memo anyway?"
+msgid_plural ""
+"Selected memo list contains memos for the given mails already. Would you "
+"like to create new memos anyway?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:494
+msgid "[No Summary]"
+msgstr "[Ei yhteenvetoa]"
+
+#: ../plugins/mail-to-task/mail-to-task.c:505
+msgid "Invalid object returned from a server"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:570
+#, c-format
+msgid "An error occurred during processing: %s"
+msgstr "Tapahtui virhe kÃ¤siteltÃ¤essÃ¤: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:287
+#: ../plugins/mail-to-task/mail-to-task.c:599
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kalenteria ei voi avata: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:292
+#: ../plugins/mail-to-task/mail-to-task.c:606
+msgid ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
+msgstr ""
+"Valittu lÃ¤hde on vain luettavissa, joten et voi luoda siihen tapahtumia. "
+"Valitse joku toinen lÃ¤hde."
+
+#: ../plugins/mail-to-task/mail-to-task.c:609
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19364,25 +18280,62 @@ msgstr ""
 "Valittu lÃ¤hde on vain luettavissa, joten et voi luoda siihen tehtÃ¤viÃ¤. "
 "Valitse joku toinen lÃ¤hde."
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:612
 msgid ""
-"A plugin which allows the creation of tasks from the contents of a mail "
-"message."
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
 msgstr ""
-"LisÃ¤osa, jonka avulla voidaan luoda tehtÃ¤viÃ¤ viestin sisÃ¤llÃ¶n perusteella."
+"Valittu lÃ¤hde on vain luettavissa, joten et voi luoda siihen muistilappuja. "
+"Valitse joku toinen lÃ¤hde."
+
+#: ../plugins/mail-to-task/mail-to-task.c:821
+#, c-format
+msgid "Cannot get source list. %s"
+msgstr "LÃ¤hdeluetteloa ei voi avata: %s"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "Convert a mail message to a task."
+msgstr "Muunna valittu viesti tehtÃ¤vÃ¤ksi."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-msgid "Con_vert to Task"
-msgstr "Muunna tehtÃ¤_vÃ¤ksi"
+msgid "Create a Mem_o"
+msgstr "Luo _muistilappu"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-msgid "Mail to task"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+msgid "Create a _Meeting"
+msgstr "Luo _kokous"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
+msgid "Create a _Task"
+msgstr "Luo _tehtÃ¤vÃ¤"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
+msgid "Create an _Event"
+msgstr "Luo t_apahtuma"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
+msgid "Mail-to-Task"
 msgstr "Viesti tehtÃ¤vÃ¤ksi"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-msgid "Convert the selected message to a new task"
-msgstr "Muunna valittu viesti uudeksi tehtÃ¤vÃ¤ksi"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
+msgid "Create a new event from the selected message"
+msgstr "Luo uusi tapahtuma valitusta viestistÃ¤"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
+msgid "Create a new meeting from the selected message"
+msgstr "Luo uusi kokous valitusta viestistÃ¤"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
+msgid "Create a new memo from the selected message"
+msgstr "Luo uusi muistilappu valitusta viestistÃ¤"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
+msgid "Create a new task from the selected message"
+msgstr "Luo uusi tehtÃ¤vÃ¤ valitusta viestistÃ¤"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Contact list _owner"
@@ -19406,11 +18359,8 @@ msgid "Mailing _List"
 msgstr "Postitus_lista"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
-msgstr ""
-"Tarjoa toimintoja yleisille postituslistan komennoille (tilaa, peru "
-"tilaus...)."
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr "Suorita yleisimpiÃ¤ postituslistan komentoja (tilaa, peru tilaus...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
@@ -19563,13 +18513,13 @@ msgstr ""
 "Haluatko merkitÃ¤ viestit luetuksi vain nykyisessÃ¤ kansiossa vai myÃ¶s "
 "kaikissai sen alikansioissa?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:164
-msgid "Current Folder and _Subfolders"
-msgstr "Nykyinen kansio ja alikan_siot"
+#: ../plugins/mark-all-read/mark-all-read.c:166
+msgid "In Current Folder and _Subfolders"
+msgstr "NykyisessÃ¤ kansiossa ja alikan_sioissa"
 
-#: ../plugins/mark-all-read/mark-all-read.c:176
-msgid "Current _Folder Only"
-msgstr "Vain nykyinen _kansio"
+#: ../plugins/mark-all-read/mark-all-read.c:180
+msgid "In Current _Folder Only"
+msgstr "Vain nykyisessÃ¤ _kansiossa"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
@@ -19580,20 +18530,20 @@ msgid "Mark Me_ssages as Read"
 msgstr "Merkitse vie_stit luetuiksi"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
-msgid "Used for marking all the messages under a folder as read"
-msgstr "KÃ¤ytetÃ¤Ã¤n merkitsemÃ¤Ã¤n kaikki kansion viestit luetuiksi"
+msgid "Mark all messages in a folder as read."
+msgstr "Merkitse kaikki kansion viestit luetuksi."
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "A plugin which implements mono plugins."
-msgstr "LisÃ¤osa, joka toteuttaa mono-lisÃ¤osat."
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
 msgid "Mono Loader"
 msgstr "Mono-lataaja"
 
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+msgid "Support plugins written in Mono."
+msgstr ""
+
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr "LisÃ¤osa, jolla voidaan hallita muiden lisÃ¤osien kÃ¤yttÃ¶Ã¤."
+msgid "Manage your Evolution plugins."
+msgstr "Hallitse Evolutionin lisÃ¤osia."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
@@ -19631,27 +18581,19 @@ msgstr "Yhteenveto"
 msgid "Plugin"
 msgstr "LisÃ¤osa"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML messages.\n"
-"\n"
-"This plugin is unsupported demonstration code only.\n"
-msgstr ""
-"TestilisÃ¤osa, joka demonstroi muotoilija-lisÃ¤osaa, jolla  voit estÃ¤Ã¤ HTML-"
-"sÃ¤hkÃ¶postit.\n"
-"\n"
-"TÃ¤mÃ¤ lisÃ¤osa on tukematonta demo-koodia.\n"
-
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
 msgstr "Raakatekstin tila"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
-msgid "Prefer plain-text"
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+msgid "Prefer Plain Text"
 msgstr "Suosi raakatekstiÃ¤"
 
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr ""
+
 #: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "NÃ¤ytÃ¤ HTML:Ã¤Ã¤, jos se on saatavilla"
@@ -19673,8 +18615,8 @@ msgid "Evolution Profiler"
 msgstr "Evolutionin profiloija"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Writes a log of profiling data events."
-msgstr "Kirjoittaa lokia profilointitiedon tapahtumista."
+msgid "Profile data events in Evolution (for developers only)."
+msgstr ""
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
@@ -19689,44 +18631,74 @@ msgid "Outlook personal folders (.pst)"
 msgstr "Outlookin omat kansiot (.pst)"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../plugins/pst-import/pst-importer.c:315
 msgid "_Address Book"
 msgstr "_Osoitekirja"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:325
+#: ../plugins/pst-import/pst-importer.c:322
 msgid "A_ppointments"
 msgstr "_Tapaamiset"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:337
+#: ../plugins/pst-import/pst-importer.c:334
 msgid "_Journal entries"
 msgstr "_PÃ¤ivÃ¤kirjamerkinnÃ¤t"
 
-#: ../plugins/pst-import/pst-importer.c:352
+#: ../plugins/pst-import/pst-importer.c:349
 msgid "Importing Outlook data"
 msgstr "Tuodaan tietoja Outlookista"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-msgid "Allows calendars to be published to the web"
-msgstr "Mahdollistaa kalenterien julkaisemisen verkossa"
-
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Calendar Publishing"
 msgstr "Kalenterien julkaisu"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
 msgstr "Sijainnit"
 
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Publish calendars to the web."
+msgstr "Julkaise kalenterit verkossa."
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 msgid "_Publish Calendar Information"
 msgstr "Julkaise kalenteritietoja"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:95
+#: ../plugins/publish-calendar/publish-calendar.c:337
+#, c-format
+msgid "Could not open %s:"
+msgstr "Ei voitu avata %s:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:97
+#, c-format
+msgid "Could not open %s: Unknown error"
+msgstr "Ei voitu avata kohdetta %s: tuntematon virhe"
+
+#: ../plugins/publish-calendar/publish-calendar.c:117
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr "Virhe julkaistaessa kohteeseen %s:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:119
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr "Julkaisu kohteeseen %s onnistui"
+
+#: ../plugins/publish-calendar/publish-calendar.c:164
+#, c-format
+msgid "Mount of %s failed:"
+msgstr "Kohteen %s liittÃ¤minen epÃ¤onnistui."
+
+#: ../plugins/publish-calendar/publish-calendar.c:624
 msgid "Are you sure you want to remove this location?"
 msgstr "Haluatko varmasti poistaa tÃ¤mÃ¤n sijainnin?"
 
+#: ../plugins/publish-calendar/publish-calendar.c:788
+msgid "Could not create publish thread."
+msgstr "JulkaisusÃ¤iettÃ¤ ei voitu luoda."
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
 msgstr "<span weight=\"bold\">Sijainti</span>"
@@ -19783,27 +18755,41 @@ msgstr ""
 msgid "Service _type:"
 msgstr "Palvelun _tyyppi:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+msgid "Time _duration:"
+msgstr "_Kesto: "
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_File:"
 msgstr "_Tiedosto:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Password:"
 msgstr "_Salasana:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Publish as:"
 msgstr "_Julkaise muodossa:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Remember password"
 msgstr "_Muista salasana"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid "_Username:"
 msgstr "KÃ¤yttÃ¤jÃ¤t_unnus:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"days\n"
+"weeks\n"
+"months"
+msgstr ""
+"pÃ¤ivÃ¤Ã¤\n"
+"viikkoa\n"
+"kuukautta"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:32
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -19811,11 +18797,17 @@ msgstr ""
 "iCal\n"
 "Vapaa/Varattu"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:461
+#: ../plugins/publish-calendar/publish-format-fb.c:69
+#: ../plugins/publish-calendar/publish-format-ical.c:82
+#, c-format
+msgid "Could not publish calendar: Calendar backend no longer exists"
+msgstr ""
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:481
 msgid "New Location"
 msgstr "Uusi sijainti"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
 msgid "Edit Location"
 msgstr "Muokkaa sijaintia"
 
@@ -19843,177 +18835,135 @@ msgstr "Muita pythonilla tehtyjÃ¤ lisÃ¤osia lataava lisÃ¤osa."
 msgid "Python Loader"
 msgstr "Python-latain"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
-msgid "SpamAssassin (built-in)"
-msgstr "Spamassassin (sisÃ¤Ã¤nrakennettu)"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "Spamassassinia ei lÃ¶ytynyt, paluukoodi: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Putken luonti epÃ¤onnistui: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Virhe forkkauksen jÃ¤lkeen: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "SpamAssassinin lapsiprosessi ei vastaa, tapetaan..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Spamassassinin lapsiprosessin odotus keskeytettiin, lopetetaan..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Putki spamassassinille epÃ¤onnnistui, virhekoodi: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "Spamassassin ei ole saatavilla."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "TÃ¤mÃ¤ tekee Spamassassinista luotettavamman, mutta hitaamman"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
 msgid "I_nclude remote tests"
 msgstr "LisÃ¤Ã¤ myÃ¶s etÃ¤testit"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid ""
-"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
-"to be installed."
-msgstr ""
-"Suodattaa roskapostia kÃ¤yttÃ¤en Spamassassinia. TÃ¤mÃ¤ lisÃ¤osa vaatii, ettÃ¤ "
-"spamassassin on asennettu."
+msgid "Filter junk messages using SpamAssassin."
+msgstr "Suodata roskaposteja spamassasinilla."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Options"
-msgstr "Spamassassin-valitsimet"
+msgid "SpamAssassin Junk Filter"
+msgstr "Spamassassin-roskapostisuodatin"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin junk plugin"
-msgstr "Spamassassin-roskapostilisÃ¤osa"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
-msgid "A plugin for saving all attachments or parts of a message at once."
-msgstr "LisÃ¤osa kaikkien liitteiden tallentamiseen kerralla."
-
-#. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:315
-msgid "Save attachments"
-msgstr "Tallenna liitteet"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments..."
-msgstr "Tallenna liitteet..."
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
-msgid "Save all attachments"
-msgstr "Tallenna kaikki liitteet"
-
-#: ../plugins/save-attachments/save-attachments.c:321
-msgid "Select save base name"
-msgstr "Valitse tallennuspaikan nimi"
-
-#: ../plugins/save-attachments/save-attachments.c:340
-msgid "MIME Type"
-msgstr "MIME-tyyppi"
-
-#: ../plugins/save-attachments/save-attachments.c:348
-msgid "Save"
-msgstr "Tallenna"
+msgid "SpamAssassin Options"
+msgstr "Spamassassin-valitsimet"
 
 #.
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:163
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:358
 msgid "Description List"
 msgstr "Kuvauslista"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:359
 msgid "Categories List"
 msgstr "Luokkalista"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "Comment List"
 msgstr "Kommenttilista"
 
-#: ../plugins/save-calendar/csv-format.c:367
-msgid "Created"
-msgstr "Luotu"
-
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Contact List"
 msgstr "Yhteystietolista"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Start"
 msgstr "Alkaa"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "End"
 msgstr "PÃ¤Ã¤ttyy"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "percent Done"
 msgstr "prosenttia valmiina"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Attendees List"
 msgstr "Osanottajalista"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Modified"
 msgstr "Muokattu"
 
-#: ../plugins/save-calendar/csv-format.c:532
-msgid "Advanced options for the CSV format"
-msgstr "CSV-muodon asetukset"
+#: ../plugins/save-calendar/csv-format.c:523
+msgid "A_dvanced options for the CSV format"
+msgstr "CSV-muodon _lisÃ¤asetukset"
 
-#: ../plugins/save-calendar/csv-format.c:539
-msgid "Prepend a header"
-msgstr "LisÃ¤Ã¤ otsake ennen"
+#: ../plugins/save-calendar/csv-format.c:530
+msgid "Prepend a _header"
+msgstr "LisÃ¤Ã¤ otsake _ennen"
 
-#: ../plugins/save-calendar/csv-format.c:548
-msgid "Value delimiter:"
-msgstr "Arvojen erotin:"
+#: ../plugins/save-calendar/csv-format.c:539
+msgid "_Value delimiter:"
+msgstr "_Arvojen erotin:"
 
-#: ../plugins/save-calendar/csv-format.c:554
-msgid "Record delimiter:"
-msgstr "Kenttien rajoitin:"
+#: ../plugins/save-calendar/csv-format.c:546
+msgid "_Record delimiter:"
+msgstr "_Kenttien erotin:"
 
-#: ../plugins/save-calendar/csv-format.c:560
-msgid "Encapsulate values with:"
-msgstr "Kapsuloi arvot kÃ¤yttÃ¤en:"
+#: ../plugins/save-calendar/csv-format.c:553
+msgid "_Encapsulate values with:"
+msgstr "_Kapsuloi arvot kÃ¤yttÃ¤en:"
 
-#: ../plugins/save-calendar/csv-format.c:582
+#: ../plugins/save-calendar/csv-format.c:575
 msgid "Comma separated value format (.csv)"
 msgstr "Pilkulla erotettu muoto (.csv)"
 
@@ -20022,8 +18972,8 @@ msgid "Save Selected"
 msgstr "Tallenna valittu"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Saves selected calendar or tasks list to disk."
-msgstr "Tallentaa valitun kalenterin tai tehtÃ¤vÃ¤listan levylle."
+msgid "Save a calendar or task list to disk."
+msgstr "Tallenna kalenteri tai tehtÃ¤vÃ¤lista levylle."
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "_Save to Disk"
@@ -20038,21 +18988,25 @@ msgstr "_Tallenna levylle"
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
+#: ../plugins/save-calendar/rdf-format.c:372
 msgid "RDF format (.rdf)"
 msgstr "RDF-muoto (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:161
+#: ../plugins/save-calendar/save-calendar.c:104
+msgid "_Format:"
+msgstr "_Muoto:"
+
+#: ../plugins/save-calendar/save-calendar.c:165
 msgid "Select destination file"
 msgstr "Valitse kohdetiedosto"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-msgid "Select one source"
-msgstr "Valitse lÃ¤hde"
+msgid "Quickly select a single calendar or task list for viewing."
+msgstr "Valitse nopeasti nÃ¤ytettÃ¤vÃ¤ kalenteri tai tehtÃ¤vÃ¤lista."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Selects a single calendar or task source for viewing."
-msgstr "Valitsee nÃ¤ytettÃ¤vÃ¤n kalenterin tai tehtÃ¤vÃ¤listaan."
+msgid "Select One Source"
+msgstr "Valitse yksi lÃ¤hde"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 msgid "Show _only this Calendar"
@@ -20060,11 +19014,11 @@ msgstr "NÃ¤ytÃ¤ _vain tÃ¤mÃ¤ kalenteri"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
 msgid "Show _only this Memo List"
-msgstr "NÃ¤ytÃ¤ _vain tÃ¤mÃ¤ muistilappulista"
+msgstr "NÃ¤ytÃ¤ _vain tÃ¤mÃ¤ muistilappuluettelo"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
 msgid "Show _only this Task List"
-msgstr "NÃ¤ytÃ¤ _vain tÃ¤mÃ¤ tehtÃ¤vÃ¤listaan"
+msgstr "NÃ¤ytÃ¤ _vain tÃ¤mÃ¤ tehtÃ¤vÃ¤lista"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
@@ -20074,15 +19028,15 @@ msgstr "Ohjaa tilin asetusten mÃ¤Ã¤rittelyssÃ¤ ensikÃ¤ynnistyksellÃ¤."
 msgid "Setup Assistant"
 msgstr "Asetusapulainen"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
 msgstr "Evolutionin asetusapulainen"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Welcome"
 msgstr "Tervetuloa"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -20092,37 +19046,37 @@ msgstr ""
 "Tervetuloa Evolutioniin. Seuraaviksi kysyttÃ¤vien tietojen avulla Evolution "
 "voi ottaa yhteyttÃ¤ sÃ¤hkÃ¶postitileihisi ja tuoda tietoja muista ohjelmista.\n"
 "\n"
-"Valitse \"EteenpÃ¤in\" jatkaaksesi. "
+"Jatka napista \"Seuraava\". "
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:115
 msgid "Importing files"
 msgstr "Tiedostojen tuonti"
 
-#: ../plugins/startup-wizard/startup-wizard.c:137
-#: ../shell/e-shell-importer.c:141
+#: ../plugins/startup-wizard/startup-wizard.c:117
+#: ../shell/e-shell-importer.c:138
 msgid "Please select the information that you would like to import:"
 msgstr "Valitse tieto jota haluaisit tuoda:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:152
-#: ../shell/e-shell-importer.c:394
+#: ../plugins/startup-wizard/startup-wizard.c:132
+#: ../shell/e-shell-importer.c:419
 #, c-format
 msgid "From %s:"
 msgstr "Ohjelmasta %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
-#: ../shell/e-shell-importer.c:505
+#: ../plugins/startup-wizard/startup-wizard.c:203
+#: ../shell/e-shell-importer.c:548
 #, c-format
 msgid "Importing data."
 msgstr "Tuodaan tietoja."
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:519
+#: ../plugins/startup-wizard/startup-wizard.c:205
+#: ../shell/e-shell-importer.c:562
 msgid "Please wait"
 msgstr "Odota, ole hyvÃ¤"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Indicates if threading of messages should fall back to subject."
-msgstr "Tulisiko viestien sÃ¤ikeistÃ¤misen palata aihejÃ¤rjestykseen."
+msgid "Sort mail message threads by subject."
+msgstr "JÃ¤rjestÃ¤ viestisÃ¤ikeet aiheen perusteella."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -20145,15 +19099,15 @@ msgstr ""
 "Luettelo avainsana- ja arvopareista, joita pohjat-lisÃ¤osa kÃ¤yttÃ¤Ã¤ viestin "
 "rungon osien korvaamiseen."
 
-#: ../plugins/templates/templates.c:603
+#: ../plugins/templates/templates.c:601
 msgid "No title"
 msgstr "Ei otsikkoa"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:709
 msgid "Save as _Template"
 msgstr "Tallenna _pohjana"
 
-#: ../plugins/templates/templates.c:713
+#: ../plugins/templates/templates.c:711
 msgid "Save as Template"
 msgstr "Tallenna pohjana"
 
@@ -20162,31 +19116,62 @@ msgid "Drafts based template plugin"
 msgstr "Pohjiin perustuva mallilisÃ¤osa"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
-msgstr "LisÃ¤osa, joka voita avata TNEF-liitteitÃ¤ ytnef-ohjelman avulla."
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr ""
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-msgid "TNEF Attachment decoder"
-msgstr "TNEF-liitteiden purkaja"
+msgid "TNEF Decoder"
+msgstr "TNEF-purkaja"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+msgid "Inline vCards"
+msgstr "SisÃ¤kkÃ¤iset vCard-tiedostot"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr "NÃ¤ytÃ¤ vCard-liitteet sÃ¤hkÃ¶postiviestin sisÃ¤llÃ¤."
+
+#: ../plugins/vcard-inline/vcard-inline.c:159
+#: ../plugins/vcard-inline/vcard-inline.c:243
+msgid "Show Full vCard"
+msgstr "NÃ¤ytÃ¤ koko vCardin"
+
+#: ../plugins/vcard-inline/vcard-inline.c:162
+msgid "Show Compact vCard"
+msgstr "NÃ¤ytÃ¤ tiivistetty vCard"
+
+#: ../plugins/vcard-inline/vcard-inline.c:222
+msgid "There is one other contact."
+msgstr "LÃ¶ytyi yksi muu yhteystieto."
+
+#: ../plugins/vcard-inline/vcard-inline.c:231
+#, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "LÃ¶ytyi %d muu yhteystieto"
+msgstr[1] "LÃ¶ytyi %d muuta yhteystietoa."
+
+#: ../plugins/vcard-inline/vcard-inline.c:252
+msgid "Save in Address Book"
+msgstr "Tallenna osoitekirjaan"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "A plugin to setup WebDAV contacts."
-msgstr "WebDAV-yhteystietojen lisÃ¤osa."
+msgid "Add WebDAV contacts to Evolution."
+msgstr "LisÃ¤Ã¤ WebDAV-yhteystietoja Evolutioniin."
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
 msgstr "WebDAV-yhteystiedot"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:96
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:107
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:336
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:363
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_VÃ¤ltÃ¤ IfMatch-komentoa (vaaditaan apache-versiolle < 2.2.8)"
 
@@ -20274,45 +19259,63 @@ msgstr ""
 "tai tiedostosta ~/.gnome2_private/Evolution."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
+msgid "Initial attachment view"
+msgstr "LiitenÃ¤kymÃ¤n oletusarvo"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+msgid "Initial file chooser folder"
+msgstr "Tiedostovalitsimen oletuskansio"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Last upgraded configuration version"
 msgstr "Viimeksi pÃ¤ivitetty konfiguraation versio"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Luettelo poluista kansioihin, jotka synkronisoidaan kovalevylle "
 "yhteydettÃ¶mÃ¤Ã¤n kÃ¤yttÃ¶Ã¶n"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Non-proxy hosts"
 msgstr "VÃ¤lipalvelimen ohittavat palvelimet"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "HTTP-vÃ¤lipalvelimelle yhteyttÃ¤ otettaessa kÃ¤ytettÃ¤vÃ¤ salasana."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Proxy configuration mode"
 msgstr "VÃ¤lipalvelimen asetustila"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "SOCKS proxy host name"
 msgstr "SOCKS-vÃ¤lipalvelimen verkkonimi"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "SOCKS proxy port"
 msgstr "SOCKS-vÃ¤lipalvelimen portti"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Secure HTTP proxy host name"
 msgstr "Salatun HTTP-vÃ¤lipalvelimen verkkonimi"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Secure HTTP proxy port"
 msgstr "Salatun HTTP-vÃ¤lipalvelimen portti"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -20324,23 +19327,23 @@ msgstr ""
 "\"aseta vÃ¤lipalvelin kÃ¤sin\" ja \"kÃ¤ytÃ¤ automaattimÃ¤Ã¤rittelyn URL:issa "
 "annettua mÃ¤Ã¤rittelyÃ¤\"."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Sidebar is visible"
 msgstr "Sivupaneeli on nÃ¤kyvissÃ¤"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Skip development warning dialog"
 msgstr "Ohita kehitysversiovaroitus"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
+#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:489
 msgid "Start in offline mode"
 msgstr "Aloita yhteydettÃ¶mÃ¤ssÃ¤ tilassa"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Statusbar is visible"
 msgstr "Tilarivi on nÃ¤kyvissÃ¤"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -20348,19 +19351,19 @@ msgstr ""
 "Evolutionin konfiguraatioversio, major/minor/configuration tasoilla "
 "(esimerkiksi \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default height for the main window, in pixels."
 msgstr "PÃ¤Ã¤ikkunan oletuskorkeus pikseleinÃ¤."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The default width for the main window, in pixels."
 msgstr "PÃ¤Ã¤ikkunan oletusleveys pikseleinÃ¤."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The default width for the sidebar, in pixels."
 msgstr "Sivupaneelin oletusleveys pikseleinÃ¤."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -20368,19 +19371,19 @@ msgstr ""
 "Viimeisin pÃ¤ivitetty Evolutionin konfiguraatioversio, major/minor/"
 "configuration tasoilla (esimerkiksi \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy HTTP through."
 msgstr "Verkkonimi, jota kÃ¤ytetÃ¤Ã¤n HTTP-vÃ¤lipalvelimena."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The machine name to proxy secure HTTP through."
 msgstr "Verkkonimi, jota kÃ¤ytetÃ¤Ã¤n HTTPS-vÃ¤lipalvelimena."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The machine name to proxy socks through."
 msgstr "Verkkonimi, jota kÃ¤ytetÃ¤Ã¤n SOCKS-vÃ¤lipalvelimena."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -20388,7 +19391,7 @@ msgstr ""
 "Portti, jonka kautta kÃ¤ytetÃ¤Ã¤n avaimessa \"/apps/evolution/shell/"
 "network_config/http_host\" mÃ¤Ã¤riteltyÃ¤ vÃ¤lipalvelinta."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -20396,7 +19399,7 @@ msgstr ""
 "Portti, jonka kautta kÃ¤ytetÃ¤Ã¤n avaimessa \"/apps/evolution/shell/"
 "network_config/secure_host\" mÃ¤Ã¤riteltyÃ¤ vÃ¤lipalvelinta."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -20404,7 +19407,7 @@ msgstr ""
 "Portti, jonka kautta kÃ¤ytetÃ¤Ã¤n avaimessa \"/apps/evolution/shell/"
 "network_config/socks_host\" mÃ¤Ã¤riteltyÃ¤ vÃ¤lipalvelinta."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -20414,7 +19417,7 @@ msgstr ""
 "\"toolbar\". Jos \"toolbar\" on valittu, kÃ¤ytetÃ¤Ã¤n tyÃ¶kalupalkissa Gnomen "
 "asetusta."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -20426,57 +19429,57 @@ msgstr ""
 "aluenimiÃ¤ muodossa *.foo.com, IP-osoitteita (sekÃ¤ IPv4 ettÃ¤ IPv6) tai "
 "verkkopeitteitÃ¤ (jotain tyyliin 192.168.0.0.24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Toolbar is visible"
 msgstr "TyÃ¶kalupalkki on nÃ¤kyvissÃ¤"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "URL that provides proxy configuration values."
 msgstr "VÃ¤lipalvelimen asetustietoja tarjoava URL."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Use HTTP proxy"
 msgstr "KÃ¤ytÃ¤ HTTP-vÃ¤lipalvelinta"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "HTTP-vÃ¤lipalvelimelle tunnistautumiseen kÃ¤ytetty kÃ¤yttÃ¤jÃ¤tunnus."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr "KÃ¤ynnistetÃ¤Ã¤nkÃ¶ Evolution yhteydettÃ¶mÃ¤ssÃ¤ vai yhteydellisessÃ¤ tilassa."
+msgstr "KÃ¤ynnistetÃ¤Ã¤nkÃ¶ Evolution verkkoyhteyksillÃ¤ vai ilman."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether or not the window should be maximized."
 msgstr "Onko ikkuna suurennettu."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the sidebar should be visible."
 msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ sivupaneeli."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the status bar should be visible."
 msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ tilarivi."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether the toolbar should be visible."
 msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ tyÃ¶kalupalkki."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Piilotetaanko varoitusikkuna Evolutionin kehitysversion kÃ¤ytÃ¶stÃ¤ vai ei."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "NÃ¤ytetÃ¤Ã¤nkÃ¶ ikkunan napit."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "Ikkunan painikkeiden tyyli"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "Ikkunan napit nÃ¤ytetÃ¤Ã¤n"
 
@@ -20493,22 +19496,22 @@ msgid "Click OK to close these connections and go offline"
 msgstr ""
 "Valitse OK sulkeaksesi nÃ¤mÃ¤ yhteydet ja siirtyÃ¤ksesi yhteydettÃ¶mÃ¤Ã¤n tilaan"
 
-#: ../shell/e-shell-importer.c:131
+#: ../shell/e-shell-importer.c:128
 msgid "Choose the type of importer to run:"
 msgstr "Valitse suoritettavan tuojan tyyppi:"
 
-#: ../shell/e-shell-importer.c:134
+#: ../shell/e-shell-importer.c:131
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr ""
 "Valitse Evolutioniin tuotavat tiedosto ja valitse listasta tiedoston tyyppi."
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the destination for this import"
 msgstr "Valitse tÃ¤mÃ¤n tuonnin kohde"
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:141
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -20520,155 +19523,159 @@ msgstr ""
 "tuoda Evolutioniin, ei lÃ¶ytynyt. Jos haluat yrittÃ¤Ã¤ uudestaan, valitse\n"
 "\"Takaisin\".\n"
 
-#: ../shell/e-shell-importer.c:282
+#: ../shell/e-shell-importer.c:295
 msgid "F_ilename:"
 msgstr "_Tiedostonimi:"
 
-#: ../shell/e-shell-importer.c:287
+#: ../shell/e-shell-importer.c:300
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: ../shell/e-shell-importer.c:296
+#: ../shell/e-shell-importer.c:309
 msgid "File _type:"
 msgstr "Tiedoston _tyyppi:"
 
-#: ../shell/e-shell-importer.c:332
+#: ../shell/e-shell-importer.c:357
 msgid "Import data and settings from _older programs"
 msgstr "Tuo tietoja ja asetuksia _vanhemmista ohjelmista"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:360
 msgid "Import a _single file"
 msgstr "Tuo _yksi tiedosto"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-importer.c:743
+msgid "_Import"
+msgstr "_Tuo"
+
+#: ../shell/e-shell-settings-dialog.c:312
 msgid "Evolution Preferences"
 msgstr "Evolutionin asetukset"
 
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:324
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - evolution"
 
-#: ../shell/e-shell-window-commands.c:75
+#: ../shell/e-shell-window-commands.c:69
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Gnomen Pilot-tyÃ¶kalut eivÃ¤t ole asennettuina tÃ¤hÃ¤n jÃ¤rjestelmÃ¤Ã¤n."
 
-#: ../shell/e-shell-window-commands.c:83
+#: ../shell/e-shell-window-commands.c:78
 #, c-format
-msgid "Error executing %s."
-msgstr "Virhe suoritettaessa %s."
+msgid "Error executing %s. (%s)"
+msgstr "Virhe suoritettaessa %s. (%s)"
 
-#: ../shell/e-shell-window-commands.c:139
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy is not installed."
 msgstr "Bug buddya ei ole asennettu."
 
-#: ../shell/e-shell-window-commands.c:142
+#: ../shell/e-shell-window-commands.c:138
 msgid "Bug buddy could not be run."
-msgstr "Bug buddya ei voi suorittaa."
+msgstr "Bug buddya ei voitu suorittaa."
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:942
+#: ../shell/e-shell-window-commands.c:938
 msgid "translator-credits"
 msgstr ""
+"Ilkka Tuohela, 2002-2009\n"
 "Timo Jyrinki, 2008\n"
-"Ilkka Tuohela, 2002-2008\n"
 "Sami Pesonen, 2001-2003\n"
 "Jarkko Ranta, 2000-2001\n"
 "\n"
 "http://gnome.fi/";
 
-#: ../shell/e-shell-window-commands.c:953
+#: ../shell/e-shell-window-commands.c:949
 msgid "Evolution Website"
 msgstr "Evolutionin www-sivut"
 
-#: ../shell/e-shell-window-commands.c:1170
+#: ../shell/e-shell-window-commands.c:1163
 msgid "_Work Online"
-msgstr "_Yhteydellinen tila"
+msgstr "A_vaa verkkoyhteydet"
 
-#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1176 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
-msgstr "_YhteydetÃ¶n tila"
+msgstr "_Katkaise verkkoyhteydet"
 
-#: ../shell/e-shell-window-commands.c:1196
+#: ../shell/e-shell-window-commands.c:1189
 msgid "Work Offline"
-msgstr "Valitse yhteydetÃ¶n tila"
+msgstr "Katkaise verkkoyhteydet"
 
-#: ../shell/e-shell-window.c:377
+#: ../shell/e-shell-window.c:372
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
 msgstr ""
-"Evolution on yhteydellisessÃ¤ tilassa.\n"
-"Siirry yhteydettÃ¶mÃ¤Ã¤n tilaan napsauttamalla tÃ¤stÃ¤."
+"Evolution on verkossa.\n"
+"Katkaise verkkoyhteydet napsauttamalla napista."
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution siirtyy yhteydettÃ¶mÃ¤Ã¤n tilaan."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:386
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
 msgstr ""
-"Evolution on yhteydettÃ¶mÃ¤ssÃ¤ tilassa.\n"
-"Siirry yhteydelliseen tilaan napsauttamalla tÃ¤stÃ¤."
+"Evolution ei ole verkossa.\n"
+"Avaa verkkoyhteydet napsauttamalla napista."
 
-#: ../shell/e-shell-window.c:787
+#: ../shell/e-shell-window.c:778
 #, c-format
 msgid "Switch to %s"
 msgstr "Avaa %s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:634
 msgid "Unknown system error."
 msgstr "Tuntematon jÃ¤rjestelmÃ¤virhe."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
+#: ../shell/e-shell.c:1251 ../widgets/misc/e-cell-date-edit.c:320
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1253
 msgid "Invalid arguments"
 msgstr "VirheellisiÃ¤ argumentteja"
 
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1255
 msgid "Cannot register on OAF"
 msgstr "OAF:ia ei voidaan rekisterÃ¶idÃ¤"
 
-#: ../shell/e-shell.c:1267
+#: ../shell/e-shell.c:1257
 msgid "Configuration Database not found"
 msgstr "Asetustietokantaa ei lÃ¶ytynyt"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-user-creatable-items-handler.c:674
+#: ../shell/e-user-creatable-items-handler.c:684
+#: ../shell/e-user-creatable-items-handler.c:689
 msgid "New"
 msgstr "Uusi"
 
-#: ../shell/test/evolution-test-component.c:105
+#: ../shell/test/evolution-test-component.c:103
 msgid "New Test"
 msgstr "Uusi testi"
 
-#: ../shell/test/evolution-test-component.c:106
+#: ../shell/test/evolution-test-component.c:104
 msgctxt "New"
 msgid "_Test"
 msgstr "_Testi"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "Create a new test item"
-msgstr "Luo uusi testijuttu"
+msgstr "Luo uusi testikohde"
 
 #: ../shell/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Tuo tiedosto Evolutioniin painikkeesta \"Tuo\"."
+msgstr "Tuo tiedosto Evolutioniin napsauttamalla \"Tuo\"."
 
 #: ../shell/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -20700,12 +19707,12 @@ msgid ""
 "With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
-"Tervetuloa Evolutionin tuoja-apulaiseen.\n"
-"TÃ¤llÃ¤ apulaisella voit tuoda ulkopuolisia tiedostoja muualta\n"
-"Evolutionin kÃ¤yttÃ¶Ã¶n."
+"Tervetuloa Evolutionin tuontiapulaiseen.\n"
+"TÃ¤llÃ¤ apulaisella voit tuoda ulkopuolisia tiedostoja muista\n"
+"ohjelmista Evolutionin kÃ¤yttÃ¶Ã¶n."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:221
+#: ../shell/main.c:226
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20741,7 +19748,7 @@ msgstr ""
 "Toivomme ettÃ¤ nautit kovan tyÃ¶mme tuloksista, ja odotamme innolla\n"
 "osallistumistasi kehitystyÃ¶hÃ¶n!\n"
 
-#: ../shell/main.c:245
+#: ../shell/main.c:250
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20749,43 +19756,43 @@ msgstr ""
 "Kiitos\n"
 "Evolution-tiimi\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:257
 msgid "Do not tell me again"
 msgstr "Ã?lÃ¤ kerro tÃ¤tÃ¤ uudestaan"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:487
 msgid "Start Evolution activating the specified component"
 msgstr "KÃ¤ynnistÃ¤ Evolution aktivoimalla mÃ¤Ã¤ritelty komponentti"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:491
 msgid "Start in online mode"
-msgstr "Aloita yhteydellisessÃ¤ tilassa"
+msgstr "KÃ¤ynnistÃ¤ verkkoyhteydet auki"
 
-#: ../shell/main.c:488
+#: ../shell/main.c:494
 msgid "Forcibly shut down all Evolution components"
 msgstr "Sulje kaikki Evolutionin osat vÃ¤kisin"
 
-#: ../shell/main.c:492
+#: ../shell/main.c:498
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tuo tiedot vÃ¤kisin uudestaan Evolution 1.4:stÃ¤"
 
-#: ../shell/main.c:495
+#: ../shell/main.c:501
 msgid "Send the debugging output of all components to a file."
 msgstr "LÃ¤hetÃ¤ testitulosteet kaikista komponenteista tiedostoon."
 
-#: ../shell/main.c:497
+#: ../shell/main.c:503
 msgid "Disable loading of any plugins."
 msgstr "Ã?lÃ¤ lataa mitÃ¤Ã¤n lisÃ¤osia."
 
-#: ../shell/main.c:499
+#: ../shell/main.c:505
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Poista sÃ¤hkÃ¶postien, yhteystietojen ja tehtÃ¤vien esikatselu kÃ¤ytÃ¶stÃ¤."
 
-#: ../shell/main.c:586
+#: ../shell/main.c:614
 msgid "- The Evolution PIM and Email Client"
 msgstr ", sÃ¤hkÃ¶posti- ja ajanhallintaohjelma"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:642
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20914,7 +19921,7 @@ msgstr "_SÃ¤ilytÃ¤ tiedot"
 
 #: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
-msgstr "_Muistuta minua myÃ¶hemmin"
+msgstr "_Muistuta myÃ¶hemmin"
 
 #: ../shell/shell.error.xml.h:35
 msgid ""
@@ -20925,8 +19932,7 @@ msgid ""
 msgstr ""
 "{1}\n"
 "\n"
-"Jos pÃ¤Ã¤tÃ¤t jatkaa, et ehkÃ¤ pÃ¤Ã¤se kÃ¤siksi joihinkin vanhoista "
-"tiedostoistasi.\n"
+"Jos pÃ¤Ã¤tÃ¤t jatkaa, et ehkÃ¤ pÃ¤Ã¤se kÃ¤siksi joihinkin vanhoista tiedoistasi.\n"
 
 #: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
@@ -20939,7 +19945,7 @@ msgstr ""
 "\n"
 "Muokkaa luotettavuusasetuksia:"
 
-#: ../smime/gui/cert-trust-dialog.c:151
+#: ../smime/gui/cert-trust-dialog.c:150
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -20948,7 +19954,7 @@ msgstr ""
 "Koska luotat varmentajaan, joka myÃ¶nsi tÃ¤mÃ¤n varmenteen, luotat myÃ¶s tÃ¤mÃ¤n "
 "varmenteen oikeellisuuteen, jollei tÃ¤ssÃ¤ muuten mainita"
 
-#: ../smime/gui/cert-trust-dialog.c:155
+#: ../smime/gui/cert-trust-dialog.c:154
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -20957,51 +19963,51 @@ msgstr ""
 "Koska et luota varmentajaan, joka myÃ¶nsi tÃ¤mÃ¤n varmenteen, et "
 "automaattisesti luota tÃ¤hÃ¤n varmenteeseen, jollei tÃ¤ssÃ¤ muuten mainita"
 
-#: ../smime/gui/certificate-manager.c:137
-#: ../smime/gui/certificate-manager.c:380
-#: ../smime/gui/certificate-manager.c:604
+#: ../smime/gui/certificate-manager.c:136
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:611
 msgid "Select a certificate to import..."
 msgstr "Valitse tuotava varmenne..."
 
-#: ../smime/gui/certificate-manager.c:146
+#: ../smime/gui/certificate-manager.c:145
 msgid "All PKCS12 files"
 msgstr "Kaikki PKCS12-tiedostot"
 
 #: ../smime/gui/certificate-manager.c:151
-#: ../smime/gui/certificate-manager.c:394
-#: ../smime/gui/certificate-manager.c:618
+#: ../smime/gui/certificate-manager.c:398
+#: ../smime/gui/certificate-manager.c:625
 msgid "All files"
 msgstr "Kaikki tiedostot"
 
-#: ../smime/gui/certificate-manager.c:271
-#: ../smime/gui/certificate-manager.c:480
-#: ../smime/gui/certificate-manager.c:702
+#: ../smime/gui/certificate-manager.c:275
+#: ../smime/gui/certificate-manager.c:488
+#: ../smime/gui/certificate-manager.c:713
 msgid "Certificate Name"
 msgstr "Varmenteen nimi"
 
-#: ../smime/gui/certificate-manager.c:280
-#: ../smime/gui/certificate-manager.c:498
+#: ../smime/gui/certificate-manager.c:284
+#: ../smime/gui/certificate-manager.c:506
 msgid "Purposes"
 msgstr "KÃ¤yttÃ¶tarkoitus"
 
-#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:553
+#: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr "Sarjanumero"
 
-#: ../smime/gui/certificate-manager.c:297
+#: ../smime/gui/certificate-manager.c:301
 msgid "Expires"
 msgstr "VanhenemispÃ¤ivÃ¤"
 
-#: ../smime/gui/certificate-manager.c:389
+#: ../smime/gui/certificate-manager.c:392
 msgid "All email certificate files"
 msgstr "Kaikki sÃ¤hkÃ¶postivarmennetiedostot"
 
-#: ../smime/gui/certificate-manager.c:489
+#: ../smime/gui/certificate-manager.c:497
 msgid "E-Mail Address"
 msgstr "SÃ¤hkÃ¶postiosoite"
 
-#: ../smime/gui/certificate-manager.c:613
+#: ../smime/gui/certificate-manager.c:620
 msgid "All CA certificate files"
 msgstr "Kaikki CA-varmenteiden tiedostot"
 
@@ -21103,7 +20109,7 @@ msgstr ""
 "Ennen kuin luotat tÃ¤hÃ¤n CA:han missÃ¤Ã¤ tarkoituksessa, tulisi sinun tutkia "
 "varmenne tarkasti."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
 msgid "Certificate"
 msgstr "Varmenne"
 
@@ -21179,11 +20185,11 @@ msgstr "OrganisaatioyksikkÃ¶ (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 sormenjÃ¤lki"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:800
 msgid "SSL Client Certificate"
 msgstr "SSL-asiakkaan varmenne"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:804
 msgid "SSL Server Certificate"
 msgstr "SSL-palvelimen varmenne"
 
@@ -21229,7 +20235,7 @@ msgid "_Edit CA Trust"
 msgstr "_Muokkaa CA:n luottamusta"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:656
+#: ../smime/lib/e-cert-db.c:652
 msgid "Certificate already exists"
 msgstr "Varmenne on jo olemassa"
 
@@ -21238,161 +20244,161 @@ msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:407
 msgid "Sign"
 msgstr "Allekirjoita"
 
-#: ../smime/lib/e-cert.c:409
+#: ../smime/lib/e-cert.c:408
 msgid "Encrypt"
 msgstr "Salaa"
 
-#: ../smime/lib/e-cert.c:514
+#: ../smime/lib/e-cert.c:513
 msgid "Version"
 msgstr "Versio"
 
-#: ../smime/lib/e-cert.c:529
+#: ../smime/lib/e-cert.c:528
 msgid "Version 1"
 msgstr "Versio 1"
 
-#: ../smime/lib/e-cert.c:532
+#: ../smime/lib/e-cert.c:531
 msgid "Version 2"
 msgstr "Versio 2"
 
-#: ../smime/lib/e-cert.c:535
+#: ../smime/lib/e-cert.c:534
 msgid "Version 3"
 msgstr "Versio 3"
 
-#: ../smime/lib/e-cert.c:617
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 RSA-salauksella"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 RSA-salauksella"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 RSA-salauksella"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA-salaus"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr "Varmenneavaimen kÃ¤yttÃ¶"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
 msgstr "Netscape-varmenteen tyyppi"
 
-#: ../smime/lib/e-cert.c:659
+#: ../smime/lib/e-cert.c:658
 msgid "Certificate Authority Key Identifier"
 msgstr "Varmentajan avaintunniste"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Kohteen tunniste (%s)"
 
-#: ../smime/lib/e-cert.c:722
+#: ../smime/lib/e-cert.c:720
 msgid "Algorithm Identifier"
 msgstr "Algoritmin tunniste"
 
-#: ../smime/lib/e-cert.c:730
+#: ../smime/lib/e-cert.c:728
 msgid "Algorithm Parameters"
 msgstr "Algoritmin parametrit"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:750
 msgid "Subject Public Key Info"
 msgstr "Aiheen julkisen avaimen tiedot"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-cert.c:755
 msgid "Subject Public Key Algorithm"
 msgstr "Aiheen julkisen avaimen algoritmi"
 
-#: ../smime/lib/e-cert.c:772
+#: ../smime/lib/e-cert.c:770
 msgid "Subject's Public Key"
 msgstr "Kohteen julkinen avain"
 
-#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
 msgid "Error: Unable to process extension"
 msgstr "Virhe: laajennosta ei voi kÃ¤sitellÃ¤"
 
-#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
+#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
 msgid "Object Signer"
 msgstr "Kohteen allekirjoittaja"
 
-#: ../smime/lib/e-cert.c:818
+#: ../smime/lib/e-cert.c:816
 msgid "SSL Certificate Authority"
 msgstr "SSL-varmenteiden varmentaja"
 
-#: ../smime/lib/e-cert.c:822
+#: ../smime/lib/e-cert.c:820
 msgid "Email Certificate Authority"
 msgstr "SÃ¤hkÃ¶postivarmenteiden varmentaja"
 
-#: ../smime/lib/e-cert.c:850
+#: ../smime/lib/e-cert.c:848
 msgid "Signing"
 msgstr "Allekirjoitus"
 
-#: ../smime/lib/e-cert.c:854
+#: ../smime/lib/e-cert.c:852
 msgid "Non-repudiation"
 msgstr "KiistÃ¤mÃ¤ttÃ¶myys"
 
-#: ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:856
 msgid "Key Encipherment"
 msgstr "Avaimen salakoodaus"
 
-#: ../smime/lib/e-cert.c:862
+#: ../smime/lib/e-cert.c:860
 msgid "Data Encipherment"
 msgstr "Tiedon salakoodaus"
 
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:864
 msgid "Key Agreement"
 msgstr "Avaimen sopimus"
 
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:868
 msgid "Certificate Signer"
 msgstr "Varmenteen allekirjoittaja"
 
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:872
 msgid "CRL Signer"
 msgstr "CRL allekirjoittaja"
 
-#: ../smime/lib/e-cert.c:922
+#: ../smime/lib/e-cert.c:920
 msgid "Critical"
 msgstr "Kriittinen"
 
-#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
+#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
 msgid "Not Critical"
 msgstr "Ei-kriittinen"
 
-#: ../smime/lib/e-cert.c:948
+#: ../smime/lib/e-cert.c:946
 msgid "Extensions"
 msgstr "Laajennokset"
 
-#: ../smime/lib/e-cert.c:1019
+#: ../smime/lib/e-cert.c:1017
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
+#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
 msgid "Certificate Signature Algorithm"
 msgstr "Varmenteen allekirjoitusalgoritmi"
 
-#: ../smime/lib/e-cert.c:1084
+#: ../smime/lib/e-cert.c:1081
 msgid "Issuer"
 msgstr "MyÃ¶ntÃ¤jÃ¤"
 
-#: ../smime/lib/e-cert.c:1138
+#: ../smime/lib/e-cert.c:1135
 msgid "Issuer Unique ID"
 msgstr "MyÃ¶ntÃ¤jÃ¤n yksilÃ¶llinen ID"
 
-#: ../smime/lib/e-cert.c:1157
+#: ../smime/lib/e-cert.c:1154
 msgid "Subject Unique ID"
 msgstr "Kohteen yksilÃ¶llinen tunniste"
 
-#: ../smime/lib/e-cert.c:1200
+#: ../smime/lib/e-cert.c:1197
 msgid "Certificate Signature Value"
 msgstr "Varmenteen allekirjoituksen arvo"
 
@@ -21448,7 +20454,7 @@ msgstr "Kopioi valitut yhteystiedot toiseen kansioon"
 
 #: ../ui/evolution-addressbook.xml.h:8
 msgid "Copy the contacts of the selected folder into another folder"
-msgstr "Kopioi valitun kansion sisÃ¤ltÃ¶ toiseen kansioon"
+msgstr "Kopioi yhteystiedot valitussa kansiossa toiseen kansioon"
 
 #: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
@@ -21493,11 +20499,11 @@ msgstr "Sii_rrÃ¤ kaikki yhteystiedot..."
 
 #: ../ui/evolution-addressbook.xml.h:20
 msgid "Move selected contacts to another folder"
-msgstr "SiirrÃ¤ valitut yhteystiedot toiseen kansioon"
+msgstr "SiirrÃ¤ valitut viestit toiseen kansioon"
 
 #: ../ui/evolution-addressbook.xml.h:21
 msgid "Move the contacts of the selected folder into another folder"
-msgstr "SiirrÃ¤ valitun kansion sisÃ¤ltÃ¶ toiseen kansioon"
+msgstr "SiirrÃ¤ valittu kansio toiseen kansioon"
 
 #: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
@@ -21522,7 +20528,7 @@ msgstr "Tulosta valitut yhteystiedot"
 
 #: ../ui/evolution-addressbook.xml.h:29
 msgid "Rename the selected folder"
-msgstr "NimeÃ¤ valittu kansio uudestaan"
+msgstr "NimeÃ¤ valittu kalenteri uudestaan"
 
 #: ../ui/evolution-addressbook.xml.h:30
 msgid "S_ave Address Book As VCard"
@@ -21538,9 +20544,9 @@ msgstr "Tallenna valitut yhteystiedot VCardina"
 
 #: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
-msgstr "Tallenna yhteystiedot valitussa kansiossa VCardina"
+msgstr "Tallenna yhteystiedot valitussa osoitekirjassa VCardina"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2724
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2719
 msgid "Select All"
 msgstr "Valitse kaikki"
 
@@ -21578,7 +20584,7 @@ msgstr "PysÃ¤ytÃ¤"
 
 #: ../ui/evolution-addressbook.xml.h:43
 msgid "Stop Loading"
-msgstr "PysÃ¤ytÃ¤ lataaminen"
+msgstr "KeskeytÃ¤ lataaminen"
 
 #: ../ui/evolution-addressbook.xml.h:44
 msgid "View the current contact"
@@ -21591,7 +20597,7 @@ msgstr "T_oiminnot"
 
 #: ../ui/evolution-addressbook.xml.h:47
 msgid "_Copy Contact to..."
-msgstr "Kopioi yhteystieto..."
+msgstr "_Kopioi yhteystieto..."
 
 #: ../ui/evolution-addressbook.xml.h:48
 msgid "_Copy Folder Contacts To"
@@ -21659,11 +20665,11 @@ msgstr "Siirry"
 
 #: ../ui/evolution-calendar.xml.h:12
 msgid "Go back"
-msgstr "Takaisin"
+msgstr "Siirry takaisin"
 
 #: ../ui/evolution-calendar.xml.h:13
 msgid "Go forward"
-msgstr "Mene eteenpÃ¤in"
+msgstr "Siirry eteenpÃ¤in"
 
 #: ../ui/evolution-calendar.xml.h:14
 msgid "List"
@@ -21674,16 +20680,16 @@ msgid "Month"
 msgstr "Kuukausi"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:195
+#: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Seuraava"
 
 #: ../ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
-msgstr "Esikatselee tulostettavaa kalenteria"
+msgstr "Esikatsele tulostettavaa kalenteria"
 
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:171
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:70
+#: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Edellinen"
 
@@ -21781,9 +20787,7 @@ msgstr "Luo tai muokkaa sÃ¤Ã¤ntÃ¶jÃ¤ uuden sÃ¤hkÃ¶postin suodatukseen"
 
 #: ../ui/evolution-mail-global.xml.h:7
 msgid "Download messages of accounts/folders marked for offline"
-msgstr ""
-"Nouda viestit tileiltÃ¤ ja kansioista, jotka on merkitty yhteydettÃ¶mÃ¤Ã¤n "
-"kÃ¤yttÃ¶Ã¶n"
+msgstr "Nouda viestit verkottomaan kÃ¤yttÃ¶Ã¶n merkityiltÃ¤ tileiltÃ¤ ja kansioista"
 
 #: ../ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
@@ -21991,13 +20995,13 @@ msgstr "Piilota valitut viestit vÃ¤liaikaisesti"
 
 #: ../ui/evolution-mail-list.xml.h:34
 msgid "Threaded Message list"
-msgstr "SÃ¤ikeistetty viesti-ikkuna"
+msgstr "SÃ¤ikeistetty viestiluettelo"
 
 #: ../ui/evolution-mail-list.xml.h:36
 msgid "_Group By Threads"
 msgstr "Ryhmittele _sÃ¤ikeittÃ¤in"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:111
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Viesti"
@@ -22149,7 +21153,7 @@ msgstr "Suodata valitut viestit roskapostiksi"
 
 #: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected messages for follow-up"
-msgstr "Merkitse valitut viestit vastattaviksi"
+msgstr "Merkitse valitut viestit vastaukseksi"
 
 #: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
@@ -22252,199 +21256,183 @@ msgid "Paste messages from the clipboard"
 msgstr "LiitÃ¤ viestit leikepÃ¶ydÃ¤ltÃ¤"
 
 #: ../ui/evolution-mail-message.xml.h:68
-msgid "Pos_t New Message to Folder"
-msgstr "L_isÃ¤Ã¤ uusi viesti kansioon"
-
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Post a Repl_y"
-msgstr "Postita _vastaus"
-
-#: ../ui/evolution-mail-message.xml.h:70
-msgid "Post a message to a Public folder"
-msgstr "Postita viesti julkiseen kansioon"
-
-#: ../ui/evolution-mail-message.xml.h:71
-msgid "Post a reply to a message in a Public folder"
-msgstr "Kirjoita vastine viestiin julkisessa kansiossa"
-
-#: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
 msgstr "E_dellinen tÃ¤rkeÃ¤ viesti"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Preview the message to be printed"
 msgstr "Esikatsele tulostettavaa viestiÃ¤"
 
-#: ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Print this message"
 msgstr "Tulosta tÃ¤mÃ¤ viesti"
 
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Re_direct"
 msgstr "_Uudelleenohjaa"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Uudelleenohjaa (siirrÃ¤) valitut viestit jollekulle"
 
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Reset the text to its original size"
 msgstr "Palauta teksti alkuperÃ¤isen kokoiseksi"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Save the selected messages as a text file"
 msgstr "Tallenna valitut viestit tekstitiedostona"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Search Folder from Mailing _List..."
 msgstr "HakunÃ¤kymÃ¤ _postilistasta..."
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Search Folder from Recipien_ts..."
 msgstr "HakunÃ¤kymÃ¤ _vastaanottajista..."
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Search Folder from S_ubject..."
 msgstr "HakunÃ¤kymÃ¤ _aiheesta..."
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Search Folder from Sen_der..."
 msgstr "HakunÃ¤kymÃ¤ _lÃ¤hettÃ¤jÃ¤stÃ¤..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search for text in the body of the displayed message"
 msgstr "EtsiÃ¤ tekstiÃ¤ nÃ¤ytetyn viestin rungosta"
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Select _All Text"
 msgstr "Valitse k_aikki teksti"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Select all the text in a message"
 msgstr "Valitse kaikki teksti viestistÃ¤"
 
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:89 ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
-msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
+msgstr "Muuta nykyisen tulostimen sivuasetuksia"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "NÃ¤ytÃ¤ vÃ¤lkkyvÃ¤ kursori nÃ¤ytettÃ¤vien viestin rungossa"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Show messages with all email headers"
 msgstr "NÃ¤ytÃ¤ viesti kaikilla otsakkeillaan"
 
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr "NÃ¤ytÃ¤ viestin raakatekstimuotoinen lÃ¤hdekoodi"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Undelete the selected messages"
 msgstr "Peruuta valittujen viestien poistaminen"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Uni_mportant"
 msgstr "Sa_mantekevÃ¤"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Zoom _Out"
 msgstr "L_oitonna"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "_Attached"
 msgstr "_Liitetty"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "_Caret Mode"
 msgstr "Kohdistin_tila"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "_Clear Flag"
 msgstr "_Poista merkki"
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Delete Message"
 msgstr "Poista _viesti"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:103
 msgid "_Find in Message..."
 msgstr "Etsi viestistÃ¤..."
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Flag Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr "_Siirry"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Important"
 msgstr "_TÃ¤rkeÃ¤"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Inline"
 msgstr "S_isÃ¤kkÃ¤isesti"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Junk"
 msgstr "_Roskapostia"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Load Images"
 msgstr "_Lataa kuvat"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Message Source"
 msgstr "_Viestin lÃ¤hdekoodi"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Next Message"
 msgstr "_Seuraava viesti"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Normal Size"
 msgstr "_Normaali koko"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Not Junk"
 msgstr "_Ei roskapostia"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Open in New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Previous Message"
 msgstr "_Edellinen viesti"
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Quoted"
 msgstr "_Lainattuna"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Read"
 msgstr "_Luettu"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Save Message..."
 msgstr "_Tallenna viesti..."
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Undelete Message"
 msgstr "_Palauta viesti"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Unread"
 msgstr "L_ukematon"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Zoom"
 msgstr "_Suurenna"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Zoom In"
 msgstr "LÃ¤_hennÃ¤"
 
@@ -22474,7 +21462,7 @@ msgstr "LiitÃ¤ muistilappu leikepÃ¶ydÃ¤ltÃ¤"
 
 #: ../ui/evolution-memos.xml.h:10
 msgid "Previews the list of memos to be printed"
-msgstr "Esikatselee luetteloa  tulostettavista muistilapuista"
+msgstr "Esikatsele luetteloa tulostettavista muistilapuista"
 
 #: ../ui/evolution-memos.xml.h:13
 msgid "Print the list of memos"
@@ -22518,7 +21506,7 @@ msgstr "LiitÃ¤ tehtÃ¤vÃ¤t leikepÃ¶ydÃ¤ltÃ¤"
 
 #: ../ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
-msgstr "Esikatselee luetteloa tulostettavista tehtÃ¤vistÃ¤"
+msgstr "Esikatsele luetteloa tulostettavista tehtÃ¤vistÃ¤"
 
 #: ../ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
@@ -22554,7 +21542,7 @@ msgstr "Muuta tyÃ¶kalupalkin nÃ¤kyvyyttÃ¤"
 
 #: ../ui/evolution.xml.h:5
 msgid "Create a new window displaying this folder"
-msgstr "Luo uusi ikkuna kansion nÃ¤yttÃ¤miseksi"
+msgstr "Luo uusi ikkuna tÃ¤mÃ¤n kansion nÃ¤kymÃ¤lle"
 
 #: ../ui/evolution.xml.h:6
 msgid "Display window buttons using the desktop toolbar setting"
@@ -22683,7 +21671,7 @@ msgstr "NÃ¤ytÃ¤ tai piilota tilarivi"
 
 #: ../ui/evolution.xml.h:39
 msgid "Work _Offline"
-msgstr "Valitse _yhteydetÃ¶n tila"
+msgstr "_Katkaise verkkoyhteydet"
 
 #: ../ui/evolution.xml.h:40
 msgid "_About"
@@ -22806,11 +21794,11 @@ msgid "With _Status"
 msgstr "_Tilan kanssa"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:430
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:432
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:771
 msgid "UTC"
 msgstr "UTC"
 
@@ -22840,19 +21828,19 @@ msgstr ""
 "aikavyÃ¶hyke.\n"
 "Loitonna kartalla oikealla hiiren napilla."
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-dialog.c:74
 #: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "Kokoelma"
 
-#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views-dialog.c:356
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "MÃ¤Ã¤rittele nÃ¤kymÃ¤t - %s"
 
+#: ../widgets/menus/gal-define-views-dialog.c:364
 #: ../widgets/menus/gal-define-views-dialog.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:368
 msgid "Define Views"
 msgstr "MÃ¤Ã¤rittele nÃ¤kymÃ¤t"
 
@@ -22862,17 +21850,16 @@ msgid "Define Views for \"%s\""
 msgstr "MÃ¤Ã¤rittele %s nÃ¤kymÃ¤t"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
 #: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "Taulu"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
 msgid "Instance"
 msgstr "Tapahtumiskerta"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
 msgid "Save Current View"
 msgstr "Tallenna nykyinen nÃ¤kymÃ¤"
 
@@ -22885,17 +21872,17 @@ msgid "_Replace existing view"
 msgstr "_Korvaa olemassaoleva nÃ¤kymÃ¤"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:581
-#: ../widgets/menus/gal-view-menus.c:367
+#: ../widgets/menus/gal-view-instance.c:580
+#: ../widgets/menus/gal-view-menus.c:365
 msgid "Custom View"
 msgstr "Oma nÃ¤kymÃ¤"
 
-#: ../widgets/menus/gal-view-instance.c:582
+#: ../widgets/menus/gal-view-instance.c:581
 msgid "Save Custom View"
 msgstr "Tallenna oma nÃ¤kymÃ¤"
 
-#: ../widgets/menus/gal-view-instance.c:586
-#: ../widgets/menus/gal-view-menus.c:391
+#: ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:388
 msgid "Define Views..."
 msgstr "MÃ¤Ã¤rittele nÃ¤kymÃ¤t..."
 
@@ -22903,32 +21890,32 @@ msgstr "MÃ¤Ã¤rittele nÃ¤kymÃ¤t..."
 msgid "C_urrent View"
 msgstr "N_ykyinen nÃ¤kymÃ¤"
 
-#: ../widgets/menus/gal-view-menus.c:328
+#: ../widgets/menus/gal-view-menus.c:327
 #, c-format
 msgid "Select View: %s"
 msgstr "Valitse nÃ¤kymÃ¤: %s"
 
-#: ../widgets/menus/gal-view-menus.c:372
+#: ../widgets/menus/gal-view-menus.c:370
 msgid "Current view is a customized view"
 msgstr "Nykyinen nÃ¤kymÃ¤ tai muokattu nÃ¤kymÃ¤"
 
-#: ../widgets/menus/gal-view-menus.c:377
+#: ../widgets/menus/gal-view-menus.c:374
 msgid "Save Custom View..."
 msgstr "Tallenna oma nÃ¤kymÃ¤..."
 
-#: ../widgets/menus/gal-view-menus.c:382
+#: ../widgets/menus/gal-view-menus.c:379
 msgid "Save current custom view"
 msgstr "Tallenna nykyinen muokattu nÃ¤kymÃ¤"
 
-#: ../widgets/menus/gal-view-menus.c:396
+#: ../widgets/menus/gal-view-menus.c:393
 msgid "Create or edit views"
 msgstr "Luo tai muokkaa nÃ¤kymiÃ¤"
 
-#: ../widgets/menus/gal-view-new-dialog.c:70
+#: ../widgets/menus/gal-view-new-dialog.c:68
 msgid "Factory"
 msgstr "Tehdas"
 
-#: ../widgets/menus/gal-view-new-dialog.c:105
+#: ../widgets/menus/gal-view-new-dialog.c:103
 msgid "Define New View"
 msgstr "MÃ¤Ã¤rittele uusi nÃ¤kymÃ¤"
 
@@ -22944,64 +21931,166 @@ msgstr "NÃ¤kymÃ¤n tyyppi"
 msgid "Type of view:"
 msgstr "NÃ¤kymÃ¤n tyyppi:"
 
-#: ../widgets/misc/e-attachment-bar.c:1132
-msgid "Attachment Bar"
-msgstr "Liitepalkki"
+#: ../widgets/misc/e-attachment.c:990
+msgid "Attached message"
+msgstr "Liitetty viesti"
+
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
+#: ../widgets/misc/e-attachment-store.c:636
+msgid "attachment.dat"
+msgstr "liite.dat"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2619
+msgid "A load operation is already in progress"
+msgstr "Lataus on jo kÃ¤ynnissÃ¤"
+
+#: ../widgets/misc/e-attachment.c:1830 ../widgets/misc/e-attachment.c:2627
+msgid "A save operation is already in progress"
+msgstr "Tallennus on jo kÃ¤ynnissÃ¤"
+
+#: ../widgets/misc/e-attachment.c:1923
+#, c-format
+msgid "Could not load '%s'"
+msgstr "%s ei voitu ladata"
+
+#: ../widgets/misc/e-attachment.c:1926
 #, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Tiedoston %s liittÃ¤minen epÃ¤onnistui: %s"
+msgid "Could not load the attachment"
+msgstr "LiitettÃ¤ ei voitu avata"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#: ../widgets/misc/e-attachment.c:2190
 #, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Tiedoston %s liittÃ¤minen epÃ¤onnistui: epÃ¤tavallinen tiedosto"
+msgid "Could not open '%s'"
+msgstr "%s ei voitu avata"
+
+#: ../widgets/misc/e-attachment.c:2193
+#, c-format
+msgid "Could not open the attachment"
+msgstr "LiitettÃ¤ ei voitu avata"
+
+#: ../widgets/misc/e-attachment.c:2635
+msgid "Attachment contents not loaded"
+msgstr "Liitteen sisÃ¤ltÃ¶Ã¤ ei ladattu"
 
-#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/e-attachment.c:2712
+#, c-format
+msgid "Could not save '%s'"
+msgstr "Tiedostoa \"%s\" ei voitu tallentaa"
+
+#: ../widgets/misc/e-attachment.c:2715
+#, c-format
+msgid "Could not save the attachment"
+msgstr "LiitettÃ¤ ei voitu tallentaa"
+
+#: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "Liitteen ominaisuudet"
 
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "Tiedostonimi:"
+#: ../widgets/misc/e-attachment-dialog.c:328
+msgid "_Filename:"
+msgstr "_Tiedostonimi:"
 
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME-tyyppi:"
+#: ../widgets/misc/e-attachment-dialog.c:363
+msgid "MIME Type:"
+msgstr "MIME-tyyppi"
+
+#: ../widgets/misc/e-attachment-handler-image.c:95
+msgid "Could not set as background"
+msgstr "Ei voitu asettaa taustakuvaksi"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:87
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "LiitettÃ¤ ei voitu lÃ¤hettÃ¤Ã¤"
+msgstr[1] "LiitteitÃ¤ ei voitu lÃ¤hettÃ¤Ã¤"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:129
+msgid "_Send To..."
+msgstr "_LÃ¤hetÃ¤..."
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:131
+msgid "Send the selected attachments somewhere"
+msgstr "LÃ¤hetÃ¤ valitut liitteet jonnekin"
+
+#: ../widgets/misc/e-attachment-icon-view.c:480
+#: ../widgets/misc/e-attachment-tree-view.c:517
+msgid "Loading"
+msgstr "Ladataan"
+
+#: ../widgets/misc/e-attachment-icon-view.c:492
+#: ../widgets/misc/e-attachment-tree-view.c:529
+msgid "Saving"
+msgstr "Tallennetaan"
+
+#: ../widgets/misc/e-attachment-paned.c:87
+msgid "Hide _Attachment Bar"
+msgstr "Piilota _liitepalkki"
+
+#: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:626
+msgid "Show _Attachment Bar"
+msgstr "NÃ¤ytÃ¤ _liitepalkki"
+
+#: ../widgets/misc/e-attachment-store.c:541
+msgid "Add Attachment"
+msgstr "LisÃ¤Ã¤ liite"
+
+#: ../widgets/misc/e-attachment-store.c:544
+msgid "A_ttach"
+msgstr "Lii_tÃ¤"
+
+#: ../widgets/misc/e-attachment-store.c:607
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "Tallenna liite"
+msgstr[1] "Tallenna liitteet"
+
+#: ../widgets/misc/e-attachment-view.c:300
+msgid "S_ave All"
+msgstr "Tallenna _kaikki"
+
+#: ../widgets/misc/e-attachment-view.c:326
+msgid "A_dd Attachment..."
+msgstr "_LisÃ¤Ã¤ liite..."
+
+#: ../widgets/misc/e-attachment-view.c:643
+#, c-format
+msgid "Open with \"%s\""
+msgstr "Avaa ohjelmassa \"%s\""
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "Ehdota liitteen automaattista nÃ¤yttÃ¤mistÃ¤"
+#: ../widgets/misc/e-attachment-view.c:646
+#, c-format
+msgid "Open this attachment in %s"
+msgstr "Avaa tÃ¤mÃ¤ liite ohjelmalla %s"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1267
+#: ../widgets/misc/e-calendar-item.c:1253
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:220
+#: ../widgets/misc/e-calendar.c:217
 msgid "Month Calendar"
 msgstr "Kuukausikalenteri"
 
 #: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3644
-#: ../widgets/text/e-text.c:3645
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3633
 msgid "Fill color"
 msgstr "TÃ¤ytÃ¶n vÃ¤ri"
 
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:462
 #: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3651
-#: ../widgets/text/e-text.c:3652 ../widgets/text/e-text.c:3659
-#: ../widgets/text/e-text.c:3660
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3646
+#: ../widgets/text/e-text.c:3647
 msgid "GDK fill color"
 msgstr "GDK:n tÃ¤yttÃ¶vÃ¤ri"
 
 #: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3666
-#: ../widgets/text/e-text.c:3667
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
+#: ../widgets/text/e-text.c:3654
 msgid "Fill stipple"
 msgstr "TÃ¤ytÃ¶n kuviopeite"
 
@@ -23025,26 +22114,25 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
-#: ../widgets/table/e-table-group-container.c:999
-#: ../widgets/table/e-table-group-leaf.c:644
-#: ../widgets/table/e-table-item.c:3070
+#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1414
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:649
+#: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "Minimileveys"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
-#: ../widgets/table/e-table-group-container.c:1000
-#: ../widgets/table/e-table-group-leaf.c:645
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1415
+#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/table/e-table-group-leaf.c:650
+#: ../widgets/table/e-table-item.c:3063
 msgid "Minimum Width"
 msgstr "Minimileveys"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "VÃ¤listys"
 
-#: ../widgets/misc/e-cell-date-edit.c:289
+#: ../widgets/misc/e-cell-date-edit.c:296
 msgid "Now"
 msgstr "Nyt"
 
@@ -23053,7 +22141,7 @@ msgstr "Nyt"
 msgid "The time must be in the format: %s"
 msgstr "Ajan tulee olla muodossa: %s"
 
-#: ../widgets/misc/e-cell-percent.c:77
+#: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosenttiarvon tulee olla vÃ¤lillÃ¤ 0 - 100"
 
@@ -23152,146 +22240,90 @@ msgstr "Muut..."
 msgid "Ch_aracter Encoding"
 msgstr "MerkistÃ¶n _koodaus"
 
-#: ../widgets/misc/e-dateedit.c:303
+#: ../widgets/misc/e-dateedit.c:295
 msgid "Date and Time"
 msgstr "PÃ¤ivÃ¤ys ja aika"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:315
 msgid "Text entry to input date"
 msgstr "TekstikenttÃ¤ pÃ¤ivÃ¤yksen syÃ¶ttÃ¶Ã¶n"
 
-#: ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:337
 msgid "Click this button to show a calendar"
 msgstr "Paina tÃ¤stÃ¤ nÃ¤yttÃ¤Ã¤ksesi kalenterin"
 
-#: ../widgets/misc/e-dateedit.c:388
+#: ../widgets/misc/e-dateedit.c:379
 msgid "Drop-down combination box to select time"
 msgstr "YhdistelmÃ¤valitsin ajan valitsemiseen"
 
-#: ../widgets/misc/e-dateedit.c:464
+#: ../widgets/misc/e-dateedit.c:455
 msgid "No_w"
 msgstr "N_yt"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:461
 msgid "_Today"
 msgstr "_TÃ¤nÃ¤Ã¤n"
 
-#: ../widgets/misc/e-dateedit.c:1635
+#: ../widgets/misc/e-dateedit.c:1583
 msgid "Invalid Date Value"
 msgstr "Virheellinen pÃ¤ivÃ¤mÃ¤Ã¤rÃ¤"
 
-#: ../widgets/misc/e-dateedit.c:1664
+#: ../widgets/misc/e-dateedit.c:1613
 msgid "Invalid Time Value"
 msgstr "Virheellinen ajan kuvaus"
 
-#: ../widgets/misc/e-expander.c:182
-msgid "Expanded"
-msgstr "Laajennettu"
-
-#: ../widgets/misc/e-expander.c:183
-msgid "Whether or not the expander is expanded"
-msgstr "Onko laajennin laajennettu"
-
-#: ../widgets/misc/e-expander.c:191
-msgid "Text of the expander's label"
-msgstr "Laajentimen otsikon teksti"
-
-#: ../widgets/misc/e-expander.c:198
-msgid "Use underline"
-msgstr "KÃ¤ytÃ¤ alleviivausta"
-
-#: ../widgets/misc/e-expander.c:199
-msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
-msgstr ""
-"Jos asetettu, tarkoittaa alleviivaus tekstissÃ¤, ettÃ¤ seuraavaa merkkiÃ¤ "
-"kÃ¤ytetÃ¤Ã¤n pikanÃ¤ppÃ¤imenÃ¤"
-
-#: ../widgets/misc/e-expander.c:207
-msgid "Space to put between the label and the child"
-msgstr "Otsikon ja lapsen vÃ¤liin laitettava tila"
-
-#: ../widgets/misc/e-expander.c:216
-msgid "Label widget"
-msgstr "MerkintÃ¤-elementti"
-
-#: ../widgets/misc/e-expander.c:217
-msgid "A widget to display in place of the usual expander label"
-msgstr "Tavallisen laajennin-otsikin tilalla nÃ¤ytettÃ¤vÃ¤ elementti"
-
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
-msgid "Expander Size"
-msgstr "Laajentimen koko"
-
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
-msgid "Size of the expander arrow"
-msgstr "Laajennusnuolen koko"
-
-#: ../widgets/misc/e-expander.c:232
-msgid "Indicator Spacing"
-msgstr "Indikaattioen vÃ¤listys"
-
-#: ../widgets/misc/e-expander.c:233
-msgid "Spacing around expander arrow"
-msgstr "Laajennusnuolen ympÃ¤rillÃ¤ oleva tila"
-
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:126 ../widgets/misc/e-filter-bar.c:179
-#: ../widgets/misc/e-filter-bar.c:307 ../widgets/misc/e-filter-bar.c:749
+#: ../widgets/misc/e-filter-bar.c:123 ../widgets/misc/e-filter-bar.c:178
+#: ../widgets/misc/e-filter-bar.c:306 ../widgets/misc/e-filter-bar.c:737
 msgid "Advanced Search"
 msgstr "Oma haku"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:230
+#: ../widgets/misc/e-filter-bar.c:229
 msgid "Save Search"
 msgstr "Tallenna haku"
 
-#: ../widgets/misc/e-filter-bar.c:267
+#: ../widgets/misc/e-filter-bar.c:266
 msgid "_Searches"
 msgstr "_Haut"
 
-#: ../widgets/misc/e-filter-bar.c:269
+#: ../widgets/misc/e-filter-bar.c:268
 msgid "Searches"
 msgstr "Haut"
 
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
+#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:110
 msgid "_Save Search..."
 msgstr "_Tallenna haku..."
 
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:111
 msgid "_Edit Saved Searches..."
 msgstr "_Muokkaa tallennettuja hakuja..."
 
-#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:112
 msgid "_Advanced Search..."
 msgstr "_Oma haku..."
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:103
 msgid "All Accounts"
 msgstr "Kaikki tilit"
 
-#: ../widgets/misc/e-filter-bar.h:108
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "Current Account"
 msgstr "Valittu tili"
 
-#: ../widgets/misc/e-filter-bar.h:109
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Folder"
 msgstr "Valittu kansio"
 
-#: ../widgets/misc/e-filter-bar.h:110
-msgid "Current Message"
-msgstr "Valittu viesti"
-
-#: ../widgets/misc/e-image-chooser.c:169
+#: ../widgets/misc/e-image-chooser.c:168
 msgid "Choose Image"
 msgstr "Valitse kuva"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:605
 msgid "World Map"
 msgstr "Maailmankartta"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:607
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -23307,102 +22339,101 @@ msgstr "Verkossa"
 msgid "The button state is online"
 msgstr "Napin tila on verkossa"
 
-#: ../widgets/misc/e-pilot-settings.c:102
+#: ../widgets/misc/e-pilot-settings.c:99
 msgid "Sync with:"
 msgstr "Synkronoi:"
 
-#: ../widgets/misc/e-pilot-settings.c:110
+#: ../widgets/misc/e-pilot-settings.c:107
 msgid "Sync Private Records:"
 msgstr "Synkronisoi yksityiset tietueet:"
 
-#: ../widgets/misc/e-pilot-settings.c:119
+#: ../widgets/misc/e-pilot-settings.c:116
 msgid "Sync Categories:"
 msgstr "Synkronointiluokat:"
 
-#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
+#: ../widgets/misc/e-reflow.c:1435 ../widgets/misc/e-reflow.c:1436
 msgid "Empty message"
 msgstr "TyhjÃ¤ viesti"
 
-#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
+#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
 msgid "Reflow model"
 msgstr "Uudelleenvirtauksen malli"
 
-#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
+#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
 msgid "Column width"
 msgstr "Sarakkeen leveys"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
+#: ../widgets/misc/e-search-bar.c:92 ../widgets/misc/e-search-bar.c:359
+#: ../widgets/misc/e-search-bar.c:503 ../widgets/misc/e-search-bar.c:505
+#: ../widgets/misc/e-search-bar.c:1021
 msgid "Search"
 msgstr "Etsi"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
+#: ../widgets/misc/e-search-bar.c:359 ../widgets/misc/e-search-bar.c:503
+#: ../widgets/misc/e-search-bar.c:505
 msgid "Click here to change the search type"
 msgstr "Muuta hakutyyppiÃ¤ napsauttamalla tÃ¤stÃ¤"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:637
 msgid "_Search"
 msgstr "Et_si"
 
-#: ../widgets/misc/e-search-bar.c:609
+#: ../widgets/misc/e-search-bar.c:643
 msgid "_Find Now"
 msgstr "_Etsi nyt"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:644
 msgid "_Clear"
 msgstr "_TyhjennÃ¤"
 
-#: ../widgets/misc/e-search-bar.c:865
+#: ../widgets/misc/e-search-bar.c:899
 msgid "Item ID"
 msgstr "Kohteen ID"
 
-#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3566
-#: ../widgets/text/e-text.c:3567
+#: ../widgets/misc/e-search-bar.c:906 ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3556
 msgid "Text"
 msgstr "Teksti"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1003
+#: ../widgets/misc/e-search-bar.c:1053
 msgid "Sho_w: "
 msgstr "NÃ¤_ytÃ¤: "
 
-#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
-#. the term to search for
-#: ../widgets/misc/e-search-bar.c:1020
+#: ../widgets/misc/e-search-bar.c:1072
 msgid "Sear_ch: "
 msgstr "_Etsi: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1032
+#: ../widgets/misc/e-search-bar.c:1088
 msgid " i_n "
 msgstr " lÃ¤_hteestÃ¤ "
 
-#: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:806
+#: ../widgets/misc/e-selection-model-array.c:593
+#: ../widgets/table/e-tree-selection-model.c:803
 msgid "Cursor Row"
 msgstr "Kohdistimen rivi"
 
-#: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:813
+#: ../widgets/misc/e-selection-model-array.c:600
+#: ../widgets/table/e-tree-selection-model.c:810
 msgid "Cursor Column"
 msgstr "Kohdistimen sarake"
 
-#: ../widgets/misc/e-selection-model.c:209
+#: ../widgets/misc/e-selection-model.c:208
 msgid "Sorter"
 msgstr "JÃ¤rjestÃ¤jÃ¤"
 
-#: ../widgets/misc/e-selection-model.c:216
+#: ../widgets/misc/e-selection-model.c:215
 msgid "Selection Mode"
 msgstr "Valintatila"
 
-#: ../widgets/misc/e-selection-model.c:224
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Cursor Mode"
 msgstr "Kohdistintila"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:519
 msgid "When de_leted:"
 msgstr "Milloin _poistettu:"
 
@@ -23426,19 +22457,19 @@ msgstr "<b>Tilan seuranta</b>"
 msgid "A_uto-delete sent item"
 msgstr "Poista lÃ¤hetetty _automaattisesti"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Creat_e a sent item to track information"
 msgstr "Luo lÃ¤hetyskohde, jonka tietoja seurataan"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Deli_vered and opened"
 msgstr "_Toimitettu ja avattu"
 
-#: ../widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.glade.h:8
 msgid "Gene_ral Options"
 msgstr "_Yleisasetukset"
 
-#: ../widgets/misc/e-send-options.glade.h:10
+#: ../widgets/misc/e-send-options.glade.h:9
 msgid ""
 "None\n"
 "Mail Receipt"
@@ -23446,7 +22477,7 @@ msgstr ""
 "Ei mitÃ¤Ã¤n\n"
 "Vastaanottaja"
 
-#: ../widgets/misc/e-send-options.glade.h:12
+#: ../widgets/misc/e-send-options.glade.h:11
 msgid ""
 "Normal\n"
 "Proprietary\n"
@@ -23462,15 +22493,15 @@ msgstr ""
 "ErittÃ¤in salainen\n"
 "Ainoastaan sinulle"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "R_eply requested"
 msgstr "V_astausta pyydetty"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid "Sta_tus Tracking"
 msgstr "_Tilan seuranta"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:20
 msgid ""
 "Undefined\n"
 "High\n"
@@ -23482,30 +22513,34 @@ msgstr ""
 "Normaali\n"
 "Matala"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When acce_pted:"
 msgstr "Milloin hy_vÃ¤ksytty: "
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When co_mpleted:"
 msgstr "Milloin val_mistuu:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "When decli_ned:"
 msgstr "Milloin h_ylÃ¤tty: "
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "Wi_thin"
 msgstr "S_isÃ¤llÃ¤"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_After:"
 msgstr "_JÃ¤lkeen:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_All information"
 msgstr "_Kaikki tiedot"
 
+#: ../widgets/misc/e-send-options.glade.h:30
+msgid "_Classification:"
+msgstr "Lu_okittelu:"
+
 #. To translators: This means Delay the message delivery for some time
 #: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
@@ -23532,46 +22567,26 @@ msgid "_When opened:"
 msgstr "_Milloin avattu:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:252
+#: ../widgets/misc/e-task-widget.c:251
 #, c-format
 msgid "%s (...)"
-msgstr "%s (...)"
+msgstr "%s... (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:258
+#: ../widgets/misc/e-task-widget.c:257
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d %% valmiina)"
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-url-entry.c:103
 msgid "Click here to go to URL"
 msgstr "Napsauta tÃ¤stÃ¤ avataksesi URLin"
 
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "Edit Master Category List..."
-msgstr "Muokkaa luokkien pÃ¤Ã¤listaa..."
-
-#: ../widgets/misc/gal-categories.glade.h:2
-msgid "Item(s) belong to these _categories:"
-msgstr "NÃ¤ihin _luokkiin kuuluvat kohdat:"
-
-#: ../widgets/misc/gal-categories.glade.h:3
-msgid "_Available Categories:"
-msgstr "Valittavat _luokat:"
-
-#: ../widgets/misc/gal-categories.glade.h:4
-msgid "categories"
-msgstr "luokat"
-
-#: ../widgets/table/e-cell-combo.c:170
+#: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "ponnahduslista"
 
-#: ../widgets/table/e-cell-date.c:62
-msgid "%l:%M %p"
-msgstr "%l.%M %p"
-
 #: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "Valittu sarake"
@@ -23584,23 +22599,23 @@ msgstr "Kohdistettu sarake"
 msgid "Unselected Column"
 msgstr "Valitsematon sarake"
 
-#: ../widgets/table/e-cell-text.c:1794
+#: ../widgets/table/e-cell-text.c:1788
 msgid "Strikeout Column"
 msgstr "Yliviivattu sarake"
 
-#: ../widgets/table/e-cell-text.c:1801
+#: ../widgets/table/e-cell-text.c:1795
 msgid "Underline Column"
 msgstr "Alleviivaa sarake"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1802
 msgid "Bold Column"
 msgstr "Vahva sarake"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1809
 msgid "Color Column"
 msgstr "VÃ¤rillinen sarake"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1823
 msgid "BG Color Column"
 msgstr "Taustan vÃ¤rinen sarake"
 
@@ -23624,12 +22639,12 @@ msgstr "Ei jÃ¤rjestetty"
 msgid "No grouping"
 msgstr "Ei ryhmitystÃ¤"
 
-#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.c:642
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
 msgstr "NÃ¤ytÃ¤ kentÃ¤t"
 
-#: ../widgets/table/e-table-config.c:664
+#: ../widgets/table/e-table-config.c:663
 msgid "Available Fields"
 msgstr "Valittavat kentÃ¤t"
 
@@ -23638,7 +22653,7 @@ msgid "A_vailable Fields:"
 msgstr "Valittavat kentÃ¤t:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Ascending"
 msgstr "Nouseva"
 
@@ -23651,7 +22666,7 @@ msgid "Clear _All"
 msgstr "TyhjennÃ¤ k_aikki"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Descending"
 msgstr "Laskeva"
 
@@ -23711,21 +22726,7 @@ msgstr "_NÃ¤ytÃ¤ kentÃ¤t jÃ¤rjestyksessÃ¤:"
 msgid "_Sort..."
 msgstr "_JÃ¤rjestÃ¤..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:633
-#: ../widgets/table/e-table-field-chooser.c:66
-#: ../widgets/table/e-table-header-item.c:1886
-msgid "DnD code"
-msgstr "DnD-koodi"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:640
-#: ../widgets/table/e-table-field-chooser.c:73
-#: ../widgets/table/e-table-header-item.c:1900
-msgid "Full Header"
-msgstr "TÃ¤ysi otsake"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:116
+#: ../widgets/table/e-table-field-chooser-dialog.c:114
 msgid "Add a column..."
 msgstr "LisÃ¤Ã¤ sarake..."
 
@@ -23741,329 +22742,307 @@ msgstr ""
 "LisÃ¤Ã¤ sarake taulukkoon raahaamalla se kohtaan,\n"
 "johon haluat sen ilmestyvÃ¤n."
 
-#: ../widgets/table/e-table-group-container.c:344
+#: ../widgets/table/e-table-group-container.c:341
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
 msgstr[0] "%s : %s (%d kohta)"
 msgstr[1] "%s : %s (%d kohtaa)"
 
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:347
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d kohta)"
 msgstr[1] "%s (%d kohtaa)"
 
-#: ../widgets/table/e-table-group-container.c:922
-#: ../widgets/table/e-table-group-container.c:923
-#: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-group-leaf.c:582
-#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-leaf.c:586
+#: ../widgets/table/e-table-group-leaf.c:587
+#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
 msgid "Alternating Row Colors"
 msgstr "Vaihtelevat rivien vÃ¤rit"
 
-#: ../widgets/table/e-table-group-container.c:929
-#: ../widgets/table/e-table-group-container.c:930
-#: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-group-leaf.c:589
-#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
-#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-leaf.c:593
+#: ../widgets/table/e-table-group-leaf.c:594
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
 msgid "Horizontal Draw Grid"
 msgstr "Vaakasuuntainen piirtoristikko"
 
-#: ../widgets/table/e-table-group-container.c:936
-#: ../widgets/table/e-table-group-container.c:937
-#: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-group-leaf.c:596
-#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
-#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-leaf.c:600
+#: ../widgets/table/e-table-group-leaf.c:601
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
 msgid "Vertical Draw Grid"
 msgstr "Pystysuuntainen piirtoristikko"
 
-#: ../widgets/table/e-table-group-container.c:943
-#: ../widgets/table/e-table-group-container.c:944
-#: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-group-leaf.c:603
-#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
-#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-leaf.c:607
+#: ../widgets/table/e-table-group-leaf.c:608
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
 msgid "Draw focus"
 msgstr "Piirron kohdistin"
 
-#: ../widgets/table/e-table-group-container.c:950
-#: ../widgets/table/e-table-group-container.c:951
-#: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-group-leaf.c:610
-#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-leaf.c:614
+#: ../widgets/table/e-table-group-leaf.c:615
+#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
 msgid "Cursor mode"
 msgstr "Kursorin tila"
 
-#: ../widgets/table/e-table-group-container.c:957
-#: ../widgets/table/e-table-group-container.c:958
-#: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-group-leaf.c:624
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-leaf.c:628
+#: ../widgets/table/e-table-group-leaf.c:629
+#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
 msgid "Selection model"
 msgstr "Valintamalli"
 
-#: ../widgets/table/e-table-group-container.c:964
-#: ../widgets/table/e-table-group-container.c:965
-#: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-group-leaf.c:617
-#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
-#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3337
-#: ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-leaf.c:621
+#: ../widgets/table/e-table-group-leaf.c:622
+#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3333
+#: ../widgets/table/e-tree.c:3334
 msgid "Length Threshold"
 msgstr "Pituuden raja-arvo"
 
-#: ../widgets/table/e-table-group-container.c:971
-#: ../widgets/table/e-table-group-container.c:972
-#: ../widgets/table/e-table-group-leaf.c:658
-#: ../widgets/table/e-table-group-leaf.c:659
-#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
-#: ../widgets/table/e-table.c:3333 ../widgets/table/e-tree.c:3369
-#: ../widgets/table/e-tree.c:3370
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-leaf.c:663
+#: ../widgets/table/e-table-group-leaf.c:664
+#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3365
+#: ../widgets/table/e-tree.c:3366
 msgid "Uniform row height"
 msgstr "YhtenÃ¤inen rivinkorkeus"
 
-#: ../widgets/table/e-table-group-container.c:978
-#: ../widgets/table/e-table-group-container.c:979
-#: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-group-leaf.c:652
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-container.c:981
+#: ../widgets/table/e-table-group-leaf.c:656
+#: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
 msgstr "JÃ¤Ã¤dytetty"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1449
 msgid "Customize Current View"
 msgstr "Muokkaa nykyistÃ¤ nÃ¤kymÃ¤Ã¤"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1469
 msgid "Sort _Ascending"
 msgstr "jÃ¤rjestÃ¤ _nousevasti"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1470
 msgid "Sort _Descending"
 msgstr "JÃ¤rjestÃ¤ _laskevasti"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1471
 msgid "_Unsort"
 msgstr "Poista _jÃ¤rjestys"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Group By This _Field"
 msgstr "Ryhmittele tÃ¤mÃ¤n _kentÃ¤n mukaan"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Group By _Box"
 msgstr "Ryhmittele _laatikoittain"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Remove This _Column"
 msgstr "Poista tÃ¤mÃ¤ sa_rake"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Add a C_olumn..."
 msgstr "LisÃ¤Ã¤ sarake..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "A_lignment"
 msgstr "_Tasaus"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "B_est Fit"
 msgstr "_Paras sovitus"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Format Column_s..."
 msgstr "Muotoile _sarakkeet..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "Custo_mize Current View..."
 msgstr "_Mukauta nykyistÃ¤ nÃ¤kymÃ¤Ã¤..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1539
 msgid "_Sort By"
 msgstr "_JÃ¤rjestystapa"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1557
 msgid "_Custom"
 msgstr "_Oma"
 
-#: ../widgets/table/e-table-header-item.c:1893
-msgid "Font Description"
-msgstr "Kirjasimen kuvaus"
-
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:172
-msgid "Sort Info"
-msgstr "Tietoja jÃ¤rjestyksestÃ¤"
-
-#: ../widgets/table/e-table-header-item.c:1928
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "Puu"
-
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
 msgid "Table header"
 msgstr "Taulukon otsikko"
 
-#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
 msgid "Table model"
 msgstr "Taulumalli"
 
-#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
+#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
 msgid "Cursor row"
 msgstr "Kohdistimen rivi"
 
-#: ../widgets/table/e-table.c:3340 ../widgets/table/e-tree.c:3376
-#: ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-table-sorter.c:172
+msgid "Sort Info"
+msgstr "Tietoja jÃ¤rjestyksestÃ¤"
+
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
+#: ../widgets/table/e-tree.c:3373
 msgid "Always search"
 msgstr "Etsi aina"
 
-#: ../widgets/table/e-table.c:3347
+#: ../widgets/table/e-table.c:3337
 msgid "Use click to add"
 msgstr "LisÃ¤Ã¤ napsauttamalla"
 
-#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
+msgid "Tree"
+msgstr "Puu"
+
+#: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
 msgid "ETree table adapter"
 msgstr "ETree-taulukon adapteri"
 
-#: ../widgets/table/e-tree.c:3383
+#: ../widgets/table/e-tree.c:3379
 msgid "Retro Look"
 msgstr "Retro-ulkoasu"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3380
 msgid "Draw lines and +/- expanders."
 msgstr "PiirrÃ¤ viivat ja +/- laajentimet."
 
-#: ../widgets/text/e-text.c:2736
+#: ../widgets/table/e-tree.c:3386
+msgid "Expander Size"
+msgstr "Laajentimen koko"
+
+#: ../widgets/table/e-tree.c:3387
+msgid "Size of the expander arrow"
+msgstr "Laajennusnuolen koko"
+
+#: ../widgets/text/e-text.c:2731
 msgid "Input Methods"
 msgstr "SyÃ¶temenetelmÃ¤t"
 
-#: ../widgets/text/e-text.c:3559 ../widgets/text/e-text.c:3560
+#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
 msgid "Event Processor"
 msgstr "Tapahtumaprosessori"
 
-#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574
+#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
 msgid "Bold"
 msgstr "Vahva"
 
-#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581
+#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
 msgid "Strikeout"
 msgstr "Yliviivattu"
 
-#: ../widgets/text/e-text.c:3587 ../widgets/text/e-text.c:3588
+#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
 msgid "Anchor"
 msgstr "Ankkuri"
 
-#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
+#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
 msgid "Justification"
 msgstr "Asemointi"
 
-#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603
+#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
 msgid "Clip Width"
 msgstr "Leikkeen leveys"
 
-#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610
+#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
 msgid "Clip Height"
 msgstr "Leikkeen korkeus"
 
-#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
+#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
 msgid "Clip"
 msgstr "Leike"
 
-#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
+#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
 msgid "Fill clip rectangle"
 msgstr "TÃ¤ytÃ¤ leikkauksen suorakulmio"
 
-#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
+#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
 msgid "X Offset"
 msgstr "X-offset"
 
-#: ../widgets/text/e-text.c:3637 ../widgets/text/e-text.c:3638
+#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
 msgid "Y Offset"
 msgstr "Y-offset"
 
-#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
 msgid "Text width"
 msgstr "Tekstin leveys"
 
-#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681
+#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
 msgid "Text height"
 msgstr "Tekstin korkeus"
 
-#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
+#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
 msgid "Use ellipsis"
 msgstr "KÃ¤ytÃ¤ ellipsejÃ¤"
 
-#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
+#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
 msgid "Ellipsis"
 msgstr "Ellipsit"
 
-#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Line wrap"
 msgstr "Rivitys"
 
-#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Break characters"
 msgstr "Katkaisevat merkit"
 
-#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Max lines"
 msgstr "RivejÃ¤ enintÃ¤Ã¤n"
 
-#: ../widgets/text/e-text.c:3745 ../widgets/text/e-text.c:3746
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Draw borders"
 msgstr "PiirrÃ¤ reunat"
 
-#: ../widgets/text/e-text.c:3752 ../widgets/text/e-text.c:3753
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Allow newlines"
 msgstr "Salli rivinvaihdot"
 
-#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw background"
 msgstr "PiirrÃ¤ tausta"
 
-#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Draw button"
 msgstr "PiirrÃ¤ nappi"
 
-#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Cursor position"
 msgstr "Kohdistimen sijainti"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3781 ../widgets/text/e-text.c:3783
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
 msgid "IM Context"
 msgstr "IM-konteksti"
 
-#: ../widgets/text/e-text.c:3789 ../widgets/text/e-text.c:3790
+#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
 msgid "Handle Popup"
 msgstr "Kahvan ponnahdusikkuna"
 
-#~ msgid ""
-#~ "[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
-#~ msgstr ""
-#~ "[Turvataso=HenkilÃ¶kohtainen;Luokittelematon;Suojattu;Luottamuksellinen;"
-#~ "Salainen;ErittÃ¤in salainen]"
-
-#~ msgid "Contact Print Style Editor Test"
-#~ msgstr "Yhteystiedon tulostustyylien muokkaimen testi"
-
-#~ msgid "Copyright (C) 2000, Ximian, Inc."
-#~ msgstr "TekijÃ¤noikeudet (C) 2000, Ximian, Inc."
-
-#~ msgid "This should test the contact print style editor widget"
-#~ msgstr ""
-#~ "TÃ¤mÃ¤n pitÃ¤isi testata yhteystiedon tulostustyylin muokkaimen widgettiÃ¤"
-
-#~ msgid "Contact Print Test"
-#~ msgstr "Yhteystiedon tulostustesti"
-
-#~ msgid "This should test the contact print code"
-#~ msgstr "TÃ¤mÃ¤n pitÃ¤isi testata yhteystiedon tulostuksen koodia"
-
-#~ msgid "Error opening the FAQ webpage."
-#~ msgstr "Virhe avattaessa FAQ-sivua."
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]