[empathy] Finnish translation update from http://l10n.laxstrom.name/wiki/Gnome_3.4 translation sprint

From: Timo Jyrinki <tjyrinki src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy] Finnish translation update from http://l10n.laxstrom.name/wiki/Gnome_3.4 translation sprint
Date: Mon, 12 Mar 2012 10:04:15 +0000 (UTC)
commit 7a7dfce6fd9e46b3a33aff4639407e586fe80a23
Author: Timo Jyrinki <timo debian org>
Date:   Mon Mar 12 10:56:45 2012 +0200

    Finnish translation update from http://l10n.laxstrom.name/wiki/Gnome_3.4 translation sprint

 po/fi.po | 4161 ++++++++++++++++++++++++++++----------------------------------
 1 files changed, 1883 insertions(+), 2278 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 45eb546..718756f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,518 +9,516 @@
 # Timo Jyrinki https://launchpad.net/~timo-jyrinki
 # Tommi Saira https://launchpad.net/~tommisaira
 # Ville-Pekka Vainio <vpivaini cs helsinki fi>, 2010.
+# Gnome 2012-03 Finnish translation sprint participants:
+# Jiri GrÃnroos
+# Niklas LaxstrÃm
+# Timo Jyrinki
 msgid ""
 msgstr ""
+""
 "Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-08 13:41+0300\n"
-"PO-Revision-Date: 2011-09-08 13:41+0300\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n";
+"POT-Creation-Date: 2012-03-02 10:35+0000\n"
+"PO-Revision-Date: 2012-03-12 08:36:45+0000\n"
 "Last-Translator: Timo Jyrinki <timo jyrinki iki fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu lists sourceforge net>\n"
-"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 2012-03-05 15:05:34+0000\n"
+"X-Generator: MediaWiki 1.20alpha (r113129); Translate 2012-03-02\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Keskustele kÃyttÃen Google Talkia, Facebookia, MSN:ÃÃ ja monia muita "
-"palveluja"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "pikaviestin"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empathy-pikaviestin"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "pikaviestin"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+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:2450
+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
-msgid "Always open a separate chat window for new chats."
-msgstr "Avaa aina uusi ikkuna uusille keskusteluille."
+msgid "Connection managers should be used"
+msgstr "Yhteyden hallintaohjelmia tulisi kÃyttÃÃ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Puhelun ÃÃnenvoimakkuus"
+msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
+msgstr "KÃyttÃÃkÃ Empathy yhteyksienhallintaa verkkoyhteyksien automaattiseen luomiseen ja katkaisuun."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Puhelun ÃÃnenvoimakkuus prosentteina."
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy yrittÃÃ yhdistÃÃ automaattisesti kÃynnistettÃessÃ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "Kamera"
+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
-msgid "Camera position"
-msgstr "Kameran sijainti"
+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
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Lempinimen jÃlkeen lisÃttÃvÃ merkki, kun kÃytetÃÃn lempinimen tÃydennystÃ "
-"(sarkain) ryhmÃkeskustelussa."
+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
-msgid "Chat window theme"
-msgstr "Keskusteluikkunan teema"
+msgid "Empathy default download folder"
+msgstr "Empathyn noutojen oletuskansio"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Keskusteluikkunan teemamuunnos"
+msgid "The default folder to save file transfers in."
+msgstr "Oletuskansio, johon siirretyt tiedostot tallennetaan."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"Pilkuilla eroteltu lista oikeinkirjoituksen tarkistusohjelman kÃyttÃmistÃ "
-"kielistÃ (esim. \"fi, en, fr\")."
+msgid "Show offline contacts"
+msgstr "NÃytÃ linjoilta poissa olevat tuttavat"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Pienikokoinen tuttavaluettelo"
+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:11
-msgid "Connection managers should be used"
-msgstr "Yhteyden hallintaohjelmia tulisi kÃyttÃÃ"
+msgid "Show avatars"
+msgstr "NÃytÃ avatar-kuvat"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Tuttavaluettelon lajitteluperuste"
+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:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Oletuskamera videopuheluihin, esim. /dev/video0"
+msgid "Show protocols"
+msgstr "NÃytÃ protokollat"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "Oletushakemisto, josta avatar-kuvat haetaan"
+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:15
-msgid "Disable popup notifications when away"
-msgstr "ÃlÃ nÃytÃ ponnahdusikkunoita poissaollessa"
+msgid "Show Balance in contact list"
+msgstr "NÃytÃ saldo yhteystietoluettelossa"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "ÃlÃ soita ÃÃniÃ poissaollessa"
+msgid "Whether to show account balances in the contact list."
+msgstr "Haluatko nÃyttÃÃ tilien saldot yhteystietoluettelossa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "NÃytÃ ajankohtaiset tapahtumat tilarivillÃ"
+msgid "Compact contact list"
+msgstr "Pienikokoinen tuttavaluettelo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"NÃytÃ ajankohtaiset tapahtumat tilarivillÃ. MikÃli epÃtosi, nÃytÃ ne "
-"kÃyttÃjÃlle vÃlittÃmÃsti."
+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:19
-msgid "Echo cancellation support"
-msgstr "Kaiun poiston tuki"
+msgid "Hide main window"
+msgstr "Piilota pÃÃikkuna"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Empathy voi julkaista kÃyttÃjÃn sijainnin"
+msgid "Hide the main window."
+msgstr "Piilota pÃÃikkuna."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy voi kÃyttÃÃ GPS:ÃÃ paikantamaan sijainnin"
+msgid "Default directory to select an avatar image from"
+msgstr "Oletushakemisto, josta avatar-kuvat haetaan"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy voi kÃyttÃÃ matkapuhelinverkkoa paikantamaan sijainnin"
+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:23
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy voi kÃyttÃÃ verkkoa paikantamaan sijainnin"
+msgid "Open new chats in separate windows"
+msgstr "Avaa uusi ikkuna uusille keskusteluille"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Empathyn noutojen oletuskansio"
+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:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy on siirtÃnyt butterfly:n lokit"
+msgid "Display incoming events in the status area"
+msgstr "NÃytÃ ajankohtaiset tapahtumat tilarivillÃ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr ""
-"Empathyn tulisi merkitÃ automaattisesti poissaolevaksi, mikÃli konetta ei "
-"kÃytetÃ"
+msgid "Display incoming events in the status area. If false, present them to the user immediately."
+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:27
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy yrittÃÃ yhdistÃÃ automaattisesti kÃynnistettÃessÃ"
+msgid "The position for the chat window side pane"
+msgstr "Keskusteluikkunan sivupaneelin sijainti"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathyn pitÃÃ heikentÃÃ sijainnin tarkkuutta"
+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:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy yrittÃÃ kÃyttÃÃ tuttavan avatarta keskusteluikkunan kuvakkeena"
+msgid "Show contact groups"
+msgstr "NÃytÃ yhteyshenkilÃryhmÃt"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "KÃytÃ WebKit-kehittÃjÃn tyÃkaluja"
+#, fuzzy
+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:31
-msgid "Enable popup notifications for new messages"
-msgstr "NÃytÃ ponnahdusikkuna uusille viesteille"
+msgid "Contact list sort criterion"
+msgstr "Tuttavaluettelon lajitteluperuste"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "KÃytÃ oikeinkirjoituksen tarkistusta"
+#, 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:33
-msgid "Hide main window"
-msgstr "Piilota pÃÃikkuna"
+msgid "Use notification sounds"
+msgstr "KÃytÃ merkkiÃÃniÃ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Piilota pÃÃikkuna."
+msgid "Whether to play a sound to notify of events."
+msgstr "Ilmoitetaanko tapahtumista merkkiÃÃnin."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "Lempinimen tÃydennysmerkki"
+msgid "Disable sounds when away"
+msgstr "ÃlÃ soita ÃÃniÃ poissaollessa"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "Avaa uusi ikkuna uusille keskusteluille"
+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:37
-msgid "Path of the Adium theme to use"
-msgstr "KÃytettÃvÃn Adium-teeman sijainti"
+msgid "Play a sound for incoming messages"
+msgstr "Soita merkkiÃÃni saapuville viesteille"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Adium-teeman sijainti Adiumia keskustelun teemana kÃytettÃessÃ."
+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:39
-msgid "Play a sound for incoming messages"
-msgstr "Soita merkkiÃÃni saapuville viesteille"
+msgid "Play a sound for outgoing messages"
+msgstr "Soita merkkiÃÃni lÃhetettÃville viesteille"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "Soita merkkiÃÃni uusista keskusteluista"
+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:41
-msgid "Play a sound for outgoing messages"
-msgstr "Soita merkkiÃÃni lÃhetettÃville viesteille"
+msgid "Play a sound for new conversations"
+msgstr "Soita merkkiÃÃni uusista keskusteluista"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "Soita merkkiÃÃni tuttavan kirjautuessa sisÃÃn"
+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:43
-msgid "Play a sound when a contact logs out"
-msgstr "Soita merkkiÃÃni tuttavan kirjautuessa ulos"
+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:44
-msgid "Play a sound when we log in"
-msgstr "Soita merkkiÃÃni kirjauduttaessa sisÃÃn"
+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:45
-msgid "Play a sound when we log out"
-msgstr "Soita merkkiÃÃni kirjauduttaessa ulos"
+msgid "Play a sound when a contact logs out"
+msgstr "Soita merkkiÃÃni tuttavan kirjautuessa ulos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Ponnahdusilmoitus kohdistamattomasta keskustelusta"
+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:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "Ponnahdusilmoitus tuttavan kirjautuessa sisÃÃn"
+msgid "Play a sound when we log in"
+msgstr "Soita merkkiÃÃni kirjauduttaessa sisÃÃn"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "Ponnahdusilmoitus tuttavan kirjautuessa ulos"
+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:49
-msgid "Position the camera preview should be during a call."
-msgstr ""
+msgid "Play a sound when we log out"
+msgstr "Soita merkkiÃÃni kirjauduttaessa ulos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr ""
+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:51
-msgid "Show avatars"
-msgstr "NÃytÃ avatar-kuvat"
+msgid "Enable popup notifications for new messages"
+msgstr "NÃytÃ ponnahdusikkuna uusille viesteille"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "NÃytÃ tuttavaluettelo huoneissa"
+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:53
-msgid "Show hint about closing the main window"
-msgstr "NÃytÃ vihje pÃÃikkunan sulkemisesta"
+msgid "Disable popup notifications when away"
+msgstr "ÃlÃ nÃytÃ ponnahdusikkunoita poissaollessa"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "NÃytÃ linjoilta poissa olevat tuttavat"
+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:55
-msgid "Show protocols"
-msgstr "NÃytÃ protokollat"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Ponnahdusilmoitus kohdistamattomasta keskustelusta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "Kielentarkastuksessa kÃytetyt kielet"
+msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
+msgstr "NÃytetÃÃnkÃ avatussa, kohdistamattomassa keskustelussa saapuneesta uudesta viestistÃ ponnahdusilmoitus."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "Oletuskansio, johon siirretyt tiedostot tallennetaan."
+msgid "Pop up notifications when a contact logs in"
+msgstr "Ponnahdusilmoitus tuttavan kirjautuessa sisÃÃn"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Viimeisin hakemisto, josta avatar-kuva oli valittu."
+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:59
-msgid "The position for the chat window side pane"
-msgstr "Keskusteluikkunan sivupaneelin sijainti"
+msgid "Pop up notifications when a contact logs out"
+msgstr "Ponnahdusilmoitus tuttavan kirjautuessa ulos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Keskusteluikkunan sivupaneelin tallennettu sijainti (pikseleinÃ)."
+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:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Keskusteluikkunoissa kÃytettÃvÃ teema."
+msgid "Use graphical smileys"
+msgstr "KÃytÃ hymiÃkuvakkeita"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr ""
-"Teemamuunnos jota kÃytetÃÃn nÃyttÃmÃÃn keskustelu keskusteluikkunoissa."
+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:63
-msgid "Use graphical smileys"
-msgstr "KÃytÃ hymiÃkuvakkeita"
+msgid "Show contact list in rooms"
+msgstr "NÃytÃ tuttavaluettelo huoneissa"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "KÃytÃ merkkiÃÃniÃ"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "NÃytetÃÃnkÃ tuttavaluettelo keskusteluhuoneissa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "KÃytÃ teemaa keskusteluhuoneille"
+msgid "Chat window theme"
+msgstr "Keskusteluikkunan teema"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Saako Empathy paljastaa kÃyttÃjÃn sijainnin tuttaville."
+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:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Saako Empathy kÃyttÃÃ GPS:ÃÃ sijainnin arvaamiseen."
+msgid "Chat window theme variant"
+msgstr "Keskusteluikkunan teemamuunnos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Saako Empathy kÃyttÃÃ matkapuhelinverkkoa sijainnin arvaamiseen."
+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:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Saako Empathy kÃyttÃÃ verkkoa sijainnin arvaamiseen."
+msgid "Path of the Adium theme to use"
+msgstr "KÃytettÃvÃn Adium-teeman sijainti"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Onko Empathy siirtÃnyt butterfly-lokit."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Adium-teeman sijainti Adiumia keskustelun teemana kÃytettÃessÃ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"Kirjautuuko Empathy tileillesi automaattisesti kÃynnistymisensÃ yhteydessÃ."
+msgid "Enable WebKit Developer Tools"
+msgstr "KÃytÃ WebKit-kehittÃjÃn tyÃkaluja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"Tulisiko Empathyn merkitÃ kÃyttÃjÃ automaattisesti poissaolevaksi, mikÃli "
-"konetta ei kÃytetÃ."
+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:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Alentaako Empathy sijaintitiedon tarkkuutta yksityisyyden suojaamiseksi."
+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:74
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgid "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
 msgstr ""
-"KÃyttÃÃkÃ Empathy tuttavan avatar-kuvaketta keskusteluikkunan kuvakkeena."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Otetaanko WebKit-kehittÃjÃn tyÃkalut, kuten Web-tutkain, kÃyttÃÃn."
+msgid "Use theme for chat rooms"
+msgstr "KÃytÃ teemaa keskusteluhuoneille"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"KÃyttÃÃkÃ Empathy yhteyksienhallintaa verkkoyhteyksien automaattiseen "
-"luomiseen ja katkaisuun."
+msgid "Whether to use the theme for chat rooms."
+msgstr "KÃytetÃÃnkÃ teemaa keskusteluhuoneissa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "Tarkistetaanko kirjoitetut sanat oikolukukielellÃ."
+msgid "Spell checking languages"
+msgstr "Kielentarkastuksessa kÃytetyt kielet"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "NÃytetÃÃnkÃ keskusteluiden hymiÃt hymiÃkuvakkeina."
+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:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr ""
+msgid "Enable spell checker"
+msgstr "KÃytÃ oikeinkirjoituksen tarkistusta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Ilmoitetaanko tuttavien sisÃÃnkirjautumisesta merkkiÃÃnellÃ."
+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:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Ilmoitetaanko tuttavien uloskirjautumisesta merkkiÃÃnellÃ."
+msgid "Nick completed character"
+msgstr "Lempinimen tÃydennysmerkki"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Ilmoitetaanko tapahtumista merkkiÃÃnin."
+msgid "Character to add after nickname when using nick completion (tab) in group chat."
+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:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Ilmoitetaanko saapuvista viesteistÃ merkkiÃÃnellÃ."
+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:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Ilmoitetaanko uusista keskusteluista merkkiÃÃnellÃ."
+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:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Ilmoitetaanko lÃhtevistÃ viesteistÃ merkkiÃÃnellÃ."
+msgid "Last account selected in Join Room dialog"
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "Ilmoitetaanko verkkoon kirjautumisesta merkkiÃÃnellÃ."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Ilmoitetaanko verkosta uloskirjautumisesta merkkiÃÃnellÃ."
+msgid "Camera device"
+msgstr "Kamera"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Ilmoitetaanko tapahtumista merkkiÃÃnin varattuna tai poissa oltaessa."
+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:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "NÃytetÃÃnkÃ ponnahdusilmoitus tuttavan uloskirjautumisesta."
+msgid "Camera position"
+msgstr "Kameran sijainti"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "NÃytetÃÃnkÃ ponnahdusilmoitus tuttavan sisÃÃnkirjautumisesta."
+msgid "Position the camera preview should be during a call."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"NÃytetÃÃnkÃ avatussa, kohdistamattomassa keskustelussa saapuneesta uudesta "
-"viestistÃ ponnahdusilmoitus."
+msgid "Echo cancellation support"
+msgstr "Kaiun poiston tuki"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "NÃytetÃÃnkÃ uudesta viestistÃ ponnahdusilmoitus."
+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:93
-msgid "Whether to show account balances in the contact list."
-msgstr ""
+msgid "Show hint about closing the main window"
+msgstr "NÃytÃ vihje pÃÃikkunan sulkemisesta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"NÃytetÃÃnkÃ tuttavien avatar-kuvakkeet tuttavaluettelossa ja "
-"keskusteluikkunoissa."
+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:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "NÃytetÃÃnkÃ poissa linjoilta olevat tuttavat tuttavaluettelossa."
+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:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "NÃytetÃÃnkÃ ponnahdusilmoituksia varattuna tai poissa oltaessa."
+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:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "NÃytetÃÃnkÃ tuttavien yhteyskÃytÃnnÃt tuttavaluettelossa."
+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:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "NÃytetÃÃnkÃ tuttavaluettelo keskusteluhuoneissa."
+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:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "NÃytetÃÃnkÃ tuttavaluettelo pienoiskokoa kÃytettÃessÃ."
+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:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr "PyydetÃÃnkÃ pÃÃikkunan sulkemisesta vahvistusta."
+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:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "KÃytetÃÃnkÃ teemaa keskusteluhuoneissa."
+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:102
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
-msgstr ""
-"Kuinka tuttavaluettelo jÃrjestetÃÃn. Oletusarvolla \"name\" "
-"jÃrjestelyperusteena on tuttavan nimi. Arvolla \"state\" luettelo "
-"jÃrjestetÃÃn tuttavien tilan perusteella."
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Saako Empathy kÃyttÃÃ GPS:ÃÃ sijainnin arvaamiseen."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-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:103
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathyn pitÃÃ heikentÃÃ sijainnin tarkkuutta"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "ViestintÃ ja VoIP-kÃyttÃjÃtilit"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Alentaako Empathy sijaintitiedon tarkkuutta yksityisyyden suojaamiseksi."
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "SyytÃ ei annettu"
+
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "Pyydettiin tilan muutosta"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "Keskeytit tiedostonsiirron"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "Toinen osapuoli katkaisi tiedostonsiirron"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "Virhe yritettÃessÃ siirtÃÃ tiedostoa"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "Toinen osapuoli ei voi siirtÃÃ tiedostoa"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Tuntematon syy"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Tiedostonsiirto valmistui, mutta tiedosto oli viallinen"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "EtÃyhteys ei tue tiedostonsiirtoa"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "Valittu tiedosto ei ole tavanomainen tiedosto"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "Valittu tiedosto on tyhjÃ"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Vastaamaton puhelu kÃyttÃjÃltÃ %s"
@@ -536,452 +534,394 @@ msgstr "Soitettiin kÃytÃjÃlle %s"
 msgid "Call from %s"
 msgstr "Puhelu kÃyttÃjÃltÃ %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Pistoketyyppi ei ole tuettu"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "SyytÃ ei annettu"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "Pyydettiin tilan muutosta"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Keskeytit tiedostonsiirron"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "Toinen osapuoli katkaisi tiedostonsiirron"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Virhe yritettÃessÃ siirtÃÃ tiedostoa"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "Toinen osapuoli ei voi siirtÃÃ tiedostoa"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
-msgid "Unknown reason"
-msgstr "Tuntematon syy"
-
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Tavoitettavissa"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Poissa"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "NÃkymÃtÃn"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "ErittelemÃtÃn syy"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Tila on nyt âPoissa linjoiltaâ"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Verkkovirhe"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Todennus epÃonnistui"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Salausvirhe"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Nimi on kÃytÃssÃ"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Varmennetta ei ole annettu"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Varmenne ei ole luotettu"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Varmenne on vanhentunut"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Varmenne ei ole vielÃ aktivoitu"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Varmenteen verkkonimi ei tÃsmÃÃ"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Varmenteen sormenjÃlki ei tÃsmÃÃ"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Itseallekirjoitettu varmenne"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Varmennevirhe"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Salausta ei ole kÃytettÃvissÃ"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Varmenne ei ole kelvollinen"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Yhteys hylÃttiin"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "YhteyttÃ ei voi muodostaa"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Yhteys katkesi"
 
-#: ../libempathy/empathy-utils.c:344
-msgid "This resource is already connected to the server"
-msgstr "TÃmÃ resurssi on jo yhdistetty palvelimelle"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "TÃmÃ tili on jo yhteydessÃ palvelimeen"
 
-#: ../libempathy/empathy-utils.c:346
-msgid ""
-"Connection has been replaced by a new connection using the same resource"
+#: ../libempathy/empathy-utils.c:357
+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:349
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Tili on jo olemassa palvelimella"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:362
 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:353
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Varmenne on kumottu"
 
-#: ../libempathy/empathy-utils.c:355
-msgid ""
-"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+#: ../libempathy/empathy-utils.c:366
+msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Varmenne kÃyttÃÃ heikkoa salausmenetelmÃÃ"
 
-#: ../libempathy/empathy-utils.c:358
-msgid ""
-"The length of the server certificate, or the depth of the server certificate "
-"chain, exceed the limits imposed by the cryptography library"
-msgstr ""
-"Palvelinsertifikaatin pituus tai palvelinsertifikaattiketjun pituus ovat "
-"suurempia kuin salauskirjasto sallii"
+#: ../libempathy/empathy-utils.c:369
+msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
+msgstr "Palvelinsertifikaatin pituus tai palvelinsertifikaattiketjun pituus ovat suurempia kuin salauskirjasto sallii"
 
-#: ../libempathy/empathy-utils.c:519
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Sovelluksesi on liian vanha"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "SisÃinen virhe"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "LÃhellÃ olevat ihmiset"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook-keskustelu"
 
-#: ../libempathy/empathy-time.c:88
+#: ../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:93
+#: ../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:98
+#: ../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:103
+#: ../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:108
+#: ../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:113
+#: ../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:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "tulevaisuudessa"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Kaikki tilit"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../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:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Salasana"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Palvelin"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Portti"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../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:1192
-msgid "My Web Accounts"
-msgstr "Omat WWW-tilit"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "KÃyttÃjÃtiliÃ %s ei voi muokata EmpathyssÃ."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "KÃynnistÃ Web-tilit"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "Muokkaa %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "KÃyttÃjÃnimi:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Toteuta"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_Kirjaudu sisÃÃn"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../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:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Luo uusi tili palvelimelle"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "_Peru"
-
 #. 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:2486
+#: ../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:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s-tili"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Uusi tili"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Esimerkki:</b> Nimimerkkini"
+#: ../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:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "LisÃasetukset"
+msgid "Screen _Name:"
+msgstr "NÃyttÃ_nimi:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Esimerkki:</b> Nimimerkkini"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "S_alasana:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Muista salasana"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Muista salasana"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Portti:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Muista salasana"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "NÃyttÃ_nimi:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "Pal_velin:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "MikÃ on AIM-salasanasi?"
+#: ../libempathy-gtk/empathy-account-widget-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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "LisÃasetukset"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "MikÃ on AIM-nÃyttÃnimesi?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Portti:"
+msgid "What is your AIM password?"
+msgstr "MikÃ on AIM-salasanasi?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "Pal_velin:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Esimerkki:</b> kÃyttÃjÃnimi"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Muista salasana"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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-groupwise.ui.h:7
+#: ../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:8
+#: ../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:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+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:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../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-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../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:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "MikÃ on ICQ-salasanasi?"
 
@@ -1018,25 +958,25 @@ msgstr "Valinnat"
 msgid "None"
 msgstr "Ei mitÃÃn"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Verkko"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set:"
-msgstr "Merkkikartta:"
+msgid "Network:"
+msgstr "Verkko:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr ""
-"Useimmat IRC-palvelimet eivÃt tarvitse salasanaa, joten jos et ole varma, "
-"ÃlÃ syÃtÃ salasanaa."
+msgid "Character set:"
+msgstr "Merkkikartta:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Verkko"
+msgid "Servers"
+msgstr "Palvelimet"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Verkko:"
+msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
+msgstr "Useimmat IRC-palvelimet eivÃt tarvitse salasanaa, joten jos et ole varma, ÃlÃ syÃtÃ salasanaa."
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
@@ -1054,265 +994,250 @@ msgstr "Lopetusviesti:"
 msgid "Real name:"
 msgstr "Oikea nimi:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Palvelimet"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "MikÃ on IRC-nimimerkkisi?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "MikÃ IRC-verkko?"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "MikÃ on IRC-nimimerkkisi?"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "MikÃ on Facebook-kÃyttÃjÃnimesi?"
+
+#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+msgid "This is your username, not your normal Facebook login.\nIf you are facebook.com/<b>badger</b>, enter <b>badger</b>.\nUse <a href=\"http://www.facebook.com/username/\";>this page</a> to choose a Facebook username if you don't have one."
+msgstr "KyseessÃ on kÃyttÃjÃnimi, ei normaalisti Facebook-kirjautumiseen kÃytettÃvÃ sÃhkÃpostiosoite.\nJos kÃyttÃjÃnimesi on esimerkiksi facebook.com/<b>tunnus</b>, kirjoita <b>tunnus</b>.\nJos et ole vielÃ luonut Facebook-kÃyttÃjÃnimeÃ, voit luoda sellaisen <a href=\"http://www.facebook.com/username/\";>tÃllÃ sivulla</a>."
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+msgid "What is your Facebook password?"
+msgstr "MikÃ on Facebook-salasanasi?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+msgid "What is your Google ID?"
+msgstr "MikÃ on Google-tunnuksesi?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "<b>Example:</b> user gmail com"
 msgstr "<b>Esimerkki:</b> nimi gmail com"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid "What is your Google password?"
+msgstr "MikÃ on Google-salasanasi?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 msgid "<b>Example:</b> user jabber org"
 msgstr "<b>Esimerkki:</b> nimi jabber org"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Salaus vaa_ditaan (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
 msgid "I_gnore SSL certificate errors"
 msgstr "_ÃlÃ huomioi SSL-varmenteiden virheitÃ"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Ohita palvelimen asetukset"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
 msgid "Priori_ty:"
 msgstr "_Prioriteetti:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "Reso_urce:"
 msgstr "Res_urssi:"
 
-#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
-msgid ""
-"This is your username, not your normal Facebook login.\n"
-"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
-"Use <a href=\"http://www.facebook.com/username/\";>this page</a> to choose a "
-"Facebook username if you don't have one."
-msgstr ""
-"KyseessÃ on kÃyttÃjÃnimi, ei normaalisti Facebook-kirjautumiseen kÃytettÃvÃ "
-"sÃhkÃpostiosoite.\n"
-"Jos kÃyttÃjÃnimesi on esimerkiksi facebook.com/<b>tunnus</b>, kirjoita "
-"<b>tunnus</b>.\n"
-"Jos et ole vielÃ luonut Facebook-kÃyttÃjÃnimeÃ, voit luoda sellaisen <a href="
-"\"http://www.facebook.com/username/\";>tÃllÃ sivulla</a>."
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "KÃytÃ vanhaa SS_L-porttia"
-
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
-msgid "What is your Facebook password?"
-msgstr "MikÃ on Facebook-salasanasi?"
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Salaus vaa_ditaan (TLS/SSL)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "MikÃ on Facebook-kÃyttÃjÃnimesi?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
-msgid "What is your Google ID?"
-msgstr "MikÃ on Google-tunnuksesi?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
-msgid "What is your Google password?"
-msgstr "MikÃ on Google-salasanasi?"
+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:24
 msgid "What is your Jabber ID?"
 msgstr "MikÃ on Jabber-tunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "MikÃ on Jabber-salasanasi?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "MikÃ on haluamasi Jabber-tunnus?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "MikÃ on Jabber-salasanasi?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "MikÃ on haluamasi Jabber-salasana?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user hotmail com"
 msgstr "<b>Esimerkki:</b> tunnus hotmail com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "MikÃ on Windows Live -tunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "MikÃ on Windows Live -salasanasi?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "SÃhkÃposti_osoite:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "Ni_mimerkki:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Sukunimi:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Etunimi:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Julkaistu nimi:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber-tunniste:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Sukunimi:"
+msgid "E-_mail address:"
+msgstr "SÃhkÃposti_osoite:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_Julkaistu nimi:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_KÃyttÃjÃnimi:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user my sip server"
 msgstr "<b>Esimerkki:</b> kÃyttÃjÃ sip-palvelimen osoite"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Tunnistautumisen kÃyttÃjÃnimi:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "LÃydÃ Sidonta"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Havaitse STUN-palvelin automaattisesti"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Sivuuta TLS-virheet"
+msgid "NAT Traversal Options"
+msgstr "NAT-lÃpÃisyn (NAT-T) asetukset"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "AikavÃli (sekunneissa)"
+msgid "Proxy Options"
+msgstr "VÃlipalvelinvalinnat"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "KÃynnissÃ pitÃvÃt valinnat"
+msgid "Miscellaneous Options"
+msgstr "Muut valinnat"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "LÃyhÃ reititys"
+msgid "STUN Server:"
+msgstr "STUN-palvelin:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mekanismi:"
+msgid "Discover the STUN server automatically"
+msgstr "Havaitse STUN-palvelin automaattisesti"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Muut valinnat"
+msgid "Discover Binding"
+msgstr "LÃydÃ Sidonta"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT-lÃpÃisyn (NAT-T) asetukset"
+#: ../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 "Port:"
-msgstr "Portti:"
+msgid "Mechanism:"
+msgstr "Mekanismi:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "VÃlipalvelinvalinnat"
+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:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Siirto:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN-palvelin:"
+msgid "Loose Routing"
+msgstr "LÃyhÃ reititys"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Palvelin:"
+msgid "Ignore TLS Errors"
+msgstr "Sivuuta TLS-virheet"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Siirto:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr ""
+msgid "Port:"
+msgstr "Portti:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "MikÃ on SIP-tilisi salasana?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h: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:24
-msgid "_Username:"
-msgstr "_KÃyttÃjÃnimi:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "MikÃ on SIP-tilisi salasana?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo!-_tunnus:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_ÃlÃ huomioi konferenssi- ja keskusteluhuonekutsuja"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Huoneluettelon maa-asetusto:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "MikÃ on Yahoo! -tunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "MikÃ on Yahoo! -salasanasi?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo!-_tunnus:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_Huoneluettelon maa-asetusto:"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:470
-#: ../libempathy-gtk/empathy-avatar-chooser.c:555
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Kuvaa ei voitu muuntaa"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 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"
+msgstr "JÃrjestelmÃssÃsi ei ole tukea yhdellekÃÃn hyvÃksytylle kuvatiedostomuodolle"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
 msgid "Couldn't save picture to file"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:934
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Valitse avatar-kuvasi"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "Ota kuva..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:941
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Ei kuvaa"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Kuvat"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
@@ -1320,242 +1245,245 @@ msgstr "Kaikki tiedostot"
 msgid "Click to enlarge"
 msgstr "Suurenna napsauttamalla"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Puhelun aloittamisessa tapahtui virhe"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Valittu yhteystieto ei tue puheluja"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Valittu yhteystieto on poissa linjoilta"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Valittu yhteystieto on virheellinen"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "TÃmÃ protokolla ei tue hÃtÃpuheluita"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "Yksityiskeskustelun avaaminen epÃonnistui"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../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:769
+#: ../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:973
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "â%sâ is not a valid contact ID"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1030
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: pyyhi kaikki nykyisen keskustelun viestit pois nÃkyvistÃ"
 
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <aihe>: aseta nykyisen keskustelun aihe"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <kanavan nimi>: liity kanavalle"
 
-#: ../libempathy-gtk/empathy-chat.c:1039
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <kanavan nimi>: liity kanavalle"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
-msgid ""
-"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
-"current one"
+#: ../libempathy-gtk/empathy-chat.c:1099
+msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1047
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <tuttavan tunnus> [<viesti>]: avaa yksityiskeskustelu"
 
-#: ../libempathy-gtk/empathy-chat.c:1050
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <tuttavan tunnus> <viesti>: avaa yksityiskeskustelu"
 
-#: ../libempathy-gtk/empathy-chat.c:1053
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nimi>: vaihda nimeÃ nykyisellÃ palvelimella"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1112
 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:1059
-msgid ""
-"/say <message>: send <message> to the current conversation. This is used to "
-"send a message starting with a '/'. For example: \"/say /join is used to "
-"join a new chat room\""
-msgstr ""
-"/say <viesti>: lÃhettÃÃ <viestin> sisÃllÃn kokonaisuudessaan keskusteluun. "
-"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:1115
+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 join a new chat room\""
+msgstr "/say <viesti>: lÃhettÃÃ <viestin> sisÃllÃn kokonaisuudessaan keskusteluun. 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:1064
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1067
-msgid ""
-"/help [<command>]: show all supported commands. If <command> is defined, "
-"show its usage."
-msgstr ""
-"/help [<komento>]: nÃyttÃÃ kaikki tuetut komennot. Jos <komento> on "
-"mÃÃritetty, nÃytÃ sen ohje."
+#: ../libempathy-gtk/empathy-chat.c:1123
+msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
+msgstr "/help [<komento>]: nÃyttÃÃ kaikki tuetut komennot. Jos <komento> on mÃÃritetty, nÃytÃ sen ohje."
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "KÃyttÃ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "Tuntematon komento"
 
-#: ../libempathy-gtk/empathy-chat.c:1242
+#: ../libempathy-gtk/empathy-chat.c:1313
 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:1564
+msgid "insufficient balance to send message"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Virhe lÃhetettÃessÃ viestiÃ \"%s\": %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
+#, 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:1412
-msgid "insufficient balance to send message"
+#: ../libempathy-gtk/empathy-chat.c:1576
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1421
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "poissa linjoilta"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "virheellinen tuttava"
 
-#: ../libempathy-gtk/empathy-chat.c:1427
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "lupa evÃtty"
 
-#: ../libempathy-gtk/empathy-chat.c:1430
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "liian pitkÃ viesti"
 
-#: ../libempathy-gtk/empathy-chat.c:1433
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "ei toteutettu"
 
-#: ../libempathy-gtk/empathy-chat.c:1437
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "tuntematon"
 
-#: ../libempathy-gtk/empathy-chat.c:1443
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Virhe lÃhetettÃessÃ viestiÃ \"%s\": %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1447
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Virhe viestiÃ lÃhettÃessÃ: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Aihe:"
 
-#: ../libempathy-gtk/empathy-chat.c:1520
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Aihe asetettu: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, 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:1728
 msgid "No topic defined"
 msgstr "Aihetta ei ole annettu"
 
-#: ../libempathy-gtk/empathy-chat.c:2031
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(Ei ehdotuksia)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2099
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "LisÃÃ â%sâ sanakirjaan"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "LisÃÃ â%sâ kielen %s sanakirjaan"
 
-#: ../libempathy-gtk/empathy-chat.c:2206
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "LisÃÃ hymiÃ"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2224
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_LÃhetÃ"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2278
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "_Kielentarkistuksen ehdotukset"
 
-#: ../libempathy-gtk/empathy-chat.c:2367
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Viimeisimpien lokien nouto epÃonnistui"
 
-#: ../libempathy-gtk/empathy-chat.c:2504
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 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:2511
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s potkaisi henkilÃn %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2514
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 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:2522
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s esti henkilÃn %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2525
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s estettiin"
 
-#: ../libempathy-gtk/empathy-chat.c:2529
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s on poistunut huoneesta"
@@ -1564,105 +1492,108 @@ msgstr "%s on poistunut huoneesta"
 #. * notifications like "foo has left the room", with the message
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
-#.
-#: ../libempathy-gtk/empathy-chat.c:2538
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s on saapunut huoneeseen"
 
-#: ../libempathy-gtk/empathy-chat.c:2588
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s vaihtoi nimekseen %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2727
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:2355
+#. 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:2993
+#: ../src/empathy-streamed-media-window.c:1886
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "Ei yhteyttÃ"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3374
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "Haluaisitteko tallentaa tÃmÃn salasanan?"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Muista"
 
-#: ../libempathy-gtk/empathy-chat.c:3390
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "Ei nyt"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "YritÃ uudelleen"
 
-#: ../libempathy-gtk/empathy-chat.c:3438
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "VÃÃrÃ salasana, yritÃ uudelleen:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3568
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Huone on salasanasuojattu:"
 
-#: ../libempathy-gtk/empathy-chat.c:3595
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "Liity"
 
-#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Yhdistetty"
 
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Keskustelu"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Tuntematon tai virheellinen tunniste"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "YhteyshenkilÃiden esto tilapÃisesti poissa"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "YhteyshenkilÃiden esto poissa"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "PÃÃsy evÃtty"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Yhteystietoa ei voitu estÃÃ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Muokkaa estettyjÃ yhteystietoja"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "KÃyttÃjÃtili:"
 
@@ -1672,578 +1603,548 @@ msgstr "Estetyt yhteyshenkilÃt"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Poista"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Kopioi linkin osoite"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Avaa linkki"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %d. %Bta %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Muokkaa tuttavan tietoja"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "HenkilÃkohtaiset tiedot"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Uusi tuttava"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../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-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../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Ã?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_EstÃ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../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-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "_PÃÃtÃ myÃhemmin"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "LiittymispyyntÃ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "Es_tÃ kÃyttÃjÃ"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "RyhmittelemÃttÃmÃt"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "SuosikkihenkilÃt"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Haluatko varmasti poistaa ryhmÃn \"%s\"?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Poistetaan ryhmÃÃ"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Poista"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Haluatko varmasti poistaa tuttavan \"%s\" yhteystiedot?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Poistetaan tuttava"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contactâ"
-msgstr "_LisÃÃ tuttavaâ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "Es_tÃ yhteystieto"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Keskustele"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_ÃÃnipuhelu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Videopuhelu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Aiemmat keskustelut"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "LÃhetÃ tiedosto"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Jaa tyÃpÃytÃni"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1373
-msgid "Favorite"
-msgstr "Suosikki"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "_Tietoja"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Muokkaa"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1283
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Kutsuu sinut tÃhÃn keskusteluhuoneeseen"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
-msgid "_Invite to Chat Room"
-msgstr "_Kutsu keskusteluhuoneeseen"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "_PÃÃtÃ myÃhemmin"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Etsi yhteystietoja"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Etsi: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "_LisÃÃ yhteystieto"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Yhteystietoa ei lÃytynyt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Valitse tuttava"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Koko nimi:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Puhelinnumero:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "SÃhkÃpostiosoite:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Kotisivu:"
+msgstr "Salli minun nÃhdÃ, milloin olet verkossa. Kiitos!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-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-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Viimeksi nÃhty:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Yhdisti kohteesta:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Poissaoloviesti:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Kanavat:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Maan ISO-tunnus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Maa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Osavaltio:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Kaupunki:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Alue:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Postinumero:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Katu:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Rakennus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Kerros:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Huone:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Teksti:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Tarkkuustaso:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Virhe:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Vertikaalinen virhe (metriÃ):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Horisontaalinen virhe (metriÃ):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Nopeus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Suuntima:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "KiipeÃmisvauhti:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Viimeksi pÃivitetty:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Pituuspiiri:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Leveyspiiri:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Korkeus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Sijainti"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../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:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Tallenna vastaus"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Avataria ei voitu tallentaa"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Sijainti</b> hetkellÃ (pvm)\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "Nimimerkki:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Asiakastiedot"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Asiakasohjelma:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "HenkilÃkohtaiset tiedot:"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Tuttavan tiedot"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Koko nimi"
+
+#: ../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:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1515
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Tunniste:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. 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)	"
+msgstr "<b>Sijainti</b> hetkellÃ (pvm)	"
+
+#: ../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:10
+#: ../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:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Versio:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../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:345
-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: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:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_LisÃÃ ryhmÃ"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../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:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "RyhmÃ"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#, invalid-plural
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+#, invalid-plural
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] ""
 msgstr[1] ""
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Linkitetyt yhteystiedot"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Valitse linkitettÃvÃt yhteystiedot"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Uuden yhteystiedon esikatselu"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr ""
-"Vasemmanpuoleisesta luettelosta valitut yhteystiedot linkitetÃÃn yhteen."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Muokkaa tuttavan 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:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Valitse soittoon kÃytettÃvÃ tili"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1288
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Soita"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Matkapuhelin"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "TyÃ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Koti"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "Es_tÃ yhteystieto"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../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:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1141
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_ÃÃnipuhelu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Videopuhelu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Aiemmat keskustelut"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "LÃhetÃ tiedosto"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Jaa tyÃpÃytÃni"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Suosikki"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "Pakettia gnome-contacts ei ole asennettu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "_Tietoja"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1167
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contactsâ"
-msgstr "_LinkitÃ yhteystiedotâ"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Kutsuu sinut tÃhÃn keskusteluhuoneeseen"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "_Kutsu keskusteluhuoneeseen"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contactâ"
+msgstr "_LisÃÃ tuttavaâ"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Poista ja _estÃ"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, 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 ""
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Haluatko varmasti poistaa ryhmÃn \"%s\"?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "Poistetaan ryhmÃÃ"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "_Poista"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Haluatko varmasti poistaa tuttavan \"%s\" yhteystiedot?"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1662
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, 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:2497
+msgid "Removing contact"
+msgstr "Poistetaan tuttava"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
+#, c-format, invalid-plural
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
 msgstr[0] ""
@@ -2253,23 +2154,23 @@ msgstr[1] ""
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Sijainti</b> hetkellÃ (pvm)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
-msgstr ""
+msgstr "Linjoilla puhelimesta tai mobiililaitteesta"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Uusi verkko"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Valitse IRC-verkko"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Valitse"
@@ -2282,247 +2183,259 @@ msgstr "uusi palvelin"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Linkâ"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "LinkitÃ yhteystiedot"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlinkâ"
-msgstr "_Poista linkitysâ"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_LinkitÃ"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Poista linkitys"
-
-#: ../libempathy-gtk/empathy-log-window.c:633
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Historia"
 
-#: ../libempathy-gtk/empathy-log-window.c:688
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "NÃytÃ"
 
-#: ../libempathy-gtk/empathy-log-window.c:710
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Etsi"
 
-#: ../libempathy-gtk/empathy-log-window.c:1158
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1160
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Keskustele kÃyttÃjÃn %s kanssa"
 
-#: ../libempathy-gtk/empathy-log-window.c:1210
-#: ../libempathy-gtk/empathy-log-window.c:1357
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr ""
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1299
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1305
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1376
+#: ../libempathy-gtk/empathy-log-window.c:1371
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s sekunti"
+msgstr[1] "%s sekuntia"
+
 #: ../libempathy-gtk/empathy-log-window.c:1378
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minuutti"
+msgstr[1] "%s minuuttia"
 
-#: ../libempathy-gtk/empathy-log-window.c:1385
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Puhelun kesto %s, puhelu pÃÃttyi %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1717
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "TÃnÃÃn"
 
-#: ../libempathy-gtk/empathy-log-window.c:1721
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Eilen"
 
-#: ../libempathy-gtk/empathy-log-window.c:1737
-msgctxt ""
-"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1739
+#, fuzzy
 msgid "%e %B %Y"
-msgstr ""
+msgstr "%A %d. %Bta %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1818
-#: ../libempathy-gtk/empathy-log-window.c:3399
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
-msgstr ""
+msgstr "Milloin tahansa"
 
-#: ../libempathy-gtk/empathy-log-window.c:1898
-#: ../libempathy-gtk/empathy-log-window.c:2328
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
-msgstr ""
+msgstr "Kuka tahansa"
 
-#: ../libempathy-gtk/empathy-log-window.c:2640
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Kuka"
 
-#: ../libempathy-gtk/empathy-log-window.c:2844
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Milloin"
 
-#: ../libempathy-gtk/empathy-log-window.c:2960
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
-msgstr ""
+msgstr "MitÃ tahansa"
 
-#: ../libempathy-gtk/empathy-log-window.c:2962
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
-msgstr ""
+msgstr "Tekstikeskustelut"
 
-#: ../libempathy-gtk/empathy-log-window.c:2964
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Puhelut"
 
-#: ../libempathy-gtk/empathy-log-window.c:2969
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Saapuneet puhelut"
 
-#: ../libempathy-gtk/empathy-log-window.c:2970
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Soitetut puhelut"
 
-#: ../libempathy-gtk/empathy-log-window.c:2971
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Vastaamattomat puhelut"
 
-#: ../libempathy-gtk/empathy-log-window.c:2993
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "MitÃ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3702
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
-msgstr ""
-"Haluatko varmasti poistaa kaikki aikaisempien keskusteluiden historiatiedot?"
+msgstr "Haluatko varmasti poistaa kaikki aikaisempien keskusteluiden historiatiedot?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3706
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "TyhjennÃ kaikki"
 
-#: ../libempathy-gtk/empathy-log-window.c:3713
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
-msgstr ""
+msgstr "Poista kohteesta:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Ladataan...</span>"
+msgid "_File"
+msgstr "_Tiedosto"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Keskustelu"
+#: ../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"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Poista kaikki historia..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profiili"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+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
 msgid "Video"
 msgstr "Video"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Muokkaa"
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "page 2"
+msgstr "sivu 2"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Ladataan...</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "Yhteystieto ei ole linjoilla"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "Valittu yhteystieto on joko virheellinen tai tuntematon"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+#, fuzzy
+msgid "The contact does not support this kind of conversation"
+msgstr "Aihe ei ole tuettu tÃssÃ keskustelussa"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Sinulla on porttikielto tÃlle kanavalle"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Kanava on tÃynnÃ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "Kanavalle voi liittyÃ vain kutsusta"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Tiedosto"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+#, fuzzy
+msgid "Can't proceed while disconnected"
+msgstr "Yhteys tuttavaan katkaistu"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "page 2"
-msgstr "sivu 2"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+#, fuzzy
+msgid "Permission denied"
+msgstr "lupa evÃtty"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Tuttavan tunniste:"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+#, fuzzy
+msgid "There was an error starting the conversation"
+msgstr "Puhelun aloittamisessa tapahtui virhe"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "_Keskustele"
+#: ../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 ""
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Uusi keskustelu"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "LÃhetÃ _videota"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "_Videopuhelu"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "_Soita"
+#. 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:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Uusi puhelu"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format, fuzzy
+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>"
+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
@@ -2552,20 +2465,15 @@ msgstr "Napsauta tehdÃksesi tÃstÃ tilasta suosikin"
 msgid "Set status"
 msgstr "Aseta tila"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Aseta lÃsnÃolosi ja nykyinen tilasi"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messagesâ"
 msgstr "Omat viestitâ"
 
 #. Create account
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
-#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Uusi %s-tili"
@@ -2575,20 +2483,20 @@ msgid "Find:"
 msgstr "Etsi:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr ""
+msgid "_Previous"
+msgstr "_Edellinen"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Lausetta ei lÃydy"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Seuraava"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "_Huomioi kirjainkoko"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr ""
+msgid "Phrase not found"
+msgstr "Lausetta ei lÃydy"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2634,14 +2542,14 @@ msgstr "Puhelu pÃÃttyi"
 msgid "Edit Custom Messages"
 msgstr "Muokkaa itse mÃÃriteltyjÃ viestejÃ"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1030
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
-msgstr ""
+msgstr "ViestiÃ muokattu %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1720
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
-msgstr ""
+msgstr "Tavallinen"
 
 #: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
@@ -2677,7 +2585,7 @@ msgstr "Varmennetta ei ole vielÃ aktivoitu."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The certificate does not have the expected fingerprint."
-msgstr ""
+msgstr "Varmenteella ei ole odotettua sormenjÃlkeÃ."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:170
 msgid "The hostname verified by the certificate doesn't match the server name."
@@ -2688,13 +2596,12 @@ msgid "The certificate is self-signed."
 msgstr "Varmenne on allekirjoitettu itse."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
-msgid ""
-"The certificate has been revoked by the issuing Certification Authority."
+msgid "The certificate has been revoked by the issuing Certification Authority."
 msgstr ""
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate is cryptographically weak."
-msgstr ""
+msgstr "Varmenne on kryptografisesti heikko."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:184
 msgid "The certificate length exceeds verifiable limits."
@@ -2702,7 +2609,7 @@ msgstr ""
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:188
 msgid "The certificate is malformed."
-msgstr ""
+msgstr "Varmenne on muodostettu vÃÃrin."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
@@ -2715,43 +2622,43 @@ msgid "Certificate hostname: %s"
 msgstr "Varmenteen ilmoittama isÃntÃnimi: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Jatka"
+msgid "C_ontinue"
+msgstr "J_atka"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Yhteys ei ole luotettava. Haluatko kuitenkin jatkaa?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Muista tÃmÃ valinta tulevia yhteyksiÃ varten"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Varmenteen tiedot"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "URI:a ei voi avata"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "Tiedoston tallennukseen ei ole riittÃvÃsti tilaa"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
-msgid ""
-"%s of free space are required to save this file, but only %s is available. "
-"Please choose another location."
-msgstr ""
-"Tiedoston tallennukseen vaaditaan tilaa vÃhintÃÃn %s, mutta vain %s on "
-"saatavilla. Valitse toinen tallennussijainti."
+msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
+msgstr "Tiedoston tallennukseen vaaditaan tilaa vÃhintÃÃn %s, mutta vain %s on saatavilla. Valitse toinen tallennussijainti."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Saapuva tiedosto kÃyttÃjÃltÃ %s"
@@ -2923,830 +2830,602 @@ msgstr "lÃnsimaalainen"
 msgid "Vietnamese"
 msgstr "vietnam"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "Valittu tuttava ei voi vastaanottaa tiedostoja."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "Valittu tuttava on poissa linjoilta."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Ei virheilmoitusta"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Pikaviesti (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "ÃlÃ yhdistÃ kÃynnistettÃessÃ"
 
-#: ../src/empathy.c:435
+#: ../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:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Empathy-pikaviestin"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Virhe yhdistettÃessÃ tilienhallintaan"
 
-#: ../src/empathy.c:639
+#: ../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"
+msgid "There was an error while trying to connect to the Telepathy Account Manager. The error was:\n\n%s"
+msgstr "YhdistettÃessÃ Empathyn tilienhallintaan tapahtui virhe:\n\n%s"
 
 #: ../src/empathy-about-dialog.c:81
-msgid ""
-"Empathy is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version."
-msgstr ""
-"Empathy on vapaa ohjelma; sitÃ on sallittu levittÃÃ edelleen ja muuttaa GNU "
-"yleisen lisenssin (GPL lisenssin) ehtojen mukaan  sellaisina kuin Free "
-"Software Foundation on ne julkaissut; joko lisenssin version 2, tai "
-"(valinnan mukaan) minkÃ tahansa myÃhemmÃn version mukaisesti."
+msgid "Empathy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
+msgstr "Empathy on vapaa ohjelma; sitÃ on sallittu levittÃÃ edelleen ja muuttaa GNU yleisen lisenssin (GPL lisenssin) ehtojen mukaan  sellaisina kuin Free Software Foundation on ne julkaissut; joko lisenssin version 2, tai (valinnan mukaan) minkÃ tahansa myÃhemmÃn version mukaisesti."
 
 #: ../src/empathy-about-dialog.c:85
-msgid ""
-"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
-"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
-"details."
-msgstr ""
-"EmpathyÃ levitetÃÃn siinÃ toivossa, ettÃ se olisi hyÃdyllinen, mutta ilman "
-"mitÃÃn takuuta; ilman edes hiljaista takuuta kaupallisesti hyvÃksyttÃvÃstÃ "
-"laadusta tai soveltuvuudesta tiettyyn tarkoitukseen. Katso GPL lisenssistÃ "
-"lisÃÃ yksityiskohtia."
+msgid "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
+msgstr "EmpathyÃ levitetÃÃn siinÃ toivossa, ettÃ se olisi hyÃdyllinen, mutta ilman mitÃÃn takuuta; ilman edes hiljaista takuuta kaupallisesti hyvÃksyttÃvÃstÃ laadusta tai soveltuvuudesta tiettyyn tarkoitukseen. Katso GPL lisenssistÃ lisÃÃ yksityiskohtia."
 
 #: ../src/empathy-about-dialog.c:89
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-130159 USA"
-msgstr ""
-"Empathyn mukana pitÃisi tulla kopio GPL-lisenssistÃ; jos nÃin ei ole, "
-"kirjoita osoitteeseen Free Software Foundation Inc., 51 Franklin St, Fifth "
-"Floor, Boston, MA 02110-1301, USA."
+msgid "You should have received a copy of the GNU General Public License along with Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgstr "Empathyn mukana pitÃisi tulla kopio GPL-lisenssistÃ; jos nÃin ei ole, kirjoita osoitteeseen Free Software Foundation Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Gnomen pikaviestiohjelma"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
-msgstr ""
-"Samuli SeppÃnen ja Henna NykÃnen, 2006.\n"
-"Ilkka Tuohela, 2006-2009.\n"
-"Tommi Vainikainen, 2009.\n"
-"Ville-Pekka Vainio, 2010.\n"
-"\n"
-"http://www.gnome.fi/\n";
-"\n"
-"Launchpad Contributions:\n"
-"  Antti Kajander https://launchpad.net/~antti-kajander\n";
-"  Christian Hellberg https://launchpad.net/~christian-hellberg\n";
-"  Elias Julkunen https://launchpad.net/~eliasj\n";
-"  Heikki Kulhia https://launchpad.net/~hessuk\n";
-"  Heikki MÃntysaari https://launchpad.net/~heikki-mantysaari\n";
-"  Ilari Oras https://launchpad.net/~ilarioras\n";
-"  Ilkka Tuohela https://launchpad.net/~hile\n";
-"  Ilkka Tuohela https://launchpad.net/~hile-utu\n";
-"  Jammi Vesterinen https://launchpad.net/~jmov\n";
-"  Jani Uusitalo https://launchpad.net/~uusijani\n";
-"  Jere Sokka https://launchpad.net/~jerry-sokka\n";
-"  Jiri GrÃnroos https://launchpad.net/~jiri-gronroos\n";
-"  Joonas Pajuniva https://launchpad.net/~joonas-pajuniva\n";
-"  Jussi Aalto https://launchpad.net/~jtaalto-deactivatedaccount\n";
-"  Kristian Kurki https://launchpad.net/~kristian-kurki\n";
-"  Matti Karnaattu https://launchpad.net/~mattikarnaattu\n";
-"  Mika Suomalainen https://launchpad.net/~mkaysi\n";
-"  Mikko Nissinen https://launchpad.net/~mikko\n";
-"  Miko-Matias GrÃnvall https://launchpad.net/~matias-gronvall\n";
-"  Ncl8 https://launchpad.net/~crofle\n";
-"  Timo Jyrinki https://launchpad.net/~timo-jyrinki\n";
-"  Tomi Juntunen https://launchpad.net/~tojuntu\n";
-"  Tommi Saira https://launchpad.net/~tommisaira\n";
-"  Tommi Vainikainen https://launchpad.net/~thv\n";
-"  Ville-Pekka Vainio https://launchpad.net/~vpvainio\n";
-"  papukaija https://launchpad.net/~papukaija";
-
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Tilien tuonnin aikana tapahtui virhe."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Virhe jÃsennettÃessÃ kÃyttÃjÃtilien asetuksia."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "TiliÃ luodessa tapahtui virhe."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Tapahtui virhe."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Virheilmoitus: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Voit joko mennÃ takaisin ja syÃttÃÃ tilien tiedot uudestaan, tai lopettaa "
-"tÃmÃn apulaisen ja lisÃtÃ tilit myÃhemmin Muokkaa-valikosta."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Tapahtui virhe"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "MinkÃ tyyppinen pikaviestintili sinulla on?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Onko sinulla muita tilejÃ, jotka haluaisit mÃÃritellÃ?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "SyÃtÃ tilisi tiedot"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "MinkÃ tyyppisen pikaviestintilin haluat luoda?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Haluatko luoda muita pikaviestintilejÃ?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "SyÃtÃ uuden kÃyttÃjÃtilin tiedot"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Keskustele Empathyn avulla verkossa olevien tuttujen kanssa, joilla on "
-"esimerkiksi Google Talk, AIM, Windows Live tai muu pikaviestintili kÃytÃssÃ. "
-"Mikrofonin ja web-kameran avulla voit myÃs soittaa ÃÃni- tai videopuheluita."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
-"Onko sinulla kÃyttÃjÃtili, jota olet kÃyttÃnyt toisessa pikaviestimessÃ?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "KyllÃ, tuo tilitiedot ohjelmasta "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "KyllÃ, syÃtÃn tilitietoni nyt"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Ei, haluan uuden kÃyttÃjÃtilin"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "Ei, haluan vain nÃhdÃ samassa lÃhiverkossa linjoilla olevat henkilÃt"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Valitse tilit, jotka haluat tuoda:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "KyllÃ"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Ei, tÃssÃ oli kaikki"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy voi automaattisesti lÃytÃÃ ja keskustella kanssasi samaan verkkoon "
-"yhdistettyjen ihmisten kanssa. Jos haluat kÃyttÃÃ tÃtÃ toimintoa, tarkista "
-"ettÃ alla olevat yksityiskohdat pitÃvÃt paikkansa. Voit helposti muuttaa "
-"nÃitÃ yksityiskohtia myÃhemmin tai estÃÃ tÃmÃn toiminnon kÃyttÃmÃllÃ âTilitâ-"
-"valintaikkunaa."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Muokkaa->Tilit"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "En _halua kÃyttÃÃ tÃtÃ ominaisuutta juuri nyt"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Et voi keskustella paikalliseen verkkoon liittyneiden ihmisten kanssa sillÃ "
-"telepathy-salut ei ole asennettu. Jos haluat ottaa tÃmÃn ominaisuuden "
-"kÃyttÃÃn, asenna telepathy-salut paketti ja luo lÃheiset ihmiset -tili Tilit-"
-"ikkunassa."
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "pakettia telepathy-salut ei ole asennettu"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "ViestintÃ- ja VoIP-kÃyttÃjÃtilien apulainen"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Tervetuloa Empathyyn"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Tuo olemassa olevat kÃyttÃjÃtilit"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "SyÃtÃ henkilÃkohtaiset tiedot"
+msgstr "Samuli SeppÃnen ja Henna NykÃnen, 2006.\nIlkka Tuohela, 2006-2009.\nTommi Vainikainen, 2009.\nVille-Pekka Vainio, 2010.\n\nhttp://www.gnome.fi/\n\nLaunchpad Contributions:\n  Antti Kajander https://launchpad.net/~antti-kajander\n  Christian Hellberg https://launchpad.net/~christian-hellberg\n  Elias Julkunen https://launchpad.net/~eliasj\n  Heikki Kulhia https://launchpad.net/~hessuk\n  Heikki MÃntysaari https://launchpad.net/~heikki-mantysaari\n  Ilari Oras https://launchpad.net/~ilarioras\n  Ilkka Tuohela https://launchpad.net/~hile\n  Ilkka Tuohela https://launchpad.net/~hile-utu\n  Jammi Vesterinen https://launchpad.net/~jmov\n  Jani Uusitalo https://launchpad.net/~uusijani\n  Jere Sokka https://launchpad.net/~jerry-sokka\n  Jiri GrÃnroos https://launchpad.net/~jiri-gronroos\n  Joonas Pajuniva https://launchpad.net/~joonas-pajuniva\n  Jussi Aalto https://launchpad.net/~jtaalto-deactivatedaccount\n  Kristian Kurki https://launchpad.net/~kristian-kurki\n  Matti
  Karnaattu https://launchpad.net/~mattikarnaattu\n  Mika Suomalainen https://launchpad.net/~mkaysi\n  Mikko Nissinen https://launchpad.net/~mikko\n  Miko-Matias GrÃnvall https://launchpad.net/~matias-gronvall\n  Ncl8 https://launchpad.net/~crofle\n  Timo Jyrinki https://launchpad.net/~timo-jyrinki\n  Tomi Juntunen https://launchpad.net/~tojuntu\n  Tommi Saira https://launchpad.net/~tommisaira\n  Tommi Vainikainen https://launchpad.net/~thv\n  Ville-Pekka Vainio https://launchpad.net/~vpvainio\n  papukaija https://launchpad.net/~papukaija";
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, 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:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Uutta tiliÃsi ei ole vielÃ tallennettu."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1164
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1289
 msgid "Connectingâ"
 msgstr "YhdistetÃÃnâ"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline â %s"
 msgstr "Poissa linjoilta â %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected â %s"
 msgstr "Yhteys katkaistu â %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline â No Network Connection"
 msgstr "Poissa linjoilta â Ei verkkoyhteyttÃ"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Tuntematon tila"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+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:468
 msgid "Offline â Account Disabled"
 msgstr "Poissa linjoilta â Tili ei ole kÃytettÃvissÃ"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "Muokkaa yhteyden asetuksia"
+
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "HenkilÃkohtaisten tietojesi nouto palvelimelta epÃonnistui."
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
 msgstr ""
-"Olet luomassa uutta kÃyttÃjÃtiliÃ. Uuden tilin luonti hylkÃÃ\n"
-"tehdyt muutokset. Haluatko varmasti jatkaa?"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "_Muokkaa yhteyden asetuksia..."
+
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Haluatko poistaa tilin â%sâ tietokoneeltasi?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "TÃmÃ ei poista tiliÃsi palvelimelta."
 
-#: ../src/empathy-accounts-dialog.c:1432
-msgid ""
-"You are about to select another account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Olet vaihtamassa kÃyttÃjÃtiliÃ. Tilin vaihtamineen hylkÃÃ\n"
-"tehdyt muutokset. Haluatko varmasti jatkaa?"
+#: ../src/empathy-accounts-dialog.c:1562
+msgid "You are about to select another account, which will discard\nyour changes. Are you sure you want to proceed?"
+msgstr "Olet vaihtamassa kÃyttÃjÃtiliÃ. Tilin vaihtamineen hylkÃÃ\ntehdyt muutokset. Haluatko varmasti jatkaa?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
-msgstr ""
+msgstr "Ota _kÃyttÃÃn"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
-msgstr ""
+msgstr "Ota _pois kÃytÃstÃ"
 
-#: ../src/empathy-accounts-dialog.c:2154
-msgid ""
-"You are about to close the window, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Olet sulkemassa ikkunan. Ikkunan sulkeminen hylkÃÃ\n"
-"tehdyt muutokset. Haluatko varmasti jatkaa?"
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "O_hita"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_YhdistÃ"
+
+#: ../src/empathy-accounts-dialog.c:2303
+msgid "You are about to close the window, which will discard\nyour changes. Are you sure you want to proceed?"
+msgstr "Olet sulkemassa ikkunan. Ikkunan sulkeminen hylkÃÃ\ntehdyt muutokset. Haluatko varmasti jatkaa?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
 msgid "Addâ"
 msgstr "LisÃÃ..."
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Ladataan tilin tietoja"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Protokollaa ei ole asennettu"
+msgid "_Importâ"
+msgstr "_Tuoâ"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "YhteyskÃytÃntÃ:"
+msgid "Loading account information"
+msgstr "Ladataan tilin tietoja"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
-msgid ""
-"To add a new account, you first have to install a backend for each protocol "
-"you want to use."
-msgstr ""
-"Ennen kuin voit lisÃtÃ tilin, sinun tÃytyy asentaa kullekin kÃytettÃvÃlle "
-"protokollalle tarvittava taustajÃrjestelmÃ."
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid "To add a new account, you first have to install a backend for each protocol you want to use."
+msgstr "Ennen kuin voit lisÃtÃ tilin, sinun tÃytyy asentaa kullekin kÃytettÃvÃlle protokollalle tarvittava taustajÃrjestelmÃ."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Importâ"
-msgstr "_Tuoâ"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "YhteyskÃytÃntÃtaustaosia ei asennettu"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr " - Empathyn tunnistautumisasiakas"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Empathyn tunnistautumisasiakas"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "LÃhellÃ olevat ihmiset"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathyn audio/video-asiakas"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathyn audio/video-asiakas"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:433
 msgid "Contrast"
 msgstr "Kontrasti"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:436
 msgid "Brightness"
 msgstr "Kirkkaus"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "ÃÃnenvoimakkuus"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "_Sivupalkki"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
 msgstr "ÃÃnisyÃte"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
 msgstr "VideosyÃte"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
 msgstr "Valintalevy"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Details"
 msgstr "Tiedot"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1672
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Soita tuttavalle %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1916
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "TÃmÃn koneen nÃkemÃ IP-osoite"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1918
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2135
 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:1457
-#: ../src/empathy-call-window.c:1920
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2137
 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:1459
-#: ../src/empathy-call-window.c:1922
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "VÃlityspalvelimen IP-osoite"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1924
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "RyhmÃlÃhetysryhmÃn IP-osoite"
 
-#: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Tuntematon"
-
-#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Tuntematon"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Tuntematon"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+#: ../src/empathy-streamed-media-window.c:1835
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Tuntematon"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2136
 #, c-format
 msgid "Connected â %d:%02dm"
 msgstr "Yhdistetty -- %d:%02d min"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2674
+#: ../src/empathy-streamed-media-window.c:2197
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Tekniset tiedot"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2712
+#: ../src/empathy-streamed-media-window.c:2235
+#: ../src/empathy-call-window.c:3026
 #, c-format
-msgid ""
-"%s's software does not understand any of the audio formats supported by your "
-"computer"
+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:2248
-#: ../src/empathy-call-window.c:2717
+#: ../src/empathy-streamed-media-window.c:2240
+#: ../src/empathy-call-window.c:3031
 #, c-format
-msgid ""
-"%s's software does not understand any of the video formats supported by your "
-"computer"
+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:2254
-#: ../src/empathy-call-window.c:2723
+#: ../src/empathy-streamed-media-window.c:2246
+#: ../src/empathy-call-window.c:3037
 #, c-format
-msgid ""
-"Can't establish a connection to %s. One of you might be on a network that "
-"does not allow direct connections."
-msgstr ""
-"YhteyttÃ ei voi muodostaa kohteeseen %s. Yksi teistÃ voi ehkÃ olla verkossa, "
-"joka ei salli suoria yhteyksiÃ."
+msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
+msgstr "YhteyttÃ ei voi muodostaa kohteeseen %s. Yksi teistÃ voi ehkÃ olla verkossa, joka ei salli suoria yhteyksiÃ."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2729
+#: ../src/empathy-streamed-media-window.c:2252
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "VerkkoyhteydessÃ tapahtui virhe"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2733
-msgid ""
-"The audio formats necessary for this call are not installed on your computer"
-msgstr ""
-"TÃhÃn puheluun vaadittavia ÃÃnitiedostomuotoja ei ole asennettu tÃlle "
-"tietokoneelle"
+#: ../src/empathy-streamed-media-window.c:2256
+#: ../src/empathy-call-window.c:3047
+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:2267
-#: ../src/empathy-call-window.c:2736
-msgid ""
-"The video formats necessary for this call are not installed on your computer"
-msgstr ""
-"TÃhÃn puheluun vaadittavia videotiedostomuotoja ei ole asennettu tÃlle "
-"tietokoneelle"
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3050
+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:2277
-#: ../src/empathy-call-window.c:2748
+#: ../src/empathy-streamed-media-window.c:2269
+#: ../src/empathy-call-window.c:3062
 #, c-format
-msgid ""
-"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
-"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
-"the Help menu."
-msgstr ""
-"Telepathy-komponentin kanssa tapahtui jotain odottamatonta. Ole hyvÃ ja <a "
-"href=\"%s\">raportoi tÃmÃ ohjelmavirhe</a> sekÃ liitÃ 'VianjÃljitys'-"
-"ikkunasta kerÃtyt lokit \"Apua\"-valikosta."
+msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
+msgstr "Telepathy-komponentin kanssa tapahtui jotain odottamatonta. Ole hyvÃ ja <a href=\"%s\">raportoi tÃmÃ ohjelmavirhe</a> sekÃ liitÃ 'VianjÃljitys'-ikkunasta kerÃtyt lokit \"Apua\"-valikosta."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2757
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Virhe soitettaessa"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2760
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Virran loppu saavutettiin"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2800
+#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "ÃÃniyhteyden muodostus ei onnistunut"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2810
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Videoyhteyden muodostus ei onnistunut"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "ÃÃni"
+msgid "_Call"
+msgstr "_Soita"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Purkamiskoodekki:"
+msgid "_Microphone"
+msgstr "_Mikrofoni"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr ""
+msgid "_Camera"
+msgstr "_Kamera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr ""
+msgid "_Settings"
+msgstr "A_setukset"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Pakkauskoodekki:"
+#: ../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-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Katkaise"
+#: ../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-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Lopeta nykyinen puhelu"
+#: ../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-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Paikallisehdokas:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_VianetsintÃ"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr ""
+msgid "Swap camera"
+msgstr "Vaihda kamera"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "EtÃehdokas:"
+msgid "Maximise me"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "LÃhetÃ ÃÃntÃ"
+msgid "Disable camera"
+msgstr "Ota kamera pois kÃytÃstÃ"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "LÃhetÃ video"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Katkaise"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr ""
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Lopeta nykyinen puhelu"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Videopuhelu"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Aloita videopuhelu"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Aloita ÃÃnipuhelu"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Vaihda kamera"
+#: ../src/empathy-call-window.ui.h:20
+msgid "Show dialpad"
+msgstr "NÃytÃ numeronÃppÃimet"
 
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:21
+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
 msgid "Toggle audio transmission"
 msgstr "ÃÃnen lÃhetys pÃÃlle/pois"
 
-#: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr ""
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Pakkauskoodekki:"
 
-#: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2307 ../src/empathy-call-window.c:2308
-#: ../src/empathy-call-window.c:2309 ../src/empathy-call-window.c:2310
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Videopuhelu"
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Purkamiskoodekki:"
 
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "EtÃehdokas:"
+
+#: ../src/empathy-call-window.ui.h:31
 #: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Soita"
+msgid "Local Candidate:"
+msgstr "Paikallisehdokas:"
 
-#: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr ""
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:25
+msgid "Audio"
+msgstr "ÃÃni"
 
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_SisÃltÃ"
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Suljetaanko tÃmÃ ikkuna?"
 
-#: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_VianetsintÃ"
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it."
+msgstr ""
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "O_hje"
+#: ../src/empathy-chat-window.c:305
+#, c-format, invalid-plural
+msgid "Closing this window will leave a chat room. You will not receive any further messages until you rejoin it."
+msgid_plural "Closing this window will leave %u chat rooms. You will not receive any further messages until you rejoin them."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr ""
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Poistutaanko huoneesta %s?"
 
-#: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
+#: ../src/empathy-chat-window.c:315
+msgid "You will not receive any further messages from this chat room until you rejoin it."
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
-#: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_NÃytÃ"
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Sulje ikkuna"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Poistu huoneesta"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, 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:493
+#: ../src/empathy-chat-window.c:652
 #, 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:509
+#: ../src/empathy-chat-window.c:668
 #, 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:518
+#: ../src/empathy-chat-window.c:677
 #, 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:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "LÃhetetÃÃn %d viesti"
+msgstr[1] "LÃhetetÃÃn %d viestiÃ"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Kirjoittaa viestiÃ."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_TyhjennÃ"
+msgid "_Conversation"
+msgstr "_Keskustelu"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "T_uttava"
+msgid "C_lear"
+msgstr "_TyhjennÃ"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "LisÃÃ _hymiÃ"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Suosikkikeskusteluhuone"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participantâ"
-msgstr "Kutsu _osallistujaâ"
+msgid "Notify for All Messages"
+msgstr "Ilmoita kaikista viesteistÃ"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "SiirrÃ vÃlilehti _vasemmalle"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_NÃytÃ tuttavaluettelo"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "SiirrÃ vÃlilehti _oikealle"
+msgid "Invite _Participantâ"
+msgstr "Kutsu _osallistujaâ"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Ilmoita kaikista viesteistÃ"
+msgid "C_ontact"
+msgstr "T_uttava"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Keskustelu"
+msgid "_Tabs"
+msgstr "V_Ãlilehdet"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Irrota vÃlilehti"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Suosikkikeskusteluhuone"
+msgid "_Previous Tab"
+msgstr "_Edellinen vÃlilehti"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Seuraava vÃlilehti"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Edellinen vÃlilehti"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Kumoa Sulje vÃlilehti"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_NÃytÃ tuttavaluettelo"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "SiirrÃ vÃlilehti _vasemmalle"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "V_Ãlilehdet"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "SiirrÃ vÃlilehti _oikealle"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Kumoa Sulje vÃlilehti"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Irrota vÃlilehti"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3760,203 +3439,204 @@ msgstr "Huone"
 msgid "Auto-Connect"
 msgstr "YhdistÃ automaattisesti"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Hallitse suosikkihuoneita"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Saapuva videopuhelu"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Saapuva puhelu"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, 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:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s soittaa sinulle. Haluatko vastata?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763
+#: ../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:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_HylkÃÃ"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Vastaa"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Vastaa kÃyttÃen videota"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../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:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Kutsu huoneeseen"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Kutsu liittyÃ kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s kutsui sinut liittymÃÃn kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_KieltÃydy"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Liity"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s kutsui sinut liittymÃÃn kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Sinut on kutsuttu liittymÃÃn kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Saapuva tiedostonsiirto tuttavalta %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Salasana vaaditaan"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
-msgstr ""
+msgstr "%s haluaa luvan nÃhdÃ, milloin olet linjoilla"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
-msgid ""
-"\n"
-"Message: %s"
-msgstr ""
-"\n"
-"Viesti: %s"
+msgid "\nMessage: %s"
+msgstr "\nViesti: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s nopeudella %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Vastaanotetaan \"%s\" tuttavalta %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "LÃhetetÃÃn \"%s\" tuttavalle %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Virhe vastaanotettaessa \"%s\" tuttavalta %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Virhe vastaanotettaessa tiedostoa"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Virhe lÃhetettÃessÃ \"%s\" tuttavalle %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Virhe lÃhetettÃessÃ tiedostoa"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" vastaanotettu tuttavalta %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" lÃhetetty tuttavalle %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Tiedostonsiirto valmistui"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Odotetaan toisen osallistujan vastausta"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Tarkistetaan tiedoston â%sâ eheyttÃ"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Lasketaan tiivistettÃ tiedostolle â%sâ"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1025
+msgid "%"
+msgstr "%"
+
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Tiedosto"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "JÃljellÃ"
 
@@ -3968,842 +3648,767 @@ msgstr "Tiedostosiirrot"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Poista valmiit, perutut ja epÃonnistuneet tiedostonsiirrot luettelosta"
 
-#: ../src/empathy-import-dialog.c:84
-msgid ""
-"No accounts to import could be found. Empathy currently only supports "
-"importing accounts from Pidgin."
-msgstr ""
-"Tuotavia tilejÃ ei lÃytynyt. Empathy osaa tÃllÃ hetkellÃ tuoda tilejÃ "
-"ainoastaan PidginistÃ."
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Tuo"
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:88
+msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
+msgstr "Tuotavia tilejÃ ei lÃytynyt. Empathy osaa tÃllÃ hetkellÃ tuoda tilejÃ ainoastaan PidginistÃ."
+
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Tuo tilejÃ"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Tuo"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "LÃhde"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Anna salasana"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Katkaise yhteys"
 
-#: ../src/empathy-main-window.c:622
+#: ../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-main-window.c:777
+#: ../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-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Muokkaa tiliÃ"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Sulje"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr ""
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr ""
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr ""
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Tuttava"
 
-#: ../src/empathy-main-window.c:2119
-msgid "Contact List"
-msgstr "Tuttavaluettelo"
-
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Tuttavat _kartalla"
-
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
 msgstr ""
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Etsi _tuttavaluettelosta"
+#. 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-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Liity _suosikkeihin"
+#: ../src/empathy-roster-window.c:2460
+msgid "Contact List"
+msgstr "Tuttavaluettelo"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Hallitse suosikkeja"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Tilin asetukset"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "_Normaali koko"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversationâ"
+msgstr "_Uusi keskusteluâ"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "New _Callâ"
 msgstr "Uusi _puheluâ"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Normaali koko _avatarien kera"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contactsâ"
+msgstr "Etsi _yhteystietoja..."
 
-#: ../src/empathy-main-window-menubar.ui.h:9
-msgid "P_references"
-msgstr "_Asetukset"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_Tiedostosiirrot"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
+#: ../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-main-window-menubar.ui.h:11
-msgid "Sort by _Name"
-msgstr "Lajittele _nimen mukaan"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Saldo"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
-msgid "Sort by _Status"
-msgstr "Lajittele _tilan mukaan"
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Tuttavat _kartalla"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_KÃyttÃjÃtilit"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:14
 msgid "_Blocked Contacts"
 msgstr "_Estetyt yhteystiedot"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
-msgid "_Compact Size"
-msgstr "_Tiivis koko"
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "P_references"
+msgstr "_Asetukset"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "_Tiedostosiirrot"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Etsi _tuttavaluettelosta"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
-msgid "_Joinâ"
-msgstr "_Liityâ"
+#: ../src/empathy-roster-window-menubar.ui.h:18
+msgid "Sort by _Name"
+msgstr "Lajittele _nimen mukaan"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversationâ"
-msgstr "_Uusi keskusteluâ"
+#: ../src/empathy-roster-window-menubar.ui.h:19
+msgid "Sort by _Status"
+msgstr "Lajittele _tilan mukaan"
 
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "_Poissa linjoilta olevat tuttavat"
+#: ../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-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_HenkilÃtiedot"
+#: ../src/empathy-roster-window-menubar.ui.h:22
+msgid "_Compact Size"
+msgstr "_Tiivis koko"
 
-#: ../src/empathy-main-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Room"
 msgstr "_Huone"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contactsâ"
-msgstr "Etsi _yhteystietoja..."
+#: ../src/empathy-roster-window-menubar.ui.h:24
+msgid "_Joinâ"
+msgstr "_Liityâ"
+
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Liity _suosikkeihin"
+
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Hallitse suosikkeja"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Keskusteluhuone"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 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:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
-msgid ""
-"%s\n"
-"Invite required: %s\n"
-"Password required: %s\n"
-"Members: %s"
-msgstr ""
-"%s\n"
-"Vaaditaan kutsu: %s\n"
-"Vaaditaan salasana: %s\n"
-"JÃseniÃ: %s"
+msgid "%s\nInvite required: %s\nPassword required: %s\nMembers: %s"
+msgstr "%s\nVaaditaan kutsu: %s\nVaaditaan salasana: %s\nJÃseniÃ: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "KyllÃ"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Ei"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Ei voitu aloittaa huoneluettelointia"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../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:2
-msgid "Couldn't load room list"
-msgstr "Ei voitu ladata huoneluetteloa"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Liity huoneeseen"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
-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."
+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
-msgid ""
-"Enter the server which hosts the room, or leave it empty if the room is on "
-"the current account's server"
-msgstr ""
-"Anna palvelin, jolta huone lÃytyy, tai jÃtÃ tyhjÃksi jos huone on tilin "
-"nykyisellÃ palvelimella"
+msgid "_Room:"
+msgstr "_Keskusteluhuone:"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Liity huoneeseen"
+msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account'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:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Ei voitu ladata huoneluetteloa"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Huoneluettelo"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Keskusteluhuone:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Viesti vastaanotettu"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Viesti lÃhetetty"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Uusi keskustelu"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "Tuttava saapui linjoille"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "Tuttava saapuu linjoille"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Tuttava poistui linjoilta"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Tili yhdistetty"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Tilin yhteys katkaistu"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Kieli"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
-msgstr ""
+msgstr "Julia"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
-msgstr ""
+msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
-msgstr ""
+msgstr "Romeo, Romeo. missÃ olet Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr ""
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: ../src/empathy-preferences.ui.h:1
+#: ../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"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Ulkoasu"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "KÃytÃs"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Avaa keskustelut:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "Keskustelun _teema:"
+msgid "new ta_bs"
+msgstr "uu_siin vÃlilehtiin"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Poista huomautukset kÃytÃstÃ oltaessa _poissa tai kiireinen"
+msgid "new _windows"
+msgstr "uusiin _ikkunoihin"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Poista ÃÃnet kÃytÃstÃ oltaessa _poissa tai kiireinen"
-
-#: ../src/empathy-preferences.ui.h:8
 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Ã"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid "Enable notifications when a contact comes online"
-msgstr "NÃytÃ ponnahdusikkuna, kun tuttava tulee linjoille"
+msgid "Log conversations"
+msgstr "Tallenna keskustelut lokitiedostoon"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact goes offline"
-msgstr "NÃytÃ ponnahdusikkuna, kun tuttava lÃhtee linjoilta"
+msgid "Behavior"
+msgstr "KÃytÃs"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when the _chat is not focused"
-msgstr "NÃytÃ huomautuksia, kun _keskustelu ei ole kohdistettu"
+msgid "General"
+msgstr "Yleinen"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable spell checking for languages:"
-msgstr "KÃytÃ kielentarkistusta kielille:"
+msgid "_Enable bubble notifications"
+msgstr "_KÃytÃ ponnahdusikkunahuomautuksia"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "General"
-msgstr "Yleinen"
+msgid "Disable notifications when _away or busy"
+msgstr "Poista huomautukset kÃytÃstÃ oltaessa _poissa tai kiireinen"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "Input level"
-msgstr ""
+msgid "Enable notifications when the _chat is not focused"
+msgstr "NÃytÃ huomautuksia, kun _keskustelu ei ole kohdistettu"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input volume"
-msgstr ""
+msgid "Enable notifications when a contact comes online"
+msgstr "NÃytÃ ponnahdusikkuna, kun tuttava tulee linjoille"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Enable notifications when a contact goes offline"
+msgstr "NÃytÃ ponnahdusikkuna, kun tuttava lÃhtee linjoilta"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Location sources:"
-msgstr "Sijainti:"
+msgid "Notifications"
+msgstr "Huomautukset"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Log conversations"
-msgstr "Tallenna keskustelut lokitiedostoon"
+msgid "_Enable sound notifications"
+msgstr "_KÃytÃ merkkiÃÃniÃ"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Notifications"
-msgstr "Huomautukset"
+msgid "Disable sounds when _away or busy"
+msgstr "Poista ÃÃnet kÃytÃstÃ oltaessa _poissa tai kiireinen"
 
 #: ../src/empathy-preferences.ui.h:20
 msgid "Play sound for events"
 msgstr "Soita ÃÃniÃ tapahtumille"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid "Privacy"
-msgstr "Yksityisyys"
+msgid "Sounds"
+msgstr "ÃÃnet"
 
 #: ../src/empathy-preferences.ui.h:22
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"Heikennetty sijaintitiedon tarkkuus tarkoittaa, ettÃ ainoastaan kaupunkisi "
-"ja maasi julkaistaan. GPS-koordinaattien tarkkuus on yksi desimaali."
+msgid "Use _echo cancellation to improve call quality"
+msgstr "KÃytÃ _kaiunpoistoa puhelun laadun parantamiseksi"
 
 #: ../src/empathy-preferences.ui.h:23
-msgid "Show _smileys as images"
-msgstr "NÃytÃ _hymiÃt hymiÃkuvakkeina"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show contact _list in rooms"
-msgstr "NÃytÃ tuttava_luettelo huoneissa"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Sounds"
-msgstr "ÃÃnet"
+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 hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
+msgstr "Kaiun poisto tekee ÃÃnestÃsi selkeÃmmÃn vastapuolen pÃÃssÃ, mutta siitÃ saattaa seurata ongelmia joillain tietokoneilla. Jos vastapuoli kuulee outoja ÃÃniÃ puhelun aikana, kokeile poistaa kaiun poisto kÃytÃstÃ ja soittaa puhelu uudelleen."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Spell Checking"
-msgstr "Kielentarkastus"
+msgid "_Publish location to my contacts"
+msgstr "_Julkaise sijainti tuttavilleni"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"Luettelo kielistÃ sisÃltÃÃ ainoastaan ne kielet, joille tietokoneessasi on "
-"asennettu sanakirja."
-
-#: ../src/empathy-preferences.ui.h:28
-msgid "Themes"
-msgstr "Teemat"
+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 decimal place."
+msgstr "Heikennetty sijaintitiedon tarkkuus tarkoittaa, ettÃ ainoastaan kaupunkisi 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
-msgid "Variant:"
-msgstr "Muunnelma:"
+msgid "_Reduce location accuracy"
+msgstr "_HeikennÃ sijaintitiedon tarkkuutta"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Automatically connect on startup"
-msgstr "_YhdistÃ automaattisesti kÃynnistyksen yhteydessÃ"
+msgid "Privacy"
+msgstr "Yksityisyys"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Cellphone"
-msgstr "_Matkapuhelin"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Enable bubble notifications"
-msgstr "_KÃytÃ ponnahdusikkunahuomautuksia"
+msgid "_Cellphone"
+msgstr "_Matkapuhelin"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable sound notifications"
-msgstr "_KÃytÃ merkkiÃÃniÃ"
-
-#: ../src/empathy-preferences.ui.h:34
-msgid "_GPS"
-msgstr "_GPS"
-
-#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Verkko (IP, Wi-Fi)"
 
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Sijainti:"
+
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "_Avaa uusi ikkuna uusille keskusteluille"
+msgid "The list of languages reflects only the languages for which you have a dictionary installed."
+msgstr "Luettelo kielistÃ sisÃltÃÃ ainoastaan ne kielet, joille tietokoneessasi on asennettu sanakirja."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "_Julkaise sijainti tuttavilleni"
+msgid "Enable spell checking for languages:"
+msgstr "KÃytÃ kielentarkistusta kielille:"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "Kielentarkastus"
 
-#. 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:39
-msgid "_Reduce location accuracy"
-msgstr "_HeikennÃ sijaintitiedon tarkkuutta"
+msgid "Chat Th_eme:"
+msgstr "Keskustelun _teema:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Muunnelma:"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Teemat"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Tila"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Soita tuttavalle uudelleen"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Kamera pois"
+msgid "Redial"
+msgstr "YhdistÃ uudelleen"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Kamera pÃÃllÃ"
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Video pois"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Kytke kamera poista kÃytÃstÃ ja lopeta videokuvan lÃhetys"
+msgid "Video Preview"
+msgstr "Videon esikatselu"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Ota kamera kÃyttÃÃn ja lÃhetÃ videokuvaa"
+msgid "Video On"
+msgstr "Video pÃÃllÃ"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Ota kamera kÃyttÃÃn, mutta ÃlÃ lÃhetÃ videokuvaa"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Soita tuttavalle uudelleen"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Esikatselu"
+msgid "Camera Off"
+msgstr "Kamera pois"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "YhdistÃ uudelleen"
+msgid "Disable camera and stop sending video"
+msgstr "Kytke kamera poista kÃytÃstÃ ja lopeta videokuvan lÃhetys"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Esikatselu"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Video pois"
+#: ../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"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Video pÃÃllÃ"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Kamera pÃÃllÃ"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Videon esikatselu"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Ota kamera kÃyttÃÃn ja lÃhetÃ videokuvaa"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Tuttavien karttanÃkymÃ"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Tallenna"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Pastebin-linkki"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Pastebin-vastaus"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "VianetsintÃikkuna"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "LÃhetÃ pastebin-palveluun"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "PysÃytÃ"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Taso "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "VirheenjÃljitys"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Tietoa"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Viesti"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Kriittinen"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Virhe"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Aika"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Alue"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Luokka"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Taso"
 
-#: ../src/empathy-debug-window.c:1642
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
+#: ../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."
 
-#: ../src/empathy-invite-participant-dialog.c:205
-#: ../src/empathy-invite-participant-dialog.c:231
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "Kutsu osanottaja"
 
-#: ../src/empathy-invite-participant-dialog.c:206
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Valitse keskusteluun kutsuttava tuttava:"
 
-#: ../src/empathy-invite-participant-dialog.c:227
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "Kutsu"
 
-#: ../src/empathy-accounts.c:183
+#: ../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"
+msgstr "ÃlÃ nÃytÃ mitÃÃn valintaikkunoita; tee mitÃ tahansa tyÃtÃ (esim. tuonti) ja poistu"
 
-#: ../src/empathy-accounts.c:187
-msgid ""
-"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+#: ../src/empathy-accounts.c:184
+msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 
-#: ../src/empathy-accounts.c:191
+#: ../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)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<kÃyttÃjÃtunnus>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy-tilit"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy-tilit"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
-msgstr ""
+msgstr "NÃytÃ tietty palvelu"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr ""
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empathyn virheenjÃljitin"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy-keskusteluasiakas"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Vastaa"
 
-#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "HylkÃÃ"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Vastaa"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Vastaa videon kanssa"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "KieltÃydy"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "HyvÃksy"
 
-#: ../src/empathy-notifications-approver.c:260
+#. 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 ""
 
-#: ../src/empathy-call-observer.c:134
+#: ../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."
+msgstr "%s yritti juuri soittaa sinulle, mutta sinulla oli toinen puhelu kesken."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1036 ../src/empathy-call-window.c:1059
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr ""
 
-#: ../src/empathy-call-window.c:2603
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "Pidossa"
 
-#: ../src/empathy-call-window.c:2606
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Vaimenna"
 
-#: ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Kesto"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2611
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s â %d:%02dm"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
-msgid "_Match case"
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
 msgstr ""
 
-#~ msgid "%s is sending you a file. Do you want to accept it?"
-#~ msgstr "%s haluaa lÃhettÃÃ sinulle tiedoston. Haluatko vastaanottaa sen?"
-
-#~ msgid "_Accept"
-#~ msgstr "_HyvÃksy"
-
-#~ msgid "Empathy has asked about importing accounts"
-#~ msgstr "Empathy on kysynyt tilien tuonnista"
-
-#~ msgid "All"
-#~ msgstr "Kaikki"
-
-#~ msgid "Select"
-#~ msgstr "Valitse"
-
-#~ msgid "Date"
-#~ msgstr "PÃivÃmÃÃrÃ"
-
-#~ msgid "Conversations"
-#~ msgstr "Keskustelut"
-
-#~ msgid "Previous Conversations"
-#~ msgstr "Aikaisemmat keskustelut"
-
-#~ msgid "_For:"
-#~ msgstr "_Ajalta:"
-
-#~ msgid "Show and edit accounts"
-#~ msgstr "NÃytÃ ja muokkaa tilejÃ"
-
-#~ msgid "The hash of the received file and the sent one do not match"
-#~ msgstr "Vastaanotetun ja lÃhetetyn tiedoston tiiviste ei tÃsmÃÃ"
-
-#~ msgid "Enter Custom Message"
-#~ msgstr "SyÃtÃ itse mÃÃritelty viesti"
-
-#~ msgid "Add _New Preset"
-#~ msgstr "LisÃÃ _uusi esitieto"
-
-#~ msgid "Saved Presets"
-#~ msgstr "Tallennetut esitiedot"
-
-#~ msgid ""
-#~ "Whether Empathy has asked about importing accounts from other programs."
-#~ msgstr "Onko Empathy tiedustellut tilien tuomisesta."
-
-#~ msgid "Show incoming messages in the messaging menu"
-#~ msgstr "NÃytÃ saapuvat viestit viestivalikossa"
-
-#~ msgid "Match case"
-#~ msgstr "Huomioi kirjainkoko"
-
-#~ msgid "_Addâ"
-#~ msgstr "_LisÃÃâ"
-
-#~ msgid "Find Next"
-#~ msgstr "Etsi seuraava"
-
-#~ msgid "Find Previous"
-#~ msgstr "Etsi edellinen"
-
-#~ msgid "The certificate has expired"
-#~ msgstr "Varmenne on vanhentunut"
-
-#~ msgid ""
-#~ "The certificate has been revoked by the issuing Certification Authority"
-#~ msgstr "Varmenne on peruutettu varmenteen myÃntÃjÃn toimesta"
-
-#~ msgid "The certificate hasn't yet been activated"
-#~ msgstr "Varmennetta ei ole vielÃ aktivoitu"
-
-#~ msgid "The certificate is self-signed"
-#~ msgstr "Varmenne on itsetehty"
-
-#~ msgid "The certificate is malformed"
-#~ msgstr "Varmenne on muodostettu vÃÃrin"
-
-#~ msgid "The identity provided by the chat server cannot be verified.\n"
-#~ msgstr "Keskustelupalvelimen antamaa tunnistetta ei voida varmistaa.\n"
-
-#~ msgid "The certificate is cryptographically weak"
-#~ msgstr "Varmenteen salausmenetelmÃ on heikko"
-
-#~ msgid ""
-#~ "The hostname verified by the certificate doesn't match the server name"
-#~ msgstr ""
-#~ "Varmenteessa ilmoitettu isÃntÃnimi ei tÃsmÃÃ palvelimen nimen kanssa"
-
-#~ msgid "The certificate length exceeds verifiable limits"
-#~ msgstr "Varmenteen pituus ylittÃÃ sallitut rajat"
-
-#~ msgid "_Enabled"
-#~ msgstr "_KÃytÃssÃ"
-
-#~ msgid "Meta-contact containing %u contact"
-#~ msgid_plural "Meta-contact containing %u contacts"
-#~ msgstr[0] "Metayhteystieto, joka sisÃltÃÃ %u yhteystiedon"
-#~ msgstr[1] "Metayhteystieto, joka sisÃltÃÃ %u yhteystietoa"
-
-#~ msgid ""
-#~ "Completely split the displayed meta-contact into the contacts it contains."
-#~ msgstr "Jaa nÃytettÃvÃ metayhteystieto sen sisÃltÃmiin yhteystietoihin."
-
-#~ msgid "Unlink meta-contact '%s'?"
-#~ msgstr "Poistetaanko metayhteystiedon â%sâ linkitys?"
-
-#~ msgid ""
-#~ "Are you sure you want to unlink this meta-contact? This will completely "
-#~ "split the meta-contact into the contacts it contains."
-#~ msgstr ""
-#~ "Haluatko varmasti poistaa tÃmÃn metayhteystiedon linkityksen? "
-#~ "Metayhteystieto jaetaan sen sisÃltÃmiin yhteystietoihin."
-
-#~ msgid "The certificate is not signed by a Certification Authority"
-#~ msgstr "Varmennetta ei ole virallisesti allekirjoitettu"
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you donât have enough credit for that call."
+msgstr ""
 
-#~ msgid "The certificate does not have the expected fingerprint"
-#~ msgstr "Varmenteessa ei ole odotettua sormenjÃlkeÃ"
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr ""
 
-#~ msgid "Don't display any dialogs if there are any non-Salut accounts"
-#~ msgstr ""
-#~ "ÃlÃ nÃytÃ mitÃÃn valintaikkunoita, paitsi jos kÃytÃssÃ on vain âLÃhellÃ "
-#~ "olevat ihmisetâ -tilejÃ"
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_Huomioi kirjainkoko"
 
-#~ msgid "Are you sure you want to remove '%s' from your contacts?"
-#~ msgstr "Haluatko varmasti poistaa kohteen '%s' yhteystiedoistasi?"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "MinkÃ tyyppinen pikaviestintili sinulla on?"
 
-#~ msgid "Your software is too old"
-#~ msgstr "Sovelluksesi on liian vanha"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "LisÃtÃÃn uutta tiliÃ"
 
-#~ msgid "Update software..."
-#~ msgstr "PÃivitÃ sovellus..."
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "LÃhellÃ olevat ihmiset"
 
-#~ msgid "Unavailable"
-#~ msgstr "Ei kÃytettÃvissÃ"
+#: ../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 "Off"
-#~ msgstr "Kiinni"
+#: ../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 "On"
-#~ msgstr "PÃÃllÃ"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]