=?utf-8?q?=5Bempathy=5D_Finnish_translation_update_by_Jiri_Gr=C3=B6nroos?=

From: Ville-Pekka Vainio <vpv src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy] Finnish translation update by Jiri GrÃnroos
Date: Wed, 12 Sep 2012 19:28:30 +0000 (UTC)
commit 5845fcbe57199c9995130384f657148a7d818028
Author: Ville-Pekka Vainio <vpvainio iki fi>
Date:   Wed Sep 12 22:28:26 2012 +0300

    Finnish translation update by Jiri GrÃnroos

 po/fi.po | 3786 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 1904 insertions(+), 1882 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 34dc973..401d6b5 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -17,9 +17,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 10:51+0200\n"
-"PO-Revision-Date: 2012-03-22 14:05+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-09-05 07:14+0000\n"
+"PO-Revision-Date: 2012-09-09 17:21+0300\n"
 "Last-Translator: Jiri GrÃnroos <jiri gronroos iki fi>\n"
 "Language-Team: Finnish <>\n"
 "Language: fi\n"
@@ -28,7 +29,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-POT-Import-Date: 2012-03-05 15:05:34+0000\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Lokalize 1.5\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Empathy"
@@ -36,7 +37,7 @@ msgstr "Empathy"
 
 #: ../data/empathy.desktop.in.in.h:2
 msgid "IM Client"
-msgstr "pikaviestin"
+msgstr "Pikaviestin"
 
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
@@ -48,21 +49,11 @@ msgstr ""
 "Keskustele kÃyttÃen Google Talkia, Facebookia, MSN:ÃÃ ja monia muita "
 "palveluja"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:1
-#: ../src/empathy-accounts-dialog.c:2513
-msgid "Messaging and VoIP Accounts"
-msgstr "ViestintÃ ja VoIP-kÃyttÃjÃtilit"
-
-#: ../data/empathy-accounts.desktop.in.in.h:2
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Hallitse viestimiÃ ja Internet-puheluiden (VoIP) kÃyttÃjÃtilejÃ"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
+#: ../data/org.gnome.Empathy.gschema.xml.h:1
 msgid "Connection managers should be used"
 msgstr "Yhteyden hallintaohjelmia tulisi kÃyttÃÃ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.h:2
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -70,119 +61,93 @@ msgstr ""
 "KÃyttÃÃkÃ Empathy yhteyksienhallintaa verkkoyhteyksien automaattiseen "
 "luomiseen ja katkaisuun."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.h:3
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy yrittÃÃ yhdistÃÃ automaattisesti kÃynnistettÃessÃ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.h:4
 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:5
+#: ../data/org.gnome.Empathy.gschema.xml.h:5
 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:6
+#: ../data/org.gnome.Empathy.gschema.xml.h:6
 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:7
+#: ../data/org.gnome.Empathy.gschema.xml.h:7
 msgid "Empathy default download folder"
-msgstr "Empathyn noutojen oletuskansio"
+msgstr "Empathyn latausten oletuskansio"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.h:8
 msgid "The default folder to save file transfers in."
 msgstr "Oletuskansio, johon siirretyt tiedostot tallennetaan."
 
 #. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once.
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.h:10
 msgid "Magic number used to check if sanity cleaning tasks should be run"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.h:11
 msgid ""
 "empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
 "should be executed or not. Users should not change this key manually."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.h:12
+#: ../src/empathy-preferences.ui.h:1
 msgid "Show offline contacts"
 msgstr "NÃytÃ linjoilta poissa olevat tuttavat"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.h:13
 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:14
-msgid "Show avatars"
-msgstr "NÃytÃ avatar-kuvat"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-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:16
-msgid "Show protocols"
-msgstr "NÃytÃ protokollat"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-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:18
+#: ../data/org.gnome.Empathy.gschema.xml.h:14
 msgid "Show Balance in contact list"
-msgstr "NÃytÃ saldo yhteystietoluettelossa"
+msgstr "NÃytÃ saldo tuttavaluettelossa"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.h:15
 msgid "Whether to show account balances in the contact list."
-msgstr "Haluatko nÃyttÃÃ tilien saldot yhteystietoluettelossa."
+msgstr "Haluatko nÃyttÃÃ tilien saldot tuttavaluettelossa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Compact contact list"
-msgstr "Pienikokoinen tuttavaluettelo"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-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:22
+#: ../data/org.gnome.Empathy.gschema.xml.h:16
 msgid "Hide main window"
 msgstr "Piilota pÃÃikkuna"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.h:17
 msgid "Hide the main window."
 msgstr "Piilota pÃÃikkuna."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.h:18
 msgid "Default directory to select an avatar image from"
 msgstr "Oletushakemisto, josta avatar-kuvat haetaan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.h:19
 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:26
+#: ../data/org.gnome.Empathy.gschema.xml.h:20
 msgid "Open new chats in separate windows"
 msgstr "Avaa uusi ikkuna uusille keskusteluille"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.h:21
 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:28
+#: ../data/org.gnome.Empathy.gschema.xml.h:22
 msgid "Display incoming events in the status area"
 msgstr "NÃytÃ ajankohtaiset tapahtumat tilarivillÃ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.h:23
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -190,132 +155,116 @@ 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:30
+#: ../data/org.gnome.Empathy.gschema.xml.h:24
 msgid "The position for the chat window side pane"
 msgstr "Keskusteluikkunan sivupaneelin sijainti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.h:25
 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:32
+#: ../data/org.gnome.Empathy.gschema.xml.h:26
 msgid "Show contact groups"
 msgstr "NÃytÃ yhteyshenkilÃryhmÃt"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.h:27
 msgid "Whether to show groups in the contact list."
-msgstr "NÃytetÃÃnkÃ tuttavien yhteyskÃytÃnnÃt tuttavaluettelossa."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Contact list sort criterion"
-msgstr "Tuttavaluettelon lajitteluperuste"
+msgstr "NÃytetÃÃnkÃ ryhmÃt tuttavaluettelossa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-#, fuzzy
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's state with the value \"state\". A value of \"name\" will sort "
-"the contact list by name."
-msgstr ""
-"Kuinka tuttavaluettelo jÃrjestetÃÃn. Oletusarvolla \"name\" "
-"jÃrjestelyperusteena on tuttavan nimi. Arvolla \"state\" luettelo "
-"jÃrjestetÃÃn tuttavien tilan perusteella."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.h:28
 msgid "Use notification sounds"
 msgstr "KÃytÃ merkkiÃÃniÃ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.h:29
 msgid "Whether to play a sound to notify of events."
 msgstr "Ilmoitetaanko tapahtumista merkkiÃÃnin."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.h:30
 msgid "Disable sounds when away"
 msgstr "ÃlÃ soita ÃÃniÃ poissaollessa"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.h:31
 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:40
+#: ../data/org.gnome.Empathy.gschema.xml.h:32
 msgid "Play a sound for incoming messages"
 msgstr "Soita merkkiÃÃni saapuville viesteille"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.h:33
 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:42
+#: ../data/org.gnome.Empathy.gschema.xml.h:34
 msgid "Play a sound for outgoing messages"
 msgstr "Soita merkkiÃÃni lÃhetettÃville viesteille"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.h:35
 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:44
+#: ../data/org.gnome.Empathy.gschema.xml.h:36
 msgid "Play a sound for new conversations"
 msgstr "Soita merkkiÃÃni uusista keskusteluista"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.h:37
 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:46
+#: ../data/org.gnome.Empathy.gschema.xml.h:38
 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:47
+#: ../data/org.gnome.Empathy.gschema.xml.h:39
 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:48
+#: ../data/org.gnome.Empathy.gschema.xml.h:40
 msgid "Play a sound when a contact logs out"
 msgstr "Soita merkkiÃÃni tuttavan kirjautuessa ulos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.h:41
 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:50
+#: ../data/org.gnome.Empathy.gschema.xml.h:42
 msgid "Play a sound when we log in"
 msgstr "Soita merkkiÃÃni kirjauduttaessa sisÃÃn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.h:43
 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:52
+#: ../data/org.gnome.Empathy.gschema.xml.h:44
 msgid "Play a sound when we log out"
 msgstr "Soita merkkiÃÃni kirjauduttaessa ulos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.h:45
 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:54
+#: ../data/org.gnome.Empathy.gschema.xml.h:46
 msgid "Enable popup notifications for new messages"
 msgstr "NÃytÃ ponnahdusikkuna uusille viesteille"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.h:47
 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:56
+#: ../data/org.gnome.Empathy.gschema.xml.h:48
 msgid "Disable popup notifications when away"
 msgstr "ÃlÃ nÃytÃ ponnahdusikkunoita poissaollessa"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.h:49
 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:58
+#: ../data/org.gnome.Empathy.gschema.xml.h:50
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Ponnahdusilmoitus kohdistamattomasta keskustelusta"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.h:51
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -323,116 +272,121 @@ msgstr ""
 "NÃytetÃÃnkÃ avatussa, kohdistamattomassa keskustelussa saapuneesta uudesta "
 "viestistÃ ponnahdusilmoitus."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.h:52
 msgid "Pop up notifications when a contact logs in"
 msgstr "Ponnahdusilmoitus tuttavan kirjautuessa sisÃÃn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.h:53
 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:62
+#: ../data/org.gnome.Empathy.gschema.xml.h:54
 msgid "Pop up notifications when a contact logs out"
 msgstr "Ponnahdusilmoitus tuttavan kirjautuessa ulos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.h:55
 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:64
+#: ../data/org.gnome.Empathy.gschema.xml.h:56
 msgid "Use graphical smileys"
 msgstr "KÃytÃ hymiÃkuvakkeita"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.h:57
 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:66
+#: ../data/org.gnome.Empathy.gschema.xml.h:58
 msgid "Show contact list in rooms"
 msgstr "NÃytÃ tuttavaluettelo huoneissa"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.h:59
 msgid "Whether to show the contact list in chat rooms."
 msgstr "NÃytetÃÃnkÃ tuttavaluettelo keskusteluhuoneissa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.h:60
 msgid "Chat window theme"
 msgstr "Keskusteluikkunan teema"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.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:70
+#: ../data/org.gnome.Empathy.gschema.xml.h:62
 msgid "Chat window theme variant"
 msgstr "Keskusteluikkunan teemamuunnos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.h:63
 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:72
+#: ../data/org.gnome.Empathy.gschema.xml.h:64
 msgid "Path of the Adium theme to use"
 msgstr "KÃytettÃvÃn Adium-teeman sijainti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-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.h:65
+#| msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgid ""
+"Path of the Adium theme to use if the theme used for chat is Adium. "
+"Deprecated."
+msgstr ""
+"Adium-teeman sijainti Adiumia keskustelun teemana kÃytettÃessÃ. "
+"Vanhennettu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.h:66
 msgid "Enable WebKit Developer Tools"
 msgstr "KÃytÃ WebKit-kehittÃjÃn tyÃkaluja"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.h:67
 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:76
+#: ../data/org.gnome.Empathy.gschema.xml.h:68
 msgid "Inform other users when you are typing to them"
 msgstr "Salli muiden kÃyttÃjien nÃhdÃ, ettÃ kirjoitat viestiÃ heille"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.h:69
 msgid ""
 "Whether to send the 'composing' or 'paused' chat states. Does not currently "
 "affect the 'gone' state."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.h:70
 msgid "Use theme for chat rooms"
 msgstr "KÃytÃ teemaa keskusteluhuoneille"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.h:71
 msgid "Whether to use the theme for chat rooms."
 msgstr "KÃytetÃÃnkÃ teemaa keskusteluhuoneissa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.h:72
 msgid "Spell checking languages"
 msgstr "Kielentarkastuksessa kÃytetyt kielet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.h:73
 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:82
+#: ../data/org.gnome.Empathy.gschema.xml.h:74
 msgid "Enable spell checker"
 msgstr "KÃytÃ oikeinkirjoituksen tarkistusta"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.h:75
 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:84
+#: ../data/org.gnome.Empathy.gschema.xml.h:76
 msgid "Nick completed character"
 msgstr "Lempinimen tÃydennysmerkki"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.h:77
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -440,291 +394,351 @@ 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:86
+#: ../data/org.gnome.Empathy.gschema.xml.h:78
 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:87
+#: ../data/org.gnome.Empathy.gschema.xml.h:79
 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:88
+#: ../data/org.gnome.Empathy.gschema.xml.h:80
 msgid "Last account selected in Join Room dialog"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.h:81
 msgid "D-Bus object path of the last account selected to join a room."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.h:82
 msgid "Camera device"
 msgstr "Kamera"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.h:83
 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:92
+#: ../data/org.gnome.Empathy.gschema.xml.h:84
 msgid "Camera position"
 msgstr "Kameran sijainti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.h:85
 msgid "Position the camera preview should be during a call."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.h:86
 msgid "Echo cancellation support"
 msgstr "Kaiun poiston tuki"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.h:87
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "KÃytetÃÃnkÃ Pulseaudion suodatinta kaiun poistamiseksi."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.h:88
 msgid "Show hint about closing the main window"
 msgstr "NÃytÃ vihje pÃÃikkunan sulkemisesta"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.h:89
 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:98
+#: ../data/org.gnome.Empathy.gschema.xml.h:90
 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:99
+#: ../data/org.gnome.Empathy.gschema.xml.h:91
 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:100
+#: ../data/org.gnome.Empathy.gschema.xml.h:92
 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:101
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
 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:102
+#: ../data/org.gnome.Empathy.gschema.xml.h:94
 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:103
+#: ../data/org.gnome.Empathy.gschema.xml.h:95
 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:104
+#: ../data/org.gnome.Empathy.gschema.xml.h:96
 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:105
+#: ../data/org.gnome.Empathy.gschema.xml.h:97
 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:106
+#: ../data/org.gnome.Empathy.gschema.xml.h:98
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathyn pitÃÃ heikentÃÃ sijainnin tarkkuutta"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:107
+#: ../data/org.gnome.Empathy.gschema.xml.h:99
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Alentaako Empathy sijaintitiedon tarkkuutta yksityisyyden suojaamiseksi."
 
-#: ../libempathy/empathy-ft-handler.c:738
+#: ../libempathy/empathy-ft-handler.c:737
 msgid "No reason was specified"
 msgstr "SyytÃ ei annettu"
 
-#: ../libempathy/empathy-ft-handler.c:741
+#: ../libempathy/empathy-ft-handler.c:740
 msgid "The change in state was requested"
 msgstr "Pyydettiin tilan muutosta"
 
-#: ../libempathy/empathy-ft-handler.c:744
+#: ../libempathy/empathy-ft-handler.c:743
 msgid "You canceled the file transfer"
 msgstr "Keskeytit tiedostonsiirron"
 
-#: ../libempathy/empathy-ft-handler.c:747
+#: ../libempathy/empathy-ft-handler.c:746
 msgid "The other participant canceled the file transfer"
 msgstr "Toinen osapuoli katkaisi tiedostonsiirron"
 
-#: ../libempathy/empathy-ft-handler.c:750
+#: ../libempathy/empathy-ft-handler.c:749
 msgid "Error while trying to transfer the file"
 msgstr "Virhe yritettÃessÃ siirtÃÃ tiedostoa"
 
-#: ../libempathy/empathy-ft-handler.c:753
+#: ../libempathy/empathy-ft-handler.c:752
 msgid "The other participant is unable to transfer the file"
 msgstr "Toinen osapuoli ei voi siirtÃÃ tiedostoa"
 
-#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-ft-handler.c:755 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "Tuntematon syy"
 
-#: ../libempathy/empathy-ft-handler.c:919
+#: ../libempathy/empathy-ft-handler.c:918
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Tiedostonsiirto valmistui, mutta tiedosto oli viallinen"
 
-#: ../libempathy/empathy-ft-handler.c:1205
+#: ../libempathy/empathy-ft-handler.c:1204
 msgid "File transfer not supported by remote contact"
 msgstr "EtÃyhteys ei tue tiedostonsiirtoa"
 
-#: ../libempathy/empathy-ft-handler.c:1261
+#: ../libempathy/empathy-ft-handler.c:1260
 msgid "The selected file is not a regular file"
 msgstr "Valittu tiedosto ei ole tavanomainen tiedosto"
 
-#: ../libempathy/empathy-ft-handler.c:1270
+#: ../libempathy/empathy-ft-handler.c:1269
 msgid "The selected file is empty"
 msgstr "Valittu tiedosto on tyhjÃ"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
+#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
+msgid "Password not found"
+msgstr "Salasanaa ei lÃydy"
+
+#: ../libempathy/empathy-keyring.c:594
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "Pikaviestintilin %s salasana (%s)"
+
+#: ../libempathy/empathy-keyring.c:631
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr ""
+
+#: ../libempathy/empathy-message.c:407 ../src/empathy-call-observer.c:116
 #, 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
+#: ../libempathy/empathy-message.c:411
 #, c-format
 msgid "Called %s"
 msgstr "Soitettiin kÃytÃjÃlle %s"
 
-#: ../libempathy/empathy-message.c:422
+#: ../libempathy/empathy-message.c:414
 #, c-format
 msgid "Call from %s"
 msgstr "Puhelu kÃyttÃjÃltÃ %s"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-time.c:90
+#, 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:96
+#, 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:102
+#, 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:108
+#, 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:114
+#, 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:120
+#, 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:142
+msgid "in the future"
+msgstr "tulevaisuudessa"
+
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "Tavoitettavissa"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "Poissa"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "NÃkymÃtÃn"
 
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../libempathy/empathy-utils.c:285
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "ErittelemÃtÃn syy"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "Tila on nyt âPoissa linjoiltaâ"
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
 #: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:81
+#: ../libempathy-gtk/empathy-new-message-dialog.c:80
 msgid "Network error"
 msgstr "Verkkovirhe"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
-msgstr "Todennus epÃonnistui"
+msgstr "Tunnistautuminen epÃonnistui"
 
-#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "Salausvirhe"
 
-#: ../libempathy/empathy-utils.c:295
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "Nimi on kÃytÃssÃ"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "Varmennetta ei ole annettu"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "Varmenne ei ole luotettu"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "Varmenne on vanhentunut"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "Varmenne ei ole vielÃ aktivoitu"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "Varmenteen verkkonimi ei tÃsmÃÃ"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "Varmenteen sormenjÃlki ei tÃsmÃÃ"
 
-#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "Itseallekirjoitettu varmenne"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "Varmennevirhe"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "Salausta ei ole kÃytettÃvissÃ"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "Varmenne ei ole kelvollinen"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "Yhteys hylÃttiin"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "YhteyttÃ ei voi muodostaa"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "Yhteys katkesi"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:354
 msgid "This account is already connected to the server"
 msgstr "TÃmÃ tili on jo yhteydessÃ palvelimeen"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:356
 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:360
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "Tili on jo olemassa palvelimella"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:361
 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:364
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "Varmenne on kumottu"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Varmenne kÃyttÃÃ heikkoa salausmenetelmÃÃ"
 
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -732,174 +746,48 @@ msgstr ""
 "Palvelinsertifikaatin pituus tai palvelinsertifikaattiketjun pituus ovat "
 "suurempia kuin salauskirjasto sallii"
 
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:372
 msgid "Your software is too old"
 msgstr "Sovelluksesi on liian vanha"
 
-#: ../libempathy/empathy-utils.c:375
+#: ../libempathy/empathy-utils.c:374
 msgid "Internal error"
 msgstr "SisÃinen virhe"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:503
 msgid "People Nearby"
 msgstr "LÃhellÃ olevat ihmiset"
 
-#: ../libempathy/empathy-utils.c:539
+#: ../libempathy/empathy-utils.c:508
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:568
+#: ../libempathy/empathy-utils.c:537
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:569
+#: ../libempathy/empathy-utils.c:538
 msgid "Facebook Chat"
 msgstr "Facebook-keskustelu"
 
-#: ../libempathy/empathy-time.c:90
-#, 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:96
-#, 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:102
-#, 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:108
-#, 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:114
-#, 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:120
-#, 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:142
-msgid "in the future"
-msgstr "tulevaisuudessa"
-
-#: ../libempathy/empathy-keyring.c:75
-msgid "Password not found"
-msgstr "Salasanaa ei lÃydy"
-
-#: ../libempathy/empathy-keyring.c:218
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr ""
-
-#: ../libempathy/empathy-keyring.c:253
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr ""
-
 #: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Kaikki tilit"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:336
-msgid "Account"
-msgstr "KÃyttÃjÃtili"
-
-#: ../libempathy-gtk/empathy-account-widget.c:683
-msgid "Password"
-msgstr "Salasana"
-
-#: ../libempathy-gtk/empathy-account-widget.c:684
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "Palvelin"
-
-#: ../libempathy-gtk/empathy-account-widget.c:685
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
-msgid "Port"
-msgstr "Portti"
-
-#: ../libempathy-gtk/empathy-account-widget.c:765
-#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
-msgid "%s:"
-msgstr "%s:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1398
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16
-msgid "Username:"
-msgstr "KÃyttÃjÃnimi:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1710
-msgid "A_pply"
-msgstr "_Toteuta"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1739
-msgid "L_og in"
-msgstr "_Kirjaudu sisÃÃn"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1812
-msgid "This account already exists on the server"
-msgstr "TÃmÃ tili on jo olemassa palvelimella"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1816
-msgid "Create a new account on the server"
-msgstr "Luo uusi tili palvelimelle"
-
-#. To translators: The first parameter is the login id and the
-#. * second one is the network. The resulting string will be something
-#. * 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:2241
-#, 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:2267
-#, c-format
-msgid "%s Account"
-msgstr "%s-tili"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2271
-msgid "New account"
-msgstr "Uusi tili"
-
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
-msgstr "S_alasana:"
+#| msgid "Pass_word:"
+msgid "Pass_word"
+msgstr "S_alasana"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-msgid "Screen _Name:"
-msgstr "NÃyttÃ_nimi:"
+#| msgid "Screen _Name:"
+msgid "Screen _Name"
+msgstr "NÃyttÃ_nimi"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 msgid "<b>Example:</b> MyScreenName"
@@ -920,30 +808,30 @@ msgstr "Muista salasana"
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../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:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-msgstr "_Portti:"
+#| msgid "_Port:"
+msgid "_Port"
+msgstr "_Portti"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../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:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
-msgid "_Server:"
-msgstr "Pal_velin:"
+#| msgid "_Server:"
+msgid "_Server"
+msgstr "Pal_velin"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Advanced"
 msgstr "LisÃasetukset"
@@ -961,101 +849,141 @@ msgstr "MikÃ on AIM-salasanasi?"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
 msgid "Remember Password"
 msgstr "Muista salasana"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-msgid "Login I_D:"
-msgstr "_KÃyttÃjÃtunnus:"
+#: ../libempathy-gtk/empathy-account-widget.c:678
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:323
+msgid "Account"
+msgstr "KÃyttÃjÃtili"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
-msgid "<b>Example:</b> username"
-msgstr "<b>Esimerkki:</b> kÃyttÃjÃnimi"
+#: ../libempathy-gtk/empathy-account-widget.c:679
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
+msgid "Password"
+msgstr "Salasana"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-msgid "What is your GroupWise User ID?"
-msgstr "MikÃ on GroupWise-kÃyttÃjÃtunnuksesi?"
+#: ../libempathy-gtk/empathy-account-widget.c:680
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
+msgid "Server"
+msgstr "Palvelin"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-msgid "What is your GroupWise password?"
-msgstr "MikÃ on GroupWise-salasanasi?"
+#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+msgid "Port"
+msgstr "Portti"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#, c-format
+msgid "%s"
+msgstr "%s"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-msgid "<b>Example:</b> 123456789"
-msgstr "<b>Esimerkki:</b> 123456789"
+#: ../libempathy-gtk/empathy-account-widget.c:820
+#, c-format
+msgid "%s:"
+msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
-msgstr "_Merkkikartta:"
+#: ../libempathy-gtk/empathy-account-widget.c:1432
+msgid "Username:"
+msgstr "KÃyttÃjÃnimi:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-msgid "What is your ICQ UIN?"
-msgstr "MikÃ on ICQ UIN -tunnuksesi?"
+#: ../libempathy-gtk/empathy-account-widget.c:1749
+msgid "A_pply"
+msgstr "_Toteuta"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-msgid "What is your ICQ password?"
-msgstr "MikÃ on ICQ-salasanasi?"
+#: ../libempathy-gtk/empathy-account-widget.c:1778
+msgid "L_og in"
+msgstr "_Kirjaudu sisÃÃn"
 
-#: ../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.c:1848
+msgid "This account already exists on the server"
+msgstr "TÃmÃ tili on jo olemassa palvelimella"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:209
-msgid "UDP"
-msgstr "UDP"
+#: ../libempathy-gtk/empathy-account-widget.c:1852
+msgid "Create a new account on the server"
+msgstr "Luo uusi tili palvelimelle"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:212
-msgid "TCP"
-msgstr "TCP"
+#. To translators: The first parameter is the login id and the
+#. * second one is the network. The resulting string will be something
+#. * 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:2263
+#, c-format
+msgid "%1$s on %2$s"
+msgstr "%s palvelimella %s"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:215
-msgid "TLS"
-msgstr "TLS"
+#. To translators: The parameter is the protocol name. The resulting
+#. * string will be something like: "Jabber Account"
+#: ../libempathy-gtk/empathy-account-widget.c:2289
+#, c-format
+msgid "%s Account"
+msgstr "%s-tili"
 
-#. translators: this string is very specific to SIP's internal; maybe
-#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:244
-msgid "Register"
-msgstr "RekisterÃi"
+#: ../libempathy-gtk/empathy-account-widget.c:2293
+msgid "New account"
+msgstr "Uusi tili"
 
-#. translators: this string is very specific to SIP's internal; maybe
-#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:249
-msgid "Options"
-msgstr "Valinnat"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#| msgid "Login I_D:"
+msgid "Login I_D"
+msgstr "_KÃyttÃjÃtunnus"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:252
-msgid "None"
-msgstr "Ei mitÃÃn"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Esimerkki:</b> kÃyttÃjÃnimi"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+msgid "What is your GroupWise User ID?"
+msgstr "MikÃ on GroupWise-kÃyttÃjÃtunnuksesi?"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+msgid "What is your GroupWise password?"
+msgstr "MikÃ on GroupWise-salasanasi?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#| msgid "ICQ _UIN:"
+msgid "ICQ _UIN"
+msgstr "ICQ _UIN"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>Esimerkki:</b> 123456789"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#| msgid "Ch_aracter set:"
+msgid "Ch_aracter set"
+msgstr "_MerkistÃkoodaus"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+msgid "What is your ICQ UIN?"
+msgstr "MikÃ on ICQ UIN -tunnuksesi?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+msgid "What is your ICQ password?"
+msgstr "MikÃ on ICQ-salasanasi?"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Network"
 msgstr "Verkko"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Network:"
-msgstr "Verkko:"
+#| msgid "Character set:"
+msgid "Character set"
+msgstr "MerkistÃkoodaus"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid "Character set:"
-msgstr "Merkkikartta:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 #: ../src/empathy-accounts-dialog.ui.h:1
 msgid "Addâ"
 msgstr "LisÃÃ..."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
 #: ../src/empathy-accounts-dialog.ui.h:2
@@ -1064,20 +992,20 @@ msgid "Remove"
 msgstr "Poista"
 
 #. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Up"
 msgstr "YlÃs"
 
 #. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Down"
 msgstr "Alas"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Servers"
 msgstr "Palvelimet"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1085,27 +1013,31 @@ 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:12
-msgid "Nickname:"
-msgstr "Nimimerkki:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#| msgid "Nickname:"
+msgid "Nickname"
+msgstr "Nimimerkki"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Password:"
-msgstr "Salasana:"
+#| msgid "Quit message:"
+msgid "Quit message"
+msgstr "Lopetusviesti"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Quit message:"
-msgstr "Lopetusviesti:"
+#| msgid "Real name:"
+msgid "Real name"
+msgstr "Oikea nimi"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-msgid "Real name:"
-msgstr "Oikea nimi:"
+#| msgid "Username:"
+msgid "Username"
+msgstr "KÃyttÃjÃnimi"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
 msgid "Which IRC network?"
 msgstr "MikÃ IRC-verkko?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
 msgid "What is your IRC nickname?"
 msgstr "MikÃ on IRC-nimimerkkisi?"
 
@@ -1153,25 +1085,27 @@ msgid "I_gnore SSL certificate errors"
 msgstr "_ÃlÃ huomioi SSL-varmenteiden virheitÃ"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
-msgid "Priori_ty:"
-msgstr "_Prioriteetti:"
+#| msgid "Priori_ty:"
+msgid "Priori_ty"
+msgstr "_Prioriteetti"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Reso_urce:"
-msgstr "Res_urssi:"
+#| msgid "Reso_urce:"
+msgid "Reso_urce"
+msgstr "Res_urssi"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "Encr_yption required (TLS/SSL)"
 msgstr "Salaus vaa_ditaan (TLS/SSL)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "Use old SS_L"
-msgstr "KÃytÃ vanhaa SS_L-porttia"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "Override server settings"
 msgstr "Ohita palvelimen asetukset"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Use old SS_L"
+msgstr "KÃytÃ vanhaa SS_L-porttia"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "MikÃ on Jabber-tunnuksesi?"
@@ -1188,6 +1122,36 @@ msgstr "MikÃ on Jabber-salasanasi?"
 msgid "What is your desired Jabber password?"
 msgstr "MikÃ on haluamasi Jabber-salasana?"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+#| msgid "Nic_kname:"
+msgid "Nic_kname"
+msgstr "Ni_mimerkki"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+#| msgid "_Last Name:"
+msgid "_Last Name"
+msgstr "_Sukunimi"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#| msgid "_First Name:"
+msgid "_First Name"
+msgstr "_Etunimi"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#| msgid "_Published Name:"
+msgid "_Published Name"
+msgstr "_Julkaistu nimi"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+#| msgid "_Jabber ID:"
+msgid "_Jabber ID"
+msgstr "_Jabber-tunniste"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
+#| msgid "E-_mail address:"
+msgid "E-_mail address"
+msgstr "SÃhkÃposti_osoite"
+
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user hotmail com"
 msgstr "<b>Esimerkki:</b> tunnus hotmail com"
@@ -1200,33 +1164,39 @@ msgstr "MikÃ on Windows Live -tunnuksesi?"
 msgid "What is your Windows Live password?"
 msgstr "MikÃ on Windows Live -salasanasi?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-msgid "Nic_kname:"
-msgstr "Ni_mimerkki:"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:207
+#: ../libempathy-gtk/empathy-account-widget-sip.c:240
+msgid "Auto"
+msgstr "Automaattinen"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Last Name:"
-msgstr "_Sukunimi:"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:210
+msgid "UDP"
+msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-msgid "_First Name:"
-msgstr "_Etunimi:"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:213
+msgid "TCP"
+msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_Published Name:"
-msgstr "_Julkaistu nimi:"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+msgid "TLS"
+msgstr "TLS"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
-msgid "_Jabber ID:"
-msgstr "_Jabber-tunniste:"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:245
+msgid "Register"
+msgstr "RekisterÃi"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "E-_mail address:"
-msgstr "SÃhkÃposti_osoite:"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:250
+msgid "Options"
+msgstr "Valinnat"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:253
+msgid "None"
+msgstr "Ei mitÃÃn"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username:"
-msgstr "_KÃyttÃjÃnimi:"
+#| msgid "_Username:"
+msgid "_Username"
+msgstr "_KÃyttÃjÃnimi"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user my sip server"
@@ -1249,8 +1219,9 @@ msgid "Miscellaneous Options"
 msgstr "Muut valinnat"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server:"
-msgstr "STUN-palvelin:"
+#| msgid "STUN Server:"
+msgid "STUN Server"
+msgstr "STUN-palvelin"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Discover the STUN server automatically"
@@ -1260,30 +1231,28 @@ msgstr "Havaitse STUN-palvelin automaattisesti"
 msgid "Discover Binding"
 msgstr "LÃydÃ Sidonta"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "Palvelin:"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 msgid "Keep-Alive Options"
 msgstr "KÃynnissÃ pitÃvÃt valinnat"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Mechanism:"
-msgstr "Mekanismi:"
+#| msgid "Mechanism:"
+msgid "Mechanism"
+msgstr "Mekanismi"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Interval (seconds)"
 msgstr "AikavÃli (sekunneissa)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Authentication username:"
-msgstr "Tunnistautumisen kÃyttÃjÃnimi:"
+#| msgid "Authentication username:"
+msgid "Authentication username"
+msgstr "Tunnistautumisen kÃyttÃjÃnimi"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-msgid "Transport:"
-msgstr "Siirto:"
+#| msgid "Transport:"
+msgid "Transport"
+msgstr "Siirto"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "Loose Routing"
@@ -1293,18 +1262,23 @@ msgstr "LÃyhÃ reititys"
 msgid "Ignore TLS Errors"
 msgstr "Sivuuta TLS-virheet"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Port:"
-msgstr "Portti:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#| msgid "E-mail address"
+msgid "Local IP Address"
+msgstr "Paikallinen IP-osoite"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../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:23
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "What is your SIP account password?"
 msgstr "MikÃ on SIP-tilisi salasana?"
 
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "S_alasana:"
+
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
 msgid "Yahoo! I_D:"
 msgstr "Yahoo!-_tunnus:"
@@ -1317,6 +1291,14 @@ msgstr "_ÃlÃ huomioi konferenssi- ja keskusteluhuonekutsuja"
 msgid "_Room List locale:"
 msgstr "_Huoneluettelon maa-asetusto:"
 
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+msgid "Ch_aracter set:"
+msgstr "_Merkkikartta:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Portti:"
+
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "MikÃ on Yahoo! -tunnuksesi?"
@@ -1325,37 +1307,37 @@ msgstr "MikÃ on Yahoo! -tunnuksesi?"
 msgid "What is your Yahoo! password?"
 msgstr "MikÃ on Yahoo! -salasanasi?"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
-#: ../libempathy-gtk/empathy-avatar-chooser.c:556
+#: ../libempathy-gtk/empathy-avatar-chooser.c:545
+#: ../libempathy-gtk/empathy-avatar-chooser.c:630
 msgid "Couldn't convert image"
 msgstr "Kuvaa ei voitu muuntaa"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:472
+#: ../libempathy-gtk/empathy-avatar-chooser.c:546
 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:819
+#: ../libempathy-gtk/empathy-avatar-chooser.c:906
 msgid "Couldn't save picture to file"
-msgstr ""
+msgstr "Kuvan tallennus tiedostoon epÃonnistui"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
 msgid "Select Your Avatar Image"
 msgstr "Valitse avatar-kuvasi"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
 msgid "Take a picture..."
 msgstr "Ota kuva..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:960
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
 msgid "No Image"
 msgstr "Ei kuvaa"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
 msgid "Images"
 msgstr "Kuvat"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
@@ -1363,6 +1345,34 @@ msgstr "Kaikki tiedostot"
 msgid "Click to enlarge"
 msgstr "Suurenna napsauttamalla"
 
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentication failed for account <b>%s</b>"
+msgstr "Tunnistautuminen tilille <b>%s</b> epÃonnistui"
+
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
+#: ../libempathy-gtk/empathy-chat.c:3725
+msgid "Retry"
+msgstr "YritÃ uudelleen"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"Anna salasana tilille\n"
+"<b>%s</b>"
+
+#: ../libempathy-gtk/empathy-calendar-button.c:66
+msgid "Select..."
+msgstr "Valitse..."
+
+#: ../libempathy-gtk/empathy-calendar-button.c:154
+msgid "_Select"
+msgstr "_Valitse"
+
 #: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
@@ -1370,15 +1380,15 @@ msgstr "Puhelun aloittamisessa tapahtui virhe"
 
 #: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
-msgstr "Valittu yhteystieto ei tue puheluja"
+msgstr "Valittu tuttava ei tue puheluja"
 
 #: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
-msgstr "Valittu yhteystieto on poissa linjoilta"
+msgstr "Valittu tuttava on poissa linjoilta"
 
 #: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
-msgstr "Valittu yhteystieto on virheellinen"
+msgstr "Valittu tuttava on virheellinen"
 
 #: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
@@ -1386,64 +1396,64 @@ msgstr "TÃmÃ protokolla ei tue hÃtÃpuheluita"
 
 #: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
-msgstr ""
+msgstr "Varasi eivÃt riitÃ tÃhÃn puheluun"
 
-#: ../libempathy-gtk/empathy-chat.c:729
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "Yksityiskeskustelun avaaminen epÃonnistui"
 
-#: ../libempathy-gtk/empathy-chat.c:787
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "Aihe ei ole tuettu tÃssÃ keskustelussa"
 
-#: ../libempathy-gtk/empathy-chat.c:793
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "Sinulla ei ole oikeutta muuttaa aihetta"
 
-#: ../libempathy-gtk/empathy-chat.c:992
-#, c-format
-msgid "â%sâ is not a valid contact ID"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:968
+#| msgid "invalid contact"
+msgid "Invalid contact ID"
+msgstr "Virheellinen tuttavatunniste"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1055
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: pyyhi kaikki nykyisen keskustelun viestit pois nÃkyvistÃ"
 
-#: ../libempathy-gtk/empathy-chat.c:1090
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <aihe>: aseta nykyisen keskustelun aihe"
 
-#: ../libempathy-gtk/empathy-chat.c:1093
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <kanavan nimi>: liity kanavalle"
 
-#: ../libempathy-gtk/empathy-chat.c:1096
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <kanavan nimi>: liity kanavalle"
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1068
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1104
+#: ../libempathy-gtk/empathy-chat.c:1072
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <tuttavan tunnus> [<viesti>]: avaa yksityiskeskustelu"
 
-#: ../libempathy-gtk/empathy-chat.c:1107
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <tuttavan tunnus> <viesti>: avaa yksityiskeskustelu"
 
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nimi>: vaihda nimeÃ nykyisellÃ palvelimella"
 
-#: ../libempathy-gtk/empathy-chat.c:1113
+#: ../libempathy-gtk/empathy-chat.c:1081
 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:1116
+#: ../libempathy-gtk/empathy-chat.c:1084
 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 "
@@ -1453,11 +1463,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:1121
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/whois <contact ID>: display information about a contact"
-msgstr ""
+msgstr "/whois <tuttavan tunnus>: nÃyttÃÃ tietoja kyseisestÃ kÃyttÃjÃstÃ"
 
-#: ../libempathy-gtk/empathy-chat.c:1124
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1465,126 +1475,126 @@ msgstr ""
 "/help [<komento>]: nÃyttÃÃ kaikki tuetut komennot. Jos <komento> on "
 "mÃÃritetty, nÃytÃ sen ohje."
 
-#: ../libempathy-gtk/empathy-chat.c:1143
+#: ../libempathy-gtk/empathy-chat.c:1111
 #, c-format
 msgid "Usage: %s"
 msgstr "KÃyttÃ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1156
 msgid "Unknown command"
 msgstr "Tuntematon komento"
 
-#: ../libempathy-gtk/empathy-chat.c:1314
+#: ../libempathy-gtk/empathy-chat.c:1282
 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:1565
+#: ../libempathy-gtk/empathy-chat.c:1539
 msgid "insufficient balance to send message"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
-#: ../libempathy-gtk/empathy-chat.c:1646
+#: ../libempathy-gtk/empathy-chat.c:1543 ../libempathy-gtk/empathy-chat.c:1557
+#: ../libempathy-gtk/empathy-chat.c:1620
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Virhe lÃhetettÃessÃ viestiÃ \"%s\": %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
-#: ../libempathy-gtk/empathy-chat.c:1650
+#: ../libempathy-gtk/empathy-chat.c:1545 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1624
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Virhe viestiÃ lÃhettÃessÃ: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1577
+#: ../libempathy-gtk/empathy-chat.c:1551
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1617
+#: ../libempathy-gtk/empathy-chat.c:1591
 msgid "not capable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1624
+#: ../libempathy-gtk/empathy-chat.c:1598
 msgid "offline"
 msgstr "poissa linjoilta"
 
-#: ../libempathy-gtk/empathy-chat.c:1627
+#: ../libempathy-gtk/empathy-chat.c:1601
 msgid "invalid contact"
 msgstr "virheellinen tuttava"
 
-#: ../libempathy-gtk/empathy-chat.c:1630
+#: ../libempathy-gtk/empathy-chat.c:1604
 msgid "permission denied"
 msgstr "lupa evÃtty"
 
-#: ../libempathy-gtk/empathy-chat.c:1633
+#: ../libempathy-gtk/empathy-chat.c:1607
 msgid "too long message"
 msgstr "liian pitkÃ viesti"
 
-#: ../libempathy-gtk/empathy-chat.c:1636
+#: ../libempathy-gtk/empathy-chat.c:1610
 msgid "not implemented"
 msgstr "ei toteutettu"
 
-#: ../libempathy-gtk/empathy-chat.c:1640
+#: ../libempathy-gtk/empathy-chat.c:1614
 msgid "unknown"
 msgstr "tuntematon"
 
-#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
+#: ../libempathy-gtk/empathy-chat.c:1681 ../src/empathy-chat-window.c:969
 msgid "Topic:"
 msgstr "Aihe:"
 
-#: ../libempathy-gtk/empathy-chat.c:1722
+#: ../libempathy-gtk/empathy-chat.c:1696
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Aihe asetettu: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1724
+#: ../libempathy-gtk/empathy-chat.c:1698
 #, c-format
 msgid "Topic set by %s to: %s"
 msgstr "%s asetti aiheeksi: %s"
 
 #. No need to display this 'event' is no topic can be defined anyway
-#: ../libempathy-gtk/empathy-chat.c:1729
+#: ../libempathy-gtk/empathy-chat.c:1703
 msgid "No topic defined"
 msgstr "Aihetta ei ole annettu"
 
-#: ../libempathy-gtk/empathy-chat.c:2245
+#: ../libempathy-gtk/empathy-chat.c:2219
 msgid "(No Suggestions)"
 msgstr "(Ei ehdotuksia)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2313
+#: ../libempathy-gtk/empathy-chat.c:2287
 #, 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:2350
+#: ../libempathy-gtk/empathy-chat.c:2324
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "LisÃÃ â%sâ kielen %s sanakirjaan"
 
-#: ../libempathy-gtk/empathy-chat.c:2420
+#: ../libempathy-gtk/empathy-chat.c:2394
 msgid "Insert Smiley"
 msgstr "LisÃÃ hymiÃ"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2438
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-chat.c:2412
+#: ../libempathy-gtk/empathy-ui-utils.c:1180
 msgid "_Send"
 msgstr "_LÃhetÃ"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2495
+#: ../libempathy-gtk/empathy-chat.c:2469
 msgid "_Spelling Suggestions"
 msgstr "_Kielentarkistuksen ehdotukset"
 
-#: ../libempathy-gtk/empathy-chat.c:2584
+#: ../libempathy-gtk/empathy-chat.c:2575
 msgid "Failed to retrieve recent logs"
 msgstr "Viimeisimpien lokien nouto epÃonnistui"
 
-#: ../libempathy-gtk/empathy-chat.c:2723
+#: ../libempathy-gtk/empathy-chat.c:2719
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s katkaisi"
@@ -1592,12 +1602,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:2730
+#: ../libempathy-gtk/empathy-chat.c:2726
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s potkaisi henkilÃn %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2733
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%s was kicked"
 msgstr "%s potkaistiin"
@@ -1605,17 +1615,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:2741
+#: ../libempathy-gtk/empathy-chat.c:2737
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s esti henkilÃn %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2744
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%s was banned"
 msgstr "%s estettiin"
 
-#: ../libempathy-gtk/empathy-chat.c:2748
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s has left the room"
 msgstr "%s on poistunut huoneesta"
@@ -1625,17 +1635,17 @@ 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:2757
+#: ../libempathy-gtk/empathy-chat.c:2753
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2782
+#: ../libempathy-gtk/empathy-chat.c:2778
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s on saapunut huoneeseen"
 
-#: ../libempathy-gtk/empathy-chat.c:2807
+#: ../libempathy-gtk/empathy-chat.c:2803
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s vaihtoi nimekseen %s"
@@ -1643,55 +1653,50 @@ msgstr "%s vaihtoi nimekseen %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2994
-#: ../src/empathy-streamed-media-window.c:1888
-#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
-#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2590
+#: ../libempathy-gtk/empathy-chat.c:2990 ../src/empathy-call-window.c:1468
+#: ../src/empathy-call-window.c:1518 ../src/empathy-call-window.c:2571
+#: ../src/empathy-event-manager.c:1176
 msgid "Disconnected"
 msgstr "Ei yhteyttÃ"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3658
+#: ../libempathy-gtk/empathy-chat.c:3665
 msgid "Would you like to store this password?"
-msgstr "Haluaisitteko tallentaa tÃmÃn salasanan?"
+msgstr "Haluatko tallentaa tÃmÃn salasanan?"
 
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3671
 msgid "Remember"
 msgstr "Muista"
 
-#: ../libempathy-gtk/empathy-chat.c:3674
+#: ../libempathy-gtk/empathy-chat.c:3681
 msgid "Not now"
 msgstr "Ei nyt"
 
-#: ../libempathy-gtk/empathy-chat.c:3718
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-msgid "Retry"
-msgstr "YritÃ uudelleen"
-
-#: ../libempathy-gtk/empathy-chat.c:3722
+#: ../libempathy-gtk/empathy-chat.c:3729
 msgid "Wrong password; please try again:"
 msgstr "VÃÃrÃ salasana, yritÃ uudelleen:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3859
 msgid "This room is protected by a password:"
 msgstr "Huone on salasanasuojattu:"
 
-#: ../libempathy-gtk/empathy-chat.c:3879
+#: ../libempathy-gtk/empathy-chat.c:3886
+#: ../src/empathy-new-chatroom-dialog.c:780
 msgid "Join"
 msgstr "Liity"
 
-#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
+#: ../libempathy-gtk/empathy-chat.c:4078 ../src/empathy-event-manager.c:1197
 msgid "Connected"
 msgstr "Yhdistetty"
 
-#: ../libempathy-gtk/empathy-chat.c:4126
+#: ../libempathy-gtk/empathy-chat.c:4133
 msgid "Conversation"
 msgstr "Keskustelu"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4131
+#: ../libempathy-gtk/empathy-chat.c:4138
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1702,11 +1707,11 @@ msgstr "Tuntematon tai virheellinen tunniste"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Contact blocking temporarily unavailable"
-msgstr "YhteyshenkilÃiden esto tilapÃisesti poissa"
+msgstr "Tuttavien esto tilapÃisesti poissa"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking unavailable"
-msgstr "YhteyshenkilÃiden esto poissa"
+msgstr "Tuttavien esto poissa"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Permission Denied"
@@ -1714,585 +1719,537 @@ msgstr "PÃÃsy evÃtty"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
 msgid "Could not block contact"
-msgstr "Yhteystietoa ei voitu estÃÃ"
+msgstr "Tuttavaa ei voitu estÃÃ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611
 msgid "Edit Blocked Contacts"
-msgstr "Muokkaa estettyjÃ yhteystietoja"
+msgstr "Muokkaa estettyjÃ tuttavia"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
+#: ../libempathy-gtk/empathy-individual-widget.c:1485
 #: ../src/empathy-chatrooms-window.ui.h:2
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
 msgstr "KÃyttÃjÃtili:"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
 msgid "Blocked Contacts"
-msgstr "Estetyt yhteyshenkilÃt"
+msgstr "Estetyt tuttavat"
 
-#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:322
-#: ../libempathy-gtk/empathy-webkit-utils.c:277
-msgid "_Copy Link Address"
-msgstr "_Kopioi linkin osoite"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Koko nimi"
 
-#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:329
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
-msgid "_Open Link"
-msgstr "_Avaa linkki"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Puhelinnumero"
 
-#. Translators: timestamp displayed between conversations in
-#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:417
-msgid "%A %B %d %Y"
-msgstr "%A %d. %Bta %Y"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "SÃhkÃpostiosoite"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:326
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
-msgid "New Contact"
-msgstr "Uusi tuttava"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "WWW-sivusto"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:395
-#: ../libempathy-gtk/empathy-individual-dialogs.c:197
-#, c-format
-msgid "Block %s?"
-msgstr "EstetÃÃnkÃ %s?"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "SyntymÃpÃivÃ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:400
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
-#, 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Ã?"
+#. 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-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "Viimeksi nÃhty:"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:405
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
-msgid "_Block"
-msgstr "_EstÃ"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Palvelin:"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:423
-#: ../libempathy-gtk/empathy-individual-dialogs.c:283
-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-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Yhdisti kohteesta:"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Subscription Request"
-msgstr "LiittymispyyntÃ"
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "Poissaoloviesti:"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
-msgid "_Block User"
-msgstr "Es_tÃ kÃyttÃjÃ"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "tyÃ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
-msgid "Decide _Later"
-msgstr "_PÃÃtÃ myÃhemmin"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "koti"
 
-#. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
-msgid "Search contacts"
-msgstr "Etsi yhteystietoja"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "matkapuhelin"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-msgid "Search: "
-msgstr "Etsi: "
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "ÃÃni"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "ensisijainen"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "postiosoite"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+#, fuzzy
+msgid "parcel"
+msgstr "Ulkoasu"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
+#. Title
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+msgid "Search contacts"
+msgstr "Etsi tuttavia"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+msgid "Search: "
+msgstr "Etsi: "
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
 msgid "_Add Contact"
-msgstr "_LisÃÃ yhteystieto"
+msgstr "_LisÃÃ tuttava"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
 msgid "No contacts found"
-msgstr "Yhteystietoa ei lÃytynyt"
+msgstr "Tuttavia ei lÃytynyt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
 msgid "Your message introducing yourself:"
-msgstr ""
+msgstr "Oma esittelyviestisi:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Salli minun nÃhdÃ, milloin olet verkossa. Kiitos!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:567
+#: ../libempathy-gtk/empathy-contact-widget.c:170
+#: ../libempathy-gtk/empathy-individual-widget.c:900
+msgid "Save Avatar"
+msgstr "Tallenna vastaus"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:226
+#: ../libempathy-gtk/empathy-individual-widget.c:958
+msgid "Unable to save avatar"
+msgstr "Avataria ei voitu tallentaa"
+
+#. Identifier to connect to Instant Messaging network
+#. Setup id label
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-user-info.c:444
+#| msgid "Identifier:"
+msgid "Identifier"
+msgstr "Tunniste"
+
+#. Setup nickname entry
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-user-info.c:449
+#| msgid "Alias:"
+msgid "Alias"
+msgstr "Nimimerkki"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Tuttavan tiedot"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requestedâ"
+msgstr "PyydetÃÃn tietojaâ"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Sijainti</b> hetkellÃ (pvm)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Asiakastiedot"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#| msgid "OS:"
+msgid "OS"
+msgstr "KÃyttÃjÃrjestelmÃ"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#| msgid "Version:"
+msgid "Version"
+msgstr "Versio"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#| msgid "Client:"
+msgid "Client"
+msgstr "Asiakasohjelma"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:327
+msgid "Groups"
+msgstr "RyhmÃt"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:339
+msgid ""
+"Select the groups you want this contact to appear in.  Note that you can "
+"select more than one group or no groups."
+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:358
+msgid "_Add Group"
+msgstr "_LisÃÃ ryhmÃ"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:393
+msgctxt "verb in a column header displaying group names"
+msgid "Select"
+msgstr "Valitse"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:403
+msgid "Group"
+msgstr "RyhmÃ"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+msgid "New Contact"
+msgstr "Uusi tuttava"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:193
+#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#, c-format
+msgid "Block %s?"
+msgstr "EstetÃÃnkÃ %s?"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:248
+#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr "Haluatko estÃÃ kÃyttÃjÃn '%s' yhteydenotot?"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+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:260
+msgid "The following identity can not be blocked:"
+msgid_plural "The following identities can not be blocked:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:270
+#: ../libempathy-gtk/empathy-subscription-dialog.c:130
+#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+msgid "_Block"
+msgstr "_EstÃ"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:279
+#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "_Raportoi tÃmÃ tuttava loukkaavana"
+msgstr[1] "_Raportoi nÃmÃ yhteyshenkilÃt loukkaavina"
+
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Muokkaa tuttavan tietoja"
+
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
+msgid "Linked Contacts"
+msgstr "Linkitetyt tuttavat"
+
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+msgid "gnome-contacts not installed"
+msgstr "Pakettia gnome-contacts ei ole asennettu"
+
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Asenna gnome-contacts tarkastellaksesi tuttavien tietoja."
+
+#. 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:172
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:347
+msgid "Select account to use to place the call"
+msgstr "Valitse soittoon kÃytettÃvÃ tili"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:351
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:18
+msgid "Call"
+msgstr "Soita"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:416
+msgid "Mobile"
+msgstr "Matkapuhelin"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:418
+msgid "Work"
+msgstr "TyÃ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:420
+msgid "HOME"
+msgstr "Koti"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:661
+msgid "_Block Contact"
+msgstr "Es_tÃ tuttava"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:717
+msgid "Delete and _Block"
+msgstr "Poista ja _estÃ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:779
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Haluatko varmasti poistaa tuttavan \"%s\" yhteystiedot?"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:788
+#, 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-menu.c:799
+msgid "Removing contact"
+msgstr "Poistetaan tuttava"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:863
+#: ../libempathy-gtk/empathy-individual-view.c:2454
+msgid "_Remove"
+msgstr "_Poista"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+msgid "_Chat"
+msgstr "_Keskustele"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1261
+#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1294
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_ÃÃnipuhelu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1327
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Videopuhelu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1368
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "_Previous Conversations"
+msgstr "_Aiemmat keskustelut"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1397
+msgid "Send File"
+msgstr "LÃhetÃ tiedosto"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
+msgid "Share My Desktop"
+msgstr "Jaa tyÃpÃytÃni"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1453
+#: ../libempathy-gtk/empathy-individual-widget.c:1368
+msgid "Favorite"
+msgstr "Suosikki"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1482
+msgid "Infor_mation"
+msgstr "_Tietoja"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1531
+msgctxt "Edit individual (contextual menu)"
+msgid "_Edit"
+msgstr "_Muokkaa"
+
+#. send invitation
+#: ../libempathy-gtk/empathy-individual-menu.c:1647
+#: ../src/empathy-chat-window.c:1235
+msgid "Inviting you to this room"
+msgstr "Kutsuu sinut tÃhÃn keskusteluhuoneeseen"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1693
+msgid "_Invite to Chat Room"
+msgstr "_Kutsu keskusteluhuoneeseen"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1889
+msgid "_Add Contactâ"
+msgstr "_LisÃÃ tuttavaâ"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2374
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Haluatko varmasti poistaa ryhmÃn \"%s\"?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2377
+msgid "Removing group"
+msgstr "Poistetaan ryhmÃÃ"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2445
+#| msgid "Real name:"
+msgid "Re_name"
+msgstr "Ni_meÃ uudelleen"
+
 #: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Kanavat:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:747
 #: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Maan ISO-tunnus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:749
 #: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Maa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:751
 #: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Osavaltio:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:753
 #: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Kaupunki:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:755
 #: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Alue:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:757
 #: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Postinumero:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:759
 #: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Katu:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:761
 #: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Rakennus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:763
 #: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Kerros:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:765
 #: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Huone:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:767
 #: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Teksti:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:769
 #: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:771
 #: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:773
 #: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Tarkkuustaso:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:775
 #: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Virhe:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:777
 #: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Vertikaalinen virhe (metriÃ):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:779
 #: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Horisontaalinen virhe (metriÃ):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:781
 #: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Nopeus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:783
 #: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Suuntima:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:785
 #: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "KiipeÃmisvauhti:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:787
 #: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Viimeksi pÃivitetty:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:789
 #: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Pituuspiiri:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:791
 #: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Leveyspiiri:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:793
 #: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Korkeus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:846
-#: ../libempathy-gtk/empathy-contact-widget.c:861
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:39
 msgid "Location"
 msgstr "Sijainti"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
 #: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e. %Bta %Y klo %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:997
-#: ../libempathy-gtk/empathy-individual-widget.c:900
-msgid "Save Avatar"
-msgstr "Tallenna vastaus"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1053
-#: ../libempathy-gtk/empathy-individual-widget.c:958
-msgid "Unable to save avatar"
-msgstr "Avataria ei voitu tallentaa"
+#. Alias
+#: ../libempathy-gtk/empathy-individual-widget.c:1304
+msgid "Alias:"
+msgstr "Nimimerkki:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1444
-msgid "Personal Details"
-msgstr "HenkilÃkohtaiset tiedot:"
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-individual-widget.c:1513
+msgid "Identifier:"
+msgstr "Tunniste:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1447
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Contact Details"
-msgstr "Tuttavan tiedot"
+#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#, c-format
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "Full name"
-msgstr "Koko nimi"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+msgid "<b>Location</b> at (date)"
+msgstr "<b>Sijainti</b> hetkellÃ (pvm)"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Phone number"
-msgstr "Puhelinnumero"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-msgid "E-mail address"
-msgstr "SÃhkÃpostiosoite"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
-msgid "Website"
-msgstr "WWW-sivusto"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
-msgid "Birthday"
-msgstr "SyntymÃpÃivÃ"
-
-#. 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-contactinfo-utils.c:113
-msgid "Last seen:"
-msgstr "Viimeksi nÃhty:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
-msgid "Connected from:"
-msgstr "Yhdisti kohteesta:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
-msgid "Away message:"
-msgstr "Poissaoloviesti:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "work"
-msgstr "tyÃ"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "home"
-msgstr "koti"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-msgid "mobile"
-msgstr "matkapuhelin"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "voice"
-msgstr "ÃÃni"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "preferred"
-msgstr "ensisijainen"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
-msgid "postal"
-msgstr "postiosoite"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
-#, fuzzy
-msgid "parcel"
-msgstr "Ulkoasu"
-
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1502
-msgid "Identifier:"
-msgstr "Tunniste:"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-individual-widget.c:1293
-msgid "Alias:"
-msgstr "Nimimerkki:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Sijainti</b> hetkellÃ (pvm)\t"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
-msgid "Information requestedâ"
-msgstr "PyydetÃÃn tietojaâ"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-msgid "Client Information"
-msgstr "Asiakastiedot"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "OS:"
-msgstr "KÃyttÃjÃrjestelmÃ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Version:"
-msgstr "Versio:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
-msgid "Client:"
-msgstr "Asiakasohjelma:"
-
-#: ../libempathy-gtk/empathy-groups-widget.c:331
-msgid "Groups"
-msgstr "RyhmÃt"
-
-#: ../libempathy-gtk/empathy-groups-widget.c:343
-msgid ""
-"Select the groups you want this contact to appear in.  Note that you can "
-"select more than one group or no groups."
-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:362
-msgid "_Add Group"
-msgstr "_LisÃÃ ryhmÃ"
-
-#: ../libempathy-gtk/empathy-groups-widget.c:397
-msgctxt "verb in a column header displaying group names"
-msgid "Select"
-msgstr "Valitse"
-
-#: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-roster-window.c:1970
-msgid "Group"
-msgstr "RyhmÃ"
-
-#: ../libempathy-gtk/empathy-individual-dialogs.c:257
-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:264
-msgid "The following identity can not be blocked:"
-msgid_plural "The following identities can not be blocked:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Muokkaa tuttavan tietoja"
-
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-#, fuzzy
-msgid "Linked Contacts"
-msgstr "Estetyt yhteyshenkilÃt"
-
-#. 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:173
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:345
-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:349
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-streamed-media-window.c:1290
-#: ../src/empathy-call-window.ui.h:18
-msgid "Call"
-msgstr "Soita"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:414
-msgid "Mobile"
-msgstr "Matkapuhelin"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:416
-msgid "Work"
-msgstr "TyÃ"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:418
-msgid "HOME"
-msgstr "Koti"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:659
-msgid "_Block Contact"
-msgstr "Es_tÃ yhteystieto"
-
-#. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1018
-#: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "_Chat"
-msgstr "_Keskustele"
-
-#. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1053
-#: ../libempathy-gtk/empathy-new-message-dialog.c:313
-msgid "_SMS"
-msgstr "_SMS"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1086
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_ÃÃnipuhelu"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1119
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Videopuhelu"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1160
-#: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "_Previous Conversations"
-msgstr "_Aiemmat keskustelut"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1189
-msgid "Send File"
-msgstr "LÃhetÃ tiedosto"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1219
-msgid "Share My Desktop"
-msgstr "Jaa tyÃpÃytÃni"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1245
-#: ../libempathy-gtk/empathy-individual-widget.c:1357
-msgid "Favorite"
-msgstr "Suosikki"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1264
-msgid "gnome-contacts not installed"
-msgstr "Pakettia gnome-contacts ei ole asennettu"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1267
-msgid "Please install gnome-contacts to access contacts details."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1398
-msgid "Infor_mation"
-msgstr "_Tietoja"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1447
-msgctxt "Edit individual (contextual menu)"
-msgid "_Edit"
-msgstr "_Muokkaa"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1564
-#: ../src/empathy-chat-window.c:1192
-msgid "Inviting you to this room"
-msgstr "Kutsuu sinut tÃhÃn keskusteluhuoneeseen"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1610
-msgid "_Invite to Chat Room"
-msgstr "_Kutsu keskusteluhuoneeseen"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1806
-#: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "_Add Contactâ"
-msgstr "_LisÃÃ tuttavaâ"
-
-#: ../libempathy-gtk/empathy-individual-view.c:2304
-msgid "Delete and _Block"
-msgstr "Poista ja _estÃ"
-
-#: ../libempathy-gtk/empathy-individual-view.c:2339
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Haluatko varmasti poistaa ryhmÃn \"%s\"?"
-
-#: ../libempathy-gtk/empathy-individual-view.c:2342
-msgid "Removing group"
-msgstr "Poistetaan ryhmÃÃ"
-
-#. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2397
-#: ../libempathy-gtk/empathy-individual-view.c:2601
-msgid "_Remove"
-msgstr "_Poista"
-
-#: ../libempathy-gtk/empathy-individual-view.c:2474
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Haluatko varmasti poistaa tuttavan \"%s\" yhteystiedot?"
-
-#: ../libempathy-gtk/empathy-individual-view.c:2483
-#, 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-view.c:2495
-msgid "Removing contact"
-msgstr "Poistetaan tuttava"
-
-#: ../libempathy-gtk/empathy-individual-widget.c:1641
-#, c-format
-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-individual-widget.ui.h:2
-msgid "Online from a phone or mobile device"
-msgstr "Linjoilla puhelimesta tai mobiililaitteesta"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Online from a phone or mobile device"
+msgstr "Linjoilla puhelimesta tai mobiililaitteesta"
 
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
@@ -2304,7 +2261,7 @@ msgstr "Valitse IRC-verkko"
 
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
-msgstr ""
+msgstr "_Nollaa verkkoluettelo"
 
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
@@ -2319,30 +2276,53 @@ msgstr "uusi palvelin"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:620
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+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 "
+"details below are correct."
+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 tiedot ovat oikein."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:98
+msgid "People nearby"
+msgstr "LÃhellÃ olevat ihmiset"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:113
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit â Accounts</span> in the Contact List."
+msgstr ""
+"Voit muuttaa nÃitÃ tietoja myÃhemmin tai poistaa tÃmÃn ominaisuuden kÃytÃstÃ "
+"valitsemalla tuttavaluettelossa <span style=\"italic\">Muokkaa â "
+"KÃyttÃjÃtilit</span>."
+
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "Historia"
 
-#: ../libempathy-gtk/empathy-log-window.c:675
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "NÃytÃ"
 
-#: ../libempathy-gtk/empathy-log-window.c:697
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "Etsi"
 
-#: ../libempathy-gtk/empathy-log-window.c:1148
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr "Keskustele kÃyttÃjÃn %s kanssa"
 
-#: ../libempathy-gtk/empathy-log-window.c:1200
-#: ../libempathy-gtk/empathy-log-window.c:1347
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1346
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr ""
@@ -2360,96 +2340,95 @@ msgstr "<i>* %s %s</i>"
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1371
+#: ../libempathy-gtk/empathy-log-window.c:1370
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s sekunti"
 msgstr[1] "%s sekuntia"
 
-#: ../libempathy-gtk/empathy-log-window.c:1378
+#: ../libempathy-gtk/empathy-log-window.c:1377
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minuutti"
 msgstr[1] "%s minuuttia"
 
-#: ../libempathy-gtk/empathy-log-window.c:1386
+#: ../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:1720
+#: ../libempathy-gtk/empathy-log-window.c:1716
 msgid "Today"
 msgstr "TÃnÃÃn"
 
-#: ../libempathy-gtk/empathy-log-window.c:1724
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Yesterday"
 msgstr "Eilen"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1739
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:1735
 msgid "%e %B %Y"
-msgstr "%A %d. %Bta %Y"
+msgstr "%e. %Bta %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1827
-#: ../libempathy-gtk/empathy-log-window.c:3487
+#: ../libempathy-gtk/empathy-log-window.c:1839
+#: ../libempathy-gtk/empathy-log-window.c:3462
 msgid "Anytime"
 msgstr "Milloin tahansa"
 
-#: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2400
+#: ../libempathy-gtk/empathy-log-window.c:1938
+#: ../libempathy-gtk/empathy-log-window.c:2397
 msgid "Anyone"
 msgstr "Kuka tahansa"
 
-#: ../libempathy-gtk/empathy-log-window.c:2713
+#: ../libempathy-gtk/empathy-log-window.c:2710
 msgid "Who"
 msgstr "Kuka"
 
-#: ../libempathy-gtk/empathy-log-window.c:2922
+#: ../libempathy-gtk/empathy-log-window.c:2919
 msgid "When"
 msgstr "Milloin"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3037
 msgid "Anything"
 msgstr "MitÃ tahansa"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3039
 msgid "Text chats"
 msgstr "Tekstikeskustelut"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
-#: ../src/empathy-preferences.ui.h:25
+#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Puhelut"
 
-#: ../libempathy-gtk/empathy-log-window.c:3047
+#: ../libempathy-gtk/empathy-log-window.c:3044
 msgid "Incoming calls"
 msgstr "Saapuneet puhelut"
 
-#: ../libempathy-gtk/empathy-log-window.c:3048
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Outgoing calls"
 msgstr "Soitetut puhelut"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3046
 msgid "Missed calls"
 msgstr "Vastaamattomat puhelut"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3066
 msgid "What"
 msgstr "MitÃ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3780
+#: ../libempathy-gtk/empathy-log-window.c:3755
 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:3784
+#: ../libempathy-gtk/empathy-log-window.c:3759
 msgid "Clear All"
 msgstr "TyhjennÃ kaikki"
 
-#: ../libempathy-gtk/empathy-log-window.c:3791
+#: ../libempathy-gtk/empathy-log-window.c:3766
 msgid "Delete from:"
 msgstr "Poista kohteesta:"
 
@@ -2459,7 +2438,6 @@ msgstr "_Tiedosto"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
 #: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "_Edit"
 msgstr "_Muokkaa"
 
@@ -2472,13 +2450,12 @@ msgid "Profile"
 msgstr "Profiili"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Keskustelu"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:26
-#: ../src/empathy-streamed-media-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:24
 msgid "Video"
 msgstr "Video"
 
@@ -2490,124 +2467,125 @@ msgstr "sivu 2"
 msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">Ladataan...</span>"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+msgid "What kind of chat account do you have?"
+msgstr "MinkÃlainen pikaviestintili sinulla on?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:151
+msgid "Adding new account"
+msgstr "LisÃtÃÃn uutta tiliÃ"
+
+#: ../libempathy-gtk/empathy-new-call-dialog.c:199
+#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+msgid "Enter a contact identifier or phone number:"
+msgstr "Anna tuttavan tunniste tai puhelinnumero:"
+
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+msgid "_Video Call"
+msgstr "_Videopuhelu"
+
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+msgid "_Audio Call"
+msgstr "_ÃÃnipuhelu"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+msgid "New Call"
+msgstr "Uusi puhelu"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:82
 msgid "The contact is offline"
-msgstr "Yhteystieto ei ole linjoilla"
+msgstr "Tuttava ei ole linjoilla"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "The specified contact is either invalid or unknown"
-msgstr "Valittu yhteystieto on joko virheellinen tai tuntematon"
+msgstr "Valittu tuttava on joko virheellinen tai tuntematon"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:87
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "The contact does not support this kind of conversation"
-msgstr "Aihe ei ole tuettu tÃssÃ keskustelussa"
+msgstr "Kyseinen tuttava ei tue tÃmÃnlaista keskustelua"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "The requested functionality is not implemented for this protocol"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Could not start a conversation with the given contact"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+#: ../libempathy-gtk/empathy-new-message-dialog.c:96
 msgid "You are banned from this channel"
 msgstr "Sinulla on porttikielto tÃlle kanavalle"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+#: ../libempathy-gtk/empathy-new-message-dialog.c:98
 msgid "This channel is full"
 msgstr "Kanava on tÃynnÃ"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "You must be invited to join this channel"
 msgstr "Kanavalle voi liittyÃ vain kutsusta"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+#: ../libempathy-gtk/empathy-new-message-dialog.c:102
 #, fuzzy
 msgid "Can't proceed while disconnected"
 msgstr "Yhteys tuttavaan katkaistu"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:105
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:104
 msgid "Permission denied"
-msgstr "lupa evÃtty"
+msgstr "Lupa evÃtty"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:111
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:110
 msgid "There was an error starting the conversation"
-msgstr "Puhelun aloittamisessa tapahtui virhe"
-
-#: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:200
-msgid "Enter a contact identifier or phone number:"
-msgstr ""
+msgstr "Keskustelua aloittaessa tapahtui virhe"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:333
+#: ../libempathy-gtk/empathy-new-message-dialog.c:332
 msgid "New Conversation"
 msgstr "Uusi keskustelu"
 
-#. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
-msgid "_Video Call"
-msgstr "_Videopuhelu"
-
-#. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:233
-msgid "_Audio Call"
-msgstr "_ÃÃnipuhelu"
-
-#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:243
-msgid "New Call"
-msgstr "Uusi puhelu"
-
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
-#, fuzzy, c-format
-msgid "Authentification failed for account <b>%s</b>"
-msgstr "Todennus epÃonnistui"
-
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
-#: ../libempathy-gtk/empathy-password-dialog.c:134
-#, 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:167
-#: ../libempathy-gtk/empathy-presence-chooser.c:203
+#: ../libempathy-gtk/empathy-presence-chooser.c:165
+#: ../libempathy-gtk/empathy-presence-chooser.c:201
 msgid "Custom Messageâ"
 msgstr "Oma viestiâ"
 
+#: ../libempathy-gtk/empathy-presence-chooser.c:218
 #: ../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:345
+#: ../libempathy-gtk/empathy-presence-chooser.c:342
 msgid "Click to remove this status as a favorite"
 msgstr "Napsauta poistaaksesi tÃmÃn tilan suosikeista"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:354
+#: ../libempathy-gtk/empathy-presence-chooser.c:351
 msgid "Click to make this status a favorite"
 msgstr "Napsauta tehdÃksesi tÃstÃ tilasta suosikin"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:388
+#. Translators: %s is a status message like 'At the pub' for example
+#: ../libempathy-gtk/empathy-presence-chooser.c:385
+#, c-format
+msgid ""
+"<b>Current message: %s</b>\n"
+"<small><i>Press Enter to set the new message or Esc to cancel.</i></small>"
+msgstr ""
+"<b>Nykyinen viesti: %s</b>\n"
+"<small><i>Paina Enter asettaaksesi uuden viestin tai Esc peruaksesi.</i><"
+"/small>"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:394
 msgid "Set status"
 msgstr "Aseta tila"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1135
+#: ../libempathy-gtk/empathy-presence-chooser.c:1102
 msgid "Custom messagesâ"
 msgstr "Omat viestitâ"
 
@@ -2615,11 +2593,15 @@ msgstr "Omat viestitâ"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:588
+#: ../libempathy-gtk/empathy-protocol-chooser.c:610
 #, c-format
 msgid "New %s account"
 msgstr "Uusi %s-tili"
 
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_Huomioi kirjainkoko"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Etsi:"
@@ -2676,39 +2658,43 @@ msgstr "Saapuva puhelu"
 msgid "Outgoing voice call"
 msgstr "LÃhetÃ puhelu"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
-msgid "Voice call ended"
-msgstr "Puhelu pÃÃttyi"
+#: ../libempathy-gtk/empathy-sound-manager.c:69
+msgid "Voice call ended"
+msgstr "Puhelu pÃÃttyi"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+msgid "Edit Custom Messages"
+msgstr "Muokkaa itse mÃÃriteltyjÃ viestejÃ"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+msgid "Subscription Request"
+msgstr "LiittymispyyntÃ"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:240
+#: ../src/empathy-event-manager.c:1114
+#, c-format
+msgid "%s would like permission to see when you are online"
+msgstr "%s haluaa luvan nÃhdÃ, milloin olet linjoilla"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
+#: ../src/empathy-event-manager.c:731
+msgid "_Decline"
+msgstr "_KieltÃydy"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
-msgid "Edit Custom Messages"
-msgstr "Muokkaa itse mÃÃriteltyjÃ viestejÃ"
+#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#| msgid "Accept"
+msgid "_Accept"
+msgstr "_HyvÃksy"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1051
+#: ../libempathy-gtk/empathy-theme-adium.c:1126
 #, c-format
 msgid "Message edited at %s"
 msgstr "ViestiÃ muokattu %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1757
+#: ../libempathy-gtk/empathy-theme-adium.c:1843
 msgid "Normal"
 msgstr "Tavallinen"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
-msgid "Classic"
-msgstr "Perinteinen"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:71
-msgid "Simple"
-msgstr "Yksinkertainen"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:72
-msgid "Clean"
-msgstr "Siisti"
-
-#: ../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."
 msgstr ""
@@ -2770,7 +2756,7 @@ msgstr "J_atka"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
 msgid "Untrusted connection"
-msgstr ""
+msgstr "Yhteys ei ole luotettava"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
@@ -2784,19 +2770,19 @@ msgstr "Muista tÃmÃ valinta tulevia yhteyksiÃ varten"
 msgid "Certificate Details"
 msgstr "Varmenteen tiedot"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1754
+#: ../libempathy-gtk/empathy-ui-utils.c:1050
 msgid "Unable to open URI"
 msgstr "URI:a ei voi avata"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1174
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1947
+#: ../libempathy-gtk/empathy-ui-utils.c:1248
 msgid "Insufficient free space to save file"
 msgstr "Tiedoston tallennukseen ei ole riittÃvÃsti tilaa"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1256
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2805,11 +2791,30 @@ msgstr ""
 "Tiedoston tallennukseen vaaditaan tilaa vÃhintÃÃn %s, mutta vain %s on "
 "saatavilla. Valitse toinen tallennussijainti."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1999
+#: ../libempathy-gtk/empathy-ui-utils.c:1302
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Saapuva tiedosto kÃyttÃjÃltÃ %s"
 
+#: ../libempathy-gtk/empathy-user-info.c:384
+msgid "Go online to edit your personal information."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-user-info.c:464
+#| msgid "Personal Details"
+msgid "<b>Personal Details</b>"
+msgstr "<b>HenkilÃkohtaiset tiedot</b>"
+
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:278
+msgid "_Copy Link Address"
+msgstr "_Kopioi linkin osoite"
+
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
+msgid "_Open Link"
+msgstr "_Avaa linkki"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "Nykyinen maa-asetusto"
@@ -2977,50 +2982,14 @@ msgstr "lÃnsimaalainen"
 msgid "Vietnamese"
 msgstr "vietnam"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "Valitse..."
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "_Valitse"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
 msgid "No error message"
 msgstr "Ei virheilmoitusta"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
 msgid "Instant Message (Empathy)"
 msgstr "Pikaviesti (Empathy)"
 
-#: ../src/empathy.c:435
-msgid "Don't connect on startup"
-msgstr "ÃlÃ yhdistÃ kÃynnistettÃessÃ"
-
-#: ../src/empathy.c:439
-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:454
-msgid "- Empathy IM Client"
-msgstr "- Empathy-pikaviestin"
-
-#: ../src/empathy.c:641
-msgid "Error contacting the Account Manager"
-msgstr "Virhe yhdistettÃessÃ tilienhallintaan"
-
-#: ../src/empathy.c:643
-#, 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 "
@@ -3097,80 +3066,97 @@ msgstr ""
 "  Ville-Pekka Vainio https://launchpad.net/~vpvainio\n";
 "  papukaija https://launchpad.net/~papukaija";
 
+#: ../src/empathy-accounts.c:184
+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:188
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr ""
+
+#: ../src/empathy-accounts.c:192
+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:194
+msgid "<account-id>"
+msgstr "<kÃyttÃjÃtunnus>"
+
+#: ../src/empathy-accounts.c:199
+msgid "- Empathy Accounts"
+msgstr "- Empathy-tilit"
+
+#: ../src/empathy-accounts.c:242
+msgid "Empathy Accounts"
+msgstr "Empathy-tilit"
+
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:72
+#: ../src/empathy-accounts-dialog.c:70
 #, 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:76
+#: ../src/empathy-accounts-dialog.c:74
 msgid "Your new account has not been saved yet."
 msgstr "Uutta tiliÃsi ei ole vielÃ tallennettu."
 
-#: ../src/empathy-accounts-dialog.c:381
-#: ../src/empathy-streamed-media-window.c:759
-#: ../src/empathy-call-window.c:1289
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1268
 msgid "Connectingâ"
 msgstr "YhdistetÃÃnâ"
 
-#: ../src/empathy-accounts-dialog.c:422
+#: ../src/empathy-accounts-dialog.c:445
 #, c-format
 msgid "Offline â %s"
 msgstr "Poissa linjoilta â %s"
 
-#: ../src/empathy-accounts-dialog.c:434
+#: ../src/empathy-accounts-dialog.c:457
 #, c-format
 msgid "Disconnected â %s"
 msgstr "Yhteys katkaistu â %s"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline â No Network Connection"
 msgstr "Poissa linjoilta â Ei verkkoyhteyttÃ"
 
-#: ../src/empathy-accounts-dialog.c:452
+#: ../src/empathy-accounts-dialog.c:475
 msgid "Unknown Status"
 msgstr "Tuntematon tila"
 
-#: ../src/empathy-accounts-dialog.c:469
+#: ../src/empathy-accounts-dialog.c:492
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
 "the account."
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:479
+#: ../src/empathy-accounts-dialog.c:502
 msgid "Offline â Account Disabled"
 msgstr "Poissa linjoilta â Tili ei ole kÃytettÃvissÃ"
 
-#: ../src/empathy-accounts-dialog.c:585
+#: ../src/empathy-accounts-dialog.c:608
 msgid "Edit Connection Parameters"
 msgstr "Muokkaa yhteyden asetuksia"
 
-#: ../src/empathy-accounts-dialog.c:750
-msgid "Failed to retrieve your personal information from the server."
-msgstr "HenkilÃkohtaisten tietojesi nouto palvelimelta epÃonnistui."
-
-#: ../src/empathy-accounts-dialog.c:756
-msgid "Go online to edit your personal information."
-msgstr ""
-
-#: ../src/empathy-accounts-dialog.c:843
+#: ../src/empathy-accounts-dialog.c:733
 msgid "_Edit Connection Parameters..."
 msgstr "_Muokkaa yhteyden asetuksia..."
 
-#: ../src/empathy-accounts-dialog.c:1339
+#: ../src/empathy-accounts-dialog.c:1235
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Haluatko poistaa tilin â%sâ tietokoneeltasi?"
 
-#: ../src/empathy-accounts-dialog.c:1343
+#: ../src/empathy-accounts-dialog.c:1239
 msgid "This will not remove your account on the server."
 msgstr "TÃmÃ ei poista tiliÃsi palvelimelta."
 
-#: ../src/empathy-accounts-dialog.c:1579
+#: ../src/empathy-accounts-dialog.c:1444
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3178,24 +3164,27 @@ msgstr ""
 "Olet vaihtamassa kÃyttÃjÃtiliÃ. Tilin vaihtamineen hylkÃÃ\n"
 "tehdyt muutokset. Haluatko varmasti jatkaa?"
 
-#. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1755
-msgid "_Enable"
-msgstr "Ota _kÃyttÃÃn"
+#. Menu item: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1635
+#| msgid "_Enable"
+msgid "_Enabled"
+msgstr "_KÃytÃssÃ"
 
-#: ../src/empathy-accounts-dialog.c:1756
-msgid "_Disable"
-msgstr "Ota _pois kÃytÃstÃ"
+#. Menu item: Rename
+#: ../src/empathy-accounts-dialog.c:1658
+#| msgid "Real name:"
+msgid "Rename"
+msgstr "NimeÃ uudelleen"
 
-#: ../src/empathy-accounts-dialog.c:2184
+#: ../src/empathy-accounts-dialog.c:2074
 msgid "_Skip"
 msgstr "O_hita"
 
-#: ../src/empathy-accounts-dialog.c:2188
+#: ../src/empathy-accounts-dialog.c:2078
 msgid "_Connect"
 msgstr "_YhdistÃ"
 
-#: ../src/empathy-accounts-dialog.c:2365
+#: ../src/empathy-accounts-dialog.c:2257
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3203,6 +3192,11 @@ msgstr ""
 "Olet sulkemassa ikkunan. Ikkunan sulkeminen hylkÃÃ\n"
 "tehdyt muutokset. Haluatko varmasti jatkaa?"
 
+#. Tweak the dialog
+#: ../src/empathy-accounts-dialog.c:2400
+msgid "Messaging and VoIP Accounts"
+msgstr "ViestintÃ ja VoIP-kÃyttÃjÃtilit"
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Importâ"
 msgstr "_Tuoâ"
@@ -3223,128 +3217,158 @@ msgstr ""
 msgid "No protocol backends installed"
 msgstr "YhteyskÃytÃntÃtaustaosia ei asennettu"
 
-#: ../src/empathy-auth-client.c:288
+#: ../src/empathy-auth-client.c:296
 msgid " - Empathy authentication client"
 msgstr " - Empathyn tunnistautumisasiakas"
 
-#: ../src/empathy-auth-client.c:304
+#: ../src/empathy-auth-client.c:312
 msgid "Empathy authentication client"
 msgstr "Empathyn tunnistautumisasiakas"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
+#: ../src/empathy.c:432
+msgid "Don't connect on startup"
+msgstr "ÃlÃ yhdistÃ kÃynnistettÃessÃ"
+
+#: ../src/empathy.c:436
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr "ÃlÃ nÃytÃ tuttavalistaa tai muita ikkunoita kÃynnistyksessÃ"
+
+#: ../src/empathy.c:452
+msgid "- Empathy IM Client"
+msgstr "- Empathy-pikaviestin"
+
+#: ../src/empathy.c:628
+msgid "Error contacting the Account Manager"
+msgstr "Virhe yhdistettÃessÃ tilienhallintaan"
+
+#: ../src/empathy.c:630
+#, 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-call.c:195
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathyn audio/video-asiakas"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
+#: ../src/empathy-call.c:219
 msgid "Empathy Audio/Video Client"
 msgstr "Empathyn audio/video-asiakas"
 
-#: ../src/empathy-streamed-media-window.c:434
-msgid "Contrast"
-msgstr "Kontrasti"
-
-#: ../src/empathy-streamed-media-window.c:437
-msgid "Brightness"
-msgstr "Kirkkaus"
-
-#: ../src/empathy-streamed-media-window.c:440
-msgid "Gamma"
-msgstr "Gamma"
+#: ../src/empathy-call-observer.c:119
+#, 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."
 
-#: ../src/empathy-streamed-media-window.c:547
-msgid "Volume"
-msgstr "ÃÃnenvoimakkuus"
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1125 ../src/empathy-call-window.c:1141
+msgid "i"
+msgstr "i"
 
-#: ../src/empathy-streamed-media-window.c:1099
-msgid "_Sidebar"
-msgstr "_Sivupalkki"
+#: ../src/empathy-call-window.c:1485 ../src/empathy-event-manager.c:510
+msgid "Incoming call"
+msgstr "Saapuva puhelu"
 
-#: ../src/empathy-streamed-media-window.c:1119
-msgid "Audio input"
-msgstr "ÃÃnisyÃte"
+#: ../src/empathy-call-window.c:1491 ../src/empathy-event-manager.c:915
+#, c-format
+msgid "Incoming video call from %s"
+msgstr "Saapuva videopuhelu taholta %s"
 
-#: ../src/empathy-streamed-media-window.c:1123
-msgid "Video input"
-msgstr "VideosyÃte"
+#: ../src/empathy-call-window.c:1491 ../src/empathy-event-manager.c:518
+#: ../src/empathy-event-manager.c:915
+#, c-format
+msgid "Incoming call from %s"
+msgstr "Puhelu kÃyttÃjÃltÃ %s"
 
-#: ../src/empathy-streamed-media-window.c:1131
-msgid "Dialpad"
-msgstr "Valintalevy"
+#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-notifications-approver.c:197
+msgid "Reject"
+msgstr "HylkÃÃ"
 
-#: ../src/empathy-streamed-media-window.c:1142
-msgid "Details"
-msgstr "Tiedot"
+#: ../src/empathy-call-window.c:1496
+#: ../src/empathy-notifications-approver.c:202
+#: ../src/empathy-notifications-approver.c:207
+msgid "Answer"
+msgstr "Vastaa"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1211
-#: ../src/empathy-call-window.c:1889
+#: ../src/empathy-call-window.c:1862
 #, c-format
 msgid "Call with %s"
 msgstr "Soita tuttavalle %s"
 
-#: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2133
+#: ../src/empathy-call-window.c:2114
 msgid "The IP address as seen by the machine"
 msgstr "TÃmÃn koneen nÃkemÃ IP-osoite"
 
-#: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2135
+#: ../src/empathy-call-window.c:2116
 msgid "The IP address as seen by a server on the Internet"
 msgstr "InternetissÃ olevan palvelimen nÃkemÃ IP-osoite"
 
-#: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2137
+#: ../src/empathy-call-window.c:2118
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Vertaisen IP-osoite toiselta puolen nÃhtynÃ"
 
-#: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2139
+#: ../src/empathy-call-window.c:2120
 msgid "The IP address of a relay server"
 msgstr "VÃlityspalvelimen IP-osoite"
 
-#: ../src/empathy-streamed-media-window.c:1452
-#: ../src/empathy-call-window.c:2141
+#: ../src/empathy-call-window.c:2122
 msgid "The IP address of the multicast group"
 msgstr "RyhmÃlÃhetysryhmÃn IP-osoite"
 
-#: ../src/empathy-streamed-media-window.c:1837
-#: ../src/empathy-streamed-media-window.c:1840
-#: ../src/empathy-streamed-media-window.c:1843
-#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "codec"
+#: ../src/empathy-call-window.c:2523 ../src/empathy-call-window.c:2524
+#: ../src/empathy-call-window.c:2525 ../src/empathy-call-window.c:2526
+#: ../src/empathy-call-window.ui.h:26
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2138
+#: ../src/empathy-call-window.c:2869
+msgid "On hold"
+msgstr "Pidossa"
+
+#: ../src/empathy-call-window.c:2871
+msgid "Mute"
+msgstr "Vaimenna"
+
+#: ../src/empathy-call-window.c:2873
+msgid "Duration"
+msgstr "Kesto"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2876
 #, c-format
-msgid "Connected â %d:%02dm"
-msgstr "Yhdistetty -- %d:%02d min"
+msgid "%s â %d:%02dm"
+msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2199
-#: ../src/empathy-call-window.c:2992
+#: ../src/empathy-call-window.c:2972
 msgid "Technical Details"
 msgstr "Tekniset tiedot"
 
-#: ../src/empathy-streamed-media-window.c:2237
-#: ../src/empathy-call-window.c:3031
+#: ../src/empathy-call-window.c:3011
 #, 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-streamed-media-window.c:2242
-#: ../src/empathy-call-window.c:3036
+#: ../src/empathy-call-window.c:3016
 #, 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-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:3042
+#: ../src/empathy-call-window.c:3022
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3353,29 +3377,25 @@ msgstr ""
 "YhteyttÃ ei voi muodostaa kohteeseen %s. Yksi teistÃ voi ehkÃ olla verkossa, "
 "joka ei salli suoria yhteyksiÃ."
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:3048
+#: ../src/empathy-call-window.c:3028
 msgid "There was a failure on the network"
 msgstr "VerkkoyhteydessÃ tapahtui virhe"
 
-#: ../src/empathy-streamed-media-window.c:2258
-#: ../src/empathy-call-window.c:3052
+#: ../src/empathy-call-window.c:3032
 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-streamed-media-window.c:2261
-#: ../src/empathy-call-window.c:3055
+#: ../src/empathy-call-window.c:3035
 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-streamed-media-window.c:2271
-#: ../src/empathy-call-window.c:3067
+#: ../src/empathy-call-window.c:3047
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3386,28 +3406,36 @@ msgstr ""
 "href=\"%s\">raportoi tÃmÃ ohjelmavirhe</a> sekÃ liitÃ 'VianjÃljitys'-"
 "ikkunasta kerÃtyt lokit \"Apua\"-valikosta."
 
-#: ../src/empathy-streamed-media-window.c:2279
-#: ../src/empathy-call-window.c:3076
+#: ../src/empathy-call-window.c:3056
 msgid "There was a failure in the call engine"
 msgstr "Virhe soitettaessa"
 
-#: ../src/empathy-streamed-media-window.c:2282
-#: ../src/empathy-call-window.c:3079
+#: ../src/empathy-call-window.c:3059
 msgid "The end of the stream was reached"
 msgstr "Virran loppu saavutettiin"
 
-#: ../src/empathy-streamed-media-window.c:2322
-#: ../src/empathy-call-window.c:3119
+#: ../src/empathy-call-window.c:3099
 msgid "Can't establish audio stream"
 msgstr "ÃÃniyhteyden muodostus ei onnistunut"
 
-#: ../src/empathy-streamed-media-window.c:2332
-#: ../src/empathy-call-window.c:3129
+#: ../src/empathy-call-window.c:3109
 msgid "Can't establish video stream"
 msgstr "Videoyhteyden muodostus ei onnistunut"
 
+#: ../src/empathy-call-window.c:3146
+#, c-format
+msgid "Your current balance is %s."
+msgstr ""
+
+#: ../src/empathy-call-window.c:3150
+msgid "Sorry, you donât have enough credit for that call."
+msgstr "Varasi eivÃt riitÃ tÃhÃn puheluun."
+
+#: ../src/empathy-call-window.c:3152
+msgid "Top Up"
+msgstr ""
+
 #: ../src/empathy-call-window.ui.h:1
-#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "_Call"
 msgstr "_Soita"
 
@@ -3424,23 +3452,18 @@ msgid "_Settings"
 msgstr "A_setukset"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-roster-window-menubar.ui.h:17
-#: ../src/empathy-streamed-media-window.ui.h:8
 msgid "_View"
 msgstr "_NÃytÃ"
 
 #: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
-#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Help"
 msgstr "O_hje"
 
 #: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
-#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Contents"
 msgstr "_SisÃltÃ"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:29
 msgid "_Debug"
 msgstr "_VianetsintÃ"
 
@@ -3461,12 +3484,10 @@ msgid "Disable camera"
 msgstr "Ota kamera pois kÃytÃstÃ"
 
 #: ../src/empathy-call-window.ui.h:14
-#: ../src/empathy-streamed-media-window.ui.h:2
 msgid "Hang up"
 msgstr "Katkaise"
 
 #: ../src/empathy-call-window.ui.h:15
-#: ../src/empathy-streamed-media-window.ui.h:9
 msgid "Hang up current call"
 msgstr "Lopeta nykyinen puhelu"
 
@@ -3491,67 +3512,65 @@ msgid "Display the dialpad"
 msgstr "NÃytÃ numeronÃppÃimistÃ"
 
 #: ../src/empathy-call-window.ui.h:22
-msgid "Send Video"
-msgstr "LÃhetÃ video"
-
-#: ../src/empathy-call-window.ui.h:23
 msgid "Toggle video transmission"
 msgstr "Kytke videon lÃhetys pÃÃlle tai pois"
 
-#: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Send Audio"
-msgstr "LÃhetÃ ÃÃntÃ"
-
-#: ../src/empathy-call-window.ui.h:25
-#: ../src/empathy-streamed-media-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:23
 msgid "Toggle audio transmission"
 msgstr "ÃÃnen lÃhetys pÃÃlle/pois"
 
-#: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-streamed-media-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:25
 msgid "Encoding Codec:"
 msgstr "Pakkauskoodekki:"
 
-#: ../src/empathy-call-window.ui.h:28
-#: ../src/empathy-streamed-media-window.ui.h:21
-#: ../src/empathy-call-window.c:2542 ../src/empathy-call-window.c:2543
-#: ../src/empathy-call-window.c:2544 ../src/empathy-call-window.c:2545
-msgid "Unknown"
-msgstr "Tuntematon"
-
-#: ../src/empathy-call-window.ui.h:29
-#: ../src/empathy-streamed-media-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:27
 msgid "Decoding Codec:"
 msgstr "Purkamiskoodekki:"
 
-#: ../src/empathy-call-window.ui.h:30
-#: ../src/empathy-streamed-media-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:28
 msgid "Remote Candidate:"
 msgstr "EtÃehdokas:"
 
-#: ../src/empathy-call-window.ui.h:31
-#: ../src/empathy-streamed-media-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:29
 msgid "Local Candidate:"
 msgstr "Paikallisehdokas:"
 
-#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
 msgid "Audio"
 msgstr "ÃÃni"
 
-#: ../src/empathy-chat-window.c:289
+#: ../src/empathy-chat.c:106
+msgid "- Empathy Chat Client"
+msgstr "- Empathy-keskusteluasiakas"
+
+#: ../src/empathy-chatrooms-window.c:251
+msgid "Name"
+msgstr "Nimi"
+
+#: ../src/empathy-chatrooms-window.c:269
+msgid "Room"
+msgstr "Huone"
+
+#: ../src/empathy-chatrooms-window.c:277
+msgid "Auto-Connect"
+msgstr "YhdistÃ automaattisesti"
+
+#: ../src/empathy-chatrooms-window.ui.h:1
+msgid "Manage Favorite Rooms"
+msgstr "Hallitse suosikkihuoneita"
+
+#: ../src/empathy-chat-window.c:282
 msgid "Close this window?"
 msgstr "Suljetaanko tÃmÃ ikkuna?"
 
-#: ../src/empathy-chat-window.c:294
+#: ../src/empathy-chat-window.c:288
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
 "until you rejoin it."
 msgstr ""
 
-#: ../src/empathy-chat-window.c:305
+#: ../src/empathy-chat-window.c:301
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3562,65 +3581,65 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/empathy-chat-window.c:314
+#: ../src/empathy-chat-window.c:312
 #, c-format
 msgid "Leave %s?"
 msgstr "Poistutaanko huoneesta %s?"
 
-#: ../src/empathy-chat-window.c:315
+#: ../src/empathy-chat-window.c:314
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
 msgstr ""
 
-#: ../src/empathy-chat-window.c:334
+#: ../src/empathy-chat-window.c:333
 msgid "Close window"
 msgstr "Sulje ikkuna"
 
-#: ../src/empathy-chat-window.c:334
+#: ../src/empathy-chat-window.c:333
 msgid "Leave room"
 msgstr "Poistu huoneesta"
 
-#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
+#: ../src/empathy-chat-window.c:667 ../src/empathy-chat-window.c:690
 #, 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:652
+#: ../src/empathy-chat-window.c:682
 #, 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:668
+#: ../src/empathy-chat-window.c:698
 #, 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:677
+#: ../src/empathy-chat-window.c:707
 #, 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:892
+#: ../src/empathy-chat-window.c:944
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:902
+#: ../src/empathy-chat-window.c:952
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "LÃhetetÃÃn %d viesti"
 msgstr[1] "LÃhetetÃÃn %d viestiÃ"
 
-#: ../src/empathy-chat-window.c:924
+#: ../src/empathy-chat-window.c:972
 msgid "Typing a message."
 msgstr "Kirjoittaa viestiÃ."
 
@@ -3684,112 +3703,160 @@ msgstr "SiirrÃ vÃlilehti _oikealle"
 msgid "_Detach Tab"
 msgstr "_Irrota vÃlilehti"
 
-#: ../src/empathy-chatrooms-window.c:251
-msgid "Name"
-msgstr "Nimi"
+#: ../src/empathy-debugger.c:69
+msgid "Show a particular service"
+msgstr "NÃytÃ tietty palvelu"
 
-#: ../src/empathy-chatrooms-window.c:269
-msgid "Room"
-msgstr "Huone"
+#: ../src/empathy-debugger.c:74
+msgid "- Empathy Debugger"
+msgstr "- Empathyn virheenjÃljitin"
+
+#: ../src/empathy-debugger.c:113
+msgid "Empathy Debugger"
+msgstr "Empathyn virheenjÃljitin"
+
+#: ../src/empathy-debug-window.c:1603
+msgid "Save"
+msgstr "Tallenna"
+
+#: ../src/empathy-debug-window.c:1663
+msgid "Pastebin link"
+msgstr "Pastebin-linkki"
+
+#: ../src/empathy-debug-window.c:1672
+msgid "Pastebin response"
+msgstr "Pastebin-vastaus"
+
+#: ../src/empathy-debug-window.c:1679
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+
+#: ../src/empathy-debug-window.c:1860
+msgid "Debug Window"
+msgstr "VianetsintÃikkuna"
+
+#: ../src/empathy-debug-window.c:1920
+msgid "Send to pastebin"
+msgstr "LÃhetÃ pastebin-palveluun"
+
+#: ../src/empathy-debug-window.c:1964
+msgid "Pause"
+msgstr "PysÃytÃ"
+
+#: ../src/empathy-debug-window.c:1976
+msgid "Level "
+msgstr "Taso "
+
+#: ../src/empathy-debug-window.c:1995
+msgid "Debug"
+msgstr "VirheenjÃljitys"
+
+#: ../src/empathy-debug-window.c:2000
+msgid "Info"
+msgstr "Tietoa"
+
+#: ../src/empathy-debug-window.c:2005 ../src/empathy-debug-window.c:2054
+msgid "Message"
+msgstr "Viesti"
+
+#: ../src/empathy-debug-window.c:2010
+msgid "Warning"
+msgstr "Varoitus"
+
+#: ../src/empathy-debug-window.c:2015
+msgid "Critical"
+msgstr "Kriittinen"
+
+#: ../src/empathy-debug-window.c:2020
+msgid "Error"
+msgstr "Virhe"
+
+#: ../src/empathy-debug-window.c:2039
+msgid "Time"
+msgstr "Aika"
+
+#: ../src/empathy-debug-window.c:2042
+msgid "Domain"
+msgstr "Alue"
+
+#: ../src/empathy-debug-window.c:2045
+msgid "Category"
+msgstr "Luokka"
 
-#: ../src/empathy-chatrooms-window.c:277
-msgid "Auto-Connect"
-msgstr "YhdistÃ automaattisesti"
+#: ../src/empathy-debug-window.c:2048
+msgid "Level"
+msgstr "Taso"
 
-#: ../src/empathy-chatrooms-window.ui.h:1
-msgid "Manage Favorite Rooms"
-msgstr "Hallitse suosikkihuoneita"
+#: ../src/empathy-debug-window.c:2077
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr "Valittu yhteyshallinta ei tue etÃvianetsintÃlaajennusta."
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:510
 msgid "Incoming video call"
 msgstr "Saapuva videopuhelu"
 
-#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
-msgid "Incoming call"
-msgstr "Saapuva puhelu"
-
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:514
 #, 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:527
+#: ../src/empathy-event-manager.c:515
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s soittaa sinulle. Haluatko vastata?"
 
-#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
-#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
-#, c-format
-msgid "Incoming call from %s"
-msgstr "Puhelu kÃyttÃjÃltÃ %s"
-
-#: ../src/empathy-event-manager.c:555
+#: ../src/empathy-event-manager.c:543
 msgid "_Reject"
 msgstr "_HylkÃÃ"
 
-#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:551 ../src/empathy-event-manager.c:559
 msgid "_Answer"
 msgstr "_Vastaa"
 
-#: ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:559
 msgid "_Answer with video"
 msgstr "_Vastaa kÃyttÃen videota"
 
-#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
-#: ../src/empathy-call-window.c:1525
-#, c-format
-msgid "Incoming video call from %s"
-msgstr "Saapuva videopuhelu taholta %s"
-
-#: ../src/empathy-event-manager.c:837
+#: ../src/empathy-event-manager.c:714
 msgid "Room invitation"
 msgstr "Kutsu huoneeseen"
 
-#: ../src/empathy-event-manager.c:839
+#: ../src/empathy-event-manager.c:716
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Kutsu liittyÃ kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:846
+#: ../src/empathy-event-manager.c:723
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s kutsui sinut liittymÃÃn kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:854
-msgid "_Decline"
-msgstr "_KieltÃydy"
-
-#: ../src/empathy-event-manager.c:859
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
+#: ../src/empathy-event-manager.c:736
 msgid "_Join"
 msgstr "_Liity"
 
-#: ../src/empathy-event-manager.c:886
+#: ../src/empathy-event-manager.c:762
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s kutsui sinut liittymÃÃn kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:892
+#: ../src/empathy-event-manager.c:768
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Sinut on kutsuttu liittymÃÃn kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:943
+#: ../src/empathy-event-manager.c:947
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Saapuva tiedostonsiirto tuttavalta %s"
 
-#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
+#: ../src/empathy-event-manager.c:983 ../src/empathy-roster-window.c:226
 msgid "Password required"
 msgstr "Salasana vaaditaan"
 
-#: ../src/empathy-event-manager.c:1216
-#, c-format
-msgid "%s would like permission to see when you are online"
-msgstr "%s haluaa luvan nÃhdÃ, milloin olet linjoilla"
-
-#: ../src/empathy-event-manager.c:1222
+#: ../src/empathy-event-manager.c:1120
 #, c-format
 msgid ""
 "\n"
@@ -3926,190 +3993,46 @@ msgid "Import Accounts"
 msgstr "Tuo tilejÃ"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:316
+#: ../src/empathy-import-widget.c:303
 msgid "Import"
 msgstr "Tuo"
 
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:312
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: ../src/empathy-import-widget.c:349
+#: ../src/empathy-import-widget.c:336
 msgid "Source"
 msgstr "LÃhde"
 
-#: ../src/empathy-roster-window.c:391
-msgid "Provide Password"
-msgstr "Anna salasana"
-
-#: ../src/empathy-roster-window.c:397
-msgid "Disconnect"
-msgstr "Katkaise yhteys"
-
-#: ../src/empathy-roster-window.c:657
-msgid "You need to setup an account to see contacts here."
-msgstr ""
-
-#: ../src/empathy-roster-window.c:673
-msgid "No match found"
-msgstr "Vastinetta ei lÃytynyt"
-
-#: ../src/empathy-roster-window.c:783
-#, c-format
-msgid "Sorry, %s accounts canât be used until your %s software is updated."
-msgstr ""
-
-#: ../src/empathy-roster-window.c:849
-msgid "Update software..."
-msgstr "PÃivitÃ sovellus..."
-
-#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
-msgid "Close"
-msgstr "Sulje"
-
-#: ../src/empathy-roster-window.c:960
-msgid "Reconnect"
-msgstr "YhdistÃ uudelleen"
-
-#: ../src/empathy-roster-window.c:966
-msgid "Edit Account"
-msgstr "Muokkaa tiliÃ"
-
-#. Translators: this string will be something like:
-#. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1110
-#, c-format
-msgid "Top up %s (%s)..."
-msgstr ""
-
-#: ../src/empathy-roster-window.c:1156
-msgid "Top up account credit"
-msgstr ""
-
-#. top up button
-#: ../src/empathy-roster-window.c:1228
-msgid "Top Up..."
-msgstr ""
-
-#: ../src/empathy-roster-window.c:1952
-msgid "Contact"
-msgstr "Tuttava"
-
-#: ../src/empathy-roster-window.c:2150
-msgid "You need to enable one of your accounts to see contacts here."
-msgstr ""
-
-#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:2158
-#, c-format
-msgid "You need to enable %s to see contacts here."
-msgstr ""
-
-#: ../src/empathy-roster-window.c:2460
-msgid "Contact List"
-msgstr "Tuttavaluettelo"
-
-#: ../src/empathy-roster-window.ui.h:1
-msgid "Account settings"
-msgstr "Tilin asetukset"
-
-#: ../src/empathy-roster-window-menubar.ui.h:2
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversationâ"
-msgstr "_Uusi keskusteluâ"
-
-#: ../src/empathy-roster-window-menubar.ui.h:3
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Callâ"
-msgstr "Uusi _puheluâ"
-
-#: ../src/empathy-roster-window-menubar.ui.h:6
-msgid "_Search for Contactsâ"
-msgstr "Etsi _yhteystietoja..."
-
-#: ../src/empathy-roster-window-menubar.ui.h:7
-msgid "_File Transfers"
-msgstr "_Tiedostosiirrot"
-
-#: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Offline Contacts"
-msgstr "_Poissa linjoilta olevat tuttavat"
-
-#: ../src/empathy-roster-window-menubar.ui.h:9
-msgid "Show P_rotocols"
-msgstr "NÃytÃ p_rotokollat"
-
-#: ../src/empathy-roster-window-menubar.ui.h:10
-msgid "Credit Balance"
-msgstr "Saldo"
-
-#: ../src/empathy-roster-window-menubar.ui.h:11
-msgid "Contacts on a _Map"
-msgstr "Tuttavat _kartalla"
-
-#: ../src/empathy-roster-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_KÃyttÃjÃtilit"
-
-#: ../src/empathy-roster-window-menubar.ui.h:14
-msgid "_Blocked Contacts"
-msgstr "_Estetyt yhteystiedot"
-
-#: ../src/empathy-roster-window-menubar.ui.h:15
-msgid "P_references"
-msgstr "_Asetukset"
-
-#: ../src/empathy-roster-window-menubar.ui.h:16
-msgid "Find in Contact _List"
-msgstr "Etsi _tuttavaluettelosta"
-
-#: ../src/empathy-roster-window-menubar.ui.h:18
-msgid "Sort by _Name"
-msgstr "Lajittele _nimen mukaan"
-
-#: ../src/empathy-roster-window-menubar.ui.h:19
-msgid "Sort by _Status"
-msgstr "Lajittele _tilan mukaan"
-
-#: ../src/empathy-roster-window-menubar.ui.h:20
-msgid "Normal Size With _Avatars"
-msgstr "Normaali koko _avatarien kera"
-
-#: ../src/empathy-roster-window-menubar.ui.h:21
-msgid "N_ormal Size"
-msgstr "_Normaali koko"
-
-#: ../src/empathy-roster-window-menubar.ui.h:22
-msgid "_Compact Size"
-msgstr "_Tiivis koko"
-
-#: ../src/empathy-roster-window-menubar.ui.h:23
-msgid "_Room"
-msgstr "_Huone"
-
-#: ../src/empathy-roster-window-menubar.ui.h:24
-msgid "_Joinâ"
-msgstr "_Liityâ"
+#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:229
+msgid "Invite Participant"
+msgstr "Kutsu osanottaja"
 
-#: ../src/empathy-roster-window-menubar.ui.h:25
-msgid "Join _Favorites"
-msgstr "Liity _suosikkeihin"
+#: ../src/empathy-invite-participant-dialog.c:202
+msgid "Choose a contact to invite into the conversation:"
+msgstr "Valitse keskusteluun kutsuttava tuttava:"
 
-#: ../src/empathy-roster-window-menubar.ui.h:26
-msgid "Manage Favorites"
-msgstr "Hallitse suosikkeja"
+#: ../src/empathy-invite-participant-dialog.c:225
+msgid "Invite"
+msgstr "Kutsu"
 
-#: ../src/empathy-new-chatroom-dialog.c:369
+#: ../src/empathy-new-chatroom-dialog.c:194
 msgid "Chat Room"
 msgstr "Keskusteluhuone"
 
-#: ../src/empathy-new-chatroom-dialog.c:385
+#: ../src/empathy-new-chatroom-dialog.c:209
 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:637
+#: ../src/empathy-new-chatroom-dialog.c:410
+#, fuzzy
+#| msgid "Failed to retrieve recent logs"
+msgid "Failed to list rooms"
+msgstr "Viimeisimpien lokien nouto epÃonnistui"
+
+#: ../src/empathy-new-chatroom-dialog.c:439
 #, c-format
 msgid ""
 "%s\n"
@@ -4122,40 +4045,44 @@ msgstr ""
 "Vaaditaan salasana: %s\n"
 "JÃseniÃ: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
 msgid "Yes"
 msgstr "KyllÃ"
 
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
 msgid "No"
 msgstr "Ei"
 
-#: ../src/empathy-new-chatroom-dialog.c:668
-msgid "Could not start room listing"
-msgstr "Ei voitu aloittaa huoneluettelointia"
-
-#: ../src/empathy-new-chatroom-dialog.c:678
-msgid "Could not stop room listing"
-msgstr "Ei voitu lopettaa huoneluettelointia"
-
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.c:784
 msgid "Join Room"
 msgstr "Liity huoneeseen"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:3
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
 "Anna liityttÃvÃn huoneen nimi tai napsauta yhtÃ tai useampaa huonetta "
 "luettelosta."
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:4
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Room:"
 msgstr "_Keskusteluhuone:"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
+#, fuzzy
+#| msgid ""
+#| "Enter the server which hosts the room, or leave it empty if the room is "
+#| "on the current account's server"
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account&apos;s server"
+msgstr ""
+"Anna palvelin, jolta huone lÃytyy, tai jÃtÃ tyhjÃksi jos huone on tilin "
+"nykyisellÃ palvelimella"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:4
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4163,179 +4090,218 @@ msgstr ""
 "Anna palvelin, jolta huone lÃytyy, tai jÃtÃ tyhjÃksi jos huone on tilin "
 "nykyisellÃ palvelimella"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "_Server:"
+msgstr "Pal_velin:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Couldn't load room list"
 msgstr "Ei voitu ladata huoneluetteloa"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
 msgid "Room List"
 msgstr "Huoneluettelo"
 
-#: ../src/empathy-preferences.c:166
+#: ../src/empathy-notifications-approver.c:188
+msgid "Respond"
+msgstr "Vastaa"
+
+#: ../src/empathy-notifications-approver.c:207
+msgid "Answer with video"
+msgstr "Vastaa videon kanssa"
+
+#: ../src/empathy-notifications-approver.c:215
+#: ../src/empathy-notifications-approver.c:225
+msgid "Decline"
+msgstr "KieltÃydy"
+
+#: ../src/empathy-notifications-approver.c:219
+#: ../src/empathy-notifications-approver.c:230
+msgid "Accept"
+msgstr "HyvÃksy"
+
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:240
+msgid "Provide"
+msgstr "Anna salasana"
+
+#: ../src/empathy-preferences.c:144
 msgid "Message received"
 msgstr "Viesti vastaanotettu"
 
-#: ../src/empathy-preferences.c:167
+#: ../src/empathy-preferences.c:145
 msgid "Message sent"
 msgstr "Viesti lÃhetetty"
 
-#: ../src/empathy-preferences.c:168
+#: ../src/empathy-preferences.c:146
 msgid "New conversation"
 msgstr "Uusi keskustelu"
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:147
 msgid "Contact comes online"
 msgstr "Tuttava saapuu linjoille"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:148
 msgid "Contact goes offline"
 msgstr "Tuttava poistui linjoilta"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:149
 msgid "Account connected"
 msgstr "Tili yhdistetty"
 
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:150
 msgid "Account disconnected"
 msgstr "Tilin yhteys katkaistu"
 
-#: ../src/empathy-preferences.c:475
+#: ../src/empathy-preferences.c:387
 msgid "Language"
 msgstr "Kieli"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:726
+#: ../src/empathy-preferences.c:638
 msgid "Juliet"
 msgstr "Julia"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:733
+#: ../src/empathy-preferences.c:645
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:739
+#: ../src/empathy-preferences.c:651
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
-msgstr "Romeo, Romeo. missÃ olet Romeo?"
+msgstr "Oi, Romeo, Romeo! Miksi olet Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:743
+#: ../src/empathy-preferences.c:655
 msgid "Deny thy father and refuse thy name;"
-msgstr ""
+msgstr "IsÃsi, nimes kiellÃ;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:746
+#: ../src/empathy-preferences.c:658
 msgid "Or if thou wilt not, be but sworn my love"
-msgstr ""
+msgstr "Tai jos sinÃ et sitÃ tahdo, vanno lempes mulle"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:749
+#: ../src/empathy-preferences.c:661
 msgid "And I'll no longer be a Capulet."
-msgstr ""
+msgstr "Ja Capulet en enÃÃ ole minÃ."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:752
+#: ../src/empathy-preferences.c:664
 msgid "Shall I hear more, or shall I speak at this?"
-msgstr ""
+msgstr "Puhunko jo, vai kuuntelenko vielÃ?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:755
+#: ../src/empathy-preferences.c:667
 msgid "Juliet has disconnected"
-msgstr ""
+msgstr "Julia poistui keskustelusta"
 
-#: ../src/empathy-preferences.c:1159
+#: ../src/empathy-preferences.c:1033
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: ../src/empathy-preferences.ui.h:1
-msgid "Show _smileys as images"
-msgstr "NÃytÃ _hymiÃt hymiÃkuvakkeina"
-
 #: ../src/empathy-preferences.ui.h:2
-msgid "Show contact _list in rooms"
-msgstr "NÃytÃ tuttava_luettelo huoneissa"
+#| msgid "Show contact groups"
+msgid "Show groups"
+msgstr "NÃytÃ ryhmÃt"
 
 #: ../src/empathy-preferences.ui.h:3
-msgid "Appearance"
-msgstr "Ulkoasu"
+#| msgid "Show contact groups"
+msgid "Show account balances"
+msgstr "NÃytÃ tilien varallisuus"
+
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2181
+msgid "Contact List"
+msgstr "Tuttavaluettelo"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:5
 msgid "Start chats in:"
 msgstr "Avaa keskustelut:"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:6
 msgid "new ta_bs"
 msgstr "uu_siin vÃlilehtiin"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:7
 msgid "new _windows"
 msgstr "uusiin _ikkunoihin"
 
-#: ../src/empathy-preferences.ui.h:7
-msgid "Display incoming events in the notification area"
-msgstr "NÃytÃ tulevat tapahtumat tilarivillÃ"
-
 #: ../src/empathy-preferences.ui.h:8
-msgid "_Automatically connect on startup"
-msgstr "_YhdistÃ automaattisesti kÃynnistyksen yhteydessÃ"
+msgid "Show _smileys as images"
+msgstr "NÃytÃ _hymiÃt hymiÃkuvakkeina"
 
 #: ../src/empathy-preferences.ui.h:9
+msgid "Show contact _list in rooms"
+msgstr "NÃytÃ tuttava_luettelo huoneissa"
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Log conversations"
 msgstr "Tallenna keskustelut lokitiedostoon"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
+msgid "Display incoming events in the notification area"
+msgstr "NÃytÃ tulevat tapahtumat ilmoitusalueella"
+
+#: ../src/empathy-preferences.ui.h:13
+msgid "_Automatically connect on startup"
+msgstr "_YhdistÃ automaattisesti kÃynnistyksen yhteydessÃ"
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "Behavior"
-msgstr "KÃytÃs"
+msgstr "Toiminta"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:15
 msgid "General"
-msgstr "Yleinen"
+msgstr "Yleiset"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:16
 msgid "_Enable bubble notifications"
-msgstr "_KÃytÃ ponnahdusikkunahuomautuksia"
+msgstr "_KÃytÃ ponnahdusikkunailmoituksia"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:17
 msgid "Disable notifications when _away or busy"
-msgstr "Poista huomautukset kÃytÃstÃ oltaessa _poissa tai kiireinen"
+msgstr "Poista ilmoitukset kÃytÃstÃ oltaessa _poissa tai kiireinen"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:18
 msgid "Enable notifications when the _chat is not focused"
-msgstr "NÃytÃ huomautuksia, kun _keskustelu ei ole kohdistettu"
+msgstr "NÃytÃ ilmoituksia, kun _keskustelu ei ole kohdistettu"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:19
 msgid "Enable notifications when a contact comes online"
 msgstr "NÃytÃ ponnahdusikkuna, kun tuttava tulee linjoille"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:20
 msgid "Enable notifications when a contact goes offline"
 msgstr "NÃytÃ ponnahdusikkuna, kun tuttava lÃhtee linjoilta"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:21
 msgid "Notifications"
-msgstr "Huomautukset"
+msgstr "Ilmoitukset"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:22
 msgid "_Enable sound notifications"
 msgstr "_KÃytÃ merkkiÃÃniÃ"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:23
 msgid "Disable sounds when _away or busy"
 msgstr "Poista ÃÃnet kÃytÃstÃ oltaessa _poissa tai kiireinen"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:24
 msgid "Play sound for events"
 msgstr "Soita ÃÃniÃ tapahtumille"
 
-#: ../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 "Use _echo cancellation to improve call quality"
 msgstr "KÃytÃ _kaiunpoistoa puhelun laadun parantamiseksi"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "Echo cancellation helps to make your voice sound clearer to the other "
 "person, but may cause problems on some computers. If you or the other person "
@@ -4347,11 +4313,11 @@ msgstr ""
 "outoja ÃÃniÃ puhelun aikana, kokeile poistaa kaiun poisto kÃytÃstÃ ja "
 "soittaa puhelu uudelleen."
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Publish location to my contacts"
 msgstr "_Julkaise sijainti tuttavilleni"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:31
 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 "
@@ -4361,31 +4327,31 @@ msgstr ""
 "ja maasi julkaistaan. GPS-koordinaattien tarkkuus on yksi desimaali."
 
 #. 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:29
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Reduce location accuracy"
 msgstr "_HeikennÃ sijaintitiedon tarkkuutta"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:34
 msgid "Privacy"
 msgstr "Yksityisyys"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Cellphone"
 msgstr "_Matkapuhelin"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Verkko (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:38
 msgid "Location sources:"
 msgstr "Sijainti:"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:40
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4393,333 +4359,389 @@ msgstr ""
 "Luettelo kielistÃ sisÃltÃÃ ainoastaan ne kielet, joille tietokoneessasi on "
 "asennettu sanakirja."
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:41
 msgid "Enable spell checking for languages:"
 msgstr "KÃytÃ kielentarkistusta kielille:"
 
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:42
 msgid "Spell Checking"
 msgstr "Kielentarkastus"
 
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:43
 msgid "Chat Th_eme:"
 msgstr "Keskustelun _teema:"
 
-#: ../src/empathy-preferences.ui.h:40
+#: ../src/empathy-preferences.ui.h:44
 msgid "Variant:"
 msgstr "Muunnelma:"
 
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:45
 msgid "Themes"
 msgstr "Teemat"
 
-#: ../src/empathy-status-icon.ui.h:4
-msgid "Status"
-msgstr "Tila"
+#: ../src/empathy-roster-window.c:243
+msgid "Provide Password"
+msgstr "Anna salasana"
+
+#: ../src/empathy-roster-window.c:249
+msgid "Disconnect"
+msgstr "Katkaise yhteys"
+
+#: ../src/empathy-roster-window.c:443
+msgid "You need to setup an account to see contacts here."
+msgstr "MÃÃritÃ tiliesi asetukset, jotta nÃet tuttavat tÃssÃ luettelossa."
+
+#: ../src/empathy-roster-window.c:531
+#, c-format
+msgid "Sorry, %s accounts canât be used until your %s software is updated."
+msgstr ""
+"Valitettavasti %s-tilejÃsi ei voi kÃyttÃÃ, ennen kuin %s on pÃivitetty."
+
+#: ../src/empathy-roster-window.c:597
+msgid "Update software..."
+msgstr "PÃivitÃ sovellus..."
+
+#: ../src/empathy-roster-window.c:603 ../src/empathy-roster-window.c:720
+msgid "Close"
+msgstr "Sulje"
+
+#: ../src/empathy-roster-window.c:708
+msgid "Reconnect"
+msgstr "YhdistÃ uudelleen"
+
+#: ../src/empathy-roster-window.c:714
+msgid "Edit Account"
+msgstr "Muokkaa tiliÃ"
+
+#: ../src/empathy-roster-window.c:894
+#, fuzzy
+#| msgid "New %s account"
+msgid "Top up account"
+msgstr "Uusi %s-tili"
+
+#: ../src/empathy-roster-window.c:1556
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr ""
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:1564
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr ""
+
+#: ../src/empathy-roster-window.c:1624
+msgid "Change your presence to see contacts here"
+msgstr ""
+
+#: ../src/empathy-roster-window.c:1633
+msgid "No match found"
+msgstr "Vastinetta ei lÃytynyt"
+
+#: ../src/empathy-roster-window.c:1638
+#| msgid "Show offline contacts"
+msgid "No online contacts"
+msgstr "Tuttavia ei ole linjoilla"
+
+#: ../src/empathy-roster-window-menubar.ui.h:1
+#| msgid "New Conversation"
+msgid "_New Conversation..."
+msgstr "_Uusi keskustelu..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#| msgid "New Call"
+msgid "New _Call..."
+msgstr "Uu_si puhelu..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#| msgid "Contact"
+msgid "Contacts"
+msgstr "Tuttavat"
+
+#: ../src/empathy-roster-window-menubar.ui.h:4
+#| msgid "_Add Contact"
+msgid "_Add Contacts..."
+msgstr "_LisÃÃ tuttavia..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:5
+#| msgid "_Search for Contactsâ"
+msgid "_Search for Contacts..."
+msgstr "Etsi tutta_via..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Blocked Contacts"
+msgstr "_Estetyt tuttavat"
+
+#: ../src/empathy-roster-window-menubar.ui.h:7
+#| msgid "_Room"
+msgid "_Rooms"
+msgstr "_Huoneet"
+
+#: ../src/empathy-roster-window-menubar.ui.h:8
+#| msgid "_Join"
+msgid "_Join..."
+msgstr "_Liity..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Join _Favorites"
+msgstr "Liity _suosikkeihin"
+
+#: ../src/empathy-roster-window-menubar.ui.h:10
+#| msgid "Manage Favorites"
+msgid "_Manage Favorites"
+msgstr "_Hallitse suosikkeja"
+
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_File Transfers"
+msgstr "_Tiedostosiirrot"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_KÃyttÃjÃtilit"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "P_references"
+msgstr "_Asetukset"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
+#| msgid "_Help"
+msgid "Help"
+msgstr "Ohje"
+
+#: ../src/empathy-roster-window-menubar.ui.h:16
+#| msgid "Empathy"
+msgid "About Empathy"
+msgstr "Tietoja pikaviestimestÃ"
 
+#: ../src/empathy-roster-window-menubar.ui.h:17
 #: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Redial"
-msgstr "YhdistÃ uudelleen"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Tilin asetukset"
 
-#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-roster-window.ui.h:2
+msgid "Go _Online"
+msgstr ""
 
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Video Off"
-msgstr "Video pois"
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversationâ"
+msgstr "_Uusi keskusteluâ"
 
-#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Video Preview"
-msgstr "Videon esikatselu"
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Callâ"
+msgstr "Uusi _puheluâ"
 
-#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Video On"
-msgstr "Video pÃÃllÃ"
+#: ../src/empathy-status-icon.ui.h:4
+msgid "Status"
+msgstr "Tila"
 
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Call the contact again"
-msgstr "Soita tuttavalle uudelleen"
+#: ../ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-widget.c:179
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
+msgid "Done"
+msgstr "Valmis"
 
-#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Camera Off"
-msgstr "Kamera pois"
+#: ../ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-widget.c:210
+msgid "Please enter your account details"
+msgstr "Anna tilisi tiedot"
 
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Disable camera and stop sending video"
-msgstr "Kytke kamera poista kÃytÃstÃ ja lopeta videokuvan lÃhetys"
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:160
+#, c-format
+#| msgid "Loading account information"
+msgid "Edit %s account options"
+msgstr "Muokkaa %s-tilin tietoja"
 
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Preview"
-msgstr "Esikatselu"
+#~ msgid "Manage Messaging and VoIP accounts"
+#~ msgstr "Hallitse viestimiÃ ja Internet-puheluiden (VoIP) kÃyttÃjÃtilejÃ"
 
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Enable camera but don't send video"
-msgstr "Ota kamera kÃyttÃÃn, mutta ÃlÃ lÃhetÃ videokuvaa"
+#~ msgid "Show avatars"
+#~ msgstr "NÃytÃ avatar-kuvat"
 
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Camera On"
-msgstr "Kamera pÃÃllÃ"
+#~ msgid ""
+#~ "Whether to show avatars for contacts in the contact list and chat windows."
+#~ msgstr ""
+#~ "NÃytetÃÃnkÃ tuttavien avatar-kuvakkeet tuttavaluettelossa ja "
+#~ "keskusteluikkunoissa."
 
-#: ../src/empathy-streamed-media-window.ui.h:18
-msgid "Enable camera and send video"
-msgstr "Ota kamera kÃyttÃÃn ja lÃhetÃ videokuvaa"
+#~ msgid "Show protocols"
+#~ msgstr "NÃytÃ protokollat"
 
-#: ../src/empathy-map-view.c:471
-msgid "Contact Map View"
-msgstr "Tuttavien karttanÃkymÃ"
+#~ msgid "Whether to show protocols for contacts in the contact list."
+#~ msgstr "NÃytetÃÃnkÃ tuttavien yhteyskÃytÃnnÃt tuttavaluettelossa."
 
-#: ../src/empathy-debug-window.c:1607
-msgid "Save"
-msgstr "Tallenna"
+#~ msgid "Compact contact list"
+#~ msgstr "Pienikokoinen tuttavaluettelo"
 
-#: ../src/empathy-debug-window.c:1667
-msgid "Pastebin link"
-msgstr "Pastebin-linkki"
+#~ msgid "Whether to show the contact list in compact mode."
+#~ msgstr "NÃytetÃÃnkÃ tuttavaluettelo pienoiskokoa kÃytettÃessÃ."
 
-#: ../src/empathy-debug-window.c:1676
-msgid "Pastebin response"
-msgstr "Pastebin-vastaus"
+#~ msgid "Contact list sort criterion"
+#~ msgstr "Tuttavaluettelon lajitteluperuste"
 
-#: ../src/empathy-debug-window.c:1683
-msgid "Data too large for a single paste. Please save logs to file."
-msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "Which criterion to use when sorting the contact list. Default is to sort "
+#~ "by the contact's state with the value \"state\". A value of \"name\" will "
+#~ "sort the contact list by name."
+#~ msgstr ""
+#~ "Kuinka tuttavaluettelo jÃrjestetÃÃn. Oletusarvolla \"name\" "
+#~ "jÃrjestelyperusteena on tuttavan nimi. Arvolla \"state\" luettelo "
+#~ "jÃrjestetÃÃn tuttavien tilan perusteella."
 
-#: ../src/empathy-debug-window.c:1912
-msgid "Debug Window"
-msgstr "VianetsintÃikkuna"
+#~ msgid "Network:"
+#~ msgstr "Verkko:"
 
-#: ../src/empathy-debug-window.c:1970
-msgid "Send to pastebin"
-msgstr "LÃhetÃ pastebin-palveluun"
+#~ msgid "Password:"
+#~ msgstr "Salasana:"
 
-#: ../src/empathy-debug-window.c:2009
-msgid "Pause"
-msgstr "PysÃytÃ"
+#~ msgid "Port:"
+#~ msgstr "Portti:"
 
-#: ../src/empathy-debug-window.c:2021
-msgid "Level "
-msgstr "Taso "
+#~ msgid "%A %B %d %Y"
+#~ msgstr "%A %d. %Bta %Y"
 
-#: ../src/empathy-debug-window.c:2040
-msgid "Debug"
-msgstr "VirheenjÃljitys"
+#~ msgid "_Block User"
+#~ msgstr "Es_tÃ kÃyttÃjÃ"
 
-#: ../src/empathy-debug-window.c:2045
-msgid "Info"
-msgstr "Tietoa"
+#~ msgid "Decide _Later"
+#~ msgstr "_PÃÃtÃ myÃhemmin"
 
-#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
-msgid "Message"
-msgstr "Viesti"
+#~ msgid "Classic"
+#~ msgstr "Perinteinen"
 
-#: ../src/empathy-debug-window.c:2055
-msgid "Warning"
-msgstr "Varoitus"
+#~ msgid "Simple"
+#~ msgstr "Yksinkertainen"
 
-#: ../src/empathy-debug-window.c:2060
-msgid "Critical"
-msgstr "Kriittinen"
+#~ msgid "Clean"
+#~ msgstr "Siisti"
 
-#: ../src/empathy-debug-window.c:2065
-msgid "Error"
-msgstr "Virhe"
+#~ msgid "Blue"
+#~ msgstr "Sininen"
 
-#: ../src/empathy-debug-window.c:2084
-msgid "Time"
-msgstr "Aika"
+#~ msgid "Failed to retrieve your personal information from the server."
+#~ msgstr "HenkilÃkohtaisten tietojesi nouto palvelimelta epÃonnistui."
 
-#: ../src/empathy-debug-window.c:2087
-msgid "Domain"
-msgstr "Alue"
+#~ msgid "_Disable"
+#~ msgstr "Ota _pois kÃytÃstÃ"
 
-#: ../src/empathy-debug-window.c:2089
-msgid "Category"
-msgstr "Luokka"
+#~ msgid "Contrast"
+#~ msgstr "Kontrasti"
 
-#: ../src/empathy-debug-window.c:2091
-msgid "Level"
-msgstr "Taso"
+#~ msgid "Brightness"
+#~ msgstr "Kirkkaus"
 
-#: ../src/empathy-debug-window.c:2114
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
-msgstr "Valittu yhteyshallinta ei tue etÃvianetsintÃlaajennusta."
+#~ msgid "Gamma"
+#~ msgstr "Gamma"
 
-#: ../src/empathy-invite-participant-dialog.c:202
-#: ../src/empathy-invite-participant-dialog.c:230
-msgid "Invite Participant"
-msgstr "Kutsu osanottaja"
+#~ msgid "Volume"
+#~ msgstr "ÃÃnenvoimakkuus"
 
-#: ../src/empathy-invite-participant-dialog.c:203
-msgid "Choose a contact to invite into the conversation:"
-msgstr "Valitse keskusteluun kutsuttava tuttava:"
+#~ msgid "_Sidebar"
+#~ msgstr "_Sivupalkki"
 
-#: ../src/empathy-invite-participant-dialog.c:226
-msgid "Invite"
-msgstr "Kutsu"
+#~ msgid "Audio input"
+#~ msgstr "ÃÃnisyÃte"
 
-#: ../src/empathy-accounts.c:180
-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"
+#~ msgid "Video input"
+#~ msgstr "VideosyÃte"
 
-#: ../src/empathy-accounts.c:184
-msgid ""
-"Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr ""
+#~ msgid "Dialpad"
+#~ msgstr "Valintalevy"
 
-#: ../src/empathy-accounts.c:188
-msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "Valitse tili alussa (esim. gabble/jabber/foo_40example_2eorg0)"
+#~ msgid "Details"
+#~ msgstr "Tiedot"
 
-#: ../src/empathy-accounts.c:190
-msgid "<account-id>"
-msgstr "<kÃyttÃjÃtunnus>"
+#~ msgctxt "codec"
+#~ msgid "Unknown"
+#~ msgstr "Tuntematon"
 
-#: ../src/empathy-accounts.c:195
-msgid "- Empathy Accounts"
-msgstr "- Empathy-tilit"
+#~ msgid "Connected â %d:%02dm"
+#~ msgstr "Yhdistetty -- %d:%02d min"
 
-#: ../src/empathy-accounts.c:231
-msgid "Empathy Accounts"
-msgstr "Empathy-tilit"
+#~ msgid "Send Video"
+#~ msgstr "LÃhetÃ video"
 
-#: ../src/empathy-debugger.c:69
-msgid "Show a particular service"
-msgstr "NÃytÃ tietty palvelu"
+#~ msgid "Send Audio"
+#~ msgstr "LÃhetÃ ÃÃntÃ"
 
-#: ../src/empathy-debugger.c:74
-msgid "- Empathy Debugger"
-msgstr ""
+#~ msgid "_Offline Contacts"
+#~ msgstr "_Poissa linjoilta olevat tuttavat"
 
-#: ../src/empathy-debugger.c:113
-msgid "Empathy Debugger"
-msgstr "Empathyn virheenjÃljitin"
+#~ msgid "Show P_rotocols"
+#~ msgstr "NÃytÃ p_rotokollat"
 
-#: ../src/empathy-chat.c:109
-msgid "- Empathy Chat Client"
-msgstr "- Empathy-keskusteluasiakas"
+#~ msgid "Credit Balance"
+#~ msgstr "Saldo"
 
-#: ../src/empathy-notifications-approver.c:189
-msgid "Respond"
-msgstr "Vastaa"
+#~ msgid "Contacts on a _Map"
+#~ msgstr "Tuttavat _kartalla"
 
-#: ../src/empathy-notifications-approver.c:203
-#: ../src/empathy-call-window.c:1529
-msgid "Reject"
-msgstr "HylkÃÃ"
+#~ msgid "Find in Contact _List"
+#~ msgstr "Etsi _tuttavaluettelosta"
 
-#: ../src/empathy-notifications-approver.c:208
-#: ../src/empathy-notifications-approver.c:213
-#: ../src/empathy-call-window.c:1530
-msgid "Answer"
-msgstr "Vastaa"
+#~ msgid "Sort by _Name"
+#~ msgstr "Lajittele _nimen mukaan"
 
-#: ../src/empathy-notifications-approver.c:213
-msgid "Answer with video"
-msgstr "Vastaa videon kanssa"
+#~ msgid "Sort by _Status"
+#~ msgstr "Lajittele _tilan mukaan"
 
-#: ../src/empathy-notifications-approver.c:221
-#: ../src/empathy-notifications-approver.c:231
-msgid "Decline"
-msgstr "KieltÃydy"
+#~ msgid "Normal Size With _Avatars"
+#~ msgstr "Normaali koko _avatarien kera"
 
-#: ../src/empathy-notifications-approver.c:225
-#: ../src/empathy-notifications-approver.c:236
-msgid "Accept"
-msgstr "HyvÃksy"
+#~ msgid "N_ormal Size"
+#~ msgstr "_Normaali koko"
 
-#. translators: the 'Provide' button is displayed in a notification
-#. * bubble when Empathy is asking for an account password; clicking on it
-#. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:246
-msgid "Provide"
-msgstr ""
+#~ msgid "_Compact Size"
+#~ msgstr "_Tiivis koko"
 
-#: ../src/empathy-call-observer.c:132
-#, 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 "_Joinâ"
+#~ msgstr "_Liityâ"
 
-#. Translators: this is an "Info" label. It should be as short
-#. * as possible.
-#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162
-msgid "i"
-msgstr ""
+#~ msgid "Could not start room listing"
+#~ msgstr "Ei voitu aloittaa huoneluettelointia"
 
-#: ../src/empathy-call-window.c:2888
-msgid "On hold"
-msgstr "Pidossa"
+#~ msgid "Could not stop room listing"
+#~ msgstr "Ei voitu lopettaa huoneluettelointia"
 
-#: ../src/empathy-call-window.c:2891
-msgid "Mute"
-msgstr "Vaimenna"
+#~ msgid "Appearance"
+#~ msgstr "Ulkoasu"
 
-#: ../src/empathy-call-window.c:2893
-msgid "Duration"
-msgstr "Kesto"
+#~ msgid "Redial"
+#~ msgstr "YhdistÃ uudelleen"
 
-#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2896
-#, c-format
-msgid "%s â %d:%02dm"
-msgstr ""
+#~ msgid "V_ideo"
+#~ msgstr "V_ideo"
 
-#: ../src/empathy-call-window.c:3166
-#, c-format
-msgid "Your current balance is %s."
-msgstr ""
+#~ msgid "Video Off"
+#~ msgstr "Video pois"
 
-#: ../src/empathy-call-window.c:3170
-msgid "Sorry, you donât have enough credit for that call."
-msgstr ""
+#~ msgid "Video Preview"
+#~ msgstr "Videon esikatselu"
 
-#: ../src/empathy-call-window.c:3172
-msgid "Top Up"
-msgstr ""
+#~ msgid "Video On"
+#~ msgstr "Video pÃÃllÃ"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
-msgid "_Match case"
-msgstr "_Huomioi kirjainkoko"
+#~ msgid "Call the contact again"
+#~ msgstr "Soita tuttavalle uudelleen"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "MinkÃ tyyppinen pikaviestintili sinulla on?"
+#~ msgid "Camera Off"
+#~ msgstr "Kamera pois"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:166
-msgid "Adding new account"
-msgstr "LisÃtÃÃn uutta tiliÃ"
+#~ msgid "Disable camera and stop sending video"
+#~ msgstr "Kytke kamera poista kÃytÃstÃ ja lopeta videokuvan lÃhetys"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
-msgid "People nearby"
-msgstr "LÃhellÃ olevat ihmiset"
+#~ msgid "Preview"
+#~ msgstr "Esikatselu"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
-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 "
-"details below are correct."
-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 tiedot ovat oikein."
+#~ msgid "Enable camera but don't send video"
+#~ msgstr "Ota kamera kÃyttÃÃn, mutta ÃlÃ lÃhetÃ videokuvaa"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
-msgid ""
-"You can change these details later or disable this feature by choosing <span "
-"style=\"italic\">Edit â Accounts</span> in the Contact List."
-msgstr ""
-"Voit muuttaa nÃitÃ tietoja myÃhemmin tai poistaa tÃmÃn ominaisuuden kÃytÃstÃ "
-"valitsemalla tuttavaluettelossa <span style=\"italic\">Muokkaa â "
-"KÃyttÃjÃtilit</span>."
+#~ msgid "Camera On"
+#~ msgstr "Kamera pÃÃllÃ"
+
+#~ msgid "Enable camera and send video"
+#~ msgstr "Ota kamera kÃyttÃÃn ja lÃhetÃ videokuvaa"
 
-#~ msgid "%s"
-#~ msgstr "%s"
+#~ msgid "Contact Map View"
+#~ msgstr "Tuttavien karttanÃkymÃ"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]