[evolution] Updated Finnish translation



commit 18c214e90036ab4f5ddb3bf1a5388d5287db88a2
Author: Ilkka Tuohela <hile iki fi>
Date:   Sun Sep 13 11:21:53 2009 +0300

    Updated Finnish translation

 po/fi.po |21100 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 11099 insertions(+), 10001 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 3b40529..a579549 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:507
 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 09:24+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"
@@ -22,322 +22,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../a11y/addressbook/ea-addressbook-view.c:94
-#: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
-msgid "evolution address book"
-msgstr "evolutionin osoitekirja"
-
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
-msgid "New Contact"
-msgstr "Uusi yhteystieto"
-
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:245
-msgid "New Contact List"
-msgstr "Uusi yhteystietoluettelo"
-
-#: ../a11y/addressbook/ea-minicard-view.c:162
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "Valitussa osoitekirjassa %s on %d kortti"
-msgstr[1] "Valitussa osoitekirjassa %s on %d korttia"
-
-#: ../a11y/addressbook/ea-minicard.c:31
-msgid "Open"
-msgstr "Avaa"
-
-#: ../a11y/addressbook/ea-minicard.c:141
-msgid "Contact List: "
-msgstr "_Yhteystietoluettelo: "
-
-#: ../a11y/addressbook/ea-minicard.c:142
-msgid "Contact: "
-msgstr "Yhteystiedot: "
-
-#: ../a11y/addressbook/ea-minicard.c:168
-msgid "evolution minicard"
-msgstr "Evolutionin minikortti"
-
-#: ../a11y/calendar/ea-cal-view-event.c:265
-msgid "It has alarms."
-msgstr "Sisältää hälytyksiä."
-
-#: ../a11y/calendar/ea-cal-view-event.c:268
-msgid "It has recurrences."
-msgstr "Sisältää toistuvuuksia."
-
-#: ../a11y/calendar/ea-cal-view-event.c:271
-msgid "It is a meeting."
-msgstr "Sisältää kokouksen."
-
-#: ../a11y/calendar/ea-cal-view-event.c:277
-#, c-format
-msgid "Calendar Event: Summary is %s."
-msgstr "Kalenteritapahtuma, yhteenveto aiheesta: %s."
-
-#: ../a11y/calendar/ea-cal-view-event.c:279
-msgid "Calendar Event: It has no summary."
-msgstr "Kalenteritapahtuma, ei yhteenvetoa."
-
-#: ../a11y/calendar/ea-cal-view-event.c:299
-msgid "calendar view event"
-msgstr "kalenterinäkymän tapahtuma"
-
-#: ../a11y/calendar/ea-cal-view-event.c:527
-msgid "Grab Focus"
-msgstr "Ota kohdistin"
-
-#: ../a11y/calendar/ea-cal-view.c:299
-msgid "New Appointment"
-msgstr "Uusi tapaaminen"
-
-#: ../a11y/calendar/ea-cal-view.c:300
-msgid "New All Day Event"
-msgstr "Uusi koko päivän tapahtuma"
-
-#: ../a11y/calendar/ea-cal-view.c:301
-msgid "New Meeting"
-msgstr "Uusi kokous"
-
-#: ../a11y/calendar/ea-cal-view.c:302
-msgid "Go to Today"
-msgstr "Siirry tähän päivään"
-
-#: ../a11y/calendar/ea-cal-view.c:303
-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
-msgid "a table to view and select the current time range"
-msgstr "taulukko, josta voi nähdä ja valita nykyisen aika-alueen"
-
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:147
-#, c-format
-msgid "It has %d event."
-msgid_plural "It has %d events."
-msgstr[0] "%d tapahtuma."
-msgstr[1] "%d tapahtumaa."
-
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
-msgid "It has no events."
-msgstr "Ei tapahtumia."
-
-#. To translators: First %s is the week, for example "July 10th -
-#. July 14th, 2006". Second %s is the number of events in this work
-#. week, for example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:159
-#, c-format
-msgid "Work Week View: %s. %s"
-msgstr "Työviikon näkymä: %s. %s"
-
-#. To translators: First %s is the day, for example "Thursday July
-#. 13th, 2006". Second %s is the number of events on this day, for
-#. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:165
-#, c-format
-msgid "Day View: %s. %s"
-msgstr "Päivänäkymä: %s. %s"
-
-#: ../a11y/calendar/ea-day-view.c:196
-msgid "calendar view for a work week"
-msgstr "kalenterin näkymä työviikkoon"
-
-#: ../a11y/calendar/ea-day-view.c:198
-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
-msgid "%A %d %b %Y"
-msgstr "%A %d. %Bta %Y"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. 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
-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
-msgid "%a %d %b %Y"
-msgstr "%a %d %b %Y"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:215
-#: ../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
-msgid "%d %b %Y"
-msgstr "%d. %Bta %Y"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. 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
-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
-msgid "Gnome Calendar"
-msgstr "Gnome kalenteri"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:288
-msgid "search bar"
-msgstr "hakupalkki"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:289
-msgid "evolution calendar search bar"
-msgstr "evolutionin kalenterin hakupalkki"
-
-#: ../a11y/calendar/ea-jump-button.c:147
-msgid "Jump button"
-msgstr "Hyppäyspainike"
-
-#: ../a11y/calendar/ea-jump-button.c:156
-msgid "Click here, you can find more events."
-msgstr "napsauta tästä, voit löytää lisää tapahtumia."
-
-#: ../a11y/calendar/ea-week-view.c:154
-#, c-format
-msgid "Month View: %s. %s"
-msgstr "Kuukausinäkymä: %s. %s"
-
-#: ../a11y/calendar/ea-week-view.c:158
-#, c-format
-msgid "Week View: %s. %s"
-msgstr "Työviikko: %s. %s"
-
-#: ../a11y/calendar/ea-week-view.c:189
-msgid "calendar view for a month"
-msgstr "kalenterin kuukausinäkymä"
-
-#: ../a11y/calendar/ea-week-view.c:191
-msgid "calendar view for one or more weeks"
-msgstr "kalenterinäkymä yhdelle tai useammalle viikolle"
-
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "ponnahdusikkuna"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
-msgid "popup a child"
-msgstr "Ponnauta lapsi"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
-msgid "edit"
-msgstr "muokkaa"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
-msgid "begin editing this cell"
-msgstr "muokkaa tätä solua"
-
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
-msgid "toggle"
-msgstr "vaihtele"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
-msgid "toggle the cell"
-msgstr "Vaihtele solun näkyvyyttä"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
-msgid "expand"
-msgstr "laajenna"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
-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
-msgid "collapse"
-msgstr "piilota"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
-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
-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
-msgid "click to add"
-msgstr "lisää napsauttamalla"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
-msgid "click"
-msgstr "napsauta"
-
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
-msgid "sort"
-msgstr "järjestä"
-
-#: ../a11y/widgets/ea-calendar-item.c:295
-#: ../a11y/widgets/ea-calendar-item.c:301
-msgid "%d %B %Y"
-msgstr "%d. %Bta %Y"
-
-#: ../a11y/widgets/ea-calendar-item.c:303
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "Kalenteri väliltä %s - %s"
-
-#: ../a11y/widgets/ea-calendar-item.c:338
-msgid "evolution calendar item"
-msgstr "evolutionin kalenterin kohta"
-
-#: ../a11y/widgets/ea-combo-button.c:56
-msgid "Combo Button"
-msgstr "yhdistelmäpainike"
-
-#: ../a11y/widgets/ea-combo-button.c:66
-msgid "Activate Default"
-msgstr "Käytä oletuksia"
-
-#: ../a11y/widgets/ea-combo-button.c:68
-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 +75,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 +102,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:1116
 msgid "Failed to delete contact"
 msgstr "Yhteystiedon poisto epäonnistui"
 
@@ -438,7 +122,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
@@ -538,7 +222,7 @@ msgstr ""
 "Yhteystietoja {0} ei voi käyttää ennen kuin Evolution käynnistetään "
 "uudestaan."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:519
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:18
@@ -572,755 +256,20 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:491
+#: ../addressbook/conduit/address-conduit.c:598
 msgid "Default Sync Address:"
 msgstr "Synkronoinnin oletusosoite:"
 
-#: ../addressbook/conduit/address-conduit.c:1521
-#: ../addressbook/conduit/address-conduit.c:1522
+#: ../addressbook/conduit/address-conduit.c:1621
+#: ../addressbook/conduit/address-conduit.c:1622
 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:1699
+#: ../addressbook/conduit/address-conduit.c:1702
 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
-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"
-
-#. 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/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
-msgid "Contacts"
-msgstr "Yhteystiedot"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Address Book"
-msgstr "Evolutionin osoitekirja"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address popup"
-msgstr "Evolutionin osoitekirjan osoiteponnahdusikkuna"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Address Book address viewer"
-msgstr "Evolutionin osoitekirjan osoitteiden katselin"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Address Book card viewer"
-msgstr "Evolutionin osoitekirjan kortinkatselin"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Address Book component"
-msgstr "Evolutionin osoitekirjan komponentti"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-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
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution kansioasetusten määrittelyjen ohjain"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-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
-msgid "On This Computer"
-msgstr "Tällä tietokoneella"
-
-#. 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
-#. Create the default Person addressbook
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. 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
-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
-msgctxt "New"
-msgid "_Contact"
-msgstr "_Yhteystieto"
-
-#: ../addressbook/gui/component/addressbook-component.c:239
-msgid "Create a new contact"
-msgstr "Luo uusi yhteystieto"
-
-#: ../addressbook/gui/component/addressbook-component.c:246
-msgctxt "New"
-msgid "Contact _List"
-msgstr "Yhteystieto_luettelo"
-
-#: ../addressbook/gui/component/addressbook-component.c:247
-msgid "Create a new contact list"
-msgstr "Luo uusi yhteystietoluettelo"
-
-#: ../addressbook/gui/component/addressbook-component.c:253
-#: ../addressbook/gui/component/addressbook-config.c:1223
-msgid "New Address Book"
-msgstr "Uusi osoitekirja"
-
-#: ../addressbook/gui/component/addressbook-component.c:254
-msgctxt "New"
-msgid "Address _Book"
-msgstr "_Osoitekirja"
-
-#: ../addressbook/gui/component/addressbook-component.c:255
-msgid "Create a new address book"
-msgstr "Luo uusi osoitekirja"
-
-#: ../addressbook/gui/component/addressbook-component.c:418
-msgid "Failed upgrading Address Book settings or folders."
-msgstr "Osoitekirjan asetusten tai kansioiden päivitys epäonnistui."
-
-#: ../addressbook/gui/component/addressbook-config.c:332
-msgid "Base"
-msgstr "Kanta"
-
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:170
-msgid "_Type:"
-msgstr "_Tyyppi:"
-
-#: ../addressbook/gui/component/addressbook-config.c:635
-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
-#: ../smime/gui/smime-ui.glade.h:28
-msgid "General"
-msgstr "Yleiset"
-
-#: ../addressbook/gui/component/addressbook-config.c:999
-#: ../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
-msgid "Server Information"
-msgstr "Palvelimen tiedot"
-
-#: ../addressbook/gui/component/addressbook-config.c:1005
-msgid "Authentication"
-msgstr "Kirjautuminen"
-
-#: ../addressbook/gui/component/addressbook-config.c:1008
-#: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../smime/gui/smime-ui.glade.h:20
-msgid "Details"
-msgstr "Yksityiskohtaiset"
-
-#: ../addressbook/gui/component/addressbook-config.c:1009
-#: ../mail/em-folder-browser.c:1000
-msgid "Searching"
-msgstr "Etsitään"
-
-#: ../addressbook/gui/component/addressbook-config.c:1011
-msgid "Downloading"
-msgstr "Noudetaan"
-
-#: ../addressbook/gui/component/addressbook-config.c:1221
-#: ../addressbook/gui/component/ldap-config.glade.h:11
-msgid "Address Book Properties"
-msgstr "Osoitekirjan ominaisuudet"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1209
-msgid "Migrating..."
-msgstr "Siirretään..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1268
-#, c-format
-msgid "Migrating '%s':"
-msgstr "Siirretään  \"%s\":"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:646
-msgid "LDAP Servers"
-msgstr "LDAP-palvelimet"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:761
-msgid "Autocompletion Settings"
-msgstr "Automaattisen täydennyksen asetukset"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1137
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolutionin yhteystietojen kansioiden sijainti ja rakenne on muuttunut "
-"Evolution 1.x:n jälkeen.\n"
-"\n"
-"Odota kärsivällisesti, kun Evolution siirtää kansioitasi..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1151
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Sähköpostilistojen yhteystietojen muoto on muuttunut.\n"
-"\n"
-"Odota kärsivällisesti, kun Evolution muuntaa kansioitasi..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1160
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Muutamien puhelinnumeroiden tallennustapa on muuttunut.\n"
-"\n"
-"Odota kärsivällisesti kun Evolution muuntaa kansioitasi..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1170
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Evolutionin Palm synkronoinnin muutosloki ja karttatiedostot ovat "
-"muuttuneet.\n"
-"\n"
-"Odota kärsivällisesti kun Evolution muuntaa Pilotin synkronointitietojasi..."
-
-#: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:448
-#, 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
-msgid "Rename Folder"
-msgstr "Nimeä kansio uudestaan"
-
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:456
-msgid "Folder names cannot contain '/'"
-msgstr "Kansion nimi ei voi sisältää merkkiä '/'"
-
-#: ../addressbook/gui/component/addressbook-view.c:949
-msgid "_New Address Book"
-msgstr "_Uusi osoitekirja"
-
-#: ../addressbook/gui/component/addressbook-view.c:950
-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
-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
-#: ../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
-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
-msgid "_Properties"
-msgstr "_Ominaisuudet..."
-
-#: ../addressbook/gui/component/addressbook-view.c:1223
-msgid "Contact Source Selector"
-msgstr "Yhteystietojen lähdevalinta"
-
-#: ../addressbook/gui/component/addressbook.c:102
-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
-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
-#, 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
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "Syötä salasana"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
-msgid "Autocomplete length"
-msgstr "Automaattisen täydennyksen pituus"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
-msgid "EFolderList XML for the list of completion URIs"
-msgstr "EFolderList XML listalle täydennettävistä URI:sta"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
-msgid "EFolderList XML for the list of completion URIs."
-msgstr "EFolderList XML listalle täydennettävistä URI:sta."
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
-msgid ""
-"Position of the vertical pane, between the card and list views and the "
-"preview pane, in pixels."
-msgstr ""
-"Vaakapaneelin sijainti pikseleinä  kortti- listanäkymän ja "
-"esikatselupaneelin välissä."
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
-msgid "Show autocompleted name with an address"
-msgstr "Näytä automaattitäydennetyt nimet osoitteen kanssa"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
-msgid "Show preview pane"
-msgstr "Näytä Esikatselupaneeli"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-msgstr ""
-"Kuinka monta merkkiä tulee kirjoittaa ennen kuin evolution yrittää "
-"automaattista täydennystä"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
-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:9
-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
-msgid "Vertical pane position"
-msgstr "Vaakapaneelin sijainti"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
-msgstr ""
-"Pakotetaanko sähköpostiosoitteen näyttäminen nimen lisäksi automaattisesti "
-"täydennetyn yhteystiedon kohdalla kentässä."
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
-msgid "Whether to show the preview pane."
-msgstr "Näytetäänkö esikatselupaneeli."
-
-#: ../addressbook/gui/component/autocompletion-config.c:175
-msgid "Always _show address of the autocompleted contact"
-msgstr "Näytä _aina automaattitäydennetyn yhteystiedon osoite"
-
-#: ../addressbook/gui/component/autocompletion-config.c:180
-msgid "Look up in address books"
-msgstr "_Etsi osoitekirjoista"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:1
-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"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:4
-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>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Downloading</b>"
-msgstr "<b>Noudetaan</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
-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"
-
-#. 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
-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
-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"
-
-#. 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:28
-msgid "Search Filter"
-msgstr "Hakusuodatin"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid "Search _base:"
-msgstr "Haku_pohja:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:30
-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
-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\"."
-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
-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
-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 "
-"root of the directory tree."
-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
-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"
-"\"."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
-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
-msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
-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
-msgid "_Download limit:"
-msgstr "_Haun rajoitus:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-msgid "_Find Possible Search Bases"
-msgstr "Etsi mahdolliset hakupohjat"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:52
-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
-#: ../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
-msgid "_Port:"
-msgstr "_Portti:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:55
-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
-msgid "_Server:"
-msgstr "_Palvelin: "
-
-#: ../addressbook/gui/component/ldap-config.glade.h:57
-msgid "_Timeout:"
-msgstr "_Aikakatkaisu:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:58
-msgid "_Use secure connection:"
-msgstr "_Käytä salattua yhteyttä:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:59
-msgid "cards"
-msgstr "kortteja"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:60
-#: ../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
-msgid "minutes"
-msgstr "minuutti"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "<b>Email</b>"
 msgstr "<b>Sähköpostiosoite</b>"
@@ -1342,44 +291,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-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:312
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1238
+#: ../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:592
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
 msgid "Contact Editor"
 msgstr "Yhteystietojen muokkain"
 
@@ -1388,1280 +335,272 @@ 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
+#: ../modules/calendar/e-memo-shell-migrate.c:250
+#: ../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:822
+#: ../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
+#: ../e-util/e-logger.c:171 ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/exchange-operations/exchange-delegates.c:951
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../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-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-minicard-view-widget.c:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:340
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1258
+#: ../addressbook/gui/widgets/e-addressbook-model.c:523
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:428
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
+#: ../addressbook/gui/widgets/e-minicard-view.c:542
+#: ../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:170
+#: ../addressbook/gui/widgets/eab-contact-display.c:532
+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:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:535
 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:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:537
+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:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:538
+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/widgets/eab-contact-display.c:607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:536
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:534
 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:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:533
+msgid "GroupWise"
+msgstr "Groupwise"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:539
 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:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:76
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../modules/mail/e-mail-shell-migrate.c:956
+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/widgets/eab-contact-display.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:77
 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/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-#: ../calendar/gui/e-calendar-view.c:2259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:78
+#: ../addressbook/gui/widgets/eab-contact-display.c:445
+#: ../calendar/gui/e-calendar-view.c:1603
 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:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:536
+msgid "Error adding contact"
+msgstr "Virhe lisättäessä yhteystietoa"
 
-#: ../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:225
+msgid "Error modifying contact"
+msgstr "Virhe muokattaessa yhteystietoa"
 
-#: ../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:239
+msgid "Error removing contact"
+msgstr "Virhe poistettaessa yhteystietoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Source Book"
 msgstr "Lähdekirja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:305
 msgid "Target Book"
 msgstr "Kohdekirja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:319
 msgid "Is New Contact"
 msgstr "Uusi yhteystieto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:326
 msgid "Writable Fields"
 msgstr "Muokattavat kentät"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:333
 msgid "Required Fields"
 msgstr "Vaaditut kentät"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:347
 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:602
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2488
 #, 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:2883
 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:2884
 msgid "_No image"
 msgstr "_Ei kuvaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3155
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2669,198 +608,124 @@ msgstr ""
 "Yhteystieto on virheellinen:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3159
 #, 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:3166
 #, 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:3181
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3192
 #, 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:3205
 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:328
 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:331
 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:405
 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:416
 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:427
 msgid "_Select Address Book"
 msgstr "_Valitse osoitekirja"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact list (%s)?"
-msgstr ""
-"Haluatko varmasti poistaa \n"
-"yhteystietolistan (%s)?"
+#: ../addressbook/gui/contact-editor/eab-editor.c:167
+#: ../shell/e-shell-backend.c:171 ../shell/e-shell-window.c:323
+msgid "Shell"
+msgstr "Tulkki"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
-msgid ""
-"Are you sure you want\n"
-"to delete these contact lists?"
-msgstr ""
-"Haluatko varmasti\n"
-"poistaa nämä yhteystietolistat?"
+#: ../addressbook/gui/contact-editor/eab-editor.c:168
+#: ../shell/e-shell-backend.c:172 ../shell/e-shell-window.c:324
+msgid "The EShell singleton"
+msgstr "EShell-yksikkö"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:331
-#, c-format
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
 msgid ""
-"Are you sure you want\n"
-"to delete contact (%s)?"
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
 msgstr ""
-"Haluatko varmasti\n"
-"poistaa yhteystiedon (%s)?"
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
 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."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
-msgid "Esq."
-msgstr "Esq."
+"\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>"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
 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/dialogs/cal-prefs-dialog.c:183
 #: ../calendar/gui/e-day-view-time-item.c:815
-#: ../calendar/gui/e-timezone-entry.c:121
+#: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "Valitse..."
 
@@ -2876,25 +741,36 @@ msgstr "_Listan nimi:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Syötä sähköpostiosoite tai raahaa yhteystieto alla olevaa listaan:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
 msgid "Contact List Members"
 msgstr "Ota yhteyttä listan jäseniin"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:928
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1319
 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-view.c:211
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:531
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
+msgid "Error adding list"
+msgstr "Virhe lisättäessä listalle"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1170
+msgid "Error modifying list"
+msgstr "Virhe muokattaessa listaa"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1184
+msgid "Error removing list"
+msgstr "Virhe poistettaessa listaa"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1228
+#: ../addressbook/gui/widgets/e-addressbook-model.c:513
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:414
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: ../addressbook/gui/widgets/e-minicard-view.c:528
 msgid "Book"
 msgstr "Kirja"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1248
 msgid "Is New List"
 msgstr "Uusi lista"
 
@@ -2936,69 +812,80 @@ 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:510
+#: ../addressbook/gui/widgets/eab-contact-display.c:515
+#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/widgets/eab-contact-display.c:786
+#: ../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/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+#: ../modules/addressbook/e-book-shell-view-actions.c:876
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-memo-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:995
 msgid "Any field contains"
 msgstr "Mikä tahansa kenttä sisältää"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../modules/addressbook/e-book-shell-view-actions.c:883
 msgid "Email begins with"
 msgstr "Sähköposti alkaa"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../modules/addressbook/e-book-shell-view-actions.c:890
 msgid "Name contains"
 msgstr "Nimi sisältää"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:143
 msgid "No contacts"
 msgstr "Ei yhteystietoja"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#: ../addressbook/gui/widgets/e-addressbook-model.c:147
 #, 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-view.c:225
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:538
+#: ../addressbook/gui/widgets/e-addressbook-model.c:308
+msgid "Error getting book view"
+msgstr "Virhe ladattaessa kirjanäkymää"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:533
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:421
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
+#: ../addressbook/gui/widgets/e-minicard-view.c:535
 msgid "Query"
 msgstr "Kysely"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:461
-msgid "Error getting book view"
-msgstr "Virhe ladattaessa kirjanäkymää"
+#: ../addressbook/gui/widgets/e-addressbook-model.c:707
+msgid "Search Interrupted"
+msgstr "Haku keskeytettiin"
 
-#: ../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:435
+#: ../addressbook/gui/widgets/e-addressbook-view.c:645
+#: ../calendar/gui/e-calendar-table.c:886 ../calendar/gui/e-memo-table.c:669
+#: ../modules/calendar/e-memo-shell-content.c:597
+#: ../modules/calendar/e-task-shell-content.c:620
+#: ../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"
 
@@ -3006,114 +893,65 @@ msgstr "Malli"
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:158
-msgid "Name begins with"
-msgstr "Nimi alkaa"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:655
+#: ../calendar/gui/e-calendar-table.c:897 ../calendar/gui/e-memo-table.c:680
+msgid "Shell View"
+msgstr "Kuorinäkymä"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:218
+#: ../addressbook/gui/widgets/e-addressbook-view.c:666
 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-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
-msgid "Type"
-msgstr "Tyyppi"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1964
-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
-#: ../ui/evolution-addressbook.xml.h:56
-msgid "_Open"
-msgstr "_Avaa"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1134
+msgid "Are you sure you want to delete these contact lists?"
+msgstr "Haluatko varmasti poistaa nämä yhteystietolistat?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-msgid "_New Contact..."
-msgstr "_Uusi yhteystieto..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
-msgid "New Contact _List..."
-msgstr "Uusi yhteystieto_luettelo..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "_Save as vCard..."
-msgstr "_Tallenna vCard-muodossa..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
-msgid "_Forward Contact"
-msgstr "_Välitä yhteystieto"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1138
+msgid "Are you sure you want to delete this contact list?"
+msgstr "Haluatko varmasti poistaa tämän yhteystietolistan?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "_Forward Contacts"
-msgstr "_Välitä yhteystiedot"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1142
+#, c-format
+msgid "Are you sure you want to delete this contact list (%s)?"
+msgstr "Haluatko varmasti poistaa tämän yhteystietolistan (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
-msgid "Send _Message to Contact"
-msgstr "Lähetä _viesti henkilölle"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1148
+msgid "Are you sure you want to delete these contacts?"
+msgstr "Haluatko varmasti poistaa nämä yhteystiedot?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
-msgid "Send _Message to List"
-msgstr "Lähetä _viesti listalle"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1152
+msgid "Are you sure you want to delete this contact?"
+msgstr "Haluatko varmasti poistaa tämän yhteystiedon?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
-msgid "Send _Message to Contacts"
-msgstr "Lähetä _viesti henkilöille"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1156
+#, c-format
+msgid "Are you sure you want to delete this contact (%s)?"
+msgstr "Haluatko varmasti poistaa tämän yhteystiedon (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
-msgid "_Print"
-msgstr "_Tulosta"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
-msgid "Cop_y to Address Book..."
-msgstr "_Kopioi osoitekirjaan..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
-msgid "Mo_ve to Address Book..."
-msgstr "_Siirrä osoitekirjaan..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
-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
-msgid "_Copy"
-msgstr "_Kopioi"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
+msgid "Save as vCard..."
+msgstr "Tallenna vCard-muodossa..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-msgid "P_aste"
-msgstr "L_iitä"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1345
+#, c-format
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr ""
+"%d yhteystiedon avaaminen avaa myös %d uutta ikkunaa.\n"
+"Haluatko varmasti näyttää tämän yhteystiedon?"
 
-#. 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
-msgid "Any Category"
-msgstr "Mikä tahansa luokka"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1350
+msgid "_Don't Display"
+msgstr "�_lä näytä"
 
-#: ../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
-msgid "Unmatched"
-msgstr "Täsmäämättömät"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1351
+msgid "Display _All Contacts"
+msgstr "Näytä k_aikki yhteystiedot"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:553
 msgid "Assistant"
 msgstr "Apulainen"
 
@@ -3142,8 +980,7 @@ 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-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3151,7 +988,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:548
 msgid "Company"
 msgstr "Yritys"
 
@@ -3200,22 +1037,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:552
 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:573
 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:526
 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:586
 msgid "Note"
 msgstr "Huomautus"
 
@@ -3244,14 +1081,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:573
 #: ../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:577
 msgid "Spouse"
 msgstr "Puoliso"
 
@@ -3270,6 +1107,7 @@ msgid "Telex"
 msgstr "Telex"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../shell/e-shell-view.c:519
 msgid "Title"
 msgstr "Titteli"
 
@@ -3281,63 +1119,59 @@ 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/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/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"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
 msgid "Column Width"
 msgstr "Sarakkeen leveys"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:178
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3347,7 +1181,7 @@ msgstr ""
 "\n"
 "Etsitään yhteystietoja..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3361,7 +1195,7 @@ msgstr ""
 "\n"
 "tai luo uusi yhteystieto kaksoisnapsautuksella."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -3375,7 +1209,7 @@ msgstr ""
 "\n"
 "Luo uusi yhteystieto kaksoisnapsautuksella."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3385,7 +1219,7 @@ msgstr ""
 "\n"
 "Etsi yhteystietoja."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -3395,261 +1229,325 @@ 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:521
 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:797
 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
-msgid "_Open Link in Browser"
-msgstr "_Avaa linkki selaimessa"
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
+#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+msgid "evolution address book"
+msgstr "evolutionin osoitekirja"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2757
-msgid "_Copy Link Location"
-msgstr "_Kopioi linkin sijainti"
+#: ../addressbook/gui/widgets/ea-minicard-view.c:33
+msgid "New Contact"
+msgstr "Uusi yhteystieto"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:624
-msgid "_Send New Message To..."
-msgstr "Lähetä uusi _viesti..."
+#: ../addressbook/gui/widgets/ea-minicard-view.c:34
+msgid "New Contact List"
+msgstr "Uusi yhteystietoluettelo"
+
+#: ../addressbook/gui/widgets/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"
+msgstr[0] "Valitussa osoitekirjassa %s on %d kortti"
+msgstr[1] "Valitussa osoitekirjassa %s on %d korttia"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+#: ../addressbook/gui/widgets/ea-minicard.c:31
+msgid "Open"
+msgstr "Avaa"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:141
+msgid "Contact List: "
+msgstr "_Yhteystietoluettelo: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:142
+msgid "Contact: "
+msgstr "Yhteystiedot: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:168
+msgid "evolution minicard"
+msgstr "Evolutionin minikortti"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:189
 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:196
+#: ../widgets/misc/e-web-view.c:330
+msgid "_Send New Message To..."
+msgstr "Lähetä uusi _viesti..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:206
+#: ../widgets/misc/e-web-view.c:303
+msgid "_Copy Link Location"
+msgstr "_Kopioi linkin sijainti"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:213
+#: ../widgets/misc/e-web-view.c:313
+msgid "_Open Link in Browser"
+msgstr "_Avaa linkki selaimessa"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:289
+#: ../addressbook/gui/widgets/eab-contact-display.c:291
 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:309
+#: ../addressbook/gui/widgets/eab-contact-display.c:320
 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:404
+#: ../addressbook/gui/widgets/eab-contact-display.c:753
 msgid "List Members"
 msgstr "Listan jäsenet"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:549
 msgid "Department"
 msgstr "Osasto"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:550
 msgid "Profession"
 msgstr "Ammatti"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:551
 msgid "Position"
 msgstr "Asema"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:554
 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:555
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../modules/calendar/e-cal-shell-view-actions.c:214
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view.c:329
+#: ../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:556
+#: ../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:557
+#: ../addressbook/gui/widgets/eab-contact-display.c:572
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:642
+#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/widgets/eab-contact-display.c:574
+msgid "Address"
+msgstr "Osoite"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:569
 msgid "Home Page"
 msgstr "Kotisivu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:570
 msgid "Web Log"
 msgstr "Web-loki"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
-#: ../calendar/gui/e-calendar-view.c:2538
+#. XXX Allow the category icons to be referenced as named
+#. *     icons, since GtkAction does not support GdkPixbufs.
+#. Get the icon file for some default category.  Doesn't matter
+#. * which, so long as it has an icon.  We're just interested in
+#. * the directory components.
+#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../calendar/gui/e-calendar-view.c:1894 ../shell/main.c:127
 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:576
+#: ../calendar/gui/e-calendar-view.c:1895
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:856
+#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person memo list
+#. Create the default Person task list
+#. orange
+#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../modules/addressbook/e-book-shell-backend.c:175
+#: ../modules/addressbook/e-book-shell-migrate.c:507
+#: ../modules/calendar/e-cal-shell-backend.c:167
+#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../modules/calendar/e-memo-shell-backend.c:152
+#: ../modules/calendar/e-memo-shell-migrate.c:112
+#: ../modules/calendar/e-task-shell-backend.c:156
+#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/mail/e-mail-shell-migrate.c:957
+#: ../plugins/email-custom-header/email-custom-header.c:336
+msgid "Personal"
+msgstr "Henkilökohtainen"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:771
 msgid "Job Title"
 msgstr "Tehtävänimike"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:892
+#: ../addressbook/gui/widgets/eab-contact-display.c:807
 msgid "Home page"
 msgstr "Kotisivu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:815
 msgid "Blog"
 msgstr "Blog"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Success"
 msgstr "Onnistui"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Backend busy"
 msgstr "Taustajärjestelmä käytössä"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Repository offline"
 msgstr "Lähde poissa käytöstä"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Address Book does not exist"
 msgstr "Osoitekirjaa ei ole olemassa"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "No Self Contact defined"
 msgstr "Omaa yhteystietoa ei ole määritelty"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Permission denied"
 msgstr "Lupa evätty"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Contact not found"
 msgstr "Yhteystietoa ei löytynyt"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Contact ID already exists"
 msgstr "Yhteystiedon tunniste on jo olemassa"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Protocol not supported"
 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
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../calendar/gui/e-cal-component-preview.c:201
+#: ../calendar/gui/e-cal-model-tasks.c:465
+#: ../calendar/gui/e-cal-model-tasks.c:781
+#: ../calendar/gui/e-calendar-table.c:224
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:800 ../calendar/gui/print.c:2578
 msgid "Canceled"
 msgstr "Peruutettu"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Could not cancel"
 msgstr "Ei voi perua"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 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
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Authentication Required"
 msgstr "Todennus vaaditaan"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "TLS not Available"
 msgstr "TLS ei ole käytettävissä"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "No such source"
 msgstr "Lähdettä ei ole olemassa"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Not available in offline mode"
 msgstr "Ei käytettävissä yhteydettömässä tilassa"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Other error"
 msgstr "Muu virhe"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Invalid server version"
 msgstr "Virheellinen palvelimen versio"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:80
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "Unsupported authentication method"
 msgstr "Tunnistautumistapa ei ole tuettu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:104
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "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
+#: ../addressbook/gui/widgets/eab-gui-util.c:113
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -3658,7 +1556,7 @@ msgstr ""
 "Tätä osoitekirjaa ei voitu avata. Tarkista että polku %s on olemassa ja että "
 "sinulla on oikeudet käyttää sitä."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -3666,7 +1564,7 @@ msgstr ""
 "Tässä Evolutionin versiossa ei ole LDAP-tukea käytettävissä. Jos haluat LDAP-"
 "tuen evolutioniin, asenna versio joka on käännetty LDAP-tuen kanssa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -3674,11 +1572,11 @@ msgstr ""
 "Tätä osoitekirjaa ei voitu avata. Osoitekirjan URI voi olla virheellinen tai "
 "palvelinta ei voi tavoittaa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:142
 msgid "Detailed error message:"
 msgstr "Yksityiskohtainen virheviesti:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:165
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3690,7 +1588,7 @@ msgstr ""
 "Tarkenna hakuasi tai muuta tulosten määrän rajaa tämän\n"
 "osoitekirjan hakemistopalvelimen asetuksissa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -3701,70 +1599,21 @@ msgstr ""
 "annettu aikaraja. Tarkenna hakuasi, tai pidennä palvelimen aikarajaa tämän "
 "osoitekirjan hakemistopalvelimen asetuksissa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 msgid "The backend for this address book was unable to parse this query."
 msgstr "Tämän osoitekirjan taustajärjestelmä ei ymmärtänyt tätä kyselyä."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#: ../addressbook/gui/widgets/eab-gui-util.c:180
 msgid "The backend for this address book refused to perform this query."
 msgstr ""
 "Tämän osoitekirjan taustajärjestelmä ei suostunut suorittamaan tätä kyselyä."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "This query did not complete successfully."
 msgstr "Kyselyä ei voitu suorittaa onnistuneesti."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-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
-msgid "Error adding contact"
-msgstr "Virhe lisättäessä yhteystietoa"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying list"
-msgstr "Virhe muokattaessa listaa"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying contact"
-msgstr "Virhe muokattaessa yhteystietoa"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-msgid "Error removing list"
-msgstr "Virhe poistettaessa listaa"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:637
-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?"
-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"
-"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?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
-msgid "_Don't Display"
-msgstr "�_lä näytä"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
-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:211
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3773,363 +1622,140 @@ msgstr ""
 "%s on jo olemassa\n"
 "Haluatko ylikirjoittaa?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
 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:255
+#: ../addressbook/gui/widgets/eab-gui-util.c:258
 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:304
 msgid "card.vcf"
 msgstr "kortti.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:482
+#: ../addressbook/gui/widgets/eab-gui-util.c:341
 msgid "Select Address Book"
 msgstr "Valitse osoitekirja"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:455
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:597
 msgid "Move contact to"
 msgstr "Siirry yhteystieto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:599
 msgid "Copy contact to"
 msgstr "Kopioi yhteystieto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:602
 msgid "Move contacts to"
 msgstr "Siirrä yhteystiedot"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:604
 msgid "Copy contacts to"
 msgstr "Kopioi yhteystiedot"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:901
-msgid "Multiple vCards"
-msgstr "Useita vCard-tiedostoja"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:908
-#, c-format
-msgid "vCard for %s"
-msgstr "vCard %s"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:920
-#: ../addressbook/gui/widgets/eab-gui-util.c:946
-#, c-format
-msgid "Contact information"
-msgstr "Yhteystiedot"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:948
-#, c-format
-msgid "Contact information for %s"
-msgstr "%s yhteystiedot"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:293
-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:5
 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,32 +1763,55 @@ 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"
 
+#: ../addressbook/util/addressbook.c:102
+msgid "Accessing LDAP Server anonymously"
+msgstr "Otetaan yhteyttä LDAP-palvelimeen anonyymisti"
+
+#: ../addressbook/util/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
+msgid "Failed to authenticate.\n"
+msgstr "Kirjautuminen epäonnistui.\n"
+
+#: ../addressbook/util/addressbook.c:214
+#: ../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/util/addressbook.c:222
+#: ../calendar/common/authentication.c:51
+#: ../plugins/google-account-setup/google-source.c:518
+#: ../plugins/publish-calendar/publish-calendar.c:215
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "Syötä salasana"
+
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
@@ -4565,7 +2214,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:332
 msgid "_Save"
 msgstr "_Tallenna"
 
@@ -4588,311 +2237,54 @@ msgstr "_Lähetä huomautus"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:258
+#: ../calendar/conduits/calendar/calendar-conduit.c:255
 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:1520
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/memo/memo-conduit.c:814
+#: ../calendar/conduits/memo/memo-conduit.c:815
+#: ../calendar/conduits/todo/todo-conduit.c:1014
+#: ../calendar/conduits/todo/todo-conduit.c:1015
 msgid "Could not start evolution-data-server"
 msgstr "Evolutionin tietopalvelimen käynnistys epäonnistui"
 
+#: ../calendar/conduits/calendar/calendar-conduit.c:1628
 #: ../calendar/conduits/calendar/calendar-conduit.c:1631
-#: ../calendar/conduits/calendar/calendar-conduit.c:1634
 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:908
+#: ../calendar/conduits/memo/memo-conduit.c:911
 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:955
+#: ../calendar/conduits/memo/memo-conduit.c:958
 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:234
 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:1098
+#: ../calendar/conduits/todo/todo-conduit.c:1101
 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:1143
+#: ../calendar/conduits/todo/todo-conduit.c:1146
 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
-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
-msgid "Calendars"
-msgstr "Kalenterit"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Määrittele aikavyöhykkeesi, kalenteri ja tehtävälistasi"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolutionin kalenteri ja tehtävät"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution kalenterin määrittely"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution kalenterin ajanvarausviestien katselin"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolutionin kalenterin/tehtävien muokkain"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution's Calendar component"
-msgstr "Evolutionin kalenterin komponentti"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution's Memos component"
-msgstr "Evolutionin muistilappukomponentti"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Tasks component"
-msgstr "Evolutionin tehtävien komponentti"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-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
-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/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
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
-msgid "Tasks"
-msgstr "Tehtävät"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-msgid "_Calendars"
-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
-msgid "_Tasks"
-msgstr "_Tehtävät"
-
-#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolutionin kalenterin hälytyspalvelu"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
-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.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
-msgid "hours"
-msgid_plural "hours"
-msgstr[0] "tunti"
-msgstr[1] "tuntia"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
-msgid "Start time"
-msgstr "Alkamisaika"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
-msgid "Appointments"
-msgstr "Tapaamiset"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Dismiss _All"
-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
-msgid "Location:"
-msgstr "Sijainti:"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-msgid "Snooze _time:"
-msgstr "Torkkumisaika:"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
-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
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#: ../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
-#: ../widgets/menus/gal-define-views.glade.h:5
-msgid "_Edit"
-msgstr "_Muokkaa"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
-msgid "_Snooze"
-msgstr "_Torku"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
-msgid "location of appointment"
-msgstr "tapaamisen sijainti"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
-msgid "No summary available."
-msgstr "Ei yhteenvetoa saatavilla"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
-msgid "No description available."
-msgstr "Ei kuvausta saatavilla"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
-msgid "No location information available."
-msgstr "Ei sijaintitietoja saatavilla"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
-#, 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
-msgid "Warning"
-msgstr "Varoitus"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
-msgid ""
-"Evolution does not support calendar reminders with\n"
-"email notifications yet, but this reminder was\n"
-"configured to send an email.  Evolution will display\n"
-"a normal reminder dialog box instead."
-msgstr ""
-"Evolution ei vielä tue kalenterin muistutuksia, joissa on\n"
-"sähköpostihuomautus, mutta tämä muistutus oli määritelty\n"
-"lähettämään sähköpostia. Evolution näyttää sen sijaan\n"
-"tavallisen huomautusikkunan."
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
-#, c-format
-msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
-"\n"
-"        %s\n"
-"\n"
-"Are you sure you want to run this program?"
-msgstr ""
-"Evolution kalenterin muistutus laukeaa nyt. Muistutus on määritelty "
-"suorittamaan seuraavan ohjelman:\n"
-"\n"
-"         %s\n"
-"\n"
-"Haluatko varmasti suorittaa tämän ohjelman?"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
-msgid "Do not ask me about this program again."
-msgstr "�lä kysy tästä ohjelmasta enää uudestaan"
-
-#: ../calendar/gui/alarm-notify/notify-main.c:141
-msgid "Could not initialize Bonobo"
-msgstr "Bonobon alustus ei onnistunut"
-
-#: ../calendar/gui/alarm-notify/notify-main.c:154
-msgid ""
-"Could not create the alarm notify service factory, maybe it's already "
-"running..."
-msgstr ""
-"Hälytysten huomautuspalvelun tehdasta ei voi luoda, ehkä se oli jo käynnissä?"
-
-#: ../calendar/gui/alarm-notify/util.c:44
-msgid "invalid time"
-msgstr "epäkelpo aika"
-
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
-#: ../calendar/gui/misc.c:116
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d tunti"
-msgstr[1] "%d tuntia"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
-#: ../calendar/gui/misc.c:122
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minuutti"
-msgstr[1] "%d minuuttia"
-
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
-#: ../calendar/gui/misc.c:126
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d sekunti"
-msgstr[1] "%d sekuntia"
-
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
 msgstr "Hälytysohjelmat"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Aika sekunteina, kuinka pitkään virheet näytetään tilarivillä."
 
@@ -4913,121 +2305,141 @@ 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 "If \"true\", show the memo preview pane in the main window."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 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:33
 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:34
+#: ../mail/evolution-mail.schemas.in.h:86
 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:35
 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:36
 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:37
 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:38
 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:39
 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:40
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -5035,39 +2447,51 @@ 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:41
 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:42
+msgid "Memo layout style"
+msgstr "Muistilappujen asetttelutyyli"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+msgid "Memo preview pane position (horizontal)"
+msgstr "Muistilappujen esikatselupaneelin sijainti (vaaka)"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+msgid "Memo preview pane position (vertical)"
+msgstr "Muistilappujen esikatselupaneelin sijainti (pysty)"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 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:46
 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:47
 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:48
 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:49
 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:50
 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:51
 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:52
 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 +2499,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:53
 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 +2507,19 @@ 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:54
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+msgid "Position of the task preview pane when oriented vertically."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -5091,15 +2527,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
-msgid ""
-"Position of the vertical pane, between the task list and the task preview "
-"pane, in pixels."
-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:58
 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 +2535,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:59
 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 +2543,83 @@ 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:60
+msgid "Primary calendar"
+msgstr "Ensisijainen kalenteri"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+msgid "Primary memo list"
+msgstr "Ensisijainen muistilappulista"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+msgid "Primary task list"
+msgstr "Ensisijainen tehtävälista"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 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:64
 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:65
 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:66
+msgid "Scroll Month View by a week"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 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:68
 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:69
 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:70
 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:71
 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:72
 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
-msgid "Show the \"Preview\" pane"
-msgstr "Näytä \"Esikatselu\"-paneeli"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+msgid "Show the memo preview pane"
+msgstr "Näytä muistilappujen esikatselupaneeli"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:127
-msgid "Show the \"Preview\" pane."
-msgstr "Näytä esikatselupaneeli"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+msgid "Show the task preview pane"
+msgstr "Näytä tehtävien esikatselupaneeli"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 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:76
 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:77
 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:78
 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:79
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
@@ -5185,15 +2627,23 @@ 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:80
+msgid "Task layout style"
+msgstr "Tehtävien asettelutapa"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+msgid "Task preview pane position (horizontal)"
+msgstr "Tehtävien esikatselupaneelin sijainti (vaaka)"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+msgid "Task preview pane position (vertical)"
+msgstr "Tehtävien esikatselupaneelin sijainti (pysty)"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Tasks due today color"
 msgstr "Tänään erääntyvien tehtävien väri"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
-msgid "Tasks vertical pane position"
-msgstr "Tehtäväpaneelin pystysijainti"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5202,7 +2652,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:86
 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 +2661,25 @@ 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:87
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 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:90
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -5223,20 +2687,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:91
 msgid "Time divisions"
 msgstr "Aikajaot"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 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:93
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -5244,42 +2707,66 @@ 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:95
 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:96
+msgid "URI of the highlighted (\"primary\") calendar"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+msgid "URI of the highlighted (\"primary\") memo list"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+msgid "URI of the highlighted (\"primary\") task list"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 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:100
 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:101
+msgid "Use system timezone"
+msgstr "Käytä järjestelmän aikavyöhykettä"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+msgid "Vertical pane position"
+msgstr "Vaakapaneelin sijainti"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Week start"
 msgstr "Viikon alku"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 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:106
 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:107
 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:108
 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:109
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5287,288 +2774,90 @@ 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:110
 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:111
 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:112
 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:113
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 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:115
 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:116
 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:117
 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:118
 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:119
 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:120
 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:121
 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:122
 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:123
 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:124
 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:125
 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:126
 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:127
 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:128
 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-search-bar.c:75
-msgid "Summary contains"
-msgstr "Yhteenveto sisältää"
-
-#: ../calendar/gui/cal-search-bar.c:76
-msgid "Description contains"
-msgstr "Kuvaus sisältää"
-
-#: ../calendar/gui/cal-search-bar.c:77
-msgid "Category is"
-msgstr "Luokka on"
-
-#: ../calendar/gui/cal-search-bar.c:78
-msgid "Comment contains"
-msgstr "Kommentti sisältää"
-
-#: ../calendar/gui/cal-search-bar.c:79
-msgid "Location contains"
-msgstr "Sijainti sisältää"
-
-#: ../calendar/gui/cal-search-bar.c:640
-msgid "Next 7 Days' Tasks"
-msgstr "Seuraavien 7 päivän tehtävät"
-
-#: ../calendar/gui/cal-search-bar.c:644
-msgid "Active Tasks"
-msgstr "Aktiiviset tehtävät"
-
-#: ../calendar/gui/cal-search-bar.c:648
-msgid "Overdue Tasks"
-msgstr "Vanhentuneet tehtävät"
-
-#: ../calendar/gui/cal-search-bar.c:652
-msgid "Completed Tasks"
-msgstr "Valmistuneet tehtävät"
-
-#: ../calendar/gui/cal-search-bar.c:656
-msgid "Tasks with Attachments"
-msgstr "Tehtävät, joissa on liitteitä"
-
-#: ../calendar/gui/cal-search-bar.c:702
-msgid "Active Appointments"
-msgstr "Aktiiviset tapaamiset"
-
-#: ../calendar/gui/cal-search-bar.c:706
-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
-#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Tulosta"
-
-#: ../calendar/gui/calendar-commands.c:315
-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 "
-"events."
-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
-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
-#: ../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
-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
-#: ../plugins/calendar-weather/calendar-weather.c:126
-msgid "Weather"
-msgstr "Sää"
-
-#: ../calendar/gui/calendar-component.c:676
-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
-msgid "_Copy..."
-msgstr "_Kopioi..."
-
-#: ../calendar/gui/calendar-component.c:682
-#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:505
-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
-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
-msgid "Failed upgrading calendars."
-msgstr "Kalenterien päivitys epäonnistui."
-
-#: ../calendar/gui/calendar-component.c:1142
-#, 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
-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
-msgid "Calendar Source Selector"
-msgstr "Kalenterilähteen valinta"
-
-#: ../calendar/gui/calendar-component.c:1487
-msgid "New appointment"
-msgstr "Uusi tapaaminen"
-
-#: ../calendar/gui/calendar-component.c:1488
-msgctxt "New"
-msgid "_Appointment"
-msgstr "_Tapaaminen"
-
-#: ../calendar/gui/calendar-component.c:1489
-msgid "Create a new appointment"
-msgstr "Luo uusi tapaaminen"
-
-#: ../calendar/gui/calendar-component.c:1495
-msgid "New meeting"
-msgstr "Uusi tapaaminen"
-
-#: ../calendar/gui/calendar-component.c:1496
-msgctxt "New"
-msgid "M_eeting"
-msgstr "_Kokous"
-
-#: ../calendar/gui/calendar-component.c:1497
-msgid "Create a new meeting request"
-msgstr "Luo uusi kokouskutsu"
-
-#: ../calendar/gui/calendar-component.c:1503
-msgid "New all day appointment"
-msgstr "Uusi koko päivän tapaaminen"
-
-#: ../calendar/gui/calendar-component.c:1504
-msgctxt "New"
-msgid "All Day A_ppointment"
-msgstr "_Koko päivän tapaaminen"
-
-#: ../calendar/gui/calendar-component.c:1505
-msgid "Create a new all-day appointment"
-msgstr "Luo uusi koko päivän tapaaminen"
-
-#: ../calendar/gui/calendar-component.c:1511
-msgid "New calendar"
-msgstr "Uusi kalenteri"
-
-#: ../calendar/gui/calendar-component.c:1512
-msgctxt "New"
-msgid "Cale_ndar"
-msgstr "_Kalenteri"
-
-#: ../calendar/gui/calendar-component.c:1513
-msgid "Create a new calendar"
-msgstr "Luo uusi kalenteri"
+#: ../calendar/gui/cal-editor-utils.c:105
+msgid "Invalid object"
+msgstr "Virheellinen olio"
 
 #: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
@@ -5608,20 +2897,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/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:262
+#: ../calendar/gui/e-cal-model.c:526 ../calendar/gui/e-calendar-table.c:704
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:339
 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
+#: ../plugins/plugin-manager/plugin-manager.c:60
+#: ../widgets/misc/e-attachment-tree-view.c:496
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "Kuvaus"
@@ -5641,35 +2930,41 @@ 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:721
+#: ../plugins/save-calendar/csv-format.c:370
+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/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:261
+#: ../calendar/gui/e-cal-model.c:524 ../calendar/gui/e-calendar-table.c:703
 #: ../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/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:260
+#: ../calendar/gui/e-cal-model.c:515 ../calendar/gui/e-cal-model.c:522
+#: ../calendar/gui/e-calendar-table.c:702 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Julkinen"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:304
+#: ../calendar/gui/dialogs/event-editor.c:295
 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:356
 msgid "Summary"
 msgstr "Kuvaus"
 
@@ -5689,34 +2984,38 @@ 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
-msgid "Error while opening the calendar"
-msgstr "Virhe avattaessa kalenteria"
+#: ../calendar/gui/dialogs/alarm-dialog.c:627
+msgid "Edit Alarm"
+msgstr "Muokkaa hälytystä"
 
-#: ../calendar/gui/comp-editor-factory.c:415
-msgid "Method not supported when opening the calendar"
-msgstr "Menetelmä ei ollut tuettu avattaessa kalenteria"
+#: ../calendar/gui/dialogs/alarm-dialog.c:822
+#: ../calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr "Ponnahdusikkuna hälytykselle"
 
-#: ../calendar/gui/comp-editor-factory.c:421
-msgid "Permission denied to open the calendar"
-msgstr "Kalenterin avaamiseen ei ollut tarvittavia oikeuksia"
+#: ../calendar/gui/dialogs/alarm-dialog.c:823
+#: ../calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "Soita ääni"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
-msgid "Unknown error"
-msgstr "Tuntematon virhe"
+#: ../calendar/gui/dialogs/alarm-dialog.c:824
+#: ../calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "Suorita ohjelma"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:601
-msgid "Edit Alarm"
-msgstr "Muokkaa hälytystä"
+#: ../calendar/gui/dialogs/alarm-dialog.c:825
+#: ../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>"
@@ -5747,83 +3046,67 @@ 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)"
+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 +3117,55 @@ 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/dialogs/cal-prefs-dialog.c:107
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/event-page.c:2905
+#: ../calendar/gui/e-cal-model-tasks.c:773
 #: ../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
-#: ../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
-#: ../widgets/misc/e-signature-combo-box.c:74
+#: ../calendar/gui/e-itip-control.c:1159 ../filter/filter-rule.c:946
+#: ../mail/em-account-editor.c:919 ../mail/em-account-editor.c:1728
+#: ../modules/mail/e-mail-junk-hook.c:95
+#: ../plugins/calendar-weather/calendar-weather.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:378
+#: ../plugins/email-custom-header/email-custom-header.c:393
+#: ../plugins/exchange-operations/exchange-delegates-user.c:179
+#: ../plugins/itip-formatter/itip-formatter.c:2217
+#: ../widgets/misc/e-account-tree-view.c:124 ../widgets/misc/e-dateedit.c:1555
+#: ../widgets/misc/e-dateedit.c:1766
+#: ../widgets/misc/e-signature-combo-box.c:75
+#: ../widgets/table/e-cell-date-edit.c:312
 msgid "None"
 msgstr "Määrittelemätön"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:499
 msgid "Selected Calendars for Alarms"
 msgstr "Valitse kalenterit hälytyksille"
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
+msgid "Time and date:"
+msgstr "Päiväys ja aika:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+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 +3192,72 @@ 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
+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:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Hälytykset</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../mail/mail-config.glade.h:14
+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
-#: ../mail/mail-config.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../mail/mail-config.glade.h:18
 #: ../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:1113
+#: ../calendar/gui/e-itip-control.c:740
 msgid "Friday"
 msgstr "Perjantai"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../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:82
+#: ../modules/addressbook/addressbook-config.c:1015
+#: ../modules/addressbook/ldap-config.glade.h:17
+#: ../plugins/itip-formatter/itip-formatter.c:2567
+#: ../smime/gui/smime-ui.glade.h:28
+msgid "General"
+msgstr "Yleiset"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5955,13 +3267,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:1109
+#: ../calendar/gui/e-itip-control.c:736
 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 +3291,245 @@ 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:102
 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:1114
+#: ../calendar/gui/e-itip-control.c:741
 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 ""
+
+#: ../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:1115
+#: ../calendar/gui/e-itip-control.c:735
 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:1112
+#: ../calendar/gui/e-itip-control.c:739
 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:1110
+#: ../calendar/gui/e-itip-control.c:737
 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:1111
+#: ../calendar/gui/e-itip-control.c:738
 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:169
+#: ../modules/addressbook/addressbook-config.c:542
+msgid "_Type:"
+msgstr "_Tyyppi:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:150
+#: ../modules/addressbook/ldap-config.glade.h:36
+#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/misc/e-signature-script-dialog.c:282
+msgid "_Name:"
+msgstr "_Nimi:"
+
+#: ../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 +3582,244 @@ 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:190 ../calendar/gui/print.c:2350
 msgid " to "
 msgstr " - "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:194 ../calendar/gui/print.c:2354
 msgid " (Completed "
 msgstr " (Valmis "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371
+#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2356
 msgid "Completed "
 msgstr "Valmis"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376
+#: ../calendar/gui/dialogs/comp-editor-util.c:201 ../calendar/gui/print.c:2361
 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:203 ../calendar/gui/print.c:2363
 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: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:238
+msgid "Could not save attachments"
+msgstr "Liitteitä ei voitu tallentaa"
 
-#: ../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:501
 msgid "Could not update object"
 msgstr "Kohdetta ei voi päivittää"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:596
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:603
 #, c-format
 msgid "Meeting - %s"
 msgstr "Kokous - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:605
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:611
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tehtävänanto - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:955
+#: ../calendar/gui/dialogs/comp-editor.c:613
 #, c-format
 msgid "Task - %s"
 msgstr "Tehtävä - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
+#: ../calendar/gui/dialogs/comp-editor.c:618
 #, c-format
 msgid "Memo - %s"
 msgstr "Muistilappu - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:634
 msgid "No Summary"
 msgstr "Ei yhteenvetoa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:788
 msgid "Keep original item?"
 msgstr "Säilytä alkuperäinen?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1312
+#: ../calendar/gui/dialogs/comp-editor.c:992
 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:999
 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:1006
 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:1013
 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:1020
 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:1041
 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:1048
 msgid "Select all text"
 msgstr "Valitse kaikki teksti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1375
+#: ../calendar/gui/dialogs/comp-editor.c:1055
 msgid "_Classification"
 msgstr "Lu_okittelu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
-#: ../mail/mail-signature-editor.c:208
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+#: ../calendar/gui/dialogs/comp-editor.c:1062
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../filter/filter.glade.h:11 ../mail/e-mail-browser.c:111
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../shell/e-shell-window-actions.c:1599
+#: ../widgets/menus/gal-define-views.glade.h:5
+msgid "_Edit"
+msgstr "_Muokkaa"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1069 ../mail/e-mail-browser.c:104
+#: ../shell/e-shell-window-actions.c:1606
+#: ../widgets/misc/e-signature-editor.c:214
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
-#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1076
+#: ../shell/e-shell-window-actions.c:1613
 msgid "_Help"
 msgstr "O_hje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1083
 msgid "_Insert"
 msgstr "L_isää"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 msgid "_Options"
 msgstr "_Asetukset"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1097 ../mail/e-mail-browser.c:118
+#: ../shell/e-shell-window-actions.c:1648
 msgid "_View"
 msgstr "_Näytä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
-#: ../composer/e-composer-actions.c:469
+#: ../calendar/gui/dialogs/comp-editor.c:1107
+#: ../composer/e-composer-actions.c:304
 msgid "_Attachment..."
 msgstr "_Liite..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1109
 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:1117
 msgid "_Categories"
 msgstr "_Luokat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 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:1125
 msgid "Time _Zone"
 msgstr "_Aikavyöhyke"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1127
 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:1136
 msgid "Pu_blic"
 msgstr "J_ulkinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1458
+#: ../calendar/gui/dialogs/comp-editor.c:1138
 msgid "Classify as public"
 msgstr "Luokittele julkiseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1463
+#: ../calendar/gui/dialogs/comp-editor.c:1143
 msgid "_Private"
 msgstr "_Yksityinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1145
 msgid "Classify as private"
 msgstr "Luokittele yksityiseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1470
+#: ../calendar/gui/dialogs/comp-editor.c:1150
 msgid "_Confidential"
 msgstr "_Luottamuksellinen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1472
+#: ../calendar/gui/dialogs/comp-editor.c:1152
 msgid "Classify as confidential"
 msgstr "Luokittele luottamukselliseksi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1480
+#: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "R_ole Field"
 msgstr "R_oolikenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1482
+#: ../calendar/gui/dialogs/comp-editor.c:1162
 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:1168
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1170
 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:1176
 msgid "_Status Field"
 msgstr "_Tilakenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1498
+#: ../calendar/gui/dialogs/comp-editor.c:1178
 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:1184
 msgid "_Type Field"
 msgstr "T_yyppikenttä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1506
+#: ../calendar/gui/dialogs/comp-editor.c:1186
 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:1210
+#: ../composer/e-composer-private.c:68
 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:1683
+#: ../composer/e-composer-actions.c:507
 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:1738
+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:2013
+#: ../calendar/gui/dialogs/comp-editor.c:2062
+#: ../calendar/gui/dialogs/comp-editor.c:2944
 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:2912 ../mail/em-utils.c:359
+#: ../plugins/prefer-plain/prefer-plain.c:91
+msgid "attachment"
+msgstr "liite"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2974
 msgid "Unable to use current version!"
 msgstr "Nykyistä versiota ei voi käyttää!"
 
@@ -6603,7 +3892,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 +3920,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"
 
@@ -6664,203 +3953,242 @@ msgstr "_Vapaa/Varattu"
 msgid "Query free / busy information for the attendees"
 msgstr "Kysy vapaa/varattu-tietoja osanottajilta"
 
-#: ../calendar/gui/dialogs/event-editor.c:301
+#: ../calendar/gui/dialogs/event-editor.c:292
 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:750
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:754
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:766
+#: ../calendar/gui/dialogs/event-page.c:2662
 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:829
+#: ../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:876
 msgid "_Delegatees"
 msgstr "_Valtuutetut"
 
-#: ../calendar/gui/dialogs/event-page.c:847
+#: ../calendar/gui/dialogs/event-page.c:878
 msgid "Atte_ndees"
 msgstr "_Osanottajat"
 
-#: ../calendar/gui/dialogs/event-page.c:1031
+#: ../calendar/gui/dialogs/event-page.c:1064
 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:1067
 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:1238
+#: ../calendar/gui/dialogs/memo-page.c:654
+#: ../calendar/gui/dialogs/task-page.c:833
 msgid "Start date is wrong"
 msgstr "Aloituspäiväys on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1213
+#: ../calendar/gui/dialogs/event-page.c:1248
 msgid "End date is wrong"
 msgstr "Lopetuspäiväys on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/event-page.c:1271
 msgid "Start time is wrong"
 msgstr "Alkamisaika on väärin"
 
-#: ../calendar/gui/dialogs/event-page.c:1243
+#: ../calendar/gui/dialogs/event-page.c:1278
 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:1440
+#: ../calendar/gui/dialogs/memo-page.c:695
+#: ../calendar/gui/dialogs/task-page.c:893
 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:1446
+#: ../calendar/gui/dialogs/memo-page.c:701
+#: ../calendar/gui/dialogs/task-page.c:899
 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:1471
+#: ../calendar/gui/dialogs/task-page.c:923
 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
-msgid "_Add "
-msgstr "_Lisää "
-
-#: ../calendar/gui/dialogs/event-page.c:2601
+#: ../calendar/gui/dialogs/event-page.c:2535
 #, 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:2579
+#: ../calendar/gui/dialogs/memo-page.c:910
+#: ../calendar/gui/dialogs/task-page.c:1717
 #, 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:2879
 #, 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:2885
 #, 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:2891
 #, 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:2904
 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:148
+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:363
+#: ../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:167 ../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ää"
+msgid ""
+"for\n"
+"until"
+msgstr ""
+"toista\n"
+"kunnes"
 
-#: ../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ä:"
+#: ../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:515
+#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-source.c:740
+msgid "hours"
+msgstr "tuntia"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../modules/addressbook/ldap-config.glade.h:43
+#: ../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:514
+#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../plugins/google-account-setup/google-source.c:739
+msgid "minutes"
+msgstr "minuutti"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
+#: ../calendar/gui/dialogs/memo-editor.c:110 ../calendar/gui/print.c:2499
 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 ""
+
+#: ../calendar/gui/dialogs/memo-page.c:351
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr ""
+
+#: ../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:1037 ../em-format/em-format-quote.c:223
+#: ../em-format/em-format.c:938 ../mail/em-format-html.c:2137
+#: ../mail/em-format-html.c:2195 ../mail/em-format-html.c:2220
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "Vastaanottaja"
 
@@ -6874,7 +4202,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:378
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Ryhmä:"
@@ -6899,38 +4227,38 @@ 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:558
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Tämä tapaaminen sisältää toistuvuuksia, joita Evolution ei voi muokata."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:892
+#: ../calendar/gui/dialogs/recurrence-page.c:889
 msgid "Recurrence date is invalid"
 msgstr "Toistuvuuden päiväys on virheellinen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:929
 msgid "End time of the recurrence was before event's start"
 msgstr "Toistuvuuden päättymisäpäivä oli ennen tapahtuman alkua"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:961
+#: ../calendar/gui/dialogs/recurrence-page.c:958
 msgid "on"
 msgstr " "
 
@@ -6938,7 +4266,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:1015
 msgid "first"
 msgstr "ensimmäinen"
 
@@ -6947,7 +4275,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:1021
 msgid "second"
 msgstr "toinen"
 
@@ -6955,7 +4283,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:1026
 msgid "third"
 msgstr "kolmas"
 
@@ -6963,21 +4291,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:1031
 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:1036
+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:1041
 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:1065
 msgid "Other Date"
 msgstr "Toinen päiväys"
 
@@ -6985,7 +4321,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:1071
 msgid "1st to 10th"
 msgstr "1. - 10."
 
@@ -6993,7 +4329,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:1077
 msgid "11th to 20th"
 msgstr "11. - 20."
 
@@ -7001,45 +4337,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:1083
 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:1108
 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:1237
 msgid "on the"
 msgstr "  "
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "tapahtumiskertaa"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2120
+#: ../calendar/gui/dialogs/recurrence-page.c:2117
 msgid "Add exception"
 msgstr "Lisää poikkeus"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2161
+#: ../calendar/gui/dialogs/recurrence-page.c:2158
 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:2164
 msgid "Modify exception"
 msgstr "Muokkaa poikkeusta"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2211
+#: ../calendar/gui/dialogs/recurrence-page.c:2208
 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:2347
 msgid "Date/Time"
 msgstr "Päiväys/aika"
 
@@ -7056,50 +4392,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:379
+#: ../calendar/gui/dialogs/task-details-page.c:399
 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:484
 msgid "Web Page"
 msgstr "WWW-sivu"
 
@@ -7111,74 +4453,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,28 +4507,36 @@ 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:360
 msgid "_Send Options"
 msgstr "_Lähetysasetukset"
 
-#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/dialogs/task-editor.c:335
 msgid "_Task"
 msgstr "_Tehtävä"
 
-#: ../calendar/gui/dialogs/task-editor.c:320
+#: ../calendar/gui/dialogs/task-editor.c:338
 msgid "Task Details"
 msgstr "Tehtävän yksityiskohdat"
 
-#: ../calendar/gui/dialogs/task-page.c:373
+#: ../calendar/gui/dialogs/task-page.c:334
+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:338
+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:386
 #: ../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:806
 msgid "Due date is wrong"
 msgstr "Eräpäivä on virheellinen"
 
-#: ../calendar/gui/dialogs/task-page.c:1763
+#: ../calendar/gui/dialogs/task-page.c:1674
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Tehtäviä kohteesta '%s' ei voi avata."
@@ -7259,6 +4573,31 @@ msgid_plural "%d weeks"
 msgstr[0] "%d viikko"
 msgstr[1] "%d viikkoa"
 
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:406 ../calendar/gui/misc.c:116
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d tunti"
+msgstr[1] "%d tuntia"
+
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:412 ../calendar/gui/misc.c:122
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuutti"
+msgstr[1] "%d minuuttia"
+
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/e-alarm-list.c:418 ../calendar/gui/misc.c:126
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekunti"
+msgstr[1] "%d sekuntia"
+
 #: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Tuntematon suoritettava tehtävä"
@@ -7319,80 +4658,137 @@ 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
-#, 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-preview.c:110 ../filter/filter-rule.c:863
 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
-msgid "Start Date:"
-msgstr "Alkamispäivä:"
+#: ../calendar/gui/e-cal-component-preview.c:116
+msgid "Categories:"
+msgstr "Luokat:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:194
-#: ../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
-msgid "Description:"
-msgstr "Kuvaus:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:218
-#: ../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:151
+#: ../calendar/gui/e-itip-control.c:1163
 #: ../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:158
+#: ../calendar/gui/e-cal-component-preview.c:169
+msgid "Start Date:"
+msgstr "Alkamispäivä:"
+
+#: ../calendar/gui/e-cal-component-preview.c:180
 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:191
+#: ../calendar/gui/e-itip-control.c:1187
+#: ../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:195
+#: ../calendar/gui/e-cal-model-tasks.c:461
+#: ../calendar/gui/e-cal-model-tasks.c:777
+#: ../calendar/gui/e-cal-model-tasks.c:854
+#: ../calendar/gui/e-calendar-table.c:220
+#: ../calendar/gui/e-calendar-table.c:231
+#: ../calendar/gui/e-calendar-table.c:798 ../calendar/gui/print.c:2572
+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:198
+#: ../calendar/gui/e-cal-model-tasks.c:463
+#: ../calendar/gui/e-cal-model-tasks.c:779
+#: ../calendar/gui/e-calendar-table.c:222
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:799 ../calendar/gui/e-itip-control.c:948
+#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/print.c:2575 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:360
+msgid "Completed"
+msgstr "Valmis"
+
+#: ../calendar/gui/e-cal-component-preview.c:205
+#: ../calendar/gui/e-cal-model-tasks.c:459
+#: ../calendar/gui/e-cal-model-tasks.c:775
+#: ../calendar/gui/e-calendar-table.c:218
+#: ../calendar/gui/e-calendar-table.c:229
+#: ../calendar/gui/e-calendar-table.c:797 ../calendar/gui/print.c:2569
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "Ei aloitettu"
+
+#: ../calendar/gui/e-cal-component-preview.c:216
 msgid "Priority:"
 msgstr "Prioriteetti:"
 
+#: ../calendar/gui/e-cal-component-preview.c:218
+#: ../calendar/gui/e-calendar-table.c:724 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1077
+msgid "High"
+msgstr "Korkea"
+
+#: ../calendar/gui/e-cal-component-preview.c:220
+#: ../calendar/gui/e-cal-model.c:1232 ../calendar/gui/e-calendar-table.c:725
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1076
+msgid "Normal"
+msgstr "Tavallinen"
+
+#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-calendar-table.c:726 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1075
+msgid "Low"
+msgstr "Matala"
+
+#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-itip-control.c:1219
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:65
+msgid "Description:"
+msgstr "Kuvaus:"
+
+#: ../calendar/gui/e-cal-component-preview.c:263
+msgid "Web Page:"
+msgstr "WWW-sivu:"
+
 #: ../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:361
+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:776
 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:777
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../calendar/gui/e-cal-model-tasks.c:627
+#: ../calendar/gui/e-cal-model-tasks.c:727
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7402,234 +4798,165 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
-#: ../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-cal-model-tasks.c:1129 ../calendar/gui/e-cal-model.c:1238
+#: ../calendar/gui/e-meeting-list-view.c:187
+#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/e-meeting-store.c:856
 #: ../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-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-cal-model-tasks.c:1129 ../calendar/gui/e-cal-model.c:1238
+#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-meeting-store.c:174
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Ei"
 
+#: ../calendar/gui/e-cal-model.c:362 ../calendar/gui/gnome-cal.c:523
+#: ../shell/e-shell.c:720
+msgid "Shell Settings"
+msgstr "Kuoren asetukset"
+
+#: ../calendar/gui/e-cal-model.c:363 ../calendar/gui/gnome-cal.c:524
+#: ../shell/e-shell.c:721
+msgid "Application-wide settings"
+msgstr "Ohjelmanlaajuiset asetukset"
+
 #. 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-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-cal-model.c:528 ../calendar/gui/e-itip-control.c:1204
+#: ../calendar/gui/e-itip-control.c:1342
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:977
+#: ../calendar/gui/print.c:994 ../e-util/e-charset.c:52
+#: ../mail/em-utils.c:1224 ../plugins/itip-formatter/itip-formatter.c:449
+#: ../plugins/itip-formatter/itip-formatter.c:2242
 #: ../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:1234
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../calendar/gui/e-cal-model.c:1010
+#: ../calendar/gui/e-cal-model.c:1236
 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:337 ../calendar/gui/e-memo-table.c:270
 msgid "* No Summary *"
 msgstr "* Ei yhteenvetoa *"
 
+#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
+#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
 #: ../calendar/gui/e-calendar-table.c:373
-#: ../calendar/gui/e-calendar-view.c:2399
+#: ../calendar/gui/e-calendar-view.c:1743 ../calendar/gui/e-memo-table.c:306
 #, 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
+#. With SunOne accounts, 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-view.c:1747 ../calendar/gui/e-memo-table.c:309
 #, c-format
 msgid "Organizer: %s"
 msgstr "Järjestäjä: %s"
 
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:415 ../calendar/gui/e-memo-table.c:348
 msgid "Start: "
 msgstr "Alkaa:"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/e-memo-table.c:366
 msgid "Due: "
 msgstr "Erääntyy:"
 
-#: ../calendar/gui/e-calendar-table.c:599
+#: ../calendar/gui/e-calendar-table.c:727 ../calendar/gui/tasktypes.xml.h:24
+msgid "Undefined"
+msgstr "Määrittelemätön"
+
+#: ../calendar/gui/e-calendar-table.c:746
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:600
+#: ../calendar/gui/e-calendar-table.c:747
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:601
+#: ../calendar/gui/e-calendar-table.c:748
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:602
+#: ../calendar/gui/e-calendar-table.c:749
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:603
+#: ../calendar/gui/e-calendar-table.c:750
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:604
+#: ../calendar/gui/e-calendar-table.c:751
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:605
+#: ../calendar/gui/e-calendar-table.c:752
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:606
+#: ../calendar/gui/e-calendar-table.c:753
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:607
+#: ../calendar/gui/e-calendar-table.c:754
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:608
+#: ../calendar/gui/e-calendar-table.c:755
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:609
+#: ../calendar/gui/e-calendar-table.c:756
 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:864 ../calendar/gui/print.c:1973
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:751
+#: ../modules/calendar/e-cal-shell-content.c:405
+#: ../modules/calendar/e-task-shell-view-actions.c:284
+#: ../modules/calendar/e-task-shell-view-actions.c:301
+#: ../modules/calendar/e-task-shell-view.c:426
+#: ../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"
+
+#: ../calendar/gui/e-calendar-table.c:1108
+#: ../calendar/gui/e-calendar-view.c:610 ../calendar/gui/e-memo-table.c:894
 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:1403
+#: ../calendar/gui/e-calendar-view.c:828 ../calendar/gui/e-memo-table.c:1118
 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
-msgid "Save as..."
-msgstr "Tallenna nimellä..."
-
-#: ../calendar/gui/e-calendar-table.c:1584
-#: ../calendar/gui/e-calendar-view.c:1758
-msgid "New _Task"
-msgstr "Uusi _tehtävä"
-
-#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:923
-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
-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
-#: ../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
-#: ../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
-msgid "_Assign Task"
-msgstr "_Anna tehtäväksi"
-
-#: ../calendar/gui/e-calendar-table.c:1601 ../calendar/gui/e-memo-table.c:935
-#: ../ui/evolution-tasks.xml.h:26
-msgid "_Forward as iCalendar"
-msgstr "_Välitä iCalendar-muodossa"
-
-#: ../calendar/gui/e-calendar-table.c:1602
-msgid "_Mark as Complete"
-msgstr "_Merkitse valmiiksi"
-
-#: ../calendar/gui/e-calendar-table.c:1603
-msgid "_Mark Selected Tasks as Complete"
-msgstr "_Merkitse valitut tehtävät valmiiksi"
-
-#: ../calendar/gui/e-calendar-table.c:1604
-msgid "_Mark as Incomplete"
-msgstr "_Merkitse keskeneräiseksi"
-
-#: ../calendar/gui/e-calendar-table.c:1605
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "_Merkitse valitut tehtävät keskeneräisiksi"
-
-#: ../calendar/gui/e-calendar-table.c:1610
-msgid "_Delete Selected Tasks"
-msgstr "_Poista valitut tehtävät"
-
-#: ../calendar/gui/e-calendar-table.c:1847
-#: ../calendar/gui/e-calendar-table.etspec.h:4
-msgid "Click to add a task"
-msgstr "Lisää tehtävä tästä"
-
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% valmiina"
 
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+msgid "Click to add a task"
+msgstr "Lisää tehtävä tästä"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "Valmis"
@@ -7638,167 +4965,96 @@ 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:367
 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:1651
+#: ../calendar/gui/e-meeting-list-view.c:598
 #: ../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
-msgid "Moving items"
-msgstr "Siirretään kohteita"
-
-#: ../calendar/gui/e-calendar-view.c:1446
-msgid "Copying items"
-msgstr "Kopioidaan kohteita"
-
-#: ../calendar/gui/e-calendar-view.c:1755
-msgid "New _Appointment..."
-msgstr "Uusi t_apaaminen..."
-
-#: ../calendar/gui/e-calendar-view.c:1756
-msgid "New All Day _Event"
-msgstr "Uusi koko pä_ivän tapahtuma"
-
-#: ../calendar/gui/e-calendar-view.c:1757
-msgid "New _Meeting"
-msgstr "Uusi _kokous"
-
-#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1768
-msgid "_Current View"
-msgstr "_Nykyinen näkymä"
-
-#: ../calendar/gui/e-calendar-view.c:1770
-msgid "Select T_oday"
-msgstr "Valitse _tämä päivä"
-
-#: ../calendar/gui/e-calendar-view.c:1771
-msgid "_Select Date..."
-msgstr "_Valitse päiväys..."
-
-#: ../calendar/gui/e-calendar-view.c:1777
-msgid "Pri_nt..."
-msgstr "T_ulosta..."
-
-#: ../calendar/gui/e-calendar-view.c:1787
-msgid "Cop_y to Calendar..."
-msgstr "_Kopioi kalenteriin..."
-
-#: ../calendar/gui/e-calendar-view.c:1788
-msgid "Mo_ve to Calendar..."
-msgstr "_Siirrä kalenteriin..."
-
-#: ../calendar/gui/e-calendar-view.c:1789
-msgid "_Delegate Meeting..."
-msgstr "_Delegoi kokous..."
-
-#: ../calendar/gui/e-calendar-view.c:1790
-msgid "_Schedule Meeting..."
-msgstr "_Järjestä kokous..."
-
-#: ../calendar/gui/e-calendar-view.c:1791
-msgid "_Forward as iCalendar..."
-msgstr "_Välitä iCalendar-muodossa..."
-
-#: ../calendar/gui/e-calendar-view.c:1792
-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
-msgid "Reply to _All"
-msgstr "Vastaa k_aikille"
-
-#: ../calendar/gui/e-calendar-view.c:1798
-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
-msgid "Delete this _Occurrence"
-msgstr "Poista tämä _tapahtumakerta"
-
-#: ../calendar/gui/e-calendar-view.c:1800
-msgid "Delete _All Occurrences"
-msgstr "Poista _kaikki tapahtumakerrat"
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:561
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
+msgid "Type"
+msgstr "Tyyppi"
 
-#: ../calendar/gui/e-calendar-view.c:2254
-#: ../calendar/gui/e-itip-control.c:1186
-#: ../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-calendar-view.c:1598
+#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-meeting-list-view.c:199
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../plugins/itip-formatter/itip-formatter.c:2230
 msgid "Accepted"
 msgstr "Hyväksytty"
 
-#: ../calendar/gui/e-calendar-view.c:2255
-#: ../calendar/gui/e-itip-control.c:1194
-#: ../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-calendar-view.c:1599
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../calendar/gui/e-meeting-list-view.c:200
+#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../plugins/itip-formatter/itip-formatter.c:2236
 msgid "Declined"
 msgstr "Hylätty"
 
-#: ../calendar/gui/e-calendar-view.c:2256
-#: ../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-calendar-view.c:1600
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "Tentative"
 msgstr "Alustava"
 
-#: ../calendar/gui/e-calendar-view.c:2257
-#: ../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-calendar-view.c:1601
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../plugins/itip-formatter/itip-formatter.c:2239
 msgid "Delegated"
 msgstr "Valtuutettu"
 
-#: ../calendar/gui/e-calendar-view.c:2258
+#: ../calendar/gui/e-calendar-view.c:1602
 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:1763 ../calendar/gui/print.c:2531
 #, 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:1794
 #, 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:162
 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:165
 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:173
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7826,48 +5082,73 @@ 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:843 ../calendar/gui/e-day-view.c:1888
+#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1665
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:847 ../calendar/gui/e-day-view.c:1905
+#: ../calendar/gui/e-week-view-main-item.c:368
+#: ../calendar/gui/ea-gnome-calendar.c:189
+#: ../modules/calendar/e-cal-shell-view-private.c:856
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1921
+#: ../calendar/gui/e-week-view-main-item.c:382
+#: ../calendar/gui/ea-gnome-calendar.c:219
+#: ../modules/calendar/e-cal-shell-view-private.c:892
+msgid "%d %b"
+msgstr "%d %b"
+
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
-#: ../calendar/gui/print.c:828
+#: ../calendar/gui/e-day-view.c:1124 ../calendar/gui/e-week-view.c:510
+#: ../calendar/gui/print.c:824
 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/e-day-view.c:1127 ../calendar/gui/e-week-view.c:513
+#: ../calendar/gui/print.c:826
 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:2626
 #, c-format
 msgid "Week %d"
 msgstr "Viikko %d"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:767
 msgid "Yes. (Complex Recurrence)"
 msgstr "Kyllä (monimutkainen toistuvuus)"
 
-#: ../calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:784
 #, 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:797
 #, 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:804
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7875,35 +5156,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:815
 msgid " and "
 msgstr " ja "
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:824
 #, 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:840
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s"
 
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:851
 #, 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:863
 #, 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:876
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -7911,36 +5192,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:887
 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:909
 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:923
 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:963
+#: ../plugins/save-calendar/csv-format.c:365
 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:1004 ../calendar/gui/e-itip-control.c:1061
 msgid "iCalendar Information"
 msgstr "iCalendarin tiedot"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1015
+#: ../calendar/gui/e-itip-control.c:1021
 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:1093 ../calendar/gui/e-itip-control.c:1109
+#: ../calendar/gui/e-itip-control.c:1120 ../calendar/gui/e-itip-control.c:1137
 #: ../plugins/itip-formatter/itip-view.c:346
 #: ../plugins/itip-formatter/itip-view.c:347
 #: ../plugins/itip-formatter/itip-view.c:434
@@ -7951,285 +5232,293 @@ 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:1144
 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
+#. Location
+#: ../calendar/gui/e-itip-control.c:1173
+#: ../plugins/itip-formatter/itip-view.c:1023
+msgid "Location:"
+msgstr "Sijainti:"
+
+#: ../calendar/gui/e-itip-control.c:1196
+#: ../plugins/itip-formatter/itip-formatter.c:2233
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
 
-#: ../calendar/gui/e-itip-control.c:1278
+#: ../calendar/gui/e-itip-control.c:1283
 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:1285
 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:1362
 #, 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:1363
 msgid "Meeting Information"
 msgstr "Kokouksen tiedot"
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1369
 #, 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:1371
 #, 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:1372
 msgid "Meeting Proposal"
 msgstr "Kokousehdotus"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1378
 #, 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:1379
 msgid "Meeting Update"
 msgstr "Kokouksen päivitys"
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1383
 #, 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:1384
 msgid "Meeting Update Request"
 msgstr "Kokouksen päivityspyyntö"
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1391
 #, 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:1392
 msgid "Meeting Reply"
 msgstr "Vastaus kokouspyyntöön"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1399
 #, 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:1400
 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:1410 ../calendar/gui/e-itip-control.c:1487
+#: ../calendar/gui/e-itip-control.c:1527
 #, 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:1411
 msgid "Bad Meeting Message"
 msgstr "Huono tapaaminen-sanoma"
 
-#: ../calendar/gui/e-itip-control.c:1434
+#: ../calendar/gui/e-itip-control.c:1438
 #, 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:1439
 msgid "Task Information"
 msgstr "Tehtävän tiedot"
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1446
 #, 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:1448
 #, 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:1449
 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:1455
 #, 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:1456
 msgid "Task Update"
 msgstr "Tehtävän päivitys"
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1460
 #, 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:1461
 msgid "Task Update Request"
 msgstr "Tehtävän päivityspyyntö"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1468
 #, 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:1469
 msgid "Task Reply"
 msgstr "Vastaus tehtävään"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1476
 #, 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:1477
 msgid "Task Cancelation"
 msgstr "Tehtävän peruminen"
 
-#: ../calendar/gui/e-itip-control.c:1484
+#: ../calendar/gui/e-itip-control.c:1488
 msgid "Bad Task Message"
 msgstr "Huono tehtävä-sanoma"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1512
 #, 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:1513
 msgid "Free/Busy Information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1517
 #, 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:1518
 msgid "Free/Busy Request"
 msgstr "Vapaa/varattu-tiedustelu"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1522
 #, 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:1523
 msgid "Free/Busy Reply"
 msgstr "Vapaa/varattu-vastaus"
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1528
 msgid "Bad Free/Busy Message"
 msgstr "Huono vapaa/kiireinen -viesti"
 
-#: ../calendar/gui/e-itip-control.c:1600
+#: ../calendar/gui/e-itip-control.c:1604
 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:1663
 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:1696
 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:1734
 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:1976
 msgid "Update complete\n"
 msgstr "Päivitys valmis\n"
 
-#: ../calendar/gui/e-itip-control.c:2009
+#: ../calendar/gui/e-itip-control.c:2010
 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:2027
 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:2045
 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:2069
 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:2076
+#: ../plugins/itip-formatter/itip-formatter.c:1394
 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:2107 ../calendar/gui/e-itip-control.c:2164
 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:2113 ../calendar/gui/e-itip-control.c:2172
 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:2290
 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:2319
+#: ../calendar/gui/e-meeting-list-view.c:586
 #: ../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:2359
 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:2383
+#: ../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:2384
 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:2385
+#: ../plugins/groupwise-features/process-meeting.c:54
 msgid "Decline"
 msgstr "Hylkää"
 
-#: ../calendar/gui/e-itip-control.c:2381
+#: ../calendar/gui/e-itip-control.c:2410
 msgid "Send Free/Busy Information"
 msgstr "Lähetä vapaa/varattu-tiedot"
 
-#: ../calendar/gui/e-itip-control.c:2409
+#: ../calendar/gui/e-itip-control.c:2434
 msgid "Update respondent status"
 msgstr "Päivitä vastaajan tila"
 
-#: ../calendar/gui/e-itip-control.c:2437
+#: ../calendar/gui/e-itip-control.c:2458
 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:2482
+#: ../modules/mail/e-mail-shell-view-actions.c:1207
+#: ../widgets/misc/e-activity-proxy.c:299
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -8253,97 +5542,97 @@ 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:"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "Toimi puheenjohtajana"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "Vaaditut läsnäolijat"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "Vapaaehtoiset läsnäolijat"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:67
 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-list-view.c:159
+#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:973
 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-list-view.c:160
+#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/print.c:974 ../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-list-view.c:161
+#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/print.c:975
 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-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/print.c:976
 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-list-view.c:173
+#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/print.c:990
 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-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:991
 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-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/print.c:992
 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-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/print.c:993
 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-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-store.c:863
 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:541
 msgid "Attendee                          "
 msgstr "Osallistuja                       "
 
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
 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:2272
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -8351,78 +5640,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:2303
 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:545
 msgid "Out of Office"
 msgstr "Poissa konttorilta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:401
+#: ../calendar/gui/e-meeting-time-sel.c:546
 msgid "No Information"
 msgstr "Ei tietoa"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "A_ttendees..."
 msgstr "_Osanottajat..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:437
+#: ../calendar/gui/e-meeting-time-sel.c:582
 msgid "O_ptions"
 msgstr "_Asetukset"
 
-#: ../calendar/gui/e-meeting-time-sel.c:454
+#: ../calendar/gui/e-meeting-time-sel.c:599
 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:609
 msgid "Show _zoomed out"
 msgstr "Näytä _etäänpää"
 
-#: ../calendar/gui/e-meeting-time-sel.c:479
+#: ../calendar/gui/e-meeting-time-sel.c:624
 msgid "_Update free/busy"
 msgstr "_Päivitä vapaa/varattu"
 
-#: ../calendar/gui/e-meeting-time-sel.c:494
+#: ../calendar/gui/e-meeting-time-sel.c:639
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:512
+#: ../calendar/gui/e-meeting-time-sel.c:657
 msgid "_Autopick"
 msgstr "_Automaattinen valinta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:672
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:689
 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:698
 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:707
 msgid "_Required people"
 msgstr "_Vaaditut henkilöt"
 
-#: ../calendar/gui/e-meeting-time-sel.c:571
+#: ../calendar/gui/e-meeting-time-sel.c:716
 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:762
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:799
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
@@ -8450,182 +5739,251 @@ msgstr "Kieli"
 msgid "Member"
 msgstr "Jäsen"
 
-#: ../calendar/gui/e-memo-table.c:940
-msgid "_Delete Selected Memos"
-msgstr "_Poista valitut muistilaput"
+#: ../calendar/gui/e-memo-table.c:647
+#: ../modules/calendar/e-cal-shell-content.c:429
+#: ../modules/calendar/e-memo-shell-view-actions.c:253
+#: ../modules/calendar/e-memo-shell-view-actions.c:270
+#: ../modules/calendar/e-memo-shell-view.c:279
+msgid "Memos"
+msgstr "Muistilaput"
 
-#: ../calendar/gui/e-memo-table.c:1091 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../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
-#, c-format
-msgid ""
-"Error on %s:\n"
-" %s"
-msgstr ""
-"Virhe %s:ssä:\n"
-"%s"
+#: ../calendar/gui/e-timezone-entry.c:330
+msgid "Select Timezone"
+msgstr "Valitse aikavyöhyke"
 
-#: ../calendar/gui/e-memos.c:812
-msgid "Loading memos"
-msgstr "Ladataan muistilappuja"
+#. 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:376 ../calendar/gui/print.c:1646
+msgid "%d %B"
+msgstr "%d %B"
 
-#: ../calendar/gui/e-memos.c:903
-#, c-format
-msgid "Opening memos at %s"
-msgstr "Avataan muistilappuja sijainnista %s"
+#: ../calendar/gui/ea-cal-view-event.c:263
+msgid "It has alarms."
+msgstr "Sisältää hälytyksiä."
 
-#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
-msgid "Deleting selected objects..."
-msgstr "Valtuutetaan seuraavat tehtävät...."
+#: ../calendar/gui/ea-cal-view-event.c:266
+msgid "It has recurrences."
+msgstr "Sisältää toistuvuuksia."
 
-#: ../calendar/gui/e-tasks.c:963
-msgid "Loading tasks"
-msgstr "Ladataan tehtäviä"
+#: ../calendar/gui/ea-cal-view-event.c:269
+msgid "It is a meeting."
+msgstr "Sisältää kokouksen."
 
-#: ../calendar/gui/e-tasks.c:1061
+#: ../calendar/gui/ea-cal-view-event.c:275
 #, c-format
-msgid "Opening tasks at %s"
-msgstr "Avataan tehtävät %s"
+msgid "Calendar Event: Summary is %s."
+msgstr "Kalenteritapahtuma, yhteenveto aiheesta: %s."
 
-#: ../calendar/gui/e-tasks.c:1306
-msgid "Completing tasks..."
-msgstr "Viimeistellään tehtäviä..."
+#: ../calendar/gui/ea-cal-view-event.c:277
+msgid "Calendar Event: It has no summary."
+msgstr "Kalenteritapahtuma, ei yhteenvetoa."
 
-#: ../calendar/gui/e-tasks.c:1356
-msgid "Expunging"
-msgstr "Poistetaan poistettuja"
+#: ../calendar/gui/ea-cal-view-event.c:297
+msgid "calendar view event"
+msgstr "kalenterinäkymän tapahtuma"
 
-#: ../calendar/gui/e-timezone-entry.c:127
-msgid "Select Timezone"
-msgstr "Valitse aikavyöhyke"
+#: ../calendar/gui/ea-cal-view-event.c:525
+msgid "Grab Focus"
+msgstr "Ota kohdistin"
 
-#. 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
-msgid "%d %B"
-msgstr "%d %B"
+#: ../calendar/gui/ea-cal-view.c:298
+msgid "New Appointment"
+msgstr "Uusi tapaaminen"
 
-#: ../calendar/gui/gnome-cal.c:2637
-msgid "_Custom View"
-msgstr "_Oma näkymä"
+#: ../calendar/gui/ea-cal-view.c:299
+msgid "New All Day Event"
+msgstr "Uusi koko päivän tapahtuma"
 
-#: ../calendar/gui/gnome-cal.c:2638
-msgid "_Save Custom View"
-msgstr "_Tallenna oma näkymä"
+#: ../calendar/gui/ea-cal-view.c:300
+msgid "New Meeting"
+msgstr "Uusi kokous"
 
-#: ../calendar/gui/gnome-cal.c:2643
-msgid "_Define Views..."
-msgstr "_Määrittele näkymät..."
+#: ../calendar/gui/ea-cal-view.c:301
+msgid "Go to Today"
+msgstr "Siirry tähän päivään"
 
-#: ../calendar/gui/gnome-cal.c:2880
-#, c-format
-msgid "Loading appointments at %s"
-msgstr "Ladataan tapaamisia %s"
+#: ../calendar/gui/ea-cal-view.c:302
+msgid "Go to Date"
+msgstr "Siirry päivään"
+
+#: ../calendar/gui/ea-day-view-main-item.c:300
+#: ../calendar/gui/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"
 
-#: ../calendar/gui/gnome-cal.c:2895
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../calendar/gui/ea-day-view.c:147 ../calendar/gui/ea-week-view.c:146
 #, c-format
-msgid "Loading tasks at %s"
-msgstr "Ladataan tehtäviä %s"
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "%d tapahtuma."
+msgstr[1] "%d tapahtumaa."
 
-#: ../calendar/gui/gnome-cal.c:2904
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:148
+msgid "It has no events."
+msgstr "Ei tapahtumia."
+
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:158
 #, c-format
-msgid "Loading memos at %s"
-msgstr "Ladataan muistilappuja lähteestä %s"
+msgid "Work Week View: %s. %s"
+msgstr "Työviikon näkymä: %s. %s"
 
-#: ../calendar/gui/gnome-cal.c:3016
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:164
 #, c-format
-msgid "Opening %s"
-msgstr "Avataan %s"
+msgid "Day View: %s. %s"
+msgstr "Päivänäkymä: %s. %s"
 
-#: ../calendar/gui/gnome-cal.c:3984
-msgid "Purging"
-msgstr "Tyhjennetään"
+#: ../calendar/gui/ea-day-view.c:195
+msgid "calendar view for a work week"
+msgstr "kalenterin näkymä työviikkoon"
 
-#: ../calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "Huhtikuu"
+#: ../calendar/gui/ea-day-view.c:197
+msgid "calendar view for one or more days"
+msgstr "Kalenteri näkymä yhdelle tai useammalle päivälle"
 
-#: ../calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "Elokuu"
+#: ../calendar/gui/ea-gnome-calendar.c:186
+#: ../modules/calendar/e-cal-shell-view-private.c:852
+msgid "%A %d %b %Y"
+msgstr "%A %d. %Bta %Y"
 
-#: ../calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "Joulukuu"
+#: ../calendar/gui/ea-gnome-calendar.c:191
+#: ../calendar/gui/ea-gnome-calendar.c:196
+#: ../calendar/gui/ea-gnome-calendar.c:198
+#: ../modules/calendar/e-cal-shell-view-private.c:859
+#: ../modules/calendar/e-cal-shell-view-private.c:865
+#: ../modules/calendar/e-cal-shell-view-private.c:868
+msgid "%a %d %b %Y"
+msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "Helmikuu"
+#: ../calendar/gui/ea-gnome-calendar.c:215
+#: ../calendar/gui/ea-gnome-calendar.c:221
+#: ../calendar/gui/ea-gnome-calendar.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:229
+#: ../modules/calendar/e-cal-shell-view-private.c:885
+#: ../modules/calendar/e-cal-shell-view-private.c:896
+#: ../modules/calendar/e-cal-shell-view-private.c:903
+#: ../modules/calendar/e-cal-shell-view-private.c:906
+msgid "%d %b %Y"
+msgstr "%d. %Bta %Y"
+
+#: ../calendar/gui/ea-gnome-calendar.c:245
+#: ../calendar/gui/ea-gnome-calendar.c:253
+#: ../calendar/importers/icalendar-importer.c:782
+msgid "Gnome Calendar"
+msgstr "Gnome kalenteri"
+
+#: ../calendar/gui/ea-jump-button.c:146
+msgid "Jump button"
+msgstr "Hyppäyspainike"
+
+#: ../calendar/gui/ea-jump-button.c:155
+msgid "Click here, you can find more events."
+msgstr "napsauta tästä, voit löytää lisää tapahtumia."
 
-#: ../calendar/gui/goto-dialog.glade.h:5
-msgid "January"
-msgstr "Tammikuu"
+#: ../calendar/gui/ea-week-view.c:153
+#, c-format
+msgid "Month View: %s. %s"
+msgstr "Kuukausinäkymä: %s. %s"
 
-#: ../calendar/gui/goto-dialog.glade.h:6
-msgid "July"
-msgstr "Heinäkuu"
+#: ../calendar/gui/ea-week-view.c:157
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "Työviikko: %s. %s"
 
-#: ../calendar/gui/goto-dialog.glade.h:7
-msgid "June"
-msgstr "Kesäkuu"
+#: ../calendar/gui/ea-week-view.c:188
+msgid "calendar view for a month"
+msgstr "kalenterin kuukausinäkymä"
 
-#: ../calendar/gui/goto-dialog.glade.h:8
-msgid "March"
-msgstr "Maaliskuu"
+#: ../calendar/gui/ea-week-view.c:190
+msgid "calendar view for one or more weeks"
+msgstr "kalenterinäkymä yhdelle tai useammalle viikolle"
 
-#: ../calendar/gui/goto-dialog.glade.h:9
-msgid "May"
-msgstr "Toukokuu"
+#: ../calendar/gui/gnome-cal.c:1944
+#, c-format
+msgid "Loading appointments at %s"
+msgstr "Ladataan tapaamisia %s"
 
-#: ../calendar/gui/goto-dialog.glade.h:10
-msgid "November"
-msgstr "Marraskuu"
+#: ../calendar/gui/gnome-cal.c:2030
+#, c-format
+msgid "Opening %s"
+msgstr "Avataan %s"
 
-#: ../calendar/gui/goto-dialog.glade.h:11
-msgid "October"
-msgstr "Lokakuu"
+#: ../calendar/gui/goto-dialog.glade.h:1
+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:409 ../calendar/gui/itip-utils.c:460
+#: ../calendar/gui/itip-utils.c:552
 msgid "An organizer must be set."
 msgstr "Järjestäjä tulee asettaa."
 
-#: ../calendar/gui/itip-utils.c:454
+#: ../calendar/gui/itip-utils.c:452
 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:634 ../calendar/gui/itip-utils.c:780
 msgid "Event information"
 msgstr "Tapahtuman tiedot"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:783
 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:638 ../calendar/gui/itip-utils.c:786
 msgid "Memo information"
 msgstr "Muistilapun tiedot"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:804
 msgid "Free/Busy information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: ../calendar/gui/itip-utils.c:640
+#: ../calendar/gui/itip-utils.c:642
 msgid "Calendar information"
 msgstr "Kalenteritiedot"
 
@@ -8633,7 +5991,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:676
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Hyväksytty"
@@ -8642,7 +6000,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:683
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
@@ -8654,7 +6012,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:690 ../calendar/gui/itip-utils.c:738
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Hylätty"
@@ -8663,7 +6021,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:697
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Valtuutettu"
@@ -8671,7 +6029,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:710
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Päivitetty"
@@ -8679,7 +6037,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:717
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Peru"
@@ -8687,7 +6045,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:724
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Päivitä"
@@ -8695,442 +6053,222 @@ 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:731
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Vastaehdotus"
 
-#: ../calendar/gui/itip-utils.c:799
+#: ../calendar/gui/itip-utils.c:801
 #, 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:809
 msgid "iCalendar information"
 msgstr "iCalendarin tiedot"
 
-#: ../calendar/gui/itip-utils.c:978
+#: ../calendar/gui/itip-utils.c:980
 msgid "You must be an attendee of the event."
 msgstr "Sinun täytyy osallistua tapahtumaan."
 
-#: ../calendar/gui/memos-component.c:507
-msgid "_New Memo List"
-msgstr "_Uusi muistilappulista"
-
-#: ../calendar/gui/memos-component.c:590
-#, 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
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ", %d valittu"
-msgstr[1] ", %d valittua"
-
-#: ../calendar/gui/memos-component.c:639
-msgid "Failed upgrading memos."
-msgstr "Muistilappujen päivitys epäonnistui."
-
-#: ../calendar/gui/memos-component.c:769
-#, 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
-msgid "There is no calendar available for creating memos"
-msgstr "Muistilappujen luomiseen tarvittavaa kalenteria ei ole saatavilla"
-
-#: ../calendar/gui/memos-component.c:892
-msgid "Memo Source Selector"
-msgstr "Muistilappujen lähteen valinta"
-
-#: ../calendar/gui/memos-component.c:1071
-msgid "New memo"
-msgstr "Uusi muistilappu"
-
-#: ../calendar/gui/memos-component.c:1072
-msgctxt "New"
-msgid "Mem_o"
-msgstr "_Muistilappu"
-
-#: ../calendar/gui/memos-component.c:1073
-msgid "Create a new memo"
-msgstr "Luo uusi muistilappu"
-
-#: ../calendar/gui/memos-component.c:1079
-msgid "New shared memo"
-msgstr "Uusi jaettu muistilappu"
-
-#: ../calendar/gui/memos-component.c:1080
-msgctxt "New"
-msgid "_Shared memo"
-msgstr "_Jaettu muistilappu"
-
-#: ../calendar/gui/memos-component.c:1081
-msgid "Create a shared new memo"
-msgstr "Luo uusi jaettu muistilappu"
-
-#: ../calendar/gui/memos-component.c:1087
-msgid "New memo list"
-msgstr "Uusi muistilappulista"
-
-#: ../calendar/gui/memos-component.c:1088
-msgctxt "New"
-msgid "Memo li_st"
-msgstr "Muistilappu_lista"
-
-#: ../calendar/gui/memos-component.c:1089
-msgid "Create a new memo list"
-msgstr "Luo uusi muistilappulista"
-
-#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
-msgid "Print Memos"
-msgstr "Tulosta muistilaput"
-
-#: ../calendar/gui/migration.c:157
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolutionin tehtäväkansioiden sijainti ja rakenne on muuttunut versiosta 1."
-"x\n"
-"\n"
-"Odota kärsivällisesti, kun Evolution konvertoi kansioitas..."
-
-#: ../calendar/gui/migration.c:161
-msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolutionin kalenterikansioiden sijainti ja rakenne on muuttunut versiosta 1."
-"x\n"
-"\n"
-"Odota kärsivällisesti, kun Evolution konvertoi kansioitasi..."
-
-#. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
-#, 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
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "Kalenterin '%s' muunnos epäonnistui"
-
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:972
-#, 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:510
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:510
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:510
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:510
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:510
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:511
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:511
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:511
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:511
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:511
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:512
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:512
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:512
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:512
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:512
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:513
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:513
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:513
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:513
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:513
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:514
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:514
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:514
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:514
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:514
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:515
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:515
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:515
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:515
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:515
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:516
 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:592
 msgid "Su"
 msgstr "Su"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "Mo"
 msgstr "Ma"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "Tu"
 msgstr "Ti"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "We"
 msgstr "Ke"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "Th"
 msgstr "To"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "Fr"
 msgstr "Pe"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "Sa"
 msgstr "La"
 
-#: ../calendar/gui/print.c:2481
+#: ../calendar/gui/print.c:2495
 msgid "Appointment"
 msgstr "Tapaaminen"
 
-#: ../calendar/gui/print.c:2483
+#: ../calendar/gui/print.c:2497
 msgid "Task"
 msgstr "Tehtävä"
 
-#: ../calendar/gui/print.c:2508
+#: ../calendar/gui/print.c:2522
 #, c-format
 msgid "Summary: %s"
 msgstr "Yhteenveto: %s"
 
-#: ../calendar/gui/print.c:2531
+#: ../calendar/gui/print.c:2545
 msgid "Attendees: "
 msgstr "Osanottajat:"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2585
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: ../calendar/gui/print.c:2588
+#: ../calendar/gui/print.c:2599
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteetti: %s"
 
-#: ../calendar/gui/print.c:2600
+#: ../calendar/gui/print.c:2614
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %i"
 
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2625
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2625
+#: ../calendar/gui/print.c:2638
 #, c-format
 msgid "Categories: %s"
 msgstr "Ryhmät: %s"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2649
 msgid "Contacts: "
 msgstr "Yhteystiedot: "
 
-#: ../calendar/gui/tasks-component.c:499
-msgid "_New Task List"
-msgstr "_Uusi tehtävälista"
-
-#: ../calendar/gui/tasks-component.c:582
-#, 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
-msgid "Failed upgrading tasks."
-msgstr "Tehtävälistan päivitys epäonnistui."
-
-#: ../calendar/gui/tasks-component.c:764
-#, 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
-msgid "There is no calendar available for creating tasks"
-msgstr "Tehtävien luomiseen tarvittavaa kalenteria ei ole saatavilla"
-
-#: ../calendar/gui/tasks-component.c:888
-msgid "Task Source Selector"
-msgstr "Tehtävien lähteen valinta"
-
-#: ../calendar/gui/tasks-component.c:1142
-msgid "New task"
-msgstr "Uusi tehtävä"
-
-#: ../calendar/gui/tasks-component.c:1143
-msgctxt "New"
-msgid "_Task"
-msgstr "_Tehtävä"
-
-#: ../calendar/gui/tasks-component.c:1144
-msgid "Create a new task"
-msgstr "Luo uusi tehtävä"
-
-#: ../calendar/gui/tasks-component.c:1150
-msgid "New assigned task"
-msgstr "Uusi tehtäväksianto"
-
-#: ../calendar/gui/tasks-component.c:1151
-msgctxt "New"
-msgid "Assigne_d Task"
-msgstr "Tehtäväksi_anto"
-
-#: ../calendar/gui/tasks-component.c:1152
-msgid "Create a new assigned task"
-msgstr "Luo uusi tehtäväksianto"
-
-#: ../calendar/gui/tasks-component.c:1158
-msgid "New task list"
-msgstr "Uusi tehtävälista"
-
-#: ../calendar/gui/tasks-component.c:1159
-msgctxt "New"
-msgid "Tas_k list"
-msgstr "_Tehtävälista"
-
-#: ../calendar/gui/tasks-component.c:1160
-msgid "Create a new task list"
-msgstr "Luo uusi tehtävälista"
-
-#: ../calendar/gui/tasks-control.c:442
-msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
-"\n"
-"Really erase these tasks?"
-msgstr ""
-"Tämä toimenpide poistaa kaikki tehtävät, jotka on merkitty tehdyiksi. Jos "
-"jatkat, et voi myöhemmin palauttaa näitä tehtäviä.\n"
-"\n"
-"Valmis poistaa nämä tehtävät?"
-
-#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1128
-msgid "Do not ask me again."
-msgstr "�lä kysy enää uudestaan"
-
-#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
-msgid "Print Tasks"
-msgstr "Tulosta tehtävät"
-
 #: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
 msgid "% Completed"
@@ -9144,11 +6282,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 +6294,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:1737
 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 +7877,185 @@ 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
-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:79
 msgid "Untitled Message"
 msgstr "Nimeämätön viesti"
 
-#: ../composer/e-composer-actions.c:471
+#: ../composer/e-composer-actions.c:202
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
+#: ../modules/calendar/e-memo-shell-view-actions.c:489
+#: ../modules/calendar/e-task-shell-view-actions.c:616
+msgid "Save as..."
+msgstr "Tallenna nimellä..."
+
+#: ../composer/e-composer-actions.c:306
+#: ../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
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../composer/e-composer-actions.c:311
+#: ../widgets/misc/e-signature-editor.c:200
 msgid "_Close"
 msgstr "_Sulje"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:313
 msgid "Close the current file"
 msgstr "Sulje nykyinen tiedosto"
 
-#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1339
-#: ../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-tasks.xml.h:29
+#: ../composer/e-composer-actions.c:318
 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
-#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+#: ../composer/e-composer-actions.c:325
 msgid "Print Pre_view"
 msgstr "Tulostuksen esikatselu"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:334
 msgid "Save the current file"
 msgstr "Tallenna nykyinen tiedosto"
 
-#: ../composer/e-composer-actions.c:504
+#: ../composer/e-composer-actions.c:339
 msgid "Save _As..."
 msgstr "Tallenna _nimellä..."
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:341
 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:346
 msgid "Save as _Draft"
 msgstr "Tallenna luonnoksena"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:348
 msgid "Save as draft"
 msgstr "Tallenna luonnoksena"
 
-#: ../composer/e-composer-actions.c:518
+#: ../composer/e-composer-actions.c:353 ../composer/e-composer-private.c:192
 msgid "S_end"
 msgstr "_Lähetä"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:355
 msgid "Send this message"
 msgstr "Lähetä viesti heti"
 
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:362
 msgid "Insert Send options"
 msgstr "Lisää lähetysvaihtoehtoja"
 
-#: ../composer/e-composer-actions.c:532
+#: ../composer/e-composer-actions.c:367
 msgid "New _Message"
 msgstr "Uusi _viesti"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:369
 msgid "Open New Message window"
 msgstr "Avaa uuden viestin luonti-ikkuna"
 
-#: ../composer/e-composer-actions.c:541
+#: ../composer/e-composer-actions.c:376
 msgid "Character _Encoding"
 msgstr "M_erkistön koodaus"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:383
 msgid "_Security"
 msgstr "Turvalli_suus"
 
-#: ../composer/e-composer-actions.c:558
+#: ../composer/e-composer-actions.c:393
 msgid "PGP _Encrypt"
 msgstr "PGP-_salaus"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:395
 msgid "Encrypt this message with PGP"
 msgstr "Salaa tämä viesti PGP:llä"
 
-#: ../composer/e-composer-actions.c:566
+#: ../composer/e-composer-actions.c:401
 msgid "PGP _Sign"
 msgstr "PGP-_allekirjoitus"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:403
 msgid "Sign this message with your PGP key"
 msgstr "Allekirjoita viesti PGP-avaimellasi"
 
-#: ../composer/e-composer-actions.c:574
+#: ../composer/e-composer-actions.c:409
 msgid "_Prioritize Message"
 msgstr "_Aseta viestin prioriteetti"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:411
 msgid "Set the message priority to high"
 msgstr "Aseta viestille korkea prioriteetti"
 
-#: ../composer/e-composer-actions.c:582
+#: ../composer/e-composer-actions.c:417
 msgid "Re_quest Read Receipt"
 msgstr "Pyydä luku_kuittausta"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:419
 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:425
 msgid "S/MIME En_crypt"
 msgstr "S/_MIME-salaus"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:427
 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:433
 msgid "S/MIME Sig_n"
 msgstr "S/MIME-a_llekirjoitus"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:435
 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:441
 msgid "_Bcc Field"
 msgstr "_BCC-kenttä"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:443
 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:449
 msgid "_Cc Field"
 msgstr "_Kopio-kenttä"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:451
 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:457
 msgid "_From Field"
 msgstr "_Lähettäjä-kenttä"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:459
 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:465
 msgid "_Reply-To Field"
 msgstr "_Vastausosoite-kenttä"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:467
 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:510
 msgid "Save Draft"
 msgstr "Tallenna luonnos"
 
-#: ../composer/e-composer-header-table.c:64
+#: ../composer/e-composer-autosave.c:445
+msgid "Unable to retrieve message from editor"
+msgstr "Viestiä ei voi hakea muokkaimelta"
+
+#: ../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,66 +8063,79 @@ 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:949
 msgid "Fr_om:"
 msgstr "_Lähettäjä:"
 
-#: ../composer/e-composer-header-table.c:652
+#: ../composer/e-composer-header-table.c:949
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:936
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:301
+#: ../modules/mail/em-mailer-prefs.c:77
+msgid "From"
+msgstr "Lähettäjä"
+
+#: ../composer/e-composer-header-table.c:958
 msgid "_Reply-To:"
 msgstr "_Vastausosoite:"
 
-#: ../composer/e-composer-header-table.c:656
+#: ../composer/e-composer-header-table.c:963
 msgid "_To:"
 msgstr "Vastaan_ottaja:"
 
-#: ../composer/e-composer-header-table.c:661
+#: ../composer/e-composer-header-table.c:969
 msgid "_Cc:"
 msgstr "_Kopiot:"
 
-#: ../composer/e-composer-header-table.c:666
+#: ../composer/e-composer-header-table.c:969
+msgid "Show CC"
+msgstr "Näytä CC"
+
+#: ../composer/e-composer-header-table.c:975
 msgid "_Bcc:"
 msgstr "_Piilokopiot:"
 
-#: ../composer/e-composer-header-table.c:671
+#: ../composer/e-composer-header-table.c:975
+msgid "Show BCC"
+msgstr "Näytä BCC"
+
+#: ../composer/e-composer-header-table.c:980
 msgid "_Post To:"
 msgstr "_Postita:"
 
-#: ../composer/e-composer-header-table.c:675
+#: ../composer/e-composer-header-table.c:984
 msgid "S_ubject:"
 msgstr "_Aihe:"
 
-#: ../composer/e-composer-header-table.c:684
+#: ../composer/e-composer-header-table.c:993
 msgid "Si_gnature:"
 msgstr "_Allekirjoitus:"
 
-#: ../composer/e-composer-name-header.c:115
+#: ../composer/e-composer-name-header.c:134
 msgid "Click here for the address book"
 msgstr "Avaa osoitekirja tästä"
 
-#: ../composer/e-composer-post-header.c:137
-msgid "Posting destination"
-msgstr "Postituksen kohde"
-
-#: ../composer/e-composer-post-header.c:138
-msgid "Choose folders to post the message to."
-msgstr "Valitse kansio johon viesti postitetaan:"
-
-#: ../composer/e-composer-post-header.c:172
+#: ../composer/e-composer-post-header.c:116
 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
+#. Check buttons
+#: ../composer/e-msg-composer.c:191 ../mail/em-utils.c:144
+#: ../plugins/attachment-reminder/attachment-reminder.c:129
+msgid "_Do not show this message again."
+msgstr "�lä _näytä tätä viestiä uudestaan."
+
+#: ../composer/e-msg-composer.c:900
 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:907
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -11024,23 +8143,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:1334 ../composer/e-msg-composer.c:2112
 msgid "Compose Message"
 msgstr "Uusi viesti"
 
-#: ../composer/e-msg-composer.c:4093
+#: ../composer/e-msg-composer.c:3320
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11206,7 +8313,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-actions.c:653
 msgid "Groupware Suite"
 msgstr "Ryhmätyöohjelmisto"
 
@@ -11222,101 +8329,219 @@ msgstr "osoitekortti"
 msgid "calendar information"
 msgstr "Kalenterin tietoja"
 
-#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
+#: ../e-util/e-charset.c:53
+msgid "Arabic"
+msgstr "Arabia"
+
+#: ../e-util/e-charset.c:54
+msgid "Baltic"
+msgstr "Balttilainen"
+
+#: ../e-util/e-charset.c:55
+msgid "Central European"
+msgstr "Keskieurooppalainen"
+
+#: ../e-util/e-charset.c:56
+msgid "Chinese"
+msgstr "Kiinalainen"
+
+#: ../e-util/e-charset.c:57
+msgid "Cyrillic"
+msgstr "Kyrillinen"
+
+#: ../e-util/e-charset.c:58
+msgid "Greek"
+msgstr "Kreikkalainen"
+
+#: ../e-util/e-charset.c:59
+msgid "Hebrew"
+msgstr "Heprea"
+
+#: ../e-util/e-charset.c:60
+msgid "Japanese"
+msgstr "Japanilainen"
+
+#: ../e-util/e-charset.c:61
+msgid "Korean"
+msgstr "Korealainen"
+
+#: ../e-util/e-charset.c:62
+msgid "Thai"
+msgstr "Thai"
+
+#: ../e-util/e-charset.c:63
+msgid "Turkish"
+msgstr "Turkkilainen"
+
+#: ../e-util/e-charset.c:64
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../e-util/e-charset.c:65
+msgid "Western European"
+msgstr "Länsieurooppalainen"
+
+#: ../e-util/e-charset.c:66
+msgid "Western European, New"
+msgstr "Länsieurooppalainen, uusi"
+
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+msgid "Traditional"
+msgstr "Perinteinen"
+
+#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
+#: ../e-util/e-charset.c:91
+msgid "Simplified"
+msgstr "Yksinkertaistettu"
+
+#: ../e-util/e-charset.c:94
+msgid "Ukrainian"
+msgstr "Ukrainalainen"
+
+#: ../e-util/e-charset.c:97
+msgid "Visual"
+msgstr "Visuaali"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:193
+#: ../modules/calendar/e-cal-shell-view-actions.c:1665
+#: ../plugins/itip-formatter/itip-view.c:191
+#: ../widgets/table/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:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "Evolutionin virhe"
 
-#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "Evolutionin varoitus"
 
-#: ../e-util/e-error.c:118
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "Evolutionin tiedot"
 
-#: ../e-util/e-error.c:120
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "Evolutionin kysely"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:444
+#: ../e-util/e-error.c:452
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Sisäinen virhe, tuntematonta virhettä \"%s\" pyydettiin"
 
-#: ../e-util/e-logger.c:161
-msgid "Component"
-msgstr "Komponentti"
+#: ../e-util/e-logger.c:172
+msgid "Name of the logger"
+msgstr "Pidemmmän nimi"
+
+#: ../e-util/e-module.c:188
+msgid "Filename"
+msgstr "Tiedostonimi"
 
-#: ../e-util/e-logger.c:162
-msgid "Name of the component being logged"
-msgstr "Lokitettavan komponentin nimi"
+#: ../e-util/e-module.c:189
+msgid "The filename of the module"
+msgstr "Moduulin 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:493
 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:2583
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Viestit"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:300
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+#: ../e-util/e-non-intrusive-error-dialog.c:301 ../mail/e-mail-browser.c:97
+#: ../shell/e-shell-window-actions.c:1459
 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 "Warning"
+msgstr "Varoitus"
+
+#: ../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
-#: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:690
+#: ../e-util/e-plugin.c:291 ../filter/rule-editor.c:802
+#: ../modules/mail/em-composer-prefs.c:474
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:717
+#: ../widgets/misc/e-account-tree-view.c:205
 msgid "Enabled"
 msgstr "käytössä"
 
-#: ../e-util/e-plugin.c:309
+#: ../e-util/e-plugin.c:292
 msgid "Whether the plugin is enabled"
 msgstr "Onko lisäosa käytössä"
 
@@ -11333,6 +8558,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,70 +8590,118 @@ 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
-msgid "I_mportant"
-msgstr "Tärk_eä"
+#: ../e-util/gconf-bridge.c:1222
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf-virhe: %s"
 
-#. red
-#: ../e-util/e-util-labels.c:40
-msgid "_Work"
-msgstr "_Työ"
+#: ../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ä."
 
-#. orange
-#: ../e-util/e-util-labels.c:41
-msgid "_Personal"
-msgstr "_Henkilökohtainen"
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:937
+#: ../modules/mail/em-mailer-prefs.c:78
+msgid "Reply-To"
+msgstr "Vastausosoite"
 
-#. green
-#: ../e-util/e-util-labels.c:42
-msgid "_To Do"
-msgstr "Te_htävää"
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:939
+#: ../mail/em-format-html.c:2138 ../mail/em-format-html.c:2202
+#: ../mail/em-format-html.c:2223 ../modules/mail/em-mailer-prefs.c:80
+msgid "Cc"
+msgstr "Kopiot"
 
-#. blue
-#: ../e-util/e-util-labels.c:43
-msgid "_Later"
-msgstr "_Myöhemmin"
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:940
+#: ../mail/em-format-html.c:2139 ../mail/em-format-html.c:2208
+#: ../mail/em-format-html.c:2226 ../modules/mail/em-mailer-prefs.c:81
+msgid "Bcc"
+msgstr "Piilokopiot"
 
-#: ../e-util/e-util-labels.c:315
-msgid "Label _Name:"
-msgstr "Merkinnän _nimi:"
+#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:941
+#: ../mail/em-filter-i18n.h:74 ../mail/message-list.etspec.h:18
+#: ../mail/message-tag-followup.c:305 ../modules/mail/em-mailer-prefs.c:82
+#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../smime/lib/e-cert.c:1112
+msgid "Subject"
+msgstr "Aihe"
 
-#: ../e-util/e-util-labels.c:338
-msgid "Edit Label"
-msgstr "Muokkaa merkintää"
+#. pseudo-header
+#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2318
+#: ../modules/mail/em-mailer-prefs.c:1120
+msgid "Mailer"
+msgstr "Postittaja"
 
-#: ../e-util/e-util-labels.c:338
-msgid "Add Label"
-msgstr "Lisää merkintä"
+#: ../em-format/em-format-quote.c:429 ../mail/em-composer-utils.c:1135
+msgid "-------- Forwarded Message --------"
+msgstr "------- Välitetty viesti ---------"
 
-#: ../e-util/e-util-labels.c:357
-msgid "Label name cannot be empty."
-msgstr "Merkinnälle täytyy antaa nimi."
+#: ../em-format/em-format.c:942 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:429
+#: ../widgets/misc/e-dateedit.c:451
+msgid "Date"
+msgstr "Päiväys"
 
-#: ../e-util/e-util-labels.c:362
-msgid ""
-"A label having the same tag already exists on the server. Please rename your "
-"label."
-msgstr ""
-"Samanniminen merkintä on jo tallennettu palvelimelle. Nimeä merkintä "
-"uudestaan."
+#: ../em-format/em-format.c:943 ../modules/mail/em-mailer-prefs.c:84
+msgid "Newsgroups"
+msgstr "Uutisryhmät"
 
-#: ../e-util/gconf-bridge.c:1221
+#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:85
+#: ../plugins/face/org-gnome-face.eplug.xml.h:4
+msgid "Face"
+msgstr "Kasvokuva"
+
+#: ../em-format/em-format.c:1297
 #, c-format
-msgid "GConf error: %s"
-msgstr "GConf-virhe: %s"
+msgid "%s attachment"
+msgstr "Liite: %s"
 
-#: ../e-util/gconf-bridge.c:1231
-msgid "All further errors shown only on terminal."
-msgstr "Kaikki virheet tästä eteenpäin näkyvät vain päätteessä."
+#: ../em-format/em-format.c:1335
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "S/MIME viestin tulkitseminen epäonnistui: tuntematon virhe"
+
+#: ../em-format/em-format.c:1472 ../em-format/em-format.c:1629
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "MIME-viestin tulkitseminen epäonnistui, näytetään lähdekoodi"
+
+#: ../em-format/em-format.c:1480
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Tuntematon salausmuoto muodolle multipart/encrypted"
+
+#: ../em-format/em-format.c:1490
+msgid "Could not parse PGP/MIME message"
+msgstr "PGP/MIME-viestiä ei voitu tulkita"
+
+#: ../em-format/em-format.c:1490
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "PGP/MIME-viestiä ei voitu tulkita: tuntematon virhe"
+
+#: ../em-format/em-format.c:1648
+msgid "Unsupported signature format"
+msgstr "Allekirjoituksen muoto ei ole tuettu"
+
+#: ../em-format/em-format.c:1656 ../em-format/em-format.c:1794
+msgid "Error verifying signature"
+msgstr "Virhe tarkistettaessa allekirjoitusta"
+
+#: ../em-format/em-format.c:1656 ../em-format/em-format.c:1785
+#: ../em-format/em-format.c:1794
+msgid "Unknown error verifying signature"
+msgstr "Tuntematon virhe tarkistettaessa allekirjoitusta"
+
+#: ../em-format/em-format.c:1868
+msgid "Could not parse PGP message"
+msgstr "PGP-viestiä ei voitu tulkita"
+
+#: ../em-format/em-format.c:1868
+msgid "Could not parse PGP message: Unknown error"
+msgstr "PGP-viestiä ei voitu tulkita: tuntematon virhe"
 
 #: ../filter/filter-datespec.c:81
 #, c-format
@@ -11538,69 +8815,68 @@ msgstr "nyt"
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:452
+#: ../filter/filter-datespec.c:442
 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
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:528
 msgid "Test"
 msgstr "Testi"
 
-#: ../filter/filter-rule.c:853
+#: ../filter/filter-rule.c:858
 msgid "R_ule name:"
 msgstr "_Säännön nimi:"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:886
 msgid "Find items that meet the following conditions"
 msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 
-#: ../filter/filter-rule.c:915
+#: ../filter/filter-rule.c:920
 msgid "A_dd Condition"
 msgstr "Lisää _ehto"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:926
 msgid "If all conditions are met"
 msgstr "jos kaikki ehdot täytetään"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:926
 msgid "If any conditions are met"
 msgstr "jos joku ehdoista täyttyy"
 
-#: ../filter/filter-rule.c:923
+#: ../filter/filter-rule.c:928
 msgid "_Find items:"
 msgstr "_Etsi kohteita:"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:946
 msgid "All related"
 msgstr "Kaikki tähän liittyvät"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:946
 msgid "Replies"
 msgstr "Vastaukset"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:946
 msgid "Replies and parents"
 msgstr "Vastaukset ja vanhemmat"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:946
 msgid "No reply or parent"
 msgstr "Ei vastasta tai vanhempaa"
 
-#: ../filter/filter-rule.c:947
+#: ../filter/filter-rule.c:948
 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:1042 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:295
 msgid "Incoming"
 msgstr "Tulevat"
 
-#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:311
+#: ../filter/filter-rule.c:1042 ../mail/em-utils.c:296
 msgid "Outgoing"
 msgstr "Lähtevät"
 
@@ -11686,142 +8962,821 @@ 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
 msgid "Add Rule"
 msgstr "Lisää sääntö"
 
-#: ../filter/rule-editor.c:463
+#: ../filter/rule-editor.c:465
 msgid "Edit Rule"
 msgstr "Muokkaa sääntöä"
 
-#: ../filter/rule-editor.c:809
+#: ../filter/rule-editor.c:812
 msgid "Rule name"
 msgstr "Säännön nimi"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Muokkaimen asetukset"
+#: ../mail/e-mail-attachment-bar.c:121 ../mail/em-format-html-display.c:1271
+#: ../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:614
+#: ../widgets/misc/e-attachment-paned.c:607
+msgid "Icon View"
+msgstr "Kuvakenäkymä"
+
+#: ../mail/e-mail-attachment-bar.c:615
+#: ../widgets/misc/e-attachment-paned.c:608
+msgid "List View"
+msgstr "Luettelonäkymä"
+
+#: ../mail/e-mail-browser.c:663
+msgid "Shell Module"
+msgstr "Päätemoduli"
+
+#: ../mail/e-mail-browser.c:664 ../mail/message-list.c:2467
+msgid "The mail shell backend"
+msgstr "Sähköpostikuoren taustajärjestelmä"
+
+#: ../mail/e-mail-browser.c:674
+msgid "Show Deleted"
+msgstr "näytä poistetut"
+
+#: ../mail/e-mail-browser.c:675
+msgid "Show deleted messages"
+msgstr "Näytä poistetut viestit"
+
+#: ../mail/e-mail-browser.c:710
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/e-shell-window-private.c:207
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../mail/e-mail-display.c:66
+msgid "_Add to Address Book..."
+msgstr "_Lisää osoitekirjaan..."
+
+#: ../mail/e-mail-display.c:73
+msgid "_To This Address"
+msgstr "_Tähän osoitteeseen"
+
+#: ../mail/e-mail-display.c:80
+msgid "_From This Address"
+msgstr "_Tästä osoitteesta"
+
+#: ../mail/e-mail-display.c:89
+msgid "Create Search _Folder"
+msgstr "Luo _hakunäkymä"
+
+#: ../mail/e-mail-label-dialog.c:220
+msgid "_Label name:"
+msgstr "_Otsakkeen nimi:"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: ../mail/e-mail-label-list-store.c:41
+msgid "I_mportant"
+msgstr "Tärk_eä"
+
+#. red
+#: ../mail/e-mail-label-list-store.c:42
+msgid "_Work"
+msgstr "_Työ"
+
+#. orange
+#: ../mail/e-mail-label-list-store.c:43
+msgid "_Personal"
+msgstr "_Henkilökohtainen"
+
+#. green
+#: ../mail/e-mail-label-list-store.c:44
+msgid "_To Do"
+msgstr "Te_htävää"
+
+#. blue
+#: ../mail/e-mail-label-list-store.c:45
+msgid "_Later"
+msgstr "_Myöhemmin"
+
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:552
+msgid "Add Label"
+msgstr "Lisää merkintä"
+
+#: ../mail/e-mail-label-manager.c:216
+msgid "Edit Label"
+msgstr "Muokkaa merkintää"
+
+#: ../mail/e-mail-label-manager.c:349
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
 msgstr ""
-"Määrittele sähköpostiasetuksia mukaan lukien turva-asetukset ja viestin "
-"näyttö"
+"Huomautus: Alaviivaa merkinnän nimessä käytetään\n"
+"valikon pikavalintana."
+
+#: ../mail/e-mail-label-tree-view.c:86
+msgid "Color"
+msgstr "Väri"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
+#: ../mail/em-folder-tree-model.c:599 ../mail/em-folder-tree.c:2497
+#: ../modules/mail/e-mail-shell-view-private.c:798
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:593
+msgid "Inbox"
+msgstr "Saapuneet"
+
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:592
+msgid "Drafts"
+msgstr "Luonnokset"
+
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:602
+msgid "Outbox"
+msgstr "Lähtevät"
+
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:604
+msgid "Sent"
+msgstr "Lähetetyt"
+
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:595
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#: ../plugins/templates/templates.c:591
+msgid "Templates"
+msgstr "Pohjat"
+
+#. XXX e-error should provide a widget layout and API suitable
+#. *     for packing additional widgets to the right of the alert
+#. *     icon.  But for now, screw it.
+#: ../mail/e-mail-reader-utils.c:107
+#: ../modules/calendar/e-task-shell-view-actions.c:576
+msgid "Do not ask me again"
+msgstr "�lä kysy uudestaan"
+
+#: ../mail/e-mail-reader.c:215 ../mail/e-mail-reader.c:604
+#: ../mail/em-account-editor.c:667 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-folder-utils.c:392 ../mail/em-vfolder-rule.c:519
+msgid "Select Folder"
+msgstr "Valitse kansio"
+
+#: ../mail/e-mail-reader.c:215 ../mail/em-folder-utils.c:387
+msgid "C_opy"
+msgstr "_Kopioi"
+
+#: ../mail/e-mail-reader.c:604 ../mail/em-folder-utils.c:387
+msgid "_Move"
+msgstr "_Siirrä"
+
+#: ../mail/e-mail-reader.c:1082
+msgid "A_dd Sender to Address Book"
+msgstr "_Lisää lähettäjä osoitekirjaan"
+
+#: ../mail/e-mail-reader.c:1084
+msgid "Add sender to address book"
+msgstr "Lisää lähettäjä osoitekirjaan"
+
+#: ../mail/e-mail-reader.c:1089
+msgid "Check for _Junk"
+msgstr "Etsi _roskapostia"
+
+#: ../mail/e-mail-reader.c:1091
+msgid "Filter the selected messages for junk status"
+msgstr "Suodata valitut viestit roskapostiksi"
+
+#: ../mail/e-mail-reader.c:1098
+msgid "Copy selected messages to the clipboard"
+msgstr "Kopioi valitut viestit leikepöydälle"
+
+#: ../mail/e-mail-reader.c:1103
+msgid "_Copy to Folder..."
+msgstr "_Kopioi kansioon..."
+
+#: ../mail/e-mail-reader.c:1105
+msgid "Copy selected messages to another folder"
+msgstr "Kopioi valitut viestit uuteen kansioon"
+
+#: ../mail/e-mail-reader.c:1110
+msgid "_Delete Message"
+msgstr "Poista _viesti"
+
+#: ../mail/e-mail-reader.c:1112
+msgid "Mark the selected messages for deletion"
+msgstr "Merkitse valitut viestit poistettaviksi"
+
+#: ../mail/e-mail-reader.c:1117
+msgid "Filter on Mailing _List..."
+msgstr "Suodata postitus_listan mukaan..."
+
+#: ../mail/e-mail-reader.c:1119
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "Luo sääntö, jolla suodatetaan viestejä tälle postilistalle"
+
+#: ../mail/e-mail-reader.c:1124
+msgid "Filter on _Recipients..."
+msgstr "Suodata _vastaanottajien mukaan..."
+
+#: ../mail/e-mail-reader.c:1126
+msgid "Create a rule to filter messages to these recipients"
+msgstr "Luo sääntö, jolla suodatetaan viestejä näille vastaanottajille "
+
+#: ../mail/e-mail-reader.c:1131
+msgid "Filter on Se_nder..."
+msgstr "Suodata _lähettäjän mukaan..."
+
+#: ../mail/e-mail-reader.c:1133
+msgid "Create a rule to filter messages from this sender"
+msgstr "Luo sääntö, jolla suodatetaan viestejä tältä lähettäjältä"
+
+#: ../mail/e-mail-reader.c:1138
+msgid "Filter on _Subject..."
+msgstr "Suodata _aiheen mukaan..."
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: ../mail/e-mail-reader.c:1140
+msgid "Create a rule to filter messages with this subject"
+msgstr "Luo sääntö, jolla suodatetaan viestejä tämän otsikon perusteella"
+
+#: ../mail/e-mail-reader.c:1145
+msgid "A_pply Filters"
+msgstr "_Toteuta suodattimet"
+
+#: ../mail/e-mail-reader.c:1147
+msgid "Apply filter rules to the selected messages"
+msgstr "Suodata valitut viestit suodatinsäännöillä"
+
+#: ../mail/e-mail-reader.c:1152
+msgid "_Find in Message..."
+msgstr "Etsi viestistä..."
+
+#: ../mail/e-mail-reader.c:1154
+msgid "Search for text in the body of the displayed message"
+msgstr "Etsiä tekstiä näytetyn viestin rungosta"
+
+#: ../mail/e-mail-reader.c:1159
+msgid "_Clear Flag"
+msgstr "_Poista merkki"
+
+#: ../mail/e-mail-reader.c:1161
+msgid "Remove the follow-up flag from the selected messages"
 msgstr ""
-"Määrittele oikoluvun, allekirjoitusten ja viestin muokkaimen asetukset tästä"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Määrittele sähköpostitilisi tästä"
+#: ../mail/e-mail-reader.c:1166
+msgid "_Flag Completed"
+msgstr "_Merkitse valmiiksi"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your network connection settings here"
-msgstr "Määrittele verkkoyhteysasetukset tästä"
+#: ../mail/e-mail-reader.c:1168
+msgid "Set the follow-up flag to completed on the selected messages"
+msgstr ""
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution-sähköposti"
+#: ../mail/e-mail-reader.c:1173
+msgid "Follow _Up..."
+msgstr "_Vastaa viestiin..."
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolutionin sähköpostitilien asetukset"
+#: ../mail/e-mail-reader.c:1175
+msgid "Flag the selected messages for follow-up"
+msgstr ""
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolutionin sähköpostikomponentti"
+#: ../mail/e-mail-reader.c:1180
+#: ../modules/mail/e-mail-attachment-handler.c:134
+msgid "_Forward"
+msgstr "_Välitä"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolutionin sähköpostin muokkain"
+#: ../mail/e-mail-reader.c:1182
+msgid "Forward the selected message to someone"
+msgstr "Välitä edelleen valitut viestit jollekulle"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolutionin viestimuokkaimen asetukset"
+#: ../mail/e-mail-reader.c:1187
+msgid "_Attached"
+msgstr "_Liitetty"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolutionin sähköpostin asetukset"
+#: ../mail/e-mail-reader.c:1189
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Välitä edelleen valitut viestit liitteenä"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Network configuration control"
-msgstr "Evolutionin verkkoyhteyden asetukset"
+#: ../mail/e-mail-reader.c:1194
+msgid "_Inline"
+msgstr "S_isäkkäisesti"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:604
-#: ../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
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
-msgid "Mail"
-msgstr "Sähköposti"
+#: ../mail/e-mail-reader.c:1196
+msgid "Forward the selected message in the body of a new message"
+msgstr "Välitä edelleen valitut viestit uuden viestin rungossa"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:495
-msgid "Mail Accounts"
-msgstr "Sähköpostitilit"
+#: ../mail/e-mail-reader.c:1201
+msgid "_Quoted"
+msgstr "_Lainattuna"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:104
-msgid "Mail Preferences"
-msgstr "Sähköpostin asetukset"
+#: ../mail/e-mail-reader.c:1203
+msgid "Forward the selected message quoted like a reply"
+msgstr "Välitä edelleen valitut viestit lainattuna vastauksen tapaan"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
-msgid "Network Preferences"
-msgstr "Verkkoasetukset"
+#: ../mail/e-mail-reader.c:1208
+msgid "_Load Images"
+msgstr "_Lataa kuvat"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:300
-msgid "_Mail"
-msgstr "_Sähköposti"
+#: ../mail/e-mail-reader.c:1210
+msgid "Force images in HTML mail to be loaded"
+msgstr "Pakota HTML-viestissä olevien kuvien lataus"
+
+#: ../mail/e-mail-reader.c:1215
+msgid "_Important"
+msgstr "_Tärkeä"
+
+#: ../mail/e-mail-reader.c:1217
+msgid "Mark the selected messages as important"
+msgstr "Merkitse valitut viestit tärkeiksi"
+
+#: ../mail/e-mail-reader.c:1222
+msgid "_Junk"
+msgstr "_Roskapostia"
+
+#: ../mail/e-mail-reader.c:1224
+msgid "Mark the selected messages as junk"
+msgstr "Merkitse valitut viestit roskapostiksi"
+
+#: ../mail/e-mail-reader.c:1229
+msgid "_Not Junk"
+msgstr "_Ei roskapostia"
+
+#: ../mail/e-mail-reader.c:1231
+msgid "Mark the selected messasges as not being junk"
+msgstr "Merkitse valitut viestit ei-roskapostiksi"
+
+#: ../mail/e-mail-reader.c:1236
+msgid "_Read"
+msgstr "_Luettu"
+
+#: ../mail/e-mail-reader.c:1238
+msgid "Mark the selected messages as having been read"
+msgstr "Merkitse valitut viestit luetuiksi"
+
+#: ../mail/e-mail-reader.c:1243
+msgid "Uni_mportant"
+msgstr "Sa_mantekevä"
+
+#: ../mail/e-mail-reader.c:1245
+msgid "Mark the selected messages as unimportant"
+msgstr "Merkitse valitut viestit samantekeviksi"
+
+#: ../mail/e-mail-reader.c:1250
+msgid "_Unread"
+msgstr "L_ukematon"
+
+#: ../mail/e-mail-reader.c:1252
+msgid "Mark the selected messages as not having been read"
+msgstr "Merkitse valitut viestit lukemattomiksi"
+
+#: ../mail/e-mail-reader.c:1257
+msgid "_Edit as New Message..."
+msgstr "_Muokkaa uutena viestinä..."
+
+#: ../mail/e-mail-reader.c:1259
+msgid "Open the selected messages in the composer for editing"
+msgstr "Avaa valitut viestit muokkaimessa"
+
+#: ../mail/e-mail-reader.c:1264
+msgid "Compose _New Message"
+msgstr "Kirjoita _uusi viesti"
+
+#: ../mail/e-mail-reader.c:1266
+msgid "Open a window for composing a mail message"
+msgstr "Luo uusi ikkuna sähköpostin kirjoitusikkuna"
+
+#: ../mail/e-mail-reader.c:1271
+msgid "_Open in New Window"
+msgstr "Avaa _uudessa ikkunassa"
+
+#: ../mail/e-mail-reader.c:1273
+msgid "Open the selected messages in a new window"
+msgstr "Avaa valitut viestit uudessa ikkunassa"
+
+#: ../mail/e-mail-reader.c:1278
+msgid "_Move to Folder..."
+msgstr "_Siirrä kansioon..."
+
+#: ../mail/e-mail-reader.c:1280
+msgid "Move selected messages to another folder"
+msgstr "Siirrä valitut viestit toiseen kansioon"
+
+#: ../mail/e-mail-reader.c:1285
+msgid "_Next Message"
+msgstr "_Seuraava viesti"
+
+#: ../mail/e-mail-reader.c:1287
+msgid "Display the next message"
+msgstr "Näytä seuraava viesti"
+
+#: ../mail/e-mail-reader.c:1292
+msgid "Next _Important Message"
+msgstr "Seuraava _tärkeä viesti"
+
+#: ../mail/e-mail-reader.c:1294
+msgid "Display the next important message"
+msgstr "Näytä seuraava tärkeä viesti"
+
+#: ../mail/e-mail-reader.c:1299
+msgid "Next _Thread"
+msgstr "Seuraava _säie"
+
+#: ../mail/e-mail-reader.c:1301
+msgid "Display the next thread"
+msgstr "Näytä seuraava säie"
+
+#: ../mail/e-mail-reader.c:1306
+msgid "Next _Unread Message"
+msgstr "Seuraava _lukematon viesti"
+
+#: ../mail/e-mail-reader.c:1308
+msgid "Display the next unread message"
+msgstr "Näytä seuraava lukematon viesti"
+
+#: ../mail/e-mail-reader.c:1313
+msgid "_Previous Message"
+msgstr "_Edellinen viesti"
+
+#: ../mail/e-mail-reader.c:1315
+msgid "Display the previous message"
+msgstr "Näytä edellinen viesti"
 
-#: ../mail/em-account-editor.c:386
+#: ../mail/e-mail-reader.c:1320
+msgid "Pr_evious Important Message"
+msgstr "E_dellinen tärkeä viesti"
+
+#: ../mail/e-mail-reader.c:1322
+msgid "Display the previous important message"
+msgstr "Näytä edellinen tärkeä viesti"
+
+#: ../mail/e-mail-reader.c:1327
+msgid "P_revious Unread Message"
+msgstr "_Edellinen lukematon viesti"
+
+#: ../mail/e-mail-reader.c:1329
+msgid "Display the previous unread message"
+msgstr "Näytä edellinen lukematon viesti"
+
+#: ../mail/e-mail-reader.c:1336
+msgid "Print this message"
+msgstr "Tulosta tämä viesti"
+
+#: ../mail/e-mail-reader.c:1343
+msgid "Preview the message to be printed"
+msgstr "Esikatsele tulostettavaa viestiä"
+
+#: ../mail/e-mail-reader.c:1348
+msgid "Re_direct"
+msgstr "_Uudelleenohjaa"
+
+#: ../mail/e-mail-reader.c:1350
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Uudelleenohjaa (siirrä) valitut viestit jollekulle"
+
+#: ../mail/e-mail-reader.c:1355
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../modules/mail/e-mail-attachment-handler.c:141
+msgid "Reply to _All"
+msgstr "Vastaa k_aikille"
+
+#: ../mail/e-mail-reader.c:1357
+msgid "Compose a reply to all the recipients of the selected message"
+msgstr "Kirjoita vastaus kaikille valitun viestin vastaanottajille"
+
+#: ../mail/e-mail-reader.c:1362
+msgid "Reply to _List"
+msgstr "Vastaa _listalle"
+
+#: ../mail/e-mail-reader.c:1364
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "Kirjoita vastaus valitussa viestissä olevalle sähköpostilistalle"
+
+#: ../mail/e-mail-reader.c:1369
+#: ../modules/mail/e-mail-attachment-handler.c:148
+msgid "_Reply to Sender"
+msgstr "_Vastaa lähettäjälle"
+
+#: ../mail/e-mail-reader.c:1371
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Vastaa valitun viestin lähettäjälle"
+
+#: ../mail/e-mail-reader.c:1376
+msgid "_Save as mbox..."
+msgstr "_Tallenna mbox-muodossa..."
+
+#: ../mail/e-mail-reader.c:1378
+msgid "Save selected messages as an mbox file"
+msgstr "Tallenna valitut viestit mbox-tiedostona"
+
+#: ../mail/e-mail-reader.c:1383
+msgid "Search Folder from Mailing _List..."
+msgstr "Hakunäkymä _postilistasta..."
+
+#: ../mail/e-mail-reader.c:1385
+msgid "Create a search folder for this mailing list"
+msgstr "Luo hakunäkymä tästä postilistasta"
+
+#: ../mail/e-mail-reader.c:1390
+msgid "Search Folder from Recipien_ts..."
+msgstr "Hakunäkymä _vastaanottajista..."
+
+#: ../mail/e-mail-reader.c:1392
+msgid "Create a search folder for these recipients"
+msgstr "Luo hakunäkymä näistä vastaanottajista"
+
+#: ../mail/e-mail-reader.c:1397
+msgid "Search Folder from Sen_der..."
+msgstr "Hakunäkymä _lähettäjästä..."
+
+#: ../mail/e-mail-reader.c:1399
+msgid "Create a search folder for this sender"
+msgstr "Luo hakunäkymä tästä lähettäjästä"
+
+#: ../mail/e-mail-reader.c:1404
+msgid "Search Folder from S_ubject..."
+msgstr "Hakunäkymä _aiheesta..."
+
+#: ../mail/e-mail-reader.c:1406
+msgid "Create a search folder for this subject"
+msgstr "Luo hakunäkymä tästä aiheesta"
+
+#: ../mail/e-mail-reader.c:1411
+msgid "Select _All Text"
+msgstr "Valitse k_aikki teksti"
+
+#: ../mail/e-mail-reader.c:1413
+msgid "Select all the text in a message"
+msgstr "Valitse kaikki teksti viestistä"
+
+#: ../mail/e-mail-reader.c:1418
+msgid "_Message Source"
+msgstr "_Viestin lähdekoodi"
+
+#: ../mail/e-mail-reader.c:1420
+msgid "Show the raw email source of the message"
+msgstr "Näytä viestin raakatekstimuotoinen lähdekoodi"
+
+#: ../mail/e-mail-reader.c:1432
+msgid "_Undelete Message"
+msgstr "_Palauta viesti"
+
+#: ../mail/e-mail-reader.c:1434
+msgid "Undelete the selected messages"
+msgstr "Peruuta valittujen viestien poistaminen"
+
+#: ../mail/e-mail-reader.c:1439
+msgid "_Normal Size"
+msgstr "_Normaali koko"
+
+#: ../mail/e-mail-reader.c:1441
+msgid "Reset the text to its original size"
+msgstr "Palauta teksti alkuperäisen kokoiseksi"
+
+#: ../mail/e-mail-reader.c:1446
+msgid "_Zoom In"
+msgstr "Lä_hennä"
+
+#: ../mail/e-mail-reader.c:1448
+msgid "Increase the text size"
+msgstr "Kasvata tekstin kokoa"
+
+#: ../mail/e-mail-reader.c:1453
+msgid "Zoom _Out"
+msgstr "L_oitonna"
+
+#: ../mail/e-mail-reader.c:1455
+msgid "Decrease the text size"
+msgstr "Pienennä tekstin kokoa"
+
+#: ../mail/e-mail-reader.c:1462
+msgid "Create R_ule"
+msgstr "Luo _sääntö"
+
+#: ../mail/e-mail-reader.c:1469
+msgid "Ch_aracter Encoding"
+msgstr "Merkistön _koodaus"
+
+#: ../mail/e-mail-reader.c:1476
+msgid "F_orward As"
+msgstr "_Välitä muodossa"
+
+#: ../mail/e-mail-reader.c:1483
+msgid "_Go To"
+msgstr "_Siirry"
+
+#: ../mail/e-mail-reader.c:1490
+msgid "Mar_k As"
+msgstr "Mer_kitse"
+
+#: ../mail/e-mail-reader.c:1497
+msgid "_Message"
+msgstr "_Viesti"
+
+#: ../mail/e-mail-reader.c:1504
+msgid "_Zoom"
+msgstr "_Suurenna"
+
+#: ../mail/e-mail-reader.c:1525
+msgid "Mark for Follo_w Up..."
+msgstr "_Merkitse _edelleen lähetettäväksi..."
+
+#: ../mail/e-mail-reader.c:1533
+msgid "Mark as _Important"
+msgstr "Merkitse _tärkeäksi"
+
+#: ../mail/e-mail-reader.c:1537
+msgid "Mark as _Junk"
+msgstr "Luokittele _roskapostiksi"
+
+#: ../mail/e-mail-reader.c:1541
+msgid "Mark as _Not Junk"
+msgstr "Luokittele _ei-roskapostiksi"
+
+#: ../mail/e-mail-reader.c:1545
+msgid "Mar_k as Read"
+msgstr "Merkitse _luetuksi"
+
+#: ../mail/e-mail-reader.c:1549
+msgid "Mark as Uni_mportant"
+msgstr "Merkitse yhden_tekeväksi"
+
+#: ../mail/e-mail-reader.c:1553
+msgid "Mark as _Unread"
+msgstr "Merkitse _lukemattomaksi"
+
+#: ../mail/e-mail-reader.c:1589
+msgid "_Caret Mode"
+msgstr "Kohdistin_tila"
+
+#: ../mail/e-mail-reader.c:1591
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "Näytä välkkyvä kursori näytettävien viestin rungossa"
+
+#: ../mail/e-mail-reader.c:1597
+msgid "All Message _Headers"
+msgstr "Kaikki viestin _otsikot"
+
+#: ../mail/e-mail-reader.c:1599
+msgid "Show messages with all email headers"
+msgstr "Näytä viesti kaikilla otsakkeillaan"
+
+#: ../mail/e-mail-reader.c:1811
+msgid "Unable to retrieve message"
+msgstr "Viestiä ei voi hakea"
+
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/e-mail-reader.c:2212
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:612
+#: ../plugins/google-account-setup/google-source.c:783
+#: ../widgets/misc/e-account-tree-view.c:234
+msgid "Default"
+msgstr "Oletukset"
+
+#: ../mail/e-mail-reader.c:2357 ../mail/em-filter-i18n.h:14
+#: ../modules/addressbook/e-book-shell-view-actions.c:979
+#: ../modules/calendar/e-cal-shell-view-actions.c:1686
+#: ../modules/calendar/e-memo-shell-view-actions.c:905
+#: ../modules/calendar/e-task-shell-view-actions.c:1105
+#: ../plugins/groupwise-features/share-folder.c:765
+msgid "Delete"
+msgstr "Poista"
+
+#: ../mail/e-mail-reader.c:2361
+#: ../modules/calendar/e-cal-shell-view-actions.c:1194
+#: ../widgets/misc/e-calendar.c:193
+msgid "Next"
+msgstr "Seuraava"
+
+#: ../mail/e-mail-reader.c:2365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1187
+#: ../widgets/misc/e-calendar.c:169
+msgid "Previous"
+msgstr "Edellinen"
+
+#: ../mail/e-mail-reader.c:2369 ../mail/message-tag-followup.c:62
+msgid "Reply"
+msgstr "Vastaa"
+
+#: ../mail/e-mail-search-bar.c:77
+#, c-format
+msgid "Matches: %d"
+msgstr "Osumia: %d"
+
+#: ../mail/e-mail-search-bar.c:552
+msgid "Close the find bar"
+msgstr "Sulje hakupalkki"
+
+#: ../mail/e-mail-search-bar.c:560
+msgid "Fin_d:"
+msgstr "Et_si:"
+
+#: ../mail/e-mail-search-bar.c:572
+msgid "Clear the search"
+msgstr "Tyhjennä hakukenttä"
+
+#: ../mail/e-mail-search-bar.c:595
+msgid "_Previous"
+msgstr "_Edellinen"
+
+#: ../mail/e-mail-search-bar.c:601
+msgid "Find the previous occurrence of the phrase"
+msgstr "Etsi lauseen edellinen esiintymä"
+
+#: ../mail/e-mail-search-bar.c:611
+msgid "_Next"
+msgstr "_Seuraava"
+
+#: ../mail/e-mail-search-bar.c:617
+msgid "Find the next occurrence of the phrase"
+msgstr "Etsi lauseen seuraava esiintymä"
+
+#: ../mail/e-mail-search-bar.c:627
+msgid "Mat_ch case"
+msgstr "Huomioi _kirjainkoko"
+
+#: ../mail/e-mail-search-bar.c:655
+msgid "Reached bottom of page, continued from top"
+msgstr "Saavutettin sivun loppu, jatketaan alusta"
+
+#: ../mail/e-mail-search-bar.c:677
+msgid "Reached top of page, continued from bottom"
+msgstr "Saavutettiin sivun alku, jatketaan lopusta"
+
+#. On This Computer is always first, and Search Folders
+#. * is always last.
+#. create the local source group
+#: ../mail/e-mail-store.c:225 ../mail/em-folder-tree-model.c:144
+#: ../mail/em-folder-tree-model.c:146 ../mail/mail-vfolder.c:220
+#: ../mail/message-list.c:1555
+#: ../modules/addressbook/e-book-shell-backend.c:125
+#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/calendar/e-cal-shell-backend.c:120
+#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-memo-shell-backend.c:107
+#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-task-shell-backend.c:110
+#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/mail/e-mail-shell-migrate.c:2931
+msgid "On This Computer"
+msgstr "Tällä tietokoneella"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../mail/em-account-editor.c:486
+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:490
+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:494
+msgid "SSL encryption"
+msgstr "SSL-salattu"
+
+#: ../mail/em-account-editor.c:587
 #, c-format
 msgid "%s License Agreement"
 msgstr "Lisenssisopimus ohjelmalle %s"
 
-#: ../mail/em-account-editor.c:393
+#: ../mail/em-account-editor.c:594
 #, c-format
 msgid ""
 "\n"
@@ -11834,118 +9789,152 @@ 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-vfolder-rule.c:513
-msgid "Select Folder"
-msgstr "Valitse kansio"
+#: ../mail/em-account-editor.c:1002
+msgid "Never"
+msgstr "Ei koskaan"
 
-#: ../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:1003
+msgid "Always"
+msgstr "Aina"
 
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:1004
 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:2084
+msgid "Mail Configuration"
+msgstr "Sähköpostiasetukset"
+
+#: ../mail/em-account-editor.c:2085
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin."
+msgstr ""
+"Tervetuloa Evolutionin sähköpostitilin asetusapulaiseen.\n"
+"\n"
+"Aloita napista \"Seuraava\"."
+
+#: ../mail/em-account-editor.c:2087 ../mail/em-account-editor.c:2213
+#: ../mail/mail-config.glade.h:87
 msgid "Identity"
 msgstr "Omat tiedot"
 
-#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:2088
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"Syötä nimesi ja sähköpostiosoitteesi alla oleviin kenttiin. \"Valinnaiset\" "
+"kentät eivät ole pakollisia, jollet halua sisältää näitä tietoja "
+"lähettämiisi sähköpostiviesteihin."
+
+#: ../mail/em-account-editor.c:2090 ../mail/em-account-editor.c:2254
+#: ../mail/mail-config.glade.h:107
 msgid "Receiving Email"
 msgstr "Vastaanotto"
 
-#: ../mail/em-account-editor.c:2130
+#: ../mail/em-account-editor.c:2091
+msgid "Please configure the following account settings."
+msgstr "Määrittele seuraavat tiliasetukset."
+
+#: ../mail/em-account-editor.c:2093 ../mail/em-account-editor.c:2714
+msgid "Sending Email"
+msgstr "Lähetys"
+
+#: ../mail/em-account-editor.c:2094
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"Syötä tiedot siitä, kuinka lähetät sähköpostia. jos et ole varma "
+"asetuksista, kysy järjestelmäsi ylläpitäjältä tai Internet-"
+"palveluntarjoajaltasi."
+
+#: ../mail/em-account-editor.c:2096
+msgid "Account Management"
+msgstr "Tilinhallinta"
+
+#: ../mail/em-account-editor.c:2097
+msgid ""
+"Please enter a descriptive name for this account in the space below.\n"
+"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."
+
+#: ../mail/em-account-editor.c:2101
+msgid "Done"
+msgstr "Valmis"
+
+#: ../mail/em-account-editor.c:2102
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"Onneksi olkoon, sähköpostiasetuksesi ovat nyt valmiit.\n"
+"\n"
+"Voit nyt lähettää ja vastaanottaa sähköpostia Evolutionilla.\n"
+"\n"
+"Tallenna asetuksesi napsauttamalla painiketta \"Toteuta\""
+
+#: ../mail/em-account-editor.c:2526
 msgid "Check for _new messages every"
 msgstr "T_arkista uudet viestit joka"
 
-#: ../mail/em-account-editor.c:2138
+#: ../mail/em-account-editor.c:2534
 msgid "minu_tes"
 msgstr "minuutti"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
-msgid "Sending Email"
-msgstr "Lähetys"
-
-#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2776 ../mail/mail-config.glade.h:63
 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:2842 ../mail/mail-config.glade.h:113
+#: ../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:2879 ../mail/em-account-editor.c:2947
 msgid "Receiving Options"
 msgstr "Vastaanottoasetukset"
 
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2880 ../mail/em-account-editor.c:2948
 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:3407 ../mail/mail-config.glade.h:35
 msgid "Account Editor"
 msgstr "Tilimuokkain"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
+#: ../mail/em-account-editor.c:3407
 msgid "Evolution Account Assistant"
 msgstr "Evolutionin sähköpostitilien apulainen"
 
-#. translators: default account indicator
-#: ../mail/em-account-prefs.c:429
-msgid "[Default]"
-msgstr "[Oletus]"
-
-#: ../mail/em-account-prefs.c:488
-msgid "Account name"
-msgstr "Tilin nimi"
-
-#: ../mail/em-account-prefs.c:490
-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
-msgid "Unnamed"
-msgstr "Nimeämätön"
-
-#: ../mail/em-composer-prefs.c:970
-msgid "Language(s)"
-msgstr "Kielet"
-
-#: ../mail/em-composer-prefs.c:1019
-msgid "Add signature script"
-msgstr "Lisää allekirjoitus-skripti"
-
-#: ../mail/em-composer-prefs.c:1061
-msgid "Signature(s)"
-msgstr "Allekirjoitukset"
-
-#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
-msgid "-------- Forwarded Message --------"
-msgstr "------- Välitetty viesti ---------"
-
-#: ../mail/em-composer-utils.c:1602
+#: ../mail/em-composer-utils.c:1590
 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:1596
 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."
 
-#: ../mail/em-composer-utils.c:2058
+#: ../mail/em-composer-utils.c:2063
 msgid "an unknown sender"
 msgstr "Tuntematon lähettäjä"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2105
+#: ../mail/em-composer-utils.c:2110
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11953,11 +9942,19 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kello ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} kirjoitti:"
 
-#: ../mail/em-composer-utils.c:2248
+#: ../mail/em-composer-utils.c:2253
 msgid "-----Original Message-----"
 msgstr "-----Alkuperäinen viesti-----"
 
-#: ../mail/em-filter-editor.c:156
+#: ../mail/em-composer-utils.c:2431
+msgid "Posting destination"
+msgstr "Postituksen kohde"
+
+#: ../mail/em-composer-utils.c:2432
+msgid "Choose folders to post the message to."
+msgstr "Valitse kansio johon viesti postitetaan:"
+
+#: ../mail/em-filter-editor.c:188
 msgid "_Filter Rules"
 msgstr "_Suodatinsäännöt"
 
@@ -12002,14 +9999,6 @@ msgstr "Otettu vastaan"
 msgid "Date sent"
 msgstr "Lähetetty"
 
-#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:768
-#: ../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
-msgid "Delete"
-msgstr "Poista"
-
 #: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "Poistettu"
@@ -12054,229 +10043,180 @@ 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 ../modules/mail/e-mail-shell-migrate.c:955
 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
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:88
 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
-#: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1115
-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
-msgid "C_reate Search Folder From Search..."
-msgstr "Luo _hakunäkymä haun perusteella..."
-
-#: ../mail/em-folder-browser.c:218
-msgid "All Messages"
-msgstr "Kaikki viestit"
-
-#: ../mail/em-folder-browser.c:219
-msgid "Unread Messages"
-msgstr "Lukemattomat viestit"
-
-#: ../mail/em-folder-browser.c:221
-msgid "No Label"
-msgstr "Ei merkintää"
-
-#: ../mail/em-folder-browser.c:228
-msgid "Read Messages"
-msgstr "Luetut viestit"
-
-#: ../mail/em-folder-browser.c:229
-msgid "Recent Messages"
-msgstr "Viimeisimmät viestit"
-
-#: ../mail/em-folder-browser.c:230
-msgid "Last 5 Days' Messages"
-msgstr "Viimeisten viiden päivän viestit"
-
-#: ../mail/em-folder-browser.c:231
-msgid "Messages with Attachments"
-msgstr "Viestit, joissa on liitteitä"
-
-#: ../mail/em-folder-browser.c:232
-msgid "Important Messages"
-msgstr "Tärkeät viestit"
-
-#: ../mail/em-folder-browser.c:233
-msgid "Messages Not Junk"
-msgstr "Viestit, jotka eivät ole roskapostia"
-
-#: ../mail/em-folder-browser.c:1188
-msgid "Account Search"
-msgstr "Haku tileiltä"
-
-#: ../mail/em-folder-browser.c:1241
-msgid "All Account Search"
-msgstr "Etsi kaikilta tileiltä"
-
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
@@ -12302,70 +10242,56 @@ msgstr "Levytilan käyttö (%s):"
 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
-msgid "Inbox"
-msgstr "Saapuneet"
-
-#: ../mail/em-folder-properties.c:390
+#: ../mail/em-folder-properties.c:399
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Kansion ominaisuudet"
 
-#: ../mail/em-folder-selection-button.c:120
+#: ../mail/em-folder-selection-button.c:75
 msgid "<click here to select a folder>"
 msgstr "<Valitse kansio tästä>"
 
-#: ../mail/em-folder-selector.c:254
+#: ../mail/em-folder-selector.c:267
 msgid "C_reate"
 msgstr "_Luo"
 
-#: ../mail/em-folder-selector.c:258
+#: ../mail/em-folder-selector.c:271
 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:148 ../mail/em-folder-tree-model.c:150
+#: ../mail/mail-vfolder.c:978 ../mail/mail-vfolder.c:1034
 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
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:156
 msgid "UNMATCHED"
 msgstr "EI VASTAAVAA"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
-msgid "Drafts"
-msgstr "Luonnokset"
-
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
-#: ../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
-msgid "Outbox"
-msgstr "Lähtevät"
-
-#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
-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:662 ../mail/em-folder-tree-model.c:998
 msgid "Loading..."
 msgstr "Ladataan..."
 
+#: ../mail/em-folder-tree.c:184 ../mail/mail-ops.c:1069
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "Etsitään kansioita kohteessa \"%s\""
+
+#: ../mail/em-folder-tree.c:431
+msgid "Folder names cannot contain '/'"
+msgstr "Kansion nimi ei voi sisältää merkkiä '/'"
+
 #. 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
@@ -12375,314 +10301,71 @@ msgstr "Ladataan..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:380
-#, c-format
+#: ../mail/em-folder-tree.c:940
+#,  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:1268
 msgid "Mail Folder Tree"
 msgstr "Sähköpostikansioiden puu"
 
-#: ../mail/em-folder-tree.c:900
+#: ../mail/em-folder-tree.c:1435
 #, c-format
 msgid "Moving folder %s"
 msgstr "Siirretään kansiota %s"
 
-#: ../mail/em-folder-tree.c:902
+#: ../mail/em-folder-tree.c:1437
 #, 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:1444 ../mail/message-list.c:2052
 #, 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:1446 ../mail/message-list.c:2054
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejä kansioon %s"
 
-#: ../mail/em-folder-tree.c:926
+#: ../mail/em-folder-tree.c:1461
 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
-msgid "_Copy to Folder"
-msgstr "_Kopioi kansioon"
-
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
-msgid "_Move to Folder"
-msgstr "_Siirrä kansioon"
-
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Etsitään kansioita kohteessa \"%s\""
-
-#: ../mail/em-folder-tree.c:2117
-msgid "Open in _New Window"
-msgstr "Avaa _uudessa ikkunassa"
-
-#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2122
-msgid "_New Folder..."
-msgstr "_Uusi kansio..."
-
-#: ../mail/em-folder-tree.c:2125
-msgid "_Move..."
-msgstr "_Siirrä..."
-
-#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh"
-msgstr "Vi_rkistä"
-
-#: ../mail/em-folder-tree.c:2134
-msgid "Fl_ush Outbox"
-msgstr "T_yhjennä lähtevien kansio"
-
-#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
-msgid "_Empty Trash"
-msgstr "_Tyhjennä roskakori"
-
-#: ../mail/em-folder-tree.c:2243
-msgid "_Unread Search Folder"
-msgstr "_Lukemattomien hakukansio"
-
-#: ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-utils.c:98
 #, 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/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
-msgid "Select folder"
-msgstr "Valitse kansio"
-
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1203
-msgid "C_opy"
-msgstr "_Kopioi"
-
-#: ../mail/em-folder-utils.c:532
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:513
+#: ../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
-msgid "Create folder"
-msgstr "Luo uusi kansio"
+#: ../mail/em-folder-utils.c:675
+msgid "Create Folder"
+msgstr "Luo 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:676
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:386
 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
-msgid "Mail Deletion Failed"
-msgstr "Sähköpostin poisto epäonnistui"
-
-#: ../mail/em-folder-view.c:1092 ../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
-msgid "_Edit as New Message..."
-msgstr "_Muokkaa uutena viestinä..."
-
-#: ../mail/em-folder-view.c:1343
-msgid "U_ndelete"
-msgstr "_Palauta"
-
-#: ../mail/em-folder-view.c:1344
-msgid "_Move to Folder..."
-msgstr "_Siirrä kansioon..."
-
-#: ../mail/em-folder-view.c:1345
-msgid "_Copy to Folder..."
-msgstr "_Kopioi kansioon..."
-
-#: ../mail/em-folder-view.c:1348
-msgid "Mar_k as Read"
-msgstr "Merkitse _luetuksi"
-
-#: ../mail/em-folder-view.c:1349
-msgid "Mark as _Unread"
-msgstr "Merkitse _lukemattomaksi"
-
-#: ../mail/em-folder-view.c:1350
-msgid "Mark as _Important"
-msgstr "Merkitse _tärkeäksi"
-
-#: ../mail/em-folder-view.c:1351
-msgid "Mark as Un_important"
-msgstr "Merkitse yhden_tekeväksi"
-
-#: ../mail/em-folder-view.c:1352
-msgid "Mark as _Junk"
-msgstr "Luokittele _roskapostiksi"
-
-#: ../mail/em-folder-view.c:1353
-msgid "Mark as _Not Junk"
-msgstr "Luokittele _ei-roskapostiksi"
-
-#: ../mail/em-folder-view.c:1354
-msgid "Mark for Follo_w Up..."
-msgstr "_Merkitse _edelleen lähetettäväksi..."
-
-#: ../mail/em-folder-view.c:1356
-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
-msgid "_None"
-msgstr "_Ei mitään"
-
-#: ../mail/em-folder-view.c:1360
-msgid "_New Label"
-msgstr "_uusi merkintä"
-
-#: ../mail/em-folder-view.c:1364
-msgid "Fla_g Completed"
-msgstr "_Merkitse valmiiksi"
-
-#: ../mail/em-folder-view.c:1365
-msgid "Cl_ear Flag"
-msgstr "_Poista merkki"
-
-#: ../mail/em-folder-view.c:1368
-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
-msgid "Search Folder based on _Subject"
-msgstr "Hakunäkymä _aiheen perusteella"
-
-#: ../mail/em-folder-view.c:1371
-msgid "Search Folder based on Se_nder"
-msgstr "Hakunäkymä _lähettäjän perusteella"
-
-#: ../mail/em-folder-view.c:1372
-msgid "Search Folder based on _Recipients"
-msgstr "Hakunäkymä _vastaanottajien perusteella"
-
-#: ../mail/em-folder-view.c:1373
-msgid "Search Folder based on Mailing _List"
-msgstr "Hakunäkymä _postituslistan perusteella"
-
-#. 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
-msgid "Filter based on Sub_ject"
-msgstr "Suodata a_iheen mukaan"
-
-#: ../mail/em-folder-view.c:1379
-msgid "Filter based on Sen_der"
-msgstr "Suodata _lähettäjän mukaan"
-
-#: ../mail/em-folder-view.c:1380
-msgid "Filter based on Re_cipients"
-msgstr "Suodata _vastaanottajien mukaan"
-
-#: ../mail/em-folder-view.c:1381
-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
-msgid "Default"
-msgstr "Oletukset"
-
-#: ../mail/em-folder-view.c:2518
-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
-msgid "Create _Search Folder"
-msgstr "Luo uusi hakunäkymä"
-
-#: ../mail/em-folder-view.c:2760
-msgid "_From this Address"
-msgstr "_Tästä osoitteesta"
-
-#: ../mail/em-folder-view.c:2761
-msgid "_To this Address"
-msgstr "_Osoitteeseen:"
-
-#: ../mail/em-folder-view.c:3254
-#, c-format
-msgid "Click to mail %s"
-msgstr "Napsauta lähettääksesi %s"
-
-#: ../mail/em-folder-view.c:3266
+#: ../mail/em-folder-utils.c:692
 #, c-format
-msgid "Click to call %s"
-msgstr "Soita numeroon %s napsauttamalla"
-
-#: ../mail/em-folder-view.c:3271
-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"
+msgid "Unsubscribing from folder \"%s\""
+msgstr "Peru kansion \"%s\" tilaus"
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:108 ../mail/em-format-html.c:1453
 msgid "Unsigned"
 msgstr "Allekirjoittamaton"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:108
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12690,11 +10373,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:109 ../mail/em-format-html.c:1454
 msgid "Valid signature"
 msgstr "Hyväksytty allekirjoitus"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:109
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12702,11 +10385,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:110 ../mail/em-format-html.c:1455
 msgid "Invalid signature"
 msgstr "Hylätty allekirjoitus"
 
-#: ../mail/em-format-html-display.c:953
+#: ../mail/em-format-html-display.c:110
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12714,11 +10397,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:111 ../mail/em-format-html.c:1456
 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:111
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12726,11 +10409,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:112 ../mail/em-format-html.c:1457
 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:112
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12738,11 +10421,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:119 ../mail/em-format-html.c:1463
 msgid "Unencrypted"
 msgstr "Salaamaton"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:119
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12750,11 +10433,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:120 ../mail/em-format-html.c:1464
 msgid "Encrypted, weak"
 msgstr "Heikosti salattu"
 
-#: ../mail/em-format-html-display.c:963
+#: ../mail/em-format-html-display.c:120
 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 +10447,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:121 ../mail/em-format-html.c:1465
 msgid "Encrypted"
 msgstr "Salattu"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:121
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12776,11 +10459,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:122 ../mail/em-format-html.c:1466
 msgid "Encrypted, strong"
 msgstr "Salattu vahvalla algoritmilla"
 
-#: ../mail/em-format-html-display.c:965
+#: ../mail/em-format-html-display.c:122
 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,530 +10473,236 @@ 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:259 ../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:274
 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:525
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
+"Evolution ei voi esittää tätä viestiä, koska se on liian suuri "
+"käsiteltäväksi.  Voit näyttää sen muotoilemattomana tai ulkoisella "
+"tekstinmuokkaimella."
+
+#: ../mail/em-format-html-display.c:795
+msgid "Completed on"
+msgstr "Valmistui"
 
-#: ../mail/em-format-html-display.c:1415
+#: ../mail/em-format-html-display.c:803
 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"
-
-#: ../mail/em-format-html-display.c:1496
-msgid "_View Inline"
-msgstr "Näytä _sisäkkäisesti"
-
-#: ../mail/em-format-html-display.c:1497
-msgid "_Hide"
-msgstr "_Piilota"
-
-#: ../mail/em-format-html-display.c:1498
-msgid "_Fit to Width"
-msgstr "Sovita _leveyteen"
-
-#: ../mail/em-format-html-display.c:1499
-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ä"
+#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
+#: ../mail/em-format-html-display.c:807
+msgid "by"
+msgstr "mennessä"
 
-#: ../mail/em-format-html-display.c:2530 ../mail/em-format-html-display.c:2569
+#: ../mail/em-format-html-display.c:1204 ../mail/em-format-html-display.c:1243
 msgid "View _Unformatted"
 msgstr "Näytä _muotoilematon"
 
-#: ../mail/em-format-html-display.c:2532
+#: ../mail/em-format-html-display.c:1206
 msgid "Hide _Unformatted"
 msgstr "Piilota _muotoilematon"
 
-#: ../mail/em-format-html-display.c:2589
+#: ../mail/em-format-html-display.c:1263
 msgid "O_pen With"
 msgstr "Avaa _ohjelmalla"
 
-#: ../mail/em-format-html-display.c:2665
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-msgstr ""
-"Evolution ei voi esittää tätä viestiä, koska se on liian suuri "
-"käsiteltäväksi.  Voit näyttää sen muotoilemattomana tai ulkoisella "
-"tekstinmuokkaimella."
-
-#: ../mail/em-format-html-print.c:157
+#: ../mail/em-format-html-print.c:163
 #, c-format
 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:165
+msgid "Formatting message"
+msgstr "Muotoillaan viestiä"
+
+#: ../mail/em-format-html.c:342
+msgid "Formatting Message..."
+msgstr "Muotoillaan viestiä..."
+
+#: ../mail/em-format-html.c:1304 ../mail/em-format-html.c:1313
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Noudetaan \"%s\""
 
-#: ../mail/em-format-html.c:927
+#: ../mail/em-format-html.c:1759
 msgid "Unknown external-body part."
 msgstr "Tuntematon ulkopuolinen viestin osa."
 
-#: ../mail/em-format-html.c:935
+#: ../mail/em-format-html.c:1767
 msgid "Malformed external-body part."
 msgstr "Väärin muotoilut rungon ulkopuolinen viestin osa."
 
-#: ../mail/em-format-html.c:965
+#: ../mail/em-format-html.c:1797
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Osoitin FTP-palvelimelle (%s)"
 
-#: ../mail/em-format-html.c:976
+#: ../mail/em-format-html.c:1808
 #, 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:1810
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Osoitin paikalliseen tiedostoon (%s)"
 
-#: ../mail/em-format-html.c:999
+#: ../mail/em-format-html.c:1831
 #, 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:1842
 #, 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
-msgid "Formatting message"
-msgstr "Muotoillaan viestiä"
-
-#: ../mail/em-format-html.c:1412
-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
-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
-msgid "Bcc"
-msgstr "Piilokopiot"
-
-#. pseudo-header
-#: ../mail/em-format-html.c:1746 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1451
-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:2483
 #, 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
-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
-msgid "Date"
-msgstr "Päiväys"
-
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:82
-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
-msgid "Face"
-msgstr "Kasvokuva"
-
-#: ../mail/em-format.c:1160
-#, c-format
-msgid "%s attachment"
-msgstr "Liite: %s"
-
-#: ../mail/em-format.c:1199
-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
-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
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Tuntematon salausmuoto muodolle multipart/encrypted"
-
-#: ../mail/em-format.c:1354
-msgid "Could not parse PGP/MIME message"
-msgstr "PGP/MIME-viestiä ei voitu tulkita"
-
-#: ../mail/em-format.c:1354
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "PGP/MIME-viestiä ei voitu tulkita: tuntematon virhe"
-
-#: ../mail/em-format.c:1511
-msgid "Unsupported signature format"
-msgstr "Allekirjoituksen muoto ei ole tuettu"
-
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
-msgid "Error verifying signature"
-msgstr "Virhe tarkistettaessa allekirjoitusta"
-
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
-msgid "Unknown error verifying signature"
-msgstr "Tuntematon virhe tarkistettaessa allekirjoitusta"
-
-#: ../mail/em-format.c:1664
-msgid "Could not parse PGP message"
-msgstr "PGP-viestiä ei voitu tulkita"
-
-#: ../mail/em-format.c:1664
-msgid "Could not parse PGP message: Unknown error"
-msgstr "PGP-viestiä ei voitu tulkita: tuntematon virhe"
-
-#: ../mail/em-mailer-prefs.c:94
-msgid "Every time"
-msgstr "Joka kerta"
-
-#: ../mail/em-mailer-prefs.c:95
-msgid "Once per day"
-msgstr "Kerran päivässä"
-
-#: ../mail/em-mailer-prefs.c:96
-msgid "Once per week"
-msgstr "Kerran viikossa"
-
-#: ../mail/em-mailer-prefs.c:97
-msgid "Once per month"
-msgstr "Kerran kuussa"
-
-#: ../mail/em-mailer-prefs.c:327
-msgid "Add Custom Junk Header"
-msgstr "Lisää oma roskapostiotsake"
-
-#: ../mail/em-mailer-prefs.c:331
-msgid "Header Name:"
-msgstr "_Otsakkeen nimi:"
-
-#: ../mail/em-mailer-prefs.c:332
-msgid "Header Value Contains:"
-msgstr "Otsakkeen arvo sisältää:"
-
-#: ../mail/em-mailer-prefs.c:437
-msgid "Contains Value"
-msgstr "Sisältää arvon"
-
-#: ../mail/em-mailer-prefs.c:459
-msgid "Color"
-msgstr "Väri"
-
-#: ../mail/em-mailer-prefs.c:462
-msgid "Tag"
-msgstr "Merkintä"
-
-#. May be a better text
-#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
-#, 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
-#, 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
-msgid "No Junk plugin available"
-msgstr "Roskapostilisäosaa ei ole saatavilla"
-
-#. green
-#: ../mail/em-migrate.c:1059
-msgid "To Do"
-msgstr "Tehtävää"
-
-#. blue
-#: ../mail/em-migrate.c:1060
-msgid "Later"
-msgstr "Myöhemmin"
-
-#: ../mail/em-migrate.c:1228
-msgid "Migration"
-msgstr "Siirto"
-
-#: ../mail/em-migrate.c:1673
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "Kansiota '%s' ei voi luoda: %s"
-
-#: ../mail/em-migrate.c:1699
-#, 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
-#, 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
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolutionin sähköpostikansioiden sijainti ja rakenne on muuttunut versiosta "
-"Evolution 1.x.\n"
-"\n"
-"Odota kärsivällisesti, että Evolution muuntaa kansioitasi..."
-
-#: ../mail/em-migrate.c:2090
-#, 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
-#, 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
-#, 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
-#, 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
-msgid "Migrating Folders"
-msgstr "Siirretään kansiota"
-
-#: ../mail/em-migrate.c:2974
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolutionin sähköpostikansioiden yhteenvedon esitys on siirretty sqlite-"
-"tietokantaan version 2.24 jälkeen.\n"
-"\n"
-"Odota kärsivällisesti, että Evolution muuntaa kansioiden tietoja..."
-
-#: ../mail/em-migrate.c:3056
-#, 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
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-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
-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
-msgid "Reply to _List"
-msgstr "Vastaa _listalle"
-
-#. make it first item
-#: ../mail/em-popup.c:625 ../mail/em-popup.c:849
-msgid "_Add to Address Book"
-msgstr "_Lisää osoitekirjaan"
-
-#: ../mail/em-subscribe-editor.c:600
+#: ../mail/em-subscribe-editor.c:607
 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:640
 msgid "Subscribed"
 msgstr "Tilattu"
 
-#: ../mail/em-subscribe-editor.c:637
+#: ../mail/em-subscribe-editor.c:644
 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:860
 msgid "Please select a server."
 msgstr "Valitse palvelin."
 
-#: ../mail/em-subscribe-editor.c:860
+#: ../mail/em-subscribe-editor.c:896
 msgid "No server has been selected"
 msgstr "Ei palvelinta valittuna"
 
-#. Check buttons
-#: ../mail/em-utils.c:122
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
-msgid "_Do not show this message again."
-msgstr "�lä _näytä tätä viestiä uudestaan."
-
-#: ../mail/em-utils.c:318
+#: ../mail/em-utils.c:305
 msgid "Message Filters"
 msgstr "Viestisuodattimet"
 
-#: ../mail/em-utils.c:371
+#: ../mail/em-utils.c:357
 msgid "message"
 msgstr "viesti"
 
-#: ../mail/em-utils.c:655
+#: ../mail/em-utils.c:645
 msgid "Save Message..."
 msgstr "Tallenna viesti..."
 
-#: ../mail/em-utils.c:705
-msgid "Add address"
-msgstr "Lisää osoite"
-
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1226
+#: ../mail/em-utils.c:1108
 #, c-format
 msgid "Messages from %s"
 msgstr "Viestit %s:ltä"
 
-#: ../mail/em-vfolder-editor.c:115
+#: ../mail/em-vfolder-editor.c:126
 msgid "Search _Folders"
 msgstr "_Hakunäkymät"
 
-#: ../mail/em-vfolder-rule.c:593
+#: ../mail/em-vfolder-rule.c:596
 msgid "Search Folder source"
 msgstr "Hakunäkymän lähde"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Filter Editor\" window height"
+msgstr "\"Suodatinmuokkain\" -ikkunan korkeus"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Filter Editor\" window maximize state"
+msgstr "\"Suodatinmuokkain\" -ikkunan suurennustila"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Filter Editor\" window width"
+msgstr "\"Suodatinmuokkain\" -ikkunan leveys"
+
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "\"Search Folder Editor\" window height"
+msgstr "\"Hakukansion muokkain\" -ikkunan korkeus"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "\"Search Folder Editor\" window maximize state"
+msgstr "\"Hakukansion muokkain\" -ikkunan suurennustila"
+
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "\"Search Folder Editor\" window width"
+msgstr "\"Hakukansion muokkain\" -ikkunan leveys"
+
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Send and Receive Mail\" window height"
 msgstr "\"Lähetä ja vastaanota\" -ikkunan korkeus"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Send and Receive Mail\" window maximize state"
 msgstr "\"Lähetä ja vastaanota\" -suurennustila"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Send and Receive Mail\" window width"
 msgstr "\"Lähetä ja vastaanota\" -ikkunan leveys"
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Allows Evolution to display text part of limited size"
 msgstr "Sallii evolutionin näyttää rajoitetun kokoiset tekstiosat"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "Pyydä aina kuittaus lukemisesta"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic emoticon recognition"
 msgstr "Tunnista hymiöt automaattisesti"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Automatic link recognition"
 msgstr "_Havaitse linkit automaattisesti"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Check incoming mail being junk"
 msgstr "Etsi roskapostia saapuvista sähköposteista"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color"
 msgstr "Lainauksen korostusväri"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Citation highlight color."
 msgstr "Lainauksen korostukseen käytetty väri."
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default height"
 msgstr "Viesti-ikkunan oletuskorkeus"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer Window default width"
 msgstr "Viesti-ikkunan oletusleveys"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Composer load/attach directory"
 msgstr "Viesti-ikkunan lataus- ja liitekansio"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Rajaa näytettäviä To-, Cc- ja Bcc-osoitteita"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -13321,7 +10710,7 @@ msgstr ""
 "Rajaa To-, Cc- ja Bcc-kentissä näytettävien osoitteiden lukumäärä avaimessa "
 "address_count määrättyyn arvoon."
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -13329,11 +10718,11 @@ msgstr ""
 "Määrittää kuinka usein paikalliset muutokset synkronoidaan "
 "postipalvelimelle.  Aikavälin täytyy olla vähintään 30 sekuntia."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Custom headers to use while checking for junk."
 msgstr "Omat otsakkeet, joiden perusteella roskaposti tunnistetaan."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -13341,59 +10730,63 @@ msgstr ""
 "Määrittää oman otsakkeen, josta roskapostiviestejä tunnistetaan. Luettelon "
 "kohdat ovat muodossa \"otsakenimi=arvo\"."
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages"
 msgstr "Viestien kirjoittamisessa oletuksena käytetty merkistö"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to compose messages."
 msgstr "Viestien kirjoittamisessa oletuksena käytetty merkistö."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages"
 msgstr "Viestejä näytettäessä oletuksena käytetty merkistö"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default charset in which to display messages."
 msgstr "Viestejä näytettäessä oletuksena käytetty merkistö."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default forward style"
 msgstr "Välityksen oletustyyli"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the Composer Window."
 msgstr "Viesti-ikkunan oletuskorkeus."
 
-#: ../mail/evolution-mail.schemas.in.h:26
-msgid "Default height of the message window."
-msgstr "Viesti-ikkunan oletuskorkeus."
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid "Default height of the mail browser window."
+msgstr "Sähköpostien selainikkunan oletuskorkeus."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default height of the subscribe dialog."
 msgstr "Tilausikkunan oletuskorkeus."
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:34
+msgid "Default maximized state of the mail browser window."
+msgstr "Sähköpostien selainikkunan oletusleveys."
+
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default value for thread expand state"
 msgstr "Säikeen laajennuksen tilan oletusarvo"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the Composer Window."
 msgstr "Viesti-ikkunan oletusleveys."
 
-#: ../mail/evolution-mail.schemas.in.h:31
-msgid "Default width of the message window."
-msgstr "Viesti-ikkunan oletusleveys."
+#: ../mail/evolution-mail.schemas.in.h:38
+msgid "Default width of the mail browser window."
+msgstr "Sähköpostien selainikkunan oletusleveys."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default width of the subscribe dialog."
 msgstr "Tilausikkunan oletusleveys."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -13401,11 +10794,11 @@ msgstr ""
 "Määrittää, etsitäänkö lähettäjän sähköpostiosoitetta rosköpostin suodatusta "
 "varten vain paikallisista osoitekirjoista"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Määrittää, etsitäänkö osoitekirjasta lähettäjän sähköpostiosoitetta"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -13418,12 +10811,12 @@ msgstr ""
 "haku voi olla hidas, jos osoitteita täydennetään esimerkiksi LDAP-"
 "osoitekirjoista."
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Määrittää käytetäänkö omia roskapostiotsakkeita roskapostin tunnistamiseen"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -13433,7 +10826,7 @@ msgstr ""
 "käytössä ja otsakkeet on annettu, voidaan tällä nopeuttaa roskapostin "
 "tunnistamista."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -13441,71 +10834,75 @@ msgstr ""
 "Määrittää käytetäänkö samaa kirjaisinta sekä \"Lähettäjä\" ja \"Vastaanottaja"
 "\" riveillä \"Viestit\"-sarakkeessa käytettäessä pystynäkymää."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for loading/attaching files to composer."
 msgstr "Kansio, josta sähköpostin liitteitä etsitään."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Directory for saving mail component files."
 msgstr "Kansio, johon sähköpostin osatiedostot tallennetaan."
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "Määritä typistetäänkö kansioiden nimet kansionäkymässä"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Näytä oikoluvun kirjoitusvirhemerkit sanoissa kirjoituksen aikana."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Empty Junk folders on exit"
 msgstr "Tyhjennä roskapostikansiot lopetettaessa"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Empty Trash folders on exit"
 msgstr "Tyhjennä roskakorit lopetettaessa"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Tyhjennä kaikki roskapostikansiot kun Evolution suljetaan"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tyhjennä kaikki roskakorit kun Evolution suljetaan"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:54
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:55
 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:56
 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:57
+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:58
 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:59
 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:60
 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:61
 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:62
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -13513,42 +10910,44 @@ 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:63
 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:64
 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:65 ../mail/mail-config.glade.h:74
 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:66
+#, fuzzy
 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."
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Height of the message-list pane"
 msgstr "Viestiluettelon korkeus"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Height of the message-list pane."
 msgstr "Viestiluettelopaneelin korkeus."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:69
 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:70
 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,25 +10955,36 @@ msgstr ""
 "Jos yrität avata 10 tai useampia viestejä kerralla, kysytään haluatko "
 "todella tehdä sen."
 
-#: ../mail/evolution-mail.schemas.in.h:62
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-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:71
 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:72
+#, fuzzy
+msgid ""
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
+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:73
+#, fuzzy
+msgid ""
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
+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:74
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -13582,7 +10992,33 @@ 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:75
+#, fuzzy
+msgid ""
+"Initial maximize state of the \"Filter Editor\" window. The value updates "
+"when the user maximizes or unmaximizes the window. Note, this particular "
+"value is not used by Evolution since the \"Filter Editor\" window cannot be "
+"maximized. This key exists only as an implementation detail."
+msgstr ""
+"\"Lähetä ja vastaanota sähköpostia\"-ikkunan suurennustilan oletusarvo. Arvo "
+"muuttuu, jos käyttäjä suurentaa tai palauttaa ikkunan. Huomaa, että "
+"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:76
+#, fuzzy
+msgid ""
+"Initial maximize state of the \"Search Folder Editor\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Search Folder Editor\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+"\"Lähetä ja vastaanota sähköpostia\"-ikkunan suurennustilan oletusarvo. Arvo "
+"muuttuu, jos käyttäjä suurentaa tai palauttaa ikkunan. Huomaa, että "
+"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:77
 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,19 +11031,33 @@ 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:78
+#, fuzzy
 msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
+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:79
+#, fuzzy
+msgid ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 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:80
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+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:68
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -13615,7 +11065,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:82
 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 +11074,35 @@ 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:83
 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:84
 msgid "Last time empty trash was run"
 msgstr "Roskakori tyhjennettiin viimeksi"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:85
+msgid "Layout style"
+msgstr "Asettelutyyli"
+
+#: ../mail/evolution-mail.schemas.in.h:87
 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:88
 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:89
 msgid "List of accepted licenses"
 msgstr "Hyväksytyt lisenssit"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "List of accounts"
 msgstr "Luettelo tileistä"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:91
 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 +11111,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:92
 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:93
 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:94
 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 +11127,129 @@ 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:95
 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:96
 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:97
 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:98
 msgid "Log filter actions"
 msgstr "Kirjaa suodatintoimenpiteet"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:99
 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:100
 msgid "Logfile to log filter actions"
 msgstr "Lokitiedosto suodattimien toimenpiteille"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Logfile to log filter actions."
 msgstr "Lokitiedosto suodattimien toimenpiteille."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:102
+msgid "Mail browser height"
+msgstr "Postiselaimen korkeus"
+
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Mail browser maximized"
+msgstr "Postiselain suurennettu"
+
+#: ../mail/evolution-mail.schemas.in.h:104
+msgid "Mail browser width"
+msgstr "Postiselaimen leveys"
+
+#: ../mail/evolution-mail.schemas.in.h:105
 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:106
 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:107
 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:108
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Merkitse lainaukset viestin \"esikatselussa\"."
 
-#: ../mail/evolution-mail.schemas.in.h:92
-msgid "Message Window default height"
-msgstr "Viesti-ikkunan oletuskorkeus"
-
-#: ../mail/evolution-mail.schemas.in.h:93
-msgid "Message Window default width"
-msgstr "Viestiikkunan oletusleveys"
-
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:109
 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:110
 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:111
 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:112
 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:113
 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:114
 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:115
 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:116
 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:117
 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:118
 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:119
 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:120
 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:121
 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:122
 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:123
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13799,136 +11257,232 @@ 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:124
 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:125
 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:126
 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:127
+msgid "Put personalized signatures at the top of replies"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Put the cursor at the bottom of replies"
+msgstr "Aseta osoitin viestin loppuun vastattaessa"
+
+#: ../mail/evolution-mail.schemas.in.h:129
 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:130
 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:131
 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:132
 msgid "Save directory"
 msgstr "Tallenna kansio"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:133
 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:134
 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:135
 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:136
 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:137
 msgid "Server synchronization interval"
 msgstr "Palvelimen synkronoinnin aikaväli"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:140
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:141
+msgid "Show \"From\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show Animations"
 msgstr "Näytä animaatiot"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:145
+msgid "Show all message headers"
+msgstr "Näytä kaikki otsakkeet"
+
+#: ../mail/evolution-mail.schemas.in.h:146
+msgid "Show all the headers when viewing a messages."
+msgstr "Näytä kaikki viestin otsakkeet näytettäessä viestiä."
+
+#: ../mail/evolution-mail.schemas.in.h:147
 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:148
 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:149
 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:150
+msgid "Show image animations"
+msgstr "Näytä kuvien animaatiot"
+
+#: ../mail/evolution-mail.schemas.in.h:151
 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:152
+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:153
+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:154
+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:155
+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:156
+msgid "Show the \"Preview\" pane"
+msgstr "Näytä \"Esikatselu\"-paneeli"
+
+#: ../mail/evolution-mail.schemas.in.h:157
+msgid "Show the \"Preview\" pane."
+msgstr "Näytä esikatselupaneeli"
+
+#: ../mail/evolution-mail.schemas.in.h:158
+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:159
+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:160
 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:161
 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:162
 msgid "Spell check inline"
 msgstr "Oikolue kirjoitettaessa"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell checking color"
 msgstr "Oikoluvun väri"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking languages"
 msgstr "Oikoluvun kielet"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Subscribe dialog default height"
 msgstr "Tilausikkunan oletuskorkeus"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default width"
 msgstr "Tilausikkunan oletusleveys"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Terminal font"
 msgstr "Päätteen kirjasin"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Text message part limit"
 msgstr "Tekstin viestiosan kokoraja"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:169
 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:170
 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:171
 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:172
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the message list. \"0\" (Classic View) places the preview pane below the "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:173
 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:174
 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:175
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -13936,7 +11490,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:176
 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 +11498,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:177
 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 +11508,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:178
 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 +11517,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:179
 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 +11528,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:180
 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 +11538,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:181
 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:182
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13996,7 +11550,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:183
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -14004,7 +11558,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:184
 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 +11568,87 @@ 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:185
 msgid "Thread the message list."
 msgstr "Säikeistä viestiluettelo"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Thread the message-list"
 msgstr "Säikeistä viestiluettelo"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:187
 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:188
 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:189
 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:190
 msgid "UID string of the default account."
 msgstr "Oletustilin UID-merkkijono."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:191
 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:192
 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:193
 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:194
 msgid "Use custom fonts"
 msgstr "Käytä omia kirjasimia"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:195
 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:196
 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:197
 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
-msgid "Use side-by-side or wide layout"
-msgstr "Näytä vierekkäistä, leveää asettelua"
+#: ../mail/evolution-mail.schemas.in.h:198
+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:166
+#: ../mail/evolution-mail.schemas.in.h:199
+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:200
 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:175
-msgid "View/ReplyTo menu item is checked"
-msgstr "Näytä/Vastausosoite on valittu"
-
-#: ../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:177
+#: ../mail/evolution-mail.schemas.in.h:201
 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:202
 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:203
 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 +11656,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:204
 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:205
 msgid "Width of the message-list pane"
 msgstr "Viestiluettelopaneelin leveys"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "Width of the message-list pane."
 msgstr "Viestiluettelopaneelin leveys."
 
@@ -14148,6 +11672,12 @@ msgstr "Viestiluettelopaneelin leveys."
 msgid "Importing Elm data"
 msgstr "Tuodaan tietoja Elmistä"
 
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
+#: ../modules/mail/e-mail-shell-view.c:481
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
+msgid "Mail"
+msgstr "Sähköposti"
+
 #: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm-tuoja"
@@ -14156,37 +11686,42 @@ msgstr "Evolution Elm-tuoja"
 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
+#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../plugins/pst-import/pst-importer.c:310
 msgid "Destination folder:"
 msgstr "Kohdekansio:"
 
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../mail/importers/evolution-mbox-importer.c:87
+#: ../plugins/pst-import/pst-importer.c:303
+msgid "Select folder"
+msgstr "Valitse kansio"
+
+#: ../mail/importers/evolution-mbox-importer.c:87
+#: ../plugins/pst-import/pst-importer.c:303
 msgid "Select folder to import into"
 msgstr "Valitse kansio, johon tuodaan"
 
-#: ../mail/importers/evolution-mbox-importer.c:219
+#: ../mail/importers/evolution-mbox-importer.c:223
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:224
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Berkeley Mailbox-muotoisten kansioiden tuoja"
 
-#: ../mail/importers/mail-importer.c:147
+#: ../mail/importers/mail-importer.c:131
 msgid "Importing mailbox"
 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
+#: ../mail/importers/mail-importer.c:215
+#: ../plugins/pst-import/pst-importer.c:455
+#: ../plugins/pst-import/pst-importer.c:561 ../shell/e-shell-importer.c:526
 #, c-format
 msgid "Importing `%s'"
 msgstr "Tuodaan '%s'"
 
-#: ../mail/importers/mail-importer.c:371
+#: ../mail/importers/mail-importer.c:358
 #, c-format
 msgid "Scanning %s"
 msgstr "Tutkitaan %s"
@@ -14195,6 +11730,11 @@ msgstr "Tutkitaan %s"
 msgid "Importing Pine data"
 msgstr "Tuodaan tietoja Pinestä"
 
+#: ../mail/importers/pine-importer.c:383
+#: ../modules/addressbook/addressbook-config.c:1016
+msgid "Address Book"
+msgstr "Osoitekirja"
+
 #: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine-tuoja"
@@ -14203,118 +11743,32 @@ msgstr "Evolution Pine-tuoja"
 msgid "Import mail from Pine."
 msgstr "Tuo sähköpostit Pinestä."
 
-#: ../mail/mail-autofilter.c:72
+#: ../mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Viesti %s:lle"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:234 ../mail/mail-autofilter.c:273
 #, c-format
 msgid "Mail from %s"
 msgstr "Viesti %s:ltä"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:257
 #, c-format
 msgid "Subject is %s"
 msgstr "Aihe on %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:292
 #, 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
-#, c-format
-msgid "%d selected, "
-msgid_plural "%d selected, "
-msgstr[0] "%d valittu, "
-msgstr[1] "%d valittua, "
-
-#: ../mail/mail-component.c:554
-#, c-format
-msgid "%d deleted"
-msgid_plural "%d deleted"
-msgstr[0] "%d poistettu"
-msgstr[1] "%d poistettua"
-
-#: ../mail/mail-component.c:561
-#, c-format
-msgid "%d junk"
-msgid_plural "%d junk"
-msgstr[0] "%d roskaposti"
-msgstr[1] "%d roskapostia"
-
-#: ../mail/mail-component.c:564
-#, c-format
-msgid "%d draft"
-msgid_plural "%d drafts"
-msgstr[0] "%d luonnos"
-msgstr[1] "%d luonnosta"
-
-#: ../mail/mail-component.c:566
-#, c-format
-msgid "%d sent"
-msgid_plural "%d sent"
-msgstr[0] "%d lähetetty"
-msgstr[1] "%d lähetettyä"
-
-#: ../mail/mail-component.c:568
-#, 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
-#, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
-msgstr[0] "%d lukematon, "
-msgstr[1] "%d lukematonta, "
-
-#: ../mail/mail-component.c:575
-#, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "%d viesti"
-msgstr[1] "%d viestiä"
-
-#: ../mail/mail-component.c:927
-msgid "New Mail Message"
-msgstr "Uusi viesti"
-
-#: ../mail/mail-component.c:928
-msgctxt "New"
-msgid "_Mail Message"
-msgstr "_Sähköpostiviesti"
-
-#: ../mail/mail-component.c:929
-msgid "Compose a new mail message"
-msgstr "Kirjoita uusi viesti"
-
-#: ../mail/mail-component.c:935
-msgid "New Mail Folder"
-msgstr "Uusi sähköpostikansio"
-
-#: ../mail/mail-component.c:936
-msgctxt "New"
-msgid "Mail _Folder"
-msgstr "Sähköposti_kansio"
-
-#: ../mail/mail-component.c:937
-msgid "Create a new mail folder"
-msgstr "Luo uusi sähköpostikansio"
-
-#: ../mail/mail-component.c:1084
-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 "
+msgid " Ch_eck for Supported Types"
 msgstr "Tar_kista tuetut tyypit"
 
 #: ../mail/mail-config.glade.h:2
@@ -14357,506 +11811,416 @@ msgstr "<span weight=\"bold\">Viestien kirjoitus</span>"
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Asetukset</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Oletustoimintatapa</span>"
 
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Poista viesti</span>"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
 msgstr "<span weight=\"bold\">_Näytettävät viestin otsakkeet</span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels</span>"
 msgstr "<span weight=\"bold\">Merkinnät</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Kuvien lataus</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Viestin näyttö</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Viestin kirjasimet</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Viestin vastaanottajat</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Valinnaiset tiedot</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Asetukset</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Tulostettavat kirjasimet</span>"
 
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Proxy Settings</span>"
 msgstr "<span weight=\"bold\">Välipalvelinasetukset</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Vaadittavat tiedot</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Turvallisuus</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Lähetetyt viestit ja luonnokset</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Palvelimen asetukset</span>"
 
-#: ../mail/mail-config.glade.h:33
+#: ../mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\">Tunnistautumismenetelmä</span>"
 
-#: ../mail/mail-config.glade.h:35
-msgid "Account Management"
-msgstr "Tilinhallinta"
-
 #: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "Lisää uusi _allekirjoitus..."
 
 #: ../mail/mail-config.glade.h:37
-msgid "Add _Script"
-msgstr "Lisää _skripti"
-
-#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Allekirjoita _aina lähtevät viestit käytettäessä tätä sähköpostitiliä"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:38
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "_Salaa myös itselle, kun lähetetään salattu viesti"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:39
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Lähetä aina kopio (Cc) osoitteeseen:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:40
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Lähetä aina _piiloitettu kopio (Bcc) osoitteeseen:"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:41
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Luota salattaessa aina avaimiin avainrenkaassani"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:42
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Salaa _aina myös itselle lähetettäessä salattu viesti"
 
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.glade.h:43
 msgid "Always request rea_d receipt"
 msgstr "Pyydä aina vastaanoton _kuittausta"
 
-#: ../mail/mail-config.glade.h:46
-msgid "Automatically insert _emoticon images"
-msgstr "Lisää _hymiöt kuvina automaattisesti"
+#: ../mail/mail-config.glade.h:44
+msgid ""
+"Attachment\n"
+"Inline\n"
+"Quoted"
+msgstr ""
+"Liite\n"
+"Sisäkkäinen\n"
+"Lainattu"
 
 #: ../mail/mail-config.glade.h:47
-msgid "Baltic (ISO-8859-13)"
-msgstr "Balttilainen (ISO-8859-13)"
+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:48
-msgid "Baltic (ISO-8859-4)"
-msgstr "Balttilainen (ISO-8859-4)"
+#: ../mail/mail-config.glade.h:51
+msgid "Automatically insert _emoticon images"
+msgstr "Lisää _hymiöt kuvina automaattisesti"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:52
 msgid "C_haracter set:"
 msgstr "_Merkistö:"
 
-#: ../mail/mail-config.glade.h:50
-msgid "Ch_eck for Supported Types "
+#: ../mail/mail-config.glade.h:53
+#: ../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:54
 msgid "Check cu_stom headers for junk"
 msgstr "Käytä _omia roskpostiotsakkeita"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:55
 msgid "Check incoming _messages for junk"
 msgstr "Etsi roskapostia _saapuvasta viesteistä"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Tarkista _oikeinkirjoitus kirjoitettaessa"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:57
 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:58
 msgid "Cle_ar"
 msgstr "_Tyhjennä"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:59
 msgid "Clea_r"
 msgstr "_Tyhjennä"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:60
 msgid "Color for _misspelled words:"
 msgstr "_Väärin kirjoitettujen sanojen väri:"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:61
 msgid "Confirm _when expunging a folder"
 msgstr "_Varmista viestien lopullinen siivous kansiosta"
 
-#: ../mail/mail-config.glade.h:59
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"Onneksi olkoon, sähköpostiasetuksesi ovat nyt valmiit.\n"
-"\n"
-"Voit nyt lähettää ja vastaanottaa sähköpostia\n"
-"Evolutionin avulla.\n"
-"\n"
-"Tallenna asetuksesi napsauttamalla painiketta \"Toteuta\""
-
-#: ../mail/mail-config.glade.h:65
-msgid "De_fault"
-msgstr "_Oletustili"
-
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:62
 msgid "Default character e_ncoding:"
 msgstr "Merkistön _oletuskoodaus:"
 
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.glade.h:64
 msgid "Delete junk messages on e_xit"
 msgstr "Poista roskapostit _suljettaessa"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:66
 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:67
 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:68
 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
-msgid "Done"
-msgstr "Valmis"
-
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:69
 msgid "Drafts _Folder:"
 msgstr "_Luonnosten kansio:"
 
-#: ../mail/mail-config.glade.h:76
-msgid "Email Accounts"
-msgstr "Sähköpostitilit"
-
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:70
 msgid "Email _Address:"
 msgstr "Sähköposti_osoite:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:71
 msgid "Empty trash folders on e_xit"
 msgstr "Tyhj_ennä roskakorit lopetettaessa"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:72
 msgid "Enable Magic S_pacebar"
 msgstr "Käytä maagista _välilyöntiä"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:73
 msgid "Enable Sea_rch Folders"
 msgstr "Käytä _hakunäkymiä"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:75
 msgid "Encry_ption certificate:"
 msgstr "_Salausvarmenne:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:76
 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:77
 msgid "Fi_xed-width:"
 msgstr "_Tasalevyinen:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:78
 msgid "Fix_ed width Font:"
 msgstr "_Tasalevyinen kirjasin:"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:79
 msgid "Font Properties"
 msgstr "Kirjasimen ominaisuudet"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:80
 msgid "Format messages in _HTML"
 msgstr "Muotoile viestit HTML:nä"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:81
 msgid "Full Nam_e:"
 msgstr "_Koko nimi:"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:83
 msgid "HTML Messages"
 msgstr "HTML-viestit"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:84
 msgid "H_TTP Proxy:"
 msgstr "H_TTP-välipalvelin:"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:85
 msgid "Headers"
 msgstr "Otsakkeet"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:86
 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:97
-msgid "Inline (Outlook style)"
-msgstr "Sisäkkäinen alkuperäisviesti (Outlookin tapaan)"
-
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:89
 msgid "KB"
 msgstr "kt"
 
-#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:90 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Merkinnät"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:91
 msgid "Languages Table"
 msgstr "Kielitaulukko"
 
-#: ../mail/mail-config.glade.h:102
-msgid "Mail Configuration"
-msgstr "Sähköpostiasetukset"
-
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:92
 msgid "Mail Headers Table"
 msgstr "Sähköposti otsikkotaulu"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:93 ../modules/mail/e-mail-shell-backend.c:213
+msgid "Mail Preferences"
+msgstr "Sähköpostin asetukset"
+
+#: ../mail/mail-config.glade.h:94
 msgid "Mailbox location"
 msgstr "Postilaatikon sijainti"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:95
 msgid "Message Composer"
 msgstr "Viestin muokkain"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:96
 msgid "No _Proxy for:"
 msgstr "Ei _välipalvelinta seuraaville:"
 
-#: ../mail/mail-config.glade.h:108
-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:97
 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:98
 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:99
 msgid "Or_ganization:"
 msgstr "Organi_saatio:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:100
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _avaimen ID:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:101
 msgid "Pass_word:"
 msgstr "_Salasana:"
 
-#: ../mail/mail-config.glade.h:115
-msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"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."
-
-#: ../mail/mail-config.glade.h:117
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Syötä tiedot siitä, kuinka lähetät sähköpostia. jos et ole varma "
-"asetuksista, kysy järjestelmäsi ylläpitäjältä tai Internet-"
-"palveluntarjoajaltasi."
-
-#: ../mail/mail-config.glade.h:118
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"Syötä nimesi ja sähköpostiosoitteesi alla oleviin kenttiin. \"Valinnaiset\" "
-"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:103
 msgid "Port:"
 msgstr "Portti:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:104
 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:105
 msgid "Re_member password"
 msgstr "Muista _salasana"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:106
 msgid "Re_ply-To:"
 msgstr "_Vastausosoite:"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:108
 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:109
 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:110
 msgid "S_elect..."
 msgstr "_Valitse..."
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:111
 msgid "S_end message receipts:"
 msgstr "Läh_etä viestin kuittaus:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:112
 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
+#: ../mail/mail-config.glade.h:114
 msgid "Select HTML fixed width font"
 msgstr "Valitse HTML-viestin tasalevyinen kirjasin"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:115
 msgid "Select HTML fixed width font for printing"
 msgstr "Valitse HTML-viestin tasalevyinen kirjasin tulostusta varten"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:116
 msgid "Select HTML variable width font"
 msgstr "Valitse HTML-viestin vaihtuvalevyinen kirjasin"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:117
 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:118
 msgid "Sending Mail"
 msgstr "Lähtevä posti"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:119
 msgid "Sent _Messages Folder:"
 msgstr "Lähetettyjen _viestien kansio:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:120
 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:121
+msgid "Server _Type:"
+msgstr "_Palvelintyyppi: "
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:122
 msgid "Sig_ning certificate:"
 msgstr "_Allekirjoitusvarmenne:"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:123
 msgid "Signat_ure:"
 msgstr "_Allekirjoitus:"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:124
 msgid "Signatures"
 msgstr "Allekirjoitukset"
 
-#: ../mail/mail-config.glade.h:147
-msgid "Signatures Table"
-msgstr "Allekirjoitusten taulu"
-
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:125
 msgid "Spell Checking"
 msgstr "Oikoluku"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:126
 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:127
+msgid "T_ype:"
 msgstr "_Tyyppi:"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:128
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14864,7 +12228,7 @@ 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:129
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14874,7 +12238,7 @@ msgstr ""
 "Valitsemasi nimi on käytössä ainoastaan tässä listassa\n"
 "näytettäessä."
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:132
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14882,156 +12246,152 @@ 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:134
 msgid "Us_ername:"
 msgstr "Käyttäjät_unnus:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:135
 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:136 ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/google-account-setup/google-source.c:700
+#: ../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:137
 msgid "V_ariable-width:"
 msgstr "_Vaihtuva leveys:"
 
-#: ../mail/mail-config.glade.h:161
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin. "
-msgstr ""
-"Tervetuloa Evolutionin sähköpostitilin määrittelyn apulaiseen.\n"
-"\n"
-"Valitse \"Eteenpäin\" aloittaaksesi."
-
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:138
 msgid "_Add Signature"
 msgstr "_Lisää allekirjoitus:"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:139
 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:140
 msgid "_Default junk plugin:"
 msgstr "_Roskapostin oletuslisäosa"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:141
 msgid "_Direct connection to the Internet"
 msgstr "_Suora yhteys Internettiin"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:142
 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:143
 msgid "_Forward style:"
 msgstr "_Välitä tyyli:"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:144
 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:145
 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:146
 msgid "_Lookup in local address book only"
 msgstr "_Etsi vain paikallisesta osoitekirjasta"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:147
 msgid "_Make this my default account"
 msgstr "Tee tästä _oletustilini"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:148
 msgid "_Manual proxy configuration:"
 msgstr "_Välipalvelimen käsin asettaminen:"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:149
 msgid "_Mark messages as read after"
 msgstr "_Merkitse viestit luetuiksi kun on kulunut"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:151
 msgid "_Never load images from the Internet"
 msgstr "_�lä koskaan lataa kuvia verkosta"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:152
 msgid "_Path:"
 msgstr "_Polku:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:153
 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:154
 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:155
 msgid "_Reply style:"
 msgstr "_Vastaustyyli:"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:156
 msgid "_Script:"
 msgstr "_Skripti:"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:157
 msgid "_Secure HTTP Proxy:"
 msgstr "_HTTPS-välipalvelin:"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:158
 msgid "_Select..."
 msgstr "_Valitse..."
 
+#: ../mail/mail-config.glade.h:159
+#: ../modules/addressbook/ldap-config.glade.h:39
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+msgid "_Server:"
+msgstr "_Palvelin: "
+
 #. 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:161
 msgid "_Show image animations"
 msgstr "Näytä kuvien animaatiot"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:162
 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:163
 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:164
 msgid "_Use Secure Connection:"
 msgstr "_Käytä salattua yhteyttä:"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:165
 msgid "_Use system defaults"
 msgstr "Käytä järjestelmän olet_uksia"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:166
 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:169
 msgid "addresses"
 msgstr "osoitteet"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.glade.h:170
 msgid "color"
 msgstr " väri"
 
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.glade.h:171
 msgid "description"
 msgstr "kuvaus"
 
+#: ../mail/mail-config.glade.h:172
+msgid "seconds"
+msgstr "sekuntia"
+
 #: ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr " "
@@ -15061,50 +12421,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,42 +12456,42 @@ 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"
 
-#: ../mail/mail-folder-cache.c:834
+#: ../mail/mail-folder-cache.c:872
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingataan %s"
 
-#: ../mail/mail-ops.c:106
+#: ../mail/mail-ops.c:110
 msgid "Filtering Selected Messages"
 msgstr "Suodatetaan valittuja viestejä"
 
-#: ../mail/mail-ops.c:265
+#: ../mail/mail-ops.c:269
 msgid "Fetching Mail"
 msgstr "Noudetaan viestejä"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:561
+#: ../mail/mail-ops.c:566
 #, 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:578 ../mail/mail-ops.c:605
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15156,123 +12500,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:622
 #, 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:730 ../mail/mail-ops.c:811
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
-#: ../mail/mail-ops.c:735
+#: ../mail/mail-ops.c:740
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Lähetetään viestiä %d / %d"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:767
 #, 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:769 ../mail/mail-send-recv.c:717
 msgid "Canceled."
 msgstr "Peruttu."
 
-#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:771 ../mail/mail-send-recv.c:719
 msgid "Complete."
 msgstr "Valmis."
 
-#: ../mail/mail-ops.c:872
+#: ../mail/mail-ops.c:883
 msgid "Saving message to folder"
 msgstr "Tallennetaan viestiä kansioon"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:960
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Siirretään viestejä kohteeseen %s"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:960
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopioidaan viestejä kohteeseen %s"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1177
 msgid "Forwarded messages"
 msgstr "Välitetyt viestit"
 
-#: ../mail/mail-ops.c:1208
+#: ../mail/mail-ops.c:1218
 #, c-format
 msgid "Opening folder %s"
 msgstr "Avataan kansiota %s"
 
-#: ../mail/mail-ops.c:1273
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Noudetaan kansion %s levytilatietoja"
 
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1356
 #, c-format
 msgid "Opening store %s"
 msgstr "Avataan tallennustilaa %s"
 
-#: ../mail/mail-ops.c:1413
+#: ../mail/mail-ops.c:1427
 #, c-format
 msgid "Removing folder %s"
 msgstr "Poistetaan kansiota %s"
 
-#: ../mail/mail-ops.c:1531
+#: ../mail/mail-ops.c:1545
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Tallennetaan kansiota %s"
 
-#: ../mail/mail-ops.c:1594
+#: ../mail/mail-ops.c:1608
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Siivotaan ja tallennetaan tiliä '%s'"
 
-#: ../mail/mail-ops.c:1595
+#: ../mail/mail-ops.c:1609
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Tallennetaan tiliä %s"
 
-#: ../mail/mail-ops.c:1649
+#: ../mail/mail-ops.c:1663
 msgid "Refreshing folder"
 msgstr "Virkistetään kansiota"
 
-#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
+#: ../mail/mail-ops.c:1703 ../mail/mail-ops.c:1753
 msgid "Expunging folder"
 msgstr "Poistetaan poistettuja kansiosta"
 
-#: ../mail/mail-ops.c:1736
+#: ../mail/mail-ops.c:1750
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tyhjennetään roskakoria '%s'"
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1751
 msgid "Local Folders"
 msgstr "Paikalliset kansiot"
 
-#: ../mail/mail-ops.c:1818
+#: ../mail/mail-ops.c:1832
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Noudetaan viestiä %s"
 
-#: ../mail/mail-ops.c:1925
+#: ../mail/mail-ops.c:1941
 #, 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:2026
 #, 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:2106
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15281,11 +12625,11 @@ msgstr ""
 "Virhe tallennettaessa viestejä: %s:\n"
 "%s"
 
-#: ../mail/mail-ops.c:2160
+#: ../mail/mail-ops.c:2178
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
+#: ../mail/mail-ops.c:2196 ../mail/mail-ops.c:2204
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15294,51 +12638,51 @@ msgstr ""
 "Tulostiedostoa ei voi luoda: %s:\n"
 "%s"
 
-#: ../mail/mail-ops.c:2201
+#: ../mail/mail-ops.c:2219
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Tietoa ei voi kirjoittaa: %s"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2364
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Yhteyttä %s katkaistaan"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2364
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Otetaan uudestaan yhteyttä kohteeseen %s"
 
-#: ../mail/mail-ops.c:2443
+#: ../mail/mail-ops.c:2460
 #, 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:2546
 msgid "Checking Service"
 msgstr "Tarkistetaan palvelua"
 
-#: ../mail/mail-send-recv.c:181
+#: ../mail/mail-send-recv.c:186
 msgid "Canceling..."
 msgstr "Perutaan..."
 
-#: ../mail/mail-send-recv.c:383
+#: ../mail/mail-send-recv.c:392
 msgid "Send & Receive Mail"
 msgstr "Lähetä ja vastaanota postia"
 
-#: ../mail/mail-send-recv.c:394
+#: ../mail/mail-send-recv.c:405
 msgid "Cancel _All"
 msgstr "_Peruuta kaikki"
 
-#: ../mail/mail-send-recv.c:503
+#: ../mail/mail-send-recv.c:514
 msgid "Updating..."
 msgstr "Päivitetään..."
 
-#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:514 ../mail/mail-send-recv.c:591
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:830
 #, c-format
 msgid "Checking for new mail"
 msgstr "Tarkistetaan onko uusia viestejä"
@@ -15353,7 +12697,7 @@ msgid "Enter Passphrase"
 msgstr "Anna salasana"
 
 #: ../mail/mail-session.c:217
-#: ../plugins/exchange-operations/exchange-config-listener.c:708
+#: ../plugins/exchange-operations/exchange-config-listener.c:705
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Anna salasana tunnukselle %s"
@@ -15366,62 +12710,50 @@ msgstr "Anna salasana"
 msgid "User canceled operation."
 msgstr "Käyttäjä perui toimenpiteen."
 
-#: ../mail/mail-signature-editor.c:201
-msgid "_Save and Close"
-msgstr "_Tallenna ja sulje"
-
-#: ../mail/mail-signature-editor.c:355
-msgid "Edit Signature"
-msgstr "Muokkaa allekirjoitusta"
-
-#: ../mail/mail-signature-editor.c:370
-msgid "_Signature Name:"
-msgstr "Allekirjoituk_sen nimi:"
-
-#: ../mail/mail-tools.c:120
+#: ../mail/mail-tools.c:122
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Saapuvien kansiota '%s' ei voi luoda: %s"
 
-#: ../mail/mail-tools.c:150
+#: ../mail/mail-tools.c:152
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Yritettiin 'movemail':ia lähteelle '%s', joka ei ole tyyppiä mbox"
 
-#: ../mail/mail-tools.c:256
+#: ../mail/mail-tools.c:258
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Välitetty viesti - %s"
 
-#: ../mail/mail-tools.c:258
+#: ../mail/mail-tools.c:260
 msgid "Forwarded message"
 msgstr "Välitetty viesti"
 
-#: ../mail/mail-tools.c:298
+#: ../mail/mail-tools.c:300
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Virheellinen kansio: ' %s'"
 
-#: ../mail/mail-vfolder.c:89
+#: ../mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Määritellään hakunäkymää: %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:237
 #, 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:244
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Päivitetään hakunäkymää \"%s\""
 
-#: ../mail/mail-vfolder.c:1086
+#: ../mail/mail-vfolder.c:1085
 msgid "Edit Search Folder"
 msgstr "Muokkaa hakunäkymää"
 
-#: ../mail/mail-vfolder.c:1175
+#: ../mail/mail-vfolder.c:1183
 msgid "New Search Folder"
 msgstr "Uusi hakunäkymä"
 
@@ -15737,6 +13069,10 @@ msgstr "�lä välitä"
 msgid "Invalid authentication"
 msgstr "Virheellinen tunnistautuminen"
 
+#: ../mail/mail.error.xml.h:70
+msgid "Mail Deletion Failed"
+msgstr "Sähköpostin poisto epäonnistui"
+
 #: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "Sähköpostin suodattimet päivitetty automaattisesti."
@@ -15850,7 +13186,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 ""
@@ -15984,6 +13320,10 @@ msgstr ""
 "alkuperäisestä kansiosta, ei vain hakutuloksista.\n"
 "Haluatko varmasti poistaa viestin?"
 
+#: ../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/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
 msgstr "Et ole täyttänyt kaikkia tarvittavia kohtia."
@@ -16031,6 +13371,10 @@ msgstr "_Hylkää muutokset"
 msgid "_Do not Synchronize"
 msgstr "�_lä synkronoi"
 
+#: ../mail/mail.error.xml.h:138
+msgid "_Empty Trash"
+msgstr "_Tyhjennä roskakori"
+
 #: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr "_Poista pysyvästi"
@@ -16039,79 +13383,82 @@ msgstr "_Poista pysyvästi"
 msgid "_Open Messages"
 msgstr "_Avaa viestit"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1064
 msgid "Unseen"
 msgstr "Nähty"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1065
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1066
 msgid "Answered"
 msgstr "Vastattu"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1067
 msgid "Forwarded"
 msgstr "Välitetty"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1068
 msgid "Multiple Unseen Messages"
 msgstr "Useita lukemattomia viestejä"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1069
 msgid "Multiple Messages"
 msgstr "Useita viestejä"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1073
 msgid "Lowest"
 msgstr "Matalin"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1074
 msgid "Lower"
 msgstr "Matalampi"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1078
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1079
 msgid "Highest"
 msgstr "Korkein"
 
-#: ../mail/message-list.c:1656 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1688 ../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:1695 ../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:1704
 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:1716
 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:1724
 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:1726
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
+#: ../mail/message-list.c:2466 ../shell/e-shell-view.c:534
+msgid "Shell Backend"
+msgstr "Tulkin taustajärjestelmä"
+
 #. 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:4054 ../mail/message-list.c:4528
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
-#: ../mail/message-list.c:4289
+#: ../mail/message-list.c:4365
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -16119,7 +13466,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:4367
+msgid ""
+"There are only hidden messages in this folder. Use View->Show Hidden "
+"Messages to show them."
+msgstr ""
+
+#: ../mail/message-list.c:4369
 msgid "There are no messages in this folder."
 msgstr "Tässä kansiossa ei ole viestejä."
 
@@ -16149,6 +13502,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,77 +13510,2235 @@ 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
 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
-msgid "Reply"
-msgstr "Vastaa"
-
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:63
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
-#: ../mail/message-tag-followup.c:65
+#: ../mail/message-tag-followup.c:64
 msgid "Review"
 msgstr "Arvio"
 
 #: ../mail/searchtypes.xml.h:1
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
 msgid "Body contains"
 msgstr "Runko sisältää"
 
 #: ../mail/searchtypes.xml.h:2
+#: ../modules/mail/e-mail-shell-view-actions.c:1450
 msgid "Message contains"
 msgstr "Viesti sisältää"
 
 #: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1457
 msgid "Recipients contain"
 msgstr "Vastaanottajat sisältää"
 
 #: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1464
 msgid "Sender contains"
 msgstr "Lähettäjä sisältää"
 
 #: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1471
 msgid "Subject contains"
 msgstr "Otsikko sisältää"
 
 #: ../mail/searchtypes.xml.h:6
-msgid "Subject or Recipients contains"
-msgstr "Aihe tai vastaanottaja sisältää"
+msgid "Subject or Addresses contains"
+msgstr "Aihe tai lähettäjät sisältävät"
+
+#: ../modules/addressbook/addressbook-config.c:212
+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."
+
+#: ../modules/addressbook/addressbook-config.c:214
+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."
+
+#: ../modules/addressbook/addressbook-config.c:216
+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."
+
+#: ../modules/addressbook/addressbook-config.c:341
+msgid "Base"
+msgstr "Kanta"
+
+#: ../modules/addressbook/addressbook-config.c:643
+msgid "Copy _book content locally for offline operation"
+msgstr "Kopioi _kirjan sisältö yhteydettömään käyttöön"
+
+#: ../modules/addressbook/addressbook-config.c:754
+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ää."
+
+#: ../modules/addressbook/addressbook-config.c:832
+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."
+
+#: ../modules/addressbook/addressbook-config.c:911
+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."
+
+#: ../modules/addressbook/addressbook-config.c:1020
+msgid "Server Information"
+msgstr "Palvelimen tiedot"
+
+#: ../modules/addressbook/addressbook-config.c:1022
+msgid "Authentication"
+msgstr "Kirjautuminen"
+
+#: ../modules/addressbook/addressbook-config.c:1025
+#: ../modules/addressbook/ldap-config.glade.h:15
+#: ../smime/gui/smime-ui.glade.h:20
+msgid "Details"
+msgstr "Yksityiskohtaiset"
+
+#: ../modules/addressbook/addressbook-config.c:1026
+msgid "Searching"
+msgstr "Etsitään"
+
+#: ../modules/addressbook/addressbook-config.c:1028
+msgid "Downloading"
+msgstr "Noudetaan"
+
+#: ../modules/addressbook/addressbook-config.c:1238
+#: ../modules/addressbook/ldap-config.glade.h:9
+msgid "Address Book Properties"
+msgstr "Osoitekirjan ominaisuudet"
+
+#: ../modules/addressbook/addressbook-config.c:1240
+msgid "New Address Book"
+msgstr "Uusi osoitekirja"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
+msgid "Autocomplete length"
+msgstr "Automaattisen täydennyksen pituus"
 
-#: ../mail/searchtypes.xml.h:7
-msgid "Subject or Sender contains"
-msgstr "Aihe tai lähettäjä sisältää"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
+msgid "Contact layout style"
+msgstr "Yhteystiedon asettelutyyli"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
+msgid "Contact preview pane position (horizontal)"
+msgstr "Yhteystietojen esikatselupaneelin sijainti (vaaka)"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
+msgid "Contact preview pane position (vertical)"
+msgstr "Yhteystietojen esikatselupaneelin sijainti (pysty)"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+msgid "EFolderList XML for the list of completion URIs"
+msgstr "EFolderList XML listalle täydennettävistä URI:sta"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+msgid "EFolderList XML for the list of completion URIs."
+msgstr "EFolderList XML listalle täydennettävistä URI:sta."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+msgid "Position of the contact preview pane when oriented vertically."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Show autocompleted name with an address"
+msgstr "Näytä automaattitäydennetyt nimet osoitteen kanssa"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+msgid "Show preview pane"
+msgstr "Näytä Esikatselupaneeli"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. \"0\" (Classic View) places the preview pane below the "
+"contact list. \"1\" (Vertical View) places the preview pane next to the "
+"contact list."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr ""
+"Kuinka monta merkkiä tulee kirjoittaa ennen kuin evolution yrittää "
+"automaattista täydennystä"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+msgid "URI for the folder last used in the select names dialog"
+msgstr "Viimeksi nimien valinta-ikkunassa valitun kansion URI"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+msgid "URI for the folder last used in the select names dialog."
+msgstr "Viimeksi nimien valinta-ikkunassa valitun kansion URI"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+"Pakotetaanko sähköpostiosoitteen näyttäminen nimen lisäksi automaattisesti "
+"täydennetyn yhteystiedon kohdalla kentässä."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+msgid "Whether to show the preview pane."
+msgstr "Näytetäänkö esikatselupaneeli."
+
+#: ../modules/addressbook/autocompletion-config.c:153
+msgid "Date/Time Format"
+msgstr "Päiväys/aika -muotoilu"
+
+#: ../modules/addressbook/autocompletion-config.c:159
+#: ../modules/mail/em-mailer-prefs.c:1141
+msgid "Table column:"
+msgstr "Taulun sarake:"
+
+#: ../modules/addressbook/autocompletion-config.c:162
+msgid "Autocompletion"
+msgstr "Automaattinen täydennys"
+
+#: ../modules/addressbook/autocompletion-config.c:165
+msgid "Always _show address of the autocompleted contact"
+msgstr "Näytä _aina automaattitäydennetyn yhteystiedon osoite"
+
+#. Create the LDAP source group
+#: ../modules/addressbook/e-book-shell-backend.c:190
+#: ../modules/addressbook/e-book-shell-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "LDAP-palvelimilla"
+
+#: ../modules/addressbook/e-book-shell-backend.c:340
+msgctxt "New"
+msgid "_Contact"
+msgstr "_Yhteystieto"
+
+#: ../modules/addressbook/e-book-shell-backend.c:342
+#: ../modules/addressbook/e-book-shell-view-actions.c:703
+msgid "Create a new contact"
+msgstr "Luo uusi yhteystieto"
+
+#: ../modules/addressbook/e-book-shell-backend.c:347
+msgid "Contact _List"
+msgstr "Yhteystieto_luettelo"
+
+#: ../modules/addressbook/e-book-shell-backend.c:349
+#: ../modules/addressbook/e-book-shell-view-actions.c:710
+msgid "Create a new contact list"
+msgstr "Luo uusi yhteystietoluettelo"
+
+#: ../modules/addressbook/e-book-shell-backend.c:357
+msgctxt "New"
+msgid "Address _Book"
+msgstr "_Osoitekirja"
+
+#: ../modules/addressbook/e-book-shell-backend.c:359
+#: ../modules/addressbook/e-book-shell-view-actions.c:619
+msgid "Create a new address book"
+msgstr "Luo uusi osoitekirja"
+
+#. Create the contacts group
+#: ../modules/addressbook/e-book-shell-backend.c:376
+#: ../modules/addressbook/e-book-shell-view.c:378
+#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:579
+msgid "Contacts"
+msgstr "Yhteystiedot"
+
+#: ../modules/addressbook/e-book-shell-backend.c:595
+#: ../modules/calendar/e-cal-shell-backend.c:758
+#: ../modules/calendar/e-memo-shell-backend.c:582
+#: ../modules/calendar/e-task-shell-backend.c:592
+msgid "Source List"
+msgstr "Lähdeluettelo"
+
+#: ../modules/addressbook/e-book-shell-backend.c:596
+msgid "The registry of address books"
+msgstr "Luettelo osoitekirjoista"
+
+#: ../modules/addressbook/e-book-shell-content.c:313
+msgid "Current View"
+msgstr "Nykyinen näkymä"
+
+#: ../modules/addressbook/e-book-shell-content.c:314
+msgid "The currently selected address book view"
+msgstr ""
+
+#: ../modules/addressbook/e-book-shell-content.c:323
+msgid "Previewed Contact"
+msgstr "Esikatseltu yhteystieto"
+
+#: ../modules/addressbook/e-book-shell-content.c:324
+msgid "The contact being shown in the preview pane"
+msgstr "Yhteystietojen esikatselupaneelissa näytettävä yhteystieto"
+
+#: ../modules/addressbook/e-book-shell-content.c:333
+#: ../modules/calendar/e-memo-shell-content.c:607
+#: ../modules/calendar/e-task-shell-content.c:630
+#: ../modules/mail/e-mail-shell-content.c:716
+msgid "Preview is Visible"
+msgstr "Esikatselu on näkyvissä"
+
+#: ../modules/addressbook/e-book-shell-content.c:334
+#: ../modules/calendar/e-memo-shell-content.c:608
+#: ../modules/calendar/e-task-shell-content.c:631
+#: ../modules/mail/e-mail-shell-content.c:717
+msgid "Whether the preview pane is visible"
+msgstr "Näytetäänkö esikatselupaneeli"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:76
+#: ../modules/calendar/e-cal-shell-migrate.c:123
+#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../modules/mail/e-mail-shell-migrate.c:1105
+msgid "Migrating..."
+msgstr "Siirretään..."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:128
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../modules/mail/e-mail-shell-migrate.c:1178
+#, c-format
+msgid "Migrating '%s':"
+msgstr "Siirretään  \"%s\":"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:645
+msgid "LDAP Servers"
+msgstr "LDAP-palvelimet"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:765
+msgid "Autocompletion Settings"
+msgstr "Automaattisen täydennyksen asetukset"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1152
+msgid ""
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolutionin yhteystietojen kansioiden sijainti ja rakenne on muuttunut "
+"Evolution 1.x:n jälkeen.\n"
+"\n"
+"Odota kärsivällisesti, kun Evolution siirtää kansioitasi..."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1166
+msgid ""
+"The format of mailing list contacts has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Sähköpostilistojen yhteystietojen muoto on muuttunut.\n"
+"\n"
+"Odota kärsivällisesti, kun Evolution muuntaa kansioitasi..."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1175
+msgid ""
+"The way Evolution stores some phone numbers has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Muutamien puhelinnumeroiden tallennustapa on muuttunut.\n"
+"\n"
+"Odota kärsivällisesti kun Evolution muuntaa kansioitasi..."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1185
+msgid ""
+"Evolution's Palm Sync changelog and map files have changed.\n"
+"\n"
+"Please be patient while Evolution migrates your Pilot Sync data..."
+msgstr ""
+"Evolutionin Palm synkronoinnin muutosloki ja karttatiedostot ovat "
+"muuttuneet.\n"
+"\n"
+"Odota kärsivällisesti kun Evolution muuntaa Pilotin synkronointitietojasi..."
+
+#: ../modules/addressbook/e-book-shell-sidebar.c:173
+#: ../modules/calendar/e-cal-shell-sidebar.c:561
+#: ../modules/calendar/e-memo-shell-sidebar.c:528
+#: ../modules/calendar/e-task-shell-sidebar.c:526
+msgid "Source Selector Widget"
+msgstr "Lähteen valintaikkuna"
+
+#: ../modules/addressbook/e-book-shell-sidebar.c:174
+msgid "This widget displays groups of address books"
+msgstr "Tämä elementti näyttä osoitekirjaryhmiä"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:596
+msgid "Co_py All Contacts To..."
+msgstr "Ko_pioi kaikki yhteystiedot..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:598
+msgid "Copy the contacts of the selected address book to another"
+msgstr "Kopioi valitun osoitekirjan sisältö toiseen osoitekirjaan"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:603
+msgid "Del_ete Address Book"
+msgstr "_Poista osoitekirja"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:605
+msgid "Delete the selected address book"
+msgstr "Poista valittu osoitekirja"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:610
+msgid "Mo_ve All Contacts To..."
+msgstr "Sii_rrä kaikki yhteystiedot..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:612
+msgid "Move the contacts of the selected address book to another"
+msgstr "Siirrä valitun osoitekirjan sisältö toiseen osoitekirjaan"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:617
+msgid "_New Address Book"
+msgstr "_Uusi osoitekirja"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:624
+msgid "Address _Book Properties"
+msgstr "Osoite_kirjan ominaisuudet"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:626
+msgid "Show properties of the selected address book"
+msgstr "Näytä valitun osoitekirjan ominaisuudet"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:631
+#: ../modules/calendar/e-cal-shell-view-actions.c:1236
+#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-task-shell-view-actions.c:756
+#: ../modules/mail/e-mail-shell-view-actions.c:1123
+msgid "_Rename..."
+msgstr "_Nimeä uudestaan..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:633
+msgid "Rename the selected address book"
+msgstr "_Nimeä valittu osoitekirja uudestaan"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:638
+msgid "S_ave Address Book as vCard"
+msgstr "T_allenna osoitekirja VCardina"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:640
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "Tallenna yhteystiedot valitussa osoitekirjassa VCardina"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:647
+msgid "Stop loading"
+msgstr "Keskeytä lataaminen"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:654
+#: ../modules/calendar/e-cal-shell-view-actions.c:1252
+msgid "Copy the selection"
+msgstr "Kopioi valinta"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:661
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
+msgid "Cut the selection"
+msgstr "Leikkaa valinta"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:668
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+msgid "Paste the clipboard"
+msgstr "Liitä leikepöytä"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
+msgid "_Copy Contact To..."
+msgstr "_Kopioi yhteystieto..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:675
+msgid "Copy selected contacts to another address book"
+msgstr "Kopioi valitut yhteystiedot toiseen osoitekirjaan"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
+msgid "_Delete Contact"
+msgstr "_Poista yhteystieto"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:682
+msgid "Delete selected contacts"
+msgstr "Poista valitut yhteystiedot"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
+msgid "_Forward Contact..."
+msgstr "_Välitä yhteystieto..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:689
+msgid "Send selected contacts to another person"
+msgstr "Lähetä valitut yhteystiedot toiselle henkilölle"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
+msgid "_Move Contact To..."
+msgstr "_Siirry yhteystieto..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:696
+msgid "Move selected contacts to another address book"
+msgstr "Siirrä valitut yhteystiedot toiseen osoitekirjaan"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
+msgid "_New Contact..."
+msgstr "_Uusi yhteystieto..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
+msgid "New Contact _List..."
+msgstr "Uusi yhteystieto_luettelo..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
+msgid "_Open"
+msgstr "_Avaa"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:717
+msgid "View the current contact"
+msgstr "Katsele nykyistä yhteystietoa"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:724
+msgid "Save selected contacts as a vCard"
+msgstr "Tallenna valitut yhteystiedot VCardina"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:731
+msgid "Select all contacts"
+msgstr "Valitse kaikki yhteystiedot"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
+msgid "_Send Message to Contact..."
+msgstr "Lähetä _viesti henkilölle..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:738
+msgid "Send a message to the selected contacts"
+msgstr "Lähetä viesti valituille  henkilöille"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:745
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#: ../modules/calendar/e-task-shell-view-actions.c:821
+msgid "_Actions"
+msgstr "T_oiminnot"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:752
+#: ../modules/calendar/e-memo-shell-view-actions.c:675
+#: ../modules/calendar/e-task-shell-view-actions.c:828
+#: ../modules/mail/e-mail-shell-view-actions.c:1265
+msgid "_Preview"
+msgstr "_Esikatselu"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:761
+#: ../modules/calendar/e-memo-shell-view-actions.c:610
+#: ../modules/calendar/e-task-shell-view-actions.c:735
+msgid "_Delete"
+msgstr "_Poista"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:765
+msgid "_Properties"
+msgstr "_Ominaisuudet..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:773
+msgid "_Save as vCard..."
+msgstr "_Tallenna vCard-muodossa..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
+msgid "Contact _Preview"
+msgstr "Yhteystiedon _esikatselu"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:823
+msgid "Show contact preview window"
+msgstr "Näytä yhteystiedon esikatseluruutu"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
+#: ../modules/calendar/e-memo-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/mail/e-mail-shell-view-actions.c:1360
+msgid "_Classic View"
+msgstr "_Perinteinen näkymä"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
+msgid "Show contact preview below the contact list"
+msgstr "Näytä yhteystiedon esikatselu yhteystietoluettelon alla"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+#: ../modules/calendar/e-memo-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/mail/e-mail-shell-view-actions.c:1367
+msgid "_Vertical View"
+msgstr "_Pystysuuntainen näkymä"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:851
+msgid "Show contact preview alongside the contact list"
+msgstr "Näytä yhteystiedon esikatselu yhteystietoluettelon vieressä"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:859
+#: ../modules/calendar/e-cal-shell-view-actions.c:1549
+#: ../modules/calendar/e-memo-shell-view-actions.c:778
+#: ../modules/calendar/e-task-shell-view-actions.c:950
+msgid "Any Category"
+msgstr "Mikä tahansa luokka"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:866
+#: ../modules/calendar/e-cal-shell-view-actions.c:1563
+#: ../modules/calendar/e-memo-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:985
+msgid "Unmatched"
+msgstr "Täsmäämättömät"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:902
+msgid "Print selected contacts"
+msgstr "Tulosta valitut yhteystiedot"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:909
+msgid "Preview the contacts to be printed"
+msgstr "Esikatsele tulostettavia yhteystietoja"
+
+#: ../modules/addressbook/e-book-shell-view.c:322
+msgid "_Forward Contacts"
+msgstr "_Välitä yhteystiedot"
+
+#: ../modules/addressbook/e-book-shell-view.c:324
+msgid "_Forward Contact"
+msgstr "_Välitä yhteystieto"
+
+#: ../modules/addressbook/e-book-shell-view.c:355
+msgid "_Send Message to Contacts"
+msgstr "Lähetä _viesti henkilöille"
+
+#: ../modules/addressbook/e-book-shell-view.c:357
+msgid "_Send Message to List"
+msgstr "Lähetä _viesti listalle"
+
+#: ../modules/addressbook/e-book-shell-view.c:359
+msgid "_Send Message to Contact"
+msgstr "Lähetä _viesti henkilölle"
+
+#: ../modules/addressbook/eab-composer-util.c:139
+msgid "Multiple vCards"
+msgstr "Useita vCard-tiedostoja"
+
+#: ../modules/addressbook/eab-composer-util.c:147
+#, c-format
+msgid "vCard for %s"
+msgstr "vCard %s"
+
+#: ../modules/addressbook/eab-composer-util.c:159
+#: ../modules/addressbook/eab-composer-util.c:186
+#, c-format
+msgid "Contact information"
+msgstr "Yhteystiedot"
+
+#: ../modules/addressbook/eab-composer-util.c:188
+#, c-format
+msgid "Contact information for %s"
+msgstr "%s yhteystiedot"
+
+#: ../modules/addressbook/ldap-config.glade.h:1
+msgid "1"
+msgstr "1"
+
+#: ../modules/addressbook/ldap-config.glade.h:2
+msgid ""
+"389\n"
+"636\n"
+"3268"
+msgstr ""
+
+#: ../modules/addressbook/ldap-config.glade.h:5
+msgid "5"
+msgstr "5"
+
+#: ../modules/addressbook/ldap-config.glade.h:6
+msgid "<b>Authentication</b>"
+msgstr "<b>Todennus</b>"
+
+#: ../modules/addressbook/ldap-config.glade.h:7
+msgid "<b>Downloading</b>"
+msgstr "<b>Noudetaan</b>"
+
+#: ../modules/addressbook/ldap-config.glade.h:8
+msgid "<b>Searching</b>"
+msgstr "<b>Etsitään</b>"
+
+#: ../modules/addressbook/ldap-config.glade.h:10
+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
+#: ../modules/addressbook/ldap-config.glade.h:14
+msgid "B_rowse this book until limit reached"
+msgstr "S_elaa tätä kirjaa, kunnes raja tulee vastaan"
+
+#: ../modules/addressbook/ldap-config.glade.h:16
+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."
+
+#: ../modules/addressbook/ldap-config.glade.h:18
+msgid "Lo_gin:"
+msgstr "_Kirjautuminen:"
+
+#: ../modules/addressbook/ldap-config.glade.h:19
+msgid ""
+"One\n"
+"Sub"
+msgstr ""
+"Yksi taso\n"
+"Alipuu"
+
+#: ../modules/addressbook/ldap-config.glade.h:21
+msgid ""
+"SSL encryption\n"
+"TLS encryption\n"
+"No encryption"
+msgstr ""
+
+#: ../modules/addressbook/ldap-config.glade.h:24
+msgid "Search Filter"
+msgstr "Hakusuodatin"
+
+#: ../modules/addressbook/ldap-config.glade.h:25
+msgid "Search _base:"
+msgstr "Haku_pohja:"
+
+#: ../modules/addressbook/ldap-config.glade.h:26
+msgid "Search _filter:"
+msgstr "Hakusuodatin:"
+
+#: ../modules/addressbook/ldap-config.glade.h:27
+#, fuzzy
+msgid ""
+"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ä."
+
+#: ../modules/addressbook/ldap-config.glade.h:28
+msgid "Supported Search Bases"
+msgstr "Tuetut hakupohjat"
+
+#: ../modules/addressbook/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 "
+"root of the directory tree."
+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."
+
+#: ../modules/addressbook/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-palvelimen koko nimi, esimerkiksi \"ldap.mycompany.com"
+"\"."
+
+#: ../modules/addressbook/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."
+msgstr ""
+"Suurin sallittu noudettavien korttien määrä noutokertaa kohti. Tämän arvon "
+"asettaminen liian suureksi hidastaa osoitekirjan käyttöä."
+
+#: ../modules/addressbook/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. "
+msgstr ""
+"Tämä on nimi, jolla tämä palvelin näkyy Evolutionin kansiolistoissa. Sitä "
+"käytetään ainoastaan listoilla näyttämiseen."
+
+#: ../modules/addressbook/ldap-config.glade.h:33
+msgid "_Download limit:"
+msgstr "_Haun rajoitus:"
+
+#: ../modules/addressbook/ldap-config.glade.h:34
+msgid "_Find Possible Search Bases"
+msgstr "Etsi mahdolliset hakupohjat"
+
+#: ../modules/addressbook/ldap-config.glade.h:35
+msgid "_Login method:"
+msgstr "_Kirjautumismenetelmä:"
+
+#: ../modules/addressbook/ldap-config.glade.h:37
+msgid "_Port:"
+msgstr "_Portti:"
+
+#: ../modules/addressbook/ldap-config.glade.h:38
+msgid "_Search scope:"
+msgstr "_Hakualue:"
+
+#: ../modules/addressbook/ldap-config.glade.h:40
+msgid "_Timeout:"
+msgstr "_Aikakatkaisu:"
+
+#: ../modules/addressbook/ldap-config.glade.h:41
+msgid "_Use secure connection:"
+msgstr "_Käytä salattua yhteyttä:"
+
+#: ../modules/addressbook/ldap-config.glade.h:42
+msgid "cards"
+msgstr "kortteja"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:259
+msgid "I_mport"
+msgstr "_Tuo"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+msgid "Select a Calendar"
+msgstr "Valitse kalenteri"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:368
+msgid "Select a Task List"
+msgstr "Valitse tehtävälista"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:378
+msgid "I_mport to Calendar"
+msgstr "Tuo _kalenteriin"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:385
+msgid "I_mport to Tasks"
+msgstr "_Tuo t_ehtäviin"
+
+#. Create the Webcal source group
+#: ../modules/calendar/e-cal-shell-backend.c:122
+#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-migrate.c:136
+#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:535
+msgid "On The Web"
+msgstr "Verkossa"
+
+#: ../modules/calendar/e-cal-shell-backend.c:123
+#: ../plugins/calendar-weather/calendar-weather.c:117
+msgid "Weather"
+msgstr "Sää"
+
+#: ../modules/calendar/e-cal-shell-backend.c:238
+#: ../modules/calendar/e-cal-shell-migrate.c:483
+msgid "Birthdays & Anniversaries"
+msgstr "Syntymä- ja vuosipäivät"
+
+#: ../modules/calendar/e-cal-shell-backend.c:424
+msgctxt "New"
+msgid "_Appointment"
+msgstr "_Tapaaminen"
+
+#: ../modules/calendar/e-cal-shell-backend.c:426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1336
+msgid "Create a new appointment"
+msgstr "Luo uusi tapaaminen"
+
+#: ../modules/calendar/e-cal-shell-backend.c:431
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "_Koko päivän tapaaminen"
+
+#: ../modules/calendar/e-cal-shell-backend.c:433
+msgid "Create a new all-day appointment"
+msgstr "Luo uusi koko päivän tapaaminen"
+
+#: ../modules/calendar/e-cal-shell-backend.c:438
+msgctxt "New"
+msgid "M_eeting"
+msgstr "_Kokous"
+
+#: ../modules/calendar/e-cal-shell-backend.c:440
+msgid "Create a new meeting request"
+msgstr "Luo uusi kokouskutsu"
+
+#: ../modules/calendar/e-cal-shell-backend.c:448
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "_Kalenteri"
+
+#: ../modules/calendar/e-cal-shell-backend.c:450
+#: ../modules/calendar/e-cal-shell-view-actions.c:1217
+msgid "Create a new calendar"
+msgstr "Luo uusi kalenteri"
+
+#: ../modules/calendar/e-cal-shell-backend.c:485
+#: ../plugins/itip-formatter/itip-formatter.c:2558
+msgid "Calendar and Tasks"
+msgstr "Kalenteri ja tehtävät"
+
+#: ../modules/calendar/e-cal-shell-backend.c:759
+msgid "The registry of calendars"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-migrate.c:131
+msgid ""
+"The location and hierarchy of the Evolution calendar folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolutionin kalenterikansioiden sijainti ja rakenne on muuttunut versiosta 1."
+"x\n"
+"\n"
+"Odota kärsivällisesti, kun Evolution konvertoi kansioitasi..."
+
+#. FIXME: set proper domain/code
+#: ../modules/calendar/e-cal-shell-migrate.c:664
+#: ../modules/calendar/e-task-shell-migrate.c:591
+#, 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
+#: ../modules/calendar/e-cal-shell-migrate.c:693
+#, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr "Kalenterin '%s' muunnos epäonnistui"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:152
+#: ../modules/calendar/e-memo-shell-sidebar.c:149
+#: ../modules/calendar/e-task-shell-sidebar.c:147
+msgid ""
+"Error on %s\n"
+"%s"
+msgstr ""
+"Virhe kohteessa %s:\n"
+"%s"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:188
+msgid "Loading calendars"
+msgstr "Ladataan kalentereita"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:428
+msgid "Calendar Selector"
+msgstr "Kalenterin valinta"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:551
+msgid "Date Navigator Widget"
+msgstr "Päivämäärävalitsin"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:552
+msgid "This widget displays a miniature calendar"
+msgstr "Tämä elementti näyttää pienen kalenterin"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:562
+msgid "This widget displays groups of calendars"
+msgstr "Tämä elementti näyttää kalenteriryhmän"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:723
+#, c-format
+msgid "Opening calendar at %s"
+msgstr "Avataan kalenteria %s"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:214
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
+msgid "Print"
+msgstr "Tulosta"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:304
+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 "
+"events."
+msgstr ""
+"Tämä toimenpide poistaa kaikki tapahtumat, jotka ovat vanhempia kuin valittu "
+"aika. Jos jatkat, et voi palauttaa näitä tapahtumia."
+
+#. Translators: This is the first part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../modules/calendar/e-cal-shell-view-actions.c:321
+msgid "Purge events older than"
+msgstr "Poista vanhemmat tapahtumat kuin"
+
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../modules/calendar/e-cal-shell-view-actions.c:334
+#: ../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:516
+#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-source.c:741
+#: ../widgets/misc/e-send-options.glade.h:39
+msgid "days"
+msgstr "päivä"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:551
+msgid "Copying Items"
+msgstr "Kopioidaan tiedostoja"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:801
+msgid "Moving Items"
+msgstr "Siirretään kohteita"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1091
+msgid "Save As..."
+msgstr "Tallenna nimellä..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1173
+#: ../modules/calendar/e-memo-shell-view-actions.c:603
+msgid "_Copy..."
+msgstr "_Kopioi..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1189
+msgid "Go Back"
+msgstr "Siirry takaisin"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1196
+msgid "Go Forward"
+msgstr "Siirry eteenpäin"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1201
+msgid "Select _Today"
+msgstr "Valitse _tämä päivä"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1203
+msgid "Select today"
+msgstr "Valitse tämä päivä"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1208
+msgid "Select _Date"
+msgstr "Valitse _päivä"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1210
+msgid "Select a specific date"
+msgstr "Valitse tietty päivä"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1215
+msgid "_New Calendar"
+msgstr "_Uusi kalenteri"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1229
+#: ../modules/calendar/e-task-shell-view-actions.c:805
+msgid "Purg_e"
+msgstr "Tyhjennä"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1231
+msgid "Purge old appointments and meetings"
+msgstr "Poista vanhat tapaamiset ja kokoukset"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1238
+msgid "Rename the selected calendar"
+msgstr "Nimeä valittu kalenteri uudestaan"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1243
+msgid "Show _Only This Calendar"
+msgstr "Näytä _vain tämä kalenteri"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
+msgid "Cop_y to Calendar..."
+msgstr "_Kopioi kalenteriin..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+msgid "_Delegate Meeting..."
+msgstr "_Delegoi kokous..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
+msgid "Delete the appointment"
+msgstr "Poista tapaaminen"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
+msgid "Delete This _Occurrence"
+msgstr "Poista tämä _tapahtumakerta"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
+msgid "Delete this occurrence"
+msgstr "Poista tapahtumiskerta"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1299
+msgid "Delete _All Occurrences"
+msgstr "Poista _kaikki tapahtumakerrat"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1301
+msgid "Delete all occurrences"
+msgstr "Poista kaikki esiintymät"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+msgid "New All Day _Event..."
+msgstr "Uusi koko pä_ivän tapahtuma..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
+msgid "Create a new all day event"
+msgstr "Luo uusi koko päivän tapaaminen"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../modules/calendar/e-cal-shell-view-memopad.c:301
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:375
+#: ../modules/calendar/e-memo-shell-view-actions.c:596
+#: ../modules/calendar/e-task-shell-view-actions.c:721
+msgid "_Forward as iCalendar..."
+msgstr "_Välitä iCalendar-muodossa..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
+msgid "New _Meeting..."
+msgstr "Uusi _kokous..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
+msgid "Create a new meeting"
+msgstr "Luo uusi kokous"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+msgid "Mo_ve to Calendar..."
+msgstr "_Siirrä kalenteriin..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+msgid "New _Appointment..."
+msgstr "Uusi t_apaaminen..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
+msgid "Make this Occurrence _Movable"
+msgstr "Muuta tämä kerta _siirrettäväksi"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+msgid "_Open Appointment"
+msgstr "_Avaa tapaaminen"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
+msgid "View the current appointment"
+msgstr "Näytä valittu tapaaminen"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+msgid "_Reply"
+msgstr "_Vastaa"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
+msgid "_Schedule Meeting..."
+msgstr "_Järjestä kokous..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1504
+msgid "Day"
+msgstr "Päivä"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1506
+msgid "Show one day"
+msgstr "Näytä yksi päivä"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+msgid "List"
+msgstr "Lista"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+msgid "Show as list"
+msgstr "Näytä luettelona"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1518
+msgid "Month"
+msgstr "Kuukausi"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1520
+msgid "Show one month"
+msgstr "Näytä yksi kuukausi"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+msgid "Week"
+msgstr "Viikko"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1527
+msgid "Show one week"
+msgstr "Näytä yksi viikko"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1532
+msgid "Work Week"
+msgstr "Työviikko"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1534
+msgid "Show one work week"
+msgstr "Näytä yksi työviikko"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1542
+msgid "Active Appointements"
+msgstr "Aktiiviset tapaamiset"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+msgid "Next 7 Days' Appointments"
+msgstr "Seuraavien 7 päivän tapaamiset"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-memo-shell-view-actions.c:802
+#: ../modules/calendar/e-task-shell-view-actions.c:1002
+msgid "Description contains"
+msgstr "Kuvaus sisältää"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+#: ../modules/calendar/e-memo-shell-view-actions.c:809
+#: ../modules/calendar/e-task-shell-view-actions.c:1009
+msgid "Summary contains"
+msgstr "Yhteenveto sisältää"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1599
+msgid "Print this calendar"
+msgstr "Tulosta tämä kalenteri"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1606
+msgid "Preview the calendar to be printed"
+msgstr "Esikatsele tulostettavaa kalenteria"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1668
+msgid "Go To"
+msgstr "Siirry"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:76
+#: ../modules/calendar/e-memo-shell-view-actions.c:96
+msgid "Deleting selected memos..."
+msgstr "Poista valitut muistilaput..."
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:275
+#: ../modules/calendar/e-memo-shell-view-actions.c:570
+msgid "Copy selected memo"
+msgstr "Kopioi valittu muistilappu"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:282
+#: ../modules/calendar/e-memo-shell-view-actions.c:577
+msgid "Cut selected memo"
+msgstr "Leikkaa valittu muistilappu"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:289
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
+msgid "Paste memo from the clipboard"
+msgstr "Liitä muistilappu leikepöydältä"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:294
+#: ../modules/calendar/e-memo-shell-view-actions.c:589
+msgid "_Delete Memo"
+msgstr "_Poista muistilappu"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:296
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
+msgid "Delete selected memos"
+msgstr "Poista valitut muistilaput"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:308
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
+msgid "New _Memo"
+msgstr "_Uusi muistilappu"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:310
+#: ../modules/calendar/e-memo-shell-backend.c:318
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
+msgid "Create a new memo"
+msgstr "Luo uusi muistilappu"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:315
+#: ../modules/calendar/e-memo-shell-view-actions.c:652
+msgid "_Open Memo"
+msgstr "_Avaa muistilappu"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
+msgid "View the selected memo"
+msgstr "Näytä valittu muistilappu"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:322
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:410
+#: ../modules/calendar/e-memo-shell-view-actions.c:659
+#: ../modules/calendar/e-task-shell-view-actions.c:798
+msgid "Open _Web Page"
+msgstr "_Avaa www-sivu"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:341
+#: ../modules/calendar/e-memo-shell-view-actions.c:835
+msgid "Print the selected memo"
+msgstr "Tulosta valittu muistilappu"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:423
+#: ../modules/calendar/e-memo-shell-view.c:223
+msgid "Delete Memo"
+msgid_plural "Delete Memos"
+msgstr[0] "Poista muistilappu"
+msgstr[1] "Poista muistilaput"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:99
+#: ../modules/calendar/e-task-shell-view-actions.c:127
+msgid "Deleting selected tasks..."
+msgstr "Poistetaan valiittuja tehtäviä...."
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-task-shell-view-actions.c:686
+msgid "_Assign Task"
+msgstr "_Anna tehtäväksi"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:349
+#: ../modules/calendar/e-task-shell-view-actions.c:695
+msgid "Copy selected tasks"
+msgstr "Kopioi valitut tehtävät"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
+#: ../modules/calendar/e-task-shell-view-actions.c:702
+msgid "Cut selected tasks"
+msgstr "Leikkaa valitut tehtävät"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:363
+#: ../modules/calendar/e-task-shell-view-actions.c:709
+msgid "Paste tasks from the clipboard"
+msgstr "Liitä tehtävät leikepöydältä"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:368
+#: ../modules/calendar/e-task-shell-view-actions.c:714
+msgid "_Delete Task"
+msgstr "_Poista tehtävä"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:370
+#: ../modules/calendar/e-task-shell-view-actions.c:716
+msgid "Delete selected tasks"
+msgstr "Poista valitut tehtävät"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
+#: ../modules/calendar/e-task-shell-view-actions.c:770
+msgid "_Mark as Complete"
+msgstr "_Merkitse valmiiksi"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
+#: ../modules/calendar/e-task-shell-view-actions.c:772
+msgid "Mark selected tasks as complete"
+msgstr "Merkitse valitut tehtävät valmistuneiksi"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:389
+msgid "_Mar_k as Incomplete"
+msgstr "_Merkitse keskeneräiseksi"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:391
+#: ../modules/calendar/e-task-shell-view-actions.c:779
+msgid "Mark selected tasks as incomplete"
+msgstr "Merkitse valitut tehtävät keskeneräisiksi"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:396
+#: ../modules/calendar/e-task-shell-view-actions.c:784
+msgid "New _Task"
+msgstr "Uusi _tehtävä"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:398
+#: ../modules/calendar/e-task-shell-backend.c:322
+#: ../modules/calendar/e-task-shell-view-actions.c:786
+msgid "Create a new task"
+msgstr "Luo uusi tehtävä"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:403
+#: ../modules/calendar/e-task-shell-view-actions.c:791
+msgid "_Open Task"
+msgstr "Avaa _tehtävä"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:405
+#: ../modules/calendar/e-task-shell-view-actions.c:793
+msgid "View the selected task"
+msgstr "Näytä valitut tehtävät"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:417
+#: ../modules/calendar/e-memo-shell-view-actions.c:666
+#: ../modules/calendar/e-task-shell-view-actions.c:812
+msgid "_Save as iCalendar..."
+msgstr "_Tallenna iCalendar-muodossa..."
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:429
+#: ../modules/calendar/e-task-shell-view-actions.c:1035
+msgid "Print the selected task"
+msgstr "Tulosta valittu tehtävä"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:534
+#: ../modules/calendar/e-task-shell-view.c:350
+msgid "Delete Task"
+msgid_plural "Delete Tasks"
+msgstr[0] "Poista tehtävä"
+msgstr[1] "Poista tehtävät"
+
+#: ../modules/calendar/e-memo-shell-backend.c:316
+msgctxt "New"
+msgid "Mem_o"
+msgstr "_Muistilappu"
+
+#: ../modules/calendar/e-memo-shell-backend.c:323
+msgid "_Shared Memo"
+msgstr "_Jaettu muistilappu"
+
+#: ../modules/calendar/e-memo-shell-backend.c:325
+msgid "Create a new shared memo"
+msgstr "Luo uusi jaettu muistilappu"
+
+#: ../modules/calendar/e-memo-shell-backend.c:333
+msgctxt "New"
+msgid "Memo Li_st"
+msgstr "Mui_stilappulista"
+
+#: ../modules/calendar/e-memo-shell-backend.c:335
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
+msgid "Create a new memo list"
+msgstr "Luo uusi muistilappulista"
+
+#: ../modules/calendar/e-memo-shell-backend.c:583
+msgid "The registry of memo lists"
+msgstr "Rekisteri muistilappuluetteloista"
+
+#: ../modules/calendar/e-memo-shell-content.c:598
+msgid "The memo table model"
+msgstr "Muistilappujen taulumalli"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:185
+msgid "Loading memos"
+msgstr "Ladataan muistilappuja"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:399
+msgid "Memo List Selector"
+msgstr "Muistilappuluetteloiden valitsin"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:529
+msgid "This widget displays groups of memo lists"
+msgstr ""
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:682
+#, c-format
+msgid "Opening memos at %s"
+msgstr "Avataan muistilappuja sijainnista %s"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:253
+#: ../modules/calendar/e-memo-shell-view-actions.c:270
+msgid "Print Memos"
+msgstr "Tulosta muistilaput"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
+msgid "_New Memo List"
+msgstr "_Uusi muistilappulista"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
+msgid "Rename the selected memo list"
+msgstr "Nimeä valittu muistilappuluettelo uudestaan"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
+msgid "Show _Only This Memo List"
+msgstr "Näytä _vain tämä muistilappuluettelo"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:740
+msgid "Memo _Preview"
+msgstr "Muistilapun _esikatselu"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:742
+msgid "Show memo preview pane"
+msgstr "Näytä muistilapun esikatselupaneeli"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:763
+msgid "Show memo preview below the memo list"
+msgstr "Näytä muistilapun esikatselu muistilappuluettelon alla"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:770
+msgid "Show memo preview alongside the memo list"
+msgstr "Näytä muistilapun esikatselu muistilappuluettelon vieressä"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:821
+msgid "Print the list of memos"
+msgstr "Tulosta luettelo muistilapuista"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:828
+msgid "Preview the list of memos to be printed"
+msgstr "Esikatsele luetteloa tulostettavista muistilapuista"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:412
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d muistilappu"
+msgstr[1] "%d muistilappua"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:416
+#: ../modules/calendar/e-task-shell-view-private.c:510
+#, c-format
+msgid "%d selected"
+msgstr ", %d valittu"
+
+#: ../modules/calendar/e-memo-shell-view.c:221
+msgid "Delete Memos"
+msgstr "Poista muistilaput"
+
+#: ../modules/calendar/e-task-shell-backend.c:320
+msgctxt "New"
+msgid "_Task"
+msgstr "_Tehtävä"
+
+#: ../modules/calendar/e-task-shell-backend.c:327
+msgid "Assigne_d Task"
+msgstr "Tehtäväksi_anto"
+
+#: ../modules/calendar/e-task-shell-backend.c:329
+msgid "Create a new assigned task"
+msgstr "Luo uusi tehtäväksianto"
+
+#: ../modules/calendar/e-task-shell-backend.c:337
+msgctxt "New"
+msgid "Tas_k List"
+msgstr "Te_htävälista"
+
+#: ../modules/calendar/e-task-shell-backend.c:339
+#: ../modules/calendar/e-task-shell-view-actions.c:744
+msgid "Create a new task list"
+msgstr "Luo uusi tehtävälista"
+
+#: ../modules/calendar/e-task-shell-backend.c:593
+msgid "The registry of task lists"
+msgstr "Rekisteri tehtävälistoista"
+
+#: ../modules/calendar/e-task-shell-content.c:621
+msgid "The task table model"
+msgstr "Tehtävien taulumalli"
+
+#: ../modules/calendar/e-task-shell-migrate.c:98
+msgid ""
+"The location and hierarchy of the Evolution task folders has changed since "
+"Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolutionin tehtäväkansioiden sijainti ja rakenne on muuttunut versiosta 1."
+"x\n"
+"\n"
+"Odota kärsivällisesti, kun Evolution konvertoi kansioitas..."
+
+#. FIXME: domain/code
+#: ../modules/calendar/e-task-shell-migrate.c:620
+#, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Tehtävien '%s' muunnos epäonnistui"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:183
+msgid "Loading tasks"
+msgstr "Ladataan tehtäviä"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:397
+msgid "Task List Selector"
+msgstr "Tehtävienluetteloiden valitsin"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:527
+msgid "This widget displays groups of task lists"
+msgstr "Tämä elementti näyttä ryhmiä tehtävälistaluetteloista"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:680
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "Avataan tehtävät %s"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:284
+#: ../modules/calendar/e-task-shell-view-actions.c:301
+msgid "Print Tasks"
+msgstr "Tulosta tehtävät"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:570
+msgid ""
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
+"\n"
+"Really erase these tasks?"
+msgstr ""
+"Tämä toimenpide poistaa kaikki tehtävät, jotka on merkitty tehdyiksi. Jos "
+"jatkat, et voi myöhemmin palauttaa näitä tehtäviä.\n"
+"\n"
+"Valmis poistaa nämä tehtävät?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:728
+msgid "Copy..."
+msgstr "Kopioi..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:742
+msgid "_New Task List"
+msgstr "_Uusi tehtävälista"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:758
+msgid "Rename the selected task list"
+msgstr "Nimeä valittu tehtäväluettelo uudestaan"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:763
+msgid "Show _Only This Task List"
+msgstr "Näytä _vain tämä tehtävälista"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:777
+msgid "Mar_k as Incomplete"
+msgstr "_Merkitse keskeneräiseksi"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:807
+msgid "Delete completed tasks"
+msgstr "Poista valmistuneet tehtävät"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:905
+msgid "Task _Preview"
+msgstr "Tehtävien _esikatselu"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:907
+msgid "Show task preview pane"
+msgstr "Näytä tehtävien esikatselupaneeli"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:928
+msgid "Show task preview below the task list"
+msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:935
+msgid "Show task preview alongside the task list"
+msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:943
+msgid "Active Tasks"
+msgstr "Aktiiviset tehtävät"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:957
+msgid "Completed Tasks"
+msgstr "Valmistuneet tehtävät"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:964
+msgid "Next 7 Days' Tasks"
+msgstr "Seuraavien 7 päivän tehtävät"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:971
+msgid "Overdue Tasks"
+msgstr "Vanhentuneet tehtävät"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:978
+msgid "Tasks with Attachments"
+msgstr "Tehtävät, joissa on liitteitä"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1021
+msgid "Print the list of tasks"
+msgstr "Tulosta tehtävälista"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1028
+msgid "Preview the list of tasks to be printed"
+msgstr "Esikatsele luetteloa tulostettavista tehtävistä"
+
+#: ../modules/calendar/e-task-shell-view-private.c:506
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d tehtävä"
+msgstr[1] "%d tehtävää"
+
+#: ../modules/calendar/e-task-shell-view.c:348
+msgid "Delete Tasks"
+msgstr "Poiista tehtäviä"
+
+#. Translators: This is only for multiple messages.
+#: ../modules/mail/e-mail-attachment-handler.c:335
+#, c-format
+msgid "%d attached messages"
+msgstr "%d liitetty viesti"
+
+#: ../modules/mail/e-mail-shell-backend.c:174
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "_Sähköpostiviesti"
+
+#: ../modules/mail/e-mail-shell-backend.c:176
+msgid "Compose a new mail message"
+msgstr "Kirjoita uusi viesti"
+
+#: ../modules/mail/e-mail-shell-backend.c:184
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "Sähköposti_kansio"
+
+#: ../modules/mail/e-mail-shell-backend.c:186
+msgid "Create a new mail folder"
+msgstr "Luo uusi sähköpostikansio"
+
+#: ../modules/mail/e-mail-shell-backend.c:205
+msgid "Mail Accounts"
+msgstr "Sähköpostitilit"
+
+#: ../modules/mail/e-mail-shell-backend.c:221
+msgid "Composer Preferences"
+msgstr "Muokkaimen asetukset"
+
+#: ../modules/mail/e-mail-shell-backend.c:229
+msgid "Network Preferences"
+msgstr "Verkkoasetukset"
+
+#. green
+#: ../modules/mail/e-mail-shell-migrate.c:958
+msgid "To Do"
+msgstr "Tehtävää"
+
+#. blue
+#: ../modules/mail/e-mail-shell-migrate.c:959
+msgid "Later"
+msgstr "Myöhemmin"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1138
+msgid "Migration"
+msgstr "Siirto"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1588
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Kansiota '%s' ei voi luoda: %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1616
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "Kansiota %s ei voi kopioidaan kohtaan %s: %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1811
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "Sähköpostin läpikäynti kohteesta '%s' epäonnistui: %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1817
+#: ../modules/mail/e-mail-shell-migrate.c:2914
+msgid "Migrating Folders"
+msgstr "Siirretään kansiota"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1818
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolutionin sähköpostikansioiden sijainti ja rakenne on muuttunut versiosta "
+"Evolution 1.x.\n"
+"\n"
+"Odota kärsivällisesti, että Evolution muuntaa kansioitasi..."
+
+#: ../modules/mail/e-mail-shell-migrate.c:2021
+#, 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"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2037
+#, 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"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2069
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr "POP3 keep-on-server tietoa `%s' ei voi kopioida: %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2540
+#: ../modules/mail/e-mail-shell-migrate.c:2554
+#, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Paikallista sähköpostitilaa '%s' ei voi luoda: %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2915
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolutionin sähköpostikansioiden yhteenvedon esitys on siirretty sqlite-"
+"tietokantaan version 2.24 jälkeen.\n"
+"\n"
+"Odota kärsivällisesti, että Evolution muuntaa kansioiden tietoja..."
+
+#: ../modules/mail/e-mail-shell-migrate.c:3012
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr "Paikallisia sähköpostikansioita ei voi luoda paikkaan '%s': %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:3030
+#, c-format
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+"Asetuksia ei voi lukea aikaisemmasta Evolutionin asennuksesta, evolution/"
+"config.xmldb' on joko vaurioitunut tai puuttuu."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1032
+#: ../modules/mail/e-mail-shell-view.c:418
+msgid "_Disable Account"
+msgstr "_Poista tili käytöstä"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1034
+msgid "Disable this account"
+msgstr "Poista tämä tili käytöstä"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1039
+msgid "C_reate Search Folder From Search..."
+msgstr "Luo _hakunäkymä haun perusteella..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1046
+msgid "_Download Messages for Offline Usage"
+msgstr "_Nouda viestit yhteydettömään käyttöön"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1048
+msgid "Download messages of accounts and folders marked for offline"
+msgstr "Nouda viestit verkottomaan käyttöön merkityiltä tileiltä ja kansioista"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1053
+msgid "Empty _Trash"
+msgstr "_Tyhjennä roskakori"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1055
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr "Poista kaikki pyyhityt viesti pysyvästi kaikista kansioista"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1060
+msgid "Fl_ush Outbox"
+msgstr "T_yhjennä lähtevien kansio"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1067
+msgid "_Copy Folder To..."
+msgstr "_Kopioi kansio..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1069
+msgid "Copy the selected folder into another folder"
+msgstr "Kopioi valittu kansio toiseen kansioon"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1076
+msgid "Permanently remove this folder"
+msgstr "Poista tämä kansio pysyvästi"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1081
+msgid "E_xpunge"
+msgstr "_Poista poistetut"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1083
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Poista pysyvästi kaikki poistetut viestit tästä kansiosta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1088
+msgid "Mar_k All Messages as Read"
+msgstr "Mer_kitse kaikki viestit luetuiksi"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1090
+msgid "Mark all messages in the folder as read"
+msgstr "Merkitse kaikki kansion viestit luetuksi"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1095
+msgid "_Move Folder To..."
+msgstr "_Siirrä kansio..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1097
+msgid "Move the selected folder into another folder"
+msgstr "Siirrä valittu kansio toiseen kansioon"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1102
+msgid "_New..."
+msgstr "_Uusi..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1104
+msgid "Create a new folder for storing mail"
+msgstr "Luo uusi kansio viestien tallentamiseen"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1111
+msgid "Change the properties of this folder"
+msgstr "Vaihda tämän kansion ominaisuuksia"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1118
+msgid "Refresh the folder"
+msgstr "Virkistä kansio"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1125
+msgid "Change the name of this folder"
+msgstr "Muuta tämän kansion nimeä"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1130
+msgid "Select _All Messages"
+msgstr "Valitse k_aikki viestit"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1132
+msgid "Select all visible messages"
+msgstr "Valitse kaikki näkyvät viestit"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1137
+msgid "Select Message _Thread"
+msgstr "Valitse viesti_säie"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1139
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
+"Valitse kaikki viestit, jotka ovat samassa säikeessä kuin nyt valittu viesti"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1144
+msgid "Select Message S_ubthread"
+msgstr "Valitse viesti_säie"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1146
+msgid "Select all replies to the currently selected message"
+msgstr "Valitse kaikki vastaukset nyt valittuun viestiin"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1151
+msgid "_Unsubscribe"
+msgstr "_Peru tilaus"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
+msgid "Unsubscribe from the selected folder"
+msgstr "Peru tämän kansion tilaus"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1158
+msgid "_New Label"
+msgstr "_uusi merkintä"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1165
+msgid "N_one"
+msgstr "Ei _mitään"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1172
+msgid "Hide _Read Messages"
+msgstr "Piilota _luetut viestit"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1174
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Piilota kaikki luetut viestit väliaikaisesti"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1179
+msgid "Hide S_elected Messages"
+msgstr "Piilota _valitut viestit"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1181
+msgid "Temporarily hide the selected messages"
+msgstr "Piilota valitut viestit väliaikaisesti"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1186
+msgid "Show Hidde_n Messages"
+msgstr "Näytä piil_otetut viestit"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
+msgid "Show messages that have been temporarily hidden"
+msgstr "Näytä viestit jotka on väliaikaisesti piilotettu"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1209
+msgid "Cancel the current mail operation"
+msgstr "Peruuta nykyinen postioperaatio"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1214
+msgid "Collapse All _Threads"
+msgstr "Sulje kaikki _säikeet"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1216
+msgid "Collapse all message threads"
+msgstr "Sulje kaikki viestisäikeet"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1221
+msgid "E_xpand All Threads"
+msgstr "_Laajenna kaikki säikeet"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1223
+msgid "Expand all message threads"
+msgstr "Laajenna kaikki viestisäikeet"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1228
+msgid "_Message Filters"
+msgstr "Viesti_suodattimet"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1230
+msgid "Create or edit rules for filtering new mail"
+msgstr "Luo tai muokkaa sääntöjä uuden sähköpostin suodatukseen"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1235
+msgid "Search F_olders"
+msgstr "Etsi _kansioita"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1237
+msgid "Create or edit search folder definitions"
+msgstr "Luo tai muokkaa hakunäkymien määrittelyjä"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1242
+msgid "_Subscriptions..."
+msgstr "_Tilaukset..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1244
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "Tilaa tai peru kansioiden tilauksia muilta palvelimilta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1251
+msgid "F_older"
+msgstr "_Kansio"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1258
+msgid "_Label"
+msgstr "_Merkintä"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1298
+msgid "_New Folder..."
+msgstr "_Uusi kansio..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
+msgid "Hide _Deleted Messages"
+msgstr "Piilota _poistetut viestit"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+"Piilota poistetut viestit sen sijaan, että ne näytettäisiin yliviivattuina"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
+msgid "Show Message _Preview"
+msgstr "Näytä viestin _esikatselu"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1333
+msgid "Show message preview pane"
+msgstr "Näytä viestin esikatseluikkuna"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1339
+msgid "_Group By Threads"
+msgstr "Ryhmittele _säikeittäin"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1341
+msgid "Threaded message list"
+msgstr "Säikeistetty viestiluettelo"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1362
+msgid "Show message preview below the message list"
+msgstr "Näytä viestin esikatselu viestiluettelon alla"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1369
+msgid "Show message preview alongside the message list"
+msgstr "Näytä viestin esikatselu viestiluettelon vieressä"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1377
+msgid "All Messages"
+msgstr "Kaikki viestit"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1384
+msgid "Important Messages"
+msgstr "Tärkeät viestit"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1391
+msgid "Last 5 Days' Messages"
+msgstr "Viimeisten viiden päivän viestit"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1398
+msgid "Messages Not Junk"
+msgstr "Viestit, jotka eivät ole roskapostia"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1405
+msgid "Messages with Attachments"
+msgstr "Viestit, joissa on liitteitä"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1412
+msgid "No Label"
+msgstr "Ei merkintää"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1419
+msgid "Read Messages"
+msgstr "Luetut viestit"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1426
+msgid "Recent Messages"
+msgstr "Viimeisimmät viestit"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1433
+msgid "Unread Messages"
+msgstr "Lukemattomat viestit"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1478
+msgid "Subject or Addresses contain"
+msgstr "Aihe tai osoiteeet sisältävät"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1488
+msgid "All Accounts"
+msgstr "Kaikki tilit"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1495
+msgid "Current Account"
+msgstr "Valittu tili"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1502
+msgid "Current Folder"
+msgstr "Valittu kansio"
+
+#: ../modules/mail/e-mail-shell-view-private.c:726
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "%d valittu, "
+msgstr[1] "%d valittua, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:737
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "%d poistettu"
+msgstr[1] "%d poistettua"
+
+#: ../modules/mail/e-mail-shell-view-private.c:743
+#: ../modules/mail/e-mail-shell-view-private.c:750
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "%d roskaposti"
+msgstr[1] "%d roskapostia"
+
+#: ../modules/mail/e-mail-shell-view-private.c:756
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d luonnos"
+msgstr[1] "%d luonnosta"
+
+#: ../modules/mail/e-mail-shell-view-private.c:762
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%d lähettämätön"
+msgstr[1] "%d lähettämätöntä"
+
+#: ../modules/mail/e-mail-shell-view-private.c:768
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "%d lähetetty"
+msgstr[1] "%d lähetettyä"
+
+#: ../modules/mail/e-mail-shell-view-private.c:780
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d lukematon, "
+msgstr[1] "%d lukematonta, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:783
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d viesti"
+msgstr[1] "%d viestiä"
+
+#: ../modules/mail/e-mail-shell-view.c:416
+msgid "Proxy _Logout"
+msgstr "Kirjaudu _pois välimuistista"
+
+#: ../modules/mail/em-composer-prefs.c:478
+msgid "Language(s)"
+msgstr "Kielet"
+
+#: ../modules/mail/em-mailer-prefs.c:96
+msgid "Every time"
+msgstr "Joka kerta"
+
+#: ../modules/mail/em-mailer-prefs.c:97
+msgid "Once per day"
+msgstr "Kerran päivässä"
+
+#: ../modules/mail/em-mailer-prefs.c:98
+msgid "Once per week"
+msgstr "Kerran viikossa"
+
+#: ../modules/mail/em-mailer-prefs.c:99
+msgid "Once per month"
+msgstr "Kerran kuussa"
+
+#: ../modules/mail/em-mailer-prefs.c:221
+msgid "Add Custom Junk Header"
+msgstr "Lisää oma roskapostiotsake"
+
+#: ../modules/mail/em-mailer-prefs.c:225
+msgid "Header Name:"
+msgstr "_Otsakkeen nimi:"
+
+#: ../modules/mail/em-mailer-prefs.c:226
+msgid "Header Value Contains:"
+msgstr "Otsakkeen arvo sisältää:"
+
+#: ../modules/mail/em-mailer-prefs.c:326
+#: ../widgets/table/e-table-click-to-add.c:500
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "Ylätunniste:"
+
+#: ../modules/mail/em-mailer-prefs.c:330
+msgid "Contains Value"
+msgstr "Sisältää arvon"
+
+#. May be a better text
+#: ../modules/mail/em-mailer-prefs.c:723 ../modules/mail/em-mailer-prefs.c:777
+#, 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
+#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:786
+#, 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."
+
+#: ../modules/mail/em-mailer-prefs.c:752
+msgid "No Junk plugin available"
+msgstr "Roskapostilisäosaa ei ole saatavilla"
+
+#: ../modules/mail/em-mailer-prefs.c:1140
+msgid "Date header:"
+msgstr "Päivämääräotsikko:"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Hei Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Pythonin liittännäislataimen testit"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Python-testilisäosa"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Testilisäosa pythonin EPlugin-lataimelle."
 
 #: ../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,24 +15752,16 @@ 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:378
 msgid "Keywords"
 msgstr "Avainsanat"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 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"
-msgstr ""
-"Tunnistaa viesteistä viitteitä liitetiedostoista, ja varoittaa puuttuvista "
-"liitetiedostoista"
-
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
@@ -16270,176 +15774,198 @@ 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."
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr ""
-"Muotoilulisäosa, joka esittää ääniliitteet sisäkkäisesti ja sallii niiden "
-"soittamisen suoraan Evolutionista."
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+msgid "Inline Audio"
+msgstr "Sisäkkäiset äänet"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Audio inline plugin"
-msgstr "�änensoiton lisäosa"
+msgid "Play audio attachments directly in mail messages."
+msgstr "Soita ääniliitteet suoraan sähköpostiviesteistä."
 
-#: ../plugins/backup-restore/backup-restore.c:138
+#: ../plugins/backup-restore/backup-restore.c:143
 msgid "Select name of the Evolution backup file"
 msgstr "Valitse Evolutionin varmuuskopiotiedoston nimi"
 
-#: ../plugins/backup-restore/backup-restore.c:167
+#: ../plugins/backup-restore/backup-restore.c:168
 msgid "_Restart Evolution after backup"
 msgstr "Käynnistä Evolution _uudestaan varmuuskopioinnin jälkeen"
 
-#: ../plugins/backup-restore/backup-restore.c:190
+#: ../plugins/backup-restore/backup-restore.c:198
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Valitse palautettavan Evolutionin varmuuskopiotiedoston nimi"
 
-#: ../plugins/backup-restore/backup-restore.c:214
+#: ../plugins/backup-restore/backup-restore.c:219
 msgid "_Restart Evolution after restore"
 msgstr "Käynnistä Evolution _uudestaan varmuuskopioinnin jälkeen"
 
-#: ../plugins/backup-restore/backup-restore.c:287
-msgid "Restore from backup"
-msgstr "Palauta varmuuskopio"
-
-#: ../plugins/backup-restore/backup-restore.c:289
+#: ../plugins/backup-restore/backup-restore.c:293
+#, fuzzy
 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"
 "Palautus palauttaa myös kaikki asetukset, sähköpostisuotimet jne."
 
-#: ../plugins/backup-restore/backup-restore.c:295
+#: ../plugins/backup-restore/backup-restore.c:300
 msgid "_Restore Evolution from the backup file"
 msgstr "_Palauta Evolution varmuuskopiotiedostosta"
 
-#: ../plugins/backup-restore/backup-restore.c:302
+#: ../plugins/backup-restore/backup-restore.c:307
 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:310
 msgid "Choose a file to restore"
 msgstr "Valitse palautettava tiedosto"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup-restore.c:318
+msgid "Restore from backup"
+msgstr "Palauta varmuuskopio"
+
+#: ../plugins/backup-restore/backup-restore.c:354
+msgid "_Backup Settings..."
+msgstr "_Varmuuskopioi asetukset..."
+
+#: ../plugins/backup-restore/backup-restore.c:356
+msgid "Backup Evolution data and settings to an archive file"
+msgstr "Varmuuskopioi Evolutionin tiedot ja asetukset arkistotiedostoon"
+
+#: ../plugins/backup-restore/backup-restore.c:361
+msgid "R_estore Settings..."
+msgstr "_Palauta asetukset..."
+
+#: ../plugins/backup-restore/backup-restore.c:363
+msgid "Restore Evolution data and settings from an archive file"
+msgstr "Palauta Evolutionin tietoja ja asetuksia arkistotiedostosta"
+
+#: ../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?"
@@ -16493,85 +16019,76 @@ msgstr ""
 "kaikki ikkunat ennen jatkamista. Voit asetta evolutionin käynnistymään "
 "automaattisesti, kun varmuuskopiointi on päättynyt."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-msgid "Backup and restore Evolution data and settings"
-msgstr "Varmuuskopioi ja palauta Evolutionin tietoja ja asetuksia"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
-msgid "R_estore Settings..."
-msgstr "_Palauta asetukset..."
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-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
+#, fuzzy
 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 ""
 "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,146 +16105,170 @@ 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:499
+#: ../plugins/google-account-setup/google-contacts-source.c:322
+#: ../plugins/google-account-setup/google-source.c:717
 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:517
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-source.c:742
+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 ""
 
 #: ../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
+#: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Fog"
 msgstr "Sää: sumuista"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Cloudy"
 msgstr "Sää: pilvistä"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Cloudy Night"
 msgstr "Sää: pilvinen yö"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Overcast"
 msgstr "Sää: poutaista"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Showers"
 msgstr "Sää: sadekuuroja"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Snow"
 msgstr "Sää: lunta"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Sunny"
 msgstr "Sää: aurinkoista"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Clear Night"
 msgstr "Sää: kirkas yö"
 
-#: ../plugins/calendar-weather/calendar-weather.c:69
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Thunderstorms"
 msgstr "Sää: ukkosmyrskyjä"
 
-#: ../plugins/calendar-weather/calendar-weather.c:230
+#: ../plugins/calendar-weather/calendar-weather.c:221
 msgid "Select a location"
 msgstr "Valitse sijainti"
 
-#: ../plugins/calendar-weather/calendar-weather.c:615
+#: ../plugins/calendar-weather/calendar-weather.c:597
 msgid "_Units:"
 msgstr "_Yksikkö:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:622
+#: ../plugins/calendar-weather/calendar-weather.c:604
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metrinen (Celsiusta, cm jne.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:623
+#: ../plugins/calendar-weather/calendar-weather.c:605
 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 ""
 
 #: ../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."
-
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy tool"
-msgstr "Kopiointityökalu"
-
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "Tarkista onko Evolution sähköpostin oletusohjelma"
@@ -16739,35 +16280,30 @@ 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
-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,43 +16312,53 @@ msgid "Default Sources"
 msgstr "Oletuslähteet"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+msgid "Mark your preferred address book and calendar as default."
+msgstr ""
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "Luettelo omista otsakkeista"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
 msgid ""
-"Provides functionality for marking a calendar or an address book as the "
-"default one."
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
 msgstr ""
-"Tarjoaa toiminallisuuden kalenterien tai osoitekirjojen merkitsemiseksi "
-"oletusvalinnaksi."
+"Avain määrittää luettelon omista otsakkeita, joita voit lisätä lähteviin "
+"viesteihin. Muoto otsakkeiden määrittelyksi avaimessa on seuraava: Otsakkeen "
+"nimi, \"=\"-merkki ja otsakken sisältö, eroteltuna \";\"-merkeillä."
 
-#: ../plugins/email-custom-header/email-custom-header.c:334
+#: ../plugins/email-custom-header/email-custom-header.c:332
 msgid "Security:"
 msgstr "Turvallisuus:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:337
 msgid "Unclassified"
 msgstr "Ei luokiteltu"
 
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:338
 msgid "Protected"
 msgstr "Suojattu"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:340
 msgid "Secret"
 msgstr "Salainen"
 
-#: ../plugins/email-custom-header/email-custom-header.c:343
+#: ../plugins/email-custom-header/email-custom-header.c:341
 msgid "Top secret"
 msgstr "Erittäin salainen"
 
-#: ../plugins/email-custom-header/email-custom-header.c:585
+#: ../plugins/email-custom-header/email-custom-header.c:583
 msgid "_Custom Header"
 msgstr "_Omat otsakkeet"
 
-#: ../plugins/email-custom-header/email-custom-header.c:906
+#: ../plugins/email-custom-header/email-custom-header.c:905
 msgid "Key"
 msgstr "Avaimet"
 
-#: ../plugins/email-custom-header/email-custom-header.c:917
-#: ../plugins/templates/templates.c:396
+#: ../plugins/email-custom-header/email-custom-header.c:916
+#: ../plugins/templates/templates.c:384
 msgid "Values"
 msgstr "Arvot"
 
@@ -16825,32 +16371,18 @@ msgstr ""
 "Omien otsakeavainten määrittelyssä käytetty muoto on seuraava:\n"
 "Omien otsakenimien avainarvot eroteltuna merkillä \";\"."
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
-msgid "Email Custom Header"
-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"
 msgstr "Omat otsakkeet"
 
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Headers"
-msgstr "Luettelo omista otsakkeista"
-
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
-msgstr ""
-"Avain määrittää luettelon omista otsakkeita, joita voit lisätä lähteviin "
-"viesteihin. Muoto otsakkeiden määrittelyksi avaimessa on seuraava: Otsakkeen "
-"nimi, \"=\"-merkki ja otsakken sisältö, eroteltuna \";\"-merkeillä."
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+msgid "Email Custom Header"
+msgstr "Omat sähköpostiotsakkeet"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -16891,11 +16423,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 +16435,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 ""
 
-#: ../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 +16529,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 +16562,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 +16598,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 +16608,92 @@ 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 ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Permissions for"
 msgstr "Oikeudet kohteelle"
 
@@ -17180,6 +16720,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 +16738,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 +16751,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 +16829,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 +16958,11 @@ msgstr "_Herkkyys: "
 msgid "_User"
 msgstr "_Käyttäjä"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:136
+#: ../plugins/exchange-operations/exchange-user-dialog.c:131
 msgid "Select User"
 msgstr "Valitse käyttäjä"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:174
+#: ../plugins/exchange-operations/exchange-user-dialog.c:169
 msgid "Address Book..."
 msgstr "Osoitekirja..."
 
@@ -17434,12 +16975,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."
+msgid "Activates the Evolution-Exchange extension package."
 msgstr ""
-"Lisäosa, jolla voidaan hallita tiettyjä Exchange-tiliin liittyviä toimintoja "
-"ja ominaisuuksia."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -17586,7 +17123,6 @@ 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
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
@@ -17684,7 +17220,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 +17242,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:623
+#: ../plugins/mail-to-task/mail-to-task.c:623
+#: ../plugins/mail-to-task/mail-to-task.c:838
 msgid "Unknown error."
 msgstr "Tuntematon virhe."
 
@@ -17791,36 +17329,56 @@ 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 ""
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/external-editor.c:119
+msgid "Automatically launch when a new mail is edited"
+msgstr ""
+
+#: ../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
+#: ../plugins/external-editor/external-editor.c:108
+msgid "Command to be executed to launch the editor: "
+msgstr "Ulkoisen muokkaimen käynnistyskomento: "
+
+#: ../plugins/external-editor/external-editor.c:109
 msgid ""
-"A plugin for using an external editor as the composer. You can send only "
-"plain-text messages."
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim -f\""
 msgstr ""
-"Lisäosa, jonka avulla voit käyttää ulkoista muokkainta viestien "
-"kirjoittamiseen. Voit lähettää tällä vain muotoilematonta tekstiä (ei HTML-"
-"viestejä)."
+"Emacsia varten käytä arvoa \"xemacs\"\n"
+"VI:tä varten käytä arvoa \"gvim -f\""
 
-#. the path to the shared library
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
+#: ../plugins/external-editor/external-editor.c:353
+#: ../plugins/external-editor/external-editor.c:355
+msgid "Compose in External Editor"
+msgstr "Kirjoita viestit ulkoisessa muokkaimessa"
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 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 +17386,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,73 +17404,48 @@ 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
-msgid "Command to be executed to launch the editor: "
-msgstr "Ulkoisen muokkaimen käynnistyskomento: "
-
-#: ../plugins/external-editor/external-editor.c:115
-msgid ""
-"For Emacs use \"xemacs\"\n"
-"For VI use \"gvim\""
-msgstr ""
-"Emacsia varten käytä arvoa \"xemacs\"\n"
-"VI:tä varten käytä arvoa \"gvim\""
-
-#: ../plugins/face/face.c:59
+#: ../plugins/face/face.c:58
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Valitse (48x48) png-tiedosto, jonka koko on < 700 tavua"
 
-#: ../plugins/face/face.c:69
+#: ../plugins/face/face.c:68
 msgid "PNG files"
 msgstr "PNG-tiedostot"
 
-#: ../plugins/face/face.c:126
+#: ../plugins/face/face.c:125
 msgid "_Face"
 msgstr "_Kasvokuva"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#, fuzzy
 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ä."
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
-#, 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/google-account-setup/google-contacts-source.c:51
+#: ../plugins/google-account-setup/google-source.c:81
+msgid "Google"
+msgstr "Google"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "_Peru tilaus"
+#: ../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/google-source.c:421
+#: ../plugins/google-account-setup/google-source.c:517
 #, 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:623
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17911,45 +17454,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:758
 msgid "Cal_endar:"
 msgstr "_Kalenteri:"
 
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-source.c:793
 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
-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:167
+#: ../plugins/groupwise-features/share-folder-common.c:386
+msgid "Create folder"
+msgstr "Luo uusi kansio"
+
+#: ../plugins/groupwise-features/install-shared.c:218
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17960,7 +17498,7 @@ msgid ""
 "%s\n"
 "\n"
 "\n"
-"Click 'Forward' to install the shared folder\n"
+"Click 'Apply' to install the shared folder\n"
 "\n"
 msgstr ""
 "Käyttäjä \"%s\" on jakanut kansion kanssasi\n"
@@ -17971,13 +17509,13 @@ msgstr ""
 "%s\n"
 "\n"
 "\n"
-"Asenna jaettu kansio napsauttamalla \"Välitä\"\n"
+"Asenna jaettu kansio napsauttamalla \"Toteuta\"\n"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:230
 msgid "Install the shared folder"
 msgstr "Asenna jaettu kansio"
 
-#: ../plugins/groupwise-features/install-shared.c:227
+#: ../plugins/groupwise-features/install-shared.c:234
 msgid "Shared Folder Installation"
 msgstr "Jaetun kansion asennus"
 
@@ -18003,7 +17541,6 @@ msgid "Email:"
 msgstr "Sähköposti:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:45
 msgid "_Disable"
 msgstr "�lä _käytä"
 
@@ -18015,23 +17552,30 @@ msgstr "_Käytä"
 msgid "_Junk List"
 msgstr "_Roskapostilista"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
+#: ../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"
+
+#: ../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
+#, fuzzy
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this ?"
+"sure you want to do this?"
 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 +17584,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-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-shared-folder.errors.xml.h:3
+#: ../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 +17711,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"
 
@@ -18173,6 +17747,10 @@ msgstr "Pääsyoikeudet"
 msgid "Add/Edit"
 msgstr "Lisää/Muokkaa"
 
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
+msgid "Appointments"
+msgstr "Tapaamiset"
+
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
 msgid "Con_tacts"
 msgstr "Yh_teystiedot"
@@ -18220,10 +17798,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:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../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 +17809,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:513
 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 +17829,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:448
 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:331
 msgid "Custom Headers"
 msgstr "Omat otsakkeet"
 
-#: ../plugins/imap-features/imap-headers.c:333
+#: ../plugins/imap-features/imap-headers.c:344
 msgid "IMAP Headers"
 msgstr "IMAP-otsakkeet"
 
@@ -18362,10 +17940,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 +17949,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 +17957,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 +17965,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 +17989,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"
 
@@ -18458,149 +18002,150 @@ msgstr ""
 "liitetty tietokoneseen tai se ei ole päällä."
 
 #: ../plugins/ipod-sync/ical-format.c:119
-#: ../plugins/save-calendar/ical-format.c:164
+#: ../plugins/save-calendar/ical-format.c:163
 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:762
 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:769
 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:773
 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:777
 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:848
+msgid "Opening the calendar. Please wait.."
+msgstr "Avataan kalenteria, odota hetki..."
+
+#: ../plugins/itip-formatter/itip-formatter.c:851
 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:1033
 msgid "Unable to parse item"
 msgstr "Kohdetta ei voi tulkita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1107
+#: ../plugins/itip-formatter/itip-formatter.c:1120
 #, 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:1132
 #, 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:1136
 #, 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:1141
 #, 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:1146
 #, 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:1240
 #, 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:1247
 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:1249
 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:1357
 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:1386
 #, 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:1390
 msgid "Attendee status updated"
 msgstr "Läsnäolon tila päivitetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1401
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Meeting information sent"
 msgstr "Kokouksen tiedot lähetetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1404
+#: ../plugins/itip-formatter/itip-formatter.c:1419
 msgid "Task information sent"
 msgstr "Tehtävän tiedot lähetetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Memo information sent"
 msgstr "Muistilapun tiedot lähetetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1431
 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:1434
 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:1437
 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:1505
+#: ../plugins/itip-formatter/itip-formatter.c:1516
 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:1506
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18608,15 +18153,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:1557
+#: ../plugins/itip-formatter/itip-formatter.c:1585
+#: ../plugins/itip-formatter/itip-formatter.c:1677
 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:1558
+#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1678
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18624,11 +18169,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:1597
 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:1598
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18636,40 +18181,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:2344
 msgid "This meeting recurs"
 msgstr "Tapaaminen on _toistuva"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2309
+#: ../plugins/itip-formatter/itip-formatter.c:2347
 msgid "This task recurs"
 msgstr "Tehtävä on toistuva"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2312
+#: ../plugins/itip-formatter/itip-formatter.c:2350
 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:2583
 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:2593
+#: ../plugins/itip-formatter/itip-formatter.c:2626
 msgid "Conflict Search"
 msgstr "Ristiriitaisuuksien haku"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2573
+#: ../plugins/itip-formatter/itip-formatter.c:2608
 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 +18227,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 +18570,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"
@@ -19163,18 +18694,6 @@ msgid ""
 msgstr ""
 "Vastaus ei ole olemassaolevalta läsnäolijalta. Lisätäänkö läsnäolijaksi?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
-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-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "Piippaa tai soita äänitiedosto."
@@ -19212,52 +18731,56 @@ msgid "Play sound when new messages arrive."
 msgstr "Soita äänitiedosto uuden sähköpostin saapuessa."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr "Soita teeman äänitiedosto viestin saapuessa, jos ei olla piippaustilassa."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Popup message together with the icon."
 msgstr "Ponnahdusikkuna kuvakkeen kanssa."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "Näytä sähköpostikuvake ilmoitusalueella, kun uusia viestejä saapuu."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file name to be played."
 msgstr "Soitettavan äänitiedoston nimi."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr ""
 "Soitettava äänitiedosto, kun uusia viestejä saapuu (jos ei piippaustilassa)."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+msgid "Use sound theme"
+msgstr "Käytä ääniteemaa"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "Soitetaanko äänitiedosto vai piipataanko uuden sähköpostin saapuessa."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether show message over the icon when new messages arrive."
 msgstr "Näytetäänkö viesti kuvakkeen päällä uuden sähköpostin saapuessa."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
 msgid "Whether the icon should blink or not."
 msgstr "Vilkkuuko uudesta sähköpostista ilmoittava kuvake."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Huomautetaanko uusista viesteistä vain saapuvien kansiossa."
 
-#: ../plugins/mail-notification/mail-notification.c:256
-msgid "Generate a _D-Bus message"
-msgstr "Luo D-Bus-viesti"
-
-#: ../plugins/mail-notification/mail-notification.c:379
+#: ../plugins/mail-notification/mail-notification.c:292
 msgid "Evolution's Mail Notification"
 msgstr "Evolutionin viestihuomautus"
 
-#: ../plugins/mail-notification/mail-notification.c:400
+#: ../plugins/mail-notification/mail-notification.c:313
 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:422
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19272,91 +18795,162 @@ msgstr[1] ""
 "%d uutta viestiä\n"
 "kansiossa %s."
 
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:427
 #, 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:444
+#: ../plugins/mail-notification/mail-notification.c:449
 msgid "New email"
 msgstr "Uusi sähköposti"
 
-#: ../plugins/mail-notification/mail-notification.c:566
+#: ../plugins/mail-notification/mail-notification.c:506
 msgid "Show icon in _notification area"
 msgstr "Näytä kuvake _ilmoitusalueella"
 
-#: ../plugins/mail-notification/mail-notification.c:569
+#: ../plugins/mail-notification/mail-notification.c:534
 msgid "B_link icon in notification area"
 msgstr "_Vilkuta kuvaketta ilmoitusalueella"
 
-#: ../plugins/mail-notification/mail-notification.c:571
+#: ../plugins/mail-notification/mail-notification.c:544
 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:723
 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:752
 msgid "_Beep"
 msgstr "_Piippaa"
 
-#: ../plugins/mail-notification/mail-notification.c:759
-msgid "Play _sound file"
-msgstr "So_ita äänitiedosto"
+#: ../plugins/mail-notification/mail-notification.c:765
+msgid "Use sound _theme"
+msgstr "Käytä ääni_teemaa"
 
-#: ../plugins/mail-notification/mail-notification.c:770
-msgid "Specify _filename:"
-msgstr "Anna _tiedostonimi:"
+#: ../plugins/mail-notification/mail-notification.c:784
+msgid "Play _file:"
+msgstr "So_ita tiedosto:"
 
-#: ../plugins/mail-notification/mail-notification.c:771
+#: ../plugins/mail-notification/mail-notification.c:795
 msgid "Select sound file"
 msgstr "Valitse äänitiedosto"
 
-#: ../plugins/mail-notification/mail-notification.c:772
-msgid "Pl_ay"
-msgstr "_Soita"
-
-#: ../plugins/mail-notification/mail-notification.c:829
+#: ../plugins/mail-notification/mail-notification.c:853
 msgid "Notify new messages for _Inbox only"
 msgstr "Huomauta uusista viesteistä _vain saapuvien kansiossa"
 
+#: ../plugins/mail-notification/mail-notification.c:862
+msgid "Generate a _D-Bus message"
+msgstr "Luo D-Bus-viesti"
+
 #: ../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:394
+#, 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:397
+#, c-format
+msgid ""
+"Selected task list contains task '%s' already. Would you like to edit the "
+"old task?"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:400
+#, c-format
+msgid ""
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:417
+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:420
+msgid ""
+"Selected task list contains some tasks for the given mails already. Would "
+"you like to create new tasks anyway?"
+msgstr ""
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:423
 msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
+"Selected memo list contains some memos for the given mails already. Would "
+"you like to create new memos anyway?"
 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:441
+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:447
+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-task/mail-to-task.c:453
+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:512
+msgid "[No Summary]"
+msgstr "[Ei yhteenvetoa]"
 
-#: ../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:523
+msgid "Invalid object returned from a server"
+msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:287
+#: ../plugins/mail-to-task/mail-to-task.c:594
+#, c-format
+msgid "An error occurred during processing: %s"
+msgstr "Tapahtui virhe käsiteltäessä: %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:623
 #, 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:630
+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:633
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19364,65 +18958,114 @@ 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:636
 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/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"
+#: ../plugins/mail-to-task/mail-to-task.c:838
+#, 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:3
-msgid "Mail to task"
-msgstr "Viesti tehtäväksi"
+#: ../plugins/mail-to-task/mail-to-task.c:957
+msgid "Create an _Event"
+msgstr "Luo t_apahtuma"
 
-#: ../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/mail-to-task.c:959
+msgid "Create a new event from the selected message"
+msgstr "Luo uusi tapahtuma valitusta viestistä"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
-msgid "Contact list _owner"
-msgstr "Ota yhteyttä listan _omistajaan"
+#: ../plugins/mail-to-task/mail-to-task.c:964
+msgid "Create a Mem_o"
+msgstr "Luo _muistilappu"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
-msgid "Get list _archive"
+#: ../plugins/mail-to-task/mail-to-task.c:966
+msgid "Create a new memo from the selected message"
+msgstr "Luo uusi muistilappu valitusta viestistä"
+
+#: ../plugins/mail-to-task/mail-to-task.c:971
+msgid "Create a _Task"
+msgstr "Luo _tehtävä"
+
+#: ../plugins/mail-to-task/mail-to-task.c:973
+msgid "Create a new task from the selected message"
+msgstr "Luo uusi tehtävä valitusta viestistä"
+
+#: ../plugins/mail-to-task/mail-to-task.c:981
+msgid "Create a _Meeting"
+msgstr "Luo _kokous"
+
+#: ../plugins/mail-to-task/mail-to-task.c:983
+msgid "Create a new meeting from the selected message"
+msgstr "Luo uusi kokous valitusta viestistä"
+
+#: ../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/mailing-list-actions/mailing-list-actions.c:276
+msgid "Get List _Archive"
 msgstr "Nouda listan _arkisto"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
-msgid "Get list _usage information"
-msgstr "Näytä listan _käyttötiedot"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:278
+msgid "Get an archive of the list this message belongs to"
+msgstr "Nouda arkisto viestin sisältämästä postituslistasta"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
-msgid "Mailing List Actions"
-msgstr "Postituslistan toiminnot"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+msgid "Get List _Usage Information"
+msgstr "Näytä tietoja listan _käytöstä"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
-msgid "Mailing _List"
-msgstr "Postitus_lista"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+msgid "Get information about the usage of the list this message belongs to"
+msgstr "Nouda tietoja viestin sisältämän postituslistan käytöstä"
 
-#: ../plugins/mailing-list-actions/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...)."
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+msgid "Contact List _Owner"
+msgstr "Ota yhteyttä listan _omistajaan"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr "Ota yhteyttä viestin sisältämän sähköpostilistan omistajaan"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
-msgid "_Post message to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+msgid "_Post Message to List"
 msgstr "_Lähetä viesti listalle"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
-msgid "_Subscribe to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "Kirjoita vastaus viestin sisältämälle sähköpostilistalle"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+msgid "_Subscribe to List"
 msgstr "_Tilaa lista"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
-msgid "_Un-subscribe to list"
-msgstr "_Peru listan tilaus"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "Tilaa viestin sisältämä postituslista"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+msgid "_Unsubscribe from List"
+msgstr "Per_u listan tilaus"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+msgid "Unsubscribe from the mailing list this message belongs to"
+msgstr "Peru viestin sisältämän postituslistan tilaus"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+msgid "Mailing _List"
+msgstr "Postitus_lista"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Mailing List Actions"
+msgstr "Postituslistan toiminnot"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+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.error.xml.h:1
 msgid "Action not available"
@@ -19503,59 +19146,11 @@ msgstr "_Muokkaa viestiä"
 msgid "_Send message"
 msgstr "_Lähetä viesti"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-msgid "Contact List _Owner"
-msgstr "Ota yhteyttä listan _omistajaan"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
-msgid "Contact the owner of the mailing list this message belongs to"
-msgstr "Ota yhteyttä viestin sisältämän sähköpostilistan omistajaan"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get List _Archive"
-msgstr "Nouda listan _arkisto"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-msgid "Get List _Usage Information"
-msgstr "Näytä tietoja listan _käytöstä"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
-msgid "Get an archive of the list this message belongs to"
-msgstr "Nouda arkisto viestin sisältämästä postituslistasta"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
-msgid "Get information about the usage of the list this message belongs to"
-msgstr "Nouda tietoja viestin sisältämän postituslistan käytöstä"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
-msgid "Post a message to the mailing list this message belongs to"
-msgstr "Kirjoita vastaus viestin sisältämälle sähköpostilistalle"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
-msgid "Subscribe to the mailing list this message belongs to"
-msgstr "Tilaa viestin sisältämä postituslista"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
-msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr "Peru viestin sisältämän postituslistan tilaus"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-msgid "_Post Message to List"
-msgstr "_Lähetä viesti listalle"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-msgid "_Subscribe to List"
-msgstr "_Tilaa lista"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-msgid "_Unsubscribe from List"
-msgstr "Per_u listan tilaus"
-
-#: ../plugins/mark-all-read/mark-all-read.c:39
+#: ../plugins/mark-all-read/mark-all-read.c:43
 msgid "Also mark messages in subfolders?"
 msgstr "Merkitse viestit myös alikansioissa?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:41
+#: ../plugins/mark-all-read/mark-all-read.c:45
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -19563,53 +19158,36 @@ 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:172
+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:186
+msgid "In Current _Folder Only"
+msgstr "Vain nykyisessä _kansiossa"
+
+#: ../plugins/mark-all-read/mark-all-read.c:297
+msgid "Mark Me_ssages as Read"
+msgstr "Merkitse vie_stit luetuiksi"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Merkitse kaikki luetuksi"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-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"
-
-#: ../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"
+msgid "Mark all messages in a folder as read."
+msgstr "Merkitse kaikki kansion viestit luetuksi."
 
 #: ../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
-#: ../plugins/plugin-manager/plugin-manager.c:252
+#: ../plugins/plugin-manager/plugin-manager.c:244
 msgid "Plugin Manager"
 msgstr "Lisäosien hallinta"
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
-msgid "Enable and disable plugins"
-msgstr "Käytä ja poista käytöstä lisäosia"
-
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-msgid "_Plugins"
-msgstr "_Lisäosat"
-
-#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../plugins/plugin-manager/plugin-manager.c:59
 msgid "Author(s)"
 msgstr "Kirjoittaja(t)"
 
@@ -19617,41 +19195,41 @@ msgstr "Kirjoittaja(t)"
 msgid "Configuration"
 msgstr "Asetukset"
 
-#: ../plugins/plugin-manager/plugin-manager.c:265
+#: ../plugins/plugin-manager/plugin-manager.c:259
 msgid "Note: Some changes will not take effect until restart"
 msgstr ""
 "Huomio: jotkut muutokset eivät astu voimaan ennen uudelleenkäynnistystä"
 
-#: ../plugins/plugin-manager/plugin-manager.c:291
+#: ../plugins/plugin-manager/plugin-manager.c:285
 msgid "Overview"
 msgstr "Yhteenveto"
 
-#: ../plugins/plugin-manager/plugin-manager.c:362
-#: ../plugins/plugin-manager/plugin-manager.c:424
+#: ../plugins/plugin-manager/plugin-manager.c:356
+#: ../plugins/plugin-manager/plugin-manager.c:418
 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"
+#: ../plugins/plugin-manager/plugin-manager.c:430
+msgid "_Plugins"
+msgstr "_Lisäosat"
+
+#: ../plugins/plugin-manager/plugin-manager.c:432
+msgid "Enable and disable plugins"
+msgstr "Käytä ja poista käytöstä lisäosia"
 
 #. 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 +19251,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"
@@ -19688,45 +19266,84 @@ msgstr "Outlookin PST-tuoja"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlookin omat kansiot (.pst)"
 
+#: ../plugins/pst-import/pst-importer.c:298
+msgid "_Mail"
+msgstr "_Sähköposti"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../plugins/pst-import/pst-importer.c:316
 msgid "_Address Book"
 msgstr "_Osoitekirja"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:325
+#: ../plugins/pst-import/pst-importer.c:323
 msgid "A_ppointments"
 msgstr "_Tapaamiset"
 
+#. Tasks
+#: ../plugins/pst-import/pst-importer.c:329 ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tehtävät"
+
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:337
+#: ../plugins/pst-import/pst-importer.c:335
 msgid "_Journal entries"
 msgstr "_Päiväkirjamerkinnät"
 
-#: ../plugins/pst-import/pst-importer.c:352
+#: ../plugins/pst-import/pst-importer.c:350
 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.xml.h:1
-msgid "_Publish Calendar Information"
-msgstr "Julkaise kalenteritietoja"
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Publish calendars to the web."
+msgstr "Julkaise kalenterit verkossa."
+
+#: ../plugins/publish-calendar/publish-calendar.c:94
+#: ../plugins/publish-calendar/publish-calendar.c:336
+#, c-format
+msgid "Could not open %s:"
+msgstr "Ei voitu avata %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:96
+#, c-format
+msgid "Could not open %s: Unknown error"
+msgstr "Ei voitu avata kohdetta %s: tuntematon virhe"
+
+#: ../plugins/publish-calendar/publish-calendar.c:116
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr "Virhe julkaistaessa kohteeseen %s:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:118
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr "Julkaisu kohteeseen %s onnistui"
+
+#: ../plugins/publish-calendar/publish-calendar.c:163
+#, c-format
+msgid "Mount of %s failed:"
+msgstr "Kohteen %s liittäminen epäonnistui."
+
+#: ../plugins/publish-calendar/publish-calendar.c:623
 msgid "Are you sure you want to remove this location?"
 msgstr "Haluatko varmasti poistaa tämän sijainnin?"
 
+#: ../plugins/publish-calendar/publish-calendar.c:937
+msgid "Could not create publish thread."
+msgstr "Julkaisusäiettä ei voitu luoda."
+
+#: ../plugins/publish-calendar/publish-calendar.c:944
+msgid "_Publish Calendar Information"
+msgstr "Julkaise kalenteritietoja"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
 msgstr "<span weight=\"bold\">Sijainti</span>"
@@ -19783,27 +19400,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,209 +19442,149 @@ 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"
 
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Hello Python"
-msgstr "Hei Python"
-
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
-msgid "Python Plugin Loader tests"
-msgstr "Pythonin liittännäislataimen testit"
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "Python-testilisäosa"
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "Testilisäosa pythonin EPlugin-lataimelle."
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using Python."
-msgstr "Muita pythonilla tehtyjä lisäosia lataava lisäosa."
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
-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:159
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:355
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:357
 msgid "Description List"
 msgstr "Kuvauslista"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:358
 msgid "Categories List"
 msgstr "Luokkalista"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:359
 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:362
 msgid "Contact List"
 msgstr "Yhteystietolista"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Start"
 msgstr "Alkaa"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "End"
 msgstr "Päättyy"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "percent Done"
 msgstr "prosenttia valmiina"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Attendees List"
 msgstr "Osanottajalista"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:371
 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:522
+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:529
+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:538
+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:545
+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:552
+msgid "_Encapsulate values with:"
+msgstr "_Kapsuloi arvot käyttäen:"
 
-#: ../plugins/save-calendar/csv-format.c:582
+#: ../plugins/save-calendar/csv-format.c:574
 msgid "Comma separated value format (.csv)"
 msgstr "Pilkulla erotettu muoto (.csv)"
 
@@ -20022,49 +19593,41 @@ 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."
-
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
-msgid "_Save to Disk"
-msgstr "_Tallenna levylle"
+msgid "Save a calendar or task list to disk."
+msgstr "Tallenna kalenteri tai tehtävälista levylle."
 
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:150
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
+#: ../plugins/save-calendar/rdf-format.c:371
 msgid "RDF format (.rdf)"
 msgstr "RDF-muoto (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:161
+#: ../plugins/save-calendar/save-calendar.c:111
+msgid "_Format:"
+msgstr "_Muoto:"
+
+#: ../plugins/save-calendar/save-calendar.c:172
 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"
+#: ../plugins/save-calendar/save-calendar.c:323
+msgid "Save the selected calendar to disk"
+msgstr "Tallenna valittu kalenteri levylle"
 
-#: ../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."
+#: ../plugins/save-calendar/save-calendar.c:358
+msgid "Save the selected memo list to disk"
+msgstr "Tallenna valittu muistilappu levylle"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-msgid "Show _only this Calendar"
-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"
-
-#: ../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"
+#: ../plugins/save-calendar/save-calendar.c:393
+msgid "Save the selected task list to disk"
+msgstr "Tallenna valittu tehtävälista levylle."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
@@ -20074,15 +19637,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:87
 msgid "Evolution Setup Assistant"
 msgstr "Evolutionin asetusapulainen"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:92
 msgid "Welcome"
 msgstr "Tervetuloa"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:97
 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 +19655,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
-msgid "Importing files"
-msgstr "Tiedostojen tuonti"
-
-#: ../plugins/startup-wizard/startup-wizard.c:137
-#: ../shell/e-shell-importer.c:141
+#: ../shell/e-shell-importer.c:129
 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:150
+#: ../shell/e-shell-importer.c:396
 #, 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:167
+msgid "Importing files"
+msgstr "Tiedostojen tuonti"
+
+#: ../plugins/startup-wizard/startup-wizard.c:235
+#: ../shell/e-shell-importer.c:519
 #, 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:237
+#: ../shell/e-shell-importer.c:538
 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,67 +19708,82 @@ msgstr ""
 "Luettelo avainsana- ja arvopareista, joita pohjat-lisäosa käyttää viestin "
 "rungon osien korvaamiseen."
 
-#: ../plugins/templates/templates.c:603
-msgid "No title"
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "Pohjiin perustuva mallilisäosa"
+
+#: ../plugins/templates/templates.c:634
+msgid "No Title"
 msgstr "Ei otsikkoa"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:705
 msgid "Save as _Template"
 msgstr "Tallenna _pohjana"
 
-#: ../plugins/templates/templates.c:713
+#: ../plugins/templates/templates.c:707
 msgid "Save as Template"
 msgstr "Tallenna pohjana"
 
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-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:160
+#: ../plugins/vcard-inline/vcard-inline.c:245
+msgid "Show Full vCard"
+msgstr "Näytä koko vCardin"
+
+#: ../plugins/vcard-inline/vcard-inline.c:163
+msgid "Show Compact vCard"
+msgstr "Näytä tiivistetty vCard"
+
+#: ../plugins/vcard-inline/vcard-inline.c:224
+msgid "There is one other contact."
+msgstr "Löytyi yksi muu yhteystieto."
+
+#: ../plugins/vcard-inline/vcard-inline.c:233
+#, 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:254
+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)"
 
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution-kuori"
-
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell Config factory"
-msgstr "Evolution-kuoren asetustehdas"
-
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution testi"
-
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolutionin testikomponentti"
-
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
 msgstr "Tunnistaudu välipalvelimelle"
@@ -20223,45 +19801,53 @@ msgid "Default sidebar width"
 msgstr "Sivupaneelin oletusleveys"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
+msgid "Default window X coordinate"
+msgstr "Oletusikkunan x-koordinaatti"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+msgid "Default window Y coordinate"
+msgstr "Oletusikkunan y-koordinaatti"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window height"
 msgstr "Ikkunan oletuskorkeus"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window state"
 msgstr "Ikkunan oletustila"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "Default window width"
 msgstr "Ikkunan oletusleveys"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 "Määrittää välipalvelinasetukset avattaessa HTTP- tai HTTPS-yhteyksiä "
 "verkkoon."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy host name"
 msgstr "HTTP-välipalvelimen verkkonimi"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy password"
 msgstr "HTTP-välipalvelimen salasana"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy port"
 msgstr "HTTP-välipalvelimen portti"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy username"
 msgstr "HTTP-välipalvelimen käyttäjätunnus"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID tai alias käynnistyksessä oletuksena näytettävälle komponentille."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
 "username is retrieved from the \"/apps/evolution/shell/network_config/"
@@ -20273,46 +19859,64 @@ msgstr ""
 "authentication_user\" ja salasana luetaan joko gnome-keyring -avainrenkaasta "
 "tai tiedostosta ~/.gnome2_private/Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Initial attachment view"
+msgstr "Liitenäkymän oletusarvo"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid "Initial file chooser folder"
+msgstr "Tiedostovalitsimen oletuskansio"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 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:22
 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:23
 msgid "Non-proxy hosts"
 msgstr "Välipalvelimen ohittavat palvelimet"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 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:25
 msgid "Proxy configuration mode"
 msgstr "Välipalvelimen asetustila"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 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:27
 msgid "SOCKS proxy port"
 msgstr "SOCKS-välipalvelimen portti"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 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:29
 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:30
 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 +19928,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:31
 msgid "Sidebar is visible"
 msgstr "Sivupaneeli on näkyvissä"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 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:33 ../shell/main.c:327
 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:34
 msgid "Statusbar is visible"
 msgstr "Tilarivi on näkyvissä"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -20348,19 +19952,27 @@ 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:36
+msgid "The default X coordinate for the main window."
+msgstr "Pääikkunan X-koordinaatin oletusarvo."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid "The default Y coordinate for the main window."
+msgstr "Pääikkunan Y-koordinaatin oletusarvo."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 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:39
 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:40
 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:41
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -20368,19 +19980,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:42
 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:43
 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:44
 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:45
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -20388,7 +20000,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:46
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -20396,7 +20008,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:47
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -20404,7 +20016,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:48
 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 +20026,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:49
 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,89 +20038,109 @@ 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:50
 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:51
 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:52
 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:53
 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:54
 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:55
 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:56
 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:57
 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:58
 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:59
 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:60
 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:61
 msgid "Window button style"
 msgstr "Ikkunan painikkeiden tyyli"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Window buttons are visible"
 msgstr "Ikkunan napit näytetään"
 
-#: ../shell/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
-msgstr "<b>Aktiiviset yhteydet</b>"
+#. Translators: The "Show:" label precedes a combo box that
+#. * allows the user to filter the current view.  Examples of
+#. * items that appear in the combo box are "Unread Messages",
+#. * "Important Messages", or "Active Appointments".
+#: ../shell/e-shell-content.c:867
+msgid "Sho_w:"
+msgstr "Nä_ytä:"
+
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-content.c:892
+msgid "Sear_ch:"
+msgstr "_Etsi:"
 
-#: ../shell/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Aktiiviset yhteydet"
+#. Scope Combo Widgets
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-content.c:934
+msgid "i_n"
+msgstr " lä_hteestä "
 
-#: ../shell/e-active-connection-dialog.glade.h:3
-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-content.c:1357
+msgid "Advanced Search"
+msgstr "Oma haku"
+
+#: ../shell/e-shell-content.c:1414 ../shell/e-shell-content.c:1415
+msgid "Searches"
+msgstr "Haut"
+
+#: ../shell/e-shell-content.c:1460
+msgid "Save Search"
+msgstr "Tallenna haku"
 
-#: ../shell/e-shell-importer.c:131
+#: ../shell/e-shell-importer.c:119
 msgid "Choose the type of importer to run:"
 msgstr "Valitse suoritettavan tuojan tyyppi:"
 
-#: ../shell/e-shell-importer.c:134
+#: ../shell/e-shell-importer.c:122
 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:126
 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:132
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -20520,192 +20152,516 @@ 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:263
 msgid "F_ilename:"
 msgstr "_Tiedostonimi:"
 
-#: ../shell/e-shell-importer.c:287
+#: ../shell/e-shell-importer.c:268
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: ../shell/e-shell-importer.c:296
+#: ../shell/e-shell-importer.c:277
 msgid "File _type:"
 msgstr "Tiedoston _tyyppi:"
 
-#: ../shell/e-shell-importer.c:332
+#: ../shell/e-shell-importer.c:329
 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:332
 msgid "Import a _single file"
 msgstr "Tuo _yksi tiedosto"
 
-#: ../shell/e-shell-settings-dialog.c:313
-msgid "Evolution Preferences"
-msgstr "Evolutionin asetukset"
+#: ../shell/e-shell-importer.c:692 ../shell/e-shell-importer.c:706
+msgid "Evolution Import Assistant"
+msgstr "Evolutionin tuoden 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
-#, c-format
-msgid "%s - Evolution"
-msgstr "%s - evolution"
+#: ../shell/e-shell-importer.c:701
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
+msgstr ""
+"Tervetuloa Evolutionin tuontiapulaiseen.\n"
+"Tällä apulaisella voit tuoda ulkopuolisia tiedostoja muista ohjelmista "
+"Evolutionin käyttöön."
+
+#: ../shell/e-shell-importer.c:720
+msgid "Importer Type"
+msgstr "Tuojan tyyppi"
+
+#: ../shell/e-shell-importer.c:733
+msgid "Select Information to Import"
+msgstr "Valitse tuotavat tiedot"
+
+#: ../shell/e-shell-importer.c:745
+msgid "Select a File"
+msgstr "Valitse tiedosto"
+
+#: ../shell/e-shell-importer.c:754
+msgid "Import Location"
+msgstr "Tuo sijainti"
+
+#: ../shell/e-shell-importer.c:760
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "Tuo tiedosto Evolutioniin napsauttamalla \"Toteuta\"."
 
-#: ../shell/e-shell-window-commands.c:75
-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-importer.c:764
+msgid "Import File"
+msgstr "Tuo tiedosto"
 
-#: ../shell/e-shell-window-commands.c:83
+#: ../shell/e-shell-migrate.c:242 ../shell/e-shell-migrate.c:243
 #, c-format
-msgid "Error executing %s."
-msgstr "Virhe suoritettaessa %s."
+msgid "%ld KB"
+msgstr "%ld KB"
 
-#: ../shell/e-shell-window-commands.c:139
-msgid "Bug buddy is not installed."
-msgstr "Bug buddya ei ole asennettu."
+#: ../shell/e-shell-switcher.c:446
+msgid "Toolbar Style"
+msgstr "_Työkalupalkin tyyli"
+
+#: ../shell/e-shell-switcher.c:447
+msgid "The switcher's toolbar style"
+msgstr "Vaihtimen työkalupalkin tyyli"
+
+#: ../shell/e-shell-switcher.c:463
+msgid "Toolbar Visible"
+msgstr "Työkalupalkki näkyvissä"
+
+#: ../shell/e-shell-switcher.c:464
+msgid "Whether the switcher is visible"
+msgstr "Näytetäänkö valitsin"
+
+#: ../shell/e-shell-view.c:485
+msgid "Switcher Action"
+msgstr "Vaihtimen toiminto"
+
+#: ../shell/e-shell-view.c:486
+msgid "The switcher action for this shell view"
+msgstr "Tämän kuorinäkymän vaihtimen toiminto"
 
-#: ../shell/e-shell-window-commands.c:142
-msgid "Bug buddy could not be run."
-msgstr "Bug buddya ei voi suorittaa."
+#: ../shell/e-shell-view.c:501
+msgid "Page Number"
+msgstr "Sivunumero"
+
+#: ../shell/e-shell-view.c:502
+msgid "The notebook page number of the shell view"
+msgstr "Tämän kuorinäkymä välilehden sivunumero"
+
+#: ../shell/e-shell-view.c:520
+msgid "The title of the shell view"
+msgstr "Kuorinäkymän otsikko"
+
+#: ../shell/e-shell-view.c:535
+msgid "The EShellBackend for this shell view"
+msgstr "Tämän kuorinäkymän EShellBackend"
+
+#: ../shell/e-shell-view.c:550
+msgid "Shell Content Widget"
+msgstr "Kuoren sisältöelementti"
+
+#: ../shell/e-shell-view.c:551
+msgid "The content widget appears in a shell window's right pane"
+msgstr "Sisältöelementti näytetään kuori-ikkunan oikeana paneelina"
+
+#: ../shell/e-shell-view.c:567
+msgid "Shell Sidebar Widget"
+msgstr "Kuoren sivupalkkielementti"
+
+#: ../shell/e-shell-view.c:568
+msgid "The sidebar widget appears in a shell window's left pane"
+msgstr "Sivupalkkielementti näytetään kuori-ikkunan vasempana paneelina"
+
+#: ../shell/e-shell-view.c:583
+msgid "Shell Taskbar Widget"
+msgstr "Kuoren tehtävälistaelementti"
+
+#: ../shell/e-shell-view.c:584
+msgid "The taskbar widget appears at the bottom of a shell window"
+msgstr "Tehtävälistaelementti näytetään kuori-ikkunan alaosassa"
+
+#: ../shell/e-shell-view.c:599
+msgid "Shell Window"
+msgstr "Kuoren ikkuna"
+
+#: ../shell/e-shell-view.c:600
+msgid "The window to which the shell view belongs"
+msgstr "Ikkuna, johon kuorinäkymä kuuluu"
+
+#: ../shell/e-shell-view.c:615
+msgid "Current View ID"
+msgstr "Nykyisen näkymän tunniste"
+
+#: ../shell/e-shell-view.c:616
+msgid "The current GAL view ID"
+msgstr "Nykyisen GAL-näkymän tunniste"
 
 #. 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-actions.c:644
 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-actions.c:655
 msgid "Evolution Website"
 msgstr "Evolutionin www-sivut"
 
-#: ../shell/e-shell-window-commands.c:1170
-msgid "_Work Online"
-msgstr "_Yhteydellinen tila"
+#: ../shell/e-shell-window-actions.c:1252
+msgid "Bug Buddy is not installed."
+msgstr "Bug buddya ei ole asennettu."
+
+#: ../shell/e-shell-window-actions.c:1254
+msgid "Bug Buddy could not be run."
+msgstr "Bug buddya ei voitu suorittaa."
+
+#: ../shell/e-shell-window-actions.c:1356
+msgid "GNOME Pilot is not installed."
+msgstr "Gnome-pilotia ei ole asennettu."
+
+#: ../shell/e-shell-window-actions.c:1358
+msgid "GNOME Pilot could not be run."
+msgstr "Gnome-pilotia ei voitu suorittaa."
+
+#: ../shell/e-shell-window-actions.c:1452
+msgid "Show information about Evolution"
+msgstr "Näytä tietoja Evolutionista"
+
+#: ../shell/e-shell-window-actions.c:1457
+msgid "_Close Window"
+msgstr "_Sulje ikkuna"
+
+#: ../shell/e-shell-window-actions.c:1464
+msgid "_Contents"
+msgstr "_Sisältö"
+
+#: ../shell/e-shell-window-actions.c:1466
+msgid "Open the Evolution User Guide"
+msgstr "Avaa Evolutionin käyttäjäopas"
+
+#: ../shell/e-shell-window-actions.c:1471
+msgid "Evolution _FAQ"
+msgstr "Evolution _FAQ"
+
+#: ../shell/e-shell-window-actions.c:1473
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "Avaa usein kysyttyjen kysymysten www-sivu"
+
+#: ../shell/e-shell-window-actions.c:1478
+msgid "_Forget Passwords"
+msgstr "_Unohda salasanat"
+
+#: ../shell/e-shell-window-actions.c:1480
+msgid "Forget all remembered passwords"
+msgstr "Unohda kaikki tallennetut salasanat"
+
+#: ../shell/e-shell-window-actions.c:1485
+msgid "I_mport..."
+msgstr "_Tuo..."
+
+#: ../shell/e-shell-window-actions.c:1487
+msgid "Import data from other programs"
+msgstr "Tuo tietoja muista ohjelmista"
+
+#: ../shell/e-shell-window-actions.c:1492
+msgid "New _Window"
+msgstr "Uusi _Ikkuna"
+
+#: ../shell/e-shell-window-actions.c:1494
+msgid "Create a new window displaying this view"
+msgstr "Luo uusi ikkuna tälle näkymälle"
+
+#: ../shell/e-shell-window-actions.c:1501
+msgid "Configure Evolution"
+msgstr "Evolutionin asetukset"
+
+#: ../shell/e-shell-window-actions.c:1506
+msgid "_Quick Reference"
+msgstr "_Pikaopas"
+
+#: ../shell/e-shell-window-actions.c:1508
+msgid "Show Evolution's shortcut keys"
+msgstr "Näytä Evolutionin pikanäppäimet"
+
+#: ../shell/e-shell-window-actions.c:1515
+msgid "Exit the program"
+msgstr "Poistu ohjelmasta"
+
+#: ../shell/e-shell-window-actions.c:1520
+msgid "_Advanced Search..."
+msgstr "_Oma haku..."
+
+#: ../shell/e-shell-window-actions.c:1522
+msgid "Construct a more advanced search"
+msgstr "Luo monimutkaisempi haku"
+
+#: ../shell/e-shell-window-actions.c:1529
+msgid "Clear the current search parameters"
+msgstr "Tyhjennä nykyiset hakuehdot"
+
+#: ../shell/e-shell-window-actions.c:1534
+msgid "_Edit Saved Searches..."
+msgstr "_Muokkaa tallennettuja hakuja..."
+
+#: ../shell/e-shell-window-actions.c:1536
+msgid "Manage your saved searches"
+msgstr "Hallitse tallennettuja hakuja"
+
+#: ../shell/e-shell-window-actions.c:1543
+msgid "Click here to change the search type"
+msgstr "Muuta hakutyyppiä napsauttamalla tästä"
+
+#: ../shell/e-shell-window-actions.c:1548
+msgid "_Find Now"
+msgstr "_Etsi nyt"
+
+#. Block the default Ctrl+F.
+#: ../shell/e-shell-window-actions.c:1550
+msgid "Execute the current search parameters"
+msgstr "Suorita tämänhetkiset hakuehdot"
+
+#: ../shell/e-shell-window-actions.c:1555
+msgid "_Save Search..."
+msgstr "_Tallenna haku..."
+
+#: ../shell/e-shell-window-actions.c:1557
+msgid "Save the current search parameters"
+msgstr "Tallenna tämänhetkiset hakuehdot"
+
+#: ../shell/e-shell-window-actions.c:1562
+msgid "Send / _Receive"
+msgstr "Lähetä ja _vastaanota"
+
+#: ../shell/e-shell-window-actions.c:1564
+msgid "Send queued items and retrieve new items"
+msgstr "Lähetä jonossa olevat viestit ja nouda uudet viestit"
+
+#: ../shell/e-shell-window-actions.c:1569
+msgid "Submit _Bug Report..."
+msgstr "Lähetä _vikailmoitus..."
+
+#: ../shell/e-shell-window-actions.c:1571
+msgid "Submit a bug report using Bug Buddy"
+msgstr "Lähetä vikailmoitus käyttäen Bug Buddyä"
+
+#: ../shell/e-shell-window-actions.c:1576
+msgid "_Synchronization Options..."
+msgstr "_Synkronointiasetukset..."
+
+#: ../shell/e-shell-window-actions.c:1578
+msgid "Set up Pilot configuration"
+msgstr "Muokkaa Pilotin asetuksia"
 
-#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-actions.c:1583
 msgid "_Work Offline"
-msgstr "_Yhteydetön tila"
+msgstr "_Katkaise verkkoyhteydet"
 
-#: ../shell/e-shell-window-commands.c:1196
-msgid "Work Offline"
-msgstr "Valitse yhteydetön tila"
+#: ../shell/e-shell-window-actions.c:1585
+msgid "Put Evolution into offline mode"
+msgstr "Katkaise verkkoyhteydet"
 
-#: ../shell/e-shell-window.c:377
-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ä."
+#: ../shell/e-shell-window-actions.c:1590
+msgid "_Work Online"
+msgstr "A_vaa verkkoyhteydet"
 
-#: ../shell/e-shell-window.c:384
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution siirtyy yhteydettömään tilaan."
+#: ../shell/e-shell-window-actions.c:1592
+msgid "Put Evolution into online mode"
+msgstr "Avaa verkkoyhteydet"
 
-#: ../shell/e-shell-window.c:391
-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ä."
+#: ../shell/e-shell-window-actions.c:1620
+msgid "Lay_out"
+msgstr "_Asettelu"
 
-#: ../shell/e-shell-window.c:787
-#, c-format
-msgid "Switch to %s"
-msgstr "Avaa %s"
+#: ../shell/e-shell-window-actions.c:1627
+msgid "_New"
+msgstr "_Uusi"
 
-#: ../shell/e-shell.c:640
-msgid "Unknown system error."
-msgstr "Tuntematon järjestelmävirhe."
+#: ../shell/e-shell-window-actions.c:1634
+msgid "_Search"
+msgstr "Et_si"
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
+#: ../shell/e-shell-window-actions.c:1641
+msgid "_Switcher Appearance"
+msgstr "Valit_simen tyyli"
 
-#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
-msgid "OK"
-msgstr "OK"
+#: ../shell/e-shell-window-actions.c:1655
+msgid "_Window"
+msgstr "_Ikkuna "
+
+#: ../shell/e-shell-window-actions.c:1665
+msgid "Show Side _Bar"
+msgstr "Näytä sivu_palkki"
+
+#: ../shell/e-shell-window-actions.c:1667
+msgid "Show the side bar"
+msgstr "Näytä sivupalkki"
+
+#: ../shell/e-shell-window-actions.c:1673
+msgid "Show _Status Bar"
+msgstr "Näytä _tilarivi"
+
+#: ../shell/e-shell-window-actions.c:1675
+msgid "Show the status bar"
+msgstr "Näytä tilarivi"
+
+#: ../shell/e-shell-window-actions.c:1681
+msgid "Show _Buttons"
+msgstr "Näytä _painikkeet"
+
+#: ../shell/e-shell-window-actions.c:1683
+msgid "Show the switcher buttons"
+msgstr "Näytä vaihtimen painikkeet"
+
+#: ../shell/e-shell-window-actions.c:1689
+msgid "Show _Tool Bar"
+msgstr "Näytä työ_kalupalkki"
+
+#: ../shell/e-shell-window-actions.c:1691
+msgid "Show the toolbar"
+msgstr "Näytä työkalupalkki"
+
+#: ../shell/e-shell-window-actions.c:1713
+msgid "_Icons Only"
+msgstr "Vain _kuvakkeet"
+
+#: ../shell/e-shell-window-actions.c:1715
+msgid "Display window buttons with icons only"
+msgstr "Näytä ikkunan napit ainoastaan kuvakkeina"
+
+#: ../shell/e-shell-window-actions.c:1720
+msgid "_Text Only"
+msgstr "Vain _teksti"
+
+#: ../shell/e-shell-window-actions.c:1722
+msgid "Display window buttons with text only"
+msgstr "Näytä ikkunan napit ainoastaan tekstinä"
+
+#: ../shell/e-shell-window-actions.c:1727
+msgid "Icons _and Text"
+msgstr "Kuvakkeet _ja teksti"
+
+#: ../shell/e-shell-window-actions.c:1729
+msgid "Display window buttons with icons and text"
+msgstr "Näytä ikkunan napit kuvakkeina ja tekstinä"
+
+#: ../shell/e-shell-window-actions.c:1734
+msgid "Tool_bar Style"
+msgstr "_Työkalupalkin tyyli"
+
+#: ../shell/e-shell-window-actions.c:1736
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr "Näytä ikkunan napit työpöydän työkalupalkin asetuksen mukaisesti"
+
+#: ../shell/e-shell-window-actions.c:1744
+msgid "Define Views..."
+msgstr "Määrittele näkymät..."
+
+#: ../shell/e-shell-window-actions.c:1746
+msgid "Create or edit views"
+msgstr "Luo tai muokkaa näkymiä"
+
+#: ../shell/e-shell-window-actions.c:1751
+msgid "Save Custom View..."
+msgstr "Tallenna oma näkymä..."
+
+#: ../shell/e-shell-window-actions.c:1753
+msgid "Save current custom view"
+msgstr "Tallenna nykyinen muokattu näkymä"
+
+#: ../shell/e-shell-window-actions.c:1760
+msgid "C_urrent View"
+msgstr "N_ykyinen näkymä"
+
+#: ../shell/e-shell-window-actions.c:1770
+msgid "Custom View"
+msgstr "Oma näkymä"
 
-#: ../shell/e-shell.c:1263
-msgid "Invalid arguments"
-msgstr "Virheellisiä argumentteja"
+#: ../shell/e-shell-window-actions.c:1772
+msgid "Current view is a customized view"
+msgstr "Nykyinen näkymä tai muokattu näkymä"
 
-#: ../shell/e-shell.c:1265
-msgid "Cannot register on OAF"
-msgstr "OAF:ia ei voidaan rekisteröidä"
+#: ../shell/e-shell-window-actions.c:1782
+msgid "Change the page settings for your current printer"
+msgstr "Muuta nykyisen tulostimen sivuasetuksia"
 
-#: ../shell/e-shell.c:1267
-msgid "Configuration Database not found"
-msgstr "Asetustietokantaa ei löytynyt"
+#: ../shell/e-shell-window-actions.c:2054
+#, c-format
+msgid "Switch to %s"
+msgstr "Avaa %s"
 
-#: ../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-shell-window-actions.c:2257
+msgid "Execute these search parameters"
+msgstr "Suorita nämä hakuehdot"
+
+#: ../shell/e-shell-window-private.c:252
 msgid "New"
 msgstr "Uusi"
 
-#: ../shell/test/evolution-test-component.c:105
-msgid "New Test"
-msgstr "Uusi testi"
+#. Translators: This is used for the main window title.
+#: ../shell/e-shell-window-private.c:569
+#, c-format
+msgid "%s - Evolution"
+msgstr "%s - evolution"
 
-#: ../shell/test/evolution-test-component.c:106
-msgctxt "New"
-msgid "_Test"
-msgstr "_Testi"
+#: ../shell/e-shell-window.c:292
+msgid "Active Shell View"
+msgstr "Aktiivinen tulkkinäkymä"
 
-#: ../shell/test/evolution-test-component.c:107
-msgid "Create a new test item"
-msgstr "Luo uusi testijuttu"
+#: ../shell/e-shell-window.c:293
+msgid "Name of the active shell view"
+msgstr "Aktiivisen tulkkinäkymän nimi"
 
-#: ../shell/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Tuo tiedosto Evolutioniin painikkeesta \"Tuo\"."
+#: ../shell/e-shell-window.c:307
+msgid "Safe Mode"
+msgstr "Turvallinen tila"
 
-#: ../shell/import.glade.h:2
-msgid "Evolution Import Assistant"
-msgstr "Evolutionin tuoden asetukset"
+#: ../shell/e-shell-window.c:308
+msgid "Whether the shell window is in safe mode"
+msgstr "Onko tulkki-ikkuna turvallisessa tilassa"
 
-#: ../shell/import.glade.h:3
-msgid "Import File"
-msgstr "Tuo tiedosto"
+#: ../shell/e-shell-window.c:339
+msgid "UI Manager"
+msgstr "UI-hallinta"
 
-#: ../shell/import.glade.h:4
-msgid "Import Location"
-msgstr "Tuo sijainti"
+#: ../shell/e-shell-window.c:340
+msgid "The shell window's GtkUIManager"
+msgstr "Tulkki-ikkunan GtkUIManager"
 
-#: ../shell/import.glade.h:5
-msgid "Importer Type"
-msgstr "Tuojan tyyppi"
+#: ../shell/e-shell.c:207
+msgid "Preparing to go offline..."
+msgstr "Valmistellaan verkotonta tilaa..."
 
-#: ../shell/import.glade.h:6
-msgid "Select Information to Import"
-msgstr "Valitse tuotavat tiedot"
+#: ../shell/e-shell.c:261
+msgid "Preparing to go online..."
+msgstr "Valmistellaan verkkoyhteydellistä tilaa..."
 
-#: ../shell/import.glade.h:7
-msgid "Select a File"
-msgstr "Valitse tiedosto"
+#: ../shell/e-shell.c:324
+msgid "Preparing to quit..."
+msgstr "Valmistellaan sulkemista..."
 
-#: ../shell/import.glade.h:8
-msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"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."
+#: ../shell/e-shell.c:688
+msgid "Network Available"
+msgstr "Verkko käytettävissä"
+
+#: ../shell/e-shell.c:689
+msgid "Whether the network is available"
+msgstr "Onko verkko käytettävissä"
+
+#: ../shell/e-shell.c:704 ../widgets/misc/e-online-button.c:130
+msgid "Online"
+msgstr "Verkossa"
+
+#: ../shell/e-shell.c:705
+msgid "Whether the shell is online"
+msgstr "Onko tulkki verkossa"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:221
+#: ../shell/main.c:176
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20741,7 +20697,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:200
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20749,43 +20705,43 @@ msgstr ""
 "Kiitos\n"
 "Evolution-tiimi\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:207
 msgid "Do not tell me again"
 msgstr "�lä kerro tätä uudestaan"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:325
 msgid "Start Evolution activating the specified component"
 msgstr "Käynnistä Evolution aktivoimalla määritelty komponentti"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:329
 msgid "Start in online mode"
-msgstr "Aloita yhteydellisessä tilassa"
+msgstr "Käynnistä verkkoyhteydet auki"
 
-#: ../shell/main.c:488
+#: ../shell/main.c:332
 msgid "Forcibly shut down all Evolution components"
 msgstr "Sulje kaikki Evolutionin osat väkisin"
 
-#: ../shell/main.c:492
+#: ../shell/main.c:336
 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:339
 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:341
 msgid "Disable loading of any plugins."
 msgstr "�lä lataa mitään lisäosia."
 
-#: ../shell/main.c:499
+#: ../shell/main.c:343
 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:494
 msgid "- The Evolution PIM and Email Client"
 msgstr ", sähköposti- ja ajanhallintaohjelma"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:518
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20799,22 +20755,14 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Haluatko varmasti unohtaa kaikki muistetut salasanat?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Cannot start Evolution"
-msgstr "Evolutionia ei voitu käynnistää"
-
-#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "Jatka"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:3
 msgid "Delete old data from version {0}?"
 msgstr "Poistetaanko vanhat tiedot versiosta {0}"
 
-#: ../shell/shell.error.xml.h:5
-msgid "Evolution can not start."
-msgstr "Evolution ei käynnisty."
-
-#: ../shell/shell.error.xml.h:6
+#: ../shell/shell.error.xml.h:4
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
@@ -20822,15 +20770,15 @@ msgstr ""
 "Salasanojen unohtaminen tyhjentää kaikki tallennetut salasanat. Salasanaa "
 "kysytään uudestaan, kun sitä seuraavan kerran tarvitaan."
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:6
 msgid "Insufficient disk space for upgrade."
 msgstr "Levytila ei riitä päivitykseen."
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:7
 msgid "Really delete old data?"
 msgstr "Poistetaanko vanhat tiedot varmasti?"
 
-#: ../shell/shell.error.xml.h:10
+#: ../shell/shell.error.xml.h:8
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -20851,7 +20799,7 @@ msgstr ""
 "Kun vanhat tiedot on poistettu, et voi vaihtaa helposti takaisin vanhaan "
 "versioon ja saada tietojasi näkyviin ilman käsityötä.\n"
 
-#: ../shell/shell.error.xml.h:16
+#: ../shell/shell.error.xml.h:14
 msgid ""
 "The previous version of Evolution stored its data in a different location.\n"
 "\n"
@@ -20866,11 +20814,11 @@ msgstr ""
 "sisältöineen pysyvästi. Jos päätät pitää nämä tiedot, voit itse poistaa "
 "hakemiston &quot;evolution&quot; myöhemmin.\n"
 
-#: ../shell/shell.error.xml.h:20
-msgid "Upgrade from previous version failed: {0}"
-msgstr "Päivitys edellisestä versiosta epäonnistui: {0}"
+#: ../shell/shell.error.xml.h:18
+msgid "Upgrade from previous version failed:"
+msgstr "Päivitys edellisestä versiosta epäonnistui: "
 
-#: ../shell/shell.error.xml.h:21
+#: ../shell/shell.error.xml.h:19
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
@@ -20883,50 +20831,110 @@ msgstr ""
 "Sinun täytyy vapauttaa enemmän tilaa kotihakemistostasi ennen kuin voit "
 "jatkaa."
 
-#: ../shell/shell.error.xml.h:24
-msgid ""
-"Your system configuration does not match your Evolution configuration.\n"
-"\n"
-"Click help for details"
-msgstr "Valitse Ohje saadaksesi lisätietoja"
-
-#: ../shell/shell.error.xml.h:27
-msgid ""
-"Your system configuration does not match your Evolution configuration:\n"
-"\n"
-"{0}\n"
-"\n"
-"Click help for details."
-msgstr ""
-"Järjestelmäsi kokoonpano ei vastaa Evolutionin asetuksiasi:\n"
-"\n"
-"{0}\n"
-"\n"
-"Valitse Ohje saadaksesi lisätietoja"
-
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:22
 msgid "_Forget"
 msgstr "_Unohda"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:23
 msgid "_Keep Data"
 msgstr "_Säilytä tiedot"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:24
 msgid "_Remind Me Later"
-msgstr "_Muistuta minua myöhemmin"
+msgstr "_Muistuta myöhemmin"
 
-#: ../shell/shell.error.xml.h:35
+#: ../shell/shell.error.xml.h:25
 msgid ""
-"{1}\n"
+"{0}\n"
 "\n"
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
 msgstr ""
-"{1}\n"
+"{0}\n"
 "\n"
 "Jos päätät jatkaa, et ehkä pääse käsiksi joihinkin vanhoista "
-"tiedostoistasi.\n"
+"tiedoistasi.\n"
+
+#: ../shell/test/e-test-shell-backend.c:60
+msgctxt "New"
+msgid "_Test Item"
+msgstr "_Testikohde"
+
+#: ../shell/test/e-test-shell-backend.c:62
+msgid "Create a new test item"
+msgstr "Luo uusi testikohde"
+
+#: ../shell/test/e-test-shell-backend.c:70
+msgctxt "New"
+msgid "Test _Source"
+msgstr "Testi_lähde"
+
+#: ../shell/test/e-test-shell-backend.c:72
+msgid "Create a new test source"
+msgstr "Luo uusi testilähde"
+
+#: ../smclient/eggdesktopfile.c:165
+#, c-format
+msgid "File is not a valid .desktop file"
+msgstr "Tiedosto ei ole kelvollinen .desktop-tiedosto"
+
+#: ../smclient/eggdesktopfile.c:188
+#, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr "Tuntematon työpöytätiedoston versio \"%s\""
+
+#: ../smclient/eggdesktopfile.c:958
+#, c-format
+msgid "Starting %s"
+msgstr "Käynnistetään %s"
+
+#: ../smclient/eggdesktopfile.c:1100
+#, c-format
+msgid "Application does not accept documents on command line"
+msgstr "Ohjelma ei hyväksy asiakirjoja komentorivillä"
+
+#: ../smclient/eggdesktopfile.c:1168
+#, c-format
+msgid "Unrecognized launch option: %d"
+msgstr "Tuntematon käynnistinvalitsin: %d"
+
+#: ../smclient/eggdesktopfile.c:1373
+#, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr "Asiakirja-URIa ei voi välittää \"Type-Link\"-työpöytälinkille"
+
+#: ../smclient/eggdesktopfile.c:1394
+#, c-format
+msgid "Not a launchable item"
+msgstr "Kohde ei ole käynnistettävä"
+
+#: ../smclient/eggsmclient.c:225
+msgid "Disable connection to session manager"
+msgstr "Estä yhteys istunnonhallintaan"
+
+#: ../smclient/eggsmclient.c:228
+msgid "Specify file containing saved configuration"
+msgstr "Anna tallennetut asetukset sisältävä tiedosto"
+
+#: ../smclient/eggsmclient.c:228
+msgid "FILE"
+msgstr "TIEDOSTO"
+
+#: ../smclient/eggsmclient.c:231
+msgid "Specify session management ID"
+msgstr "Anna istunnonhallinnan tunniste"
+
+#: ../smclient/eggsmclient.c:231
+msgid "ID"
+msgstr "TUNNISTE"
+
+#: ../smclient/eggsmclient.c:252
+msgid "Session management options:"
+msgstr "Istunnonhallinnan valitsimet:"
+
+#: ../smclient/eggsmclient.c:253
+msgid "Show session management options"
+msgstr "Näytä istunnonhallinnan valinnat"
 
 #: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
@@ -20939,7 +20947,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 +20956,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 "
@@ -20958,8 +20966,8 @@ msgstr ""
 "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:384
+#: ../smime/gui/certificate-manager.c:612
 msgid "Select a certificate to import..."
 msgstr "Valitse tuotava varmenne..."
 
@@ -20967,44 +20975,48 @@ msgstr "Valitse tuotava varmenne..."
 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:152
+#: ../smime/gui/certificate-manager.c:399
+#: ../smime/gui/certificate-manager.c:626
 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:276
+#: ../smime/gui/certificate-manager.c:489
+#: ../smime/gui/certificate-manager.c:714
 msgid "Certificate Name"
 msgstr "Varmenteen nimi"
 
-#: ../smime/gui/certificate-manager.c:280
-#: ../smime/gui/certificate-manager.c:498
+#: ../smime/gui/certificate-manager.c:285
+#: ../smime/gui/certificate-manager.c:507
 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:294 ../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:302
 msgid "Expires"
 msgstr "Vanhenemispäivä"
 
-#: ../smime/gui/certificate-manager.c:389
+#: ../smime/gui/certificate-manager.c:393
 msgid "All email certificate files"
 msgstr "Kaikki sähköpostivarmennetiedostot"
 
-#: ../smime/gui/certificate-manager.c:489
+#: ../smime/gui/certificate-manager.c:498
 msgid "E-Mail Address"
 msgstr "Sähköpostiosoite"
 
-#: ../smime/gui/certificate-manager.c:613
+#: ../smime/gui/certificate-manager.c:621
 msgid "All CA certificate files"
 msgstr "Kaikki CA-varmenteiden tiedostot"
 
+#: ../smime/gui/certificate-manager.c:1052
+msgid "Certificates"
+msgstr "Varmenteet"
+
 #: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
@@ -21103,7 +21115,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 +21191,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 +21241,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 +21250,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"
 
@@ -21421,1318 +21433,6 @@ msgstr "Komentoa %s ei voitu suorittaa: %s\n"
 msgid "Shutting down %s (%s)\n"
 msgstr "Sammutetaan %s (%s)\n"
 
-#: ../ui/evolution-addressbook.xml.h:1
-msgid "Address _Book Properties"
-msgstr "Osoite_kirjan ominaisuudet"
-
-#: ../ui/evolution-addressbook.xml.h:3
-msgid "Change the properties of the selected folder"
-msgstr "Muuta valitun kansion ominaisuuksia"
-
-#: ../ui/evolution-addressbook.xml.h:4
-msgid "Co_py All Contacts To..."
-msgstr "Ko_pioi kaikki yhteystiedot..."
-
-#: ../ui/evolution-addressbook.xml.h:5
-msgid "Contact _Preview"
-msgstr "Yhteystiedon _esikatselu"
-
-#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Kopioi"
-
-#: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy selected contacts to another folder"
-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"
-
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
-msgid "Copy the selection"
-msgstr "Kopioi valinta"
-
-#: ../ui/evolution-addressbook.xml.h:10
-msgid "Copy to Folder..."
-msgstr "Kopioi kansioon..."
-
-#: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new address book folder"
-msgstr "Luo uusi osoitekirjakansio"
-
-#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
-#: ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Leikkaa"
-
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
-msgid "Cut the selection"
-msgstr "Leikkaa valinta"
-
-#: ../ui/evolution-addressbook.xml.h:14
-msgid "Del_ete Address Book"
-msgstr "_Poista osoitekirja"
-
-#: ../ui/evolution-addressbook.xml.h:16
-msgid "Delete selected contacts"
-msgstr "Poista valitut yhteystiedot"
-
-#: ../ui/evolution-addressbook.xml.h:17
-msgid "Delete the selected folder"
-msgstr "Poista valittu kansio"
-
-#: ../ui/evolution-addressbook.xml.h:18
-msgid "Forward Contact"
-msgstr "Välitä yhteystieto eteenpäin"
-
-#: ../ui/evolution-addressbook.xml.h:19
-msgid "Mo_ve All Contacts To..."
-msgstr "Sii_rrä kaikki yhteystiedot..."
-
-#: ../ui/evolution-addressbook.xml.h:20
-msgid "Move selected contacts to another folder"
-msgstr "Siirrä valitut yhteystiedot 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"
-
-#: ../ui/evolution-addressbook.xml.h:22
-msgid "Move to Folder..."
-msgstr "Siirrä kansioon..."
-
-#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
-#: ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Liitä"
-
-#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
-msgid "Paste the clipboard"
-msgstr "Liitä leikepöytä"
-
-#: ../ui/evolution-addressbook.xml.h:25
-msgid "Previews the contacts to be printed"
-msgstr "Esikatsele tulostettavia yhteystietoja"
-
-#: ../ui/evolution-addressbook.xml.h:28
-msgid "Print selected contacts"
-msgstr "Tulosta valitut yhteystiedot"
-
-#: ../ui/evolution-addressbook.xml.h:29
-msgid "Rename the selected folder"
-msgstr "Nimeä valittu kansio uudestaan"
-
-#: ../ui/evolution-addressbook.xml.h:30
-msgid "S_ave Address Book As VCard"
-msgstr "T_allenna osoitekirja VCardina"
-
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
-msgstr "Tallenna VCardina..."
-
-#: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard"
-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"
-
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2724
-msgid "Select All"
-msgstr "Valitse kaikki"
-
-#: ../ui/evolution-addressbook.xml.h:35
-msgid "Select _All"
-msgstr "Valitse _kaikki"
-
-#: ../ui/evolution-addressbook.xml.h:36
-msgid "Select all contacts"
-msgstr "Valitse kaikki yhteystiedot"
-
-#: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts"
-msgstr "Lähetä viesti valituille  henkilöille"
-
-#: ../ui/evolution-addressbook.xml.h:38
-msgid "Send message to contact"
-msgstr "Lähetä viesti henkilölle"
-
-#: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person"
-msgstr "Lähetä valitut yhteystiedot toiselle henkilölle"
-
-#: ../ui/evolution-addressbook.xml.h:40
-msgid "Show contact preview window"
-msgstr "Näytä yhteystiedon esikatseluruutu"
-
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "St_op"
-msgstr "Py_säytä"
-
-#: ../ui/evolution-addressbook.xml.h:42
-msgid "Stop"
-msgstr "Pysäytä"
-
-#: ../ui/evolution-addressbook.xml.h:43
-msgid "Stop Loading"
-msgstr "Pysäytä lataaminen"
-
-#: ../ui/evolution-addressbook.xml.h:44
-msgid "View the current contact"
-msgstr "Katsele nykyistä yhteystietoa"
-
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-tasks.xml.h:21
-msgid "_Actions"
-msgstr "T_oiminnot"
-
-#: ../ui/evolution-addressbook.xml.h:47
-msgid "_Copy Contact to..."
-msgstr "Kopioi yhteystieto..."
-
-#: ../ui/evolution-addressbook.xml.h:48
-msgid "_Copy Folder Contacts To"
-msgstr "_Kopioi kansion yhteystiedot..."
-
-#: ../ui/evolution-addressbook.xml.h:50
-msgid "_Delete Contact"
-msgstr "_Poista yhteystieto"
-
-#: ../ui/evolution-addressbook.xml.h:52
-msgid "_Forward Contact..."
-msgstr "_Välitä yhteystieto..."
-
-#: ../ui/evolution-addressbook.xml.h:53
-msgid "_Move Contact to..."
-msgstr "_Siirry yhteystieto..."
-
-#: ../ui/evolution-addressbook.xml.h:54
-msgid "_Move Folder Contacts To"
-msgstr "_Siirrä kansion sisältö..."
-
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
-msgid "_New"
-msgstr "_Uusi"
-
-#: ../ui/evolution-addressbook.xml.h:60
-msgid "_Rename"
-msgstr "_Nimeä uudestaan"
-
-#: ../ui/evolution-addressbook.xml.h:61
-msgid "_Save Contact as VCard..."
-msgstr "_Tallenna yhteystieto VCardina..."
-
-#: ../ui/evolution-addressbook.xml.h:62
-msgid "_Save Folder Contacts As VCard"
-msgstr "Tallenna kansion yhteystiedot VCardina"
-
-#: ../ui/evolution-addressbook.xml.h:63
-msgid "_Send Message to Contact..."
-msgstr "Lähetä _viesti henkilölle..."
-
-#: ../ui/evolution-calendar.xml.h:4
-msgid "Day"
-msgstr "Päivä"
-
-#: ../ui/evolution-calendar.xml.h:6
-msgid "Delete _all Occurrences"
-msgstr "Poista k_aikki tapahtumakerrat"
-
-#: ../ui/evolution-calendar.xml.h:7
-msgid "Delete all occurrences"
-msgstr "Poista kaikki esiintymät"
-
-#: ../ui/evolution-calendar.xml.h:8
-msgid "Delete the appointment"
-msgstr "Poista tapaaminen"
-
-#: ../ui/evolution-calendar.xml.h:10
-msgid "Delete this occurrence"
-msgstr "Poista tapahtumiskerta"
-
-#: ../ui/evolution-calendar.xml.h:11
-msgid "Go To"
-msgstr "Siirry"
-
-#: ../ui/evolution-calendar.xml.h:12
-msgid "Go back"
-msgstr "Takaisin"
-
-#: ../ui/evolution-calendar.xml.h:13
-msgid "Go forward"
-msgstr "Mene eteenpäin"
-
-#: ../ui/evolution-calendar.xml.h:14
-msgid "List"
-msgstr "Lista"
-
-#: ../ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "Kuukausi"
-
-#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:195
-msgid "Next"
-msgstr "Seuraava"
-
-#: ../ui/evolution-calendar.xml.h:18
-msgid "Previews the calendar to be printed"
-msgstr "Esikatselee tulostettavaa kalenteria"
-
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:171
-msgid "Previous"
-msgstr "Edellinen"
-
-#: ../ui/evolution-calendar.xml.h:22
-msgid "Print this calendar"
-msgstr "Tulosta tämä kalenteri"
-
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
-msgid "Purg_e"
-msgstr "Tyhjennä"
-
-#: ../ui/evolution-calendar.xml.h:24
-msgid "Purge old appointments and meetings"
-msgstr "Poista vanhat tapaamiset ja kokoukset"
-
-#: ../ui/evolution-calendar.xml.h:25
-msgid "Select _Date"
-msgstr "Valitse _päivä"
-
-#: ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
-msgstr "Valitse _tämä päivä"
-
-#: ../ui/evolution-calendar.xml.h:27
-msgid "Select a specific date"
-msgstr "Valitse tietty päivä"
-
-#: ../ui/evolution-calendar.xml.h:28
-msgid "Select today"
-msgstr "Valitse tämä päivä"
-
-#: ../ui/evolution-calendar.xml.h:29
-msgid "Show as list"
-msgstr "Näytä luettelona"
-
-#: ../ui/evolution-calendar.xml.h:30
-msgid "Show one day"
-msgstr "Näytä yksi päivä"
-
-#: ../ui/evolution-calendar.xml.h:31
-msgid "Show one month"
-msgstr "Näytä yksi kuukausi"
-
-#: ../ui/evolution-calendar.xml.h:32
-msgid "Show one week"
-msgstr "Näytä yksi viikko"
-
-#: ../ui/evolution-calendar.xml.h:33
-msgid "Show the working week"
-msgstr "Näytä työviikko"
-
-#: ../ui/evolution-calendar.xml.h:35
-msgid "View the current appointment"
-msgstr "Näytä valittu tapaaminen"
-
-#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "Näytä lokiviestit vianetsintäkonsolissa"
-
-#: ../ui/evolution-calendar.xml.h:37
-msgid "Week"
-msgstr "Viikko"
-
-#: ../ui/evolution-calendar.xml.h:38
-msgid "Work Week"
-msgstr "Työviikko"
-
-#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "_Vianetsintälokit"
-
-#: ../ui/evolution-calendar.xml.h:45
-msgid "_Open Appointment"
-msgstr "_Avaa tapaaminen"
-
-#: ../ui/evolution-mail-global.xml.h:2
-msgid "Cancel the current mail operation"
-msgstr "Peruuta nykyinen postioperaatio"
-
-#: ../ui/evolution-mail-global.xml.h:3
-msgid "Copy the selected folder into another folder"
-msgstr "Kopioi valittu kansio toiseen kansioon"
-
-#: ../ui/evolution-mail-global.xml.h:4
-msgid "Create a new folder for storing mail"
-msgstr "Luo uusi kansio viestien tallentamiseen"
-
-#: ../ui/evolution-mail-global.xml.h:5
-msgid "Create or edit Search Folder definitions"
-msgstr "Luo tai muokkaa hakunäkymien määrittelyjä"
-
-#: ../ui/evolution-mail-global.xml.h:6
-msgid "Create or edit rules for filtering new mail"
-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"
-
-#: ../ui/evolution-mail-global.xml.h:8
-msgid "Empty _Trash"
-msgstr "_Tyhjennä roskakori"
-
-#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-msgid "F_older"
-msgstr "_Kansio"
-
-#: ../ui/evolution-mail-global.xml.h:10
-msgid "Move the selected folder into another folder"
-msgstr "Siirrä valittu kansio toiseen kansioon"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:12
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "Poista kaikki pyyhityt viesti pysyvästi kaikista kansioista"
-
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Search F_olders"
-msgstr "Etsi _kansioita"
-
-#: ../ui/evolution-mail-global.xml.h:14
-msgid "Show Message _Preview"
-msgstr "Näytä viestin _esikatselu"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview below the message list"
-msgstr "Näytä viestin esikatselu viestiluettelon alla"
-
-#: ../ui/evolution-mail-global.xml.h:16
-msgid "Show message preview side-by-side with the message list"
-msgstr "Näytä viestin esikatselu viestiluettelon vieressä"
-
-#: ../ui/evolution-mail-global.xml.h:17
-msgid "Show message preview window"
-msgstr "Näytä viestin esikatseluikkuna"
-
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Tilaa tai peru kansioiden tilauksia muilta palvelimilta"
-
-#: ../ui/evolution-mail-global.xml.h:20
-msgid "_Classic View"
-msgstr "_Perinteinen näkymä"
-
-#: ../ui/evolution-mail-global.xml.h:21
-msgid "_Copy Folder To..."
-msgstr "_Kopioi kansio..."
-
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Download Messages for Offline Usage"
-msgstr "_Nouda viestit yhteydettömään käyttöön"
-
-#: ../ui/evolution-mail-global.xml.h:25
-msgid "_Message Filters"
-msgstr "Viesti_suodattimet"
-
-#: ../ui/evolution-mail-global.xml.h:26
-msgid "_Move Folder To..."
-msgstr "_Siirrä kansio..."
-
-#: ../ui/evolution-mail-global.xml.h:27
-msgid "_New..."
-msgstr "_Uusi..."
-
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Preview"
-msgstr "_Esikatselu"
-
-#.
-#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
-#.
-#: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions..."
-msgstr "_Tilaukset..."
-
-#: ../ui/evolution-mail-global.xml.h:33
-msgid "_Vertical View"
-msgstr "_Pystysuuntainen näkymä"
-
-#: ../ui/evolution-mail-list.xml.h:1
-msgid "Change the name of this folder"
-msgstr "Muuta tämän kansion nimeä"
-
-#: ../ui/evolution-mail-list.xml.h:2
-msgid "Change the properties of this folder"
-msgstr "Vaihda tämän kansion ominaisuuksia"
-
-#: ../ui/evolution-mail-list.xml.h:3
-msgid "Collapse All _Threads"
-msgstr "Sulje kaikki _säikeet"
-
-#: ../ui/evolution-mail-list.xml.h:4
-msgid "Collapse all message threads"
-msgstr "Sulje kaikki viestisäikeet"
-
-#: ../ui/evolution-mail-list.xml.h:5
-msgid "Copy selected message(s) to the clipboard"
-msgstr "Kopioi valitut viestit uuteen kansioon"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:7
-msgid "Cut selected message(s) to the clipboard"
-msgstr "Leikkaa valitut viestit leikepöydälle"
-
-#: ../ui/evolution-mail-list.xml.h:8
-msgid "E_xpand All Threads"
-msgstr "_Laajenna kaikki säikeet"
-
-#: ../ui/evolution-mail-list.xml.h:9
-msgid "E_xpunge"
-msgstr "_Poista poistetut"
-
-#: ../ui/evolution-mail-list.xml.h:10
-msgid "Expand all message threads"
-msgstr "Laajenna kaikki viestisäikeet"
-
-#: ../ui/evolution-mail-list.xml.h:12
-msgid "Hide S_elected Messages"
-msgstr "Piilota _valitut viestit"
-
-#: ../ui/evolution-mail-list.xml.h:13
-msgid "Hide _Deleted Messages"
-msgstr "Piilota _poistetut viestit"
-
-#: ../ui/evolution-mail-list.xml.h:14
-msgid "Hide _Read Messages"
-msgstr "Piilota _luetut viestit"
-
-#: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Piilota poistetut viestit sen sijaan, että ne näytettäisiin yliviivattuina"
-
-#: ../ui/evolution-mail-list.xml.h:16
-msgid "Mar_k All Messages as Read"
-msgstr "Mer_kitse kaikki viestit luetuiksi"
-
-#: ../ui/evolution-mail-list.xml.h:17
-msgid "Mark all messages in the folder as read"
-msgstr "Merkitse kaikki kansion viestit luetuksi"
-
-#: ../ui/evolution-mail-list.xml.h:18
-msgid "Paste message(s) from the clipboard"
-msgstr "Liitä viestit leikepöydältä"
-
-#: ../ui/evolution-mail-list.xml.h:19
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "Poista pysyvästi kaikki poistetut viestit tästä kansiosta"
-
-#: ../ui/evolution-mail-list.xml.h:20
-msgid "Permanently remove this folder"
-msgstr "Poista tämä kansio pysyvästi"
-
-#: ../ui/evolution-mail-list.xml.h:22
-msgid "Refresh the folder"
-msgstr "Virkistä kansio"
-
-#: ../ui/evolution-mail-list.xml.h:23
-msgid "Select Message S_ubthread"
-msgstr "Valitse viesti_säie"
-
-#: ../ui/evolution-mail-list.xml.h:24
-msgid "Select Message _Thread"
-msgstr "Valitse viesti_säie"
-
-#: ../ui/evolution-mail-list.xml.h:25
-msgid "Select _All Messages"
-msgstr "Valitse k_aikki viestit"
-
-#: ../ui/evolution-mail-list.xml.h:26
-msgid "Select all and only the messages that are not currently selected"
-msgstr "Poista kaikki viestit, jotka eivät ole juuri nyt valittu"
-
-#: ../ui/evolution-mail-list.xml.h:27
-msgid "Select all messages in the same thread as the selected message"
-msgstr ""
-"Valitse kaikki viestit, jotka ovat samassa säikeessä kuin nyt valittu viesti"
-
-#: ../ui/evolution-mail-list.xml.h:28
-msgid "Select all replies to the currently selected message"
-msgstr "Valitse kaikki vastaukset nyt valittuun viestiin"
-
-#: ../ui/evolution-mail-list.xml.h:29
-msgid "Select all visible messages"
-msgstr "Valitse kaikki näkyvät viestit"
-
-#: ../ui/evolution-mail-list.xml.h:30
-msgid "Show Hidde_n Messages"
-msgstr "Näytä piil_otetut viestit"
-
-#: ../ui/evolution-mail-list.xml.h:31
-msgid "Show messages that have been temporarily hidden"
-msgstr "Näytä viestit jotka on väliaikaisesti piilotettu"
-
-#: ../ui/evolution-mail-list.xml.h:32
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Piilota kaikki luetut viestit väliaikaisesti"
-
-#: ../ui/evolution-mail-list.xml.h:33
-msgid "Temporarily hide the selected messages"
-msgstr "Piilota valitut viestit väliaikaisesti"
-
-#: ../ui/evolution-mail-list.xml.h:34
-msgid "Threaded Message list"
-msgstr "Säikeistetty viesti-ikkuna"
-
-#: ../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-messagedisplay.xml.h:7
-msgid "_Message"
-msgstr "_Viesti"
-
-#: ../ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Address Book"
-msgstr "_Lisää lähettäjä osoitekirjaan"
-
-#: ../ui/evolution-mail-message.xml.h:2
-msgid "A_pply Filters"
-msgstr "_Toteuta suodattimet"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-message.xml.h:4
-msgid "Add Sender to Address Book"
-msgstr "Lisää lähettäjä osoitekirjaan"
-
-#: ../ui/evolution-mail-message.xml.h:5
-msgid "All Message _Headers"
-msgstr "Kaikki viestin _otsikot"
-
-#: ../ui/evolution-mail-message.xml.h:6
-msgid "Apply filter rules to the selected messages"
-msgstr "Suodata valitut viestit suodatinsäännöillä"
-
-#: ../ui/evolution-mail-message.xml.h:7
-msgid "Check for _Junk"
-msgstr "Etsi _roskapostia"
-
-#: ../ui/evolution-mail-message.xml.h:8
-msgid "Compose _New Message"
-msgstr "Kirjoita _uusi viesti"
-
-#: ../ui/evolution-mail-message.xml.h:9
-msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "Kirjoita vastaus kaikille valitun viestin vastaanottajille"
-
-#: ../ui/evolution-mail-message.xml.h:10
-msgid "Compose a reply to the mailing list of the selected message"
-msgstr "Kirjoita vastaus valitussa viestissä olevalle sähköpostilistalle"
-
-#: ../ui/evolution-mail-message.xml.h:11
-msgid "Compose a reply to the sender of the selected message"
-msgstr "Vastaa valitun viestin lähettäjälle"
-
-#: ../ui/evolution-mail-message.xml.h:12
-msgid "Copy selected messages to another folder"
-msgstr "Kopioi valitut viestit uuteen kansioon"
-
-#: ../ui/evolution-mail-message.xml.h:13
-msgid "Copy selected messages to the clipboard"
-msgstr "Kopioi valitut viestit leikepöydälle"
-
-#: ../ui/evolution-mail-message.xml.h:14
-msgid "Create R_ule"
-msgstr "Luo _sääntö"
-
-#: ../ui/evolution-mail-message.xml.h:15
-msgid "Create a Search Folder for these recipients"
-msgstr "Luo hakunäkymä näistä vastaanottajista"
-
-#: ../ui/evolution-mail-message.xml.h:16
-msgid "Create a Search Folder for this mailing list"
-msgstr "Luo hakunäkymä tästä postilistasta"
-
-#: ../ui/evolution-mail-message.xml.h:17
-msgid "Create a Search Folder for this sender"
-msgstr "Luo hakunäkymä tästä lähettäjästä"
-
-#: ../ui/evolution-mail-message.xml.h:18
-msgid "Create a Search Folder for this subject"
-msgstr "Luo hakunäkymä tästä aiheesta"
-
-#: ../ui/evolution-mail-message.xml.h:19
-msgid "Create a rule to filter messages from this sender"
-msgstr "Luo sääntö, jolla suodatetaan viestejä tältä lähettäjältä"
-
-#: ../ui/evolution-mail-message.xml.h:20
-msgid "Create a rule to filter messages to these recipients"
-msgstr "Luo sääntö, jolla suodatetaan viestejä näille vastaanottajille "
-
-#: ../ui/evolution-mail-message.xml.h:21
-msgid "Create a rule to filter messages to this mailing list"
-msgstr "Luo sääntö, jolla suodatetaan viestejä tälle postilistalle"
-
-#: ../ui/evolution-mail-message.xml.h:22
-msgid "Create a rule to filter messages with this subject"
-msgstr "Luo sääntö, jolla suodatetaan viestejä tämän otsikon perusteella"
-
-#: ../ui/evolution-mail-message.xml.h:23
-msgid "Cut selected messages to the clipboard"
-msgstr "Leikkaa valitut viestit leikepöydälle"
-
-#: ../ui/evolution-mail-message.xml.h:24
-msgid "Decrease the text size"
-msgstr "Pienennä tekstin kokoa"
-
-#: ../ui/evolution-mail-message.xml.h:26
-msgid "Display the next important message"
-msgstr "Näytä seuraava tärkeä viesti"
-
-#: ../ui/evolution-mail-message.xml.h:27
-msgid "Display the next message"
-msgstr "Näytä seuraava viesti"
-
-#: ../ui/evolution-mail-message.xml.h:28
-msgid "Display the next thread"
-msgstr "Näytä seuraava säie"
-
-#: ../ui/evolution-mail-message.xml.h:29
-msgid "Display the next unread message"
-msgstr "Näytä seuraava lukematon viesti"
-
-#: ../ui/evolution-mail-message.xml.h:30
-msgid "Display the previous important message"
-msgstr "Näytä edellinen tärkeä viesti"
-
-#: ../ui/evolution-mail-message.xml.h:31
-msgid "Display the previous message"
-msgstr "Näytä edellinen viesti"
-
-#: ../ui/evolution-mail-message.xml.h:32
-msgid "Display the previous unread message"
-msgstr "Näytä edellinen lukematon viesti"
-
-#: ../ui/evolution-mail-message.xml.h:33
-msgid "F_orward As..."
-msgstr "_Välitä muodossa..."
-
-#: ../ui/evolution-mail-message.xml.h:34
-msgid "Filter on Mailing _List..."
-msgstr "Suodata postitus_listan mukaan..."
-
-#: ../ui/evolution-mail-message.xml.h:35
-msgid "Filter on Se_nder..."
-msgstr "Suodata _lähettäjän mukaan..."
-
-#: ../ui/evolution-mail-message.xml.h:36
-msgid "Filter on _Recipients..."
-msgstr "Suodata _vastaanottajien mukaan..."
-
-#: ../ui/evolution-mail-message.xml.h:37
-msgid "Filter on _Subject..."
-msgstr "Suodata _aiheen mukaan..."
-
-#: ../ui/evolution-mail-message.xml.h:38
-msgid "Filter the selected messages for junk status"
-msgstr "Suodata valitut viestit roskapostiksi"
-
-#: ../ui/evolution-mail-message.xml.h:39
-msgid "Flag selected messages for follow-up"
-msgstr "Merkitse valitut viestit vastattaviksi"
-
-#: ../ui/evolution-mail-message.xml.h:40
-msgid "Follow _Up..."
-msgstr "_Vastaa viestiin..."
-
-#: ../ui/evolution-mail-message.xml.h:41
-msgid "Force images in HTML mail to be loaded"
-msgstr "Pakota HTML-viestissä olevien kuvien lataus"
-
-#: ../ui/evolution-mail-message.xml.h:43
-msgid "Forward the selected message in the body of a new message"
-msgstr "Välitä edelleen valitut viestit uuden viestin rungossa"
-
-#: ../ui/evolution-mail-message.xml.h:44
-msgid "Forward the selected message quoted like a reply"
-msgstr "Välitä edelleen valitut viestit lainattuna vastauksen tapaan"
-
-#: ../ui/evolution-mail-message.xml.h:45
-msgid "Forward the selected message to someone"
-msgstr "Välitä edelleen valitut viestit jollekulle"
-
-#: ../ui/evolution-mail-message.xml.h:46
-msgid "Forward the selected message to someone as an attachment"
-msgstr "Välitä edelleen valitut viestit liitteenä"
-
-#: ../ui/evolution-mail-message.xml.h:47
-msgid "Increase the text size"
-msgstr "Kasvata tekstin kokoa"
-
-#: ../ui/evolution-mail-message.xml.h:49
-msgid "Mar_k as"
-msgstr "Mer_kitse"
-
-#: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected messages as having been read"
-msgstr "Merkitse valitut viestit luetuiksi"
-
-#: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected messages as important"
-msgstr "Merkitse valitut viestit tärkeiksi"
-
-#: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected messages as junk"
-msgstr "Merkitse valitut viestit roskapostiksi"
-
-#: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected messages as not being junk"
-msgstr "Merkitse valitut viestit ei-roskapostiksi"
-
-#: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected messages as not having been read"
-msgstr "Merkitse valitut viestit lukemattomiksi"
-
-#: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected messages as unimportant"
-msgstr "Merkitse valitut viestit samantekeviksi"
-
-#: ../ui/evolution-mail-message.xml.h:56
-msgid "Mark the selected messages for deletion"
-msgstr "Merkitse valitut viestit poistettaviksi"
-
-#: ../ui/evolution-mail-message.xml.h:57
-msgid "Move selected messages to another folder"
-msgstr "Siirrä valitut viestit toiseen kansioon"
-
-#: ../ui/evolution-mail-message.xml.h:59
-msgid "Next _Important Message"
-msgstr "Seuraava _tärkeä viesti"
-
-#: ../ui/evolution-mail-message.xml.h:60
-msgid "Next _Thread"
-msgstr "Seuraava _säie"
-
-#: ../ui/evolution-mail-message.xml.h:61
-msgid "Next _Unread Message"
-msgstr "Seuraava _lukematon viesti"
-
-#: ../ui/evolution-mail-message.xml.h:62
-msgid "Not Junk"
-msgstr "Ei roskapostia"
-
-#: ../ui/evolution-mail-message.xml.h:63
-msgid "Open a window for composing a mail message"
-msgstr "Luo uusi ikkuna sähköpostin kirjoitusikkuna"
-
-#: ../ui/evolution-mail-message.xml.h:64
-msgid "Open the selected messages in a new window"
-msgstr "Avaa valitut viestit uudessa ikkunassa"
-
-#: ../ui/evolution-mail-message.xml.h:65
-msgid "Open the selected messages in the composer for editing"
-msgstr "Avaa valitut viestit muokkaimessa"
-
-#: ../ui/evolution-mail-message.xml.h:66
-msgid "P_revious Unread Message"
-msgstr "_Edellinen lukematon viesti"
-
-#: ../ui/evolution-mail-message.xml.h:67
-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
-msgid "Preview the message to be printed"
-msgstr "Esikatsele tulostettavaa viestiä"
-
-#: ../ui/evolution-mail-message.xml.h:77
-msgid "Print this message"
-msgstr "Tulosta tämä viesti"
-
-#: ../ui/evolution-mail-message.xml.h:78
-msgid "Re_direct"
-msgstr "_Uudelleenohjaa"
-
-#: ../ui/evolution-mail-message.xml.h:79
-msgid "Redirect (bounce) the selected message to someone"
-msgstr "Uudelleenohjaa (siirrä) valitut viestit jollekulle"
-
-#: ../ui/evolution-mail-message.xml.h:84
-msgid "Reset the text to its original size"
-msgstr "Palauta teksti alkuperäisen kokoiseksi"
-
-#: ../ui/evolution-mail-message.xml.h:85
-msgid "Save the selected messages as a text file"
-msgstr "Tallenna valitut viestit tekstitiedostona"
-
-#: ../ui/evolution-mail-message.xml.h:86
-msgid "Search Folder from Mailing _List..."
-msgstr "Hakunäkymä _postilistasta..."
-
-#: ../ui/evolution-mail-message.xml.h:87
-msgid "Search Folder from Recipien_ts..."
-msgstr "Hakunäkymä _vastaanottajista..."
-
-#: ../ui/evolution-mail-message.xml.h:88
-msgid "Search Folder from S_ubject..."
-msgstr "Hakunäkymä _aiheesta..."
-
-#: ../ui/evolution-mail-message.xml.h:89
-msgid "Search Folder from Sen_der..."
-msgstr "Hakunäkymä _lähettäjästä..."
-
-#: ../ui/evolution-mail-message.xml.h:90
-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
-msgid "Select _All Text"
-msgstr "Valitse k_aikki teksti"
-
-#: ../ui/evolution-mail-message.xml.h:92
-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
-msgid "Set up the page settings for your current printer"
-msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
-
-#: ../ui/evolution-mail-message.xml.h:94
-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
-msgid "Show messages with all email headers"
-msgstr "Näytä viesti kaikilla otsakkeillaan"
-
-#: ../ui/evolution-mail-message.xml.h:96
-msgid "Show the raw email source of the message"
-msgstr "Näytä viestin raakatekstimuotoinen lähdekoodi"
-
-#: ../ui/evolution-mail-message.xml.h:97
-msgid "Undelete the selected messages"
-msgstr "Peruuta valittujen viestien poistaminen"
-
-#: ../ui/evolution-mail-message.xml.h:98
-msgid "Uni_mportant"
-msgstr "Sa_mantekevä"
-
-#: ../ui/evolution-mail-message.xml.h:99
-msgid "Zoom _Out"
-msgstr "L_oitonna"
-
-#: ../ui/evolution-mail-message.xml.h:100
-msgid "_Attached"
-msgstr "_Liitetty"
-
-#: ../ui/evolution-mail-message.xml.h:101
-msgid "_Caret Mode"
-msgstr "Kohdistin_tila"
-
-#: ../ui/evolution-mail-message.xml.h:102
-msgid "_Clear Flag"
-msgstr "_Poista merkki"
-
-#: ../ui/evolution-mail-message.xml.h:105
-msgid "_Delete Message"
-msgstr "Poista _viesti"
-
-#: ../ui/evolution-mail-message.xml.h:107
-msgid "_Find in Message..."
-msgstr "Etsi viestistä..."
-
-#: ../ui/evolution-mail-message.xml.h:108
-msgid "_Flag Completed"
-msgstr "_Merkitse valmiiksi"
-
-#: ../ui/evolution-mail-message.xml.h:110
-msgid "_Go To"
-msgstr "_Siirry"
-
-#: ../ui/evolution-mail-message.xml.h:111
-msgid "_Important"
-msgstr "_Tärkeä"
-
-#: ../ui/evolution-mail-message.xml.h:112
-msgid "_Inline"
-msgstr "S_isäkkäisesti"
-
-#: ../ui/evolution-mail-message.xml.h:113
-msgid "_Junk"
-msgstr "_Roskapostia"
-
-#: ../ui/evolution-mail-message.xml.h:114
-msgid "_Load Images"
-msgstr "_Lataa kuvat"
-
-#: ../ui/evolution-mail-message.xml.h:116
-msgid "_Message Source"
-msgstr "_Viestin lähdekoodi"
-
-#: ../ui/evolution-mail-message.xml.h:118
-msgid "_Next Message"
-msgstr "_Seuraava viesti"
-
-#: ../ui/evolution-mail-message.xml.h:119
-msgid "_Normal Size"
-msgstr "_Normaali koko"
-
-#: ../ui/evolution-mail-message.xml.h:120
-msgid "_Not Junk"
-msgstr "_Ei roskapostia"
-
-#: ../ui/evolution-mail-message.xml.h:121
-msgid "_Open in New Window"
-msgstr "Avaa _uudessa ikkunassa"
-
-#: ../ui/evolution-mail-message.xml.h:122
-msgid "_Previous Message"
-msgstr "_Edellinen viesti"
-
-#: ../ui/evolution-mail-message.xml.h:124
-msgid "_Quoted"
-msgstr "_Lainattuna"
-
-#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Read"
-msgstr "_Luettu"
-
-#: ../ui/evolution-mail-message.xml.h:128
-msgid "_Save Message..."
-msgstr "_Tallenna viesti..."
-
-#: ../ui/evolution-mail-message.xml.h:129
-msgid "_Undelete Message"
-msgstr "_Palauta viesti"
-
-#: ../ui/evolution-mail-message.xml.h:130
-msgid "_Unread"
-msgstr "L_ukematon"
-
-#: ../ui/evolution-mail-message.xml.h:131
-msgid "_Zoom"
-msgstr "_Suurenna"
-
-#: ../ui/evolution-mail-message.xml.h:132
-msgid "_Zoom In"
-msgstr "Lä_hennä"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "Sulje"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
-msgid "Main toolbar"
-msgstr "Päätyökalupalkki"
-
-#: ../ui/evolution-memos.xml.h:3
-msgid "Copy selected memo"
-msgstr "Kopioi valittu muistilappu"
-
-#: ../ui/evolution-memos.xml.h:5
-msgid "Cut selected memo"
-msgstr "Leikkaa valittu muistilappu"
-
-#: ../ui/evolution-memos.xml.h:7
-msgid "Delete selected memos"
-msgstr "Poista valitut muistilaput"
-
-#: ../ui/evolution-memos.xml.h:9
-msgid "Paste memo from the clipboard"
-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"
-
-#: ../ui/evolution-memos.xml.h:13
-msgid "Print the list of memos"
-msgstr "Tulosta luettelo muistilapuista"
-
-#: ../ui/evolution-memos.xml.h:14
-msgid "View the selected memo"
-msgstr "Näytä valittu muistilappu"
-
-#: ../ui/evolution-memos.xml.h:18
-msgid "_Open Memo"
-msgstr "_Avaa muistilappu"
-
-#: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected tasks"
-msgstr "Kopioi valitut tehtävät"
-
-#: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected tasks"
-msgstr "Leikkaa valitut tehtävät"
-
-#: ../ui/evolution-tasks.xml.h:7
-msgid "Delete completed tasks"
-msgstr "Poista valmistuneet tehtävät"
-
-#: ../ui/evolution-tasks.xml.h:8
-msgid "Delete selected tasks"
-msgstr "Poista valitut tehtävät"
-
-#: ../ui/evolution-tasks.xml.h:9
-msgid "Mar_k as Complete"
-msgstr "Merkitse _valmiiksi"
-
-#: ../ui/evolution-tasks.xml.h:10
-msgid "Mark selected tasks as complete"
-msgstr "Merkitse valitut tehtävät valmistuneiksi"
-
-#: ../ui/evolution-tasks.xml.h:12
-msgid "Paste tasks from the clipboard"
-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ä"
-
-#: ../ui/evolution-tasks.xml.h:16
-msgid "Print the list of tasks"
-msgstr "Tulosta tehtävälista"
-
-#: ../ui/evolution-tasks.xml.h:18
-msgid "Show task preview window"
-msgstr "Näytä tehtävien esikatseluruutu"
-
-#: ../ui/evolution-tasks.xml.h:19
-msgid "Task _Preview"
-msgstr "Tehtävien _esikatselu"
-
-#: ../ui/evolution-tasks.xml.h:20
-msgid "View the selected task"
-msgstr "Näytä valitut tehtävät"
-
-#: ../ui/evolution-tasks.xml.h:27
-msgid "_Open Task"
-msgstr "Avaa _tehtävä"
-
-#: ../ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "Tietoja Evolutionista..."
-
-#: ../ui/evolution.xml.h:2
-msgid "Change Evolution's settings"
-msgstr "Muuta Evolutionin asetuksia"
-
-#: ../ui/evolution.xml.h:3
-msgid "Change the visibility of the toolbar"
-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"
-
-#: ../ui/evolution.xml.h:6
-msgid "Display window buttons using the desktop toolbar setting"
-msgstr "Näytä ikkunan napit työpöydän työkalupalkin asetuksen mukaisesti"
-
-#: ../ui/evolution.xml.h:7
-msgid "Display window buttons with icons and text"
-msgstr "Näytä ikkunan napit kuvakkeina ja tekstinä"
-
-#: ../ui/evolution.xml.h:8
-msgid "Display window buttons with icons only"
-msgstr "Näytä ikkunan napit ainoastaan kuvakkeina"
-
-#: ../ui/evolution.xml.h:9
-msgid "Display window buttons with text only"
-msgstr "Näytä ikkunan napit ainoastaan tekstinä"
-
-#: ../ui/evolution.xml.h:10
-msgid "Evolution _FAQ"
-msgstr "Evolution _FAQ"
-
-#: ../ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "Poistu ohjelmasta"
-
-#: ../ui/evolution.xml.h:12
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr ""
-"Unohda muistetut salasanat siten, että ne kysytään tarvittaessa uudestaan"
-
-#: ../ui/evolution.xml.h:13
-msgid "Hide window buttons"
-msgstr "Piilota ikkunan napit"
-
-#: ../ui/evolution.xml.h:14
-msgid "I_mport..."
-msgstr "_Tuo..."
-
-#: ../ui/evolution.xml.h:15
-msgid "Icons _and Text"
-msgstr "Kuvakkeet _ja teksti"
-
-#: ../ui/evolution.xml.h:16
-msgid "Import data from other programs"
-msgstr "Tuo tietoja muista ohjelmista"
-
-#: ../ui/evolution.xml.h:17
-msgid "Lay_out"
-msgstr "_Asettelu"
-
-#: ../ui/evolution.xml.h:19
-msgid "New _Window"
-msgstr "Uusi _Ikkuna"
-
-#: ../ui/evolution.xml.h:20
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "Avaa usein kysyttyjen kysymysten www-sivu"
-
-#: ../ui/evolution.xml.h:21
-msgid "Page Set_up..."
-msgstr "Sivun as_etukset..."
-
-#: ../ui/evolution.xml.h:22
-msgid "Prefere_nces"
-msgstr "As_etukset"
-
-#: ../ui/evolution.xml.h:23
-msgid "Send / Receive"
-msgstr "Lähetä / Vastaanota"
-
-#: ../ui/evolution.xml.h:24
-msgid "Send / _Receive"
-msgstr "Lähetä ja _vastaanota"
-
-#: ../ui/evolution.xml.h:25
-msgid "Send queued items and retrieve new items"
-msgstr "Lähetä jonossa olevat viestit ja nouda uudet viestit"
-
-#: ../ui/evolution.xml.h:26
-msgid "Set up Pilot configuration"
-msgstr "Muokkaa Pilotin asetuksia"
-
-#: ../ui/evolution.xml.h:28
-msgid "Show Side _Bar"
-msgstr "Näytä sivu_palkki"
-
-#: ../ui/evolution.xml.h:29
-msgid "Show _Status Bar"
-msgstr "Näytä _tilarivi"
-
-#: ../ui/evolution.xml.h:30
-msgid "Show _Toolbar"
-msgstr "Näytä työ_kalupalkki"
-
-#: ../ui/evolution.xml.h:31
-msgid "Show information about Evolution"
-msgstr "Näytä tietoja Evolutionista"
-
-#: ../ui/evolution.xml.h:32
-msgid "Submit Bug Report"
-msgstr "Lähetä vikailmoitus"
-
-#: ../ui/evolution.xml.h:33
-msgid "Submit _Bug Report"
-msgstr "Lähetä _vikailmoitus"
-
-#: ../ui/evolution.xml.h:34
-msgid "Submit a bug report using Bug Buddy"
-msgstr "Lähetä vikailmoitus käyttäen Bug Buddyä"
-
-#: ../ui/evolution.xml.h:35
-msgid "Toggle whether we are working offline."
-msgstr "Määritä, työskennelläänkö poissa linjoilta."
-
-#: ../ui/evolution.xml.h:36
-msgid "Tool_bar Style"
-msgstr "_Työkalupalkin tyyli"
-
-#: ../ui/evolution.xml.h:37
-msgid "View/Hide the Side Bar"
-msgstr "Näytä tai piilota sivupalkki"
-
-#: ../ui/evolution.xml.h:38
-msgid "View/Hide the Status Bar"
-msgstr "Näytä tai piilota tilarivi"
-
-#: ../ui/evolution.xml.h:39
-msgid "Work _Offline"
-msgstr "Valitse _yhteydetön tila"
-
-#: ../ui/evolution.xml.h:40
-msgid "_About"
-msgstr "_Tietoja"
-
-#: ../ui/evolution.xml.h:41
-msgid "_Close Window"
-msgstr "_Sulje ikkuna"
-
-#: ../ui/evolution.xml.h:44
-msgid "_Forget Passwords"
-msgstr "_Unohda salasanat"
-
-#: ../ui/evolution.xml.h:45
-msgid "_Frequently Asked Questions"
-msgstr "_Uaset kysytyt kysymykset"
-
-#: ../ui/evolution.xml.h:47
-msgid "_Hide Buttons"
-msgstr "_Piilota napit"
-
-#: ../ui/evolution.xml.h:48
-msgid "_Icons Only"
-msgstr "Vain _kuvakkeet"
-
-#: ../ui/evolution.xml.h:50
-msgid "_Quick Reference"
-msgstr "_Pikaopas"
-
-#: ../ui/evolution.xml.h:51
-msgid "_Quit"
-msgstr "_Lopeta"
-
-#: ../ui/evolution.xml.h:52
-msgid "_Switcher Appearance"
-msgstr "Valit_simen tyyli"
-
-#: ../ui/evolution.xml.h:53
-msgid "_Synchronization Options..."
-msgstr "_Synkronointiasetukset..."
-
-#: ../ui/evolution.xml.h:54
-msgid "_Text Only"
-msgstr "Vain _teksti"
-
-#: ../ui/evolution.xml.h:56
-msgid "_Window"
-msgstr "_Ikkuna "
-
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "_Yrityksen mukaan"
@@ -22806,11 +21506,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 +21540,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 +21562,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ä"
 
@@ -22884,51 +21583,11 @@ msgstr "Luo uusi _näkymä"
 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
-msgid "Custom View"
-msgstr "Oma näkymä"
-
-#: ../widgets/menus/gal-view-instance.c:582
-msgid "Save Custom View"
-msgstr "Tallenna oma näkymä"
-
-#: ../widgets/menus/gal-view-instance.c:586
-#: ../widgets/menus/gal-view-menus.c:391
-msgid "Define Views..."
-msgstr "Määrittele näkymät..."
-
-#: ../widgets/menus/gal-view-menus.c:304
-msgid "C_urrent View"
-msgstr "N_ykyinen näkymä"
-
-#: ../widgets/menus/gal-view-menus.c:328
-#, c-format
-msgid "Select View: %s"
-msgstr "Valitse näkymä: %s"
-
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Current view is a customized view"
-msgstr "Nykyinen näkymä tai muokattu näkymä"
-
-#: ../widgets/menus/gal-view-menus.c:377
-msgid "Save Custom View..."
-msgstr "Tallenna oma näkymä..."
-
-#: ../widgets/menus/gal-view-menus.c:382
-msgid "Save current custom view"
-msgstr "Tallenna nykyinen muokattu näkymä"
-
-#: ../widgets/menus/gal-view-menus.c:396
-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 +21603,222 @@ 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-account-manager.c:348
+msgid "De_fault"
+msgstr "_Oletustili"
+
+#: ../widgets/misc/e-account-tree-view.c:224
+msgid "Account Name"
+msgstr "Tilin nimi"
+
+#: ../widgets/misc/e-account-tree-view.c:255
+msgid "Protocol"
+msgstr "Protokolla"
+
+#: ../widgets/misc/e-action-combo-box.c:388
+msgid "Action"
+msgstr "Toiminto"
+
+#: ../widgets/misc/e-action-combo-box.c:389
+msgid "A GtkRadioAction"
+msgstr "GtkRadioAction"
+
+#. Translators: This is a cancelled activity.
+#: ../widgets/misc/e-activity.c:224
+#, c-format
+msgid "%s (cancelled)"
+msgstr "%s (peruttu)"
+
+#. Translators: This is a completed activity.
+#: ../widgets/misc/e-activity.c:227
+#, c-format
+msgid "%s (completed)"
+msgstr "%s (valmis)"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#. Translators: This is an activity whose percent
+#. * complete is unknown.
+#: ../widgets/misc/e-activity.c:231
 #, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Tiedoston %s liittäminen epäonnistui: %s"
+msgid "%s..."
+msgstr "%s..."
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#: ../widgets/misc/e-activity.c:236
 #, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Tiedoston %s liittäminen epäonnistui: epätavallinen tiedosto"
+msgid "%s (%d%% complete)"
+msgstr "%s (%d %% valmiina)"
 
-#: ../widgets/misc/e-attachment.glade.h:1
+#: ../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-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-image.c:147
+msgid "Set as _Background"
+msgstr "Aseta _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"
+
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment-store.c:636
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
+msgid "attachment.dat"
+msgstr "liite.dat"
+
+#: ../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:350
+msgid "_Hide"
+msgstr "_Piilota"
+
+#: ../widgets/misc/e-attachment-view.c:357
+msgid "_View Inline"
+msgstr "Näytä _sisäkkäisesti"
+
+#: ../widgets/misc/e-attachment-view.c:643
+#, c-format
+msgid "Open with \"%s\""
+msgstr "Avaa ohjelmassa \"%s\""
+
+#: ../widgets/misc/e-attachment-view.c:646
+#, c-format
+msgid "Open this attachment in %s"
+msgstr "Avaa tämä liite ohjelmalla %s"
+
+#: ../widgets/misc/e-attachment.c:990
+msgid "Attached message"
+msgstr "Liitetty viesti"
+
+#: ../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.glade.h:4
-msgid "MIME type:"
-msgstr "MIME-tyyppi:"
+#: ../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.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "Ehdota liitteen automaattista näyttämistä"
+#: ../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 "Could not load the attachment"
+msgstr "Liitettä ei voitu avata"
+
+#: ../widgets/misc/e-attachment.c:2190
+#, c-format
+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.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"
 
 #. 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,273 +21842,79 @@ 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/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/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
-msgid "Now"
-msgstr "Nyt"
-
-#: ../widgets/misc/e-cell-date-edit.c:846
-#, c-format
-msgid "The time must be in the format: %s"
-msgstr "Ajan tulee olla muodossa: %s"
-
-#: ../widgets/misc/e-cell-percent.c:77
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Prosenttiarvon tulee olla välillä 0 - 100"
-
-#: ../widgets/misc/e-charset-picker.c:57
-msgid "Arabic"
-msgstr "Arabia"
-
-#: ../widgets/misc/e-charset-picker.c:58
-msgid "Baltic"
-msgstr "Balttilainen"
-
-#: ../widgets/misc/e-charset-picker.c:59
-msgid "Central European"
-msgstr "Keskieurooppalainen"
-
-#: ../widgets/misc/e-charset-picker.c:60
-msgid "Chinese"
-msgstr "Kiinalainen"
-
-#: ../widgets/misc/e-charset-picker.c:61
-msgid "Cyrillic"
-msgstr "Kyrillinen"
-
-#: ../widgets/misc/e-charset-picker.c:62
-msgid "Greek"
-msgstr "Kreikkalainen"
-
-#: ../widgets/misc/e-charset-picker.c:63
-msgid "Hebrew"
-msgstr "Heprea"
-
-#: ../widgets/misc/e-charset-picker.c:64
-msgid "Japanese"
-msgstr "Japanilainen"
-
-#: ../widgets/misc/e-charset-picker.c:65
-msgid "Korean"
-msgstr "Korealainen"
-
-#: ../widgets/misc/e-charset-picker.c:66
-msgid "Thai"
-msgstr "Thai"
-
-#: ../widgets/misc/e-charset-picker.c:67
-msgid "Turkish"
-msgstr "Turkkilainen"
-
-#: ../widgets/misc/e-charset-picker.c:68
-msgid "Unicode"
-msgstr "Unicode"
-
-#: ../widgets/misc/e-charset-picker.c:69
-msgid "Western European"
-msgstr "Länsieurooppalainen"
-
-#: ../widgets/misc/e-charset-picker.c:70
-msgid "Western European, New"
-msgstr "Länsieurooppalainen, uusi"
-
-#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
-#: ../widgets/misc/e-charset-picker.c:91
-msgid "Traditional"
-msgstr "Perinteinen"
-
-#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-msgid "Simplified"
-msgstr "Yksinkertaistettu"
-
-#: ../widgets/misc/e-charset-picker.c:98
-msgid "Ukrainian"
-msgstr "Ukrainalainen"
-
-#: ../widgets/misc/e-charset-picker.c:101
-msgid "Visual"
-msgstr "Visuaali"
-
-#: ../widgets/misc/e-charset-picker.c:170
-#, c-format
-msgid "Unknown character set: %s"
-msgstr "Tuntematon merkistö: %s"
-
-#: ../widgets/misc/e-charset-picker.c:215
+#: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "Merkistön koodaus"
 
-#: ../widgets/misc/e-charset-picker.c:230
+#: ../widgets/misc/e-charset-combo-box.c:117
 msgid "Enter the character set to use"
 msgstr "Syötä käytettävä merkistö"
 
-#: ../widgets/misc/e-charset-picker.c:337
+#: ../widgets/misc/e-charset-combo-box.c:336
 msgid "Other..."
 msgstr "Muut..."
 
-#: ../widgets/misc/e-charset-picker.c:599
-msgid "Ch_aracter Encoding"
-msgstr "Merkistön _koodaus"
-
-#: ../widgets/misc/e-dateedit.c:303
+#: ../widgets/misc/e-dateedit.c:408
 msgid "Date and Time"
 msgstr "Päiväys ja aika"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:428
 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:450
 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:492
 msgid "Drop-down combination box to select time"
 msgstr "Yhdistelmävalitsin ajan valitsemiseen"
 
-#: ../widgets/misc/e-dateedit.c:464
+#: ../widgets/misc/e-dateedit.c:568
 msgid "No_w"
 msgstr "N_yt"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:574
 msgid "_Today"
 msgstr "_Tänään"
 
-#: ../widgets/misc/e-dateedit.c:1635
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../widgets/misc/e-dateedit.c:582
+msgid "_None"
+msgstr "_Ei mitään"
+
+#: ../widgets/misc/e-dateedit.c:1675
 msgid "Invalid Date Value"
 msgstr "Virheellinen päivämäärä"
 
-#: ../widgets/misc/e-dateedit.c:1664
+#: ../widgets/misc/e-dateedit.c:1705
 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
-msgid "Advanced Search"
-msgstr "Oma haku"
-
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:230
-msgid "Save Search"
-msgstr "Tallenna haku"
-
-#: ../widgets/misc/e-filter-bar.c:267
-msgid "_Searches"
-msgstr "_Haut"
-
-#: ../widgets/misc/e-filter-bar.c:269
-msgid "Searches"
-msgstr "Haut"
-
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
-msgid "_Save Search..."
-msgstr "_Tallenna haku..."
-
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
-msgid "_Edit Saved Searches..."
-msgstr "_Muokkaa tallennettuja hakuja..."
-
-#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
-msgid "_Advanced Search..."
-msgstr "_Oma haku..."
-
-#: ../widgets/misc/e-filter-bar.h:107
-msgid "All Accounts"
-msgstr "Kaikki tilit"
-
-#: ../widgets/misc/e-filter-bar.h:108
-msgid "Current Account"
-msgstr "Valittu tili"
-
-#: ../widgets/misc/e-filter-bar.h:109
-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
-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."
@@ -23299,110 +21922,85 @@ msgstr ""
 "Hiirikäyttöinen maailmankartta aikavyöhykkeen valintaa varten. Näppäimistön "
 "käyttäjät voivat valita aikavyöhykkeen allaolevasta pudotusvalikosta."
 
-#: ../widgets/misc/e-online-button.c:106
-msgid "Online"
-msgstr "Verkossa"
+#: ../widgets/misc/e-online-button.c:27
+msgid "Evolution is currently online.  Click this button to work offline."
+msgstr "Evolution on verkossa. Katkaise verkkoyhteydet napsauttamalla napista."
+
+#: ../widgets/misc/e-online-button.c:30
+msgid "Evolution is currently offline.  Click this button to work online."
+msgstr "Evolution ei ole verkossa. Avaa verkkoyhteydet napsauttamalla napista."
+
+#: ../widgets/misc/e-online-button.c:33
+msgid "Evolution is currently offline because the network is unavailable."
+msgstr "Evolution ei ole verkossa, koska verkko ei ole käytettävissä."
 
-#: ../widgets/misc/e-online-button.c:107
+#: ../widgets/misc/e-online-button.c:131
 msgid "The button state is online"
 msgstr "Napin tila on verkossa"
 
-#: ../widgets/misc/e-pilot-settings.c:102
+#: ../widgets/misc/e-paned.c:180
+msgid "Horizontal Position"
+msgstr "Vaakasijainti"
+
+#: ../widgets/misc/e-paned.c:181
+msgid "Pane position when oriented horizontally"
+msgstr "Paneelin sijainti sen ollessa vaaka-asennossa"
+
+#: ../widgets/misc/e-paned.c:192
+msgid "Vertical Position"
+msgstr "Pystysijainti"
+
+#: ../widgets/misc/e-paned.c:193
+msgid "Pane position when oriented vertically"
+msgstr "Paneelin sijainti sen ollessa pystyasennossa"
+
+#: ../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
-msgid "Empty message"
-msgstr "Tyhjä viesti"
+#: ../widgets/misc/e-popup-action.c:173
+msgid "Source Action"
+msgstr "Lähteen toiminto"
 
-#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
-msgid "Reflow model"
-msgstr "Uudelleenvirtauksen malli"
+#: ../widgets/misc/e-popup-action.c:174
+msgid "The source action to proxy"
+msgstr "Välitettävä lähteen toiminto"
 
-#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
-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
-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
-msgid "Click here to change the search type"
-msgstr "Muuta hakutyyppiä napsauttamalla tästä"
-
-#: ../widgets/misc/e-search-bar.c:603
-msgid "_Search"
-msgstr "Et_si"
-
-#: ../widgets/misc/e-search-bar.c:609
-msgid "_Find Now"
-msgstr "_Etsi nyt"
-
-#: ../widgets/misc/e-search-bar.c:610
-msgid "_Clear"
-msgstr "_Tyhjennä"
-
-#: ../widgets/misc/e-search-bar.c:865
-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
-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
-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
-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
-msgid " i_n "
-msgstr " lä_hteestä "
+#: ../widgets/misc/e-preferences-window.c:216
+msgid "Evolution Preferences"
+msgstr "Evolutionin asetukset"
 
-#: ../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 +22024,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 +22044,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 +22060,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 +22080,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"
@@ -23531,46 +22133,133 @@ msgstr "Milloin _sopii"
 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
-#, c-format
-msgid "%s (...)"
-msgstr "%s (...)"
+#: ../widgets/misc/e-signature-editor.c:130
+#: ../widgets/misc/e-signature-editor.c:489
+#: ../widgets/misc/e-signature-manager.c:349
+#: ../widgets/misc/e-signature-script-dialog.c:218
+msgid "Unnamed"
+msgstr "Nimeämätön"
 
-#. 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
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d %% valmiina)"
+#: ../widgets/misc/e-signature-editor.c:207
+msgid "_Save and Close"
+msgstr "_Tallenna ja sulje"
+
+#: ../widgets/misc/e-signature-editor.c:361
+msgid "Edit Signature"
+msgstr "Muokkaa allekirjoitusta"
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-signature-editor.c:376
+msgid "_Signature Name:"
+msgstr "Allekirjoituk_sen nimi:"
+
+#: ../widgets/misc/e-signature-manager.c:294
+msgid "Add Signature Script"
+msgstr "Lisää allekirjoitus-skripti"
+
+#: ../widgets/misc/e-signature-manager.c:359
+msgid "Edit Signature Script"
+msgstr "Muokkaa allekirjoitus-skriptiä"
+
+#: ../widgets/misc/e-signature-manager.c:576
+msgid "Add _Script"
+msgstr "Lisää _skripti"
+
+#: ../widgets/misc/e-signature-script-dialog.c:266
+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."
+msgstr ""
+"Tämän komennon tulostetta käytetään allekirjoituksenasi. \n"
+"Valitsemasi nimi on käytössä ainoastaan tässä listassa\n"
+"näytettäessä."
+
+#: ../widgets/misc/e-signature-script-dialog.c:311
+msgid "S_cript:"
+msgstr "_Skripti:"
+
+#: ../widgets/misc/e-signature-script-dialog.c:342
+msgid "Script file must be executable."
+msgstr "Skriptitiedoston tulee olla suoritettavissa."
+
+#: ../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/e-web-view.c:305
+msgid "Copy the link to the clipboard"
+msgstr "Kopioi linkki leikepöydälle"
+
+#: ../widgets/misc/e-web-view.c:315
+msgid "Open the link in a web browser"
+msgstr "Avaa linkki selaimessa"
 
-#: ../widgets/misc/gal-categories.glade.h:2
-msgid "Item(s) belong to these _categories:"
-msgstr "Näihin _luokkiin kuuluvat kohdat:"
+#: ../widgets/misc/e-web-view.c:323
+msgid "_Copy Email Address"
+msgstr "_Kopioi sähköpostiosoite"
 
-#: ../widgets/misc/gal-categories.glade.h:3
-msgid "_Available Categories:"
-msgstr "Valittavat _luokat:"
+#: ../widgets/misc/e-web-view.c:325
+msgid "Copy the email address to the clipboard"
+msgstr "Kopioi sähköpostiosoite leikepöydälle"
 
-#: ../widgets/misc/gal-categories.glade.h:4
-msgid "categories"
-msgstr "luokat"
+#: ../widgets/misc/e-web-view.c:332
+msgid "Send a mail message to this address"
+msgstr "Lähetä sähköpostiviesti tähän osoitteeseen"
 
-#: ../widgets/table/e-cell-combo.c:170
+#: ../widgets/misc/e-web-view.c:574
+#, c-format
+msgid "Click to mail %s"
+msgstr "Napsauta lähettääksesi %s"
+
+#: ../widgets/misc/e-web-view.c:576 ../widgets/misc/e-web-view.c:578
+#: ../widgets/misc/e-web-view.c:580
+#, c-format
+msgid "Click to call %s"
+msgstr "Soita numeroon %s napsauttamalla"
+
+#: ../widgets/misc/e-web-view.c:582
+msgid "Click to hide/unhide addresses"
+msgstr "Napsauta piilottaaksesi tai näyttääksesi osoitteet"
+
+#: ../widgets/misc/e-web-view.c:584
+#, c-format
+msgid "Click to open %s"
+msgstr "Napsauta avataksesi %s"
+
+#: ../widgets/misc/ea-calendar-item.c:295
+#: ../widgets/misc/ea-calendar-item.c:301
+msgid "%d %B %Y"
+msgstr "%d. %Bta %Y"
+
+#: ../widgets/misc/ea-calendar-item.c:303
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Kalenteri väliltä %s - %s"
+
+#: ../widgets/misc/ea-calendar-item.c:338
+msgid "evolution calendar item"
+msgstr "evolutionin kalenterin kohta"
+
+#: ../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-date-edit.c:296
+msgid "Now"
+msgstr "Nyt"
+
+#: ../widgets/table/e-cell-date-edit.c:320
+msgid "OK"
+msgstr "OK"
+
+#: ../widgets/table/e-cell-date-edit.c:846
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "Ajan tulee olla muodossa: %s"
+
+#: ../widgets/table/e-cell-percent.c:76
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "Prosenttiarvon tulee olla välillä 0 - 100"
 
 #: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
@@ -23584,26 +22273,32 @@ 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"
 
+#: ../widgets/table/e-table-click-to-add.c:578
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+msgid "click to add"
+msgstr "lisää napsauttamalla"
+
 #: ../widgets/table/e-table-config.c:152
 msgid "State"
 msgstr "Tila"
@@ -23624,12 +22319,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"
 
@@ -23711,21 +22406,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,95 +22422,95 @@ 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"
 
@@ -23890,159 +22571,2579 @@ msgstr "_Järjestystapa"
 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/table/gal-a11y-e-cell-popup.c:121
+msgid "popup"
+msgstr "ponnahdusikkuna"
+
+#. action name
+#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+msgid "popup a child"
+msgstr "Ponnauta lapsi"
+
+#: ../widgets/table/gal-a11y-e-cell-text.c:616
+msgid "edit"
+msgstr "muokkaa"
+
+#: ../widgets/table/gal-a11y-e-cell-text.c:617
+msgid "begin editing this cell"
+msgstr "muokkaa tätä solua"
+
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
+msgid "toggle"
+msgstr "vaihtele"
+
+#. action name
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+msgid "toggle the cell"
+msgstr "Vaihtele solun näkyvyyttä"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:210
+msgid "expand"
+msgstr "laajenna"
+
+#: ../widgets/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ä"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:216
+msgid "collapse"
+msgstr "piilota"
+
+#: ../widgets/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"
+
+#: ../widgets/table/gal-a11y-e-cell.c:120
+msgid "Table Cell"
+msgstr "Taulukon solu"
+
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:67
+msgid "click"
+msgstr "napsauta"
+
+#: ../widgets/table/gal-a11y-e-table-column-header.c:152
+msgid "sort"
+msgstr "järjestä"
+
+#: ../widgets/text/e-text.c:2719
+msgid "Select All"
+msgstr "Valitse kaikki"
+
+#: ../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:3555 ../widgets/text/e-text.c:3556
+msgid "Text"
+msgstr "Teksti"
+
+#: ../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 "search bar"
+#~ msgstr "hakupalkki"
+
+#~ msgid "evolution calendar search bar"
+#~ msgstr "evolutionin kalenterin hakupalkki"
+
+#~ msgid "Combo Button"
+#~ msgstr "yhdistelmäpainike"
+
+#~ msgid "Activate Default"
+#~ msgstr "Käytä oletuksia"
+
+#~ msgid "Popup Menu"
+#~ msgstr "Ponnahdusvalikko"
+
+#~ msgid "Toggle Attachment Bar"
+#~ msgstr "Näytä tai piilota liitepalkki"
+
+#~ msgid "activate"
+#~ msgstr "ota käyttöön"
+
+#~ msgid "C_ontacts"
+#~ msgstr "_Yhteystiedot"
+
+#~ msgid "Configure autocomplete here"
+#~ msgstr "Määrittele automaattinen täydennys"
+
+#~ msgid "Evolution Address Book"
+#~ msgstr "Evolutionin osoitekirja"
+
+#~ msgid "Evolution Address Book address popup"
+#~ msgstr "Evolutionin osoitekirjan osoiteponnahdusikkuna"
+
+#~ msgid "Evolution Address Book address viewer"
+#~ msgstr "Evolutionin osoitekirjan osoitteiden katselin"
+
+#~ msgid "Evolution Address Book card viewer"
+#~ msgstr "Evolutionin osoitekirjan kortinkatselin"
+
+#~ msgid "Evolution Address Book component"
+#~ msgstr "Evolutionin osoitekirjan komponentti"
+
+#~ msgid "Evolution S/MIME Certificate Management Control"
+#~ msgstr "Evolution S/MIME-varmenteiden hallintatyökalu"
+
+#~ msgid "Evolution folder settings configuration control"
+#~ msgstr "Evolution kansioasetusten määrittelyjen ohjain"
+
+#~ msgid "Manage your S/MIME certificates here"
+#~ msgstr "Hallitse S/Mime-varmenteita"
+
+#~ msgid "Failed upgrading Address Book settings or folders."
+#~ msgstr "Osoitekirjan asetusten tai kansioiden päivitys epäonnistui."
+
+#~ msgid "Rename the \"%s\" folder to:"
+#~ msgstr "Nimeä \"%s\" uudestaan: "
+
+#~ msgid "Rename Folder"
+#~ msgstr "Nimeä kansio uudestaan"
+
+#~ msgid "Save As vCard..."
+#~ msgstr "Tallenna vCard-muodossa..."
+
+#~ msgid "Contact Source Selector"
+#~ msgstr "Yhteystietojen lähdevalinta"
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the card and list views and the "
+#~ "preview pane, in pixels."
+#~ msgstr ""
+#~ "Vaakapaneelin sijainti pikseleinä  kortti- listanäkymän ja "
+#~ "esikatselupaneelin välissä."
+
+#~ msgid "Look up in address books"
+#~ msgstr "_Etsi osoitekirjoista"
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid "<b>Type:</b>"
+#~ msgstr "<b>Tyyppi:</b>"
+
+#~ msgid "Add Address Book"
+#~ msgstr "Lisää osoitekirja"
+
+#~ msgid "Anonymously"
+#~ msgstr "Anonyymisti"
+
+#~ msgid "Basic"
+#~ msgstr "Yleistä"
+
+#~ msgid "Distinguished name"
+#~ msgstr "Yksikäsitteinen nimi"
+
+#~ msgid "Email address"
+#~ msgstr "Sähköpostiosoite"
+
+#~ msgid "Find Possible Search Bases"
+#~ msgstr "Etsi mahdolliset hakupohjat"
+
+#~ msgid "Search filter"
+#~ msgstr "Hakusuodatin"
+
+#~ msgid "Sub"
+#~ msgstr "Ali"
+
+#~ msgid "Using email address"
+#~ msgstr "Käytetään sähköpostiosoitetta"
+
+#~ msgid "Whenever Possible"
+#~ msgstr "Milloin mahdollista"
+
+#~ msgid "_Add Address Book"
+#~ msgstr "_Lisää osoitekirja"
+
+#~ msgid "MSN Messenger"
+#~ msgstr "MSN Messenger"
+
+#~ msgid "Novell GroupWise"
+#~ msgstr "Novell GroupWise"
+
+#~ msgid "Novell Groupwise"
+#~ msgstr "Novell Groupwise"
+
+#~ msgid "_Notes:"
+#~ msgstr "_Huomioita:"
+
+#~ msgid "United States"
+#~ msgstr "Yhdysvallat"
+
+#~ msgid "Afghanistan"
+#~ msgstr "Afganistan"
+
+#~ msgid "Albania"
+#~ msgstr "Albania"
+
+#~ msgid "Algeria"
+#~ msgstr "Algeria"
+
+#~ msgid "American Samoa"
+#~ msgstr "Amerikkalainen Samoa"
+
+#~ msgid "Andorra"
+#~ msgstr "Andorra"
+
+#~ msgid "Angola"
+#~ msgstr "Angola"
+
+#~ msgid "Anguilla"
+#~ msgstr "Anguilla"
+
+#~ msgid "Antarctica"
+#~ msgstr "Etelämanner"
+
+#~ msgid "Antigua And Barbuda"
+#~ msgstr "Antigua ja Barbuda"
+
+#~ msgid "Argentina"
+#~ msgstr "Argentiina"
+
+#~ msgid "Armenia"
+#~ msgstr "Armenia"
+
+#~ msgid "Aruba"
+#~ msgstr "Aruba"
+
+#~ msgid "Australia"
+#~ msgstr "Australia"
+
+#~ msgid "Austria"
+#~ msgstr "Itävalta"
+
+#~ msgid "Azerbaijan"
+#~ msgstr "Azerbaidzan"
+
+#~ msgid "Bahamas"
+#~ msgstr "Bahamasaaret"
+
+#~ msgid "Bahrain"
+#~ msgstr "Bahrain"
+
+#~ msgid "Bangladesh"
+#~ msgstr "Bangladesh"
+
+#~ msgid "Barbados"
+#~ msgstr "Barbados"
+
+#~ msgid "Belarus"
+#~ msgstr "Valko-Venäjä"
+
+#~ msgid "Belgium"
+#~ msgstr "Belgia"
+
+#~ msgid "Belize"
+#~ msgstr "Belize"
+
+#~ msgid "Benin"
+#~ msgstr "Benin"
+
+#~ msgid "Bermuda"
+#~ msgstr "Bermudasaaret"
+
+#~ msgid "Bhutan"
+#~ msgstr "Bhutan"
+
+#~ msgid "Bolivia"
+#~ msgstr "Bolivia"
+
+#~ msgid "Bosnia And Herzegowina"
+#~ msgstr "Bosnia-Hertsegovina"
+
+#~ msgid "Botswana"
+#~ msgstr "Botswana"
+
+#~ msgid "Bouvet Island"
+#~ msgstr "Bouvet-saari"
+
+#~ msgid "Brazil"
+#~ msgstr "Brasilia"
+
+#~ msgid "British Indian Ocean Territory"
+#~ msgstr "Brittiläinen Intian valtameren alue"
+
+#~ msgid "Brunei Darussalam"
+#~ msgstr "Brunei Darussalam"
+
+#~ msgid "Bulgaria"
+#~ msgstr "Bulgaria"
+
+#~ msgid "Burkina Faso"
+#~ msgstr "Burkina Faso"
+
+#~ msgid "Burundi"
+#~ msgstr "Burundi"
+
+#~ msgid "Cambodia"
+#~ msgstr "Kambodza"
+
+#~ msgid "Cameroon"
+#~ msgstr "Kamerun"
+
+#~ msgid "Canada"
+#~ msgstr "Kanada"
+
+#~ msgid "Cape Verde"
+#~ msgstr "Kap Verde"
+
+#~ msgid "Cayman Islands"
+#~ msgstr "Caymansaaret"
+
+#~ msgid "Central African Republic"
+#~ msgstr "Keski-Afrikan Tasavalta"
+
+#~ msgid "Chad"
+#~ msgstr "Tsad"
+
+#~ msgid "Chile"
+#~ msgstr "Chile"
+
+#~ msgid "China"
+#~ msgstr "Kiina"
+
+#~ msgid "Christmas Island"
+#~ msgstr "Joulusaaret"
+
+#~ msgid "Cocos (Keeling) Islands"
+#~ msgstr "Kookos(Keeling)-saaret"
+
+#~ msgid "Colombia"
+#~ msgstr "Kolumbia"
+
+#~ msgid "Comoros"
+#~ msgstr "Komorit"
+
+#~ msgid "Congo"
+#~ msgstr "Kongo"
+
+#~ msgid "Congo, The Democratic Republic Of The"
+#~ msgstr "Kongon demokraattinen tasavalta"
+
+#~ msgid "Cook Islands"
+#~ msgstr "Cookinsaaret"
+
+#~ msgid "Costa Rica"
+#~ msgstr "Costa Rica"
+
+#~ msgid "Cote d'Ivoire"
+#~ msgstr "Norsunluurannikko"
+
+#~ msgid "Croatia"
+#~ msgstr "Kroatia"
+
+#~ msgid "Cuba"
+#~ msgstr "Kuuba"
+
+#~ msgid "Cyprus"
+#~ msgstr "Kypros"
+
+#~ msgid "Czech Republic"
+#~ msgstr "TÅ¡ekki"
+
+#~ msgid "Denmark"
+#~ msgstr "Tanska"
+
+#~ msgid "Djibouti"
+#~ msgstr "Djibouti"
+
+#~ msgid "Dominica"
+#~ msgstr "Dominica"
+
+#~ msgid "Dominican Republic"
+#~ msgstr "Dominikaaninen Tasavalta"
+
+#~ msgid "Ecuador"
+#~ msgstr "Ecuador"
+
+#~ msgid "Egypt"
+#~ msgstr "Egypti"
+
+#~ msgid "El Salvador"
+#~ msgstr "El Salvador"
+
+#~ msgid "Equatorial Guinea"
+#~ msgstr "Päiväntasaajan Guinea"
+
+#~ msgid "Eritrea"
+#~ msgstr "Eritrea"
+
+#~ msgid "Estonia"
+#~ msgstr "Viro"
+
+#~ msgid "Ethiopia"
+#~ msgstr "Etiopia"
+
+#~ msgid "Falkland Islands"
+#~ msgstr "Falklandsaaret"
+
+#~ msgid "Faroe Islands"
+#~ msgstr "Färsaaret"
+
+#~ msgid "Fiji"
+#~ msgstr "Fidzi"
+
+#~ msgid "Finland"
+#~ msgstr "Suomi"
+
+#~ msgid "France"
+#~ msgstr "Ranska"
+
+#~ msgid "French Guiana"
+#~ msgstr "Ranskan Guiana"
+
+#~ msgid "French Polynesia"
+#~ msgstr "Polynesia"
+
+#~ msgid "French Southern Territories"
+#~ msgstr "Ranskan eteläiset alueet"
+
+#~ msgid "Gabon"
+#~ msgstr "Gabon"
+
+#~ msgid "Gambia"
+#~ msgstr "Gambia"
+
+#~ msgid "Georgia"
+#~ msgstr "Georgia"
+
+#~ msgid "Germany"
+#~ msgstr "Saksa"
+
+#~ msgid "Ghana"
+#~ msgstr "Ghana"
+
+#~ msgid "Gibraltar"
+#~ msgstr "Gibraltar"
+
+#~ msgid "Greece"
+#~ msgstr "Kreikka"
+
+#~ msgid "Greenland"
+#~ msgstr "Grönlanti"
+
+#~ msgid "Grenada"
+#~ msgstr "Grenada"
+
+#~ msgid "Guadeloupe"
+#~ msgstr "Guadeloupe"
+
+#~ msgid "Guam"
+#~ msgstr "Guam"
+
+#~ msgid "Guatemala"
+#~ msgstr "Guatemala"
+
+#~ msgid "Guernsey"
+#~ msgstr "Guernsey"
+
+#~ msgid "Guinea"
+#~ msgstr "Guinea"
+
+#~ msgid "Guinea-Bissau"
+#~ msgstr "Guinea Bissau"
+
+#~ msgid "Guyana"
+#~ msgstr "Guyana"
+
+#~ msgid "Haiti"
+#~ msgstr "Haiti"
+
+#~ msgid "Heard And McDonald Islands"
+#~ msgstr "Heard ja McDonaldinsaaret"
+
+#~ msgid "Holy See"
+#~ msgstr "Pyhä meri"
+
+#~ msgid "Honduras"
+#~ msgstr "Honduras"
+
+#~ msgid "Hong Kong"
+#~ msgstr "Hong Kong"
+
+#~ msgid "Hungary"
+#~ msgstr "Unkari"
+
+#~ msgid "Iceland"
+#~ msgstr "Islanti"
+
+#~ msgid "India"
+#~ msgstr "Intia"
+
+#~ msgid "Indonesia"
+#~ msgstr "Indonesia"
+
+#~ msgid "Iran"
+#~ msgstr "Iran"
+
+#~ msgid "Iraq"
+#~ msgstr "Irak"
+
+#~ msgid "Ireland"
+#~ msgstr "Irlanti"
+
+#~ msgid "Isle of Man"
+#~ msgstr "Mansaari"
+
+#~ msgid "Israel"
+#~ msgstr "Israel"
+
+#~ msgid "Italy"
+#~ msgstr "Italia"
+
+#~ msgid "Jamaica"
+#~ msgstr "Jamaika"
+
+#~ msgid "Japan"
+#~ msgstr "Japani"
+
+#~ msgid "Jersey"
+#~ msgstr "Jersey"
+
+#~ msgid "Jordan"
+#~ msgstr "Jordania"
+
+#~ msgid "Kazakhstan"
+#~ msgstr "Kazakstan"
+
+#~ msgid "Kenya"
+#~ msgstr "Kenia"
+
+#~ msgid "Kiribati"
+#~ msgstr "Kiribati"
+
+#~ msgid "Korea, Democratic People's Republic Of"
+#~ msgstr "Korean demokraattinen kansantasavalta"
+
+#~ msgid "Korea, Republic Of"
+#~ msgstr "Korean tasavalta"
+
+#~ msgid "Kuwait"
+#~ msgstr "Kuwait"
+
+#~ msgid "Kyrgyzstan"
+#~ msgstr "Kirgisia"
+
+#~ msgid "Laos"
+#~ msgstr "Laos"
+
+#~ msgid "Latvia"
+#~ msgstr "Latvia"
+
+#~ msgid "Lebanon"
+#~ msgstr "Libanon"
+
+#~ msgid "Lesotho"
+#~ msgstr "Lesotho"
+
+#~ msgid "Liberia"
+#~ msgstr "Liberia"
+
+#~ msgid "Libya"
+#~ msgstr "Libya"
+
+#~ msgid "Liechtenstein"
+#~ msgstr "Liechtenstein"
+
+#~ msgid "Lithuania"
+#~ msgstr "Liettua"
+
+#~ msgid "Luxembourg"
+#~ msgstr "Luxemburg"
+
+#~ msgid "Macao"
+#~ msgstr "Macao"
+
+#~ msgid "Macedonia"
+#~ msgstr "Makedonia"
+
+#~ msgid "Madagascar"
+#~ msgstr "Madagaskar"
+
+#~ msgid "Malawi"
+#~ msgstr "Malawi"
+
+#~ msgid "Malaysia"
+#~ msgstr "Malesia"
+
+#~ msgid "Maldives"
+#~ msgstr "Malediivit"
+
+#~ msgid "Mali"
+#~ msgstr "Mali"
+
+#~ msgid "Malta"
+#~ msgstr "Malta"
+
+#~ msgid "Marshall Islands"
+#~ msgstr "Marshallinsaaret"
+
+#~ msgid "Martinique"
+#~ msgstr "Martinique"
+
+#~ msgid "Mauritania"
+#~ msgstr "Mauritania"
+
+#~ msgid "Mauritius"
+#~ msgstr "Mauritius"
+
+#~ msgid "Mexico"
+#~ msgstr "Meksiko"
+
+#~ msgid "Micronesia"
+#~ msgstr "Mikronesia"
+
+#~ msgid "Moldova, Republic Of"
+#~ msgstr "Moldova"
+
+#~ msgid "Monaco"
+#~ msgstr "Monaco"
+
+#~ msgid "Mongolia"
+#~ msgstr "Mongolia"
+
+#~ msgid "Montserrat"
+#~ msgstr "Montserrat"
+
+#~ msgid "Morocco"
+#~ msgstr "Marokko"
+
+#~ msgid "Mozambique"
+#~ msgstr "Mosambik"
+
+#~ msgid "Myanmar"
+#~ msgstr "Myanmar"
+
+#~ msgid "Namibia"
+#~ msgstr "Namibia"
+
+#~ msgid "Nauru"
+#~ msgstr "Nauru"
+
+#~ msgid "Nepal"
+#~ msgstr "Nepali"
+
+#~ msgid "Netherlands"
+#~ msgstr "Alankomaat"
+
+#~ msgid "Netherlands Antilles"
+#~ msgstr "Alankomaiden Antillit"
+
+#~ msgid "New Caledonia"
+#~ msgstr "Uusi Kaledonia"
+
+#~ msgid "New Zealand"
+#~ msgstr "Uusi-Seelanti"
+
+#~ msgid "Nicaragua"
+#~ msgstr "Nicaragua"
+
+#~ msgid "Niger"
+#~ msgstr "Niger"
+
+#~ msgid "Nigeria"
+#~ msgstr "Nigeria"
+
+#~ msgid "Niue"
+#~ msgstr "Niue"
+
+#~ msgid "Norfolk Island"
+#~ msgstr "Norfolkinsaari"
+
+#~ msgid "Northern Mariana Islands"
+#~ msgstr "Pohjois-Mariaanit"
+
+#~ msgid "Norway"
+#~ msgstr "Norja"
+
+#~ msgid "Oman"
+#~ msgstr "Oman"
+
+#~ msgid "Pakistan"
+#~ msgstr "Pakistan"
+
+#~ msgid "Palau"
+#~ msgstr "Palau"
+
+#~ msgid "Palestinian Territory"
+#~ msgstr "Palestiinalainen alue"
+
+#~ msgid "Panama"
+#~ msgstr "Panama"
+
+#~ msgid "Papua New Guinea"
+#~ msgstr "Papua Uusi-Guinea"
+
+#~ msgid "Paraguay"
+#~ msgstr "Paraguay"
+
+#~ msgid "Peru"
+#~ msgstr "Peru"
+
+#~ msgid "Philippines"
+#~ msgstr "Filippiinit"
+
+#~ msgid "Pitcairn"
+#~ msgstr "Pitcairn"
+
+#~ msgid "Poland"
+#~ msgstr "Puola"
+
+#~ msgid "Portugal"
+#~ msgstr "Portugal"
+
+#~ msgid "Puerto Rico"
+#~ msgstr "Puerto Rico"
+
+#~ msgid "Qatar"
+#~ msgstr "Qatar"
+
+#~ msgid "Reunion"
+#~ msgstr "Réunion"
+
+#~ msgid "Romania"
+#~ msgstr "Romania"
+
+#~ msgid "Russian Federation"
+#~ msgstr "Venäjä"
+
+#~ msgid "Rwanda"
+#~ msgstr "Ruanda"
+
+#~ msgid "Saint Kitts And Nevis"
+#~ msgstr "Saint Kitts ja Nevis"
+
+#~ msgid "Saint Lucia"
+#~ msgstr "Saint Lucia"
+
+#~ msgid "Saint Vincent And The Grenadines"
+#~ msgstr "Saint Vincent ja Grenadiinit"
+
+#~ msgid "Samoa"
+#~ msgstr "Samoa"
+
+#~ msgid "San Marino"
+#~ msgstr "San Marino"
+
+#~ msgid "Sao Tome And Principe"
+#~ msgstr "São Tomé ja Principe"
+
+#~ msgid "Saudi Arabia"
+#~ msgstr "Saudi Arabia"
+
+#~ msgid "Senegal"
+#~ msgstr "Senegal"
+
+#~ msgid "Serbia And Montenegro"
+#~ msgstr "Serbia ja Montenegro"
+
+#~ msgid "Sierra Leone"
+#~ msgstr "Sierra Leone"
+
+#~ msgid "Singapore"
+#~ msgstr "Singapore"
+
+#~ msgid "Slovakia"
+#~ msgstr "Slovakia"
+
+#~ msgid "Slovenia"
+#~ msgstr "Slovenia"
+
+#~ msgid "Solomon Islands"
+#~ msgstr "Salomonsaaret"
+
+#~ msgid "Somalia"
+#~ msgstr "Somalia"
+
+#~ msgid "South Africa"
+#~ msgstr "Etelä-Afrikka"
+
+#~ msgid "South Georgia And The South Sandwich Islands"
+#~ msgstr "Etelä-Georgia ja Eteläiset Sandwichsaaret"
+
+#~ msgid "Spain"
+#~ msgstr "Espanja"
+
+#~ msgid "Sri Lanka"
+#~ msgstr "Sri Lanka"
+
+#~ msgid "St. Helena"
+#~ msgstr "Saint Helena"
+
+#~ msgid "St. Pierre And Miquelon"
+#~ msgstr "Saint-Pierre ja Miquelon"
+
+#~ msgid "Sudan"
+#~ msgstr "Sudan"
+
+#~ msgid "Suriname"
+#~ msgstr "Surinam"
+
+#~ msgid "Svalbard And Jan Mayen Islands"
+#~ msgstr "Svalbard ja Jan Mayen"
+
+#~ msgid "Swaziland"
+#~ msgstr "Swazimaa"
+
+#~ msgid "Sweden"
+#~ msgstr "Ruotsi"
+
+#~ msgid "Switzerland"
+#~ msgstr "Sveitsi"
+
+#~ msgid "Syria"
+#~ msgstr "Syyria"
+
+#~ msgid "Taiwan"
+#~ msgstr "Taiwan"
+
+#~ msgid "Tajikistan"
+#~ msgstr "Tadkistan"
+
+#~ msgid "Tanzania, United Republic Of"
+#~ msgstr "Tansania"
+
+#~ msgid "Thailand"
+#~ msgstr "Thaimaa"
+
+#~ msgid "Timor-Leste"
+#~ msgstr "Timor-Leste"
+
+#~ msgid "Togo"
+#~ msgstr "Togo"
+
+#~ msgid "Tokelau"
+#~ msgstr "Tokelau"
+
+#~ msgid "Tonga"
+#~ msgstr "Tonga"
+
+#~ msgid "Trinidad And Tobago"
+#~ msgstr "Trinidad ja Tobago"
+
+#~ msgid "Tunisia"
+#~ msgstr "Tunisia"
+
+#~ msgid "Turkey"
+#~ msgstr "Turkki"
+
+#~ msgid "Turkmenistan"
+#~ msgstr "Turkmenistan"
+
+#~ msgid "Turks And Caicos Islands"
+#~ msgstr "Turks- ja Caicossaaret"
+
+#~ msgid "Tuvalu"
+#~ msgstr "Tuvalu"
+
+#~ msgid "Uganda"
+#~ msgstr "Uganda"
+
+#~ msgid "Ukraine"
+#~ msgstr "Ukraina"
+
+#~ msgid "United Arab Emirates"
+#~ msgstr "Yhdistyneet arabiemiirikunnat"
+
+#~ msgid "United Kingdom"
+#~ msgstr "Iso-Britannia"
+
+#~ msgid "United States Minor Outlying Islands"
+#~ msgstr "Yhdysvaltain pienet erillissaaret"
+
+#~ msgid "Uruguay"
+#~ msgstr "Uruguay"
+
+#~ msgid "Uzbekistan"
+#~ msgstr "Uzbekistan"
+
+#~ msgid "Vanuatu"
+#~ msgstr "Vanuatu"
+
+#~ msgid "Venezuela"
+#~ msgstr "Venezuela"
+
+#~ msgid "Viet Nam"
+#~ msgstr "Vietnam"
+
+#~ msgid "Virgin Islands, British"
+#~ msgstr "Brittiläiset Neitsytsaaret"
+
+#~ msgid "Virgin Islands, U.S."
+#~ msgstr "Yhdysvaltain Neitsytsaaret"
+
+#~ msgid "Wallis And Futuna Islands"
+#~ msgstr "Wallis ja Futuna"
+
+#~ msgid "Western Sahara"
+#~ msgstr "Länsi-Sahara"
+
+#~ msgid "Yemen"
+#~ msgstr "Jemen"
+
+#~ msgid "Zambia"
+#~ msgstr "Sambia"
+
+#~ msgid "Zimbabwe"
+#~ msgstr "Zimbabwe"
+
+#~ msgid "AOL Instant Messenger"
+#~ msgstr "AOL pikaviestin"
+
+#~ msgid "Yahoo Messenger"
+#~ msgstr "Yahoo -pikaviestin"
+
+#~ msgid "Gadu-Gadu Messenger"
+#~ msgstr "Gadu-Gadu -pikaviestin"
+
+#~ msgid "Service"
+#~ msgstr "Palvelu"
+
+#~ msgid "Username"
+#~ msgstr "Käyttäjätunnus"
+
+#~ msgid "Address _2:"
+#~ msgstr "Osoite _2:"
+
+#~ msgid "Ci_ty:"
+#~ msgstr "_Kaupunki:"
+
+#~ msgid "Countr_y:"
+#~ msgstr "M_aa:"
+
+#~ msgid "Full Address"
+#~ msgstr "_Osoite:"
+
+#~ msgid "_ZIP Code:"
+#~ msgstr "Po_stinumero:"
+
+#~ msgid "Dr."
+#~ msgstr "Tr."
+
+#~ msgid "Esq."
+#~ msgstr "Esq."
+
+#~ msgid "I"
+#~ msgstr "I"
+
+#~ msgid "II"
+#~ msgstr "II"
+
+#~ msgid "III"
+#~ msgstr "III"
+
+#~ msgid "Jr."
+#~ msgstr "Jr."
+
+#~ msgid "Miss"
+#~ msgstr "Neiti"
+
+#~ msgid "Mr."
+#~ msgstr "Hra."
+
+#~ msgid "Mrs."
+#~ msgstr "Rva."
+
+#~ msgid "Ms."
+#~ msgstr "Nti."
+
+#~ msgid "Sr."
+#~ msgstr "Hr."
+
+#~ msgid "Add IM Account"
+#~ msgstr "Lisää pikaviestitili"
+
+#~ msgid "_Account name:"
+#~ msgstr "_Tilin nimi:"
+
+#~ msgid "_IM Service:"
+#~ msgstr "_Pikaviestipalvelu:"
+
+#~ msgid "Name begins with"
+#~ msgstr "Nimi alkaa"
+
+#~ msgid "_Print"
+#~ msgstr "_Tulosta"
+
+#~ msgid "Cop_y to Address Book..."
+#~ msgstr "_Kopioi osoitekirjaan..."
+
+#~ msgid "Mo_ve to Address Book..."
+#~ msgstr "_Siirrä osoitekirjaan..."
+
+#~ msgid "Cu_t"
+#~ msgstr "_Leikkaa"
+
+#~ msgid "_Copy"
+#~ msgstr "_Kopioi"
+
+#~ msgid "P_aste"
+#~ msgstr "L_iitä"
+
+#~ msgid "Querying Address Book..."
+#~ msgstr "Etsitään osoitekirjasta..."
+
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pt. Tahoma"
+
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pt. Tahoma"
+
+#~ msgid "Blank forms at end:"
+#~ msgstr "Tyhjiä kaavakkeita lopussa:"
+
+#~ msgid "Body"
+#~ msgstr "Runko"
+
+#~ msgid "Bottom:"
+#~ msgstr "Ala:"
+
+#~ msgid "Dimensions:"
+#~ msgstr "Mitat:"
+
+#~ msgid "F_ont..."
+#~ msgstr "_Kirjasin..."
+
+#~ msgid "Fonts"
+#~ msgstr "Kirjasinlajit"
+
+#~ msgid "Footer:"
+#~ msgstr "Alatunniste:"
+
+#~ msgid "Header/Footer"
+#~ msgstr "Ylä-/Alatunniste"
+
+#~ msgid "Headings"
+#~ msgstr "Otsakkeet"
+
+#~ msgid "Headings for each letter"
+#~ msgstr "Joka kirjeen otsakkeet"
+
+#~ msgid "Height:"
+#~ msgstr "Korkeus:"
+
+#~ msgid "Immediately follow each other"
+#~ msgstr "Seuraa välittömästi toisiaan"
+
+#~ msgid "Include:"
+#~ msgstr "Sisäistä:"
+
+#~ msgid "Landscape"
+#~ msgstr "Vaaka"
+
+#~ msgid "Left:"
+#~ msgstr "Vasen:"
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "Kirje tabulaattorit sivulla"
+
+#~ msgid "Margins"
+#~ msgstr "Reunukset"
+
+#~ msgid "Number of columns:"
+#~ msgstr "Sarakkeiden määrä:"
+
+#~ msgid "Options"
+#~ msgstr "Asetukset"
+
+#~ msgid "Orientation"
+#~ msgstr "Suunta"
+
+#~ msgid "Page"
+#~ msgstr "Sivu"
+
+#~ msgid "Page Setup:"
+#~ msgstr "Sivun asetukset:"
+
+#~ msgid "Paper"
+#~ msgstr "Paperi"
+
+#~ msgid "Paper source:"
+#~ msgstr "Paperilähde:"
+
+#~ msgid "Portrait"
+#~ msgstr "Pysty"
+
+#~ msgid "Preview:"
+#~ msgstr "Esikatselu:"
+
+#~ msgid "Print using gray shading"
+#~ msgstr "Tulosta käyttäen harmaata varjostusta"
+
+#~ msgid "Reverse on even pages"
+#~ msgstr "Peilikuvareunukset"
+
+#~ msgid "Right:"
+#~ msgstr "Oikea:"
+
+#~ msgid "Sections:"
+#~ msgstr "Osiot:"
+
+#~ msgid "Start on a new page"
+#~ msgstr "Aloita uudelta sivulta"
+
+#~ msgid "Style name:"
+#~ msgstr "Tyylin nimi:"
+
+#~ msgid "Top:"
+#~ msgstr "Ylä:"
+
+#~ msgid "Width:"
+#~ msgstr "Leveys:"
+
+#~ msgid "_Font..."
+#~ msgstr "_Kirjasin..."
+
+#~ msgid "Configure your timezone, Calendar and Task List here "
+#~ msgstr "Määrittele aikavyöhykkeesi, kalenteri ja tehtävälistasi"
+
+#~ msgid "Evolution Calendar and Tasks"
+#~ msgstr "Evolutionin kalenteri ja tehtävät"
+
+#~ msgid "Evolution Calendar configuration control"
+#~ msgstr "Evolution kalenterin määrittely"
+
+#~ msgid "Evolution Calendar scheduling message viewer"
+#~ msgstr "Evolution kalenterin ajanvarausviestien katselin"
+
+#~ msgid "Evolution Calendar/Task editor"
+#~ msgstr "Evolutionin kalenterin/tehtävien muokkain"
+
+#~ msgid "Evolution's Calendar component"
+#~ msgstr "Evolutionin kalenterin komponentti"
+
+#~ msgid "Evolution's Memos component"
+#~ msgstr "Evolutionin muistilappukomponentti"
+
+#~ msgid "Evolution's Tasks component"
+#~ msgstr "Evolutionin tehtävien komponentti"
+
+#~ msgid "Memo_s"
+#~ msgstr "Mui_stilaput"
+
+#~ msgid "_Calendars"
+#~ msgstr "_Kalenterit"
+
+#~ msgid "Evolution Calendar alarm notification service"
+#~ msgstr "Evolutionin kalenterin hälytyspalvelu"
+
+#~ msgid "minute"
+#~ msgid_plural "minutes"
+#~ msgstr[0] "minuutti"
+#~ msgstr[1] "minuuttia"
+
+#~ msgid "Start time"
+#~ msgstr "Alkamisaika"
+
+#~ msgid "Dismiss _All"
+#~ msgstr "Hylkää _kaikki"
+
+#~ msgid "Snooze _time:"
+#~ msgstr "Torkkumisaika:"
+
+#~ msgid "_Dismiss"
+#~ msgstr "_Hylkää"
+
+#~ msgid "_Snooze"
+#~ msgstr "_Torku"
+
+#~ msgid "location of appointment"
+#~ msgstr "tapaamisen sijainti"
+
+#~ msgid "No summary available."
+#~ msgstr "Ei yhteenvetoa saatavilla"
+
+#~ msgid "No description available."
+#~ msgstr "Ei kuvausta saatavilla"
+
+#~ msgid "No location information available."
+#~ msgstr "Ei sijaintitietoja saatavilla"
+
+#~ msgid "You have %d alarms"
+#~ msgstr "Sinulla on %d hälytystä"
+
+#~ msgid ""
+#~ "Evolution does not support calendar reminders with\n"
+#~ "email notifications yet, but this reminder was\n"
+#~ "configured to send an email.  Evolution will display\n"
+#~ "a normal reminder dialog box instead."
+#~ msgstr ""
+#~ "Evolution ei vielä tue kalenterin muistutuksia, joissa on\n"
+#~ "sähköpostihuomautus, mutta tämä muistutus oli määritelty\n"
+#~ "lähettämään sähköpostia. Evolution näyttää sen sijaan\n"
+#~ "tavallisen huomautusikkunan."
+
+#~ msgid ""
+#~ "An Evolution Calendar reminder is about to trigger. This reminder is "
+#~ "configured to run the following program:\n"
+#~ "\n"
+#~ "        %s\n"
+#~ "\n"
+#~ "Are you sure you want to run this program?"
+#~ msgstr ""
+#~ "Evolution kalenterin muistutus laukeaa nyt. Muistutus on määritelty "
+#~ "suorittamaan seuraavan ohjelman:\n"
+#~ "\n"
+#~ "         %s\n"
+#~ "\n"
+#~ "Haluatko varmasti suorittaa tämän ohjelman?"
+
+#~ msgid "Do not ask me about this program again."
+#~ msgstr "�lä kysy tästä ohjelmasta enää uudestaan"
+
+#~ msgid "Could not initialize Bonobo"
+#~ msgstr "Bonobon alustus ei onnistunut"
+
+#~ msgid ""
+#~ "Could not create the alarm notify service factory, maybe it's already "
+#~ "running..."
+#~ msgstr ""
+#~ "Hälytysten huomautuspalvelun tehdasta ei voi luoda, ehkä se oli jo "
+#~ "käynnissä?"
+
+#~ msgid "invalid time"
+#~ msgstr "epäkelpo aika"
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the task list and the task preview "
+#~ "pane, in pixels."
+#~ msgstr ""
+#~ "Vaakapaneelin sijainti pikseleinä, tehtävälistan ja tehtävän esikatselun "
+#~ "välissä."
+
+#~ msgid "Whether to use daylight savings time while displaying events."
+#~ msgstr "Käytetäänkö kesäaikaa näytettäessä tapahtumia."
+
+#~ msgid "daylight savings time"
+#~ msgstr "kesäaika"
+
+#~ msgid "Category is"
+#~ msgstr "Luokka on"
+
+#~ msgid "Comment contains"
+#~ msgstr "Kommentti sisältää"
+
+#~ msgid "Location contains"
+#~ msgstr "Sijainti sisältää"
+
+#~ msgid "_Make available for offline use"
+#~ msgstr "_Kopioi käytettäväksi yhteydettömässä tilassa"
+
+#~ msgid "_Do not make available for offline use"
+#~ msgstr "_�lä kopioi käytettäväksi yhteydettömässä tilassa"
+
+#~ msgid "Failed upgrading calendars."
+#~ msgstr "Kalenterien päivitys epäonnistui."
+
+#~ msgid "Unable to open the calendar '%s' for creating events and meetings"
+#~ msgstr ""
+#~ "Kalenterin \"%s\" avaus tehtävien ja kokousten luontia varten epäonnistui"
+
+#~ msgid "There is no calendar available for creating events and meetings"
+#~ msgstr "Tehtävien ja kokousten luontia varten ei löydy kalenteria"
+
+#~ msgid "New appointment"
+#~ msgstr "Uusi tapaaminen"
+
+#~ msgid "New meeting"
+#~ msgstr "Uusi tapaaminen"
+
+#~ msgid "New all day appointment"
+#~ msgstr "Uusi koko päivän tapaaminen"
+
+#~ msgid "New calendar"
+#~ msgstr "Uusi kalenteri"
+
+#~ msgid "Error while opening the calendar"
+#~ msgstr "Virhe avattaessa kalenteria"
+
+#~ msgid "Method not supported when opening the calendar"
+#~ msgstr "Menetelmä ei ollut tuettu avattaessa kalenteria"
+
+#~ msgid "Permission denied to open the calendar"
+#~ msgstr "Kalenterin avaamiseen ei ollut tarvittavia oikeuksia"
+
+#~ msgid "Unknown error"
+#~ msgstr "Tuntematon virhe"
+
+#~ msgid "after"
+#~ msgstr "jälkeen"
+
+#~ msgid "day(s)"
+#~ msgstr "päivä"
+
+#~ msgid "end of appointment"
+#~ msgstr "tapaamisen päättymistä"
+
+#~ msgid "hour(s)"
+#~ msgstr "tunti(a)"
+
+#~ msgid "minute(s)"
+#~ msgstr "minuutti(a)"
+
+#~ msgid "Adjust for daylight sa_ving time"
+#~ msgstr "Säädä _kesäajan mukaan"
+
+#~ msgid "Attached message - %s"
+#~ msgstr "Liitetty viesti - %s"
+
+#~ msgid "Cancel _Drag"
+#~ msgstr "Peruuta _raahaus"
+
+#~ msgid "<b>%d</b> Attachment"
+#~ msgid_plural "<b>%d</b> Attachments"
+#~ msgstr[0] "<b>%d</b> liite"
+#~ msgstr[1] "<b>%d</b> liitettä"
+
+#~ msgid "Hide Attachment _Bar"
+#~ msgstr "Piilota _liitepalkki"
+
+#~ msgid "Show Attachment _Bar"
+#~ msgstr "Näytä _liitepalkki"
+
+#~ msgid "Show Attachments"
+#~ msgstr "Näytä liitteet"
+
+#~ msgid "Press space key to toggle attachment bar"
+#~ msgstr "Näytä tai piilota liitepalkki välilyönnillä"
+
+#~ msgid "_Add "
+#~ msgstr "_Lisää "
+
+#~ msgid "1 day before appointment"
+#~ msgstr "Yksi päivä ennen tapaamista"
+
+#~ msgid "1 hour before appointment"
+#~ msgstr "Yksi tunti ennen tapaamista"
+
+#~ msgid "15 minutes before appointment"
+#~ msgstr "15 minuuttia ennen tapaamista"
+
+#~ msgid "for"
+#~ msgstr "kesto"
+
+#~ msgid "<b>Att_endees</b>"
+#~ msgstr "<b>_Läsnäolijat</b>"
+
+#~ msgid "C_hange Organizer"
+#~ msgstr "Vaihda _järjestäjää"
+
+#~ msgid "Co_ntacts..."
+#~ msgstr "_Yhteystiedot..."
+
+#~ msgid "forever"
+#~ msgstr "ikuisesti"
+
+#~ msgid "month(s)"
+#~ msgstr "kuukausi"
+
+#~ msgid "week(s)"
+#~ msgstr "viikko"
+
+#~ msgid "year(s)"
+#~ msgstr "vuosi"
+
+#~ msgid "untitled_image.%s"
+#~ msgstr "nimetön_kuva.%s"
+
+#~ msgid "_Save As..."
+#~ msgstr "Tallenna _nimellä..."
+
+#~ msgid "_Save Selected"
+#~ msgstr "Tallenna _valitut"
+
+#~ msgid "P_rint..."
+#~ msgstr "T_ulosta..."
+
+#~ msgid "C_ut"
+#~ msgstr "L_eikkaa"
+
+#~ msgid "_Paste"
+#~ msgstr "L_iitä"
+
+#~ msgid "_Forward as iCalendar"
+#~ msgstr "_Välitä iCalendar-muodossa"
+
+#~ msgid "_Mark Selected Tasks as Complete"
+#~ msgstr "_Merkitse valitut tehtävät valmiiksi"
+
+#~ msgid "_Mark Selected Tasks as Incomplete"
+#~ msgstr "_Merkitse valitut tehtävät keskeneräisiksi"
+
+#~ msgid "_Delete Selected Tasks"
+#~ msgstr "_Poista valitut tehtävät"
+
+#~ msgid "Select T_oday"
+#~ msgstr "Valitse _tämä päivä"
+
+#~ msgid "_Select Date..."
+#~ msgstr "_Valitse päiväys..."
+
+#~ msgid "Pri_nt..."
+#~ msgstr "T_ulosta..."
+
+#~ msgid "_Delete Selected Memos"
+#~ msgstr "_Poista valitut muistilaput"
+
+#~ msgid "Completing tasks..."
+#~ msgstr "Viimeistellään tehtäviä..."
+
+#~ msgid "Expunging"
+#~ msgstr "Poistetaan poistettuja"
+
+#~ msgid "_Custom View"
+#~ msgstr "_Oma näkymä"
+
+#~ msgid "_Save Custom View"
+#~ msgstr "_Tallenna oma näkymä"
+
+#~ msgid "_Define Views..."
+#~ msgstr "_Määrittele näkymät..."
+
+#~ msgid "Loading tasks at %s"
+#~ msgstr "Ladataan tehtäviä %s"
+
+#~ msgid "Loading memos at %s"
+#~ msgstr "Ladataan muistilappuja lähteestä %s"
+
+#~ msgid "Purging"
+#~ msgstr "Tyhjennetään"
+
+#~ msgid "April"
+#~ msgstr "Huhtikuu"
+
+#~ msgid "August"
+#~ msgstr "Elokuu"
+
+#~ msgid "December"
+#~ msgstr "Joulukuu"
+
+#~ msgid "February"
+#~ msgstr "Helmikuu"
+
+#~ msgid "January"
+#~ msgstr "Tammikuu"
+
+#~ msgid "July"
+#~ msgstr "Heinäkuu"
+
+#~ msgid "June"
+#~ msgstr "Kesäkuu"
+
+#~ msgid "March"
+#~ msgstr "Maaliskuu"
+
+#~ msgid "May"
+#~ msgstr "Toukokuu"
+
+#~ msgid "November"
+#~ msgstr "Marraskuu"
+
+#~ msgid "October"
+#~ msgstr "Lokakuu"
+
+#~ msgid "September"
+#~ msgstr "Syyskuu"
+
+#~ msgid "Failed upgrading memos."
+#~ msgstr "Muistilappujen päivitys epäonnistui."
+
+#~ 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"
+
+#~ msgid "There is no calendar available for creating memos"
+#~ msgstr "Muistilappujen luomiseen tarvittavaa kalenteria ei ole saatavilla"
+
+#~ msgid "New shared memo"
+#~ msgstr "Uusi jaettu muistilappu"
+
+#~ msgctxt "New"
+#~ msgid "Memo li_st"
+#~ msgstr "Muistilappu_lista"
+
+#~ msgid "Failed upgrading tasks."
+#~ msgstr "Tehtävälistan päivitys epäonnistui."
+
+#~ 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"
+
+#~ msgid "There is no calendar available for creating tasks"
+#~ msgstr "Tehtävien luomiseen tarvittavaa kalenteria ei ole saatavilla"
+
+#~ msgid "New task"
+#~ msgstr "Uusi tehtävä"
+
+#~ msgid "New assigned task"
+#~ msgstr "Uusi tehtäväksianto"
+
+#~ msgctxt "New"
+#~ msgid "Tas_k list"
+#~ msgstr "_Tehtävälista"
+
+#~ msgid "Could not open autosave file"
+#~ msgstr "Automaattitallennuksen tiedostoa ei voi avata"
+
+#~ msgid "_Post-To Field"
+#~ msgstr "_Postitusosoite-kenttä (Post-To)"
+
+#~ msgid "Toggles whether the Post-To field is displayed"
+#~ msgstr "Määrittää näytetäänkö Postitusosoite-kenttä"
+
+#~ msgid "_Subject Field"
+#~ msgstr "Ot_sikko-kenttä"
+
+#~ msgid "Toggles whether the Subject field is displayed"
+#~ msgstr "Määrittää näytetäänkö otsikkokenttä"
+
+#~ msgid "_To Field"
+#~ msgstr "_Vastaanottaja-kenttä"
+
+#~ msgid "Toggles whether the To field is displayed"
+#~ msgstr "Määrittää näytetäänkö Vastaanottaja-kenttä"
+
+#~ msgid "Component"
+#~ msgstr "Komponentti"
+
+#~ msgid "Label name cannot be empty."
+#~ msgstr "Merkinnälle täytyy antaa nimi."
+
+#~ msgid ""
+#~ "A label having the same tag already exists on the server. Please rename "
+#~ "your label."
+#~ msgstr ""
+#~ "Samanniminen merkintä on jo tallennettu palvelimelle. Nimeä merkintä "
+#~ "uudestaan."
+
+#~ msgid "ago"
+#~ msgstr "sitten"
+
+#~ msgid "months"
+#~ msgstr "kuukautta"
+
+#~ msgid "the time you specify"
+#~ msgstr "määrittelemäsi aika"
+
+#~ msgid "years"
+#~ msgstr "vuotta"
+
+#~ msgid ""
+#~ "Configure mail preferences, including security and message display, here"
+#~ msgstr ""
+#~ "Määrittele sähköpostiasetuksia mukaan lukien turva-asetukset ja viestin "
+#~ "näyttö"
+
+#~ msgid "Configure spell-checking, signatures, and the message composer here"
+#~ msgstr ""
+#~ "Määrittele oikoluvun, allekirjoitusten ja viestin muokkaimen asetukset "
+#~ "tästä"
+
+#~ msgid "Configure your email accounts here"
+#~ msgstr "Määrittele sähköpostitilisi tästä"
+
+#~ msgid "Configure your network connection settings here"
+#~ msgstr "Määrittele verkkoyhteysasetukset tästä"
+
+#~ msgid "Evolution Mail"
+#~ msgstr "Evolution-sähköposti"
+
+#~ msgid "Evolution Mail accounts configuration control"
+#~ msgstr "Evolutionin sähköpostitilien asetukset"
+
+#~ msgid "Evolution Mail component"
+#~ msgstr "Evolutionin sähköpostikomponentti"
+
+#~ msgid "Evolution Mail composer"
+#~ msgstr "Evolutionin sähköpostin muokkain"
+
+#~ msgid "Evolution Mail composer configuration control"
+#~ msgstr "Evolutionin viestimuokkaimen asetukset"
+
+#~ msgid "Evolution Mail preferences control"
+#~ msgstr "Evolutionin sähköpostin asetukset"
+
+#~ msgid "Evolution Network configuration control"
+#~ msgstr "Evolutionin verkkoyhteyden asetukset"
+
+#~ msgid "[Default]"
+#~ msgstr "[Oletus]"
+
+#~ msgid "Signature(s)"
+#~ msgstr "Allekirjoitukset"
+
+#~ msgid "Account Search"
+#~ msgstr "Haku tileiltä"
+
+#~ msgid "All Account Search"
+#~ msgstr "Etsi kaikilta tileiltä"
+
+#~ msgid "_Copy to Folder"
+#~ msgstr "_Kopioi kansioon"
+
+#~ msgid "_Move to Folder"
+#~ msgstr "_Siirrä kansioon"
+
+#~ msgid "Open in _New Window"
+#~ msgstr "Avaa _uudessa ikkunassa"
+
+#~ msgid "_Move..."
+#~ msgstr "_Siirrä..."
+
+#~ msgid "Re_fresh"
+#~ msgstr "Vi_rkistä"
+
+#~ msgid "_Unread Search Folder"
+#~ msgstr "_Lukemattomien hakukansio"
+
+#~ msgid "U_ndelete"
+#~ msgstr "_Palauta"
+
+#~ msgid "Fla_g Completed"
+#~ msgstr "_Merkitse valmiiksi"
+
+#~ msgid "Cl_ear Flag"
+#~ msgstr "_Poista merkki"
+
+#~ msgid "Crea_te Rule From Message"
+#~ msgstr "_Luo viestistä sääntö"
+
+#~ msgid "Search Folder based on _Subject"
+#~ msgstr "Hakunäkymä _aiheen perusteella"
+
+#~ msgid "Search Folder based on Se_nder"
+#~ msgstr "Hakunäkymä _lähettäjän perusteella"
+
+#~ msgid "Search Folder based on _Recipients"
+#~ msgstr "Hakunäkymä _vastaanottajien perusteella"
+
+#~ msgid "Filter based on Sub_ject"
+#~ msgstr "Suodata a_iheen mukaan"
+
+#~ msgid "Filter based on Sen_der"
+#~ msgstr "Suodata _lähettäjän mukaan"
+
+#~ msgid "Filter based on Re_cipients"
+#~ msgstr "Suodata _vastaanottajien mukaan"
+
+#~ msgid "Filter based on _Mailing List"
+#~ msgstr "Suodata _postituslistan mukaan"
+
+#~ msgid "Retrieving Message..."
+#~ msgstr "Noudetaan viestiä..."
+
+#~ msgid "C_all To..."
+#~ msgstr "_Soita..."
+
+#~ msgid "Completed on %B %d, %Y, %l:%M %p"
+#~ msgstr "Valmistui %B %d, %Y, %l.%M %p"
+
+#~ msgid "by %B %d, %Y, %l:%M %p"
+#~ msgstr "kirjoittanut %d %l.%M %p"
+
+#~ msgid "_Fit to Width"
+#~ msgstr "Sovita _leveyteen"
+
+#~ msgid "Show _Original Size"
+#~ msgstr "Näytä alkuperäinen k_oko"
+
+#~ msgid "_Save Selected..."
+#~ msgstr "_Tallenna valinta..."
+
+#~ msgid "%d at_tachment"
+#~ msgid_plural "%d at_tachments"
+#~ msgstr[0] "%d lii_te"
+#~ msgstr[1] "%d lii_tettä"
+
+#~ msgid "S_ave"
+#~ msgstr "T_allenna"
+
+#~ msgid "No Attachment"
+#~ msgstr "Ei liitteitä"
+
+#~ msgid " (%a, %R %Z)"
+#~ msgstr " (%a. %R %Z)"
+
+#~ msgid " (%R %Z)"
+#~ msgstr " (%R %Z)"
+
+#~ msgid "Tag"
+#~ msgstr "Merkintä"
+
+#~ msgid "_Reply to sender"
+#~ msgstr "_Vastaa lähettäjälle"
+
+#~ msgid "Add address"
+#~ msgstr "Lisää osoite"
+
+#~ msgid "Default height of the message window."
+#~ msgstr "Viesti-ikkunan oletuskorkeus."
+
+#~ msgid "Default width of the message window."
+#~ msgstr "Viesti-ikkunan oletusleveys."
+
+#~ 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."
+#~ 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."
+
+#~ msgid ""
+#~ "If the \"Preview\" pane is on, then show it side-by-side rather than "
+#~ "vertically."
+#~ msgstr ""
+#~ "Jos \"Esikatselu\"-paneeli on käytössä, se näytetään viestiluettelon "
+#~ "vieressä eikä alapuolella."
+
+#~ msgid "Message Window default height"
+#~ msgstr "Viesti-ikkunan oletuskorkeus"
+
+#~ msgid "Message Window default width"
+#~ msgstr "Viestiikkunan oletusleveys"
+
+#~ msgid "Use side-by-side or wide layout"
+#~ msgstr "Näytä vierekkäistä, leveää asettelua"
+
+#~ msgid "View/Bcc menu item is checked"
+#~ msgstr "Näytä/Bcc on valittu"
+
+#~ msgid "View/Bcc menu item is checked."
+#~ msgstr "Näytä/Bcc on valittu."
+
+#~ msgid "View/Cc menu item is checked"
+#~ msgstr "Näytä/Cc on valittu"
+
+#~ msgid "View/Cc menu item is checked."
+#~ msgstr "Näytä/Cc on valittu."
+
+#~ msgid "View/From menu item is checked"
+#~ msgstr "Näytä/Lähettäjä on valittu."
+
+#~ msgid "View/From menu item is checked."
+#~ msgstr "Näytä/Lähettäjä on valittu."
+
+#~ msgid "View/PostTo menu item is checked"
+#~ msgstr "Näytä/Lähetä ryhmään on valittu"
+
+#~ msgid "View/PostTo menu item is checked."
+#~ msgstr "Näytä/Lähetä ryhmään on valittu"
+
+#~ msgid "View/ReplyTo menu item is checked"
+#~ msgstr "Näytä/Vastausosoite on valittu"
+
+#~ msgid "View/ReplyTo menu item is checked."
+#~ msgstr "Näytä/Vastausosoite on valittu"
+
+#~ msgid "New Mail Message"
+#~ msgstr "Uusi viesti"
+
+#~ msgid "New Mail Folder"
+#~ msgstr "Uusi sähköpostikansio"
+
+#~ msgid "Failed upgrading Mail settings or folders."
+#~ msgstr "Sähköpostin asetusten tai kansioiden päivitys epäonnistui."
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Balttilainen (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Balttilainen (ISO-8859-4)"
+
+#~ msgid "Ch_eck for Supported Types "
+#~ msgstr "Tar_kista tuetut tyypit"
+
+#~ msgid "Do not quote"
+#~ msgstr "�lä lainaa"
+
+#~ msgid "Email Accounts"
+#~ msgstr "Sähköpostitilit"
+
+#~ msgid "Inline (Outlook style)"
+#~ msgstr "Sisäkkäinen alkuperäisviesti (Outlookin tapaan)"
+
+#~ msgid "Quoted"
+#~ msgstr "Lainattu"
+
+#~ msgid "S_OCKS Host:"
+#~ msgstr "S_OCKS-palvelin:"
+
+#~ msgid "Select Drafts Folder"
+#~ msgstr "Valitse luonnosten kansio"
+
+#~ msgid "Select Sent Folder"
+#~ msgstr "Valitse lähetettyjen kansio"
+
+#~ msgid "Signatures Table"
+#~ msgstr "Allekirjoitusten taulu"
+
+#~ msgid "_Automatic proxy configuration URL:"
+#~ msgstr "_Automaattisten välipalvelinasetusten URL:"
+
+#~ msgid "Case _sensitive"
+#~ msgstr "Kirjain_koolla on merkitystä"
+
+#~ msgid "F_ind:"
+#~ msgstr "_Etsi:"
+
+#~ msgid "Find in Message"
+#~ msgstr "Etsi viestistä"
+
+#~ msgid "None Selected"
+#~ msgstr "Ei mitään valittuna"
+
+#~ msgid "Subject or Recipients contains"
+#~ msgstr "Aihe tai vastaanottaja sisältää"
+
+#~ msgid "Provides core functionality for local address books."
+#~ msgstr "Tarjoaa paikallisten osoitekirjojen perustoiminnot."
+
+#~ msgid ""
+#~ "Looks for clues in a message for mention of attachments and warns if the "
+#~ "attachment is missing"
+#~ msgstr ""
+#~ "Tunnistaa viesteistä viitteitä liitetiedostoista, ja varoittaa "
+#~ "puuttuvista liitetiedostoista"
+
+#~ 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 plugin"
+#~ msgstr "�änensoiton lisäosa"
+
+#~ msgid "A plugin for backing up and restore Evolution data and settings."
+#~ msgstr "Varmuuskopioi ja palauta Evolutionin tietoja ja asetuksia."
+
+#~ msgid "CalDAV Calendar sources"
+#~ msgstr "CalDAV-kalenterien lähteet"
+
+#~ msgid "Provides core functionality for local calendars."
+#~ msgstr "Tarjoaa paikallisten kalenterien perustoiminnot."
+
+#~ msgid "HTTP Calendars"
+#~ msgstr "HTTP-kalenterit"
+
+#~ msgid "Provides core functionality for webcal and http calendars."
+#~ msgstr "Tarjoaa webcal- ja http-kalentereiden perustoiminnot."
+
+#~ msgid "Provides core functionality for weather calendars."
+#~ msgstr "Tarjoaa sääkalentereiden perustoiminnot."
+
+#~ 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"
+
+#~ msgid ""
+#~ "Provides functionality for marking a calendar or an address book as the "
+#~ "default one."
+#~ msgstr ""
+#~ "Tarjoaa toiminallisuuden kalenterien tai osoitekirjojen merkitsemiseksi "
+#~ "oletusvalinnaksi."
+
+#~ msgid "S_pecify the mailbox name"
+#~ msgstr "_Anna sähköpostikansion nimi"
+
+#~ 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 "Compose messages using an external editor"
+#~ msgstr "Kirjoita viestit käyttäen ulkoista muokkainta"
+
+#~ msgid "Allows unsubscribing of mail folders in the side bar context menu."
+#~ msgstr ""
+#~ "Sallii postikansioiden tilauksen perumisen sivupalkin kontekstivalikosta."
+
+#~ msgid "Unsubscribe Folders"
+#~ msgstr "Peru kansioiden tilauksia"
+
+#~ msgid "A plugin to setup Google Calendar and Contacts."
+#~ msgstr "Google-kalenterin ja yhteystietojen lisäosa."
+
+#~ msgid "Google sources"
+#~ msgstr "Google-lähteet"
+
+#~ msgid "A plugin to setup GroupWise calendar and contacts sources."
+#~ msgstr "Groupwise-kalenterien ja yhteystietolähteiden lisäosa."
+
+#~ msgid "A plugin to setup hula calendar sources."
+#~ msgstr "Hula-kalenterien lähteiden määrittelyn lisäosa."
+
+#~ msgid "Hula Account Setup"
+#~ msgstr "Hula-tilin asetukset"
+
+#~ msgid "A plugin for the features in the IMAP accounts."
+#~ msgstr "Lisäosa IMAP-tilien ominaisuuksille."
+
+#~ msgid "_Import to Calendar"
+#~ msgstr "_Tuo kalenteriin"
+
+#~ msgid "Import ICS"
+#~ msgstr "Tuo ICS-tiedosto"
+
+#~ msgid "_Import"
+#~ msgstr "_Tuo"
+
+#~ msgid "Imports ICS attachments to calendar."
+#~ msgstr "Tuo ICS-liitteitä kalenteriin."
+
+#~ msgid ""
+#~ "Synchronize the selected task/memo/calendar/address book with Apple iPod"
+#~ msgstr ""
+#~ "Synkronoi valitut tehtävät, muistilaput, kalenterit tai osoitekirjat "
+#~ "Apple iPodiin"
+
+#~ msgid "_Tasks :"
+#~ msgstr "_Tehtävät :"
+
+#~ msgid "Memos :"
+#~ msgstr "Muistilaput :"
+
+#~ msgid "Allows disabling of accounts."
+#~ msgstr "Mahdollistaa tilien poistamisen käytöstä."
+
+#~ msgid "Specify _filename:"
+#~ msgstr "Anna _tiedostonimi:"
+
+#~ msgid "Pl_ay"
+#~ msgstr "_Soita"
+
+#~ 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."
+#~ msgstr ""
+#~ "Luo D-Bus-viestin, tai huomauttaa käyttäjää ilmoitusalueen kuvakkeella "
+#~ "sekä huomautusviestillä, kun uusia viestejä saapuu."
+
+#~ msgid ""
+#~ "A plugin which allows the creation of meetings from the contents of a "
+#~ "mail message."
+#~ msgstr ""
+#~ "Lisäosa, jonka avulla voidaan luoda tapaamisia viestin sisällön "
+#~ "perusteella."
+
+#~ msgid "Con_vert to Meeting"
+#~ msgstr "_Muuta kokoukseksi"
+
+#~ msgid "Mail to meeting"
+#~ msgstr "Sähköposti kokoukselle"
+
+#~ msgid ""
+#~ "A plugin which allows the creation of tasks from the contents of a mail "
+#~ "message."
+#~ msgstr ""
+#~ "Lisäosa, jonka avulla voidaan luoda tehtäviä viestin sisällön perusteella."
+
+#~ msgid "Con_vert to Task"
+#~ msgstr "Muunna tehtä_väksi"
+
+#~ msgid "Mail to task"
+#~ msgstr "Viesti tehtäväksi"
+
+#~ msgid "Contact list _owner"
+#~ msgstr "Ota yhteyttä listan _omistajaan"
+
+#~ msgid "Get list _archive"
+#~ msgstr "Nouda listan _arkisto"
+
+#~ msgid "Get list _usage information"
+#~ msgstr "Näytä listan _käyttötiedot"
+
+#~ msgid "_Post message to list"
+#~ msgstr "_Lähetä viesti listalle"
+
+#~ msgid "_Subscribe to list"
+#~ msgstr "_Tilaa lista"
+
+#~ msgid "_Un-subscribe to list"
+#~ msgstr "_Peru listan tilaus"
+
+#~ msgid "Used for marking all the messages under a folder as read"
+#~ msgstr "Käytetään merkitsemään kaikki kansion viestit luetuiksi"
+
+#~ msgid "A plugin which implements mono plugins."
+#~ msgstr "Lisäosa, joka toteuttaa mono-lisäosat."
+
+#~ msgid "Mono Loader"
+#~ msgstr "Mono-lataaja"
+
+#~ msgid "A plugin for managing which plugins are enabled or disabled."
+#~ msgstr "Lisäosa, jolla voidaan hallita muiden lisäosien käyttöä."
+
+#~ 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"
+
+#~ msgid "Writes a log of profiling data events."
+#~ msgstr "Kirjoittaa lokia profilointitiedon tapahtumista."
+
+#~ msgid "A plugin which loads other plugins written using Python."
+#~ msgstr "Muita pythonilla tehtyjä lisäosia lataava lisäosa."
+
+#~ msgid "Python Loader"
+#~ msgstr "Python-latain"
+
+#~ msgid "SpamAssassin (built-in)"
+#~ msgstr "Spamassassin (sisäänrakennettu)"
+
+#~ 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 "A plugin for saving all attachments or parts of a message at once."
+#~ msgstr "Lisäosa kaikkien liitteiden tallentamiseen kerralla."
+
+#~ msgid "Save Attachments..."
+#~ msgstr "Tallenna liitteet..."
+
+#~ msgid "Save all attachments"
+#~ msgstr "Tallenna kaikki liitteet"
+
+#~ msgid "Select save base name"
+#~ msgstr "Valitse tallennuspaikan nimi"
+
+#~ msgid "_Save to Disk"
+#~ msgstr "_Tallenna levylle"
+
+#~ msgid "Select one source"
+#~ msgstr "Valitse lähde"
+
+#~ msgid "Selects a single calendar or task source for viewing."
+#~ msgstr "Valitsee näytettävän kalenterin tai tehtävälistaan."
+
+#~ msgid "Indicates if threading of messages should fall back to subject."
+#~ msgstr "Tulisiko viestien säikeistämisen palata aihejärjestykseen."
+
+#~ msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
+#~ msgstr "Lisäosa, joka voita avata TNEF-liitteitä ytnef-ohjelman avulla."
+
+#~ msgid "A plugin to setup WebDAV contacts."
+#~ msgstr "WebDAV-yhteystietojen lisäosa."
+
+#~ msgid "Evolution Shell"
+#~ msgstr "Evolution-kuori"
+
+#~ msgid "Evolution Shell Config factory"
+#~ msgstr "Evolution-kuoren asetustehdas"
+
+#~ msgid "Evolution Test"
+#~ msgstr "Evolution testi"
+
+#~ msgid "Evolution Test component"
+#~ msgstr "Evolutionin testikomponentti"
+
+#~ msgid "<b>Active Connections</b>"
+#~ msgstr "<b>Aktiiviset yhteydet</b>"
+
+#~ msgid "Active Connections"
+#~ msgstr "Aktiiviset yhteydet"
+
+#~ msgid "Click OK to close these connections and go offline"
+#~ msgstr ""
+#~ "Valitse OK sulkeaksesi nämä yhteydet ja siirtyäksesi yhteydettömään tilaan"
+
+#~ 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."
+
+#~ msgid "Error executing %s."
+#~ msgstr "Virhe suoritettaessa %s."
+
+#~ msgid "Work Offline"
+#~ msgstr "Katkaise verkkoyhteydet"
+
+#~ msgid "Evolution is in the process of going offline."
+#~ msgstr "Evolution siirtyy yhteydettömään tilaan."
+
+#~ msgid "Unknown system error."
+#~ msgstr "Tuntematon järjestelmävirhe."
+
+#~ msgid "Invalid arguments"
+#~ msgstr "Virheellisiä argumentteja"
+
+#~ msgid "Cannot register on OAF"
+#~ msgstr "OAF:ia ei voidaan rekisteröidä"
+
+#~ msgid "Configuration Database not found"
+#~ msgstr "Asetustietokantaa ei löytynyt"
+
+#~ msgid "New Test"
+#~ msgstr "Uusi testi"
+
+#~ msgid "Cannot start Evolution"
+#~ msgstr "Evolutionia ei voitu käynnistää"
+
+#~ msgid "Evolution can not start."
+#~ msgstr "Evolution ei käynnisty."
+
+#~ msgid ""
+#~ "Your system configuration does not match your Evolution configuration.\n"
+#~ "\n"
+#~ "Click help for details"
+#~ msgstr "Valitse Ohje saadaksesi lisätietoja"
+
+#~ msgid ""
+#~ "Your system configuration does not match your Evolution configuration:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "\n"
+#~ "Click help for details."
+#~ msgstr ""
+#~ "Järjestelmäsi kokoonpano ei vastaa Evolutionin asetuksiasi:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "\n"
+#~ "Valitse Ohje saadaksesi lisätietoja"
+
+#~ msgid "Copy"
+#~ msgstr "Kopioi"
+
+#~ msgid "Copy to Folder..."
+#~ msgstr "Kopioi kansioon..."
+
+#~ msgid "Create a new address book folder"
+#~ msgstr "Luo uusi osoitekirjakansio"
+
+#~ msgid "Cut"
+#~ msgstr "Leikkaa"
+
+#~ msgid "Forward Contact"
+#~ msgstr "Välitä yhteystieto eteenpäin"
+
+#~ msgid "Move to Folder..."
+#~ msgstr "Siirrä kansioon..."
+
+#~ msgid "Paste"
+#~ msgstr "Liitä"
+
+#~ msgid "Save as VCard..."
+#~ msgstr "Tallenna VCardina..."
+
+#~ msgid "Select _All"
+#~ msgstr "Valitse _kaikki"
+
+#~ msgid "Send message to contact"
+#~ msgstr "Lähetä viesti henkilölle"
+
+#~ msgid "St_op"
+#~ msgstr "Py_säytä"
+
+#~ msgid "Stop"
+#~ msgstr "Pysäytä"
+
+#~ msgid "_Copy Folder Contacts To"
+#~ msgstr "_Kopioi kansion yhteystiedot..."
+
+#~ msgid "_Move Folder Contacts To"
+#~ msgstr "_Siirrä kansion sisältö..."
+
+#~ msgid "_Rename"
+#~ msgstr "_Nimeä uudestaan"
+
+#~ msgid "_Save Contact as VCard..."
+#~ msgstr "_Tallenna yhteystieto VCardina..."
+
+#~ msgid "_Save Folder Contacts As VCard"
+#~ msgstr "Tallenna kansion yhteystiedot VCardina"
+
+#~ msgid "Delete _all Occurrences"
+#~ msgstr "Poista k_aikki tapahtumakerrat"
+
+#~ msgid "Show the working week"
+#~ msgstr "Näytä työviikko"
+
+#~ msgid "View the debug console for log messages"
+#~ msgstr "Näytä lokiviestit vianetsintäkonsolissa"
+
+#~ msgid "_Debug Logs"
+#~ msgstr "_Vianetsintälokit"
+
+#~ msgid "Show message preview side-by-side with the message list"
+#~ msgstr "Näytä viestin esikatselu viestiluettelon vieressä"
+
+#~ msgid "Copy selected message(s) to the clipboard"
+#~ msgstr "Kopioi valitut viestit uuteen kansioon"
+
+#~ msgid "Cut selected message(s) to the clipboard"
+#~ msgstr "Leikkaa valitut viestit leikepöydälle"
+
+#~ msgid "Paste message(s) from the clipboard"
+#~ msgstr "Liitä viestit leikepöydältä"
+
+#~ msgid "Select all and only the messages that are not currently selected"
+#~ msgstr "Poista kaikki viestit, jotka eivät ole juuri nyt valittu"
+
+#~ msgid "Cut selected messages to the clipboard"
+#~ msgstr "Leikkaa valitut viestit leikepöydälle"
+
+#~ msgid "Not Junk"
+#~ msgstr "Ei roskapostia"
+
+#~ msgid "Paste messages from the clipboard"
+#~ msgstr "Liitä viestit leikepöydältä"
+
+#~ msgid "Pos_t New Message to Folder"
+#~ msgstr "L_isää uusi viesti kansioon"
+
+#~ msgid "Post a Repl_y"
+#~ msgstr "Postita _vastaus"
+
+#~ msgid "Post a message to a Public folder"
+#~ msgstr "Postita viesti julkiseen kansioon"
+
+#~ msgid "Post a reply to a message in a Public folder"
+#~ msgstr "Kirjoita vastine viestiin julkisessa kansiossa"
+
+#~ msgid "_Save Message..."
+#~ msgstr "_Tallenna viesti..."
+
+#~ msgid "Close"
+#~ msgstr "Sulje"
+
+#~ msgid "Main toolbar"
+#~ msgstr "Päätyökalupalkki"
+
+#~ msgid "Mar_k as Complete"
+#~ msgstr "Merkitse _valmiiksi"
+
+#~ msgid "Show task preview window"
+#~ msgstr "Näytä tehtävien esikatseluruutu"
+
+#~ msgid "About Evolution..."
+#~ msgstr "Tietoja Evolutionista..."
+
+#~ msgid "Change the visibility of the toolbar"
+#~ msgstr "Muuta työkalupalkin näkyvyyttä"
+
+#~ msgid "Forget remembered passwords so you will be prompted for them again"
+#~ msgstr ""
+#~ "Unohda muistetut salasanat siten, että ne kysytään tarvittaessa uudestaan"
+
+#~ msgid "Hide window buttons"
+#~ msgstr "Piilota ikkunan napit"
+
+#~ msgid "Page Set_up..."
+#~ msgstr "Sivun as_etukset..."
+
+#~ msgid "Prefere_nces"
+#~ msgstr "As_etukset"
+
+#~ msgid "Send / Receive"
+#~ msgstr "Lähetä / Vastaanota"
+
+#~ msgid "Submit Bug Report"
+#~ msgstr "Lähetä vikailmoitus"
+
+#~ msgid "Toggle whether we are working offline."
+#~ msgstr "Määritä, työskennelläänkö poissa linjoilta."
+
+#~ msgid "View/Hide the Side Bar"
+#~ msgstr "Näytä tai piilota sivupalkki"
+
+#~ msgid "View/Hide the Status Bar"
+#~ msgstr "Näytä tai piilota tilarivi"
+
+#~ msgid "Work _Offline"
+#~ msgstr "_Katkaise verkkoyhteydet"
+
+#~ msgid "_About"
+#~ msgstr "_Tietoja"
+
+#~ msgid "_Frequently Asked Questions"
+#~ msgstr "_Uaset kysytyt kysymykset"
+
+#~ msgid "_Hide Buttons"
+#~ msgstr "_Piilota napit"
+
+#~ msgid "_Quit"
+#~ msgstr "_Lopeta"
+
+#~ msgid "Save Custom View"
+#~ msgstr "Tallenna oma näkymä"
+
+#~ msgid "Attachment Bar"
+#~ msgstr "Liitepalkki"
+
+#~ msgid "Cannot attach file %s: %s"
+#~ msgstr "Tiedoston %s liittäminen epäonnistui: %s"
+
+#~ msgid "Cannot attach file %s: not a regular file"
+#~ msgstr "Tiedoston %s liittäminen epäonnistui: epätavallinen tiedosto"
+
+#~ msgid "MIME type:"
+#~ msgstr "MIME-tyyppi:"
+
+#~ msgid "Suggest automatic display of attachment"
+#~ msgstr "Ehdota liitteen automaattista näyttämistä"
+
+#~ msgid "Unknown character set: %s"
+#~ msgstr "Tuntematon merkistö: %s"
+
+#~ msgid "Expanded"
+#~ msgstr "Laajennettu"
+
+#~ msgid "Whether or not the expander is expanded"
+#~ msgstr "Onko laajennin laajennettu"
+
+#~ msgid "Text of the expander's label"
+#~ msgstr "Laajentimen otsikon teksti"
+
+#~ 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ä"
+
+#~ msgid "Space to put between the label and the child"
+#~ msgstr "Otsikon ja lapsen väliin laitettava tila"
+
+#~ msgid "Label widget"
+#~ msgstr "Merkintä-elementti"
+
+#~ msgid "A widget to display in place of the usual expander label"
+#~ msgstr "Tavallisen laajennin-otsikin tilalla näytettävä elementti"
+
+#~ msgid "Indicator Spacing"
+#~ msgstr "Indikaattioen välistys"
+
+#~ msgid "Spacing around expander arrow"
+#~ msgstr "Laajennusnuolen ympärillä oleva tila"
+
+#~ msgid "_Searches"
+#~ msgstr "_Haut"
+
+#~ msgid "Current Message"
+#~ msgstr "Valittu viesti"
+
+#~ msgid "Choose Image"
+#~ msgstr "Valitse kuva"
+
+#~ msgid "Empty message"
+#~ msgstr "Tyhjä viesti"
+
+#~ msgid "Reflow model"
+#~ msgstr "Uudelleenvirtauksen malli"
+
+#~ msgid "Column width"
+#~ msgstr "Sarakkeen leveys"
+
+#~ msgid "Search"
+#~ msgstr "Etsi"
+
+#~ msgid "_Clear"
+#~ msgstr "_Tyhjennä"
+
+#~ msgid "Item ID"
+#~ msgstr "Kohteen ID"
+
+#~ msgid "Edit Master Category List..."
+#~ msgstr "Muokkaa luokkien päälistaa..."
+
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "Näihin _luokkiin kuuluvat kohdat:"
+
+#~ msgid "_Available Categories:"
+#~ msgstr "Valittavat _luokat:"
+
+#~ msgid "categories"
+#~ msgstr "luokat"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l.%M %p"
+
+#~ msgid "DnD code"
+#~ msgstr "DnD-koodi"
+
+#~ msgid "Full Header"
+#~ msgstr "Täysi otsake"
+
+#~ msgid "Font Description"
+#~ msgstr "Kirjasimen kuvaus"
+
 #~ msgid ""
 #~ "[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
 #~ msgstr ""
@@ -24059,9 +25160,6 @@ msgstr "Kahvan ponnahdusikkuna"
 #~ 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"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]