[empathy] Update Finnish translation

From: Timo Jyrinki <tjyrinki src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy] Update Finnish translation
Date: Thu, 8 Sep 2011 10:41:57 +0000 (UTC)
commit 180787f1addccd923d50b45858ba24a0487e98bc
Author: Timo Jyrinki <timo debian org>
Date:   Thu Sep 8 13:41:45 2011 +0300

    Update Finnish translation

 po/fi.po | 2969 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 1901 insertions(+), 1068 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 88fc266..45eb546 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -12,17 +12,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: "
-"http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n";
-"POT-Creation-Date: 2010-11-13 22:40+0000\n"
-"PO-Revision-Date: 2010-11-15 13:51+0200\n"
-"Last-Translator: Ville-Pekka Vainio <vpivaini cs helsinki fi>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-09-08 13:41+0300\n"
+"PO-Revision-Date: 2011-09-08 13:41+0300\n"
+"Last-Translator: Timo Jyrinki <timo jyrinki iki fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu lists sourceforge net>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Launchpad-Export-Date: 2010-09-13 15:12+0000\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
@@ -47,6 +46,22 @@ msgid "Always open a separate chat window for new chats."
 msgstr "Avaa aina uusi ikkuna uusille keskusteluille."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Puhelun ÃÃnenvoimakkuus"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Puhelun ÃÃnenvoimakkuus prosentteina."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "Kamera"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Kameran sijainti"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -54,46 +69,54 @@ msgstr ""
 "Lempinimen jÃlkeen lisÃttÃvÃ merkki, kun kÃytetÃÃn lempinimen tÃydennystÃ "
 "(sarkain) ryhmÃkeskustelussa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Keskusteluikkunan teema"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Chat window theme variant"
+msgstr "Keskusteluikkunan teemamuunnos"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Pilkuilla eroteltu lista oikeinkirjoituksen tarkistusohjelman kÃyttÃmistÃ "
 "kielistÃ (esim. \"fi, en, fr\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Pienikokoinen tuttavaluettelo"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Yhteyden hallintaohjelmia tulisi kÃyttÃÃ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Tuttavaluettelon lajitteluperuste"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Oletuskamera videopuheluihin, esim. /dev/video0"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "Oletushakemisto, josta avatar-kuvat haetaan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "ÃlÃ nÃytÃ ponnahdusikkunoita poissaollessa"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "ÃlÃ soita ÃÃniÃ poissaollessa"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "NÃytÃ ajankohtaiset tapahtumat tilarivillÃ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -101,238 +124,248 @@ msgstr ""
 "NÃytÃ ajankohtaiset tapahtumat tilarivillÃ. MikÃli epÃtosi, nÃytÃ ne "
 "kÃyttÃjÃlle vÃlittÃmÃsti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "Kaiun poiston tuki"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Empathy voi julkaista kÃyttÃjÃn sijainnin"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy voi kÃyttÃÃ GPS:ÃÃ paikantamaan sijainnin"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy voi kÃyttÃÃ matkapuhelinverkkoa paikantamaan sijainnin"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy voi kÃyttÃÃ verkkoa paikantamaan sijainnin"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Empathyn noutojen oletuskansio"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has asked about importing accounts"
-msgstr "Empathy on kysynyt tilien tuonnista"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy on siirtÃnyt butterfly:n lokit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr ""
 "Empathyn tulisi merkitÃ automaattisesti poissaolevaksi, mikÃli konetta ei "
 "kÃytetÃ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy yrittÃÃ yhdistÃÃ automaattisesti kÃynnistettÃessÃ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathyn pitÃÃ heikentÃÃ sijainnin tarkkuutta"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy yrittÃÃ kÃyttÃÃ tuttavan avatarta keskusteluikkunan kuvakkeena"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
-msgstr "Ota kÃyttÃÃn WebKit-kehittÃjÃn tyÃkalut"
+msgstr "KÃytÃ WebKit-kehittÃjÃn tyÃkaluja"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "NÃytÃ ponnahdusikkuna uusille viesteille"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
-msgstr "Ota kÃyttÃÃn oikeinkirjoituksen tarkistus"
+msgstr "KÃytÃ oikeinkirjoituksen tarkistusta"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Piilota pÃÃikkuna"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Piilota pÃÃikkuna."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Lempinimen tÃydennysmerkki"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Avaa uusi ikkuna uusille keskusteluille"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "KÃytettÃvÃn Adium-teeman sijainti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "Adium-teeman sijainti Adiumia keskustelun teemana kÃytettÃessÃ."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Soita merkkiÃÃni saapuville viesteille"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Soita merkkiÃÃni uusista keskusteluista"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Soita merkkiÃÃni lÃhetettÃville viesteille"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Soita merkkiÃÃni tuttavan kirjautuessa sisÃÃn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Soita merkkiÃÃni tuttavan kirjautuessa ulos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Soita merkkiÃÃni kirjauduttaessa sisÃÃn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Soita merkkiÃÃni kirjauduttaessa ulos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Ponnahdusilmoitus kohdistamattomasta keskustelusta"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "Ponnahdusilmoitus tuttavan kirjautuessa sisÃÃn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Ponnahdusilmoitus tuttavan kirjautuessa ulos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Show Balance in contact list"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "NÃytÃ avatar-kuvat"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "NÃytÃ tuttavaluettelo huoneissa"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "NÃytÃ vihje pÃÃikkunan sulkemisesta"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "NÃytÃ linjoilta poissa olevat tuttavat"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "NÃytÃ protokollat"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Kielentarkastuksessa kÃytetyt kielet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "Oletuskansio, johon siirretyt tiedostot tallennetaan."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Viimeisin hakemisto, josta avatar-kuva oli valittu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "Keskusteluikkunan sivupaneelin sijainti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Keskusteluikkunan sivupaneelin tallennettu sijainti (pikseleinÃ)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Keskusteluikkunoissa kÃytettÃvÃ teema."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr ""
+"Teemamuunnos jota kÃytetÃÃn nÃyttÃmÃÃn keskustelu keskusteluikkunoissa."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "KÃytÃ hymiÃkuvakkeita"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "KÃytÃ merkkiÃÃniÃ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "KÃytÃ teemaa keskusteluhuoneille"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Saako Empathy paljastaa kÃyttÃjÃn sijainnin tuttaville."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Saako Empathy kÃyttÃÃ GPS:ÃÃ sijainnin arvaamiseen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Saako Empathy kÃyttÃÃ matkapuhelinverkkoa sijainnin arvaamiseen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Saako Empathy kÃyttÃÃ verkkoa sijainnin arvaamiseen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr "Onko Empathy tiedustellut tilien tuomisesta."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Onko Empathy siirtÃnyt butterfly-lokit."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
 "Kirjautuuko Empathy tileillesi automaattisesti kÃynnistymisensÃ yhteydessÃ."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Tulisiko Empathyn merkitÃ kÃyttÃjÃ automaattisesti poissaolevaksi, mikÃli "
 "konetta ei kÃytetÃ."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Alentaako Empathy sijaintitiedon tarkkuutta yksityisyyden suojaamiseksi."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "KÃyttÃÃkÃ Empathy tuttavan avatar-kuvaketta keskusteluikkunan kuvakkeena."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "Otetaanko WebKit-kehittÃjÃn tyÃkalut, kuten Web-tutkain, kÃyttÃÃn."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -340,61 +373,65 @@ msgstr ""
 "KÃyttÃÃkÃ Empathy yhteyksienhallintaa verkkoyhteyksien automaattiseen "
 "luomiseen ja katkaisuun."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "Tarkistetaanko kirjoitetut sanat oikolukukielellÃ."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "NÃytetÃÃnkÃ keskusteluiden hymiÃt hymiÃkuvakkeina."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "Ilmoitetaanko tuttavien sisÃÃnkirjautumisesta merkkiÃÃnellÃ."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "Ilmoitetaanko tuttavien uloskirjautumisesta merkkiÃÃnellÃ."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Ilmoitetaanko tapahtumista merkkiÃÃnin."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Ilmoitetaanko saapuvista viesteistÃ merkkiÃÃnellÃ."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Ilmoitetaanko uusista keskusteluista merkkiÃÃnellÃ."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Ilmoitetaanko lÃhtevistÃ viesteistÃ merkkiÃÃnellÃ."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Ilmoitetaanko verkkoon kirjautumisesta merkkiÃÃnellÃ."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Ilmoitetaanko verkosta uloskirjautumisesta merkkiÃÃnellÃ."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Ilmoitetaanko tapahtumista merkkiÃÃnin varattuna tai poissa oltaessa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "NÃytetÃÃnkÃ ponnahdusilmoitus tuttavan uloskirjautumisesta."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "NÃytetÃÃnkÃ ponnahdusilmoitus tuttavan sisÃÃnkirjautumisesta."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -402,56 +439,60 @@ msgstr ""
 "NÃytetÃÃnkÃ avatussa, kohdistamattomassa keskustelussa saapuneesta uudesta "
 "viestistÃ ponnahdusilmoitus."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "NÃytetÃÃnkÃ uudesta viestistÃ ponnahdusilmoitus."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Whether to show account balances in the contact list."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "NÃytetÃÃnkÃ tuttavien avatar-kuvakkeet tuttavaluettelossa ja "
 "keskusteluikkunoissa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "NÃytetÃÃnkÃ poissa linjoilta olevat tuttavat tuttavaluettelossa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr "NÃytetÃÃnkÃ ponnahdusilmoituksia varattuna tai poissa oltaessa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "NÃytetÃÃnkÃ tuttavien yhteyskÃytÃnnÃt tuttavaluettelossa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "NÃytetÃÃnkÃ tuttavaluettelo keskusteluhuoneissa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "NÃytetÃÃnkÃ tuttavaluettelo pienoiskokoa kÃytettÃessÃ."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
 msgstr "PyydetÃÃnkÃ pÃÃikkunan sulkemisesta vahvistusta."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "KÃytetÃÃnkÃ teemaa keskusteluhuoneissa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
 "the contact list by state."
 msgstr ""
 "Kuinka tuttavaluettelo jÃrjestetÃÃn. Oletusarvolla \"name\" "
-"jÃrjestelyperusteena on tuttavan nimi. Arvolla \"state\" luettelo jÃrjestetÃÃn "
-"tuttavien tilan perusteella."
+"jÃrjestelyperusteena on tuttavan nimi. Arvolla \"state\" luettelo "
+"jÃrjestetÃÃn tuttavien tilan perusteella."
 
 #: ../data/empathy-accounts.desktop.in.in.h:1
 msgid "Manage Messaging and VoIP accounts"
@@ -459,187 +500,204 @@ msgstr "Hallitse viestimiÃ ja Internet-puheluiden (VoIP) kÃyttÃjÃtilejÃ"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2156
+#: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
 msgstr "ViestintÃ ja VoIP-kÃyttÃjÃtilit"
 
-#: ../libempathy/empathy-ft-handler.c:851
-msgid "The hash of the received file and the sent one do not match"
-msgstr "Vastaanotetun ja lÃhetetyn tiedoston tiiviste ei tÃsmÃÃ"
+#: ../libempathy/empathy-ft-handler.c:825
+msgid "File transfer completed, but the file was corrupted"
+msgstr "Tiedostonsiirto valmistui, mutta tiedosto oli viallinen"
 
 #: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "EtÃyhteys ei tue tiedostonsiirtoa"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "Valittu tiedosto ei ole tavanomainen tiedosto"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "Valittu tiedosto on tyhjÃ"
 
-#: ../libempathy/empathy-tp-file.c:283
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "Vastaamaton puhelu kÃyttÃjÃltÃ %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "Soitettiin kÃytÃjÃlle %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "Puhelu kÃyttÃjÃltÃ %s"
+
+#: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
 msgstr "Pistoketyyppi ei ole tuettu"
 
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:387
 msgid "No reason was specified"
 msgstr "SyytÃ ei annettu"
 
-#: ../libempathy/empathy-tp-file.c:405
+#: ../libempathy/empathy-tp-file.c:390
 msgid "The change in state was requested"
 msgstr "Pyydettiin tilan muutosta"
 
-#: ../libempathy/empathy-tp-file.c:408
+#: ../libempathy/empathy-tp-file.c:393
 msgid "You canceled the file transfer"
 msgstr "Keskeytit tiedostonsiirron"
 
-#: ../libempathy/empathy-tp-file.c:411
+#: ../libempathy/empathy-tp-file.c:396
 msgid "The other participant canceled the file transfer"
 msgstr "Toinen osapuoli katkaisi tiedostonsiirron"
 
-#: ../libempathy/empathy-tp-file.c:414
+#: ../libempathy/empathy-tp-file.c:399
 msgid "Error while trying to transfer the file"
 msgstr "Virhe yritettÃessÃ siirtÃÃ tiedostoa"
 
-#: ../libempathy/empathy-tp-file.c:417
+#: ../libempathy/empathy-tp-file.c:402
 msgid "The other participant is unable to transfer the file"
 msgstr "Toinen osapuoli ei voi siirtÃÃ tiedostoa"
 
-#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
 msgid "Unknown reason"
 msgstr "Tuntematon syy"
 
-#: ../libempathy/empathy-utils.c:246
+#: ../libempathy/empathy-utils.c:222
 msgid "Available"
 msgstr "Tavoitettavissa"
 
-#: ../libempathy/empathy-utils.c:248
+#: ../libempathy/empathy-utils.c:224
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:227
 msgid "Away"
 msgstr "Poissa"
 
-#: ../libempathy/empathy-utils.c:253
+#: ../libempathy/empathy-utils.c:229
 msgid "Invisible"
 msgstr "NÃkymÃtÃn"
 
-#: ../libempathy/empathy-utils.c:255
+#: ../libempathy/empathy-utils.c:231
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1903
-#: ../src/empathy-call-window.c:1904 ../src/empathy-call-window.c:1905
-#: ../src/empathy-call-window.c:1906 ../src/empathy-call-window.ui.h:18
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:234
+msgctxt "presence"
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:274
 msgid "No reason specified"
 msgstr "ErittelemÃtÃn syy"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
 msgid "Status is set to offline"
 msgstr "Tila on nyt âPoissa linjoiltaâ"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Verkkovirhe"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
 msgid "Authentication failed"
 msgstr "Todennus epÃonnistui"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
 msgid "Encryption error"
 msgstr "Salausvirhe"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:284
 msgid "Name in use"
 msgstr "Nimi on kÃytÃssÃ"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
 msgid "Certificate not provided"
 msgstr "Varmennetta ei ole annettu"
 
-#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
 msgid "Certificate untrusted"
 msgstr "Varmenne ei ole luotettu"
 
-#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
 msgid "Certificate expired"
 msgstr "Varmenne on vanhentunut"
 
-#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
 msgid "Certificate not activated"
 msgstr "Varmenne ei ole vielÃ aktivoitu"
 
-#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
 msgid "Certificate hostname mismatch"
 msgstr "Varmenteen verkkonimi ei tÃsmÃÃ"
 
-#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate fingerprint mismatch"
 msgstr "Varmenteen sormenjÃlki ei tÃsmÃÃ"
 
-#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate self-signed"
 msgstr "Itseallekirjoitettu varmenne"
 
-#: ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:300
 msgid "Certificate error"
 msgstr "Varmennevirhe"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:334
 msgid "Encryption is not available"
 msgstr "Salausta ei ole kÃytettÃvissÃ"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:336
 msgid "Certificate is invalid"
 msgstr "Varmenne ei ole kelvollinen"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:338
 msgid "Connection has been refused"
 msgstr "Yhteys hylÃttiin"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:340
 msgid "Connection can't be established"
 msgstr "YhteyttÃ ei voi muodostaa"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:342
 msgid "Connection has been lost"
 msgstr "Yhteys katkesi"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:344
 msgid "This resource is already connected to the server"
 msgstr "TÃmÃ resurssi on jo yhdistetty palvelimelle"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:346
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Yhteys on korvattu samaa resurssia kÃyttÃvÃllÃ uudella yhteydellÃ"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:349
 msgid "The account already exists on the server"
-msgstr "Tunnus on jo olemassa palvelimella"
+msgstr "Tili on jo olemassa palvelimella"
 
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:351
 msgid "Server is currently too busy to handle the connection"
 msgstr "Palvelin on liian kiireinen kÃsitellÃkseen tÃtÃ yhteyttÃ"
 
-#: ../libempathy/empathy-utils.c:375
+#: ../libempathy/empathy-utils.c:353
 msgid "Certificate has been revoked"
 msgstr "Varmenne on kumottu"
 
-#: ../libempathy/empathy-utils.c:377
+#: ../libempathy/empathy-utils.c:355
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Varmenne kÃyttÃÃ heikkoa salausmenetelmÃÃ"
 
-#: ../libempathy/empathy-utils.c:380
+#: ../libempathy/empathy-utils.c:358
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -647,130 +705,144 @@ msgstr ""
 "Palvelinsertifikaatin pituus tai palvelinsertifikaattiketjun pituus ovat "
 "suurempia kuin salauskirjasto sallii"
 
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:519
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "LÃhellÃ olevat ihmiset"
 
-#: ../libempathy/empathy-utils.c:549
+#: ../libempathy/empathy-utils.c:524
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:550
+#: ../libempathy/empathy-utils.c:553
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../libempathy/empathy-utils.c:554
 msgid "Facebook Chat"
 msgstr "Facebook-keskustelu"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d sekunti sitten"
 msgstr[1] "%d sekuntia sitten"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minuutti sitten"
 msgstr[1] "%d minuuttia sitten"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d tunti sitten"
 msgstr[1] "%d tuntia sitten"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d pÃivÃ sitten"
 msgstr[1] "%d pÃivÃÃ sitten"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d viikko sitten"
 msgstr[1] "%d viikkoa sitten"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d kuukausi sitten"
 msgstr[1] "%d kuukautta sitten"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
 msgid "in the future"
 msgstr "tulevaisuudessa"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:463
-msgid "All"
-msgstr "Kaikki"
+#: ../libempathy-gtk/empathy-account-chooser.c:539
+msgid "All accounts"
+msgstr "Kaikki tilit"
 
-#: ../libempathy-gtk/empathy-account-widget.c:514
-#: ../libempathy-gtk/empathy-log-window.c:646
-#: ../src/empathy-import-widget.c:312
+#: ../libempathy-gtk/empathy-account-widget.c:694
+#: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "KÃyttÃjÃtili"
 
-#: ../libempathy-gtk/empathy-account-widget.c:515
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Salasana"
 
-#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Palvelin"
 
-#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Portti"
 
-#: ../libempathy-gtk/empathy-account-widget.c:589
-#: ../libempathy-gtk/empathy-account-widget.c:646
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
 #: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Omat WWW-tilit"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
+#, c-format
+msgid "The account %s is edited via %s."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget.c:1214
+#, c-format
+msgid "The account %s cannot be edited in Empathy."
+msgstr "KÃyttÃjÃtiliÃ %s ei voi muokata EmpathyssÃ."
+
+#: ../libempathy-gtk/empathy-account-widget.c:1233
+msgid "Launch My Web Accounts"
+msgstr "KÃynnistÃ Web-tilit"
+
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Muokkaa %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "KÃyttÃjÃnimi:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1521
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "_Toteuta"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1551
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "_Kirjaudu sisÃÃn"
 
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1617
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1401
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "KÃyttÃjÃtili:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1628
-msgid "_Enabled"
-msgstr "_KÃytÃssÃ"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1693
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "TÃmÃ tili on jo olemassa palvelimella"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1696
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Luo uusi tili palvelimelle"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1789
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "_Peru"
 
@@ -779,19 +851,19 @@ msgstr "_Peru"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2077
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%s palvelimella %s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2103
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "%s-tili"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2107
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "Uusi tili"
 
@@ -803,6 +875,7 @@ msgstr "<b>Esimerkki:</b> Nimimerkkini"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -816,38 +889,58 @@ msgstr "LisÃasetukset"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "S_alasana:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Remember Password"
+msgstr "Muista salasana"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-password-dialog.c:311
+msgid "Remember password"
+msgstr "Muista salasana"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 msgid "Screen _Name:"
 msgstr "NÃyttÃ_nimi:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 msgid "What is your AIM password?"
 msgstr "MikÃ on AIM-salasanasi?"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "MikÃ on AIM-nÃyttÃnimesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "Pal_velin:"
@@ -863,11 +956,11 @@ msgstr "<b>Esimerkki:</b> kÃyttÃjÃnimi"
 msgid "Login I_D:"
 msgstr "_KÃyttÃjÃtunnus:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 msgid "What is your GroupWise User ID?"
 msgstr "MikÃ on GroupWise-kÃyttÃjÃtunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise password?"
 msgstr "MikÃ on GroupWise-salasanasi?"
 
@@ -884,84 +977,92 @@ msgstr "_Merkkikartta:"
 msgid "ICQ _UIN:"
 msgstr "ICQ _UIN:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
 msgid "What is your ICQ UIN?"
 msgstr "MikÃ on ICQ UIN -tunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ password?"
 msgstr "MikÃ on ICQ-salasanasi?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "Automaattinen"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "RekisterÃi"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Valinnat"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Ei mitÃÃn"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "Merkkikartta:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"Useimmat IRC-palvelimet eivÃt tarvitse salasanaa, joten jos et ole varma, "
+"ÃlÃ syÃtÃ salasanaa."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "Verkko"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "Verkko:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Nimimerkki:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "Lopetusviesti:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "Oikea nimi:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "Palvelimet"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "MikÃ on IRC-nimimerkkisi?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "MikÃ IRC-verkko?"
 
@@ -989,12 +1090,12 @@ msgstr "Ohita palvelimen asetukset"
 msgid "Priori_ty:"
 msgstr "_Prioriteetti:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid "Reso_urce:"
 msgstr "Res_urssi:"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1005,42 +1106,42 @@ msgstr ""
 "sÃhkÃpostiosoite.\n"
 "Jos kÃyttÃjÃnimesi on esimerkiksi facebook.com/<b>tunnus</b>, kirjoita "
 "<b>tunnus</b>.\n"
-"Jos et ole vielÃ luonut Facebook-kÃyttÃjÃnimeÃ, voit luoda sellaisen <a "
-"href=\"http://www.facebook.com/username/\";>tÃllÃ sivulla</a>."
+"Jos et ole vielÃ luonut Facebook-kÃyttÃjÃnimeÃ, voit luoda sellaisen <a href="
+"\"http://www.facebook.com/username/\";>tÃllÃ sivulla</a>."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "Use old SS_L"
 msgstr "KÃytÃ vanhaa SS_L-porttia"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "What is your Facebook password?"
 msgstr "MikÃ on Facebook-salasanasi?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 msgid "What is your Facebook username?"
 msgstr "MikÃ on Facebook-kÃyttÃjÃnimesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 msgid "What is your Google ID?"
 msgstr "MikÃ on Google-tunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 msgid "What is your Google password?"
 msgstr "MikÃ on Google-salasanasi?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "What is your Jabber ID?"
 msgstr "MikÃ on Jabber-tunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 msgid "What is your Jabber password?"
 msgstr "MikÃ on Jabber-salasanasi?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your desired Jabber ID?"
 msgstr "MikÃ on haluamasi Jabber-tunnus?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber password?"
 msgstr "MikÃ on haluamasi Jabber-salasana?"
 
@@ -1048,11 +1149,11 @@ msgstr "MikÃ on haluamasi Jabber-salasana?"
 msgid "<b>Example:</b> user hotmail com"
 msgstr "<b>Esimerkki:</b> tunnus hotmail com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 msgid "What is your Windows Live ID?"
 msgstr "MikÃ on Windows Live -tunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live password?"
 msgstr "MikÃ on Windows Live -salasanasi?"
 
@@ -1097,156 +1198,205 @@ msgid "Discover the STUN server automatically"
 msgstr "Havaitse STUN-palvelin automaattisesti"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "Sivuuta TLS-virheet"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "AikavÃli (sekunneissa)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
 msgstr "KÃynnissÃ pitÃvÃt valinnat"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
 msgstr "LÃyhÃ reititys"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
 msgstr "Mekanismi:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
 msgstr "Muut valinnat"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
 msgstr "NAT-lÃpÃisyn (NAT-T) asetukset"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
 msgstr "Portti:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Proxy Options"
 msgstr "VÃlipalvelinvalinnat"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "STUN-palvelin:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "Transport:"
 msgstr "Siirto:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "MikÃ on SIP-tilisi salasana?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "MikÃ on SIP-tilisi kÃyttÃjÃtunnus?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
-msgstr "_KÃyttÃjÃtunnus:"
+msgstr "_KÃyttÃjÃnimi:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "I_gnore conference and chat room invitations"
 msgstr "_ÃlÃ huomioi konferenssi- ja keskusteluhuonekutsuja"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "What is your Yahoo! ID?"
 msgstr "MikÃ on Yahoo! -tunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "What is your Yahoo! password?"
 msgstr "MikÃ on Yahoo! -salasanasi?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Yahoo! I_D:"
 msgstr "Yahoo!-_tunnus:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
 msgstr "_Huoneluettelon maa-asetusto:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:470
+#: ../libempathy-gtk/empathy-avatar-chooser.c:555
 msgid "Couldn't convert image"
 msgstr "Kuvaa ei voitu muuntaa"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
 msgid "None of the accepted image formats are supported on your system"
 msgstr ""
 "JÃrjestelmÃssÃsi ei ole tukea yhdellekÃÃn hyvÃksytylle kuvatiedostomuodolle"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+msgid "Couldn't save picture to file"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:934
 msgid "Select Your Avatar Image"
 msgstr "Valitse avatar-kuvasi"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:938
+msgid "Take a picture..."
+msgstr "Ota kuva..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:941
 msgid "No Image"
 msgstr "Ei kuvaa"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
 msgid "Images"
 msgstr "Kuvat"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:323
+#: ../libempathy-gtk/empathy-avatar-image.c:322
 msgid "Click to enlarge"
 msgstr "Suurenna napsauttamalla"
 
-#: ../libempathy-gtk/empathy-chat.c:642
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "Puhelun aloittamisessa tapahtui virhe"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "Valittu yhteystieto ei tue puheluja"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "Valittu yhteystieto on poissa linjoilta"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "Valittu yhteystieto on virheellinen"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "TÃmÃ protokolla ei tue hÃtÃpuheluita"
+
+#: ../libempathy-gtk/empathy-chat.c:702
 msgid "Failed to open private chat"
 msgstr "Yksityiskeskustelun avaaminen epÃonnistui"
 
-#: ../libempathy-gtk/empathy-chat.c:682
+#: ../libempathy-gtk/empathy-chat.c:763
 msgid "Topic not supported on this conversation"
 msgstr "Aihe ei ole tuettu tÃssÃ keskustelussa"
 
-#: ../libempathy-gtk/empathy-chat.c:688
+#: ../libempathy-gtk/empathy-chat.c:769
 msgid "You are not allowed to change the topic"
 msgstr "Sinulla ei ole oikeutta muuttaa aihetta"
 
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:973
+#, c-format
+msgid "â%sâ is not a valid contact ID"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1030
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: pyyhi kaikki nykyisen keskustelun viestit pois nÃkyvistÃ"
 
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:1033
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <aihe>: aseta nykyisen keskustelun aihe"
 
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:1036
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <kanavan nimi>: liity kanavalle"
 
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:1039
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <kanavan nimi>: liity kanavalle"
 
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:1043
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1047
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <tuttavan tunnus> [<viesti>]: avaa yksityiskeskustelu"
 
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:1050
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <tuttavan tunnus> <viesti>: avaa yksityiskeskustelu"
 
-#: ../libempathy-gtk/empathy-chat.c:843
+#: ../libempathy-gtk/empathy-chat.c:1053
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nimi>: vaihda nimeÃ nykyisellÃ palvelimella"
 
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:1056
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <viesti>: lÃhetÃ TOIMINTO viesti tÃmÃnhetkiseen keskusteluun"
 
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:1059
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1256,7 +1406,11 @@ msgstr ""
 "TÃtÃ toimintoa kÃytetÃÃn kun viestin halutaan alkavan merkillÃ \"/\", "
 "esimerkiksi: \"/say /join komentoa kÃytetÃÃn kanavalle liittymiseen\""
 
-#: ../libempathy-gtk/empathy-chat.c:854
+#: ../libempathy-gtk/empathy-chat.c:1064
+msgid "/whois <contact ID>: display information about a contact"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1264,84 +1418,113 @@ msgstr ""
 "/help [<komento>]: nÃyttÃÃ kaikki tuetut komennot. Jos <komento> on "
 "mÃÃritetty, nÃytÃ sen ohje."
 
-#: ../libempathy-gtk/empathy-chat.c:864
+#: ../libempathy-gtk/empathy-chat.c:1077
 #, c-format
 msgid "Usage: %s"
 msgstr "KÃyttÃ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:893
+#: ../libempathy-gtk/empathy-chat.c:1116
 msgid "Unknown command"
 msgstr "Tuntematon komento"
 
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1242
 msgid "Unknown command; see /help for the available commands"
 msgstr "Tuntematon komento; kirjoita /help nÃhdÃksesi kÃytÃssÃ olevat komennot"
 
-#: ../libempathy-gtk/empathy-chat.c:1152
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1412
+msgid "insufficient balance to send message"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1414
+msgid "not capable"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1421
 msgid "offline"
 msgstr "poissa linjoilta"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1424
 msgid "invalid contact"
 msgstr "virheellinen tuttava"
 
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1427
 msgid "permission denied"
 msgstr "lupa evÃtty"
 
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1430
 msgid "too long message"
 msgstr "liian pitkÃ viesti"
 
-#: ../libempathy-gtk/empathy-chat.c:1164
+#: ../libempathy-gtk/empathy-chat.c:1433
 msgid "not implemented"
 msgstr "ei toteutettu"
 
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1437
 msgid "unknown"
 msgstr "tuntematon"
 
-#: ../libempathy-gtk/empathy-chat.c:1172
+#: ../libempathy-gtk/empathy-chat.c:1443
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Virhe lÃhetettÃessÃ viestiÃ \"%s\": %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1447
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Virhe viestiÃ lÃhettÃessÃ: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Aihe:"
 
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1520
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Aihe asetettu: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1296
+#: ../libempathy-gtk/empathy-chat.c:1522
 msgid "No topic defined"
 msgstr "Aihetta ei ole annettu"
 
-#: ../libempathy-gtk/empathy-chat.c:1775
+#: ../libempathy-gtk/empathy-chat.c:2031
 msgid "(No Suggestions)"
 msgstr "(Ei ehdotuksia)"
 
-#: ../libempathy-gtk/empathy-chat.c:1829
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:2099
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr "LisÃÃ â%sâ sanakirjaan"
+
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:2136
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr "LisÃÃ â%sâ kielen %s sanakirjaan"
+
+#: ../libempathy-gtk/empathy-chat.c:2206
 msgid "Insert Smiley"
 msgstr "LisÃÃ hymiÃ"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1805
+#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_LÃhetÃ"
 
-#: ../libempathy-gtk/empathy-chat.c:1881
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:2278
 msgid "_Spelling Suggestions"
 msgstr "_Kielentarkistuksen ehdotukset"
 
-#: ../libempathy-gtk/empathy-chat.c:1958
+#: ../libempathy-gtk/empathy-chat.c:2367
 msgid "Failed to retrieve recent logs"
 msgstr "Viimeisimpien lokien nouto epÃonnistui"
 
-#: ../libempathy-gtk/empathy-chat.c:2064
+#: ../libempathy-gtk/empathy-chat.c:2504
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s katkaisi"
@@ -1349,12 +1532,12 @@ msgstr "%s katkaisi"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2071
+#: ../libempathy-gtk/empathy-chat.c:2511
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s potkaisi henkilÃn %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2514
 #, c-format
 msgid "%s was kicked"
 msgstr "%s potkaistiin"
@@ -1362,17 +1545,17 @@ msgstr "%s potkaistiin"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2082
+#: ../libempathy-gtk/empathy-chat.c:2522
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s esti henkilÃn %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2085
+#: ../libempathy-gtk/empathy-chat.c:2525
 #, c-format
 msgid "%s was banned"
 msgstr "%s estettiin"
 
-#: ../libempathy-gtk/empathy-chat.c:2089
+#: ../libempathy-gtk/empathy-chat.c:2529
 #, c-format
 msgid "%s has left the room"
 msgstr "%s on poistunut huoneesta"
@@ -1382,82 +1565,174 @@ msgstr "%s on poistunut huoneesta"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2098
+#: ../libempathy-gtk/empathy-chat.c:2538
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2123
+#: ../libempathy-gtk/empathy-chat.c:2563
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s on saapunut huoneeseen"
 
-#: ../libempathy-gtk/empathy-chat.c:2148
+#: ../libempathy-gtk/empathy-chat.c:2588
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s vaihtoi nimekseen %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1947
+#: ../libempathy-gtk/empathy-chat.c:2727
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:2355
 msgid "Disconnected"
 msgstr "Ei yhteyttÃ"
 
-#: ../libempathy-gtk/empathy-chat.c:2934
-msgid "Wrong password; please try again:"
-msgstr "VÃÃrÃ salasana, yritÃ uudelleen:"
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3374
+msgid "Would you like to store this password?"
+msgstr "Haluaisitteko tallentaa tÃmÃn salasanan?"
+
+#: ../libempathy-gtk/empathy-chat.c:3380
+msgid "Remember"
+msgstr "Muista"
 
-#: ../libempathy-gtk/empathy-chat.c:2935
+#: ../libempathy-gtk/empathy-chat.c:3390
+msgid "Not now"
+msgstr "Ei nyt"
+
+#: ../libempathy-gtk/empathy-chat.c:3434
 msgid "Retry"
 msgstr "YritÃ uudelleen"
 
-#: ../libempathy-gtk/empathy-chat.c:2940
+#: ../libempathy-gtk/empathy-chat.c:3438
+msgid "Wrong password; please try again:"
+msgstr "VÃÃrÃ salasana, yritÃ uudelleen:"
+
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3568
 msgid "This room is protected by a password:"
 msgstr "Huone on salasanasuojattu:"
 
-#: ../libempathy-gtk/empathy-chat.c:2941
+#: ../libempathy-gtk/empathy-chat.c:3595
 msgid "Join"
 msgstr "Liity"
 
-#: ../libempathy-gtk/empathy-chat.c:3081
+#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Yhdistetty"
 
-#: ../libempathy-gtk/empathy-chat.c:3134
-#: ../libempathy-gtk/empathy-log-window.c:653
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "Conversation"
 msgstr "Keskustelu"
 
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3857
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+msgid "Unknown or invalid identifier"
+msgstr "Tuntematon tai virheellinen tunniste"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+msgid "Contact blocking temporarily unavailable"
+msgstr "YhteyshenkilÃiden esto tilapÃisesti poissa"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+msgid "Contact blocking unavailable"
+msgstr "YhteyshenkilÃiden esto poissa"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+msgid "Permission Denied"
+msgstr "PÃÃsy evÃtty"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+msgid "Could not block contact"
+msgstr "Yhteystietoa ei voitu estÃÃ"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+msgid "Edit Blocked Contacts"
+msgstr "Muokkaa estettyjÃ yhteystietoja"
+
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "KÃyttÃjÃtili:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Estetyt yhteyshenkilÃt"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Poista"
+
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:791
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Kopioi linkin osoite"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
-#: ../libempathy-gtk/empathy-theme-adium.c:798
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Avaa linkki"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:424
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%A %d. %Bta %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-contact-dialogs.c:299
 #: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "Muokkaa tuttavan tietoja"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:292
+#: ../libempathy-gtk/empathy-contact-dialogs.c:350
 msgid "Personal Information"
 msgstr "HenkilÃkohtaiset tiedot"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:397
-#: ../libempathy-gtk/empathy-individual-dialogs.c:111
+#: ../libempathy-gtk/empathy-contact-dialogs.c:459
+#: ../libempathy-gtk/empathy-individual-dialogs.c:119
 msgid "New Contact"
 msgstr "Uusi tuttava"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.c:533
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#, c-format
+msgid "Block %s?"
+msgstr "EstetÃÃnkÃ %s?"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:538
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr "Oletko varma kÃyttÃjÃn '%s' estÃmisestÃ?"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:543
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+msgid "_Block"
+msgstr "_EstÃ"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:559
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "_Raportoi tÃmÃ yhteyshenkilÃ loukkaavana"
+msgstr[1] "_Raportoi nÃmÃ yhteyshenkilÃt loukkaavina"
+
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "_PÃÃtÃ myÃhemmin"
@@ -1466,6 +1741,10 @@ msgstr "_PÃÃtÃ myÃhemmin"
 msgid "Subscription Request"
 msgstr "LiittymispyyntÃ"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "_Block User"
+msgstr "Es_tÃ kÃyttÃjÃ"
+
 #: ../libempathy-gtk/empathy-contact-list-store.h:71
 msgid "Ungrouped"
 msgstr "RyhmittelemÃttÃmÃt"
@@ -1474,280 +1753,331 @@ msgstr "RyhmittelemÃttÃmÃt"
 msgid "Favorite People"
 msgstr "SuosikkihenkilÃt"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2232
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Haluatko varmasti poistaa ryhmÃn \"%s\"?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2235
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "Poistetaan ryhmÃÃ"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2055
-#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2289
-#: ../libempathy-gtk/empathy-individual-view.c:2387
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2320
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Haluatko varmasti poistaa tuttavan \"%s\" yhteystiedot?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2322
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "Poistetaan tuttava"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contactâ"
 msgstr "_LisÃÃ tuttavaâ"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:516
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-contact-menu.c:300
+msgid "_Block Contact"
+msgstr "Es_tÃ yhteystieto"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Keskustele"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:559
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_ÃÃnipuhelu"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:601
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videopuhelu"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:644
-#: ../src/empathy-main-window.ui.h:25
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "_Aiemmat keskustelut"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:685
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "LÃhetÃ tiedosto"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:374
-#: ../libempathy-gtk/empathy-individual-menu.c:727
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Jaa tyÃpÃytÃni"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:414
-#: ../libempathy-gtk/empathy-contact-widget.c:1570
-#: ../libempathy-gtk/empathy-individual-menu.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1373
 msgid "Favorite"
 msgstr "Suosikki"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:443
-#: ../libempathy-gtk/empathy-individual-menu.c:788
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "_Tietoja"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:489
+#: ../libempathy-gtk/empathy-contact-menu.c:600
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:543
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:903
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Kutsuu sinut tÃhÃn keskusteluhuoneeseen"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:574
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
 msgid "_Invite to Chat Room"
 msgstr "_Kutsu keskusteluhuoneeseen"
 
+#. Title
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+msgid "Search contacts"
+msgstr "Etsi yhteystietoja"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+msgid "Search: "
+msgstr "Etsi: "
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+msgid "_Add Contact"
+msgstr "_LisÃÃ yhteystieto"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+msgid "No contacts found"
+msgstr "Yhteystietoa ei lÃytynyt"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr ""
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Valitse tuttava"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:226
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-contact-widget.c:336
+#: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "Koko nimi:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:227
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-contact-widget.c:337
+#: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "Puhelinnumero:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:228
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-contact-widget.c:338
+#: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "SÃhkÃpostiosoite:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:229
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-contact-widget.c:339
+#: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "Kotisivu:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:230
-#: ../libempathy-gtk/empathy-individual-widget.c:152
+#: ../libempathy-gtk/empathy-contact-widget.c:340
+#: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "SyntymÃpÃivÃ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:609
-#: ../libempathy-gtk/empathy-individual-widget.c:454
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "Viimeksi nÃhty:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "Yhdisti kohteesta:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "Poissaoloviesti:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "Kanavat:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "Maan ISO-tunnus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:611
-#: ../libempathy-gtk/empathy-individual-widget.c:456
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "Maa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:613
-#: ../libempathy-gtk/empathy-individual-widget.c:458
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "Osavaltio:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:615
-#: ../libempathy-gtk/empathy-individual-widget.c:460
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "Kaupunki:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:617
-#: ../libempathy-gtk/empathy-individual-widget.c:462
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "Alue:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:619
-#: ../libempathy-gtk/empathy-individual-widget.c:464
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "Postinumero:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:621
-#: ../libempathy-gtk/empathy-individual-widget.c:466
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Katu:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:623
-#: ../libempathy-gtk/empathy-individual-widget.c:468
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "Rakennus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:625
-#: ../libempathy-gtk/empathy-individual-widget.c:470
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "Kerros:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:627
-#: ../libempathy-gtk/empathy-individual-widget.c:472
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "Huone:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:629
-#: ../libempathy-gtk/empathy-individual-widget.c:474
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Teksti:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:631
-#: ../libempathy-gtk/empathy-individual-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:633
-#: ../libempathy-gtk/empathy-individual-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:635
-#: ../libempathy-gtk/empathy-individual-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "Tarkkuustaso:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:637
-#: ../libempathy-gtk/empathy-individual-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "Virhe:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:639
-#: ../libempathy-gtk/empathy-individual-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "Vertikaalinen virhe (metriÃ):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:641
-#: ../libempathy-gtk/empathy-individual-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "Horisontaalinen virhe (metriÃ):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:643
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Nopeus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:645
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "Suuntima:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:647
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "KiipeÃmisvauhti:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:649
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "Viimeksi pÃivitetty:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:651
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "Pituuspiiri:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:653
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "Leveyspiiri:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:655
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "Korkeus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:718
-#: ../libempathy-gtk/empathy-contact-widget.c:735
-#: ../libempathy-gtk/empathy-individual-widget.c:582
-#: ../libempathy-gtk/empathy-individual-widget.c:599
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:16
 msgid "Location"
 msgstr "Sijainti"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:737
-#: ../libempathy-gtk/empathy-individual-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:789
-#: ../libempathy-gtk/empathy-individual-widget.c:650
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e. %Bta %Y klo %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:872
-#: ../libempathy-gtk/empathy-individual-widget.c:841
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "Tallenna vastaus"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:928
-#: ../libempathy-gtk/empathy-individual-widget.c:899
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "Avataria ei voitu tallentaa"
 
@@ -1757,7 +2087,7 @@ msgstr "<b>Sijainti</b> hetkellÃ (pvm)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1227
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "Nimimerkki:"
 
@@ -1777,7 +2107,7 @@ msgstr "Tuttavan tiedot"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1431
+#: ../libempathy-gtk/empathy-individual-widget.c:1515
 msgid "Identifier:"
 msgstr "Tunniste:"
 
@@ -1794,11 +2124,11 @@ msgstr "KÃyttÃjÃrjestelmÃ:"
 msgid "Version:"
 msgstr "Versio:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "RyhmÃt"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1806,34 +2136,46 @@ msgstr ""
 "Valitse ryhmÃt, joissa haluat tÃmÃn tuttavan nÃkyvÃn. Huomaa ettÃ voit "
 "valita useita ryhmiÃ tai olla valitsematta yhtÃÃn ryhmÃÃ."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
 msgid "_Add Group"
 msgstr "_LisÃÃ ryhmÃ"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:397
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
+#: ../libempathy-gtk/empathy-groups-widget.c:399
+msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Valitse"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-main-window.c:1250
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "RyhmÃ"
 
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+msgid "The following identity will be blocked:"
+msgid_plural "The following identities will be blocked:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+msgid "The following identity can not be blocked:"
+msgid_plural "The following identities can not be blocked:"
+msgstr[0] ""
+msgstr[1] ""
+
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "Linkitetyt yhteystiedot"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
 msgid "Select contacts to link"
 msgstr "Valitse linkitettÃvÃt yhteystiedot"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
 msgid "New contact preview"
 msgstr "Uuden yhteystiedon esikatselu"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr ""
 "Vasemmanpuoleisesta luettelosta valitut yhteystiedot linkitetÃÃn yhteen."
@@ -1841,42 +2183,97 @@ msgstr ""
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo jabber org) and the second is one
 #. * of the user's account IDs (e.g. me hotmail com).
-#: ../libempathy-gtk/empathy-individual-menu.c:132
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Valitse soittoon kÃytettÃvÃ tili"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Soita"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Matkapuhelin"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "TyÃ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "Koti"
+
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1141
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Muokkaa"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:1167
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contactsâ"
 msgstr "_LinkitÃ yhteystiedotâ"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+msgid "Delete and _Block"
+msgstr "Poista ja _estÃ"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2510
+#, c-format
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1662
 #, c-format
-msgid "Meta-contact containing %u contact"
-msgid_plural "Meta-contact containing %u contacts"
-msgstr[0] "Metayhteystieto, joka sisÃltÃÃ %u yhteystiedon"
-msgstr[1] "Metayhteystieto, joka sisÃltÃÃ %u yhteystietoa"
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:1
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Sijainti</b> hetkellÃ (pvm)"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Online from a phone or mobile device"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
 msgid "New Network"
 msgstr "Uusi verkko"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
 msgid "Choose an IRC network"
 msgstr "Valitse IRC-verkko"
 
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+msgid "Reset _Networks List"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "Valitse"
+
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:280
 msgid "new server"
 msgstr "uusi palvelin"
@@ -1899,8 +2296,8 @@ msgstr "_Poista linkitysâ"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:121
 msgid ""
-"Completely split the displayed meta-contact into the contacts it contains."
-msgstr "Jaa nÃytettÃvÃ metayhteystieto sen sisÃltÃmiin yhteystietoihin."
+"Completely split the displayed linked contacts into the separate contacts."
+msgstr ""
 
 #. Add button
 #. Translators: this is an action button in the linking dialogue. "Link" is
@@ -1910,286 +2307,451 @@ msgstr "Jaa nÃytettÃvÃ metayhteystieto sen sisÃltÃmiin yhteystietoihin."
 msgid "_Link"
 msgstr "_LinkitÃ"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:182
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
 #, c-format
-msgid "Unlink meta-contact '%s'?"
-msgstr "Poistetaanko metayhteystiedon â%sâ linkitys?"
+msgid "Unlink linked contacts '%s'?"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:185
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
 msgid ""
-"Are you sure you want to unlink this meta-contact? This will completely "
-"split the meta-contact into the contacts it contains."
+"Are you sure you want to unlink these linked contacts? This will completely "
+"split the linked contacts into separate contacts."
 msgstr ""
-"Haluatko varmasti poistaa tÃmÃn metayhteystiedon linkityksen? "
-"Metayhteystieto jaetaan sen sisÃltÃmiin yhteystietoihin."
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:190
 msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Poista linkitys"
 
-#: ../libempathy-gtk/empathy-log-window.c:663
-msgid "Date"
-msgstr "PÃivÃmÃÃrÃ"
+#: ../libempathy-gtk/empathy-log-window.c:633
+msgid "History"
+msgstr "Historia"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Keskustelut"
+#: ../libempathy-gtk/empathy-log-window.c:688
+msgid "Show"
+msgstr "NÃytÃ"
+
+#: ../libempathy-gtk/empathy-log-window.c:710
+msgid "Search"
+msgstr "Etsi"
+
+#: ../libempathy-gtk/empathy-log-window.c:1158
+#, c-format
+msgid "Chat in %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:1160
+#, c-format
+msgid "Chat with %s"
+msgstr "Keskustele kÃyttÃjÃn %s kanssa"
+
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1357
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr ""
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1299
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1305
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1376
+#: ../libempathy-gtk/empathy-log-window.c:1378
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
+#: ../libempathy-gtk/empathy-log-window.c:1385
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Puhelun kesto %s, puhelu pÃÃttyi %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1717
+msgid "Today"
+msgstr "TÃnÃÃn"
+
+#: ../libempathy-gtk/empathy-log-window.c:1721
+msgid "Yesterday"
+msgstr "Eilen"
+
+#: ../libempathy-gtk/empathy-log-window.c:1737
+msgctxt ""
+"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+msgid "%e %B %Y"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:1818
+#: ../libempathy-gtk/empathy-log-window.c:3399
+msgid "Anytime"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:1898
+#: ../libempathy-gtk/empathy-log-window.c:2328
+msgid "Anyone"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:2640
+msgid "Who"
+msgstr "Kuka"
+
+#: ../libempathy-gtk/empathy-log-window.c:2844
+msgid "When"
+msgstr "Milloin"
+
+#: ../libempathy-gtk/empathy-log-window.c:2960
+msgid "Anything"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:2962
+msgid "Text chats"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:2964
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "Puhelut"
+
+#: ../libempathy-gtk/empathy-log-window.c:2969
+msgid "Incoming calls"
+msgstr "Saapuneet puhelut"
+
+#: ../libempathy-gtk/empathy-log-window.c:2970
+msgid "Outgoing calls"
+msgstr "Soitetut puhelut"
+
+#: ../libempathy-gtk/empathy-log-window.c:2971
+msgid "Missed calls"
+msgstr "Vastaamattomat puhelut"
+
+#: ../libempathy-gtk/empathy-log-window.c:2993
+msgid "What"
+msgstr "MitÃ"
+
+#: ../libempathy-gtk/empathy-log-window.c:3702
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr ""
+"Haluatko varmasti poistaa kaikki aikaisempien keskusteluiden historiatiedot?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3706
+msgid "Clear All"
+msgstr "TyhjennÃ kaikki"
+
+#: ../libempathy-gtk/empathy-log-window.c:3713
+msgid "Delete from:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Ladataan...</span>"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Etsi seuraava"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Keskustelu"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Etsi edellinen"
+msgid "Delete All History..."
+msgstr "Poista kaikki historia..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Aikaisemmat keskustelut"
+msgid "Profile"
+msgstr "Profiili"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Video"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Etsi"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "_Muokkaa"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_Tiedosto"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_Ajalta:"
+msgid "page 2"
+msgstr "sivu 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "Tuttavan tunniste:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:145
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "_Keskustele"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:155
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "Uusi keskustelu"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:205
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "LÃhetÃ _videota"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "_Soita"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "Uusi puhelu"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:274
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"Anna salasana tilille\n"
+"<b>%s</b>"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:168
-#: ../libempathy-gtk/empathy-presence-chooser.c:204
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Messageâ"
 msgstr "Oma viestiâ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:221
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messagesâ"
 msgstr "Muokkaa omia viestejÃâ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:346
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "Napsauta poistaaksesi tÃmÃn tilan suosikeista"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:355
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "Napsauta tehdÃksesi tÃstÃ tilasta suosikin"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:389
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "Aseta tila"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:939
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr "Aseta lÃsnÃolosi ja nykyinen tilasi"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1124
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messagesâ"
 msgstr "Omat viestitâ"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#, c-format
+msgid "New %s account"
+msgstr "Uusi %s-tili"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Etsi:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Huomioi kirjainkoko"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Phrase not found"
 msgstr "Lausetta ei lÃydy"
 
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "_Next"
+msgstr "_Seuraava"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "_Previous"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "Vastaanotettiin pikaviesti"
 
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
 msgid "Sent an instant message"
 msgstr "LÃhetettiin pikaviesti"
 
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Incoming chat request"
 msgstr "Saapuva keskustelupyyntÃ"
 
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact connected"
 msgstr "Tuttava yhdistetty"
 
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Contact disconnected"
 msgstr "Yhteys tuttavaan katkaistu"
 
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Connected to server"
 msgstr "Yhdistetty palvelimeen"
 
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Disconnected from server"
 msgstr "Yhteys palvelimeen katkaistu"
 
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Incoming voice call"
 msgstr "Saapuva puhelu"
 
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Outgoing voice call"
 msgstr "LÃhetÃ puhelu"
 
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
 msgid "Voice call ended"
 msgstr "Puhelu pÃÃttyi"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "SyÃtÃ itse mÃÃritelty viesti"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "Muokkaa itse mÃÃriteltyjÃ viestejÃ"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "LisÃÃ _uusi esitieto"
+#: ../libempathy-gtk/empathy-theme-adium.c:1030
+#, c-format
+msgid "Message edited at %s"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr "Tallennetut esitiedot"
+#: ../libempathy-gtk/empathy-theme-adium.c:1720
+msgid "Normal"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Perinteinen"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Yksinkertainen"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "Siisti"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Sininen"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
-msgid "The identity provided by the chat server cannot be verified.\n"
-msgstr "Keskustelupalvelimen antamaa tunnistetta ei voida varmistaa.\n"
+msgid "The identity provided by the chat server cannot be verified."
+msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:156
-msgid "The certificate is not signed by a Certification Authority"
-msgstr "Varmennetta ei ole virallisesti allekirjoitettu"
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+msgid "The certificate is not signed by a Certification Authority."
+msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:160
-msgid "The certificate has expired"
-msgstr "Varmenne on vanhentunut"
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+msgid "The certificate has expired."
+msgstr "Varmenne on vanhentunut."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:163
-msgid "The certificate hasn't yet been activated"
-msgstr "Varmennetta ei ole vielÃ aktivoitu"
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+msgid "The certificate hasn't yet been activated."
+msgstr "Varmennetta ei ole vielÃ aktivoitu."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:166
-msgid "The certificate does not have the expected fingerprint"
-msgstr "Varmenteessa ei ole odotettua sormenjÃlkeÃ"
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+msgid "The certificate does not have the expected fingerprint."
+msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:169
-msgid "The hostname verified by the certificate doesn't match the server name"
-msgstr "Varmenteessa ilmoitettu isÃntÃnimi ei tÃsmÃÃ palvelimen nimen kanssa"
+#: ../libempathy-gtk/empathy-tls-dialog.c:170
+msgid "The hostname verified by the certificate doesn't match the server name."
+msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:173
-msgid "The certificate is self-signed"
-msgstr "Varmenne on itsetehty"
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid "The certificate is self-signed."
+msgstr "Varmenne on allekirjoitettu itse."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:176
-msgid "The certificate has been revoked by the issuing Certification Authority"
-msgstr "Varmenne on peruutettu varmenteen myÃntÃjÃn toimesta"
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
+msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:180
-msgid "The certificate is cryptographically weak"
-msgstr "Varmenteen salausmenetelmÃ on heikko"
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+msgid "The certificate is cryptographically weak."
+msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:183
-msgid "The certificate length exceeds verifiable limits"
-msgstr "Varmenteen pituus ylittÃÃ sallitut rajat"
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+msgid "The certificate length exceeds verifiable limits."
+msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:187
-msgid "The certificate is malformed"
-msgstr "Varmenne on muodostettu vÃÃrin"
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+msgid "The certificate is malformed."
+msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "Odotettu isÃntÃnimi: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "Varmenteen ilmoittama isÃntÃnimi: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:263
+#: ../libempathy-gtk/empathy-tls-dialog.c:281
 msgid "Continue"
 msgstr "Jatka"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:269
+#: ../libempathy-gtk/empathy-tls-dialog.c:287
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Yhteys ei ole luotettava. Haluatko kuitenkin jatkaa?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:286
+#: ../libempathy-gtk/empathy-tls-dialog.c:297
 msgid "Remember this choice for future connections"
 msgstr "Muista tÃmÃ valinta tulevia yhteyksiÃ varten"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:303
 msgid "Certificate Details"
 msgstr "Varmenteen tiedot"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1702
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "URI:a ei voi avata"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1797
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1866
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
+msgid "Insufficient free space to save file"
+msgstr "Tiedoston tallennukseen ei ole riittÃvÃsti tilaa"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#, c-format
+msgid ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
+msgstr ""
+"Tiedoston tallennukseen vaaditaan tilaa vÃhintÃÃn %s, mutta vain %s on "
+"saatavilla. Valitse toinen tallennussijainti."
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Saapuva tiedosto kÃyttÃjÃltÃ %s"
@@ -2377,19 +2939,35 @@ msgstr "Ei virheilmoitusta"
 msgid "Instant Message (Empathy)"
 msgstr "Pikaviesti (Empathy)"
 
-#: ../src/empathy.c:414
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "ÃlÃ yhdistÃ kÃynnistettÃessÃ"
 
-#: ../src/empathy.c:418
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "ÃlÃ nÃytÃ tuttavalistaa tai muita dialogeja kÃynnistyksessÃ"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- Empathy-pikaviestin"
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy.c:637
+msgid "Error contacting the Account Manager"
+msgstr "Virhe yhdistettÃessÃ tilienhallintaan"
+
+#: ../src/empathy.c:639
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"YhdistettÃessÃ Empathyn tilienhallintaan tapahtui virhe:\n"
+"\n"
+"%s"
+
+#: ../src/empathy-about-dialog.c:81
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -2401,7 +2979,7 @@ msgstr ""
 "Software Foundation on ne julkaissut; joko lisenssin version 2, tai "
 "(valinnan mukaan) minkÃ tahansa myÃhemmÃn version mukaisesti."
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -2413,7 +2991,7 @@ msgstr ""
 "laadusta tai soveltuvuudesta tiettyyn tarkoitukseen. Katso GPL lisenssistÃ "
 "lisÃÃ yksityiskohtia."
 
-#: ../src/empathy-about-dialog.c:93
+#: ../src/empathy-about-dialog.c:89
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -2423,11 +3001,11 @@ msgstr ""
 "kirjoita osoitteeseen Free Software Foundation Inc., 51 Franklin St, Fifth "
 "Floor, Boston, MA 02110-1301, USA."
 
-#: ../src/empathy-about-dialog.c:121
+#: ../src/empathy-about-dialog.c:107
 msgid "An Instant Messaging client for GNOME"
 msgstr "Gnomen pikaviestiohjelma"
 
-#: ../src/empathy-about-dialog.c:127
+#: ../src/empathy-about-dialog.c:113
 msgid "translator-credits"
 msgstr ""
 "Samuli SeppÃnen ja Henna NykÃnen, 2006.\n"
@@ -2447,18 +3025,22 @@ msgstr ""
 "  Ilkka Tuohela https://launchpad.net/~hile\n";
 "  Ilkka Tuohela https://launchpad.net/~hile-utu\n";
 "  Jammi Vesterinen https://launchpad.net/~jmov\n";
-"  Jani Uusitalo https://launchpad.net/~jani-uusitalo\n";
+"  Jani Uusitalo https://launchpad.net/~uusijani\n";
 "  Jere Sokka https://launchpad.net/~jerry-sokka\n";
 "  Jiri GrÃnroos https://launchpad.net/~jiri-gronroos\n";
-"  Jussi Aalto https://launchpad.net/~jtaalto\n";
+"  Joonas Pajuniva https://launchpad.net/~joonas-pajuniva\n";
+"  Jussi Aalto https://launchpad.net/~jtaalto-deactivatedaccount\n";
+"  Kristian Kurki https://launchpad.net/~kristian-kurki\n";
 "  Matti Karnaattu https://launchpad.net/~mattikarnaattu\n";
-"  Mika Suomalainen https://launchpad.net/~s-mika\n";
+"  Mika Suomalainen https://launchpad.net/~mkaysi\n";
 "  Mikko Nissinen https://launchpad.net/~mikko\n";
+"  Miko-Matias GrÃnvall https://launchpad.net/~matias-gronvall\n";
 "  Ncl8 https://launchpad.net/~crofle\n";
 "  Timo Jyrinki https://launchpad.net/~timo-jyrinki\n";
 "  Tomi Juntunen https://launchpad.net/~tojuntu\n";
 "  Tommi Saira https://launchpad.net/~tommisaira\n";
 "  Tommi Vainikainen https://launchpad.net/~thv\n";
+"  Ville-Pekka Vainio https://launchpad.net/~vpvainio\n";
 "  papukaija https://launchpad.net/~papukaija";
 
 #: ../src/empathy-account-assistant.c:167
@@ -2471,7 +3053,7 @@ msgstr "Virhe jÃsennettÃessÃ kÃyttÃjÃtilien asetuksia."
 
 #: ../src/empathy-account-assistant.c:173
 msgid "There was an error while creating the account."
-msgstr "Tunnusta luodessa tapahtui virhe."
+msgstr "TiliÃ luodessa tapahtui virhe."
 
 #: ../src/empathy-account-assistant.c:175
 msgid "There was an error."
@@ -2491,92 +3073,81 @@ msgstr ""
 "tÃmÃn apulaisen ja lisÃtÃ tilit myÃhemmin Muokkaa-valikosta."
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1315
+#: ../src/empathy-account-assistant.c:1271
 msgid "An error occurred"
 msgstr "Tapahtui virhe"
 
-#. To translator: %s is the protocol name
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:614
-#, c-format
-msgid "New %s account"
-msgstr "Uusi %s-tili"
-
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:467
 msgid "What kind of chat account do you have?"
 msgstr "MinkÃ tyyppinen pikaviestintili sinulla on?"
 
-#: ../src/empathy-account-assistant.c:520
+#: ../src/empathy-account-assistant.c:473
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "Onko sinulla muita tilejÃ, jotka haluaisit mÃÃritellÃ?"
 
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:479
 msgid "Enter your account details"
 msgstr "SyÃtÃ tilisi tiedot"
 
-#: ../src/empathy-account-assistant.c:531
+#: ../src/empathy-account-assistant.c:484
 msgid "What kind of chat account do you want to create?"
 msgstr "MinkÃ tyyppisen pikaviestintilin haluat luoda?"
 
-#: ../src/empathy-account-assistant.c:537
+#: ../src/empathy-account-assistant.c:490
 msgid "Do you want to create other chat accounts?"
 msgstr "Haluatko luoda muita pikaviestintilejÃ?"
 
-#: ../src/empathy-account-assistant.c:544
+#: ../src/empathy-account-assistant.c:497
 msgid "Enter the details for the new account"
 msgstr "SyÃtÃ uuden kÃyttÃjÃtilin tiedot"
 
-#: ../src/empathy-account-assistant.c:659
+#: ../src/empathy-account-assistant.c:612
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
 "programs. With a microphone or a webcam you can also have audio or video "
 "calls."
 msgstr ""
-"Empathya kÃyttÃen voit keskustella verkossa olevien tuttujen kanssa, jotka "
-"kÃyttÃvÃt Google Talkia, AIM:ÃÃ, Windows LiveÃ ja monia muita pikaviestimiÃ. "
-"Mikrofonin ja web-kameran avulla voit myÃs soittaa puheluita sekÃ "
-"videopuheluita."
+"Keskustele Empathyn avulla verkossa olevien tuttujen kanssa, joilla on "
+"esimerkiksi Google Talk, AIM, Windows Live tai muu pikaviestintili kÃytÃssÃ. "
+"Mikrofonin ja web-kameran avulla voit myÃs soittaa ÃÃni- tai videopuheluita."
 
-#: ../src/empathy-account-assistant.c:676
+#: ../src/empathy-account-assistant.c:629
 msgid "Do you have an account you've been using with another chat program?"
 msgstr ""
 "Onko sinulla kÃyttÃjÃtili, jota olet kÃyttÃnyt toisessa pikaviestimessÃ?"
 
-#: ../src/empathy-account-assistant.c:699
+#: ../src/empathy-account-assistant.c:652
 msgid "Yes, import my account details from "
 msgstr "KyllÃ, tuo tilitiedot ohjelmasta "
 
-#: ../src/empathy-account-assistant.c:720
+#: ../src/empathy-account-assistant.c:673
 msgid "Yes, I'll enter my account details now"
 msgstr "KyllÃ, syÃtÃn tilitietoni nyt"
 
-#: ../src/empathy-account-assistant.c:742
+#: ../src/empathy-account-assistant.c:695
 msgid "No, I want a new account"
 msgstr "Ei, haluan uuden kÃyttÃjÃtilin"
 
-#: ../src/empathy-account-assistant.c:752
+#: ../src/empathy-account-assistant.c:705
 msgid "No, I just want to see people online nearby for now"
 msgstr "Ei, haluan vain nÃhdÃ samassa lÃhiverkossa linjoilla olevat henkilÃt"
 
-#: ../src/empathy-account-assistant.c:773
+#: ../src/empathy-account-assistant.c:726
 msgid "Select the accounts you want to import:"
 msgstr "Valitse tilit, jotka haluat tuoda:"
 
-#: ../src/empathy-account-assistant.c:857
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-account-assistant.c:813
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "Yes"
 msgstr "KyllÃ"
 
-#: ../src/empathy-account-assistant.c:864
+#: ../src/empathy-account-assistant.c:820
 msgid "No, that's all for now"
 msgstr "Ei, tÃssÃ oli kaikki"
 
-#: ../src/empathy-account-assistant.c:1129
+#: ../src/empathy-account-assistant.c:1085
 msgid ""
 "Empathy can automatically discover and chat with the people connected on the "
 "same network as you. If you want to use this feature, please check that the "
@@ -2586,19 +3157,19 @@ msgstr ""
 "Empathy voi automaattisesti lÃytÃÃ ja keskustella kanssasi samaan verkkoon "
 "yhdistettyjen ihmisten kanssa. Jos haluat kÃyttÃÃ tÃtÃ toimintoa, tarkista "
 "ettÃ alla olevat yksityiskohdat pitÃvÃt paikkansa. Voit helposti muuttaa "
-"nÃitÃ yksityiskohtia myÃhemmin tai estÃÃ tÃmÃn toiminnon kÃyttÃmÃllÃ "
-"âTilitâ-valintaikkunaa."
+"nÃitÃ yksityiskohtia myÃhemmin tai estÃÃ tÃmÃn toiminnon kÃyttÃmÃllÃ âTilitâ-"
+"valintaikkunaa."
 
-#: ../src/empathy-account-assistant.c:1135
-#: ../src/empathy-account-assistant.c:1191
+#: ../src/empathy-account-assistant.c:1091
+#: ../src/empathy-account-assistant.c:1147
 msgid "Edit->Accounts"
 msgstr "Muokkaa->Tilit"
 
-#: ../src/empathy-account-assistant.c:1151
-msgid "I don't want to enable this feature for now"
-msgstr "En halua ottaa tÃtÃ toimintoa kÃyttÃÃn nyt"
+#: ../src/empathy-account-assistant.c:1107
+msgid "I do _not want to enable this feature for now"
+msgstr "En _halua kÃyttÃÃ tÃtÃ ominaisuutta juuri nyt"
 
-#: ../src/empathy-account-assistant.c:1187
+#: ../src/empathy-account-assistant.c:1143
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2607,69 +3178,71 @@ msgid ""
 msgstr ""
 "Et voi keskustella paikalliseen verkkoon liittyneiden ihmisten kanssa sillÃ "
 "telepathy-salut ei ole asennettu. Jos haluat ottaa tÃmÃn ominaisuuden "
-"kÃyttÃÃn, asenna telepathy-salut paketti ja luo lÃheiset ihmiset -tili "
-"Tilit-ikkunassa."
+"kÃyttÃÃn, asenna telepathy-salut paketti ja luo lÃheiset ihmiset -tili Tilit-"
+"ikkunassa."
 
-#: ../src/empathy-account-assistant.c:1193
+#: ../src/empathy-account-assistant.c:1149
 msgid "telepathy-salut not installed"
 msgstr "pakettia telepathy-salut ei ole asennettu"
 
-#: ../src/empathy-account-assistant.c:1239
+#: ../src/empathy-account-assistant.c:1195
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "ViestintÃ- ja VoIP-kÃyttÃjÃtilien apulainen"
 
-#: ../src/empathy-account-assistant.c:1273
+#: ../src/empathy-account-assistant.c:1229
 msgid "Welcome to Empathy"
 msgstr "Tervetuloa Empathyyn"
 
-#: ../src/empathy-account-assistant.c:1282
+#: ../src/empathy-account-assistant.c:1238
 msgid "Import your existing accounts"
 msgstr "Tuo olemassa olevat kÃyttÃjÃtilit"
 
-#: ../src/empathy-account-assistant.c:1300
+#: ../src/empathy-account-assistant.c:1256
 msgid "Please enter personal details"
 msgstr "SyÃtÃ henkilÃkohtaiset tiedot"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:65
+#: ../src/empathy-accounts-dialog.c:64
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Tilille %s tehtyjÃ muutoksia ei ole tallennettu."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:68
 msgid "Your new account has not been saved yet."
-msgstr "Uutta tunnustasi ei ole vielÃ tallennettu."
+msgstr "Uutta tiliÃsi ei ole vielÃ tallennettu."
 
-#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1164
 msgid "Connectingâ"
 msgstr "YhdistetÃÃnâ"
 
-#: ../src/empathy-accounts-dialog.c:322
+#: ../src/empathy-accounts-dialog.c:386
 #, c-format
 msgid "Offline â %s"
 msgstr "Poissa linjoilta â %s"
 
-#: ../src/empathy-accounts-dialog.c:334
+#: ../src/empathy-accounts-dialog.c:398
 #, c-format
 msgid "Disconnected â %s"
 msgstr "Yhteys katkaistu â %s"
 
-#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-accounts-dialog.c:409
 msgid "Offline â No Network Connection"
 msgstr "Poissa linjoilta â Ei verkkoyhteyttÃ"
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Unknown Status"
 msgstr "Tuntematon tila"
 
-#: ../src/empathy-accounts-dialog.c:364
+#: ../src/empathy-accounts-dialog.c:428
 msgid "Offline â Account Disabled"
 msgstr "Poissa linjoilta â Tili ei ole kÃytettÃvissÃ"
 
-#: ../src/empathy-accounts-dialog.c:810
+#: ../src/empathy-accounts-dialog.c:831
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2677,16 +3250,16 @@ msgstr ""
 "Olet luomassa uutta kÃyttÃjÃtiliÃ. Uuden tilin luonti hylkÃÃ\n"
 "tehdyt muutokset. Haluatko varmasti jatkaa?"
 
-#: ../src/empathy-accounts-dialog.c:1157
+#: ../src/empathy-accounts-dialog.c:1192
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Haluatko poistaa tilin â%sâ tietokoneeltasi?"
 
-#: ../src/empathy-accounts-dialog.c:1161
+#: ../src/empathy-accounts-dialog.c:1196
 msgid "This will not remove your account on the server."
 msgstr "TÃmÃ ei poista tiliÃsi palvelimelta."
 
-#: ../src/empathy-accounts-dialog.c:1399
+#: ../src/empathy-accounts-dialog.c:1432
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2694,7 +3267,16 @@ msgstr ""
 "Olet vaihtamassa kÃyttÃjÃtiliÃ. Tilin vaihtamineen hylkÃÃ\n"
 "tehdyt muutokset. Haluatko varmasti jatkaa?"
 
-#: ../src/empathy-accounts-dialog.c:2002
+#. Menu items: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1643
+msgid "_Enable"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:1644
+msgid "_Disable"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:2154
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2703,18 +3285,22 @@ msgstr ""
 "tehdyt muutokset. Haluatko varmasti jatkaa?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Addâ"
+msgstr "LisÃÃ..."
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
 msgstr "Ladataan tilin tietoja"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
 msgstr "Protokollaa ei ole asennettu"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "YhteyskÃytÃntÃ:"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -2722,19 +3308,15 @@ msgstr ""
 "Ennen kuin voit lisÃtÃ tilin, sinun tÃytyy asentaa kullekin kÃytettÃvÃlle "
 "protokollalle tarvittava taustajÃrjestelmÃ."
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Addâ"
-msgstr "_LisÃÃâ"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Importâ"
 msgstr "_Tuoâ"
 
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:249
 msgid " - Empathy authentication client"
 msgstr " - Empathyn tunnistautumisasiakas"
 
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:265
 msgid "Empathy authentication client"
 msgstr "Empathyn tunnistautumisasiakas"
 
@@ -2742,108 +3324,132 @@ msgstr "Empathyn tunnistautumisasiakas"
 msgid "People nearby"
 msgstr "LÃhellÃ olevat ihmiset"
 
-#: ../src/empathy-av.c:133
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathyn audio/video-asiakas"
 
-#: ../src/empathy-av.c:149
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
 msgid "Empathy Audio/Video Client"
 msgstr "Empathyn audio/video-asiakas"
 
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "Kontrasti"
 
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "Kirkkaus"
 
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "ÃÃnenvoimakkuus"
 
-#: ../src/empathy-call-window.c:1175
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "_Sivupalkki"
 
-#: ../src/empathy-call-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "ÃÃnisyÃte"
 
-#: ../src/empathy-call-window.c:1198
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "VideosyÃte"
 
-#: ../src/empathy-call-window.c:1202
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "Valintalevy"
 
-#: ../src/empathy-call-window.c:1207
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "Tiedot"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1275
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1672
 #, c-format
 msgid "Call with %s"
 msgstr "Soita tuttavalle %s"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-call-window.c:1354
-msgid "Call"
-msgstr "Soita"
-
-#: ../src/empathy-call-window.c:1508
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:1916
 msgid "The IP address as seen by the machine"
 msgstr "TÃmÃn koneen nÃkemÃ IP-osoite"
 
-#: ../src/empathy-call-window.c:1510
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:1918
 msgid "The IP address as seen by a server on the Internet"
 msgstr "InternetissÃ olevan palvelimen nÃkemÃ IP-osoite"
 
-#: ../src/empathy-call-window.c:1512
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:1920
 msgid "The IP address of the peer as seen by the other side"
-msgstr ""
+msgstr "Vertaisen IP-osoite toiselta puolen nÃhtynÃ"
 
-#: ../src/empathy-call-window.c:1514
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:1922
 msgid "The IP address of a relay server"
-msgstr ""
+msgstr "VÃlityspalvelimen IP-osoite"
 
-#: ../src/empathy-call-window.c:1516
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:1924
 msgid "The IP address of the multicast group"
 msgstr "RyhmÃlÃhetysryhmÃn IP-osoite"
 
+#: ../src/empathy-streamed-media-window.c:1843
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: ../src/empathy-streamed-media-window.c:1846
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: ../src/empathy-streamed-media-window.c:1849
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: ../src/empathy-streamed-media-window.c:1852
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "Tuntematon"
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2263
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected â %d:%02dm"
 msgstr "Yhdistetty -- %d:%02d min"
 
-#: ../src/empathy-call-window.c:2324
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2674
 msgid "Technical Details"
 msgstr "Tekniset tiedot"
 
-#: ../src/empathy-call-window.c:2362
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2712
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s:n ohjelmisto ei ymmÃrrÃ mitÃÃn ÃÃnimuotoja mitÃ tietokoneesi tukee"
 
-#: ../src/empathy-call-window.c:2367
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2717
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s:n ohjelmisto ei ymmÃrrÃ mitÃÃn videomuotoja mitÃ tietokoneesi tukee"
 
-#: ../src/empathy-call-window.c:2373
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2723
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -2852,25 +3458,29 @@ msgstr ""
 "YhteyttÃ ei voi muodostaa kohteeseen %s. Yksi teistÃ voi ehkÃ olla verkossa, "
 "joka ei salli suoria yhteyksiÃ."
 
-#: ../src/empathy-call-window.c:2379
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2729
 msgid "There was a failure on the network"
 msgstr "VerkkoyhteydessÃ tapahtui virhe"
 
-#: ../src/empathy-call-window.c:2383
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2733
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "TÃhÃn puheluun vaadittavia ÃÃnitiedostomuotoja ei ole asennettu tÃlle "
 "tietokoneelle"
 
-#: ../src/empathy-call-window.c:2386
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2736
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "TÃhÃn puheluun vaadittavia videotiedostomuotoja ei ole asennettu tÃlle "
 "tietokoneelle"
 
-#: ../src/empathy-call-window.c:2396
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2748
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2878,150 +3488,203 @@ msgid ""
 "the Help menu."
 msgstr ""
 "Telepathy-komponentin kanssa tapahtui jotain odottamatonta. Ole hyvÃ ja <a "
-"href=\"%s\">raportoi tÃmÃ ohjelmavirhe</a> sekÃ liitÃ 'VianjÃljitys'-ikkunasta "
-"kerÃtyt lokit \"Apua\"-valikosta."
+"href=\"%s\">raportoi tÃmÃ ohjelmavirhe</a> sekÃ liitÃ 'VianjÃljitys'-"
+"ikkunasta kerÃtyt lokit \"Apua\"-valikosta."
 
-#: ../src/empathy-call-window.c:2404
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2757
 msgid "There was a failure in the call engine"
 msgstr "Virhe soitettaessa"
 
-#: ../src/empathy-call-window.c:2407
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2760
 msgid "The end of the stream was reached"
 msgstr "Virran loppu saavutettiin"
 
-#: ../src/empathy-call-window.c:2447
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2800
 msgid "Can't establish audio stream"
 msgstr "ÃÃniyhteyden muodostus ei onnistunut"
 
-#: ../src/empathy-call-window.c:2457
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2810
 msgid "Can't establish video stream"
 msgstr "Videoyhteyden muodostus ei onnistunut"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "ÃÃni"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Soita tuttavalle uudelleen"
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Kamera pois"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Purkamiskoodekki:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Kamera pÃÃllÃ"
+msgid "Disable camera"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Purkamiskoodekki:"
+msgid "Display the dialpad"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Kytke kamera poista kÃytÃstÃ ja lopeta videokuvan lÃhetys"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Pakkauskoodekki:"
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Ota kamera kÃyttÃÃn ja lÃhetÃ videokuvaa"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "Katkaise"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Ota kamera kÃyttÃÃn, mutta ÃlÃ lÃhetÃ videokuvaa"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Lopeta nykyinen puhelu"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Pakkauskoodekki:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Paikallisehdokas:"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "Katkaise"
+msgid "Maximise me"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Lopeta nykyinen puhelu"
+msgid "Minimise me"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr ""
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "EtÃehdokas:"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Esikatselu"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "LÃhetÃ ÃÃntÃ"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "YhdistÃ uudelleen"
+msgid "Send Video"
+msgstr "LÃhetÃ video"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
+msgid "Show dialpad"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "LÃhetÃ ÃÃntÃ"
+msgid "Start a video call"
+msgstr "Aloita videopuhelu"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "ÃÃnen lÃhetys pÃÃlle/pois"
+msgid "Start an audio call"
+msgstr "Aloita ÃÃnipuhelu"
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "Vaihda kamera"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "ÃÃnen lÃhetys pÃÃlle/pois"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Video"
-
-#: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "Video pois"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "Video pÃÃllÃ"
+msgid "Toggle video transmission"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2307 ../src/empathy-call-window.c:2308
+#: ../src/empathy-call-window.c:2309 ../src/empathy-call-window.c:2310
+msgid "Unknown"
+msgstr "Tuntematon"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Videon esikatselu"
+msgid "Video call"
+msgstr "Videopuhelu"
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "_Soita"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "_SisÃltÃ"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "_VianetsintÃ"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "O_hje"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_NÃytÃ"
 
-#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d lukematon)"
 msgstr[1] "%s (%d lukematonta)"
 
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (ja %u muu)"
 msgstr[1] "%s (ja %u muuta)"
 
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d lukematon muilta)"
 msgstr[1] "%s (%d lukematonta muilta)"
 
-#: ../src/empathy-chat-window.c:489
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d lukematon kaikilta)"
 msgstr[1] "%s (%d lukematonta kaikilta)"
 
-#: ../src/empathy-chat-window.c:695
+#: ../src/empathy-chat-window.c:733
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:743
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "Kirjoittaa viestiÃ."
 
@@ -3033,10 +3696,6 @@ msgstr "_TyhjennÃ"
 msgid "C_ontact"
 msgstr "T_uttava"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Keskustelu"
-
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "LisÃÃ _hymiÃ"
@@ -3057,10 +3716,6 @@ msgstr "SiirrÃ vÃlilehti _oikealle"
 msgid "Notify for All Messages"
 msgstr "Ilmoita kaikista viesteistÃ"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
-msgid "_Contents"
-msgstr "_SisÃltÃ"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "_Keskustelu"
@@ -3069,18 +3724,10 @@ msgstr "_Keskustelu"
 msgid "_Detach Tab"
 msgstr "_Irrota vÃlilehti"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
-msgid "_Edit"
-msgstr "_Muokkaa"
-
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
 msgstr "_Suosikkikeskusteluhuone"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
-msgid "_Help"
-msgstr "O_hje"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "_Seuraava vÃlilehti"
@@ -3101,15 +3748,15 @@ msgstr "V_Ãlilehdet"
 msgid "_Undo Close Tab"
 msgstr "_Kumoa Sulje vÃlilehti"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "Nimi"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "Huone"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "YhdistÃ automaattisesti"
 
@@ -3117,86 +3764,95 @@ msgstr "YhdistÃ automaattisesti"
 msgid "Manage Favorite Rooms"
 msgstr "Hallitse suosikkihuoneita"
 
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "Saapuva videopuhelu"
 
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming call"
 msgstr "Saapuva puhelu"
 
-#: ../src/empathy-event-manager.c:472
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s soittaa videopuhelun sinulle. Haluatko vastata?"
 
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s soittaa sinulle. Haluatko vastata?"
 
-#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Puhelu kÃyttÃjÃltÃ %s"
 
-#: ../src/empathy-event-manager.c:501
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "_HylkÃÃ"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "_Vastaa"
 
-#: ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr "_Vastaa kÃyttÃen videota"
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Saapuva videopuhelu taholta %s"
 
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "Kutsu huoneeseen"
 
-#: ../src/empathy-event-manager.c:697
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Kutsu liittyÃ kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:704
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s kutsui sinut liittymÃÃn kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "_KieltÃydy"
 
-#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Liity"
 
-#: ../src/empathy-event-manager.c:743
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s kutsui sinut liittymÃÃn kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Sinut on kutsuttu liittymÃÃn kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:797
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Saapuva tiedostonsiirto tuttavalta %s"
 
-#: ../src/empathy-event-manager.c:1005
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+msgid "Password required"
+msgstr "Salasana vaaditaan"
+
+#: ../src/empathy-event-manager.c:1190
 #, c-format
-msgid "Subscription requested by %s"
-msgstr "LiittymispyyntÃ tuttavalta %s"
+msgid "%s would like permission to see when you are online"
+msgstr ""
 
-#: ../src/empathy-event-manager.c:1009
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3205,116 +3861,102 @@ msgstr ""
 "\n"
 "Viesti: %s"
 
-#: ../src/empathy-event-manager.c:1052
-#, c-format
-msgid "%s is now offline."
-msgstr "%s on nyt poissa linjoilta."
-
-#: ../src/empathy-event-manager.c:1072
-#, c-format
-msgid "%s is now online."
-msgstr "%s on nyt linjoilla."
-
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s nopeudella %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Vastaanotetaan \"%s\" tuttavalta %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "LÃhetetÃÃn \"%s\" tuttavalle %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Virhe vastaanotettaessa \"%s\" tuttavalta %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr "Virhe vastaanotettaessa tiedostoa"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Virhe lÃhetettÃessÃ \"%s\" tuttavalle %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr "Virhe lÃhetettÃessÃ tiedostoa"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" vastaanotettu tuttavalta %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" lÃhetetty tuttavalle %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
 msgstr "Tiedostonsiirto valmistui"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
 msgstr "Odotetaan toisen osallistujan vastausta"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Tarkistetaan tiedoston â%sâ eheyttÃ"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Lasketaan tiivistettÃ tiedostolle â%sâ"
 
-#: ../src/empathy-ft-manager.c:996
-msgid "%"
-msgstr "%"
-
-#: ../src/empathy-ft-manager.c:1008
+#: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Tiedosto"
 
-#: ../src/empathy-ft-manager.c:1030
+#: ../src/empathy-ft-manager.c:1060
 msgid "Remaining"
 msgstr "JÃljellÃ"
 
@@ -3339,137 +3981,166 @@ msgid "Import Accounts"
 msgstr "Tuo tilejÃ"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:292
+#: ../src/empathy-import-widget.c:301
 msgid "Import"
 msgstr "Tuo"
 
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:310
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:334
 msgid "Source"
 msgstr "LÃhde"
 
-#: ../src/empathy-main-window.c:383
+#: ../src/empathy-main-window.c:392
+msgid "Provide Password"
+msgstr "Anna salasana"
+
+#: ../src/empathy-main-window.c:398
+msgid "Disconnect"
+msgstr "Katkaise yhteys"
+
+#: ../src/empathy-main-window.c:622
 msgid "No match found"
 msgstr "Vastinetta ei lÃytynyt"
 
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:777
 msgid "Reconnect"
 msgstr "YhdistÃ uudelleen"
 
-#: ../src/empathy-main-window.c:544
+#: ../src/empathy-main-window.c:783
 msgid "Edit Account"
 msgstr "Muokkaa tiliÃ"
 
-#: ../src/empathy-main-window.c:550
+#: ../src/empathy-main-window.c:789
 msgid "Close"
 msgstr "Sulje"
 
-#: ../src/empathy-main-window.c:1232
+#. Translators: this string will be something like:
+#. *   Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr ""
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr ""
+
+#. top up button
+#: ../src/empathy-main-window.c:1046
+msgid "Top Up..."
+msgstr ""
+
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "Tuttava"
 
-#: ../src/empathy-main-window.c:1557
+#: ../src/empathy-main-window.c:2119
 msgid "Contact List"
 msgstr "Tuttavaluettelo"
 
-#: ../src/empathy-main-window.c:1666
-msgid "Show and edit accounts"
-msgstr "NÃytÃ ja muokkaa tilejÃ"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Tuttavat _kartalla"
 
-#: ../src/empathy-main-window.ui.h:2
-msgid "Context"
-msgstr "Yhteys"
+#: ../src/empathy-main-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr ""
+
+#: ../src/empathy-main-window-menubar.ui.h:3
+msgid "Find in Contact _List"
+msgstr "Etsi _tuttavaluettelosta"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "Liity _suosikkeihin"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Hallitse suosikkeja"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "_Normaali koko"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Callâ"
 msgstr "Uusi _puheluâ"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Normaali koko _avatarien kera"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "_Asetukset"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "NÃytÃ p_rotokollat"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Lajittele _nimen mukaan"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Lajittele _tilan mukaan"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_KÃyttÃjÃtilit"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window-menubar.ui.h:15
+msgid "_Blocked Contacts"
+msgstr "_Estetyt yhteystiedot"
+
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "_Tiivis koko"
 
-#: ../src/empathy-main-window.ui.h:17
-msgid "_Debug"
-msgstr "_VianetsintÃ"
-
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "_Tiedostosiirrot"
 
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Joinâ"
 msgstr "_Liityâ"
 
-#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversationâ"
 msgstr "_Uusi keskusteluâ"
 
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "_Poissa linjoilta olevat tuttavat"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "_HenkilÃtiedot"
 
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "_Huone"
 
-#: ../src/empathy-new-chatroom-dialog.c:379
+#: ../src/empathy-main-window-menubar.ui.h:29
+msgid "_Search for Contactsâ"
+msgstr "Etsi _yhteystietoja..."
+
+#: ../src/empathy-new-chatroom-dialog.c:337
 msgid "Chat Room"
 msgstr "Keskusteluhuone"
 
-#: ../src/empathy-new-chatroom-dialog.c:395
+#: ../src/empathy-new-chatroom-dialog.c:353
 msgid "Members"
 msgstr "JÃsenet"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:553
 #, c-format
 msgid ""
 "%s\n"
@@ -3482,16 +4153,16 @@ msgstr ""
 "Vaaditaan salasana: %s\n"
 "JÃseniÃ: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "No"
 msgstr "Ei"
 
-#: ../src/empathy-new-chatroom-dialog.c:638
+#: ../src/empathy-new-chatroom-dialog.c:584
 msgid "Could not start room listing"
 msgstr "Ei voitu aloittaa huoneluettelointia"
 
-#: ../src/empathy-new-chatroom-dialog.c:648
+#: ../src/empathy-new-chatroom-dialog.c:594
 msgid "Could not stop room listing"
 msgstr "Ei voitu lopettaa huoneluettelointia"
 
@@ -3526,39 +4197,79 @@ msgstr "Huoneluettelo"
 msgid "_Room:"
 msgstr "_Keskusteluhuone:"
 
-#: ../src/empathy-preferences.c:138
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Viesti vastaanotettu"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Viesti lÃhetetty"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "Uusi keskustelu"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "Tuttava saapui linjoille"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "Tuttava poistui linjoilta"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "Tili yhdistetty"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "Tilin yhteys katkaistu"
 
-#: ../src/empathy-preferences.c:445
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Kieli"
 
-#: ../src/empathy-preferences.c:882
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Juliet"
+msgstr ""
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:741
+msgid "Romeo"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "Deny thy father and refuse thy name;"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "And I'll no longer be a Capulet."
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+msgid "Juliet has disconnected"
+msgstr ""
+
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -3566,67 +4277,75 @@ msgstr "Asetukset"
 msgid "Appearance"
 msgstr "Ulkoasu"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "KÃytÃs"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "Keskustelun _teema:"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "Poista huomautukset kÃytÃstÃ oltaessa _poissa tai kiireinen"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "Poista ÃÃnet kÃytÃstÃ oltaessa _poissa tai kiireinen"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "NÃytÃ tulevat tapahtumat tilarivillÃ"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
 msgid "Enable notifications when a contact comes online"
-msgstr "Ota kÃyttÃÃn ponnahdusikkunat, kun tuttava tulee linjoille"
+msgstr "NÃytÃ ponnahdusikkuna, kun tuttava tulee linjoille"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact goes offline"
-msgstr "Ota kÃyttÃÃn ponnahdusikkunat, kun tuttava lÃhtee linjoilta"
+msgstr "NÃytÃ ponnahdusikkuna, kun tuttava lÃhtee linjoilta"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when the _chat is not focused"
 msgstr "NÃytÃ huomautuksia, kun _keskustelu ei ole kohdistettu"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable spell checking for languages:"
 msgstr "KÃytÃ kielentarkistusta kielille:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
 msgid "General"
 msgstr "Yleinen"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
+msgid "Input level"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input volume"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location sources:"
 msgstr "Sijainti:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:18
 msgid "Log conversations"
 msgstr "Tallenna keskustelut lokitiedostoon"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:19
 msgid "Notifications"
 msgstr "Huomautukset"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:20
 msgid "Play sound for events"
 msgstr "Soita ÃÃniÃ tapahtumille"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:21
 msgid "Privacy"
 msgstr "Yksityisyys"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:22
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -3635,23 +4354,23 @@ msgstr ""
 "Heikennetty sijaintitiedon tarkkuus tarkoittaa, ettÃ ainoastaan kaupunkisi "
 "ja maasi julkaistaan. GPS-koordinaattien tarkkuus on yksi desimaali."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show _smileys as images"
 msgstr "NÃytÃ _hymiÃt hymiÃkuvakkeina"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show contact _list in rooms"
 msgstr "NÃytÃ tuttava_luettelo huoneissa"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:25
 msgid "Sounds"
 msgstr "ÃÃnet"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:26
 msgid "Spell Checking"
 msgstr "Kielentarkastus"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -3659,67 +4378,51 @@ msgstr ""
 "Luettelo kielistÃ sisÃltÃÃ ainoastaan ne kielet, joille tietokoneessasi on "
 "asennettu sanakirja."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "Teemat"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:29
+msgid "Variant:"
+msgstr "Muunnelma:"
+
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Automatically connect on startup"
 msgstr "_YhdistÃ automaattisesti kÃynnistyksen yhteydessÃ"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Cellphone"
 msgstr "_Matkapuhelin"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Enable bubble notifications"
 msgstr "_KÃytÃ ponnahdusikkunahuomautuksia"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable sound notifications"
 msgstr "_KÃytÃ merkkiÃÃniÃ"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:34
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Verkko (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Open new chats in separate windows"
 msgstr "_Avaa uusi ikkuna uusille keskusteluille"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Publish location to my contacts"
 msgstr "_Julkaise sijainti tuttavilleni"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345Â is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:39
 msgid "_Reduce location accuracy"
 msgstr "_HeikennÃ sijaintitiedon tarkkuutta"
 
-#: ../src/empathy-status-icon.c:141
-msgid "Respond"
-msgstr "Vastaa"
-
-#: ../src/empathy-status-icon.c:147
-msgid "Reject"
-msgstr "HylkÃÃ"
-
-#: ../src/empathy-status-icon.c:151
-msgid "Answer"
-msgstr "Vastaa"
-
-#: ../src/empathy-status-icon.c:158
-msgid "Decline"
-msgstr "KieltÃydy"
-
-#: ../src/empathy-status-icon.c:162
-msgid "Accept"
-msgstr "HyvÃksy"
-
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "Tila"
@@ -3728,249 +4431,379 @@ msgstr "Tila"
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#: ../src/empathy-map-view.c:452
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Soita tuttavalle uudelleen"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Kamera pois"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Kamera pÃÃllÃ"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Kytke kamera poista kÃytÃstÃ ja lopeta videokuvan lÃhetys"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Ota kamera kÃyttÃÃn ja lÃhetÃ videokuvaa"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Ota kamera kÃyttÃÃn, mutta ÃlÃ lÃhetÃ videokuvaa"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Esikatselu"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "YhdistÃ uudelleen"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Video pois"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Video pÃÃllÃ"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Videon esikatselu"
+
+#: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "Tuttavien karttanÃkymÃ"
 
-#: ../src/empathy-debug-window.c:1219
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Tallenna"
 
-#: ../src/empathy-debug-window.c:1395
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "VianetsintÃikkuna"
 
-#: ../src/empathy-debug-window.c:1475
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "PysÃytÃ"
 
-#: ../src/empathy-debug-window.c:1487
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "Taso "
 
-#: ../src/empathy-debug-window.c:1507
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "VirheenjÃljitys"
 
-#: ../src/empathy-debug-window.c:1513
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "Tietoa"
 
-#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Viesti"
 
-#: ../src/empathy-debug-window.c:1525
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../src/empathy-debug-window.c:1531
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "Kriittinen"
 
-#: ../src/empathy-debug-window.c:1537
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "Virhe"
 
-#: ../src/empathy-debug-window.c:1556
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "Aika"
 
-#: ../src/empathy-debug-window.c:1559
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Alue"
 
-#: ../src/empathy-debug-window.c:1561
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Luokka"
 
-#: ../src/empathy-debug-window.c:1563
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "Taso"
 
-#: ../src/empathy-debug-window.c:1600
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "Valittu yhteyshallinta ei tue etÃvianetsintÃlaajennusta."
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:231
 msgid "Invite Participant"
 msgstr "Kutsu osanottaja"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:206
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Valitse keskusteluun kutsuttava tuttava:"
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:227
 msgid "Invite"
 msgstr "Kutsu"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:183
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "ÃlÃ nÃytÃ mitÃÃn valintaikkunoita; tee mitÃ tahansa tyÃtÃ (esim. tuonti) ja "
 "poistu"
 
-#: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs if there are any non-Salut accounts"
+#: ../src/empathy-accounts.c:187
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
-"ÃlÃ nÃytÃ mitÃÃn valintaikkunoita, paitsi jos kÃytÃssÃ on vain âLÃhellÃ "
-"olevat ihmisetâ -tilejÃ"
 
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:191
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "Valitse tili alussa (esim. gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:193
 msgid "<account-id>"
 msgstr "<kÃyttÃjÃtunnus>"
 
-#: ../src/empathy-accounts.c:200
+#: ../src/empathy-accounts.c:198
 msgid "- Empathy Accounts"
 msgstr "- Empathy-tilit"
 
-#: ../src/empathy-accounts.c:216
+#: ../src/empathy-accounts.c:237
 msgid "Empathy Accounts"
 msgstr "Empathy-tilit"
 
-#: ../src/empathy-debugger.c:40
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr ""
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr ""
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "Empathyn virheenjÃljitin"
 
-#~ msgid "Use _Yahoo! Japan"
-#~ msgstr "KÃytÃ _Yahoo! Japania"
+#: ../src/empathy-chat.c:107
+msgid "- Empathy Chat Client"
+msgstr "- Empathy-keskusteluasiakas"
 
-#~ msgid "Show incoming messages in the messaging menu"
-#~ msgstr "NÃytÃ saapuvat viestit viestivalikossa"
+#: ../src/empathy-notifications-approver.c:203
+msgid "Respond"
+msgstr "Vastaa"
 
-#~ msgid "Pri_ority:"
-#~ msgstr "_TÃrkeys:"
+#: ../src/empathy-notifications-approver.c:217
+msgid "Reject"
+msgstr "HylkÃÃ"
 
-#~ msgid "_Encryption required (TLS/SSL)"
-#~ msgstr "_Vaadi salaus (TLS/SSL)"
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer"
+msgstr "Vastaa"
 
-#~ msgid "_Ignore SSL certificate errors"
-#~ msgstr "ÃlÃ _huomioi SSL-varmenteiden virheitÃ"
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Vastaa videon kanssa"
 
-#~ msgid "_Nickname:"
-#~ msgstr "_Nimimerkki:"
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
+msgid "Decline"
+msgstr "KieltÃydy"
 
-#~ msgid "Send file"
-#~ msgstr "LÃhetÃ tiedosto"
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
+msgid "Accept"
+msgstr "HyvÃksy"
 
-#~ msgid "Enabled"
-#~ msgstr "KÃytÃssÃ"
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr ""
 
-#~ msgid "Automatically _connect on startup "
-#~ msgstr "YhdistÃ _kÃynnistettÃessÃ "
+#: ../src/empathy-call-observer.c:134
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr ""
+"%s yritti juuri soittaa sinulle, mutta sinulla oli toinen puhelu kesken."
 
-#~ msgid "Failed to reconnect this chat"
-#~ msgstr "UudelleenyhdistÃminen tÃhÃn keskusteluun epÃonnistui"
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1036 ../src/empathy-call-window.c:1059
+msgid "i"
+msgstr ""
 
-#~ msgid "<b>Location</b>, "
-#~ msgstr "<b>Sijainti</b>, "
+#: ../src/empathy-call-window.c:2603
+msgid "On hold"
+msgstr "Pidossa"
 
-#~ msgid "Select a destination"
-#~ msgstr "Valitse kohde"
+#: ../src/empathy-call-window.c:2606
+msgid "Mute"
+msgstr "Vaimenna"
 
-#~ msgid "Empathy IM Client"
-#~ msgstr "Empathy-pikaviestin"
+#: ../src/empathy-call-window.c:2608
+msgid "Duration"
+msgstr "Kesto"
 
-#~ msgid "Send and receive messages"
-#~ msgstr "LÃhetÃ ja vastaanota viestejÃ"
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2611
+#, c-format
+msgid "%s â %d:%02dm"
+msgstr ""
 
-#~ msgid "Share my desktop"
-#~ msgstr "Jaa tyÃpÃytÃni"
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr ""
 
-#~ msgid "MC 4 accounts have been imported"
-#~ msgstr "MC 4 -tilit on tuotu"
+#~ msgid "%s is sending you a file. Do you want to accept it?"
+#~ msgstr "%s haluaa lÃhettÃÃ sinulle tiedoston. Haluatko vastaanottaa sen?"
 
-#~ msgid "MC 4 accounts have been imported."
-#~ msgstr "MC 4 -tilit on tuotu."
+#~ msgid "_Accept"
+#~ msgstr "_HyvÃksy"
 
-#~ msgid "%s account"
-#~ msgstr "%s-tili"
+#~ msgid "Empathy has asked about importing accounts"
+#~ msgstr "Empathy on kysynyt tilien tuonnista"
 
-#~ msgid "Use the messaging indicator"
-#~ msgstr "KÃytÃ viesti-ilmoittimia"
+#~ msgid "All"
+#~ msgstr "Kaikki"
 
-#~ msgid ""
-#~ "Whether or not to use the messaging indicator, if false the icon in the "
-#~ "notification area will be displayed."
-#~ msgstr ""
-#~ "NÃytetÃÃnkÃ viesti-ilmoitin, jos ei, ilmoitusalueella nÃytetÃÃn ikoni."
+#~ msgid "Select"
+#~ msgstr "Valitse"
+
+#~ msgid "Date"
+#~ msgstr "PÃivÃmÃÃrÃ"
+
+#~ msgid "Conversations"
+#~ msgstr "Keskustelut"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "Aikaisemmat keskustelut"
+
+#~ msgid "_For:"
+#~ msgstr "_Ajalta:"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "NÃytÃ ja muokkaa tilejÃ"
 
-#~ msgid "Failed to join chat room"
-#~ msgstr "Keskusteluhuoneeseen liittyminen epÃonnistui"
+#~ msgid "The hash of the received file and the sent one do not match"
+#~ msgstr "Vastaanotetun ja lÃhetetyn tiedoston tiiviste ei tÃsmÃÃ"
 
-#~ msgid "_Character set:"
-#~ msgstr "_Merkkikartta:"
+#~ msgid "Enter Custom Message"
+#~ msgstr "SyÃtÃ itse mÃÃritelty viesti"
+
+#~ msgid "Add _New Preset"
+#~ msgstr "LisÃÃ _uusi esitieto"
+
+#~ msgid "Saved Presets"
+#~ msgstr "Tallennetut esitiedot"
 
 #~ msgid ""
-#~ "<b>%s</b>\n"
-#~ "Invite required: %s\n"
-#~ "Password required: %s\n"
-#~ "Members: %s"
-#~ msgstr ""
-#~ "<b>%s</b>\n"
-#~ "Kutsu vaaditaan: %s\n"
-#~ "Salasana vaaditaan: %s\n"
-#~ "JÃsenet: %s"
+#~ "Whether Empathy has asked about importing accounts from other programs."
+#~ msgstr "Onko Empathy tiedustellut tilien tuomisesta."
 
-#~ msgid "_E-mail address:"
-#~ msgstr "_SÃhkÃpostiosoite:"
+#~ msgid "Show incoming messages in the messaging menu"
+#~ msgstr "NÃytÃ saapuvat viestit viestivalikossa"
 
-#~ msgid "File transfer completed, but the file was corrupted"
-#~ msgstr "Tiedostonsiirto valmistui, mutta tiedosto oli viallinen"
+#~ msgid "Match case"
+#~ msgstr "Huomioi kirjainkoko"
 
-#~ msgid "Google Talk"
-#~ msgstr "Google Talk"
+#~ msgid "_Addâ"
+#~ msgstr "_LisÃÃâ"
 
-#~ msgid "The account %s is edited via My Web Accounts."
-#~ msgstr "TiliÃ %s muokataan Web-tilien kautta."
+#~ msgid "Find Next"
+#~ msgstr "Etsi seuraava"
 
-#~ msgid "The account %s cannot be edited in Empathy."
-#~ msgstr "KÃyttÃjÃtiliÃ %s ei voi muokata EmpathyssÃ."
+#~ msgid "Find Previous"
+#~ msgstr "Etsi edellinen"
 
-#~ msgid "Launch My Web Accounts"
-#~ msgstr "KÃynnistÃ Web-tilit"
+#~ msgid "The certificate has expired"
+#~ msgstr "Varmenne on vanhentunut"
 
-#~ msgid "Add '%s' to Dictionary"
-#~ msgstr "LisÃÃ â%sâ sanakirjaan"
+#~ msgid ""
+#~ "The certificate has been revoked by the issuing Certification Authority"
+#~ msgstr "Varmenne on peruutettu varmenteen myÃntÃjÃn toimesta"
 
-#~ msgid "Add '%s' to %s Dictionary"
-#~ msgstr "LisÃÃ â%sâ kielen %s sanakirjaan"
+#~ msgid "The certificate hasn't yet been activated"
+#~ msgstr "Varmennetta ei ole vielÃ aktivoitu"
 
-#~ msgctxt "verb displayed on a button to select an IRC network"
-#~ msgid "Select"
-#~ msgstr "Valitse"
+#~ msgid "The certificate is self-signed"
+#~ msgstr "Varmenne on itsetehty"
 
-#~ msgid "Save _New Status Message"
-#~ msgstr "Tallenna _uusi tilaviesti"
+#~ msgid "The certificate is malformed"
+#~ msgstr "Varmenne on muodostettu vÃÃrin"
 
-#~ msgid "Saved Status Messages"
-#~ msgstr "Tallennetut tilaviestit"
+#~ msgid "The identity provided by the chat server cannot be verified.\n"
+#~ msgstr "Keskustelupalvelimen antamaa tunnistetta ei voida varmistaa.\n"
 
-#~ msgid "Error contacting the Account Manager"
-#~ msgstr "Virhe yhdistettÃessÃ tilienhallintaan"
+#~ msgid "The certificate is cryptographically weak"
+#~ msgstr "Varmenteen salausmenetelmÃ on heikko"
 
 #~ msgid ""
-#~ "There was an error while trying to connect to the Telepathy Account "
-#~ "Manager. The error was:\n"
-#~ "\n"
-#~ "%s"
+#~ "The hostname verified by the certificate doesn't match the server name"
 #~ msgstr ""
-#~ "YhdistettÃessÃ Empathyn tilienhallintaan tapahtui virhe:\n"
-#~ "\n"
-#~ "%s"
+#~ "Varmenteessa ilmoitettu isÃntÃnimi ei tÃsmÃÃ palvelimen nimen kanssa"
+
+#~ msgid "The certificate length exceeds verifiable limits"
+#~ msgstr "Varmenteen pituus ylittÃÃ sallitut rajat"
+
+#~ msgid "_Enabled"
+#~ msgstr "_KÃytÃssÃ"
+
+#~ msgid "Meta-contact containing %u contact"
+#~ msgid_plural "Meta-contact containing %u contacts"
+#~ msgstr[0] "Metayhteystieto, joka sisÃltÃÃ %u yhteystiedon"
+#~ msgstr[1] "Metayhteystieto, joka sisÃltÃÃ %u yhteystietoa"
+
+#~ msgid ""
+#~ "Completely split the displayed meta-contact into the contacts it contains."
+#~ msgstr "Jaa nÃytettÃvÃ metayhteystieto sen sisÃltÃmiin yhteystietoihin."
+
+#~ msgid "Unlink meta-contact '%s'?"
+#~ msgstr "Poistetaanko metayhteystiedon â%sâ linkitys?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink this meta-contact? This will completely "
+#~ "split the meta-contact into the contacts it contains."
+#~ msgstr ""
+#~ "Haluatko varmasti poistaa tÃmÃn metayhteystiedon linkityksen? "
+#~ "Metayhteystieto jaetaan sen sisÃltÃmiin yhteystietoihin."
+
+#~ msgid "The certificate is not signed by a Certification Authority"
+#~ msgstr "Varmennetta ei ole virallisesti allekirjoitettu"
+
+#~ msgid "The certificate does not have the expected fingerprint"
+#~ msgstr "Varmenteessa ei ole odotettua sormenjÃlkeÃ"
+
+#~ msgid "Don't display any dialogs if there are any non-Salut accounts"
+#~ msgstr ""
+#~ "ÃlÃ nÃytÃ mitÃÃn valintaikkunoita, paitsi jos kÃytÃssÃ on vain âLÃhellÃ "
+#~ "olevat ihmisetâ -tilejÃ"
+
+#~ msgid "Are you sure you want to remove '%s' from your contacts?"
+#~ msgstr "Haluatko varmasti poistaa kohteen '%s' yhteystiedoistasi?"
+
+#~ msgid "Your software is too old"
+#~ msgstr "Sovelluksesi on liian vanha"
+
+#~ msgid "Update software..."
+#~ msgstr "PÃivitÃ sovellus..."
 
-#~ msgid "%s would like permission to see when you are available"
-#~ msgstr "%s haluaisi oikeuden nÃhdÃ, milloin olet tavoitettavissa"
+#~ msgid "Unavailable"
+#~ msgstr "Ei kÃytettÃvissÃ"
 
-#~ msgid "Find in Contact _List"
-#~ msgstr "Etsi _tuttavaluettelosta"
+#~ msgid "Off"
+#~ msgstr "Kiinni"
 
-#~ msgid "- Empathy Chat Client"
-#~ msgstr "- Empathy-keskusteluasiakas"
+#~ msgid "On"
+#~ msgstr "PÃÃllÃ"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]