im.pidgin.pidgin: 0b43c761b11bc674283e053811c52e4230382444

nosnilmot at pidgin.im nosnilmot at pidgin.im
Thu Feb 28 11:30:46 EST 2008


-----------------------------------------------------------------
Revision: 0b43c761b11bc674283e053811c52e4230382444
Ancestor: 5d5484012e54834874739deb81e011074c1d098e
Author: nosnilmot at pidgin.im
Date: 2008-02-28T16:25:22
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0b43c761b11bc674283e053811c52e4230382444

Modified files:
        po/ChangeLog po/fi.po

ChangeLog: 

Finnish translation updated (Timo Jyrinki)
Closes #4920

-------------- next part --------------
============================================================
--- po/ChangeLog	dade75b2a3257e9063d603591b5d01cebef2ae08
+++ po/ChangeLog	63a1cf741149718dee44a35a92b25792794714b3
@@ -1,9 +1,10 @@ version 2.4.0
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.4.0
 	* Arabic translation updated (Khaled Hosny)
 	* Belarusian Latin translation updated (Ihar Hrachyshka)
 	* Dutch translation updated (Daniël Heres)
+	* Finnish translation updated (Timo Jyrinki)
 	* Greek translation updated (Bouklis Panos)
 	* Hebrew translation updated (Shalom Craimer)
 	* Norwegian Bokmål translation updated (Hallvard Glad, Espen Stefansen)
============================================================
--- po/fi.po	a88c6fddef2c0532edd73bba26e0a977bec6bf20
+++ po/fi.po	2615ae1756e6236e6f092a06607ff5d268b14f06
@@ -1,7 +1,7 @@
 # Pidgin Finnish translation
 # Copyright (C) 2002 Tero Kuusela <teroajk at subdimension.com>
 # Copyright (C) 2003-2005 Arto Alakulju <arto at alakulju.net>
-# Copyright (C) 2005-2007 Timo Jyrinki <timo.jyrinki at iki.fi>
+# Copyright (C) 2005-2008 Timo Jyrinki <timo.jyrinki at iki.fi>
 #
 # This file is distributed under the same license as the Pidgin package.
 #
@@ -10,8 +10,8 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-14 23:05+0200\n"
-"PO-Revision-Date: 2007-11-14 23:05+0200\n"
+"POT-Creation-Date: 2008-02-26 03:22-0500\n"
+"PO-Revision-Date: 2008-02-26 16:48+0200\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki at iki.fi>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
-#: ../finch/finch.c:418
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
+#: ../finch/finch.c:417
 msgid "Finch"
 msgstr "Finch"
 
@@ -50,7 +52,7 @@ msgstr ""
 "  -n, --nologin       älä kirjaudu automaattisesti\n"
 "  -v, --version       näytä nykyinen versionumero ja poistu\n"
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:730
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:743
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -61,15 +63,15 @@ msgstr ""
 "Tutki asiaa ja suorita asetusten siirto käsin. Ilmoita tästä ongelmasta "
 "osoitteessa http://developer.pidgin.im/"
 
-#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:189
-#: ../finch/gntplugin.c:237 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
+#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:574
+#: ../finch/gntblist.c:710 ../finch/gntblist.c:723 ../finch/gntplugin.c:196
+#: ../finch/gntplugin.c:244 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2032
+#: ../libpurple/protocols/jabber/buddy.c:2036
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/jabber.c:1584
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
 #: ../libpurple/protocols/silc/ops.c:1460
@@ -101,8 +103,8 @@ msgstr "(Unohdit luultavasti suorittaa \
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Unohdit luultavasti suorittaa \"make install\".)"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
-#: ../pidgin/gtkaccount.c:1478 ../pidgin/gtkblist.c:4501
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:138
+#: ../pidgin/gtkaccount.c:1447 ../pidgin/gtkblist.c:4542
 msgid "Modify Account"
 msgstr "Muokkaa tiliä"
 
@@ -125,41 +127,44 @@ msgid "Alias:"
 
 #: ../finch/gntaccount.c:552
 msgid "Alias:"
-msgstr "Alias:"
+msgstr "Lempinimi:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
-#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
-#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2226 ../finch/gntblist.c:2289
-#: ../finch/gntcertmgr.c:91 ../finch/gntplugin.c:475 ../finch/gntpounce.c:472
-#: ../finch/gntpounce.c:680 ../finch/gntprefs.c:265 ../finch/gntsound.c:1058
-#: ../finch/gntstatus.c:145 ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../finch/plugins/gnthistory.c:181 ../libpurple/account.c:1105
-#: ../libpurple/account.c:1394 ../libpurple/account.c:1429
-#: ../libpurple/conversation.c:1215 ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/protocols/gg/gg.c:508 ../libpurple/protocols/gg/gg.c:667
-#: ../libpurple/protocols/gg/gg.c:804 ../libpurple/protocols/gg/gg.c:886
-#: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2426
-#: ../libpurple/protocols/jabber/buddy.c:2462
+#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:639
+#: ../finch/gntaccount.c:890 ../finch/gntblist.c:620 ../finch/gntblist.c:698
+#: ../finch/gntblist.c:733 ../finch/gntblist.c:1077 ../finch/gntblist.c:1303
+#: ../finch/gntblist.c:1437 ../finch/gntblist.c:2602 ../finch/gntblist.c:2651
+#: ../finch/gntblist.c:2715 ../finch/gntcertmgr.c:90 ../finch/gntplugin.c:532
+#: ../finch/gntpounce.c:471 ../finch/gntpounce.c:679 ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1059 ../finch/gntstatus.c:145 ../finch/gntstatus.c:485
+#: ../finch/gntstatus.c:610 ../finch/plugins/gnthistory.c:178
+#: ../libpurple/account.c:1116 ../libpurple/account.c:1419
+#: ../libpurple/account.c:1454 ../libpurple/conversation.c:1222
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:508
+#: ../libpurple/protocols/gg/gg.c:667 ../libpurple/protocols/gg/gg.c:804
+#: ../libpurple/protocols/gg/gg.c:886
+#: ../libpurple/protocols/jabber/buddy.c:730
+#: ../libpurple/protocols/jabber/buddy.c:2430
+#: ../libpurple/protocols/jabber/buddy.c:2466
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1035
-#: ../libpurple/protocols/jabber/jabber.c:1044
-#: ../libpurple/protocols/jabber/jabber.c:1746
-#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/jabber/jabber.c:1053
+#: ../libpurple/protocols/jabber/jabber.c:1062
+#: ../libpurple/protocols/jabber/jabber.c:1777
+#: ../libpurple/protocols/jabber/si.c:1109
 #: ../libpurple/protocols/jabber/usermood.c:202
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:291 ../libpurple/protocols/msn/msn.c:308
-#: ../libpurple/protocols/msn/msn.c:325 ../libpurple/protocols/msn/msn.c:342
-#: ../libpurple/protocols/msn/msn.c:363 ../libpurple/protocols/msnp9/msn.c:287
-#: ../libpurple/protocols/msnp9/msn.c:304
-#: ../libpurple/protocols/msnp9/msn.c:321
-#: ../libpurple/protocols/msnp9/msn.c:338
-#: ../libpurple/protocols/msnp9/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6144
+#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:359 ../libpurple/protocols/msnp9/msn.c:284
+#: ../libpurple/protocols/msnp9/msn.c:301
+#: ../libpurple/protocols/msnp9/msn.c:318
+#: ../libpurple/protocols/msnp9/msn.c:335
+#: ../libpurple/protocols/msnp9/msn.c:356
+#: ../libpurple/protocols/myspace/user.c:582
+#: ../libpurple/protocols/myspace/user.c:676
+#: ../libpurple/protocols/oscar/oscar.c:6197
 #: ../libpurple/protocols/oscar/peer.c:1048
 #: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -167,17 +172,17 @@ msgstr "Alias:"
 #: ../libpurple/protocols/qq/group.c:124
 #: ../libpurple/protocols/qq/group_join.c:140
 #: ../libpurple/protocols/qq/group_join.c:365
-#: ../libpurple/protocols/qq/group_opt.c:144
-#: ../libpurple/protocols/qq/group_opt.c:399
-#: ../libpurple/protocols/qq/sys_msg.c:113
-#: ../libpurple/protocols/qq/sys_msg.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3430
-#: ../libpurple/protocols/sametime/sametime.c:3516
-#: ../libpurple/protocols/sametime/sametime.c:3690
-#: ../libpurple/protocols/sametime/sametime.c:5443
-#: ../libpurple/protocols/sametime/sametime.c:5533
-#: ../libpurple/protocols/sametime/sametime.c:5658
+#: ../libpurple/protocols/qq/group_opt.c:120
+#: ../libpurple/protocols/qq/group_opt.c:375
+#: ../libpurple/protocols/qq/sys_msg.c:115
+#: ../libpurple/protocols/qq/sys_msg.c:175
+#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/sametime/sametime.c:3438
+#: ../libpurple/protocols/sametime/sametime.c:3524
+#: ../libpurple/protocols/sametime/sametime.c:3698
+#: ../libpurple/protocols/sametime/sametime.c:5451
+#: ../libpurple/protocols/sametime/sametime.c:5541
+#: ../libpurple/protocols/sametime/sametime.c:5666
 #: ../libpurple/protocols/silc/buddy.c:455
 #: ../libpurple/protocols/silc/buddy.c:1079
 #: ../libpurple/protocols/silc/buddy.c:1194
@@ -191,41 +196,41 @@ msgstr "Alias:"
 #: ../libpurple/protocols/silc10/buddy.c:1192
 #: ../libpurple/protocols/silc10/chat.c:600
 #: ../libpurple/protocols/silc10/chat.c:730
-#: ../libpurple/protocols/silc10/ops.c:1904
-#: ../libpurple/protocols/silc10/silc.c:736
-#: ../libpurple/protocols/silc10/silc.c:943
-#: ../libpurple/protocols/yahoo/yahoo.c:1034
-#: ../libpurple/protocols/yahoo/yahoo.c:3509
-#: ../libpurple/protocols/yahoo/yahoo.c:3520 ../pidgin/gtkaccount.c:1913
-#: ../pidgin/gtkaccount.c:2501 ../pidgin/gtkblist.c:6678
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:789
-#: ../pidgin/gtkdialogs.c:928 ../pidgin/gtkdialogs.c:1020
-#: ../pidgin/gtkdialogs.c:1040 ../pidgin/gtkdialogs.c:1064
-#: ../pidgin/gtkdialogs.c:1086 ../pidgin/gtkdialogs.c:1134
-#: ../pidgin/gtkdialogs.c:1175 ../pidgin/gtkdialogs.c:1231
-#: ../pidgin/gtkdialogs.c:1270 ../pidgin/gtkdialogs.c:1297
-#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1121
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
-#: ../pidgin/gtkprivacy.c:606 ../pidgin/gtkprivacy.c:620
-#: ../pidgin/gtkrequest.c:321 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1593
+#: ../libpurple/protocols/silc10/ops.c:1910
+#: ../libpurple/protocols/silc10/silc.c:742
+#: ../libpurple/protocols/silc10/silc.c:948
+#: ../libpurple/protocols/yahoo/yahoo.c:993
+#: ../libpurple/protocols/yahoo/yahoo.c:3540
+#: ../libpurple/protocols/yahoo/yahoo.c:3551 ../pidgin/gtkaccount.c:1841
+#: ../pidgin/gtkaccount.c:2402 ../pidgin/gtkblist.c:6768
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:765
+#: ../pidgin/gtkdialogs.c:904 ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1016 ../pidgin/gtkdialogs.c:1040
+#: ../pidgin/gtkdialogs.c:1062 ../pidgin/gtkdialogs.c:1110
+#: ../pidgin/gtkdialogs.c:1151 ../pidgin/gtkdialogs.c:1207
+#: ../pidgin/gtkdialogs.c:1246 ../pidgin/gtkdialogs.c:1273
+#: ../pidgin/gtkimhtmltoolbar.c:438 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkplugin.c:290 ../pidgin/gtkpounce.c:1113
+#: ../pidgin/gtkprivacy.c:509 ../pidgin/gtkprivacy.c:525
+#: ../pidgin/gtkprivacy.c:550 ../pidgin/gtkprivacy.c:564
+#: ../pidgin/gtkrequest.c:273 ../pidgin/gtksavedstatuses.c:345
+#: ../pidgin/gtkstatusbox.c:1610
 msgid "Cancel"
 msgstr "Peru"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:297
-#: ../finch/gntplugin.c:475 ../finch/gntpounce.c:478 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1428 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:754
-#: ../pidgin/gtkrequest.c:327
+#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:310 ../finch/gntdebug.c:297
+#: ../finch/gntplugin.c:532 ../finch/gntpounce.c:477 ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1056 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
+#: ../libpurple/account.c:1453 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:729 ../pidgin/gtkdebug.c:746
+#: ../pidgin/gtkrequest.c:279
 msgid "Save"
 msgstr "Tallenna"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1905
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1587
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1832
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1604
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
@@ -235,128 +240,147 @@ msgstr "Poista tili"
 msgstr "Poista tili"
 
 #. Delete button
-#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:679 ../finch/gntpounce.c:742
+#: ../finch/gntaccount.c:638 ../finch/gntaccount.c:708
+#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:678 ../finch/gntpounce.c:741
 #: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1912 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1120 ../pidgin/gtkrequest.c:324
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1592
+#: ../pidgin/gtkaccount.c:1840 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1112 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1609
 msgid "Delete"
 msgstr "Poista"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2123 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2331 ../pidgin/gtkdocklet.c:715
+#: ../finch/gntaccount.c:670 ../finch/gntblist.c:2469 ../finch/gntui.c:94
+#: ../pidgin/gtkaccount.c:2261 ../pidgin/gtkdocklet.c:716
 msgid "Accounts"
 msgstr "Käyttäjätilit"
 
-#: ../finch/gntaccount.c:675
+#: ../finch/gntaccount.c:676
 msgid "You can enable/disable accounts from the following list."
 msgstr ""
 "Voit ottaa käyttöön/pois käytöstä käyttäjätilejä seuraavasta luettelosta."
 
 #. Add button
-#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2381
-#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:385 ../finch/gntpounce.c:726
-#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:885
-#: ../libpurple/protocols/qq/sys_msg.c:114
-#: ../libpurple/protocols/qq/sys_msg.c:173
-#: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../finch/gntaccount.c:699 ../finch/gntaccount.c:889 ../finch/gntblist.c:619
+#: ../finch/gntblist.c:698 ../finch/gntblist.c:733 ../finch/gntblist.c:2819
+#: ../finch/gntcertmgr.c:305 ../finch/gntnotify.c:385 ../finch/gntpounce.c:725
+#: ../finch/gntroomlist.c:274 ../finch/gntstatus.c:199
+#: ../libpurple/protocols/gg/gg.c:885 ../libpurple/protocols/qq/sys_msg.c:116
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../libpurple/protocols/sametime/sametime.c:5540
 #: ../libpurple/protocols/silc/chat.c:619
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2500
-#: ../pidgin/gtkblist.c:6677 ../pidgin/gtkconv.c:1713
-#: ../pidgin/gtkrequest.c:325
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2401
+#: ../pidgin/gtkblist.c:6767 ../pidgin/gtkconv.c:1702
+#: ../pidgin/gtkrequest.c:277
 msgid "Add"
 msgstr "Lisää"
 
 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:734
+#: ../finch/gntaccount.c:704 ../finch/gntpounce.c:733
 msgid "Modify"
 msgstr "Muokkaa"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2447
+#: ../finch/gntaccount.c:812 ../pidgin/gtkaccount.c:2348
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s on tehnyt käyttäjästä %s tuttavansa%s%s"
 
-#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2499
+#: ../finch/gntaccount.c:885 ../pidgin/gtkaccount.c:2400
 msgid "Add buddy to your list?"
 msgstr "Lisää tuttava tuttavaluetteloon?"
 
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2557
+#: ../finch/gntaccount.c:945 ../pidgin/gtkaccount.c:2458
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s haluaa lisätä käyttäjän %s tuttavaluetteloonsa%s%s"
 
-#: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2580
-#: ../pidgin/gtkaccount.c:2586
+#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:973
+#: ../finch/gntaccount.c:1000 ../pidgin/gtkaccount.c:2481
+#: ../pidgin/gtkaccount.c:2488
 msgid "Authorize buddy?"
 msgstr "Valtuuta tuttava?"
 
-#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2581 ../pidgin/gtkaccount.c:2587
+#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
+#: ../pidgin/gtkaccount.c:2482 ../pidgin/gtkaccount.c:2489
 msgid "Authorize"
 msgstr "Valtuuta"
 
-#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2582 ../pidgin/gtkaccount.c:2588
+#: ../finch/gntaccount.c:978 ../finch/gntaccount.c:1005
+#: ../pidgin/gtkaccount.c:2483 ../pidgin/gtkaccount.c:2490
 msgid "Deny"
 msgstr "Kiellä"
 
-#: ../finch/gntblist.c:289
+#: ../finch/gntblist.c:265
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"Kirjautuneena: %d\n"
+"Yhteensä: %d"
+
+#: ../finch/gntblist.c:274
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Tili: %s (%s)"
+
+#: ../finch/gntblist.c:286
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"Viimeksi nähty: %s sitten"
+
+#: ../finch/gntblist.c:306 ../pidgin/gtkprefs.c:327
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
+msgid "Default"
+msgstr "Oletus"
+
+#: ../finch/gntblist.c:563
 msgid "You must provide a screename for the buddy."
 msgstr "Tuttavan näyttönimi on annettava."
 
-#: ../finch/gntblist.c:291
+#: ../finch/gntblist.c:565
 msgid "You must provide a group."
 msgstr "Ryhmä on määritettävä."
 
-#: ../finch/gntblist.c:293
+#: ../finch/gntblist.c:567
 msgid "You must select an account."
 msgstr "Käyttäjätili täytyy valita."
 
-#: ../finch/gntblist.c:295
+#: ../finch/gntblist.c:569
 msgid "The selected account is not online."
 msgstr "Valittu käyttäjätili ei ole linjoilla."
 
-#: ../finch/gntblist.c:300
+#: ../finch/gntblist.c:574
 msgid "Error adding buddy"
 msgstr "Virhe lisättäessä tuttavaa"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2898
-#: ../pidgin/gtkaccount.c:1986 ../pidgin/gtksavedstatuses.c:986
+#: ../finch/gntblist.c:601 ../libpurple/protocols/oscar/oscar.c:2949
+#: ../pidgin/gtkaccount.c:1914 ../pidgin/gtksavedstatuses.c:971
 msgid "Screen Name"
 msgstr "Näyttönimi"
 
-#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1551
-#: ../libpurple/protocols/msnp9/msn.c:1402
-#: ../libpurple/protocols/silc/chat.c:610
-#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1039
-#: ../pidgin/gtkdialogs.c:1063 ../pidgin/gtkdialogs.c:1085
-#: ../pidgin/gtkrequest.c:328
-msgid "Alias"
-msgstr "Alias"
+#: ../finch/gntblist.c:604
+msgid "Alias (optional)"
+msgstr "Lempinimi (valinnainen) "
 
-#: ../finch/gntblist.c:331 ../finch/gntblist.c:413
-msgid "Group"
-msgstr "Ryhmä"
+#: ../finch/gntblist.c:607
+msgid "Add in group"
+msgstr "Lisää ryhmään"
 
-#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntblist.c:2212 ../finch/gntblist.c:2276 ../finch/gntnotify.c:174
-#: ../finch/gntstatus.c:576 ../libpurple/plugins/idle.c:153
-#: ../libpurple/plugins/idle.c:190 ../pidgin/gtkblist.c:3242
-#: ../pidgin/gtknotify.c:512 ../pidgin/gtkpounce.c:1288
-#: ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../finch/gntblist.c:611 ../finch/gntblist.c:678 ../finch/gntblist.c:1648
+#: ../finch/gntblist.c:2583 ../finch/gntblist.c:2637 ../finch/gntblist.c:2702
+#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:3201 ../pidgin/gtknotify.c:517
+#: ../pidgin/gtkpounce.c:1281 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Tili"
 
-#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
+#: ../finch/gntblist.c:617 ../finch/gntblist.c:1126
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1030
 #: ../libpurple/protocols/silc/buddy.c:1075
@@ -365,188 +389,210 @@ msgstr "Tili"
 #: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/buddy.c:1083
 #: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/yahoo.c:3354 ../pidgin/gtkblist.c:6179
+#: ../libpurple/protocols/yahoo/yahoo.c:3380 ../pidgin/gtkblist.c:6298
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Lisää tuttava"
 
-#: ../finch/gntblist.c:341
+#: ../finch/gntblist.c:617
 msgid "Please enter buddy information."
 msgstr "Syötä tuttavan tiedot."
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
+#: ../finch/gntblist.c:647 ../libpurple/blist.c:1237
 msgid "Chats"
 msgstr "Ryhmäkeskustelut"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../finch/gntblist.c:2207
-#: ../libpurple/protocols/jabber/jabber.c:951
-#: ../libpurple/protocols/jabber/jabber.c:954
-#: ../libpurple/protocols/msn/msn.c:1732 ../libpurple/protocols/msn/msn.c:1797
-#: ../libpurple/protocols/msn/msn.c:1824
-#: ../libpurple/protocols/msnp9/msn.c:1585
-#: ../libpurple/protocols/msnp9/msn.c:1650
-#: ../libpurple/protocols/msnp9/msn.c:1677
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:608
-#: ../pidgin/gtkroomlist.c:931
+#: ../finch/gntblist.c:684 ../finch/gntblist.c:2578 ../finch/gntblist.c:2632
+#: ../finch/gntroomlist.c:298 ../libpurple/protocols/jabber/jabber.c:981
+#: ../libpurple/protocols/jabber/jabber.c:984
+#: ../libpurple/protocols/msn/msn.c:1740 ../libpurple/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msn/msn.c:1832
+#: ../libpurple/protocols/msnp9/msn.c:1596
+#: ../libpurple/protocols/msnp9/msn.c:1661
+#: ../libpurple/protocols/msnp9/msn.c:1688
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:652
+#: ../pidgin/gtkroomlist.c:749
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Nimi"
 
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
+#: ../finch/gntblist.c:687 ../finch/gntblist.c:1589
+#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msnp9/msn.c:1413
+#: ../libpurple/protocols/silc/chat.c:610
+#: ../libpurple/protocols/silc10/chat.c:590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
+#: ../libpurple/protocols/zephyr/zephyr.c:792
+#: ../libpurple/protocols/zephyr/zephyr.c:1167 ../pidgin/gtkdialogs.c:1015
+#: ../pidgin/gtkdialogs.c:1039 ../pidgin/gtkdialogs.c:1061
+#: ../pidgin/gtkrequest.c:280
+msgid "Alias"
+msgstr "Lempinimi"
+
+#: ../finch/gntblist.c:690 ../finch/gntblist.c:2835
+msgid "Group"
+msgstr "Ryhmä"
+
+#: ../finch/gntblist.c:693 ../finch/gntblist.c:1093
 msgid "Auto-join"
 msgstr "Liity automaattisesti"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6563
+#: ../finch/gntblist.c:696 ../finch/gntblist.c:1128 ../pidgin/gtkblist.c:6681
 msgid "Add Chat"
 msgstr "Lisää ryhmäkeskustelu"
 
-#: ../finch/gntblist.c:420
+#: ../finch/gntblist.c:697
 msgid "You can edit more information from the context menu later."
 msgstr "Voit muokata lisää tietoja myöhemmin pikavalikosta."
 
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
+#: ../finch/gntblist.c:710 ../finch/gntblist.c:723
 msgid "Error adding group"
 msgstr "Virhe lisättäessä ryhmää"
 
-#: ../finch/gntblist.c:434
+#: ../finch/gntblist.c:711
 msgid "You must give a name for the group to add."
 msgstr "Lisättävän ryhmän nimi on annettava."
 
-#: ../finch/gntblist.c:447
+#: ../finch/gntblist.c:724
 msgid "A group with the name already exists."
 msgstr "Valitun niminen ryhmä on jo olemassa"
 
-#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
-#: ../libpurple/protocols/sametime/sametime.c:5442
-#: ../libpurple/protocols/sametime/sametime.c:5530 ../pidgin/gtkblist.c:6674
+#: ../finch/gntblist.c:731 ../finch/gntblist.c:1130
+#: ../libpurple/protocols/sametime/sametime.c:5450
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtkblist.c:6764
 msgid "Add Group"
 msgstr "Lisää ryhmä"
 
-#: ../finch/gntblist.c:454
+#: ../finch/gntblist.c:731
 msgid "Enter the name of the group"
 msgstr "Anna ryhmän nimi"
 
-#: ../finch/gntblist.c:802
+#: ../finch/gntblist.c:1076
 msgid "Edit Chat"
 msgstr "Muokkaa ryhmäkeskustelua"
 
-#: ../finch/gntblist.c:802
+#: ../finch/gntblist.c:1076
 msgid "Please Update the necessary fields."
 msgstr "Päivitä vaaditut kentät."
 
-#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
+#: ../finch/gntblist.c:1077 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: ../finch/gntblist.c:828
+#: ../finch/gntblist.c:1102
 msgid "Edit Settings"
 msgstr "Muokkaa asetuksia"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:1138 ../pidgin/gtkutils.c:980
 msgid "Information"
 msgstr "Tiedot"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:1138 ../pidgin/gtkutils.c:980
 msgid "Retrieving..."
 msgstr "Haetaan..."
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:528
+#: ../finch/gntblist.c:1192 ../finch/gntconv.c:591
 #: ../libpurple/protocols/silc/chat.c:903
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Hae tiedot"
 
-#: ../finch/gntblist.c:908
+#: ../finch/gntblist.c:1196
 msgid "Add Buddy Pounce"
 msgstr "Lisää tuttavailmoitin"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:540
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:588
-#: ../pidgin/gtkconv.c:1661
+#: ../finch/gntblist.c:1203 ../finch/gntconv.c:603
+#: ../libpurple/protocols/jabber/si.c:1109
+#: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:588
+#: ../pidgin/gtkconv.c:1650
 msgid "Send File"
 msgstr "Lähetä tiedosto"
 
-#: ../finch/gntblist.c:919
+#: ../finch/gntblist.c:1210 ../libpurple/protocols/gg/gg.c:1629
+#: ../libpurple/protocols/msn/msn.c:660 ../libpurple/protocols/msnp9/msn.c:562
+msgid "Blocked"
+msgstr "Estetty"
+
+#: ../finch/gntblist.c:1216 ../finch/gntblist.c:1605
 msgid "View Log"
 msgstr "Näytä loki"
 
-#: ../finch/gntblist.c:1000
+#: ../finch/gntblist.c:1298
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Anna uusi nimi kohteelle %s"
 
-#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
+#: ../finch/gntblist.c:1300 ../finch/gntblist.c:1589
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: ../finch/gntblist.c:1002
+#: ../finch/gntblist.c:1300
 msgid "Set Alias"
 msgstr "Aseta lempinimi"
 
-#: ../finch/gntblist.c:1003
+#: ../finch/gntblist.c:1301
 msgid "Enter empty string to reset the name."
 msgstr "Syötä tyhjä merkkijono palauttaaksesi oletusnimen."
 
-#: ../finch/gntblist.c:1079
+#: ../finch/gntblist.c:1415
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "Kontaktin poistaminen poistaa myös kaikki kontaktissa olevat tuttavat"
 
-#: ../finch/gntblist.c:1087
+#: ../finch/gntblist.c:1423
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Ryhmän poistaminen poistaa myös kaikki ryhmässä olevat tuttavat"
 
-#: ../finch/gntblist.c:1092
+#: ../finch/gntblist.c:1428
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1095
+#: ../finch/gntblist.c:1431
 msgid "Confirm Remove"
 msgstr "Vahvista poistaminen"
 
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1710 ../pidgin/gtkrequest.c:326
-#: ../pidgin/gtkstatusbox.c:264
+#: ../finch/gntblist.c:1436 ../finch/gntblist.c:1591 ../finch/gntft.c:243
+#: ../pidgin/gtkconv.c:1699 ../pidgin/gtkrequest.c:278
+#: ../pidgin/gtkstatusbox.c:267
 msgid "Remove"
 msgstr "Poista"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2434 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:4937
+#: ../finch/gntblist.c:1565 ../finch/gntblist.c:2876 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:95 ../pidgin/gtkblist.c:5037
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Tuttavat"
 
-#: ../finch/gntblist.c:1257
+#: ../finch/gntblist.c:1596
 msgid "Place tagged"
 msgstr "Paikka merkitty"
 
-#: ../finch/gntblist.c:1262
+#: ../finch/gntblist.c:1601
 msgid "Toggle Tag"
 msgstr "Merkitse/poista merkintä"
 
 #. General
-#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:638
+#: ../finch/gntblist.c:1641 ../libpurple/protocols/gg/gg.c:638
 #: ../libpurple/protocols/gg/gg.c:1052 ../libpurple/protocols/gg/gg.c:1125
 #: ../libpurple/protocols/gg/gg.c:2228
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2217
-#: ../libpurple/protocols/jabber/buddy.c:2409
-#: ../libpurple/protocols/jabber/jabber.c:964
-#: ../libpurple/protocols/jabber/jabber.c:1573
-#: ../libpurple/protocols/jabber/jabber.c:1587
-#: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1615
-#: ../libpurple/protocols/jabber/jabber.c:1629
-#: ../libpurple/protocols/msn/msn.c:1559 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msnp9/msn.c:1410
-#: ../libpurple/protocols/msnp9/msn.c:1588
+#: ../libpurple/protocols/jabber/buddy.c:1251
+#: ../libpurple/protocols/jabber/buddy.c:2221
+#: ../libpurple/protocols/jabber/buddy.c:2413
+#: ../libpurple/protocols/jabber/jabber.c:992
+#: ../libpurple/protocols/jabber/jabber.c:1604
+#: ../libpurple/protocols/jabber/jabber.c:1618
+#: ../libpurple/protocols/jabber/jabber.c:1632
+#: ../libpurple/protocols/jabber/jabber.c:1646
+#: ../libpurple/protocols/jabber/jabber.c:1660
+#: ../libpurple/protocols/msn/msn.c:1567 ../libpurple/protocols/msn/msn.c:1743
+#: ../libpurple/protocols/msnp9/msn.c:1421
+#: ../libpurple/protocols/msnp9/msn.c:1599
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1538
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -556,95 +602,83 @@ msgstr "Merkitse/poista merkintä"
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3266
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072 ../pidgin/gtkblist.c:3225
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:359
-#: ../libpurple/protocols/jabber/buddy.c:787
-#: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:611 ../libpurple/protocols/msn/msn.c:629
-#: ../libpurple/protocols/msn/msn.c:637 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/msnp9/msn.c:544
+#: ../finch/gntblist.c:1663 ../finch/gntprefs.c:261
+#: ../libpurple/protocols/bonjour/bonjour.c:376
+#: ../libpurple/protocols/jabber/buddy.c:789
+#: ../libpurple/protocols/jabber/buddy.c:953
+#: ../libpurple/protocols/msn/msn.c:607 ../libpurple/protocols/msn/msn.c:625
+#: ../libpurple/protocols/msn/msn.c:633 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msnp9/msn.c:541
 #: ../libpurple/protocols/msnp9/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2842
-#: ../libpurple/protocols/oscar/oscar.c:2922
-#: ../libpurple/protocols/yahoo/yahoo.c:3108
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3294
-#: ../pidgin/gtkblist.c:3700 ../pidgin/gtkprefs.c:2026
+#: ../libpurple/protocols/novell/novell.c:2843
+#: ../libpurple/protocols/oscar/oscar.c:2973
+#: ../libpurple/protocols/yahoo/yahoo.c:3134
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3253
+#: ../pidgin/gtkblist.c:3703 ../pidgin/gtkprefs.c:1946
 msgid "Idle"
 msgstr "Jouten"
 
-#: ../finch/gntblist.c:1334
+#: ../finch/gntblist.c:1677
 msgid "On Mobile"
 msgstr "Liikkeellä"
 
-#: ../finch/gntblist.c:1415
-#, c-format
-msgid ""
-"Online: %d\n"
-"Total: %d"
-msgstr ""
-"Kirjautuneena: %d\n"
-"Yhteensä: %d"
-
-#: ../finch/gntblist.c:1424
-#, c-format
-msgid "Account: %s (%s)"
-msgstr "Tili: %s (%s)"
-
-#: ../finch/gntblist.c:1436
-#, c-format
-msgid ""
-"\n"
-"Last Seen: %s ago"
-msgstr ""
-"\n"
-"Viimeksi nähty: %s sitten"
-
-#: ../finch/gntblist.c:1706 ../pidgin/gtkdocklet.c:582
+#: ../finch/gntblist.c:1976 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "Uusi..."
 
-#: ../finch/gntblist.c:1713 ../pidgin/gtkdocklet.c:583
+#: ../finch/gntblist.c:1983 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "Tallennettu..."
 
-#: ../finch/gntblist.c:2091 ../finch/gntplugin.c:345 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:716 ../pidgin/gtkplugin.c:555
+#: ../finch/gntblist.c:2437 ../finch/gntplugin.c:352 ../finch/gntui.c:100
+#: ../pidgin/gtkdocklet.c:717 ../pidgin/gtkplugin.c:601
 msgid "Plugins"
 msgstr "Liitännäiset"
 
-#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:783
-msgid "New Instant Message"
-msgstr "Uusi pikaviesti"
+#: ../finch/gntblist.c:2591 ../finch/gntblist.c:2596
+msgid "Block/Unblock"
+msgstr "Estä/poista esto"
 
-#: ../finch/gntblist.c:2222 ../pidgin/gtkdialogs.c:785
+#: ../finch/gntblist.c:2592 ../libpurple/protocols/gg/gg.c:1665
+msgid "Block"
+msgstr "Estä"
+
+#: ../finch/gntblist.c:2593 ../libpurple/protocols/gg/gg.c:1661
+msgid "Unblock"
+msgstr "Poista esto"
+
+#: ../finch/gntblist.c:2598
 msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
+"Please enter the screen name or alias of the person you would like to Block/"
+"Unblock."
 msgstr ""
-"Syötä sen henkilön näyttönimi tai lempinimi, jolle haluat lähettää "
-"pikaviestin."
+"Syötä sen henkilön näyttönimi tai lempinimi, jonka haluat estää tai jolta "
+"haluat poistaa eston."
 
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2225 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
-#: ../finch/gntnotify.c:80 ../finch/plugins/gnthistory.c:180
-#: ../libpurple/account.c:1104 ../libpurple/account.c:1393
-#: ../libpurple/protocols/gg/gg.c:507 ../libpurple/protocols/gg/gg.c:666
-#: ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1745
+#: ../finch/gntblist.c:2601 ../finch/gntblist.c:2650 ../finch/gntcertmgr.c:89
+#: ../finch/gntconn.c:137 ../finch/gntnotify.c:80
+#: ../finch/plugins/gnthistory.c:177 ../libpurple/account.c:1115
+#: ../libpurple/account.c:1418 ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1776
 #: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
-#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
-#: ../libpurple/protocols/msnp9/msn.c:286
-#: ../libpurple/protocols/msnp9/msn.c:303
-#: ../libpurple/protocols/msnp9/msn.c:320
-#: ../libpurple/protocols/msnp9/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6143
+#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
+#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/msnp9/msn.c:283
+#: ../libpurple/protocols/msnp9/msn.c:300
+#: ../libpurple/protocols/msnp9/msn.c:317
+#: ../libpurple/protocols/msnp9/msn.c:334
+#: ../libpurple/protocols/myspace/user.c:581
+#: ../libpurple/protocols/myspace/user.c:675
+#: ../libpurple/protocols/oscar/oscar.c:6196
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1193
 #: ../libpurple/protocols/silc/chat.c:449
@@ -659,86 +693,117 @@ msgstr ""
 #: ../libpurple/protocols/silc10/chat.c:464
 #: ../libpurple/protocols/silc10/chat.c:729
 #: ../libpurple/protocols/silc10/ops.c:1297
-#: ../libpurple/protocols/silc10/ops.c:1903
-#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1033
-#: ../libpurple/protocols/yahoo/yahoo.c:3508
-#: ../libpurple/protocols/yahoo/yahoo.c:3519 ../pidgin/gtkcertmgr.c:195
-#: ../pidgin/gtkdialogs.c:788 ../pidgin/gtkdialogs.c:927
-#: ../pidgin/gtkdialogs.c:1019 ../pidgin/gtkrequest.c:320
+#: ../libpurple/protocols/silc10/ops.c:1909
+#: ../libpurple/protocols/silc10/silc.c:741
+#: ../libpurple/protocols/yahoo/yahoo.c:992
+#: ../libpurple/protocols/yahoo/yahoo.c:3539
+#: ../libpurple/protocols/yahoo/yahoo.c:3550 ../pidgin/gtkcertmgr.c:195
+#: ../pidgin/gtkdialogs.c:764 ../pidgin/gtkdialogs.c:903
+#: ../pidgin/gtkdialogs.c:995 ../pidgin/gtkrequest.c:272
 msgid "OK"
 msgstr "OK"
 
-#: ../finch/gntblist.c:2272
+#: ../finch/gntblist.c:2645 ../pidgin/gtkdialogs.c:759
+msgid "New Instant Message"
+msgstr "Uusi pikaviesti"
+
+#: ../finch/gntblist.c:2647 ../pidgin/gtkdialogs.c:761
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
+msgstr ""
+"Syötä sen henkilön näyttönimi tai lempinimi, jolle haluat lähettää "
+"pikaviestin."
+
+#: ../finch/gntblist.c:2698
 msgid "Channel"
 msgstr "Kanava"
 
-#: ../finch/gntblist.c:2284 ../pidgin/gtkblist.c:940
+#: ../finch/gntblist.c:2710 ../pidgin/gtkblist.c:951
 msgid "Join a Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../finch/gntblist.c:2286
+#: ../finch/gntblist.c:2712
 msgid "Please enter the name of the chat you want to join."
 msgstr "Syötä liityttävän ryhmäkeskustelun nimi."
 
-#: ../finch/gntblist.c:2288 ../finch/gntnotify.c:394
+#: ../finch/gntblist.c:2714 ../finch/gntnotify.c:394
 msgid "Join"
 msgstr "Liity"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2326 ../finch/gntpounce.c:460 ../pidgin/gtkpounce.c:810
+#: ../finch/gntblist.c:2759 ../finch/gntpounce.c:459 ../pidgin/gtkpounce.c:802
 msgid "Options"
 msgstr "Valinnat"
 
-#: ../finch/gntblist.c:2332
+#: ../finch/gntblist.c:2765
 msgid "Send IM..."
 msgstr "Lähetä pikaviesti..."
 
-#: ../finch/gntblist.c:2337
+#: ../finch/gntblist.c:2770
+msgid "Block/Unblock..."
+msgstr "Estä/poista esto..."
+
+#: ../finch/gntblist.c:2775
 msgid "Join Chat..."
 msgstr "Liity ryhmäkeskusteluun..."
 
-#: ../finch/gntblist.c:2342
+#: ../finch/gntblist.c:2780
 msgid "Show"
 msgstr "Näytä"
 
-#: ../finch/gntblist.c:2347
+#: ../finch/gntblist.c:2785
 msgid "Empty groups"
 msgstr "Tyhjät ryhmät"
 
-#: ../finch/gntblist.c:2354
+#: ../finch/gntblist.c:2792
 msgid "Offline buddies"
 msgstr "Poissa linjoilta olevat tuttavat"
 
-#: ../finch/gntblist.c:2361
+#: ../finch/gntblist.c:2799
 msgid "Sort"
 msgstr "Lajittele"
 
-#: ../finch/gntblist.c:2366
+#: ../finch/gntblist.c:2804
 msgid "By Status"
 msgstr "Tilan mukaan"
 
-#: ../finch/gntblist.c:2371 ../pidgin/gtkblist.c:4191
+#: ../finch/gntblist.c:2809 ../pidgin/gtkblist.c:4194
 msgid "Alphabetically"
 msgstr "Aakkosittain"
 
-#: ../finch/gntblist.c:2376
+#: ../finch/gntblist.c:2814
 msgid "By Log Size"
 msgstr "Lokin koon mukaan"
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+#: ../finch/gntblist.c:2825
+msgid "Buddy"
+msgstr "Tuttava"
+
+#: ../finch/gntblist.c:2830 ../libpurple/protocols/oscar/oscar.c:647
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:549
+msgid "Chat"
+msgstr "Keskustelu"
+
+#: ../finch/gntblist.c:2840 ../finch/plugins/grouping.c:255
+msgid "Grouping"
+msgstr "Ryhmittely"
+
+#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
 msgstr "Varmenteen tuonti"
 
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
 msgstr "Määrittele isäntänimi"
 
-#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
 msgstr "Kirjoita se isäntänimi jolle tämä varmenne on tehty."
 
-#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
+#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
@@ -747,19 +812,19 @@ msgstr ""
 "Tiedostoa %s ei voi tuoda.\n"
 "Varmista että tiedosto on luettavissa ja PEM-muodossa.\n"
 
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
 msgstr "Varmenteen tuontivirhe"
 
-#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
 msgstr "X.509-varmenteen tuonti epäonnistui"
 
-#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
+#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
 msgstr "Valitse PEM-varmenne"
 
-#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
+#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
@@ -768,24 +833,24 @@ msgstr ""
 "Tiedostoon %s vienti epäonnistui.\n"
 "Tarkista että kohdepolkuun on kirjoitusoikeudet\n"
 
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
 msgstr "Varmenteen vientivirhe"
 
-#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
 msgstr "X.509-varmenteen vienti epäonnistui"
 
-#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
+#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
 msgid "PEM X.509 Certificate Export"
 msgstr "PEM X.509 -varmenteen vienti"
 
-#: ../finch/gntcertmgr.c:188
+#: ../finch/gntcertmgr.c:187
 #, c-format
 msgid "Certificate for %s"
 msgstr "Varmenne kohteelle %s"
 
-#: ../finch/gntcertmgr.c:195
+#: ../finch/gntcertmgr.c:194
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -798,57 +863,57 @@ msgstr ""
 "SHA1-sormenjälki:\n"
 "%s"
 
-#: ../finch/gntcertmgr.c:198
+#: ../finch/gntcertmgr.c:197
 msgid "SSL Host Certificate"
 msgstr "SSL Host -varmenne"
 
-#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
+#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:371
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "Poistetaanko kohteen %s varmenne?"
 
-#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
+#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:373
 msgid "Confirm certificate delete"
 msgstr "Vahvista varmenteen poisto"
 
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:603
+#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:613
 msgid "Certificate Manager"
 msgstr "Varmennehallinta"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:671
+#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:694
 #: ../libpurple/protocols/silc/silc.c:1150
-#: ../libpurple/protocols/silc10/silc.c:918
+#: ../libpurple/protocols/silc10/silc.c:924 ../pidgin/gtkcertmgr.c:446
 msgid "Hostname"
 msgstr "Isäntä"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1689
-#: ../pidgin/gtkdebug.c:840
+#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1678
+#: ../pidgin/gtkdebug.c:832
 msgid "Info"
 msgstr "Tiedot"
 
 #. Close button
-#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:213 ../finch/gntplugin.c:406 ../finch/gntpounce.c:751
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:407
-#: ../libpurple/protocols/msnp9/msn.c:403
+#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:253 ../finch/gntnotify.c:182
+#: ../finch/gntplugin.c:220 ../finch/gntplugin.c:413 ../finch/gntpounce.c:750
+#: ../finch/gntroomlist.c:275 ../finch/gntstatus.c:216
+#: ../libpurple/protocols/msn/msn.c:403 ../libpurple/protocols/msnp9/msn.c:400
 #: ../libpurple/protocols/silc/util.c:388
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2474
-#: ../pidgin/gtkrequest.c:323
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2375
+#: ../pidgin/gtkrequest.c:275
 msgid "Close"
 msgstr "Sulje"
 
-#: ../finch/gntconn.c:125
+#: ../finch/gntconn.c:126
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:128
+#: ../finch/gntconn.c:129
 #, c-format
 msgid "%s disconnected."
 msgstr "Yhteys katkennut kohteeseen %s."
 
-#: ../finch/gntconn.c:129
+#: ../finch/gntconn.c:130
 #, c-format
 msgid ""
 "%s\n"
@@ -861,50 +926,58 @@ msgstr ""
 "Finch ei yritä uudelleenyhdistää käyttäjätiliä kunnes korjaat virheen ja "
 "otat tilin uudelleen käyttöön."
 
-#: ../finch/gntconn.c:138
+#: ../finch/gntconn.c:139
 msgid "Re-enable Account"
 msgstr "Ota tili uudelleen käyttöön"
 
-#: ../finch/gntconv.c:137
+#: ../finch/gntconn.c:156
+msgid ""
+"The account has disconnected and you are no longer in this chat. You will be "
+"automatically rejoined in the chat when the account reconnects."
+msgstr ""
+"Yhteys käyttäjätiliin on katkennut, etkä ole enää tässä keskustelussa. "
+"Keskusteluun liitytään uudelleen kun käyttäjätili on jälleen yhdistettynä. "
+
+#: ../finch/gntconv.c:159
 msgid "No such command."
 msgstr "Sellaista komentoa ei ole."
 
-#: ../finch/gntconv.c:141 ../pidgin/gtkconv.c:531
+#: ../finch/gntconv.c:163 ../pidgin/gtkconv.c:492
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Syntaksivirhe: Syötit väärän määrän argumentteja kyseiselle komennolle."
 
-#: ../finch/gntconv.c:146 ../pidgin/gtkconv.c:537
+#: ../finch/gntconv.c:168 ../pidgin/gtkconv.c:498
 msgid "Your command failed for an unknown reason."
 msgstr "Komento epäonnistui tuntemattomasta syystä."
 
-#: ../finch/gntconv.c:151 ../pidgin/gtkconv.c:544
+#: ../finch/gntconv.c:173 ../pidgin/gtkconv.c:505
 msgid "That command only works in chats, not IMs."
 msgstr "Komento toimii vain ryhmäkeskusteluissa, ei pikaviesteissä."
 
-#: ../finch/gntconv.c:154 ../pidgin/gtkconv.c:547
+#: ../finch/gntconv.c:176 ../pidgin/gtkconv.c:508
 msgid "That command only works in IMs, not chats."
 msgstr "Komento toimii vain pikaviesteissä, ei ryhmäkeskusteluissa."
 
-#: ../finch/gntconv.c:158 ../pidgin/gtkconv.c:552
+#: ../finch/gntconv.c:180 ../pidgin/gtkconv.c:513
 msgid "That command doesn't work on this protocol."
 msgstr "Tämä komento ei toimi tälle yhteyskäytännölle."
 
-#: ../finch/gntconv.c:166
+#: ../finch/gntconv.c:188
 msgid "Message was not sent, because you are not signed on."
 msgstr "Viestiä ei lähetetty, koska ei olla kirjauduttu sisään."
 
-#: ../finch/gntconv.c:245
+#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:268
+#: ../finch/gntconv.c:291
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:273 ../finch/gntconv.c:795
+#: ../finch/gntconv.c:296 ../finch/gntconv.c:880 ../pidgin/gtkconv.c:3474
 #, c-format
 msgid ""
 "\n"
@@ -913,68 +986,72 @@ msgstr ""
 "\n"
 "%s kirjoittaa..."
 
-#: ../finch/gntconv.c:292
+#: ../finch/gntconv.c:315
 msgid "You have left this chat."
 msgstr "Olet poistunut tästä keskustelusta."
 
-#: ../finch/gntconv.c:408 ../pidgin/gtkconv.c:1416
+#: ../finch/gntconv.c:433 ../pidgin/gtkconv.c:1384
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Kirjaaminen lokiin aloitettu. Tämän keskustelun viestit kirjataan nyt lokiin."
 
-#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1424
+#: ../finch/gntconv.c:437 ../pidgin/gtkconv.c:1392
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Kirjaaminen lokiin lopetettu. Tämän keskustelun viestejä ei enää kirjata "
 "lokiin."
 
-#: ../finch/gntconv.c:463
+#: ../finch/gntconv.c:523
 msgid "Send To"
 msgstr "Lähetä käyttäjälle"
 
-#: ../finch/gntconv.c:507
+#: ../finch/gntconv.c:568
 msgid "Conversation"
 msgstr "Keskustelu"
 
-#: ../finch/gntconv.c:513
+#: ../finch/gntconv.c:574
 msgid "Clear Scrollback"
 msgstr "Tyhjennä takaisinvieritys"
 
-#: ../finch/gntconv.c:517 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:578 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Näytä aikaleimat"
 
-#: ../finch/gntconv.c:533
+#: ../finch/gntconv.c:596
 msgid "Add Buddy Pounce..."
 msgstr "Lisää tuttavailmoitin..."
 
-#: ../finch/gntconv.c:548
+#: ../finch/gntconv.c:611
+msgid "View Log..."
+msgstr "Näytä loki..."
+
+#: ../finch/gntconv.c:615
 msgid "Enable Logging"
 msgstr "Ota lokiinkirjaus käyttöön"
 
-#: ../finch/gntconv.c:554
+#: ../finch/gntconv.c:621
 msgid "Enable Sounds"
 msgstr "Ota äänet käyttöön"
 
-#: ../finch/gntconv.c:760
+#: ../finch/gntconv.c:833
 msgid "<AUTO-REPLY> "
 msgstr "<AUTOMAATTIVASTAUS> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:883
+#: ../finch/gntconv.c:968
 msgid "List of users:\n"
 msgstr "Luettelo käyttäjistä:\n"
 
-#: ../finch/gntconv.c:1045 ../pidgin/gtkconv.c:371
+#: ../finch/gntconv.c:1130 ../pidgin/gtkconv.c:337
 msgid "Supported debug options are:  version"
 msgstr "Tuetut vianjäljitysvalinnat ovat: versio"
 
-#: ../finch/gntconv.c:1081 ../pidgin/gtkconv.c:423
+#: ../finch/gntconv.c:1166 ../pidgin/gtkconv.c:389
 msgid "No such command (in this context)."
 msgstr "Komento ei saatavilla (tässä kontekstissa)."
 
-#: ../finch/gntconv.c:1084 ../pidgin/gtkconv.c:426
+#: ../finch/gntconv.c:1169 ../pidgin/gtkconv.c:392
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -982,7 +1059,7 @@ msgstr ""
 "Kirjoita \"/help &lt;komento&gt;\" saadaksesi ohjeen tietystä komennosta.\n"
 "Seuraavat komennot ovat saatavilla tässä kontekstissa:\n"
 
-#: ../finch/gntconv.c:1142 ../pidgin/gtkconv.c:7755
+#: ../finch/gntconv.c:1242 ../pidgin/gtkconv.c:7773
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -990,61 +1067,61 @@ msgstr ""
 "say &lt;viesti&gt;: Lähetä viesti normaalisti, niin kuin et olisi "
 "käyttämässä komentoa."
 
-#: ../finch/gntconv.c:1145 ../pidgin/gtkconv.c:7758
+#: ../finch/gntconv.c:1245 ../pidgin/gtkconv.c:7776
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;toiminta&gt;: Lähetä IRC-tyylinen toiminta tuttavalle tai "
 "keskusteluun."
 
-#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7761
+#: ../finch/gntconv.c:1248 ../pidgin/gtkconv.c:7779
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
 "debug &lt;valinta&gt;: Lähetä eri debug-tietoja senhetkiseen keskusteluun."
 
-#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7764
+#: ../finch/gntconv.c:1251 ../pidgin/gtkconv.c:7782
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Tyhjentää keskustelun"
 
-#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7770
+#: ../finch/gntconv.c:1254 ../pidgin/gtkconv.c:7788
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;komento&gt;: Ohje tietylle komennolle."
 
-#: ../finch/gntconv.c:1157
+#: ../finch/gntconv.c:1257
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Näytä luettelo keskustelussa olevista käyttäjistä"
 
-#: ../finch/gntconv.c:1162
+#: ../finch/gntconv.c:1262
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Näytä liitännäiset-ikkuna."
 
-#: ../finch/gntconv.c:1165
+#: ../finch/gntconv.c:1265
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Näytä tuttavaluettelo."
 
-#: ../finch/gntconv.c:1168
+#: ../finch/gntconv.c:1268
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Näytä käyttäjätilit-ikkuna."
 
-#: ../finch/gntconv.c:1171
+#: ../finch/gntconv.c:1271
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Näytä virheenjäljitysikkuna."
 
-#: ../finch/gntconv.c:1174
+#: ../finch/gntconv.c:1274
 msgid "prefs: Show the preference window."
 msgstr "prefs: Näytä asetukset-ikkuna."
 
-#: ../finch/gntconv.c:1177
+#: ../finch/gntconv.c:1277
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Näytä tallennetut tilat -ikkuna"
 
-#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2663
-#: ../pidgin/gtkdebug.c:220 ../pidgin/gtkft.c:543
+#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:948 ../pidgin/gtkconv.c:2656
+#: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
 msgid "Unable to open file."
 msgstr "Tiedoston avaaminen epäonnistui."
 
-#: ../finch/gntdebug.c:271 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:700
+#: ../finch/gntdebug.c:271 ../finch/gntui.c:98 ../pidgin/gtkdebug.c:689
 msgid "Debug Window"
 msgstr "Virheenjäljitysikkuna"
 
@@ -1052,7 +1129,7 @@ msgstr "Virheenjäljitysikkuna"
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:759
+#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:751
 msgid "Clear"
 msgstr "Tyhjennä"
 
@@ -1060,111 +1137,176 @@ msgstr "Suodatin:"
 msgid "Filter:"
 msgstr "Suodatin:"
 
-#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:768
+#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:760
 msgid "Pause"
 msgstr "Tauko"
 
-#: ../finch/gntft.c:118 ../pidgin/gtkft.c:229
+#: ../finch/gntft.c:120 ../pidgin/gtkft.c:229
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "Tiedostonsiirrrot - tiedosto %d%% / %d"
 
 #. Create the window.
-#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
-#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
+#: ../finch/gntft.c:125 ../finch/gntft.c:212 ../finch/gntui.c:99
+#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Tiedostonsiirrot"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "Valmiina"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "Tiedoston nimi"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "Koko"
 
-#: ../finch/gntft.c:201
+#: ../finch/gntft.c:217
 msgid "Speed"
 msgstr "Nopeus"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "Jäljellä"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../finch/gntft.c:217 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
+#: ../libpurple/protocols/bonjour/bonjour.c:380
 #: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1584
 #: ../libpurple/protocols/gg/gg.c:1592
-#: ../libpurple/protocols/jabber/buddy.c:778
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1538
-#: ../libpurple/protocols/msn/msn.c:621 ../libpurple/protocols/msn/msn.c:631
-#: ../libpurple/protocols/msn/msn.c:636 ../libpurple/protocols/msn/msn.c:639
-#: ../libpurple/protocols/msnp9/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2852
-#: ../libpurple/protocols/oscar/oscar.c:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2710
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/sametime/sametime.c:3305
-#: ../libpurple/protocols/sametime/sametime.c:4196
-#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkblist.c:3338
-#: ../pidgin/gtkblist.c:3352 ../pidgin/gtkblist.c:3354
-#: ../pidgin/gtksavedstatuses.c:1005 ../pidgin/gtksavedstatuses.c:1150
+#: ../libpurple/protocols/jabber/buddy.c:780
+#: ../libpurple/protocols/jabber/buddy.c:784
+#: ../libpurple/protocols/jabber/buddy.c:943
+#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/msn/msn.c:617 ../libpurple/protocols/msn/msn.c:627
+#: ../libpurple/protocols/msn/msn.c:632 ../libpurple/protocols/msn/msn.c:635
+#: ../libpurple/protocols/msnp9/msn.c:540
+#: ../libpurple/protocols/novell/novell.c:2853
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2761
+#: ../libpurple/protocols/oscar/oscar.c:3813
+#: ../libpurple/protocols/sametime/sametime.c:3313
+#: ../libpurple/protocols/sametime/sametime.c:4204
+#: ../libpurple/protocols/yahoo/yahoo.c:3285 ../pidgin/gtkblist.c:3297
+#: ../pidgin/gtkblist.c:3311 ../pidgin/gtkblist.c:3313
+#: ../pidgin/gtksavedstatuses.c:990 ../pidgin/gtksavedstatuses.c:1134
 msgid "Status"
 msgstr "Tila"
 
-#: ../finch/gntft.c:211
+#: ../finch/gntft.c:227
 msgid "Close this window when all transfers finish"
 msgstr "Sulje tämä ikkuna kun kaikki siirrot ovat valmiita"
 
-#: ../finch/gntft.c:218
+#: ../finch/gntft.c:234
 msgid "Clear finished transfers"
 msgstr "Poista valmiit siirrot"
 
-#: ../finch/gntft.c:232
+#: ../finch/gntft.c:248 ../finch/gntroomlist.c:272
 msgid "Stop"
 msgstr "Pysäytä"
 
-#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
+#: ../finch/gntft.c:321 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:934
 msgid "Waiting for transfer to begin"
 msgstr "Odotetaan lähetyksen alkamista"
 
-#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
+#: ../finch/gntft.c:388 ../pidgin/gtkft.c:163 ../pidgin/gtkft.c:1015
 msgid "Canceled"
 msgstr "Peruutettu"
 
-#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:390 ../pidgin/gtkft.c:1017
 msgid "Failed"
 msgstr "Epäonnistunut"
 
-#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
+#: ../finch/gntft.c:434 ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:431
+#: ../finch/gntft.c:445
 #, c-format
 msgid "The file was saved as %s."
 msgstr "Tiedosto tallennettiin nimellä %s."
 
-#: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
-#: ../pidgin/gtkft.c:1116
+#: ../finch/gntft.c:446 ../finch/gntft.c:447 ../pidgin/gtkft.c:160
+#: ../pidgin/gtkft.c:1077
 msgid "Finished"
 msgstr "Valmis"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:404
-#: ../libpurple/protocols/msnp9/session.c:357
+#: ../finch/gntft.c:452 ../libpurple/protocols/msn/session.c:404
+#: ../libpurple/protocols/msnp9/session.c:356
 msgid "Transferring"
 msgstr "Siirtää"
 
+#: ../finch/gntlog.c:183
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr "Keskustelu paikassa %s aiheesta %s"
+
+#: ../finch/gntlog.c:186
+#, c-format
+msgid "Conversation with %s on %s"
+msgstr "Keskustelu henkilön %s kanssa aiheesta %s"
+
+#: ../finch/gntlog.c:231 ../pidgin/gtklog.c:503
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../finch/gntlog.c:271 ../pidgin/gtklog.c:550
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+"Järjestelmätapahtumat kirjataan lokiin vain jos \"Kirjaa kaikki "
+"tilamuutokset järjestelmälokiin\" on asetettu."
+
+#: ../finch/gntlog.c:275 ../pidgin/gtklog.c:554
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+"Pikaviestit kirjataan lokiin vain jos \"Kirjaa kaikki pikaviestit lokiin\" "
+"on asetettu."
+
+#: ../finch/gntlog.c:278 ../pidgin/gtklog.c:557
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+"Ryhmäkeskustelut kirjataan lokiin vain jos \"Kirjaa kaikki ryhmäkeskustelut "
+"lokiin\" on asetettu."
+
+#: ../finch/gntlog.c:284 ../pidgin/gtklog.c:566
+msgid "No logs were found"
+msgstr "Lokeja ei löytynyt"
+
+#: ../finch/gntlog.c:330 ../pidgin/gtklog.c:646
+msgid "Total log size:"
+msgstr "Lokin kokonaiskoko:"
+
+#. Search box *********
+#: ../finch/gntlog.c:338
+msgid "Scroll/Search: "
+msgstr "Vieritä/etsi:"
+
+#: ../finch/gntlog.c:382 ../pidgin/gtklog.c:716
+#, c-format
+msgid "Conversations in %s"
+msgstr "Keskustelut paikassa %s"
+
+#: ../finch/gntlog.c:390 ../finch/gntlog.c:447 ../pidgin/gtklog.c:724
+#: ../pidgin/gtklog.c:799
+#, c-format
+msgid "Conversations with %s"
+msgstr "Keskustelut käyttäjän %s kanssa"
+
+#: ../finch/gntlog.c:472 ../pidgin/gtklog.c:824
+msgid "System Log"
+msgstr "Järjestelmäloki"
+
 #: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "Sähköpostit"
@@ -1173,11 +1315,11 @@ msgstr "Sinulle on postia."
 msgid "You have mail!"
 msgstr "Sinulle on postia."
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:519
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:524
 msgid "Sender"
 msgstr "Lähettäjä"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:526
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:531
 msgid "Subject"
 msgstr "Aihe"
 
@@ -1188,17 +1330,17 @@ msgstr[1] "%s (%s): %d uutta viestiä."
 msgstr[0] "%s (%s): %d uusi viesti."
 msgstr[1] "%s (%s): %d uutta viestiä."
 
-#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:342
+#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:346
 msgid "New Mail"
 msgstr "Uusi sähköposti"
 
-#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:949
+#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:959
 #, c-format
 msgid "Info for %s"
 msgstr "%s tiedot"
 
 #: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:950
+#: ../pidgin/gtknotify.c:960
 msgid "Buddy Information"
 msgstr "Tuttavan tiedot"
 
@@ -1206,11 +1348,11 @@ msgstr "Jatka"
 msgid "Continue"
 msgstr "Jatka"
 
-#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1650
+#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1639
 msgid "IM"
 msgstr "Pikaviesti"
 
-#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3515
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3523
 msgid "Invite"
 msgstr "Kutsu"
 
@@ -1218,19 +1360,19 @@ msgstr "(ei mitään)"
 msgid "(none)"
 msgstr "(ei mitään)"
 
-#: ../finch/gntplugin.c:77 ../finch/gntplugin.c:86
+#: ../finch/gntplugin.c:84 ../finch/gntplugin.c:93
 msgid "ERROR"
 msgstr "VIRHE"
 
-#: ../finch/gntplugin.c:77
+#: ../finch/gntplugin.c:84
 msgid "loading plugin failed"
 msgstr "liitännäisen lataus epäonnistui"
 
-#: ../finch/gntplugin.c:86
+#: ../finch/gntplugin.c:93
 msgid "unloading plugin failed"
 msgstr "liitännäisen poistaminen käytöstä epäonnistui"
 
-#: ../finch/gntplugin.c:132
+#: ../finch/gntplugin.c:139
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1247,43 +1389,43 @@ msgstr ""
 "Sivusto: %s\n"
 "Tiedostonimi: %s\n"
 
-#: ../finch/gntplugin.c:190
+#: ../finch/gntplugin.c:197
 msgid "Plugin need to be loaded before you can configure it."
 msgstr ""
 "Liitännäinen tulee olla käytössä ennen kuin sen asetuksia voidaan muuttaa."
 
-#: ../finch/gntplugin.c:238
+#: ../finch/gntplugin.c:245
 msgid "No configuration options for this plugin."
 msgstr "Tälle liitännäiselle ei ole asetuksia."
 
-#: ../finch/gntplugin.c:259
+#: ../finch/gntplugin.c:266
 msgid "Error loading plugin"
 msgstr "Liitännäistä ladattaessa tapahtui virhe"
 
-#: ../finch/gntplugin.c:260
+#: ../finch/gntplugin.c:267
 msgid "The selected file is not a valid plugin."
 msgstr "Valittu tiedosto ei ole kelvollinen liitännäinen."
 
-#: ../finch/gntplugin.c:261
+#: ../finch/gntplugin.c:268
 msgid ""
 "Please open the debug window and try again to see the exact error message."
 msgstr ""
 "Avaa virheenjäljitysikkuna ja yritä uudelleen nähdäksesi tarkan virheviestin."
 
-#: ../finch/gntplugin.c:324
+#: ../finch/gntplugin.c:331
 msgid "Select plugin to install"
 msgstr "Valitse asennettava liitännäinen"
 
-#: ../finch/gntplugin.c:350
+#: ../finch/gntplugin.c:357
 msgid "You can (un)load plugins from the following list."
 msgstr ""
 "Voit ottaa käyttöön/pois käytöstä liitännäisiä seuraavasta luettelosta."
 
-#: ../finch/gntplugin.c:401
+#: ../finch/gntplugin.c:408
 msgid "Install Plugin..."
 msgstr "Asenna liitännäinen..."
 
-#: ../finch/gntplugin.c:411
+#: ../finch/gntplugin.c:418
 msgid "Configure Plugin"
 msgstr "Liitännäisen asetukset"
 
@@ -1292,187 +1434,186 @@ msgstr "Liitännäisen asetukset"
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:467 ../finch/gntplugin.c:474 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:717 ../pidgin/gtkprefs.c:2169
+#: ../finch/gntplugin.c:524 ../finch/gntplugin.c:531 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:103 ../pidgin/gtkdocklet.c:718 ../pidgin/gtkprefs.c:2070
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: ../finch/gntpounce.c:194 ../pidgin/gtkpounce.c:256
+#: ../finch/gntpounce.c:193 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Syötä ilmoitettava tuttava."
 
-#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
+#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "Uusi tuttavailmoitin"
 
-#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
+#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "Muokkaa tuttavailmoitinta"
 
-#: ../finch/gntpounce.c:344
+#: ../finch/gntpounce.c:343
 msgid "Pounce Who"
 msgstr "Kenestä ilmoitetaan"
 
 #. Account:
-#: ../finch/gntpounce.c:347 ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:346 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Käyttäjätili:"
 
-#: ../finch/gntpounce.c:369
+#: ../finch/gntpounce.c:368
 msgid "Buddy name:"
 msgstr "Tuttavan nimi:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:387 ../pidgin/gtkpounce.c:600
+#: ../finch/gntpounce.c:386 ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr "Ilmoita kun tuttava..."
 
-#: ../finch/gntpounce.c:389
+#: ../finch/gntpounce.c:388
 msgid "Signs on"
 msgstr "kirjautuu sisään"
 
-#: ../finch/gntpounce.c:390
+#: ../finch/gntpounce.c:389
 msgid "Signs off"
 msgstr "kirjautuu ulos"
 
-#: ../finch/gntpounce.c:391
+#: ../finch/gntpounce.c:390
 msgid "Goes away"
 msgstr "poistuu"
 
-#: ../finch/gntpounce.c:392
+#: ../finch/gntpounce.c:391
 msgid "Returns from away"
 msgstr "palaa"
 
-#: ../finch/gntpounce.c:393
+#: ../finch/gntpounce.c:392
 msgid "Becomes idle"
 msgstr "on jouten"
 
-#: ../finch/gntpounce.c:394
+#: ../finch/gntpounce.c:393
 msgid "Is no longer idle"
 msgstr "ei enää ole jouten"
 
-#: ../finch/gntpounce.c:395
+#: ../finch/gntpounce.c:394
 msgid "Starts typing"
 msgstr "alkaa kirjoittaa"
 
-#: ../finch/gntpounce.c:396
+#: ../finch/gntpounce.c:395
 msgid "Pauses while typing"
 msgstr "keskeyttää kirjoittamisen"
 
-#: ../finch/gntpounce.c:397
+#: ../finch/gntpounce.c:396
 msgid "Stops typing"
 msgstr "lopettaa kirjoittamisen"
 
-#: ../finch/gntpounce.c:398
+#: ../finch/gntpounce.c:397
 msgid "Sends a message"
 msgstr "lähettää viestin"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:427 ../pidgin/gtkpounce.c:661
+#: ../finch/gntpounce.c:426 ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "Toiminto"
 
-#: ../finch/gntpounce.c:429
+#: ../finch/gntpounce.c:428
 msgid "Open an IM window"
 msgstr "Avaa pikaviesti-ikkuna"
 
-#: ../finch/gntpounce.c:430
+#: ../finch/gntpounce.c:429
 msgid "Pop up a notification"
 msgstr "Ponnahdusilmoitus"
 
-#: ../finch/gntpounce.c:431
+#: ../finch/gntpounce.c:430
 msgid "Send a message"
 msgstr "Lähetä viesti"
 
-#: ../finch/gntpounce.c:432
+#: ../finch/gntpounce.c:431
 msgid "Execute a command"
 msgstr "Suorita komento"
 
-#: ../finch/gntpounce.c:433
+#: ../finch/gntpounce.c:432
 msgid "Play a sound"
 msgstr "Soita ääni"
 
-#: ../finch/gntpounce.c:461
-msgid "Pounce only when my status is not available"
-msgstr "Ilmoita vain kun tilani on \"tavoittamattomissa\""
+#: ../finch/gntpounce.c:460
+msgid "Pounce only when my status is not Available"
+msgstr "Ilmoita vain kun tilani ei ole Tavoitettavissa"
 
-#: ../finch/gntpounce.c:463 ../pidgin/gtkpounce.c:1301
+#: ../finch/gntpounce.c:462 ../pidgin/gtkpounce.c:1294
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../finch/gntpounce.c:631
+#: ../finch/gntpounce.c:630
 msgid "Cannot create pounce"
 msgstr "Ilmoitinta ei voi luoda"
 
-#: ../finch/gntpounce.c:632
+#: ../finch/gntpounce.c:631
 msgid "You do not have any accounts."
 msgstr "Yhtäkään käyttäjätiliä ei ole määritelty."
 
-#: ../finch/gntpounce.c:633
+#: ../finch/gntpounce.c:632
 msgid "You must create an account first before you can create a pounce."
 msgstr "Käyttäjätili tulee luoda ennen ilmoittimen luomista."
 
-#: ../finch/gntpounce.c:675 ../pidgin/gtkpounce.c:1116
+#: ../finch/gntpounce.c:674 ../pidgin/gtkpounce.c:1108
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Haluatko varmasti poistaa ilmoituksen %s käyttäjältä %s?"
 
-#: ../finch/gntpounce.c:709 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1352
+#: ../finch/gntpounce.c:708 ../finch/gntui.c:96 ../pidgin/gtkpounce.c:1337
 msgid "Buddy Pounces"
 msgstr "Tuttavailmoittimet"
 
-#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1436
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s alkoi kirjoittaa sinulle (%s)"
 
-#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1482
+#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1438
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s keskeytti kirjoittamisen sinulle (%s)"
 
-#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1484
+#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1440
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s on kirjautunut sisään (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1486
+#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1442
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s on palannut oltuaan jouten (%s)"
 
-#: ../finch/gntpounce.c:831 ../pidgin/gtkpounce.c:1488
+#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1444
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s on palannut oltuaan poissa (%s)"
 
-#: ../finch/gntpounce.c:833 ../pidgin/gtkpounce.c:1490
+#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1446
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s on lopettanut kirjoittamisen sinulle (%s)"
 
-#: ../finch/gntpounce.c:835 ../pidgin/gtkpounce.c:1492
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1448
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s on kirjautunut ulos (%s)"
 
-#: ../finch/gntpounce.c:837 ../pidgin/gtkpounce.c:1494
+#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1450
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s on jouten (%s)"
 
-#: ../finch/gntpounce.c:839 ../pidgin/gtkpounce.c:1496
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s on poissa. (%s)"
 
-#: ../finch/gntpounce.c:841 ../pidgin/gtkpounce.c:1498
+#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s on lähettämässä sinulle viestiä. (%s)"
 
-#: ../finch/gntpounce.c:842 ../pidgin/gtkpounce.c:1499
-#, c-format
+#: ../finch/gntpounce.c:845 ../pidgin/gtkpounce.c:1455
 msgid "Unknown pounce event. Please report this!"
 msgstr "Tuntematon ilmoitinviesti. Raportoi tästä!"
 
@@ -1480,12 +1621,12 @@ msgstr "Perustuen näppäimistön käytt
 msgid "Based on keyboard use"
 msgstr "Perustuen näppäimistön käyttöön"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:2031
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1951
 msgid "From last sent message"
 msgstr "Viimeisestä lähetetystä viestistä"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:900 ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:2030 ../pidgin/gtkprefs.c:2044
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:848 ../pidgin/gtkprefs.c:856
+#: ../pidgin/gtkprefs.c:1950 ../pidgin/gtkprefs.c:1964
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Ei koskaan"
@@ -1502,15 +1643,15 @@ msgstr "Ilmoita tuttaville kun kirjoitat
 msgid "Notify buddies when you are typing"
 msgstr "Ilmoita tuttaville kun kirjoitat heille"
 
-#: ../finch/gntprefs.c:198 ../finch/plugins/gnthistory.c:156
+#: ../finch/gntprefs.c:198 ../finch/plugins/gnthistory.c:153
 msgid "Log format"
 msgstr "Lokin muoto"
 
-#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:146
+#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:143
 msgid "Log IMs"
 msgstr "Kirjaa pikaviestit"
 
-#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:147
+#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:144
 msgid "Log chats"
 msgstr "Kirjaa ryhmäkeskustelut"
 
@@ -1535,120 +1676,137 @@ msgstr "Vaihda tila seuraavaksi"
 msgstr "Vaihda tila seuraavaksi"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:995 ../pidgin/gtkprefs.c:2135
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:942 ../pidgin/gtkprefs.c:2037
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Keskustelut"
 
-#: ../finch/gntprefs.c:260 ../finch/plugins/gnthistory.c:154
-#: ../pidgin/gtkprefs.c:1563 ../pidgin/gtkprefs.c:2146
+#: ../finch/gntprefs.c:260 ../finch/plugins/gnthistory.c:151
+#: ../pidgin/gtkprefs.c:1507 ../pidgin/gtkprefs.c:2048
 msgid "Logging"
 msgstr "Kirjataan lokiin"
 
-#: ../finch/gntrequest.c:585
+#: ../finch/gntrequest.c:621
 msgid "Not implemented yet."
 msgstr "Ominaisuutta ei ole vielä toteutettu."
 
-#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1699
-#: ../pidgin/gtkrequest.c:1745
+#: ../finch/gntrequest.c:726 ../pidgin/gtkrequest.c:1552
+#: ../pidgin/gtkrequest.c:1598
 msgid "Save File..."
 msgstr "Tallenna tiedosto..."
 
-#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1700
-#: ../pidgin/gtkrequest.c:1746
+#: ../finch/gntrequest.c:726 ../pidgin/gtkrequest.c:1553
+#: ../pidgin/gtkrequest.c:1599
 msgid "Open File..."
 msgstr "Avaa tiedosto..."
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:62
+#: ../finch/gntrequest.c:743
+msgid "Choose Location..."
+msgstr "Valitse sijainti..."
+
+#: ../finch/gntroomlist.c:208
+msgid "Hit 'Enter' to find more rooms of this category."
+msgstr "Paina \"Enter\" nähdäksesi lisää tämän luokan huoneita."
+
+#: ../finch/gntroomlist.c:273
+msgid "Get"
+msgstr "Hae"
+
+#. Create the window.
+#: ../finch/gntroomlist.c:285 ../finch/gntui.c:101 ../pidgin/gtkroomlist.c:530
+msgid "Room List"
+msgstr "Huoneluettelo"
+
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Tuttava kirjautuu sisään"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:63
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Tuttava kirjautuu ulos"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "Viesti vastaanotettu"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "Vastaanotettu viesti aloittaa keskustelun"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "Viesti lähetetty"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Joku saapuu ryhmäkeskusteluun"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "Joku poistuu ryhmäkeskustelusta"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "Sinä puhut ryhmäkeskustelussa"
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Muut puhuvat ryhmäkeskustelussa"
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:73
+#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:73
 msgid "Someone says your screen name in chat"
 msgstr "Joku sanoo kutsumanimesi ryhmäkeskustelussa"
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:306
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:306
 msgid "GStreamer Failure"
 msgstr "GStreamer-virhe"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:307
+#: ../finch/gntsound.c:363 ../pidgin/gtksound.c:307
 msgid "GStreamer failed to initialize."
 msgstr "GStreameria ei voi alustaa."
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1687
-#: ../pidgin/gtkprefs.c:1776 ../pidgin/gtkprefs.c:1972
+#: ../finch/gntsound.c:717 ../finch/gntsound.c:803 ../pidgin/gtkprefs.c:1631
+#: ../pidgin/gtkprefs.c:1720 ../pidgin/gtkprefs.c:1893
 msgid "(default)"
 msgstr "(oletus)"
 
-#: ../finch/gntsound.c:729
+#: ../finch/gntsound.c:730
 msgid "Select Sound File ..."
 msgstr "Valitse äänitiedosto..."
 
-#: ../finch/gntsound.c:904
+#: ../finch/gntsound.c:905
 msgid "Sound Preferences"
 msgstr "Ääniasetukset"
 
-#: ../finch/gntsound.c:915
+#: ../finch/gntsound.c:916
 msgid "Profiles"
 msgstr "Profiilit"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1817
+#: ../finch/gntsound.c:955 ../pidgin/gtkprefs.c:1758
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: ../finch/gntsound.c:957
+#: ../finch/gntsound.c:958
 msgid "Console Beep"
 msgstr "Konsoliäänimerkki"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1821
+#: ../finch/gntsound.c:959 ../pidgin/gtkprefs.c:1762
 msgid "Command"
 msgstr "Komento"
 
-#: ../finch/gntsound.c:959
+#: ../finch/gntsound.c:960
 msgid "No Sound"
 msgstr "Ei ääntä"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1812
+#: ../finch/gntsound.c:962 ../pidgin/gtkprefs.c:1753
 msgid "Sound Method"
 msgstr "Äänimenetelmä"
 
-#: ../finch/gntsound.c:966
+#: ../finch/gntsound.c:967
 msgid "Method: "
 msgstr "Menetelmä: "
 
-#: ../finch/gntsound.c:973
+#: ../finch/gntsound.c:974
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1658,55 +1816,55 @@ msgstr ""
 "(%s tiedostonimeksi)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1856
+#: ../finch/gntsound.c:982 ../pidgin/gtkprefs.c:1784
 msgid "Sound Options"
 msgstr "Äänivalinnat"
 
-#: ../finch/gntsound.c:982
+#: ../finch/gntsound.c:983
 msgid "Sounds when conversation has focus"
 msgstr "Äänet kun keskusteluikkuna on aktiivinen"
 
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:910
-#: ../pidgin/gtkprefs.c:1863 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:846 ../pidgin/gtkprefs.c:858
+#: ../pidgin/gtkprefs.c:1791 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Aina"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1861
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1789
 msgid "Only when available"
 msgstr "Kun tavoitettavissa"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1862
+#: ../finch/gntsound.c:993 ../pidgin/gtkprefs.c:1790
 msgid "Only when not available"
-msgstr "Kun tavoittamattomissa"
+msgstr "Kun ei tavoitettavissa"
 
-#: ../finch/gntsound.c:999
+#: ../finch/gntsound.c:1000
 msgid "Volume(0-100):"
 msgstr "Äänenvoimakkuus(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1898
+#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1819
 msgid "Sound Events"
 msgstr "Äänitapahtumat"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1957
+#: ../finch/gntsound.c:1021 ../pidgin/gtkprefs.c:1878
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: ../finch/gntsound.c:1020
+#: ../finch/gntsound.c:1021
 msgid "File"
 msgstr "Tiedosto"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1976
+#: ../finch/gntsound.c:1040 ../pidgin/gtkprefs.c:1897
 msgid "Test"
 msgstr "Kokeile"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1980
+#: ../finch/gntsound.c:1043 ../pidgin/gtkprefs.c:1901
 msgid "Reset"
 msgstr "Nollaa"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1984
+#: ../finch/gntsound.c:1046 ../pidgin/gtkprefs.c:1905
 msgid "Choose..."
 msgstr "Valitse..."
 
@@ -1725,8 +1883,9 @@ msgstr "Tallennetut tilat"
 
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
-#: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/msn/msn.c:725
+#: ../libpurple/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/msn/msn.c:733
+#: ../libpurple/protocols/myspace/myspace.c:171
 #: ../libpurple/protocols/novell/novell.c:1493
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
@@ -1745,44 +1904,44 @@ msgstr "Tyyppi"
 #. not independent
 #. Attributes - each status can have a message.
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:275
-#: ../libpurple/protocols/bonjour/bonjour.c:282
-#: ../libpurple/protocols/bonjour/bonjour.c:365
+#: ../libpurple/protocols/bonjour/bonjour.c:292
+#: ../libpurple/protocols/bonjour/bonjour.c:299
+#: ../libpurple/protocols/bonjour/bonjour.c:382
 #: ../libpurple/protocols/gg/gg.c:1079 ../libpurple/protocols/gg/gg.c:1587
 #: ../libpurple/protocols/gg/gg.c:1605 ../libpurple/protocols/gg/gg.c:1615
 #: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/gg/gg.c:1630
-#: ../libpurple/protocols/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:238
-#: ../libpurple/protocols/jabber/jabber.c:1570
-#: ../libpurple/protocols/jabber/jabber.c:1584
-#: ../libpurple/protocols/jabber/jabber.c:1598
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1626
-#: ../libpurple/protocols/jabber/jabber.c:1642
-#: ../libpurple/protocols/msn/msn.c:677 ../libpurple/protocols/msn/msn.c:683
-#: ../libpurple/protocols/msn/msn.c:689 ../libpurple/protocols/msn/msn.c:695
-#: ../libpurple/protocols/msn/msn.c:700 ../libpurple/protocols/msn/msn.c:705
+#: ../libpurple/protocols/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:245
+#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1615
+#: ../libpurple/protocols/jabber/jabber.c:1629
+#: ../libpurple/protocols/jabber/jabber.c:1643
+#: ../libpurple/protocols/jabber/jabber.c:1657
+#: ../libpurple/protocols/jabber/jabber.c:1673
+#: ../libpurple/protocols/msn/msn.c:685 ../libpurple/protocols/msn/msn.c:691
+#: ../libpurple/protocols/msn/msn.c:697 ../libpurple/protocols/msn/msn.c:703
+#: ../libpurple/protocols/msn/msn.c:708 ../libpurple/protocols/msn/msn.c:713
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2855
-#: ../libpurple/protocols/novell/novell.c:2958
-#: ../libpurple/protocols/novell/novell.c:2964
-#: ../libpurple/protocols/novell/novell.c:2970
-#: ../libpurple/protocols/oscar/oscar.c:5604
-#: ../libpurple/protocols/oscar/oscar.c:5822
-#: ../libpurple/protocols/oscar/oscar.c:5836
-#: ../libpurple/protocols/oscar/oscar.c:5852
-#: ../libpurple/protocols/oscar/oscar.c:5859
-#: ../libpurple/protocols/oscar/oscar.c:5866
-#: ../libpurple/protocols/sametime/sametime.c:3328
-#: ../libpurple/protocols/sametime/sametime.c:3334
-#: ../libpurple/protocols/sametime/sametime.c:3340
-#: ../libpurple/protocols/sametime/sametime.c:3419
+#: ../libpurple/protocols/novell/novell.c:2856
+#: ../libpurple/protocols/novell/novell.c:2959
+#: ../libpurple/protocols/novell/novell.c:2965
+#: ../libpurple/protocols/novell/novell.c:2971
+#: ../libpurple/protocols/oscar/oscar.c:5657
+#: ../libpurple/protocols/oscar/oscar.c:5875
+#: ../libpurple/protocols/oscar/oscar.c:5889
+#: ../libpurple/protocols/oscar/oscar.c:5905
+#: ../libpurple/protocols/oscar/oscar.c:5912
+#: ../libpurple/protocols/oscar/oscar.c:5919
+#: ../libpurple/protocols/sametime/sametime.c:3336
+#: ../libpurple/protocols/sametime/sametime.c:3342
+#: ../libpurple/protocols/sametime/sametime.c:3348
+#: ../libpurple/protocols/sametime/sametime.c:3427
 #: ../libpurple/protocols/silc/buddy.c:1554
 #: ../libpurple/protocols/silc10/buddy.c:1554
 #: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/yahoo.c:3762
-#: ../libpurple/protocols/yahoo/yahoo.c:3768
-#: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1016
+#: ../libpurple/protocols/yahoo/yahoo.c:3793
+#: ../libpurple/protocols/yahoo/yahoo.c:3799
+#: ../libpurple/protocols/zephyr/zephyr.c:2349
+#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1001
 msgid "Message"
 msgstr "Viesti"
 
@@ -1832,15 +1991,15 @@ msgstr "Tallenna ja käytä"
 msgid "Save & Use"
 msgstr "Tallenna ja käytä"
 
-#: ../finch/gntui.c:85
+#: ../finch/gntui.c:97
 msgid "Certificates"
 msgstr "Varmenteet"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2137
+#: ../finch/gntui.c:102 ../pidgin/gtkprefs.c:2039
 msgid "Sounds"
 msgstr "Äänet"
 
-#: ../finch/gntui.c:91
+#: ../finch/gntui.c:104
 msgid "Statuses"
 msgstr "Tilat"
 
@@ -1938,16 +2097,16 @@ msgstr "Leivänpaahdin-liitännäinen"
 msgid "Toaster plugin"
 msgstr "Leivänpaahdin-liitännäinen"
 
-#: ../finch/plugins/gnthistory.c:117 ../pidgin/plugins/history.c:125
+#: ../finch/plugins/gnthistory.c:114 ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Keskustelu käyttäjän %s kanssa %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:175 ../pidgin/plugins/history.c:153
+#: ../finch/plugins/gnthistory.c:172 ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "Historia-liitännäinen vaatii lokiinkirjauksen käyttöä"
 
-#: ../finch/plugins/gnthistory.c:176 ../pidgin/plugins/history.c:154
+#: ../finch/plugins/gnthistory.c:173 ../pidgin/plugins/history.c:154
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1960,15 +2119,15 @@ msgstr ""
 "Lokien käyttöönotto pikaviesteille ja/tai ryhmäkeskusteluille ottaa käyttöön "
 "historiatoiminnon vastaaville keskustelutyypeille."
 
-#: ../finch/plugins/gnthistory.c:221
+#: ../finch/plugins/gnthistory.c:217
 msgid "GntHistory"
 msgstr "GntHistory"
 
-#: ../finch/plugins/gnthistory.c:223 ../pidgin/plugins/history.c:197
+#: ../finch/plugins/gnthistory.c:219 ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Näyttää osan edellistä keskustelua uudessa keskustelussa."
 
-#: ../finch/plugins/gnthistory.c:224 ../pidgin/plugins/history.c:198
+#: ../finch/plugins/gnthistory.c:220 ../pidgin/plugins/history.c:198
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1976,6 +2135,48 @@ msgstr ""
 "Kun uusi keskustelu aloitetaan, tämä liitännäinen näyttää edellisen "
 "keskustelun keskusteluikkunassa."
 
+#: ../finch/plugins/grouping.c:42 ../libpurple/protocols/oscar/oscar.c:738
+msgid "Online"
+msgstr "Linjoilla"
+
+#: ../finch/plugins/grouping.c:44 ../finch/plugins/grouping.c:145
+#: ../libpurple/protocols/gg/gg.c:1010
+#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/novell/novell.c:2846
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:5707
+#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
+#: ../libpurple/protocols/qq/qq.c:293
+#: ../libpurple/protocols/yahoo/yahoo.c:3136 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3297 ../pidgin/gtkblist.c:3679
+#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1085
+msgid "Offline"
+msgstr "Poissa linjoilta"
+
+#: ../finch/plugins/grouping.c:117 ../pidgin/gtkblist.c:3336
+msgid "Online Buddies"
+msgstr "Tuttavat linjoilla"
+
+#: ../finch/plugins/grouping.c:117
+msgid "Offline Buddies"
+msgstr "Tuttavat poissa linjoilta"
+
+#: ../finch/plugins/grouping.c:127
+msgid "Online/Offline"
+msgstr "Linjoilla/poissa linjoilta"
+
+#: ../finch/plugins/grouping.c:168
+msgid "Meebo"
+msgstr "Meebo"
+
+#: ../finch/plugins/grouping.c:217
+msgid "No Grouping"
+msgstr "Ei ryhmittelyä"
+
+#: ../finch/plugins/grouping.c:257 ../finch/plugins/grouping.c:258
+msgid "Provides alternate buddylist grouping options."
+msgstr "Mahdollistaa vaihtoehtoisia tuttavien ryhmittelyvalintoja."
+
 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr "Lastlog"
@@ -1993,88 +2194,88 @@ msgstr "Lastlog-liitännäinen."
 msgid "Lastlog plugin."
 msgstr "Lastlog-liitännäinen."
 
-#: ../libpurple/account.c:875
+#: ../libpurple/account.c:886
 msgid "accounts"
 msgstr "käyttäjätilit"
 
-#: ../libpurple/account.c:1050 ../libpurple/protocols/jabber/auth.c:199
+#: ../libpurple/account.c:1061 ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
 msgstr "Salasana tarvitaan kirjautumiseen."
 
-#: ../libpurple/account.c:1084
+#: ../libpurple/account.c:1095
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Anna salasana käyttäjätilille %s (%s)"
 
-#: ../libpurple/account.c:1091
+#: ../libpurple/account.c:1102
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: ../libpurple/account.c:1096
+#: ../libpurple/account.c:1107
 msgid "Save password"
 msgstr "Tallenna salasana"
 
-#: ../libpurple/account.c:1131 ../libpurple/connection.c:105
-#: ../libpurple/connection.c:178
+#: ../libpurple/account.c:1142 ../libpurple/connection.c:118
+#: ../libpurple/connection.c:191
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "%s-yhteyskäytäntöliitännäinen puuttuu"
 
-#: ../libpurple/account.c:1133 ../libpurple/connection.c:108
+#: ../libpurple/account.c:1144 ../libpurple/connection.c:121
 msgid "Connection Error"
 msgstr "Yhteysvirhe"
 
-#: ../libpurple/account.c:1330 ../libpurple/protocols/gg/gg.c:708
-#: ../libpurple/protocols/jabber/jabber.c:1698
+#: ../libpurple/account.c:1355 ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/jabber/jabber.c:1729
 msgid "New passwords do not match."
 msgstr "Uudet salasanat eivät täsmää."
 
-#: ../libpurple/account.c:1339
+#: ../libpurple/account.c:1364
 msgid "Fill out all fields completely."
 msgstr "Täytä kaikki kentät kokonaan."
 
-#: ../libpurple/account.c:1362
+#: ../libpurple/account.c:1387
 msgid "Original password"
 msgstr "Vanha salasana"
 
-#: ../libpurple/account.c:1369
+#: ../libpurple/account.c:1394
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: ../libpurple/account.c:1376
+#: ../libpurple/account.c:1401
 msgid "New password (again)"
 msgstr "Uusi salasana (uudelleen)"
 
-#: ../libpurple/account.c:1382
+#: ../libpurple/account.c:1407
 #, c-format
 msgid "Change password for %s"
 msgstr "Vaihda %s:n salasana"
 
-#: ../libpurple/account.c:1390
+#: ../libpurple/account.c:1415
 msgid "Please enter your current password and your new password."
 msgstr "Anna nykyinen sekä uusi salasana."
 
-#: ../libpurple/account.c:1421
+#: ../libpurple/account.c:1446
 #, c-format
 msgid "Change user information for %s"
 msgstr "Vaihda käyttäjätietoja - %s"
 
-#: ../libpurple/account.c:1424 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1449 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Aseta käyttäjätiedot"
 
-#: ../libpurple/account.c:1895 ../libpurple/protocols/gg/gg.c:1019
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2030
-#: ../libpurple/protocols/jabber/buddy.c:2047
-#: ../libpurple/protocols/novell/novell.c:2848
-#: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:160
+#: ../libpurple/account.c:1920 ../libpurple/protocols/gg/gg.c:1019
+#: ../libpurple/protocols/jabber/buddy.c:784
+#: ../libpurple/protocols/jabber/buddy.c:2034
+#: ../libpurple/protocols/jabber/buddy.c:2051
+#: ../libpurple/protocols/novell/novell.c:2849
+#: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:166
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
-#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3272 ../pidgin/gtkblist.c:6069
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1348
+#: ../libpurple/blist.c:1558 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3433 ../pidgin/gtkblist.c:6188
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2110,69 +2311,56 @@ msgstr "Kertakäyttöisen varmenteen tar
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:886
+#: ../libpurple/certificate.c:894
 msgid "Certificate Authorities"
 msgstr "Varmentajat"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1054
+#: ../libpurple/certificate.c:1062
 msgid "SSL Peers Cache"
 msgstr "SSL Peers -välimuisti"
 
 #. Make messages
-#: ../libpurple/certificate.c:1185
+#: ../libpurple/certificate.c:1193
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "Hyväksy varmenne kohteelle %s?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1191
+#: ../libpurple/certificate.c:1199
 msgid "SSL Certificate Verification"
 msgstr "SSL-varmenteen tarkistus"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1201
+#: ../libpurple/certificate.c:1208
 msgid "Accept"
 msgstr "Hyväksy"
 
-#: ../libpurple/certificate.c:1202 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/certificate.c:1209 ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:90
-#: ../libpurple/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/group_opt.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "Kieltäydy"
 
-#: ../libpurple/certificate.c:1203
+#: ../libpurple/certificate.c:1210
 msgid "_View Certificate..."
 msgstr "_Näytä varmenne..."
 
 #. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1303
+#: ../libpurple/certificate.c:1311
 #, c-format
 msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"Kohteen \"%s\" esittämä varmenne näyttää olevan lähteestä \"%s\". Tämä "
-"saattaa tarkoittaa ettet ole yhdistämässä siihen palveluun johon luulet."
-
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1328
-#, c-format
-msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
 "automatically checked."
 msgstr ""
 "Kohteen \"%s\" esittämä varmenne on itseallekirjoitettu. Sitä ei voida "
 "automaattisesti tarkistaa."
 
-#: ../libpurple/certificate.c:1346
+#: ../libpurple/certificate.c:1329
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "Kohteelle %s esitetty varmenneketju ei ole kelvollinen."
@@ -2182,16 +2370,16 @@ msgstr "Kohteelle %s esitetty varmenneke
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1354 ../libpurple/certificate.c:1423
+#: ../libpurple/certificate.c:1337 ../libpurple/certificate.c:1407
 msgid "SSL Certificate Error"
 msgstr "SSL-varmennevirhe"
 
-#: ../libpurple/certificate.c:1355
+#: ../libpurple/certificate.c:1338
 msgid "Invalid certificate chain"
 msgstr "Epäkelpo varmenneketju"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1375
+#: ../libpurple/certificate.c:1359
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
@@ -2199,12 +2387,12 @@ msgstr ""
 "Juurivarmennetietokantaa ei ole, joten tätä varmennetta ei voi kelpuuttaa."
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1398
+#: ../libpurple/certificate.c:1382
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr "Tämän varmenteen myöntäjän juurivarmenne on tuntematon Pidginille."
 
-#: ../libpurple/certificate.c:1415
+#: ../libpurple/certificate.c:1399
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
@@ -2214,12 +2402,25 @@ msgstr ""
 "Kohteen %s esittämällä varmenneketjulla ei ole kelvollista digitaalista "
 "allekirjoitusta varmentajalta jolta se väittää allekirjoituksen olevan."
 
-#: ../libpurple/certificate.c:1424
+#: ../libpurple/certificate.c:1408
 msgid "Invalid certificate authority signature"
 msgstr "Epäkelpo varmentajan allekirjoitus"
 
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1434
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"Kohteen \"%s\" esittämä varmenne näyttää olevan lähteestä \"%s\". Tämä "
+"saattaa tarkoittaa ettet ole yhdistämässä siihen palveluun johon luulet."
+
 #. Make messages
-#: ../libpurple/certificate.c:1888
+#: ../libpurple/certificate.c:1896
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2237,34 +2438,35 @@ msgstr ""
 "Vanhenemispäivä: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1897
+#: ../libpurple/certificate.c:1905
 msgid "Certificate Information"
 msgstr "Varmennetiedot"
 
-#: ../libpurple/connection.c:107
+#: ../libpurple/connection.c:120
 msgid "Registration Error"
 msgstr "Rekisteröintivirhe"
 
-#: ../libpurple/connection.c:180
+#: ../libpurple/connection.c:193
 msgid "Unregistration Error"
 msgstr "Rekisteröinnin poistamisen virhe"
 
-#: ../libpurple/connection.c:350
+#: ../libpurple/connection.c:347
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s kirjautui sisään"
 
-#: ../libpurple/connection.c:380
+#: ../libpurple/connection.c:377
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s kirjautui ulos"
 
-#: ../libpurple/connection.c:525 ../libpurple/plugin.c:277
-#: ../libpurple/protocols/jabber/buddy.c:2350
+#: ../libpurple/connection.c:530 ../libpurple/plugin.c:277
+#: ../libpurple/protocols/jabber/buddy.c:2354
 #: ../libpurple/protocols/msn/servconn.c:141
 #: ../libpurple/protocols/msn/session.c:377
 #: ../libpurple/protocols/msnp9/servconn.c:139
-#: ../libpurple/protocols/msnp9/session.c:330
+#: ../libpurple/protocols/msnp9/session.c:329
+#: ../libpurple/protocols/oscar/family_chatnav.c:63
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
@@ -2281,45 +2483,45 @@ msgstr "Viesti on liian suuri."
 msgid "The message is too large."
 msgstr "Viesti on liian suuri."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:267
-#: ../libpurple/protocols/bonjour/jabber.c:310
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:272
+#: ../libpurple/protocols/bonjour/jabber.c:315
 msgid "Unable to send message."
 msgstr "Viestiä ei voi lähettää."
 
-#: ../libpurple/conversation.c:1211
+#: ../libpurple/conversation.c:1218
 msgid "Send Message"
 msgstr "Lähetä viesti"
 
-#: ../libpurple/conversation.c:1214
+#: ../libpurple/conversation.c:1221
 msgid "_Send Message"
 msgstr "_Lähetä viesti"
 
-#: ../libpurple/conversation.c:1620
+#: ../libpurple/conversation.c:1627
 #, c-format
 msgid "%s entered the room."
 msgstr "%s saapui huoneeseen."
 
-#: ../libpurple/conversation.c:1623
+#: ../libpurple/conversation.c:1630
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] saapui huoneeseen."
 
-#: ../libpurple/conversation.c:1733
+#: ../libpurple/conversation.c:1740
 #, c-format
 msgid "You are now known as %s"
 msgstr "Olet nyt nimeltäsi %s"
 
-#: ../libpurple/conversation.c:1753
+#: ../libpurple/conversation.c:1760
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nyt nimeltään %s"
 
-#: ../libpurple/conversation.c:1828
+#: ../libpurple/conversation.c:1835
 #, c-format
 msgid "%s left the room."
 msgstr "%s poistui huoneesta."
 
-#: ../libpurple/conversation.c:1831
+#: ../libpurple/conversation.c:1838
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s poistui huoneesta (%s)."
@@ -2348,15 +2550,15 @@ msgstr "Ei nimeä"
 msgid "No name"
 msgstr "Ei nimeä"
 
-#: ../libpurple/dnsquery.c:511
+#: ../libpurple/dnsquery.c:532
 msgid "Unable to create new resolver process\n"
 msgstr "Selvitysprosessin luominen epäonnistui\n"
 
-#: ../libpurple/dnsquery.c:516
+#: ../libpurple/dnsquery.c:537
 msgid "Unable to send request to resolver process\n"
 msgstr "Pyyntöä ei voi lähettää selvitysprosessille\n"
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:698
+#: ../libpurple/dnsquery.c:570 ../libpurple/dnsquery.c:719
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2365,13 +2567,13 @@ msgstr ""
 "Virhe selvitettäessä %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:712
-#: ../libpurple/dnsquery.c:830
+#: ../libpurple/dnsquery.c:573 ../libpurple/dnsquery.c:733
+#: ../libpurple/dnsquery.c:851
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Virhe selvitettäessä %s: %d"
 
-#: ../libpurple/dnsquery.c:574
+#: ../libpurple/dnsquery.c:595
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -2380,21 +2582,20 @@ msgstr ""
 "Virhe luettaessa selvitysprosessista:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:578
-#, c-format
+#: ../libpurple/dnsquery.c:599
 msgid "EOF while reading from resolver process"
 msgstr "EOF luettaessa selvitysprosessista"
 
-#: ../libpurple/dnsquery.c:762
+#: ../libpurple/dnsquery.c:783
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Säikeen luonti epäonnistui: %s"
 
-#: ../libpurple/dnsquery.c:763
+#: ../libpurple/dnsquery.c:784
 msgid "Unknown reason"
 msgstr "Tuntematon syy"
 
-#: ../libpurple/ft.c:209
+#: ../libpurple/ft.c:210
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2403,7 +2604,7 @@ msgstr ""
 "Virhe luettaessa %s:  \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:213
+#: ../libpurple/ft.c:214
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2412,7 +2613,7 @@ msgstr ""
 "Virhe kirjoitettaessa %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:217
+#: ../libpurple/ft.c:218
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2421,39 +2622,39 @@ msgstr ""
 "Virhe käytettäessä tiedostoa %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:253
+#: ../libpurple/ft.c:254
 msgid "Directory is not writable."
 msgstr "Kansioon ei ole kirjoitusoikeuksia."
 
-#: ../libpurple/ft.c:268
+#: ../libpurple/ft.c:269
 msgid "Cannot send a file of 0 bytes."
 msgstr "Ei voi lähettää tiedostoa, jonka koko on 0 tavua."
 
-#: ../libpurple/ft.c:278
+#: ../libpurple/ft.c:279
 msgid "Cannot send a directory."
 msgstr "Kansiota ei voi lähettää."
 
-#: ../libpurple/ft.c:287
+#: ../libpurple/ft.c:288
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s ei ole tavallinen tiedosto. Ei suostuta ylikirjoittamaan sitä.\n"
 
-#: ../libpurple/ft.c:347
+#: ../libpurple/ft.c:348
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s on lähettämässä sinulle %s (%s)"
 
-#: ../libpurple/ft.c:354
+#: ../libpurple/ft.c:355
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "Käyttäjä %s tahtoo lähettää sinulle tiedoston"
 
-#: ../libpurple/ft.c:397
+#: ../libpurple/ft.c:398
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Hyväksytäänkö tiedostonsiirtopyyntö käyttäjältä %s?"
 
-#: ../libpurple/ft.c:401
+#: ../libpurple/ft.c:402
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2464,62 +2665,60 @@ msgstr ""
 "Etäkone: %s\n"
 "Portti: %d"
 
-#: ../libpurple/ft.c:436
+#: ../libpurple/ft.c:437
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s tarjoaa tiedostoa %s"
 
-#: ../libpurple/ft.c:488
+#: ../libpurple/ft.c:490
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ei ole kelvollinen tiedostonimi.\n"
 
-#: ../libpurple/ft.c:509
+#: ../libpurple/ft.c:511
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Tarjotaan tiedostoa %s lähetettäväksi käyttäjälle %s."
 
-#: ../libpurple/ft.c:521
+#: ../libpurple/ft.c:523
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Aloitetaan tiedoston %s siirto käyttäjältä %s"
 
-#: ../libpurple/ft.c:682
+#: ../libpurple/ft.c:700
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Tiedoston %s siirto valmis"
 
-#: ../libpurple/ft.c:685
-#, c-format
+#: ../libpurple/ft.c:703
 msgid "File transfer complete"
 msgstr "Tiedostonsiirto valmis"
 
-#: ../libpurple/ft.c:1103
+#: ../libpurple/ft.c:1138
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Peruutit tiedoston %s siirron"
 
-#: ../libpurple/ft.c:1108
-#, c-format
+#: ../libpurple/ft.c:1143
 msgid "File transfer cancelled"
 msgstr "Tiedostonsiirto peruutettu"
 
-#: ../libpurple/ft.c:1166
+#: ../libpurple/ft.c:1201
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s peruutti tiedoston %s siirron"
 
-#: ../libpurple/ft.c:1171
+#: ../libpurple/ft.c:1206
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "Käyttäjä %s peruutti tiedostonsiirron"
 
-#: ../libpurple/ft.c:1228
+#: ../libpurple/ft.c:1263
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Tiedostonsiirto käyttäjälle %s epäonnistui."
 
-#: ../libpurple/ft.c:1230
+#: ../libpurple/ft.c:1265
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Tiedostonsiirto käyttäjältä %s epäonnistui."
@@ -2700,27 +2899,27 @@ msgstr "<b><font color=\"red\">Lokilla e
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Lokilla ei ole read-funktiota</font></b>"
 
-#: ../libpurple/log.c:598
+#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:612
+#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "Teksti"
 
-#: ../libpurple/log.c:626
+#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "Vanha tasainen muoto"
 
-#: ../libpurple/log.c:839
+#: ../libpurple/log.c:838
 msgid "Logging of this conversation failed."
 msgstr "Tämän keskustelun kirjaaminen lokiin epäonnistui."
 
-#: ../libpurple/log.c:1282
+#: ../libpurple/log.c:1281
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1366
+#: ../libpurple/log.c:1365
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2729,7 +2928,7 @@ msgstr ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "AUTOMAATTIVASTAUS&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1368
+#: ../libpurple/log.c:1367
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2738,16 +2937,16 @@ msgstr ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "AUTOMAATTIVASTAUS&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
+#: ../libpurple/log.c:1425 ../libpurple/log.c:1558
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Lokin hakemistopolkua ei löydy!</b></font>"
 
-#: ../libpurple/log.c:1438 ../libpurple/log.c:1568
+#: ../libpurple/log.c:1437 ../libpurple/log.c:1567
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Ei voi lukea tiedostoa: %s</b></font>"
 
-#: ../libpurple/log.c:1500
+#: ../libpurple/log.c:1499
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMAATTIVASTAUS>: %s\n"
@@ -2758,7 +2957,6 @@ msgstr "Käytät: %s, mutta tämä liitÃ
 msgstr "Käytät: %s, mutta tämä liitännäinen vaatii: %s."
 
 #: ../libpurple/plugin.c:375
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Tämä liitännäinen ei ole määritellyt tunnistetta (ID)."
 
@@ -2822,51 +3020,50 @@ msgstr "Valmis (automaattinen hyväksynt
 msgid "Autoaccept complete"
 msgstr "Valmis (automaattinen hyväksyntä)"
 
-#: ../libpurple/plugins/autoaccept.c:160
+#: ../libpurple/plugins/autoaccept.c:171
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "Kun tiedostonsiirtopyyntö saapuu käyttäjältä %s"
 
-#: ../libpurple/plugins/autoaccept.c:162
+#: ../libpurple/plugins/autoaccept.c:173
 msgid "Set Autoaccept Setting"
 msgstr "Aseta automaattihyväksynnän asetus"
 
-#: ../libpurple/plugins/autoaccept.c:164
+#: ../libpurple/plugins/autoaccept.c:175
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/autoaccept.c:176 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1451
-#: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2292
-#: ../libpurple/protocols/oscar/oscar.c:5936
-#: ../libpurple/protocols/oscar/oscar.c:5991
-#: ../libpurple/protocols/oscar/oscar.c:6217
-#: ../libpurple/protocols/oscar/oscar.c:6287 ../libpurple/request.h:1828
-#: ../libpurple/request.h:1841 ../libpurple/request.h:1854
-#: ../libpurple/request.h:1867 ../pidgin/gtkblist.c:546
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:2294
+#: ../libpurple/protocols/oscar/oscar.c:2343
+#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:6044
+#: ../libpurple/protocols/oscar/oscar.c:6270
+#: ../libpurple/protocols/oscar/oscar.c:6340 ../libpurple/request.h:1458
+#: ../libpurple/request.h:1468 ../pidgin/gtkblist.c:552
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: ../libpurple/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:179
 msgid "Ask"
 msgstr "Kysy"
 
-#: ../libpurple/plugins/autoaccept.c:169
+#: ../libpurple/plugins/autoaccept.c:180
 msgid "Auto Accept"
 msgstr "Hyväksy automaattisesti"
 
-#: ../libpurple/plugins/autoaccept.c:170
+#: ../libpurple/plugins/autoaccept.c:181
 msgid "Auto Reject"
 msgstr "Hylkää automaattisesti"
 
-#: ../libpurple/plugins/autoaccept.c:185
+#: ../libpurple/plugins/autoaccept.c:196
 msgid "Autoaccept File Transfers..."
 msgstr "Tiedostonsiirtojen automaattihyväksyminen..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:215
+#: ../libpurple/plugins/autoaccept.c:226
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2874,11 +3071,11 @@ msgstr ""
 "Polku johon tiedostot tallennetaan\n"
 "(Anna koko polku)"
 
-#: ../libpurple/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:231
 msgid "Automatically reject from users not in buddy list"
 msgstr "Hylkää automaattisesti käyttäjiltä jotka eivät ole tuttavia"
 
-#: ../libpurple/plugins/autoaccept.c:224
+#: ../libpurple/plugins/autoaccept.c:235
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2887,10 +3084,10 @@ msgstr ""
 "valmis\n"
 "(vain kun keskustelua lähettäjän kanssa ei avoinna)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1808
-#: ../libpurple/protocols/msn/msn.c:1838
-#: ../libpurple/protocols/msnp9/msn.c:1661
-#: ../libpurple/protocols/msnp9/msn.c:1691
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1846
+#: ../libpurple/protocols/msnp9/msn.c:1672
+#: ../libpurple/protocols/msnp9/msn.c:1702
 msgid "Notes"
 msgstr "Merkinnät"
 
@@ -3271,6 +3468,14 @@ msgstr "Lataa .NET-liitännäisiä Monon
 msgid "Loads .NET plugins with Mono."
 msgstr "Lataa .NET-liitännäisiä Monon avulla."
 
+#: ../libpurple/plugins/newline.c:57
+msgid "Add new line in IMs"
+msgstr "Lisää rivinvaihto pikaviesteihin"
+
+#: ../libpurple/plugins/newline.c:61
+msgid "Add new line in Chats"
+msgstr "Lisää rivinvaihto keskusteluihin"
+
 #. *< magic
 #. *< major version
 #. *< minor version
@@ -3280,18 +3485,18 @@ msgstr "Lataa .NET-liitännäisiä Monon
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/newline.c:68
+#: ../libpurple/plugins/newline.c:104
 msgid "New Line"
 msgstr "Rivinvaihto"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/newline.c:70
+#: ../libpurple/plugins/newline.c:106
 msgid "Prepends a newline to displayed message."
 msgstr "Lisää näytettävän viestin eteen rivinvaihdon."
 
 #. *< summary
-#: ../libpurple/plugins/newline.c:71
+#: ../libpurple/plugins/newline.c:107
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the screen name in the conversation window."
@@ -3338,31 +3543,31 @@ msgstr ""
 
 #: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msn/msn.c:661
 #: ../libpurple/protocols/msnp9/dialog.c:133
-#: ../libpurple/protocols/msnp9/msn.c:550
-#: ../libpurple/protocols/msnp9/msn.c:564
-#: ../libpurple/protocols/novell/novell.c:1928
+#: ../libpurple/protocols/msnp9/msn.c:547
+#: ../libpurple/protocols/msnp9/msn.c:563
+#: ../libpurple/protocols/novell/novell.c:1929
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:308
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:318
+#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:270
 msgid "Yes"
 msgstr "Kyllä"
 
 #: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msn/msn.c:661
 #: ../libpurple/protocols/msnp9/dialog.c:134
-#: ../libpurple/protocols/msnp9/msn.c:550
-#: ../libpurple/protocols/msnp9/msn.c:564
-#: ../libpurple/protocols/novell/novell.c:1929
+#: ../libpurple/protocols/msnp9/msn.c:547
+#: ../libpurple/protocols/msnp9/msn.c:563
+#: ../libpurple/protocols/novell/novell.c:1930
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:319
+#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:271
 msgid "No"
 msgstr "Ei"
 
@@ -3466,7 +3671,7 @@ msgstr "Kokeilee että useimmat asiat to
 msgstr "Kokeilee että useimmat asiat toimivat."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:911
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:910
 #: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
 msgstr "X.509-varmenteet"
@@ -3477,7 +3682,7 @@ msgstr "X.509-varmenteet"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:995
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:994
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3485,8 +3690,8 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:998
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1000
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:997
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:999
 msgid "Provides SSL support through GNUTLS."
 msgstr "Tuo SSL-tuen GNUTLS:n kautta."
 
@@ -3607,7 +3812,7 @@ msgstr ""
 "ActiveTCL-asennusta ei havaittu. Jos haluat käyttää TCL-liitännäisiä, asenna "
 "ActiveTCL osoitteesta http://www.activestate.com\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:108
+#: ../libpurple/protocols/bonjour/bonjour.c:101
 msgid ""
 "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
 "developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
@@ -3617,51 +3822,51 @@ msgstr ""
 "kysytyt kysymykset osoitteessa http://developer.pidgin.im/wiki/Using%"
 "20Pidgin#CanIusePidginforBonjourLink-LocalMessaging."
 
-#: ../libpurple/protocols/bonjour/bonjour.c:127
+#: ../libpurple/protocols/bonjour/bonjour.c:120
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Sisääntulevia pikaviestintäyhteyksiä ei voi kuunnella\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:154
+#: ../libpurple/protocols/bonjour/bonjour.c:147
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 "Paikalliseen mDNS-palvelimeen ei voi luoda yhteyttä. Onko se käynnissä?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:370
-#: ../libpurple/protocols/bonjour/bonjour.c:675
+#: ../libpurple/protocols/bonjour/bonjour.c:392
+#: ../libpurple/protocols/bonjour/bonjour.c:698
 #: ../libpurple/protocols/gg/gg.c:633
-#: ../libpurple/protocols/jabber/jabber.c:969
+#: ../libpurple/protocols/jabber/jabber.c:996
 msgid "First name"
 msgstr "Etunimi"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:372
-#: ../libpurple/protocols/bonjour/bonjour.c:678
+#: ../libpurple/protocols/bonjour/bonjour.c:394
+#: ../libpurple/protocols/bonjour/bonjour.c:701
 #: ../libpurple/protocols/gg/gg.c:628
-#: ../libpurple/protocols/jabber/jabber.c:974
+#: ../libpurple/protocols/jabber/jabber.c:1000
 msgid "Last name"
 msgstr "Sukunimi"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:376
+#: ../libpurple/protocols/bonjour/bonjour.c:398
 #: ../libpurple/protocols/jabber/buddy.c:295
-#: ../libpurple/protocols/jabber/buddy.c:1325
-#: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2219
+#: ../libpurple/protocols/jabber/buddy.c:1329
+#: ../libpurple/protocols/jabber/buddy.c:1339
+#: ../libpurple/protocols/jabber/buddy.c:2223
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:561
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
 msgid "E-Mail"
 msgstr "Sähköposti"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:379
-#: ../libpurple/protocols/bonjour/bonjour.c:684
+#: ../libpurple/protocols/bonjour/bonjour.c:401
+#: ../libpurple/protocols/bonjour/bonjour.c:707
 msgid "AIM Account"
 msgstr "AIM-tili"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:382
-#: ../libpurple/protocols/bonjour/bonjour.c:687
+#: ../libpurple/protocols/bonjour/bonjour.c:404
+#: ../libpurple/protocols/bonjour/bonjour.c:710
 msgid "XMPP Account"
 msgstr "XMPP-tili"
 
@@ -3675,22 +3880,22 @@ msgstr "XMPP-tili"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:486
-#: ../libpurple/protocols/bonjour/bonjour.c:488
+#: ../libpurple/protocols/bonjour/bonjour.c:508
+#: ../libpurple/protocols/bonjour/bonjour.c:510
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:629
+#: ../libpurple/protocols/bonjour/bonjour.c:651
 msgid "Purple Person"
 msgstr "Purple-henkilö"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:681
+#: ../libpurple/protocols/bonjour/bonjour.c:704
 #: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:959
+#: ../libpurple/protocols/jabber/jabber.c:988
 #: ../libpurple/protocols/silc/silc.c:913
 #: ../libpurple/protocols/silc/silc.c:1154
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/silc.c:928
 msgid "E-mail"
 msgstr "Sähköposti"
 
@@ -3698,38 +3903,44 @@ msgstr "Bonjour"
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:395
+#: ../libpurple/protocols/bonjour/jabber.c:407
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s on sulkenut keskustelun."
 
-#: ../libpurple/protocols/bonjour/jabber.c:453
-#: ../libpurple/protocols/bonjour/jabber.c:686
-#: ../libpurple/protocols/bonjour/jabber.c:704
+#: ../libpurple/protocols/bonjour/jabber.c:457
+#: ../libpurple/protocols/bonjour/jabber.c:522
+#: ../libpurple/protocols/bonjour/jabber.c:567
+#: ../libpurple/protocols/bonjour/jabber.c:744
+#: ../libpurple/protocols/bonjour/jabber.c:762
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Viestiä ei voi lähettää, keskustelua ei voi aloittaa."
 
-#: ../libpurple/protocols/bonjour/jabber.c:603
+#: ../libpurple/protocols/bonjour/jabber.c:661
 msgid "Cannot open socket"
 msgstr "Pistoketta ei voi avata"
 
-#: ../libpurple/protocols/bonjour/jabber.c:613
+#: ../libpurple/protocols/bonjour/jabber.c:671
 msgid "Error setting socket options"
 msgstr "Virhe asetettaessa pistokevalintoja"
 
-#: ../libpurple/protocols/bonjour/jabber.c:639
+#: ../libpurple/protocols/bonjour/jabber.c:697
 msgid "Could not bind socket to port"
 msgstr "Pistoketta ei voi liittää porttiin"
 
-#: ../libpurple/protocols/bonjour/jabber.c:649
+#: ../libpurple/protocols/bonjour/jabber.c:707
 msgid "Could not listen on socket"
 msgstr "Pistoketta ei voi kuunnella"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1845
+#: ../libpurple/protocols/bonjour/mdns_win32.c:110
+msgid "Error communicating with local mDNSResponder."
+msgstr "Virhe viestittäessä paikallisen mDNSResponderin kanssa."
+
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1851
 msgid "Invalid proxy settings"
 msgstr "Epäkelvot välipalvelinvalinnat"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1845
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1851
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3801,9 +4012,9 @@ msgstr "Rekisteröinti onnistui!"
 msgstr "Rekisteröinti onnistui!"
 
 #: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:776
-#: ../libpurple/protocols/jabber/jabber.c:940
-#: ../libpurple/protocols/jabber/jabber.c:943
-#: ../libpurple/protocols/jabber/jabber.c:1731
+#: ../libpurple/protocols/jabber/jabber.c:971
+#: ../libpurple/protocols/jabber/jabber.c:974
+#: ../libpurple/protocols/jabber/jabber.c:1762
 msgid "Password"
 msgstr "Salasana"
 
@@ -3829,9 +4040,9 @@ msgstr "Täytä seuraavat kentät"
 
 #: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
 #: ../libpurple/protocols/gg/gg.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:984
-#: ../libpurple/protocols/oscar/oscar.c:3799
-#: ../libpurple/protocols/oscar/oscar.c:3812
+#: ../libpurple/protocols/jabber/jabber.c:1008
+#: ../libpurple/protocols/oscar/oscar.c:3822
+#: ../libpurple/protocols/oscar/oscar.c:3835
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Paikkakunta"
@@ -3840,14 +4051,14 @@ msgstr "Syntymävuosi"
 msgid "Year of birth"
 msgstr "Syntymävuosi"
 
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1737
-#: ../libpurple/protocols/msnp9/msn.c:1590
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1745
+#: ../libpurple/protocols/msnp9/msn.c:1601
+#: ../libpurple/protocols/myspace/user.c:129
+#: ../libpurple/protocols/oscar/oscar.c:3765
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:227 ../libpurple/protocols/qq/qq.c:230
 #: ../libpurple/protocols/qq/qq.c:233 ../libpurple/protocols/qq/qq.c:237
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1097
 msgid "Gender"
 msgstr "Sukupuoli"
 
@@ -3856,14 +4067,14 @@ msgstr "Mies vai nainen"
 msgstr "Mies vai nainen"
 
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/oscar/oscar.c:3765
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Male"
 msgstr "Mies"
 
 #: ../libpurple/protocols/gg/gg.c:654
-#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/oscar/oscar.c:3765
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
@@ -3922,65 +4133,50 @@ msgstr "Lisää ryhmäkeskusteluun..."
 msgid "Add to chat..."
 msgstr "Lisää ryhmäkeskusteluun..."
 
-#: ../libpurple/protocols/gg/gg.c:1010
-#: ../libpurple/protocols/jabber/buddy.c:2034
-#: ../libpurple/protocols/novell/novell.c:2845
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5654
-#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
-#: ../libpurple/protocols/qq/qq.c:293
-#: ../libpurple/protocols/yahoo/yahoo.c:3110 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3338 ../pidgin/gtkblist.c:3676
-#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1061
-msgid "Offline"
-msgstr "Poissa linjoilta"
-
 #: ../libpurple/protocols/gg/gg.c:1013
-#: ../libpurple/protocols/jabber/buddy.c:2036
+#: ../libpurple/protocols/jabber/buddy.c:2040
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/msnp9/state.c:29
 #: ../libpurple/protocols/msnp9/state.c:30
 #: ../libpurple/protocols/msnp9/state.c:37
 #: ../libpurple/protocols/msnp9/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2833
+#: ../libpurple/protocols/novell/novell.c:2834
 #: ../libpurple/protocols/qq/qq.c:281
-#: ../libpurple/protocols/yahoo/yahoo.c:3112 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/yahoo/yahoo.c:3138 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1081
 msgid "Available"
 msgstr "Tavoitettavissa"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:537
-#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2040
-#: ../libpurple/protocols/novell/novell.c:2836
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4557
-#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:544
+#: ../libpurple/protocols/irc/msgs.c:312
+#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/novell/novell.c:2837
+#: ../libpurple/protocols/oscar/oscar.c:732
+#: ../libpurple/protocols/oscar/oscar.c:5735
 #: ../libpurple/protocols/qq/qq.c:181 ../libpurple/protocols/qq/qq.c:285
 #: ../libpurple/protocols/silc/buddy.c:1479
 #: ../libpurple/protocols/silc10/buddy.c:1479
-#: ../libpurple/protocols/yahoo/yahoo.c:3664
-#: ../libpurple/protocols/yahoo/yahoo.c:3738 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:2040
-#: ../pidgin/gtkstatusbox.c:1058
-#, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:3695
+#: ../libpurple/protocols/yahoo/yahoo.c:3769 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:1960
+#: ../pidgin/gtkstatusbox.c:1082
 msgid "Away"
 msgstr "Poissa"
 
 #: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1119
-#: ../libpurple/protocols/oscar/oscar.c:2709
-#: ../libpurple/protocols/oscar/oscar.c:3709
+#: ../libpurple/protocols/oscar/oscar.c:2760
+#: ../libpurple/protocols/oscar/oscar.c:3732
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
-#: ../libpurple/protocols/jabber/buddy.c:2213
-#: ../libpurple/protocols/jabber/buddy.c:2399
-#: ../libpurple/protocols/oscar/oscar.c:3720
+#: ../libpurple/protocols/jabber/buddy.c:2217
+#: ../libpurple/protocols/jabber/buddy.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:3743
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
@@ -3991,7 +4187,7 @@ msgstr "Syntymävuosi"
 msgstr "Syntymävuosi"
 
 #: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
-#: ../libpurple/protocols/oscar/oscar.c:3921
+#: ../libpurple/protocols/oscar/oscar.c:3944
 msgid "Unable to display the search results."
 msgstr "Hakutuloksia ei voi näyttää."
 
@@ -4035,23 +4231,10 @@ msgstr "Yhteys epäonnistui."
 msgid "Connection failed."
 msgstr "Yhteys epäonnistui."
 
-#: ../libpurple/protocols/gg/gg.c:1629 ../libpurple/protocols/msn/msn.c:664
-#: ../libpurple/protocols/msnp9/msn.c:563
-msgid "Blocked"
-msgstr "Estetty"
-
 #: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr "Lisää ryhmäkeskusteluun"
 
-#: ../libpurple/protocols/gg/gg.c:1661
-msgid "Unblock"
-msgstr "Poista esto"
-
-#: ../libpurple/protocols/gg/gg.c:1665
-msgid "Block"
-msgstr "Estä"
-
 #: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "Keskustelunimi:"
@@ -4122,36 +4305,39 @@ msgstr "Gadu-Gadu-käyttäjä"
 
 #: ../libpurple/protocols/irc/cmds.c:43
 #: ../libpurple/protocols/silc/silc.c:1780
-#: ../libpurple/protocols/silc10/silc.c:1569
+#: ../libpurple/protocols/silc10/silc.c:1572
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Tuntematon komento: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:503
+#: ../libpurple/protocols/irc/cmds.c:511
 #: ../libpurple/protocols/jabber/chat.c:591
 #: ../libpurple/protocols/silc/silc.c:1488
-#: ../libpurple/protocols/silc10/silc.c:1277
+#: ../libpurple/protocols/silc10/silc.c:1280
 #, c-format
 msgid "current topic is: %s"
 msgstr "nykyinen aihe on: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:507
+#: ../libpurple/protocols/irc/cmds.c:515
 #: ../libpurple/protocols/jabber/chat.c:595
 #: ../libpurple/protocols/silc/silc.c:1492
-#: ../libpurple/protocols/silc10/silc.c:1281
+#: ../libpurple/protocols/silc10/silc.c:1284
 msgid "No topic is set"
 msgstr "Aihetta ei ole asetettu"
 
-#: ../libpurple/protocols/irc/dcc_send.c:296
-#: ../libpurple/protocols/irc/dcc_send.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:287
+#: ../libpurple/protocols/irc/dcc_send.c:298
+#: ../libpurple/protocols/irc/dcc_send.c:339
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:318
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:327
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:336
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1109
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1513
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1564
 msgid "File Transfer Failed"
 msgstr "Tiedostonsiirto epäonnistui"
 
-#: ../libpurple/protocols/irc/dcc_send.c:297
-#: ../libpurple/protocols/irc/dcc_send.c:338
+#: ../libpurple/protocols/irc/dcc_send.c:299
+#: ../libpurple/protocols/irc/dcc_send.c:340
 msgid "Could not open a listening port."
 msgstr "Kuuntelevaa porttia ei voi avata."
 
@@ -4173,83 +4359,83 @@ msgstr "MOTD %s:lle"
 msgstr "MOTD %s:lle"
 
 #: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
-#: ../libpurple/protocols/irc/irc.c:625 ../libpurple/protocols/irc/irc.c:654
-#: ../libpurple/protocols/myspace/myspace.c:2378
+#: ../libpurple/protocols/irc/irc.c:633 ../libpurple/protocols/irc/irc.c:662
+#: ../libpurple/protocols/myspace/myspace.c:2530
 msgid "Server has disconnected"
 msgstr "Palvelin on katkaissut yhteyden"
 
-#: ../libpurple/protocols/irc/irc.c:253
+#: ../libpurple/protocols/irc/irc.c:260
 msgid "View MOTD"
 msgstr "Näytä MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:265 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:272 ../libpurple/protocols/silc/chat.c:33
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanava:"
 
-#: ../libpurple/protocols/irc/irc.c:271
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:527
+#: ../libpurple/protocols/irc/irc.c:278
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:496
 msgid "_Password:"
 msgstr "_Salasana:"
 
-#: ../libpurple/protocols/irc/irc.c:304
+#: ../libpurple/protocols/irc/irc.c:311
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-kutsumanimissä ei tule olla välilyöntejä"
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:325
-#: ../libpurple/protocols/jabber/jabber.c:1311
+#: ../libpurple/protocols/irc/irc.c:332
+#: ../libpurple/protocols/jabber/jabber.c:1336
 #: ../libpurple/protocols/msn/session.c:402
-#: ../libpurple/protocols/msnp9/session.c:355
-#: ../libpurple/protocols/myspace/myspace.c:302
-#: ../libpurple/protocols/novell/novell.c:2198
-#: ../libpurple/protocols/oscar/oscar.c:1290
+#: ../libpurple/protocols/msnp9/session.c:354
+#: ../libpurple/protocols/myspace/myspace.c:295
+#: ../libpurple/protocols/novell/novell.c:2199
+#: ../libpurple/protocols/oscar/oscar.c:1331
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3768
-#: ../libpurple/protocols/simple/simple.c:1893
-#: ../libpurple/protocols/yahoo/yahoo.c:2948
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
+#: ../libpurple/protocols/sametime/sametime.c:3776
+#: ../libpurple/protocols/simple/simple.c:1915
+#: ../libpurple/protocols/yahoo/yahoo.c:2966
+#: ../libpurple/protocols/zephyr/zephyr.c:1585 ../pidgin/gtkstatusbox.c:681
 msgid "Connecting"
 msgstr "Yhdistetään"
 
-#: ../libpurple/protocols/irc/irc.c:335
-#: ../libpurple/protocols/jabber/jabber.c:637
-#: ../libpurple/protocols/jabber/jabber.c:1126
+#: ../libpurple/protocols/irc/irc.c:342
+#: ../libpurple/protocols/jabber/jabber.c:664
+#: ../libpurple/protocols/jabber/jabber.c:1145
 msgid "SSL support unavailable"
 msgstr "SSL-tuki ei saatavilla"
 
-#: ../libpurple/protocols/irc/irc.c:348
-#: ../libpurple/protocols/myspace/myspace.c:320
+#: ../libpurple/protocols/irc/irc.c:355
+#: ../libpurple/protocols/myspace/myspace.c:313
 #: ../libpurple/protocols/simple/simple.c:469
-#: ../libpurple/protocols/simple/simple.c:1803
+#: ../libpurple/protocols/simple/simple.c:1825
 msgid "Couldn't create socket"
 msgstr "Pistokkeen luominen epäonnistui"
 
-#: ../libpurple/protocols/irc/irc.c:430
-#: ../libpurple/protocols/oscar/oscar.c:1286
+#: ../libpurple/protocols/irc/irc.c:437
+#: ../libpurple/protocols/oscar/oscar.c:1327
 msgid "Couldn't connect to host"
 msgstr "Yhteyttä isäntään ei voi muodostaa"
 
-#: ../libpurple/protocols/irc/irc.c:620 ../libpurple/protocols/irc/irc.c:649
-#: ../libpurple/protocols/myspace/myspace.c:2372
+#: ../libpurple/protocols/irc/irc.c:628 ../libpurple/protocols/irc/irc.c:657
+#: ../libpurple/protocols/myspace/myspace.c:2524
 msgid "Read error"
 msgstr "Virhe luettaessa"
 
-#: ../libpurple/protocols/irc/irc.c:790
+#: ../libpurple/protocols/irc/irc.c:798
 #: ../libpurple/protocols/silc/chat.c:1398
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1497
+#: ../libpurple/protocols/yahoo/yahoochat.c:1508
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: ../libpurple/protocols/irc/irc.c:793
-#: ../libpurple/protocols/sametime/sametime.c:3416
+#: ../libpurple/protocols/irc/irc.c:801
+#: ../libpurple/protocols/sametime/sametime.c:3424
 #: ../libpurple/protocols/silc/chat.c:1401
 #: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1506
+#: ../libpurple/protocols/yahoo/yahoochat.c:1517
 msgid "Topic"
 msgstr "Aihe"
 
@@ -4261,50 +4447,50 @@ msgstr "Aihe"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:931
+#: ../libpurple/protocols/irc/irc.c:939
 msgid "IRC Protocol Plugin"
 msgstr "IRC-yhteyskäytäntöliitännäinen"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:932
+#: ../libpurple/protocols/irc/irc.c:940
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRC-yhteyskäytäntöliitännäinen joka on vähemmän huono..."
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:957 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2335
-#: ../libpurple/protocols/msnp9/msn.c:2186
-#: ../libpurple/protocols/oscar/oscar.c:6721
+#: ../libpurple/protocols/irc/irc.c:965 ../libpurple/protocols/irc/msgs.c:325
+#: ../libpurple/protocols/msn/msn.c:2343
+#: ../libpurple/protocols/msnp9/msn.c:2197
+#: ../libpurple/protocols/oscar/oscar.c:6747
 #: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5773
+#: ../libpurple/protocols/sametime/sametime.c:5781
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1343
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:2083
+#: ../libpurple/protocols/simple/simple.c:2099
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Palvelin"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:960 ../libpurple/protocols/msn/msn.c:2340
-#: ../libpurple/protocols/msnp9/msn.c:2191
-#: ../libpurple/protocols/oscar/oscar.c:6724
+#: ../libpurple/protocols/irc/irc.c:968 ../libpurple/protocols/msn/msn.c:2348
+#: ../libpurple/protocols/msnp9/msn.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:6750
 #: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5778
+#: ../libpurple/protocols/sametime/sametime.c:5786
 #: ../libpurple/protocols/silc/silc.c:2061
-#: ../libpurple/protocols/silc10/silc.c:1864
+#: ../libpurple/protocols/silc10/silc.c:1867
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Portti"
 
-#: ../libpurple/protocols/irc/irc.c:963
+#: ../libpurple/protocols/irc/irc.c:971
 msgid "Encodings"
 msgstr "Merkistöt"
 
-#: ../libpurple/protocols/irc/irc.c:966 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:931
-#: ../libpurple/protocols/jabber/jabber.c:934
+#: ../libpurple/protocols/irc/irc.c:974 ../libpurple/protocols/irc/msgs.c:318
+#: ../libpurple/protocols/jabber/jabber.c:964
+#: ../libpurple/protocols/jabber/jabber.c:966
 #: ../libpurple/protocols/silc/buddy.c:1542
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -4316,13 +4502,13 @@ msgstr "Merkistöt"
 #: ../libpurple/protocols/silc10/ops.c:1194
 #: ../libpurple/protocols/silc10/ops.c:1340
 #: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:916
+#: ../libpurple/protocols/silc10/silc.c:922
 msgid "Username"
 msgstr "Käyttäjänimi"
 
-#: ../libpurple/protocols/irc/irc.c:969 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:977 ../libpurple/protocols/irc/msgs.c:319
 #: ../libpurple/protocols/silc/silc.c:1152
-#: ../libpurple/protocols/silc10/silc.c:920
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Real name"
 msgstr "Oikea nimi"
 
@@ -4330,158 +4516,158 @@ msgstr "Oikea nimi"
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:977
+#: ../libpurple/protocols/irc/irc.c:985
 msgid "Use SSL"
 msgstr "Käytä SSL:ää"
 
-#: ../libpurple/protocols/irc/msgs.c:187
+#: ../libpurple/protocols/irc/msgs.c:189
 msgid "Bad mode"
 msgstr "Väärä tila"
 
-#: ../libpurple/protocols/irc/msgs.c:198
+#: ../libpurple/protocols/irc/msgs.c:200
 #, c-format
 msgid "You are banned from %s."
 msgstr "Sinut on kielletty kanavalta %s."
 
-#: ../libpurple/protocols/irc/msgs.c:199
+#: ../libpurple/protocols/irc/msgs.c:201
 msgid "Banned"
 msgstr "Kielletty"
 
-#: ../libpurple/protocols/irc/msgs.c:216
+#: ../libpurple/protocols/irc/msgs.c:218
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Käyttäjää %s ei voi estää: estolista on täynnä"
 
-#: ../libpurple/protocols/irc/msgs.c:301
+#: ../libpurple/protocols/irc/msgs.c:303
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:302
+#: ../libpurple/protocols/irc/msgs.c:304
 msgid " <i>(identified)</i>"
 msgstr "<i>(tunnistettu)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/irc/msgs.c:305
+#: ../libpurple/protocols/oscar/oscar.c:3733
 #: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Kutsumanimi"
 
-#: ../libpurple/protocols/irc/msgs.c:329
+#: ../libpurple/protocols/irc/msgs.c:331
 #: ../libpurple/protocols/silc/ops.c:1268
 #: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Tällä hetkellä"
 
-#: ../libpurple/protocols/irc/msgs.c:334
+#: ../libpurple/protocols/irc/msgs.c:336
 msgid "Idle for"
 msgstr "Jouten "
 
-#: ../libpurple/protocols/irc/msgs.c:337
+#: ../libpurple/protocols/irc/msgs.c:339
 msgid "Online since"
 msgstr "Linjoilla"
 
-#: ../libpurple/protocols/irc/msgs.c:341
+#: ../libpurple/protocols/irc/msgs.c:343
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Kuvaava adjektiivi:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:341
+#: ../libpurple/protocols/irc/msgs.c:343
 msgid "Glorious"
 msgstr "Loistokas"
 
-#: ../libpurple/protocols/irc/msgs.c:420
+#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s on vaihtanut aiheeksi: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:422
+#: ../libpurple/protocols/irc/msgs.c:424
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s on poistanut aiheen."
 
-#: ../libpurple/protocols/irc/msgs.c:430
+#: ../libpurple/protocols/irc/msgs.c:432
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s:n aihe on: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:448
+#: ../libpurple/protocols/irc/msgs.c:450
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Tuntematon viesti \"%s\""
 
-#: ../libpurple/protocols/irc/msgs.c:449
+#: ../libpurple/protocols/irc/msgs.c:451
 msgid "Unknown message"
 msgstr "Tuntematon viesti"
 
-#: ../libpurple/protocols/irc/msgs.c:449
+#: ../libpurple/protocols/irc/msgs.c:451
 msgid "The IRC server received a message it did not understand."
 msgstr "IRC-palvelin vastaanotti viestin jota se ei ymmärtänyt."
 
-#: ../libpurple/protocols/irc/msgs.c:470
+#: ../libpurple/protocols/irc/msgs.c:472
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Käyttäjät %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:575
+#: ../libpurple/protocols/irc/msgs.c:577
 msgid "Time Response"
 msgstr "Vastaus time-komentoon "
 
-#: ../libpurple/protocols/irc/msgs.c:576
+#: ../libpurple/protocols/irc/msgs.c:578
 msgid "The IRC server's local time is:"
 msgstr "IRC palvelimen paikallinen aika:"
 
-#: ../libpurple/protocols/irc/msgs.c:587
+#: ../libpurple/protocols/irc/msgs.c:589
 msgid "No such channel"
 msgstr "Kanavaa ei ole"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:598
+#: ../libpurple/protocols/irc/msgs.c:600
 msgid "no such channel"
 msgstr "kanavaa ei ole"
 
-#: ../libpurple/protocols/irc/msgs.c:601
+#: ../libpurple/protocols/irc/msgs.c:603
 msgid "User is not logged in"
 msgstr "Käyttäjä ei ole kirjautuneena sisään"
 
-#: ../libpurple/protocols/irc/msgs.c:606
+#: ../libpurple/protocols/irc/msgs.c:608
 msgid "No such nick or channel"
 msgstr "Kutsumanimeä/kanavaa ei ole olemassa"
 
-#: ../libpurple/protocols/irc/msgs.c:626
+#: ../libpurple/protocols/irc/msgs.c:628
 msgid "Could not send"
 msgstr "Lähettäminen ei onnistu"
 
-#: ../libpurple/protocols/irc/msgs.c:682
+#: ../libpurple/protocols/irc/msgs.c:684
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Liittyminen kanavalle %s vaatii kutsun."
 
-#: ../libpurple/protocols/irc/msgs.c:683
+#: ../libpurple/protocols/irc/msgs.c:685
 msgid "Invitation only"
 msgstr "Vain kutsu"
 
-#: ../libpurple/protocols/irc/msgs.c:798
+#: ../libpurple/protocols/irc/msgs.c:801
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s on poistanut sinut kanavalta: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:803 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:806 ../libpurple/protocols/silc/ops.c:699
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s potkaisi (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:826
+#: ../libpurple/protocols/irc/msgs.c:829
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "moodin (%s %s) asetti %s"
 
-#: ../libpurple/protocols/irc/msgs.c:911 ../libpurple/protocols/irc/msgs.c:912
+#: ../libpurple/protocols/irc/msgs.c:914 ../libpurple/protocols/irc/msgs.c:915
 msgid "Invalid nickname"
 msgstr "Virheellinen lempinimi"
 
-#: ../libpurple/protocols/irc/msgs.c:913
+#: ../libpurple/protocols/irc/msgs.c:916
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4489,7 +4675,7 @@ msgstr ""
 "Palvelin hylkäsi valitsemasi kutsumanimen. Siinä on todennäköisesti "
 "kiellettyjä merkkejä."
 
-#: ../libpurple/protocols/irc/msgs.c:918
+#: ../libpurple/protocols/irc/msgs.c:921
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4497,44 +4683,44 @@ msgstr ""
 "Palvelin hylkäsi valitsemasi tilinimen. Siinä on todennäköisesti kiellettyjä "
 "merkkejä."
 
-#: ../libpurple/protocols/irc/msgs.c:957
+#: ../libpurple/protocols/irc/msgs.c:960
 msgid "Cannot change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../libpurple/protocols/irc/msgs.c:957
+#: ../libpurple/protocols/irc/msgs.c:960
 msgid "Could not change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../libpurple/protocols/irc/msgs.c:978
+#: ../libpurple/protocols/irc/msgs.c:981
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Olet poistunut kanavalta %s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1020
+#: ../libpurple/protocols/irc/msgs.c:1023
 msgid "Error: invalid PONG from server"
 msgstr "Virhe: epäkelpo PONG palvelimelta"
 
-#: ../libpurple/protocols/irc/msgs.c:1022
+#: ../libpurple/protocols/irc/msgs.c:1025
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING vastaus -- Viive: %lu sekuntia"
 
-#: ../libpurple/protocols/irc/msgs.c:1113
+#: ../libpurple/protocols/irc/msgs.c:1116
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Kohteeseen %s ei voi liittyä: vaatii rekisteröinnin."
 
-#: ../libpurple/protocols/irc/msgs.c:1114
+#: ../libpurple/protocols/irc/msgs.c:1117
 #: ../libpurple/protocols/silc/ops.c:1093
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Kanavalle ei voi liittyä"
 
-#: ../libpurple/protocols/irc/msgs.c:1148
+#: ../libpurple/protocols/irc/msgs.c:1151
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Kutsumanimi tai kanava ei tilapäisesti ole käytössä."
 
-#: ../libpurple/protocols/irc/msgs.c:1160
+#: ../libpurple/protocols/irc/msgs.c:1163
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops %s:ltä"
@@ -4642,7 +4828,7 @@ msgstr "names [kanava]: Listaa kanavalla
 msgstr "names [kanava]: Listaa kanavalla olevat käyttäjät."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2321
+#: ../libpurple/protocols/jabber/jabber.c:2348
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;uusi nimi&gt;: Muuta nimesi."
 
@@ -4651,6 +4837,10 @@ msgstr "nickserv: Lähetä komento nicks
 msgstr "nickserv: Lähetä komento nickserv:lle"
 
 #: ../libpurple/protocols/irc/parse.c:139
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr "notice &lt;kohde&gt;: Lähetä ilmoitus käyttäjälle tai kanavalle."
+
+#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -4658,7 +4848,7 @@ msgstr ""
 "op &lt;nimi1&gt; [nimi2] ...: Anna kanavaoperaattorin status jollekulle. "
 "Sinun tulee olla kanavaoperaattori tehdäksesi näin."
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:141
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -4666,11 +4856,11 @@ msgstr ""
 "operwall &lt;viesti&gt;: Jos et tiedä mikä tämä on, sinun ei todennäköisesti "
 "tule käyttää tätä."
 
-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:142
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Lähetä komento operserv:lle"
 
-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -4678,7 +4868,7 @@ msgstr ""
 "part [huone] [viesti]: Poistu tämänhetkiseltä kanavalta tai tietyltä "
 "kanavalta valinnaisen viestin kanssa."
 
-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -4686,7 +4876,7 @@ msgstr ""
 "ping [nimi]: Kysyy kuinka paljon viivettä käyttäjällä(tai palvelimella jos "
 "ei käyttäjää annettu) on."
 
-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:145
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4694,15 +4884,15 @@ msgstr ""
 "query &lt;nimi&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle (kun "
 "olet kanavalla)."
 
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [viesti]: Katkaise yhteys palvelimelle + valinnainen viesti."
 
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:147
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]: Lähetä \"raaka\" komento palvelimelle."
 
-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:148
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -4710,23 +4900,23 @@ msgstr ""
 "remove &lt;nimi&gt; [viesti]: Poista joku huoneesta. Sinun tulee olla "
 "kanavaoperaattori tehdäksesi näin."
 
-#: ../libpurple/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Näyttää paikallisen ajan IRC palvelimella."
 
-#: ../libpurple/protocols/irc/parse.c:149
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [uusi aihe]: Näytä tai vaihda kanavan aihetta."
 
-#: ../libpurple/protocols/irc/parse.c:150
+#: ../libpurple/protocols/irc/parse.c:151
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;nimi1&gt; [nimi2] ...: Aseta tai poista käyttäjän tila."
 
-#: ../libpurple/protocols/irc/parse.c:151
+#: ../libpurple/protocols/irc/parse.c:152
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [nimi]: lähetä CTCP VERSION -pyyntö käyttäjälle"
 
-#: ../libpurple/protocols/irc/parse.c:152
+#: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -4734,7 +4924,7 @@ msgstr ""
 "voice &lt;nimi1&gt; [nimi2] ...: Aseta kanavan ääni-tila jollekulle. Sinun "
 "tulee olla kanavaoperaattori tehdäksesi näin."
 
-#: ../libpurple/protocols/irc/parse.c:153
+#: ../libpurple/protocols/irc/parse.c:154
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -4742,38 +4932,38 @@ msgstr ""
 "wallops &lt;viesti&gt;: Jos et tiedä mikä tämä on, sinun ei todennäköisesti "
 "tulee käyttää sitä."
 
-#: ../libpurple/protocols/irc/parse.c:154
+#: ../libpurple/protocols/irc/parse.c:155
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [palvelin] &lt;nimi&gt;: Hae tietoja käyttäjästä."
 
-#: ../libpurple/protocols/irc/parse.c:155
+#: ../libpurple/protocols/irc/parse.c:156
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr "whowas &lt;nimi&gt;: Hae tietoja käyttäjästä joka on kirjautunut ulos."
 
-#: ../libpurple/protocols/irc/parse.c:520
+#: ../libpurple/protocols/irc/parse.c:521
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Vastausaika %s:ltä: %lu sekuntia"
 
-#: ../libpurple/protocols/irc/parse.c:521
+#: ../libpurple/protocols/irc/parse.c:522
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:521
+#: ../libpurple/protocols/irc/parse.c:522
 msgid "CTCP PING reply"
 msgstr "CTCP PING:n vastaus"
 
-#: ../libpurple/protocols/irc/parse.c:633
-#: ../libpurple/protocols/irc/parse.c:640 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:634
+#: ../libpurple/protocols/irc/parse.c:641 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Yhteys katkennut."
 
 #: ../libpurple/protocols/jabber/adhoccommands.c:143
-#: ../libpurple/protocols/jabber/jabber.c:698
-#: ../libpurple/protocols/jabber/jabber.c:728
-#: ../libpurple/protocols/jabber/jabber.c:1901
+#: ../libpurple/protocols/jabber/jabber.c:725
+#: ../libpurple/protocols/jabber/jabber.c:755
+#: ../libpurple/protocols/jabber/jabber.c:1932
 msgid "Unknown Error"
 msgstr "Tuntematon virhe"
 
@@ -4796,7 +4986,7 @@ msgstr ""
 "Palvelin vaatii salaamattoman tunnistautumisen salaamattoman yhteyden yli"
 
 #: ../libpurple/protocols/jabber/auth.c:323
-#: ../libpurple/protocols/jabber/auth.c:518
+#: ../libpurple/protocols/jabber/auth.c:526
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4807,30 +4997,29 @@ msgstr ""
 
 #: ../libpurple/protocols/jabber/auth.c:325
 #: ../libpurple/protocols/jabber/auth.c:326
-#: ../libpurple/protocols/jabber/auth.c:520
-#: ../libpurple/protocols/jabber/auth.c:521
-#: ../libpurple/protocols/jabber/auth.c:614
-#: ../libpurple/protocols/jabber/auth.c:615
+#: ../libpurple/protocols/jabber/auth.c:528
+#: ../libpurple/protocols/jabber/auth.c:529
+#: ../libpurple/protocols/jabber/auth.c:720
+#: ../libpurple/protocols/jabber/auth.c:721
 msgid "Plaintext Authentication"
 msgstr "Tekstipohjainen tunnistus"
 
-#: ../libpurple/protocols/jabber/auth.c:340
-#: ../libpurple/protocols/jabber/auth.c:534
-#: ../libpurple/protocols/jabber/auth.c:627
-msgid "Server does not use any supported authentication method"
-msgstr "Palvelin ei käytä mitään tuetuista tunnistautumismenetelmistä"
-
-#: ../libpurple/protocols/jabber/auth.c:472
-#: ../libpurple/protocols/jabber/auth.c:576
-#: ../libpurple/protocols/jabber/auth.c:795
-#: ../libpurple/protocols/jabber/auth.c:944
-#: ../libpurple/protocols/jabber/auth.c:971
-#: ../libpurple/protocols/jabber/auth.c:993
+#: ../libpurple/protocols/jabber/auth.c:480
+#: ../libpurple/protocols/jabber/auth.c:653
+#: ../libpurple/protocols/jabber/auth.c:901
+#: ../libpurple/protocols/jabber/auth.c:1050
+#: ../libpurple/protocols/jabber/auth.c:1077
+#: ../libpurple/protocols/jabber/auth.c:1101
 #: ../libpurple/protocols/jabber/jabber.c:127
 msgid "Invalid response from server."
 msgstr "Kelvoton vastaus palvelimelta."
 
-#: ../libpurple/protocols/jabber/auth.c:616
+#: ../libpurple/protocols/jabber/auth.c:542
+#: ../libpurple/protocols/jabber/auth.c:733
+msgid "Server does not use any supported authentication method"
+msgstr "Palvelin ei käytä mitään tuetuista tunnistautumismenetelmistä"
+
+#: ../libpurple/protocols/jabber/auth.c:722
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4838,115 +5027,115 @@ msgstr ""
 "Tämä palvelin vaatii tekstipohjaisen tunnistautumisen salaamattoman yhteyden "
 "yli. Sallitaanko tämä ja jatketaan?"
 
-#: ../libpurple/protocols/jabber/auth.c:818
-#: ../libpurple/protocols/jabber/auth.c:843
+#: ../libpurple/protocols/jabber/auth.c:924
+#: ../libpurple/protocols/jabber/auth.c:949
 msgid "Invalid challenge from server"
 msgstr "Virheellinen tunnistushaaste palvelimelta"
 
-#: ../libpurple/protocols/jabber/auth.c:917
+#: ../libpurple/protocols/jabber/auth.c:1023
 msgid "SASL error"
 msgstr "SASL-virhe"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:1219
-#: ../libpurple/protocols/sametime/sametime.c:4174
+#: ../libpurple/protocols/jabber/buddy.c:1223
+#: ../libpurple/protocols/sametime/sametime.c:4182
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Koko nimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:1231
+#: ../libpurple/protocols/jabber/buddy.c:1235
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Sukunimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:1234
+#: ../libpurple/protocols/jabber/buddy.c:1238
 msgid "Given Name"
 msgstr "Etunimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:1004
+#: ../libpurple/protocols/jabber/jabber.c:1024
 msgid "URL"
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:1282
+#: ../libpurple/protocols/jabber/buddy.c:1286
 msgid "Street Address"
 msgstr "Katuosoite"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:1279
+#: ../libpurple/protocols/jabber/buddy.c:1283
 msgid "Extended Address"
 msgstr "Laajennettu osoite"
 
 #: ../libpurple/protocols/jabber/buddy.c:290
-#: ../libpurple/protocols/jabber/buddy.c:1285
+#: ../libpurple/protocols/jabber/buddy.c:1289
 msgid "Locality"
 msgstr "Alue"
 
 #: ../libpurple/protocols/jabber/buddy.c:291
-#: ../libpurple/protocols/jabber/buddy.c:1288
+#: ../libpurple/protocols/jabber/buddy.c:1292
 msgid "Region"
 msgstr "Seutu"
 
 #: ../libpurple/protocols/jabber/buddy.c:292
-#: ../libpurple/protocols/jabber/buddy.c:1291
+#: ../libpurple/protocols/jabber/buddy.c:1295
 msgid "Postal Code"
 msgstr "Postinumero"
 
 #: ../libpurple/protocols/jabber/buddy.c:293
-#: ../libpurple/protocols/jabber/buddy.c:1295
+#: ../libpurple/protocols/jabber/buddy.c:1299
 #: ../libpurple/protocols/silc/silc.c:1158
-#: ../libpurple/protocols/silc10/silc.c:926
+#: ../libpurple/protocols/silc10/silc.c:932
 msgid "Country"
 msgstr "Maa"
 
 #: ../libpurple/protocols/jabber/buddy.c:294
-#: ../libpurple/protocols/jabber/buddy.c:1306
-#: ../libpurple/protocols/jabber/buddy.c:1313
+#: ../libpurple/protocols/jabber/buddy.c:1310
+#: ../libpurple/protocols/jabber/buddy.c:1317
 msgid "Telephone"
 msgstr "Puhelin"
 
 #: ../libpurple/protocols/jabber/buddy.c:296
-#: ../libpurple/protocols/jabber/buddy.c:1350
+#: ../libpurple/protocols/jabber/buddy.c:1354
 msgid "Organization Name"
 msgstr "Organisaation nimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:297
-#: ../libpurple/protocols/jabber/buddy.c:1353
+#: ../libpurple/protocols/jabber/buddy.c:1357
 msgid "Organization Unit"
 msgstr "Organisaatioyksikkö"
 
 #: ../libpurple/protocols/jabber/buddy.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1362
+#: ../libpurple/protocols/jabber/buddy.c:1366
 msgid "Role"
 msgstr "Asema"
 
 #: ../libpurple/protocols/jabber/buddy.c:300
-#: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1806
-#: ../libpurple/protocols/msnp9/msn.c:1659
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/jabber/buddy.c:1254
+#: ../libpurple/protocols/msn/msn.c:1814
+#: ../libpurple/protocols/msnp9/msn.c:1670
+#: ../libpurple/protocols/oscar/oscar.c:3782
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
 #: ../libpurple/protocols/jabber/buddy.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/buddy.c:1369
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3350
-#: ../pidgin/gtkprefs.c:740
+#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3309
+#: ../pidgin/gtkprefs.c:688
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../libpurple/protocols/jabber/buddy.c:722
-#: ../libpurple/protocols/jabber/buddy.c:723
+#: ../libpurple/protocols/jabber/buddy.c:724
+#: ../libpurple/protocols/jabber/buddy.c:725
 msgid "Edit XMPP vCard"
 msgstr "Muokkaa XMPP-vCardia"
 
-#: ../libpurple/protocols/jabber/buddy.c:724
+#: ../libpurple/protocols/jabber/buddy.c:726
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4954,224 +5143,224 @@ msgstr ""
 "Kaikki alla olevat kentät ovat valinnaisia. Kirjoita vain tiedot, joiden "
 "luovuttamista pidät sopivana."
 
-#: ../libpurple/protocols/jabber/buddy.c:795
-#: ../libpurple/protocols/jabber/buddy.c:960
+#: ../libpurple/protocols/jabber/buddy.c:797
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Client"
 msgstr "Asiakasohjelma"
 
-#: ../libpurple/protocols/jabber/buddy.c:799
-#: ../libpurple/protocols/jabber/buddy.c:964
+#: ../libpurple/protocols/jabber/buddy.c:801
+#: ../libpurple/protocols/jabber/buddy.c:966
 msgid "Operating System"
 msgstr "Käyttöjärjestelmä"
 
-#: ../libpurple/protocols/jabber/buddy.c:815
-#: ../libpurple/protocols/jabber/buddy.c:975
+#: ../libpurple/protocols/jabber/buddy.c:817
+#: ../libpurple/protocols/jabber/buddy.c:977
 msgid "Last Activity"
 msgstr "Viimeisin aktiivisena olo"
 
-#: ../libpurple/protocols/jabber/buddy.c:817
-#: ../libpurple/protocols/jabber/buddy.c:977
+#: ../libpurple/protocols/jabber/buddy.c:819
+#: ../libpurple/protocols/jabber/buddy.c:979
 msgid "Service Discovery Info"
 msgstr "Palvelulöytötiedot"
 
-#: ../libpurple/protocols/jabber/buddy.c:819
-#: ../libpurple/protocols/jabber/buddy.c:979
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:981
 msgid "Service Discovery Items"
 msgstr "Palvelulöytökohteet"
 
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:981
+#: ../libpurple/protocols/jabber/buddy.c:823
+#: ../libpurple/protocols/jabber/buddy.c:983
 msgid "Extended Stanza Addressing"
 msgstr "Laajennettu raakalohko-osoitus"
 
-#: ../libpurple/protocols/jabber/buddy.c:823
-#: ../libpurple/protocols/jabber/buddy.c:983
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:985
 msgid "Multi-User Chat"
 msgstr "Monen käyttäjän keskustelu"
 
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/jabber/buddy.c:985
+#: ../libpurple/protocols/jabber/buddy.c:827
+#: ../libpurple/protocols/jabber/buddy.c:987
 msgid "Multi-User Chat Extended Presence Information"
 msgstr "Monen käyttäjän keskustelun laajennetut läsnäolotiedot"
 
-#: ../libpurple/protocols/jabber/buddy.c:827
-#: ../libpurple/protocols/jabber/buddy.c:987
+#: ../libpurple/protocols/jabber/buddy.c:829
+#: ../libpurple/protocols/jabber/buddy.c:989
 msgid "In-Band Bytestreams"
 msgstr "In-band-tavujonot"
 
-#: ../libpurple/protocols/jabber/buddy.c:829
-#: ../libpurple/protocols/jabber/buddy.c:989
+#: ../libpurple/protocols/jabber/buddy.c:831
+#: ../libpurple/protocols/jabber/buddy.c:991
 msgid "Ad-Hoc Commands"
 msgstr "Ad-Hoc-komennot"
 
-#: ../libpurple/protocols/jabber/buddy.c:831
-#: ../libpurple/protocols/jabber/buddy.c:991
+#: ../libpurple/protocols/jabber/buddy.c:833
+#: ../libpurple/protocols/jabber/buddy.c:993
 msgid "PubSub Service"
 msgstr "PubSub-palvelu"
 
-#: ../libpurple/protocols/jabber/buddy.c:833
-#: ../libpurple/protocols/jabber/buddy.c:993
+#: ../libpurple/protocols/jabber/buddy.c:835
+#: ../libpurple/protocols/jabber/buddy.c:995
 msgid "SOCKS5 Bytestreams"
 msgstr "SOCKS5-tavujonot"
 
-#: ../libpurple/protocols/jabber/buddy.c:835
-#: ../libpurple/protocols/jabber/buddy.c:995
+#: ../libpurple/protocols/jabber/buddy.c:837
+#: ../libpurple/protocols/jabber/buddy.c:997
 msgid "Out of Band Data"
 msgstr "Out of band -tiedot"
 
-#: ../libpurple/protocols/jabber/buddy.c:837
-#: ../libpurple/protocols/jabber/buddy.c:997
+#: ../libpurple/protocols/jabber/buddy.c:839
+#: ../libpurple/protocols/jabber/buddy.c:999
 msgid "XHTML-IM"
 msgstr "XHTML-IM"
 
-#: ../libpurple/protocols/jabber/buddy.c:839
-#: ../libpurple/protocols/jabber/buddy.c:999
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:1001
 msgid "In-Band Registration"
 msgstr "Rekisteröinti \"in-band\""
 
-#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/buddy.c:1001
+#: ../libpurple/protocols/jabber/buddy.c:843
+#: ../libpurple/protocols/jabber/buddy.c:1003
 msgid "User Location"
 msgstr "Käyttäjän sijainti"
 
-#: ../libpurple/protocols/jabber/buddy.c:843
-#: ../libpurple/protocols/jabber/buddy.c:1003
+#: ../libpurple/protocols/jabber/buddy.c:845
+#: ../libpurple/protocols/jabber/buddy.c:1005
 msgid "User Avatar"
 msgstr "Käyttäjän hahmo"
 
-#: ../libpurple/protocols/jabber/buddy.c:845
-#: ../libpurple/protocols/jabber/buddy.c:1005
+#: ../libpurple/protocols/jabber/buddy.c:847
+#: ../libpurple/protocols/jabber/buddy.c:1007
 msgid "Chat State Notifications"
 msgstr "Keskustelun tilan ilmoitukset"
 
-#: ../libpurple/protocols/jabber/buddy.c:847
-#: ../libpurple/protocols/jabber/buddy.c:1007
+#: ../libpurple/protocols/jabber/buddy.c:849
+#: ../libpurple/protocols/jabber/buddy.c:1009
 msgid "Software Version"
 msgstr "Ohjelmistoversio"
 
-#: ../libpurple/protocols/jabber/buddy.c:849
-#: ../libpurple/protocols/jabber/buddy.c:1009
+#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:1011
 msgid "Stream Initiation"
 msgstr "Virtauksen alustus"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
-#: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3277
+#: ../libpurple/protocols/jabber/buddy.c:853
+#: ../libpurple/protocols/jabber/buddy.c:1013
+#: ../libpurple/protocols/sametime/sametime.c:3285
 msgid "File Transfer"
 msgstr "Tiedostonsiirto"
 
-#: ../libpurple/protocols/jabber/buddy.c:853
-#: ../libpurple/protocols/jabber/buddy.c:1013
+#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:1015
 msgid "User Mood"
 msgstr "Käyttäjän mieliala"
 
-#: ../libpurple/protocols/jabber/buddy.c:855
-#: ../libpurple/protocols/jabber/buddy.c:1015
+#: ../libpurple/protocols/jabber/buddy.c:857
+#: ../libpurple/protocols/jabber/buddy.c:1017
 msgid "User Activity"
 msgstr "Käyttäjän aktiivisuus"
 
-#: ../libpurple/protocols/jabber/buddy.c:857
-#: ../libpurple/protocols/jabber/buddy.c:1017
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:1019
 msgid "Entity Capabilities"
 msgstr "Entiteetin ominaisuudet"
 
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/jabber/buddy.c:1019
+#: ../libpurple/protocols/jabber/buddy.c:861
+#: ../libpurple/protocols/jabber/buddy.c:1021
 msgid "Encrypted Session Negotiations"
 msgstr "Salatut istuntojen neuvottelut"
 
-#: ../libpurple/protocols/jabber/buddy.c:861
-#: ../libpurple/protocols/jabber/buddy.c:1021
+#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:1023
 msgid "User Tune"
 msgstr "Käyttäjänimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:863
-#: ../libpurple/protocols/jabber/buddy.c:1023
+#: ../libpurple/protocols/jabber/buddy.c:865
+#: ../libpurple/protocols/jabber/buddy.c:1025
 msgid "Roster Item Exchange"
 msgstr "Tuttavaluetteloiden vaihto"
 
-#: ../libpurple/protocols/jabber/buddy.c:865
-#: ../libpurple/protocols/jabber/buddy.c:1025
+#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:1027
 msgid "Reachability Address"
 msgstr "Tavoitettavuusosoite"
 
-#: ../libpurple/protocols/jabber/buddy.c:867
-#: ../libpurple/protocols/jabber/buddy.c:1027
+#: ../libpurple/protocols/jabber/buddy.c:869
+#: ../libpurple/protocols/jabber/buddy.c:1029
 msgid "User Profile"
 msgstr "Käyttäjän profiili"
 
-#: ../libpurple/protocols/jabber/buddy.c:869
-#: ../libpurple/protocols/jabber/buddy.c:1029
+#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:1031
 msgid "Jingle"
 msgstr "Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:871
-#: ../libpurple/protocols/jabber/buddy.c:1031
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:1033
 msgid "Jingle Audio"
 msgstr "Jingle-ääni"
 
-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/jabber/buddy.c:1033
+#: ../libpurple/protocols/jabber/buddy.c:875
+#: ../libpurple/protocols/jabber/buddy.c:1035
 msgid "User Nickname"
 msgstr "Käyttäjän kutsumanimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:875
-#: ../libpurple/protocols/jabber/buddy.c:1035
+#: ../libpurple/protocols/jabber/buddy.c:877
+#: ../libpurple/protocols/jabber/buddy.c:1037
 msgid "Jingle ICE UDP"
 msgstr "Jingle ICE UDP"
 
-#: ../libpurple/protocols/jabber/buddy.c:877
-#: ../libpurple/protocols/jabber/buddy.c:1037
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/buddy.c:1039
 msgid "Jingle ICE TCP"
 msgstr "Jingle ICE TCP"
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/buddy.c:1039
+#: ../libpurple/protocols/jabber/buddy.c:881
+#: ../libpurple/protocols/jabber/buddy.c:1041
 msgid "Jingle Raw UDP"
 msgstr "Jingle raaka-UDP"
 
-#: ../libpurple/protocols/jabber/buddy.c:881
-#: ../libpurple/protocols/jabber/buddy.c:1041
+#: ../libpurple/protocols/jabber/buddy.c:883
+#: ../libpurple/protocols/jabber/buddy.c:1043
 msgid "Jingle Video"
 msgstr "Jingle-video"
 
-#: ../libpurple/protocols/jabber/buddy.c:883
-#: ../libpurple/protocols/jabber/buddy.c:1043
+#: ../libpurple/protocols/jabber/buddy.c:885
+#: ../libpurple/protocols/jabber/buddy.c:1045
 msgid "Jingle DTMF"
 msgstr "Jingle DTMF"
 
-#: ../libpurple/protocols/jabber/buddy.c:885
-#: ../libpurple/protocols/jabber/buddy.c:1045
+#: ../libpurple/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:1047
 msgid "Message Receipts"
 msgstr "Viestikuittaukset"
 
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:1047
+#: ../libpurple/protocols/jabber/buddy.c:889
+#: ../libpurple/protocols/jabber/buddy.c:1049
 msgid "Public Key Publishing"
 msgstr "Julkisen avaimen julkaiseminen"
 
-#: ../libpurple/protocols/jabber/buddy.c:889
-#: ../libpurple/protocols/jabber/buddy.c:1049
+#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:1051
 msgid "User Chatting"
 msgstr "Käyttäjä keskustelee"
 
-#: ../libpurple/protocols/jabber/buddy.c:891
-#: ../libpurple/protocols/jabber/buddy.c:1051
+#: ../libpurple/protocols/jabber/buddy.c:893
+#: ../libpurple/protocols/jabber/buddy.c:1053
 msgid "User Browsing"
 msgstr "Käyttäjä selaa"
 
-#: ../libpurple/protocols/jabber/buddy.c:893
-#: ../libpurple/protocols/jabber/buddy.c:1053
+#: ../libpurple/protocols/jabber/buddy.c:895
+#: ../libpurple/protocols/jabber/buddy.c:1055
 msgid "User Gaming"
 msgstr "Käyttäjä pelaa"
 
-#: ../libpurple/protocols/jabber/buddy.c:895
-#: ../libpurple/protocols/jabber/buddy.c:1055
+#: ../libpurple/protocols/jabber/buddy.c:897
+#: ../libpurple/protocols/jabber/buddy.c:1057
 msgid "User Viewing"
 msgstr "Käyttäjä katselee"
 
-#: ../libpurple/protocols/jabber/buddy.c:897
-#: ../libpurple/protocols/jabber/buddy.c:1057
+#: ../libpurple/protocols/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1059
 #: ../libpurple/protocols/silc/ops.c:1600
 #: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1612
@@ -5179,161 +5368,160 @@ msgstr "Ping"
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/jabber/buddy.c:899
-#: ../libpurple/protocols/jabber/buddy.c:1059
+#: ../libpurple/protocols/jabber/buddy.c:901
+#: ../libpurple/protocols/jabber/buddy.c:1061
 msgid "Stanza Encryption"
 msgstr "Raakalohkojen salaus"
 
-#: ../libpurple/protocols/jabber/buddy.c:901
-#: ../libpurple/protocols/jabber/buddy.c:1061
+#: ../libpurple/protocols/jabber/buddy.c:903
+#: ../libpurple/protocols/jabber/buddy.c:1063
 msgid "Entity Time"
 msgstr "Entiteetin aika"
 
-#: ../libpurple/protocols/jabber/buddy.c:903
-#: ../libpurple/protocols/jabber/buddy.c:1063
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:1065
 msgid "Delayed Delivery"
 msgstr "Viivästetty toimitus"
 
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:1065
+#: ../libpurple/protocols/jabber/buddy.c:907
+#: ../libpurple/protocols/jabber/buddy.c:1067
 msgid "Collaborative Data Objects"
 msgstr "Yhteistyötä tekevät dataobjektit"
 
-#: ../libpurple/protocols/jabber/buddy.c:907
-#: ../libpurple/protocols/jabber/buddy.c:1067
+#: ../libpurple/protocols/jabber/buddy.c:909
+#: ../libpurple/protocols/jabber/buddy.c:1069
 msgid "File Repository and Sharing"
 msgstr "Tiedostovarasto ja jakaminen"
 
-#: ../libpurple/protocols/jabber/buddy.c:909
-#: ../libpurple/protocols/jabber/buddy.c:1069
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:1071
 msgid "STUN Service Discovery for Jingle"
 msgstr "STUN-palvelun löytäminen Jinglelle"
 
-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/jabber/buddy.c:1071
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1073
 msgid "Simplified Encrypted Session Negotiation"
 msgstr "Yksinkertaistettu salatun istunnon neuvottelu"
 
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1073
+#: ../libpurple/protocols/jabber/buddy.c:915
+#: ../libpurple/protocols/jabber/buddy.c:1075
 msgid "Hop Check"
 msgstr "Hyppytarkistus"
 
-#: ../libpurple/protocols/jabber/buddy.c:921
-#: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2916
+#: ../libpurple/protocols/jabber/buddy.c:923
+#: ../libpurple/protocols/jabber/buddy.c:1083
+#: ../libpurple/protocols/oscar/oscar.c:2967
 msgid "Capabilities"
 msgstr "Kyvyt"
 
-#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/buddy.c:935
 #: ../libpurple/protocols/jabber/libxmpp.c:209
-#: ../libpurple/protocols/jabber/si.c:859
+#: ../libpurple/protocols/jabber/si.c:1094
 msgid "Resource"
 msgstr "Sijainti"
 
-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1569
-#: ../libpurple/protocols/jabber/jabber.c:1583
-#: ../libpurple/protocols/jabber/jabber.c:1597
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1625
+#: ../libpurple/protocols/jabber/buddy.c:937
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1614
+#: ../libpurple/protocols/jabber/jabber.c:1628
+#: ../libpurple/protocols/jabber/jabber.c:1642
+#: ../libpurple/protocols/jabber/jabber.c:1656
 msgid "Priority"
 msgstr "Tärkeys"
 
-#: ../libpurple/protocols/jabber/buddy.c:1237
+#: ../libpurple/protocols/jabber/buddy.c:1241
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
-#: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:979
-#: ../libpurple/protocols/oscar/oscar.c:3798
-#: ../libpurple/protocols/oscar/oscar.c:3811
+#: ../libpurple/protocols/jabber/buddy.c:1274
+#: ../libpurple/protocols/jabber/jabber.c:1004
+#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/oscar/oscar.c:3834
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Osoite"
 
-#: ../libpurple/protocols/jabber/buddy.c:1276
+#: ../libpurple/protocols/jabber/buddy.c:1280
 msgid "P.O. Box"
 msgstr "Postilokero"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "Photo"
 msgstr "Valokuva"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1945
+#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Un-hide From"
 msgstr "\"Tule esiin\""
 
-#: ../libpurple/protocols/jabber/buddy.c:1949
+#: ../libpurple/protocols/jabber/buddy.c:1953
 msgid "Temporarily Hide From"
 msgstr "Piiloudu väliaikaisesti tuttavalta"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1957
+#: ../libpurple/protocols/jabber/buddy.c:1961
 msgid "Cancel Presence Notification"
 msgstr "Peru paikallaoloilmoitus"
 
-#: ../libpurple/protocols/jabber/buddy.c:1964
+#: ../libpurple/protocols/jabber/buddy.c:1968
 msgid "(Re-)Request authorization"
 msgstr "Pyydä valtuutusta uudelleen"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1973
+#: ../libpurple/protocols/jabber/buddy.c:1977
 msgid "Unsubscribe"
 msgstr "Poista listalta"
 
-#: ../libpurple/protocols/jabber/buddy.c:1988
+#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Log In"
 msgstr "Kirjaudu sisään"
 
-#: ../libpurple/protocols/jabber/buddy.c:1992
+#: ../libpurple/protocols/jabber/buddy.c:1996
 msgid "Log Out"
 msgstr "Kirjaudu ulos"
 
-#: ../libpurple/protocols/jabber/buddy.c:2038
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/buddy.c:2042
+#: ../libpurple/protocols/jabber/jabber.c:1613
 msgid "Chatty"
 msgstr "Juttelutuulella"
 
-#: ../libpurple/protocols/jabber/buddy.c:2042
+#: ../libpurple/protocols/jabber/buddy.c:2046
 msgid "Extended Away"
 msgstr "Pidennetty poissaolo"
 
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5858
-#: ../libpurple/protocols/sametime/sametime.c:3339
-#, c-format
+#: ../libpurple/protocols/jabber/buddy.c:2048
+#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:726
+#: ../libpurple/protocols/oscar/oscar.c:5911
+#: ../libpurple/protocols/sametime/sametime.c:3347
 msgid "Do Not Disturb"
 msgstr "Älä häiritse"
 
-#: ../libpurple/protocols/jabber/buddy.c:2211
+#: ../libpurple/protocols/jabber/buddy.c:2215
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2215
-#: ../libpurple/protocols/jabber/buddy.c:2404
-#: ../libpurple/protocols/oscar/oscar.c:3721
+#: ../libpurple/protocols/jabber/buddy.c:2219
+#: ../libpurple/protocols/jabber/buddy.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:3744
 msgid "Last Name"
 msgstr "Sukunimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:2247
+#: ../libpurple/protocols/jabber/buddy.c:2251
 msgid "The following are the results of your search"
 msgstr "Hakutulokset"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2332
+#: ../libpurple/protocols/jabber/buddy.c:2336
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -5341,69 +5529,69 @@ msgstr ""
 "Etsi henkilöä syöttämällä hakukriteerit kenttiin. Huom: jokainen kenttä "
 "tukee jokerimerkkejä (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:2352
+#: ../libpurple/protocols/jabber/buddy.c:2356
 msgid "Directory Query Failed"
 msgstr "Hakemistohaku epäonnistui"
 
-#: ../libpurple/protocols/jabber/buddy.c:2353
+#: ../libpurple/protocols/jabber/buddy.c:2357
 msgid "Could not query the directory server."
 msgstr "Hakemistopalvelimelta ei voi hakea."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2387
+#: ../libpurple/protocols/jabber/buddy.c:2391
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Palvelimen ohjeet: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2394
+#: ../libpurple/protocols/jabber/buddy.c:2398
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Täytä yksi tai useampia kentistä etsiäksesi XMPP-käyttäjiä."
 
-#: ../libpurple/protocols/jabber/buddy.c:2414
+#: ../libpurple/protocols/jabber/buddy.c:2418
 #: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:3724
-#: ../libpurple/protocols/oscar/oscar.c:3733
+#: ../libpurple/protocols/oscar/oscar.c:3747
+#: ../libpurple/protocols/oscar/oscar.c:3756
 msgid "E-Mail Address"
 msgstr "Sähköpostiosoite"
 
-#: ../libpurple/protocols/jabber/buddy.c:2423
-#: ../libpurple/protocols/jabber/buddy.c:2424
+#: ../libpurple/protocols/jabber/buddy.c:2427
+#: ../libpurple/protocols/jabber/buddy.c:2428
 msgid "Search for XMPP users"
 msgstr "Etsi XMPP-käyttäjiä"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2425
+#: ../libpurple/protocols/jabber/buddy.c:2429
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5657
+#: ../libpurple/protocols/qq/sys_msg.c:177
+#: ../libpurple/protocols/qq/sys_msg.c:253
+#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/sametime/sametime.c:5665
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Etsi"
 
-#: ../libpurple/protocols/jabber/buddy.c:2440
+#: ../libpurple/protocols/jabber/buddy.c:2444
 msgid "Invalid Directory"
 msgstr "Virheellinen kansio"
 
-#: ../libpurple/protocols/jabber/buddy.c:2457
+#: ../libpurple/protocols/jabber/buddy.c:2461
 msgid "Enter a User Directory"
 msgstr "Syötä käyttäjähakemisto"
 
-#: ../libpurple/protocols/jabber/buddy.c:2458
+#: ../libpurple/protocols/jabber/buddy.c:2462
 msgid "Select a user directory to search"
 msgstr "Valitse käyttäjähakemisto, josta haetaan"
 
-#: ../libpurple/protocols/jabber/buddy.c:2461
+#: ../libpurple/protocols/jabber/buddy.c:2465
 msgid "Search Directory"
 msgstr "Etsi hakemistosta"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5342
-#: ../libpurple/protocols/yahoo/yahoochat.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:5391
+#: ../libpurple/protocols/yahoo/yahoochat.c:1057
 msgid "_Room:"
 msgstr "_Huone:"
 
@@ -5503,15 +5691,19 @@ msgstr "Virhe kirjoituksessa"
 msgid "Write error"
 msgstr "Virhe kirjoituksessa"
 
-#: ../libpurple/protocols/jabber/jabber.c:424
-#: ../libpurple/protocols/jabber/jabber.c:463
+#: ../libpurple/protocols/jabber/jabber.c:401
+msgid "Ping timeout"
+msgstr "Pingin aikakatkaisu"
+
+#: ../libpurple/protocols/jabber/jabber.c:448
+#: ../libpurple/protocols/jabber/jabber.c:488
 msgid "Read Error"
 msgstr "Virhe luettaessa"
 
-#: ../libpurple/protocols/jabber/jabber.c:500
+#: ../libpurple/protocols/jabber/jabber.c:525
 #: ../libpurple/protocols/oscar/flap_connection.c:398
-#: ../libpurple/protocols/yahoo/yahoo.c:2562
-#: ../libpurple/protocols/yahoo/yahoo.c:2594
+#: ../libpurple/protocols/yahoo/yahoo.c:2576
+#: ../libpurple/protocols/yahoo/yahoo.c:2608
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5520,194 +5712,194 @@ msgstr ""
 "Yhteyttä palvelimeen ei voi muodostaa:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:550
+#: ../libpurple/protocols/jabber/jabber.c:575
 msgid "Unable to create socket"
 msgstr "Pistokkeen luonti epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:598
-#: ../libpurple/protocols/jabber/jabber.c:1092
+#: ../libpurple/protocols/jabber/jabber.c:625
+#: ../libpurple/protocols/jabber/jabber.c:1110
 msgid "Invalid XMPP ID"
 msgstr "Epäkelpo XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:605
+#: ../libpurple/protocols/jabber/jabber.c:632
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Epäkelpo XMPP-ID. Verkkoalue pitää olla asetettu."
 
-#: ../libpurple/protocols/jabber/jabber.c:683
+#: ../libpurple/protocols/jabber/jabber.c:710
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s:n rekisteröinti onnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:689
+#: ../libpurple/protocols/jabber/jabber.c:716
 #, c-format
 msgid "Registration to %s successful"
 msgstr "Rekisteröinti kohteeseen %s onnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:691
-#: ../libpurple/protocols/jabber/jabber.c:692
+#: ../libpurple/protocols/jabber/jabber.c:718
+#: ../libpurple/protocols/jabber/jabber.c:719
 msgid "Registration Successful"
 msgstr "Rekisteröinti onnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:700
-#: ../libpurple/protocols/jabber/jabber.c:701
+#: ../libpurple/protocols/jabber/jabber.c:727
+#: ../libpurple/protocols/jabber/jabber.c:728
 msgid "Registration Failed"
 msgstr "Rekisteröinti epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:719
+#: ../libpurple/protocols/jabber/jabber.c:746
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr "Rekisteröinti kohteesta %s onnistuneesti poistettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:721
-#: ../libpurple/protocols/jabber/jabber.c:722
+#: ../libpurple/protocols/jabber/jabber.c:748
+#: ../libpurple/protocols/jabber/jabber.c:749
 msgid "Unregistration Successful"
 msgstr "Rekisteröinnin poisto onnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:730
-#: ../libpurple/protocols/jabber/jabber.c:731
+#: ../libpurple/protocols/jabber/jabber.c:757
+#: ../libpurple/protocols/jabber/jabber.c:758
 msgid "Unregistration Failed"
 msgstr "Rekisteröinnin poisto epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:891
-#: ../libpurple/protocols/jabber/jabber.c:892
+#: ../libpurple/protocols/jabber/jabber.c:924
+#: ../libpurple/protocols/jabber/jabber.c:925
 msgid "Already Registered"
 msgstr "Valmiiksi rekisteröity"
 
-#: ../libpurple/protocols/jabber/jabber.c:989
-#: ../libpurple/protocols/oscar/oscar.c:3800
-#: ../libpurple/protocols/oscar/oscar.c:3813
+#: ../libpurple/protocols/jabber/jabber.c:1012
+#: ../libpurple/protocols/oscar/oscar.c:3823
+#: ../libpurple/protocols/oscar/oscar.c:3836
 msgid "State"
 msgstr "Lääni"
 
-#: ../libpurple/protocols/jabber/jabber.c:994
+#: ../libpurple/protocols/jabber/jabber.c:1016
 msgid "Postal code"
 msgstr "Postinumero"
 
-#: ../libpurple/protocols/jabber/jabber.c:999
+#: ../libpurple/protocols/jabber/jabber.c:1020
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:915
 #: ../libpurple/protocols/silc/util.c:563
 #: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/silc.c:689
 #: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../libpurple/protocols/jabber/jabber.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1028
 msgid "Date"
 msgstr "Päiväys"
 
-#: ../libpurple/protocols/jabber/jabber.c:1014
+#: ../libpurple/protocols/jabber/jabber.c:1032
 msgid "Unregister"
 msgstr "Rekisteröinnin poisto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1021
+#: ../libpurple/protocols/jabber/jabber.c:1039
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr "Syötä alla olevat tiedot muuttaaksesi käyttäjätilin rekisteröimistä."
 
-#: ../libpurple/protocols/jabber/jabber.c:1024
+#: ../libpurple/protocols/jabber/jabber.c:1042
 msgid "Please fill out the information below to register your new account."
 msgstr "Syötä alla olevat tiedot rekisteröidäksesi uuden tilin."
 
-#: ../libpurple/protocols/jabber/jabber.c:1032
-#: ../libpurple/protocols/jabber/jabber.c:1033
+#: ../libpurple/protocols/jabber/jabber.c:1050
+#: ../libpurple/protocols/jabber/jabber.c:1051
 msgid "Register New XMPP Account"
 msgstr "Rekisteröi uusi XMPP-tili"
 
-#: ../libpurple/protocols/jabber/jabber.c:1034
-#: ../libpurple/protocols/jabber/jabber.c:1043
+#: ../libpurple/protocols/jabber/jabber.c:1052
+#: ../libpurple/protocols/jabber/jabber.c:1061
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1039
+#: ../libpurple/protocols/jabber/jabber.c:1057
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "Vaihda tilin rekisteröitymistä kohteessa %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1040
+#: ../libpurple/protocols/jabber/jabber.c:1058
 #, c-format
 msgid "Register New Account at %s"
 msgstr "Rekisteröi uusi tili kohteessa %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1043
+#: ../libpurple/protocols/jabber/jabber.c:1061
 msgid "Change Registration"
 msgstr "Muuta rekisteröitymistä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1151
-#: ../libpurple/protocols/jabber/jabber.c:1152
+#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1171
 msgid "Error unregistering account"
 msgstr "Virhe poistettaessa käyttäjätilin rekisteröitymistä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1157
-#: ../libpurple/protocols/jabber/jabber.c:1158
+#: ../libpurple/protocols/jabber/jabber.c:1176
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "Account successfully unregistered"
 msgstr "Käyttäjätilin rekisteröinti poistettiin onnistuneesti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1315
+#: ../libpurple/protocols/jabber/jabber.c:1340
 msgid "Initializing Stream"
 msgstr "Alustetaan datavirtaa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/jabber/jabber.c:1345
 msgid "Initializing SSL/TLS"
 msgstr "Alustetaan SSL/TLS-salausta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1324
+#: ../libpurple/protocols/jabber/jabber.c:1349
 #: ../libpurple/protocols/msn/session.c:408
-#: ../libpurple/protocols/msnp9/session.c:361
+#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: ../libpurple/protocols/jabber/jabber.c:1333
+#: ../libpurple/protocols/jabber/jabber.c:1358
 msgid "Re-initializing Stream"
 msgstr "Uudelleenalustetaan datavirtaa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1427
-#: ../libpurple/protocols/jabber/jabber.c:1879
-#: ../libpurple/protocols/jabber/jabber.c:1922
-#: ../libpurple/protocols/jabber/jabber.c:1960
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5652
+#: ../libpurple/protocols/jabber/jabber.c:1452
+#: ../libpurple/protocols/jabber/jabber.c:1910
+#: ../libpurple/protocols/jabber/jabber.c:1953
+#: ../libpurple/protocols/jabber/jabber.c:1991
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:5705
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
-#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Both"
 msgstr "molemmille"
 
-#: ../libpurple/protocols/jabber/jabber.c:1477
+#: ../libpurple/protocols/jabber/jabber.c:1502
 msgid "From (To pending)"
 msgstr "vain sinulle (odottaa lupaa)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "From"
 msgstr "Lähettäjä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1507
 msgid "To"
 msgstr "vain sinulta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1509
 msgid "None (To pending)"
 msgstr "Ei mitään (odottaa lupaa)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1511
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../libpurple/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Subscription"
 msgstr "Tilailmoitus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1571
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/jabber/jabber.c:1599
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1627
+#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:1527
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1616
+#: ../libpurple/protocols/jabber/jabber.c:1630
+#: ../libpurple/protocols/jabber/jabber.c:1644
+#: ../libpurple/protocols/jabber/jabber.c:1658
 #: ../libpurple/protocols/jabber/usermood.c:184
 #: ../libpurple/protocols/silc/buddy.c:1560
 #: ../libpurple/protocols/silc/ops.c:1212
@@ -5716,403 +5908,405 @@ msgstr "Mieliala"
 msgid "Mood"
 msgstr "Mieliala"
 
-#: ../libpurple/protocols/jabber/jabber.c:1507
-#: ../libpurple/protocols/msn/msn.c:647
-msgid "Current media"
-msgstr "Nykyinen media"
+#: ../libpurple/protocols/jabber/jabber.c:1536
+#: ../libpurple/protocols/msn/msn.c:642
+msgid "Now Listening"
+msgstr "Kuuntelee nyt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1572
-#: ../libpurple/protocols/jabber/jabber.c:1586
-#: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1628
+#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1617
+#: ../libpurple/protocols/jabber/jabber.c:1631
+#: ../libpurple/protocols/jabber/jabber.c:1645
+#: ../libpurple/protocols/jabber/jabber.c:1659
 msgid "Mood Text"
 msgstr "Mielialan teksti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1574
-#: ../libpurple/protocols/jabber/jabber.c:1588
-#: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1616
-#: ../libpurple/protocols/jabber/jabber.c:1630
+#: ../libpurple/protocols/jabber/jabber.c:1605
+#: ../libpurple/protocols/jabber/jabber.c:1619
+#: ../libpurple/protocols/jabber/jabber.c:1633
+#: ../libpurple/protocols/jabber/jabber.c:1647
+#: ../libpurple/protocols/jabber/jabber.c:1661
 msgid "Allow Buzz"
 msgstr "Salli äänimerkki"
 
-#: ../libpurple/protocols/jabber/jabber.c:1648
+#: ../libpurple/protocols/jabber/jabber.c:1679
 msgid "Tune Artist"
 msgstr "Kappaleen esittäjä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/jabber/jabber.c:1680
 msgid "Tune Title"
 msgstr "Kappaleen nimi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1650
+#: ../libpurple/protocols/jabber/jabber.c:1681
 msgid "Tune Album"
 msgstr "Kappaleen levy"
 
-#: ../libpurple/protocols/jabber/jabber.c:1651
+#: ../libpurple/protocols/jabber/jabber.c:1682
 msgid "Tune Genre"
 msgstr "Kappaleen tyylilaji"
 
-#: ../libpurple/protocols/jabber/jabber.c:1652
+#: ../libpurple/protocols/jabber/jabber.c:1683
 msgid "Tune Comment"
 msgstr "Kappaleen kommentti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1653
+#: ../libpurple/protocols/jabber/jabber.c:1684
 msgid "Tune Track"
 msgstr "Kappaleen numero"
 
-#: ../libpurple/protocols/jabber/jabber.c:1654
+#: ../libpurple/protocols/jabber/jabber.c:1685
 msgid "Tune Time"
 msgstr "Kappaleen kesto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/jabber/jabber.c:1686
 msgid "Tune Year"
 msgstr "Kappaleen vuosi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1656
+#: ../libpurple/protocols/jabber/jabber.c:1687
 msgid "Tune URL"
 msgstr "Kappaleen URL"
 
-#: ../libpurple/protocols/jabber/jabber.c:1672
+#: ../libpurple/protocols/jabber/jabber.c:1703
 msgid "Password Changed"
 msgstr "Salasana muutettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1673
+#: ../libpurple/protocols/jabber/jabber.c:1704
 msgid "Your password has been changed."
 msgstr "Salasana vaihdettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1679
-#: ../libpurple/protocols/jabber/jabber.c:1680
+#: ../libpurple/protocols/jabber/jabber.c:1710
+#: ../libpurple/protocols/jabber/jabber.c:1711
 msgid "Error changing password"
 msgstr "Virhe vaihdettaessa salasanaa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1737
+#: ../libpurple/protocols/jabber/jabber.c:1768
 msgid "Password (again)"
 msgstr "Salasana (uudelleen)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1743
-#: ../libpurple/protocols/jabber/jabber.c:1744
+#: ../libpurple/protocols/jabber/jabber.c:1774
+#: ../libpurple/protocols/jabber/jabber.c:1775
 msgid "Change XMPP Password"
 msgstr "Vaihda XMPP-salasana"
 
-#: ../libpurple/protocols/jabber/jabber.c:1744
+#: ../libpurple/protocols/jabber/jabber.c:1775
 msgid "Please enter your new password"
 msgstr "Anna uusi salasanasi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1758
-#: ../libpurple/protocols/oscar/oscar.c:6438
+#: ../libpurple/protocols/jabber/jabber.c:1789
+#: ../libpurple/protocols/oscar/oscar.c:6491
 #: ../libpurple/protocols/silc/silc.c:1236
-#: ../libpurple/protocols/silc10/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:1010
 msgid "Set User Info..."
 msgstr "Aseta käyttäjätiedot..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1763
-#: ../libpurple/protocols/oscar/oscar.c:6449
+#: ../libpurple/protocols/jabber/jabber.c:1794
+#: ../libpurple/protocols/oscar/oscar.c:6502
 #: ../libpurple/protocols/silc/silc.c:1232
-#: ../libpurple/protocols/silc10/silc.c:1003
+#: ../libpurple/protocols/silc10/silc.c:1006
 msgid "Change Password..."
 msgstr "Vaihda salasana..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1768
+#: ../libpurple/protocols/jabber/jabber.c:1799
 msgid "Search for Users..."
 msgstr "Etsi käyttäjiä..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1890
 msgid "Bad Request"
 msgstr "Virheellinen pyyntö"
 
-#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1892
 msgid "Conflict"
 msgstr "Ristiriita"
 
-#: ../libpurple/protocols/jabber/jabber.c:1863
+#: ../libpurple/protocols/jabber/jabber.c:1894
 msgid "Feature Not Implemented"
 msgstr "Ominaisuutta ei ole implementoitu."
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:1896
 msgid "Forbidden"
 msgstr "Estetty"
 
-#: ../libpurple/protocols/jabber/jabber.c:1867
+#: ../libpurple/protocols/jabber/jabber.c:1898
 msgid "Gone"
 msgstr "Poistunut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1869
-#: ../libpurple/protocols/jabber/jabber.c:1950
+#: ../libpurple/protocols/jabber/jabber.c:1900
+#: ../libpurple/protocols/jabber/jabber.c:1981
 msgid "Internal Server Error"
 msgstr "Sisäinen palvelinvirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1871
+#: ../libpurple/protocols/jabber/jabber.c:1902
 msgid "Item Not Found"
 msgstr "Kohdetta ei löytynyt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1873
+#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Malformed XMPP ID"
 msgstr "Muodoltaan virheellinen XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1875
+#: ../libpurple/protocols/jabber/jabber.c:1906
 msgid "Not Acceptable"
 msgstr "Ei kelvollinen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1877
+#: ../libpurple/protocols/jabber/jabber.c:1908
 msgid "Not Allowed"
 msgstr "Ei sallittu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1881
+#: ../libpurple/protocols/jabber/jabber.c:1912
 msgid "Payment Required"
 msgstr "Vaatii maksun"
 
-#: ../libpurple/protocols/jabber/jabber.c:1883
+#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Recipient Unavailable"
 msgstr "Vastaanottaja ei saatavilla."
 
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/jabber.c:1918
 msgid "Registration Required"
 msgstr "Vaatii rekisteröinnin"
 
-#: ../libpurple/protocols/jabber/jabber.c:1889
+#: ../libpurple/protocols/jabber/jabber.c:1920
 msgid "Remote Server Not Found"
 msgstr "Palvelinta ei löytynyt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1891
+#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Remote Server Timeout"
 msgstr "Palvelin aikakatkaisi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1893
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Server Overloaded"
 msgstr "Palvelin ylikuormitettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1895
+#: ../libpurple/protocols/jabber/jabber.c:1926
 msgid "Service Unavailable"
 msgstr "Palvelu ei käytettävissä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1897
+#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Subscription Required"
 msgstr "Vaatii tilailmoitukset"
 
-#: ../libpurple/protocols/jabber/jabber.c:1899
+#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Unexpected Request"
 msgstr "Odottamaton pyyntö"
 
-#: ../libpurple/protocols/jabber/jabber.c:1907
+#: ../libpurple/protocols/jabber/jabber.c:1938
 msgid "Authorization Aborted"
 msgstr "Valtuutus keskeytetty"
 
-#: ../libpurple/protocols/jabber/jabber.c:1909
+#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Incorrect encoding in authorization"
 msgstr "Väärä merkistö valtuutusviestissä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
+#: ../libpurple/protocols/jabber/jabber.c:1942
 msgid "Invalid authzid"
 msgstr "Epäkelpo authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1913
+#: ../libpurple/protocols/jabber/jabber.c:1944
 msgid "Invalid Authorization Mechanism"
 msgstr "Epäkelpo tunnistautumismekanismi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1916
+#: ../libpurple/protocols/jabber/jabber.c:1947
 msgid "Authorization mechanism too weak"
 msgstr "Tunnistautumismekanismi liian heikko"
 
-#: ../libpurple/protocols/jabber/jabber.c:1924
+#: ../libpurple/protocols/jabber/jabber.c:1955
 msgid "Temporary Authentication Failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
+#: ../libpurple/protocols/jabber/jabber.c:1958
 msgid "Authentication Failure"
 msgstr "Todennus epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:1935
+#: ../libpurple/protocols/jabber/jabber.c:1966
 msgid "Bad Format"
 msgstr "Väärä muoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
+#: ../libpurple/protocols/jabber/jabber.c:1968
 msgid "Bad Namespace Prefix"
 msgstr "Väärä nimiavaruuden etuliite"
 
-#: ../libpurple/protocols/jabber/jabber.c:1940
+#: ../libpurple/protocols/jabber/jabber.c:1971
 msgid "Resource Conflict"
 msgstr "Sijaintikonflikti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1942
+#: ../libpurple/protocols/jabber/jabber.c:1973
 #: ../libpurple/protocols/silc/silc.c:350
-#: ../libpurple/protocols/silc10/ops.c:1720
+#: ../libpurple/protocols/silc10/ops.c:1725
 msgid "Connection Timeout"
 msgstr "Ei yhteyttä määräajassa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1944
+#: ../libpurple/protocols/jabber/jabber.c:1975
 msgid "Host Gone"
 msgstr "Verkkoisäntä kadonnut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1946
+#: ../libpurple/protocols/jabber/jabber.c:1977
 msgid "Host Unknown"
 msgstr "Tuntematon isäntä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1948
+#: ../libpurple/protocols/jabber/jabber.c:1979
 msgid "Improper Addressing"
 msgstr "Vääränlainen osoitus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1952
+#: ../libpurple/protocols/jabber/jabber.c:1983
 msgid "Invalid ID"
 msgstr "Epäkelpo ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1954
+#: ../libpurple/protocols/jabber/jabber.c:1985
 msgid "Invalid Namespace"
 msgstr "Väärä nimiavaruus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1956
+#: ../libpurple/protocols/jabber/jabber.c:1987
 msgid "Invalid XML"
 msgstr "Epäkelpo XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1958
+#: ../libpurple/protocols/jabber/jabber.c:1989
 msgid "Non-matching Hosts"
 msgstr "Verkkoisännät eivät täsmää"
 
-#: ../libpurple/protocols/jabber/jabber.c:1962
+#: ../libpurple/protocols/jabber/jabber.c:1993
 msgid "Policy Violation"
 msgstr "Menettelykäytäntörikkomus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1964
+#: ../libpurple/protocols/jabber/jabber.c:1995
 msgid "Remote Connection Failed"
 msgstr "Etäyhteydessä yhteydessä virhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1966
+#: ../libpurple/protocols/jabber/jabber.c:1997
 msgid "Resource Constraint"
 msgstr "Sijaintirajoite"
 
-#: ../libpurple/protocols/jabber/jabber.c:1968
+#: ../libpurple/protocols/jabber/jabber.c:1999
 msgid "Restricted XML"
 msgstr "Rajoitettu XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1970
+#: ../libpurple/protocols/jabber/jabber.c:2001
 msgid "See Other Host"
 msgstr "Etsi toinen isäntä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1972
+#: ../libpurple/protocols/jabber/jabber.c:2003
 msgid "System Shutdown"
 msgstr "Järjestelmän alasajo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1974
+#: ../libpurple/protocols/jabber/jabber.c:2005
 msgid "Undefined Condition"
 msgstr "Määrittelemätön tila"
 
-#: ../libpurple/protocols/jabber/jabber.c:1976
+#: ../libpurple/protocols/jabber/jabber.c:2007
 msgid "Unsupported Encoding"
 msgstr "Merkistöä ei tueta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1978
+#: ../libpurple/protocols/jabber/jabber.c:2009
 msgid "Unsupported Stanza Type"
 msgstr "Säkeistötyyppiä (stanza type) ei tuettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1980
+#: ../libpurple/protocols/jabber/jabber.c:2011
 msgid "Unsupported Version"
 msgstr "Versiota ei tueta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1982
+#: ../libpurple/protocols/jabber/jabber.c:2013
 msgid "XML Not Well Formed"
 msgstr "Huonosti muotoiltua XML:ää"
 
-#: ../libpurple/protocols/jabber/jabber.c:1984
+#: ../libpurple/protocols/jabber/jabber.c:2015
 msgid "Stream Error"
 msgstr "Datavirtavirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:2069
+#: ../libpurple/protocols/jabber/jabber.c:2100
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Käyttäjää %s ei voi estää"
 
-#: ../libpurple/protocols/jabber/jabber.c:2089
+#: ../libpurple/protocols/jabber/jabber.c:2120
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Tuntematon kytkös: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2094
+#: ../libpurple/protocols/jabber/jabber.c:2125
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Käyttäjälle %s ei voi tehdä kytköstä \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2113
+#: ../libpurple/protocols/jabber/jabber.c:2144
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Tuntematon rooli: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2118
+#: ../libpurple/protocols/jabber/jabber.c:2149
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Roolia \"%s\" ei voi asettaa käyttäjälle: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2171
+#: ../libpurple/protocols/jabber/jabber.c:2202
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Käyttäjää %s ei voi potkaista ulos."
 
-#: ../libpurple/protocols/jabber/jabber.c:2202
+#: ../libpurple/protocols/jabber/jabber.c:2233
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "Käyttäjää %s ei voi pingata."
 
-#: ../libpurple/protocols/jabber/jabber.c:2220
-#: ../libpurple/protocols/jabber/jabber.c:2231
+#: ../libpurple/protocols/jabber/jabber.c:2251
+#: ../libpurple/protocols/jabber/jabber.c:2262
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr "Äänimerkkiä ei voi lähettää, koska mitään ei tiedetä käyttäjästä %s."
 
-#: ../libpurple/protocols/jabber/jabber.c:2226
+#: ../libpurple/protocols/jabber/jabber.c:2257
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr ""
 "Äänimerkkiä ei voi lähettää, koska käyttäjä %s voi olla poissa linjoilta."
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
+#: ../libpurple/protocols/jabber/jabber.c:2288
 #, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr "Äänimerkkiä ei voi lähettää, koska käyttäjä %s ei tue sitä."
 
-#: ../libpurple/protocols/jabber/jabber.c:2279
-#: ../libpurple/protocols/yahoo/yahoo.c:4130
+#. Yahoo only supports one attention command: the 'buzz'.
+#. This is index number YAHOO_BUZZ.
+#: ../libpurple/protocols/jabber/jabber.c:2308
+#: ../libpurple/protocols/yahoo/yahoo.c:4143
 msgid "Buzz"
 msgstr "Tööttää"
 
-#: ../libpurple/protocols/jabber/jabber.c:2280
+#: ../libpurple/protocols/jabber/jabber.c:2309
 #: ../libpurple/protocols/jabber/message.c:308
-#: ../libpurple/protocols/yahoo/yahoo.c:4131
+#: ../libpurple/protocols/yahoo/yahoo.c:4144
 #, c-format
 msgid "%s has buzzed you!"
 msgstr "%s on töötännyt sinulle."
 
-#: ../libpurple/protocols/jabber/jabber.c:2281
-#: ../libpurple/protocols/yahoo/yahoo.c:4132
+#: ../libpurple/protocols/jabber/jabber.c:2309
+#: ../libpurple/protocols/yahoo/yahoo.c:4144
 #, c-format
 msgid "Buzzing %s..."
 msgstr "Töötätään tuttavalle %s..."
 
-#: ../libpurple/protocols/jabber/jabber.c:2313
+#: ../libpurple/protocols/jabber/jabber.c:2340
 msgid "config:  Configure a chat room."
 msgstr "config: Konfiguroi ryhmäkeskusteluhuone."
 
-#: ../libpurple/protocols/jabber/jabber.c:2317
+#: ../libpurple/protocols/jabber/jabber.c:2344
 msgid "configure:  Configure a chat room."
 msgstr "configure: Konfiguroi ryhmäkeskusteluhuone."
 
-#: ../libpurple/protocols/jabber/jabber.c:2326
+#: ../libpurple/protocols/jabber/jabber.c:2353
 msgid "part [room]:  Leave the room."
 msgstr "part [huone]: Poistu huoneesta."
 
-#: ../libpurple/protocols/jabber/jabber.c:2331
+#: ../libpurple/protocols/jabber/jabber.c:2358
 msgid "register:  Register with a chat room."
 msgstr "register: Rekisteröidy ryhmäkeskusteluhuoneeseen."
 
-#: ../libpurple/protocols/jabber/jabber.c:2337
+#: ../libpurple/protocols/jabber/jabber.c:2364
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [uusi aihe]: Näytä tai vaihda aihe."
 
-#: ../libpurple/protocols/jabber/jabber.c:2343
+#: ../libpurple/protocols/jabber/jabber.c:2370
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;käyttäjä&gt; [huone]: Kiellä käyttäjä huoneesta."
 
-#: ../libpurple/protocols/jabber/jabber.c:2349
+#: ../libpurple/protocols/jabber/jabber.c:2376
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6120,7 +6314,7 @@ msgstr ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Aseta "
 "käyttäjän käyttäjäluokka tälle huoneelle."
 
-#: ../libpurple/protocols/jabber/jabber.c:2355
+#: ../libpurple/protocols/jabber/jabber.c:2382
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6128,31 +6322,31 @@ msgstr ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Aseta "
 "käyttäjän rooli huoneessa."
 
-#: ../libpurple/protocols/jabber/jabber.c:2361
+#: ../libpurple/protocols/jabber/jabber.c:2388
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;käyttäjä&gt; [viesti]: Kutsu käyttäjä huoneeseen."
 
-#: ../libpurple/protocols/jabber/jabber.c:2367
+#: ../libpurple/protocols/jabber/jabber.c:2394
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;huone&gt; [palvelin]: Liity ryhmäkeskusteluun tällä palvelimella."
 
-#: ../libpurple/protocols/jabber/jabber.c:2373
+#: ../libpurple/protocols/jabber/jabber.c:2400
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;käyttäjä&gt; [huone]: Potkaise käyttäjä ulos huoneesta."
 
-#: ../libpurple/protocols/jabber/jabber.c:2378
+#: ../libpurple/protocols/jabber/jabber.c:2405
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msh &lt;käyttäjä&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle."
 
-#: ../libpurple/protocols/jabber/jabber.c:2384
+#: ../libpurple/protocols/jabber/jabber.c:2411
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr "ping &lt;jid&gt;:\tPingaa käyttäjää/komponenttia/palvelinta."
 
-#: ../libpurple/protocols/jabber/jabber.c:2389
-#: ../libpurple/protocols/yahoo/yahoo.c:4156
+#: ../libpurple/protocols/jabber/jabber.c:2416
+#: ../libpurple/protocols/yahoo/yahoo.c:4167
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Tööttää tuttavalle äänimerkki huomion saamiseksi"
 
@@ -6172,7 +6366,7 @@ msgstr "XMPP-yhteyskäytäntöliitännä
 msgstr "XMPP-yhteyskäytäntöliitännäinen"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:509
+#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:478
 msgid "Domain"
 msgstr "Palvelin"
 
@@ -6189,8 +6383,8 @@ msgstr "Salli salaamaton tunnistautumine
 msgstr "Salli salaamaton tunnistautuminen salaamattoman yhteyden yli"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:227
-#: ../libpurple/protocols/myspace/myspace.c:3305
-#: ../libpurple/protocols/simple/simple.c:2089
+#: ../libpurple/protocols/myspace/myspace.c:3466
+#: ../libpurple/protocols/simple/simple.c:2105
 msgid "Connect port"
 msgstr "Yhdistä porttiin"
 
@@ -6198,12 +6392,16 @@ msgstr "Yhdistä porttiin"
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:231
-#: ../libpurple/protocols/myspace/myspace.c:3302
+#: ../libpurple/protocols/myspace/myspace.c:3463
 #: ../libpurple/protocols/silc/silc.c:2057
-#: ../libpurple/protocols/silc10/silc.c:1860 ../pidgin/gtkaccount.c:840
+#: ../libpurple/protocols/silc10/silc.c:1863 ../pidgin/gtkaccount.c:809
 msgid "Connect server"
 msgstr "Yhdistä palvelimeen"
 
+#: ../libpurple/protocols/jabber/libxmpp.c:236
+msgid "File transfer proxies"
+msgstr "Tiedostonsiirron välipalvelimet"
+
 #: ../libpurple/protocols/jabber/message.c:106
 #, c-format
 msgid "%s has left the conversation."
@@ -6242,16 +6440,16 @@ msgstr "Virhe XML-jäsennyksessä"
 msgid "XML Parse error"
 msgstr "Virhe XML-jäsennyksessä"
 
-#: ../libpurple/protocols/jabber/presence.c:435
+#: ../libpurple/protocols/jabber/presence.c:441
 msgid "Unknown Error in presence"
 msgstr "Tuntematon virhe tavoitettavuudessa"
 
-#: ../libpurple/protocols/jabber/presence.c:516
-#: ../libpurple/protocols/jabber/presence.c:517
+#: ../libpurple/protocols/jabber/presence.c:522
+#: ../libpurple/protocols/jabber/presence.c:523
 msgid "Create New Room"
 msgstr "Luo uusi huone"
 
-#: ../libpurple/protocols/jabber/presence.c:518
+#: ../libpurple/protocols/jabber/presence.c:524
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6259,58 +6457,58 @@ msgstr ""
 "Olet luomassa uutta huonetta. Haluatko muuttaa asetuksia vai käytetäänkö "
 "oletusasetuksia?"
 
-#: ../libpurple/protocols/jabber/presence.c:524
+#: ../libpurple/protocols/jabber/presence.c:530
 msgid "_Configure Room"
 msgstr "_Aseta huoneen asetuksia"
 
-#: ../libpurple/protocols/jabber/presence.c:525
+#: ../libpurple/protocols/jabber/presence.c:531
 msgid "_Accept Defaults"
 msgstr "_Hyväksy oletusasetukset"
 
-#: ../libpurple/protocols/jabber/presence.c:567
+#: ../libpurple/protocols/jabber/presence.c:573
 #, c-format
 msgid "Error in chat %s"
 msgstr "Virhe ryhmäkeskustelussa: %s"
 
-#: ../libpurple/protocols/jabber/presence.c:571
+#: ../libpurple/protocols/jabber/presence.c:577
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Virhe liityttäessä ryhmäkeskusteluun %s"
 
-#: ../libpurple/protocols/jabber/si.c:775
+#: ../libpurple/protocols/jabber/si.c:1009
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Tiedostoa ei voi lähettää käyttäjälle %s, käyttäjä ei tue tiedostonsiirtoja"
 
-#: ../libpurple/protocols/jabber/si.c:776
-#: ../libpurple/protocols/jabber/si.c:777
-#: ../libpurple/protocols/jabber/si.c:845
+#: ../libpurple/protocols/jabber/si.c:1010
+#: ../libpurple/protocols/jabber/si.c:1011
+#: ../libpurple/protocols/jabber/si.c:1080
 msgid "File Send Failed"
 msgstr "Tiedoston lähetys epäonnistui"
 
-#: ../libpurple/protocols/jabber/si.c:838
+#: ../libpurple/protocols/jabber/si.c:1073
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "Tiedostoa ei voi lähettää käyttäjälle %s, virheellinen JID."
 
-#: ../libpurple/protocols/jabber/si.c:840
+#: ../libpurple/protocols/jabber/si.c:1075
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "Tiedostoa ei voi lähettää käyttäjälle %s, käyttäjä ei ole linjoilla"
 
-#: ../libpurple/protocols/jabber/si.c:842
+#: ../libpurple/protocols/jabber/si.c:1077
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 "Tiedostoa ei voi lähettää käyttäjälle %s, käyttäjä ei tue tiedostonsiirtoja"
 
-#: ../libpurple/protocols/jabber/si.c:857
+#: ../libpurple/protocols/jabber/si.c:1092
 #, c-format
-msgid "Please select which resource of %s you would like to send a file to"
+msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Valitse käyttäjän %s sijainti johon haluat lähettää tiedoston"
 
-#: ../libpurple/protocols/jabber/si.c:873
+#: ../libpurple/protocols/jabber/si.c:1108
 msgid "Select a Resource"
 msgstr "Valitse sijainti"
 
@@ -6392,195 +6590,163 @@ msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:36
 #: ../libpurple/protocols/msnp9/error.c:36
-#, c-format
 msgid "Unable to parse message"
 msgstr "Viestin jäsennys epäonnistui"
 
 #: ../libpurple/protocols/msn/error.c:41
 #: ../libpurple/protocols/msnp9/error.c:41
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaksivirhe (todennäköisesti ohjelmistovirhe)"
 
 #: ../libpurple/protocols/msn/error.c:46
 #: ../libpurple/protocols/msnp9/error.c:46
-#, c-format
 msgid "Invalid e-mail address"
 msgstr "Epäkelpo sähköpostiosoite"
 
 #: ../libpurple/protocols/msn/error.c:49
 #: ../libpurple/protocols/msnp9/error.c:49
-#, c-format
 msgid "User does not exist"
 msgstr "Käyttäjää ei ole"
 
 #: ../libpurple/protocols/msn/error.c:53
 #: ../libpurple/protocols/msnp9/error.c:53
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Täysin kelvollinen verkkoalueen nimi puuttuu"
 
 #: ../libpurple/protocols/msn/error.c:56
 #: ../libpurple/protocols/msnp9/error.c:56
-#, c-format
 msgid "Already logged in"
 msgstr "Olet jo kirjautuneena sisään"
 
 #: ../libpurple/protocols/msn/error.c:59
 #: ../libpurple/protocols/msnp9/error.c:59
-#, c-format
 msgid "Invalid screen name"
 msgstr "Epäkelpo näyttönimi"
 
 #: ../libpurple/protocols/msn/error.c:62
 #: ../libpurple/protocols/msnp9/error.c:62
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Epäkelpo lempinimi"
 
 #: ../libpurple/protocols/msn/error.c:65
 #: ../libpurple/protocols/msnp9/error.c:65
-#, c-format
 msgid "List full"
 msgstr "Lista täynnä"
 
 #: ../libpurple/protocols/msn/error.c:68
 #: ../libpurple/protocols/msnp9/error.c:68
-#, c-format
 msgid "Already there"
 msgstr "On jo siellä"
 
 #: ../libpurple/protocols/msn/error.c:72
 #: ../libpurple/protocols/msnp9/error.c:72
-#, c-format
 msgid "Not on list"
 msgstr "Ei tuttavissa"
 
 #: ../libpurple/protocols/msn/error.c:75
 #: ../libpurple/protocols/msnp9/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:756
-#, c-format
+#: ../libpurple/protocols/zephyr/zephyr.c:760
 msgid "User is offline"
 msgstr "Käyttäjä on poissa linjoilta"
 
 #: ../libpurple/protocols/msn/error.c:78
 #: ../libpurple/protocols/msnp9/error.c:78
-#, c-format
 msgid "Already in the mode"
 msgstr "Olet jo kyseisessä tilassa"
 
 #: ../libpurple/protocols/msn/error.c:82
 #: ../libpurple/protocols/msnp9/error.c:82
-#, c-format
 msgid "Already in opposite list"
 msgstr "On jo vastakkaisessa listassa"
 
 #: ../libpurple/protocols/msn/error.c:86
 #: ../libpurple/protocols/msnp9/error.c:86
-#, c-format
 msgid "Too many groups"
 msgstr "Liian monta ryhmää"
 
 #: ../libpurple/protocols/msn/error.c:89
 #: ../libpurple/protocols/msnp9/error.c:89
-#, c-format
 msgid "Invalid group"
 msgstr "Epäkelpo ryhmä"
 
 #: ../libpurple/protocols/msn/error.c:92
 #: ../libpurple/protocols/msnp9/error.c:92
-#, c-format
 msgid "User not in group"
 msgstr "Käyttäjä ei ole ryhmässä"
 
 #: ../libpurple/protocols/msn/error.c:95
 #: ../libpurple/protocols/msnp9/error.c:95
-#, c-format
 msgid "Group name too long"
 msgstr "Ryhmän nimi liian pitkä"
 
 #: ../libpurple/protocols/msn/error.c:98
 #: ../libpurple/protocols/msnp9/error.c:98
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Ryhmää nolla ei voi poistaa"
 
 #: ../libpurple/protocols/msn/error.c:103
 #: ../libpurple/protocols/msnp9/error.c:103
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Yritettiin lisätä käyttäjää ryhmään jota ei ole"
 
 #: ../libpurple/protocols/msn/error.c:107
 #: ../libpurple/protocols/msnp9/error.c:107
-#, c-format
 msgid "Switchboard failed"
 msgstr "Kytkentä epäonnistui"
 
 #: ../libpurple/protocols/msn/error.c:111
 #: ../libpurple/protocols/msnp9/error.c:111
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Siirrosta tiedottaminen epäonnistui"
 
 #: ../libpurple/protocols/msn/error.c:116
 #: ../libpurple/protocols/msnp9/error.c:116
-#, c-format
 msgid "Required fields missing"
 msgstr "Vaadittuja kenttiä puuttuu"
 
 #: ../libpurple/protocols/msn/error.c:120
 #: ../libpurple/protocols/msnp9/error.c:120
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Liian monta osumaa FND:hen"
 
 #: ../libpurple/protocols/msn/error.c:124
 #: ../libpurple/protocols/msnp9/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:120
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Not logged in"
 msgstr "Et ole kirjautunut sisään."
 
 #: ../libpurple/protocols/msn/error.c:128
 #: ../libpurple/protocols/msnp9/error.c:128
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Palvelu ei tilapäisesti ole käytettävissä"
 
 #: ../libpurple/protocols/msn/error.c:131
 #: ../libpurple/protocols/msnp9/error.c:131
-#, c-format
 msgid "Database server error"
 msgstr "Tietokantapalvelimen virhe"
 
 #: ../libpurple/protocols/msn/error.c:135
 #: ../libpurple/protocols/msnp9/error.c:135
-#, c-format
 msgid "Command disabled"
 msgstr "Komento poistettu käytöstä"
 
 #: ../libpurple/protocols/msn/error.c:139
 #: ../libpurple/protocols/msnp9/error.c:139
-#, c-format
 msgid "File operation error"
 msgstr "Tiedostotoiminnossa virhe"
 
 #: ../libpurple/protocols/msn/error.c:143
 #: ../libpurple/protocols/msnp9/error.c:143
-#, c-format
 msgid "Memory allocation error"
 msgstr "Muistin varaamisessa virhe"
 
 #: ../libpurple/protocols/msn/error.c:147
 #: ../libpurple/protocols/msnp9/error.c:147
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Väärä CHL-arvo lähetetty palvelimelle"
 
 #: ../libpurple/protocols/msn/error.c:152
 #: ../libpurple/protocols/msnp9/error.c:152
-#, c-format
 msgid "Server busy"
 msgstr "Palvelimella ruuhkaa"
 
@@ -6590,131 +6756,110 @@ msgstr "Palvelimella ruuhkaa"
 #: ../libpurple/protocols/msnp9/error.c:155
 #: ../libpurple/protocols/msnp9/error.c:170
 #: ../libpurple/protocols/msnp9/error.c:230
-#, c-format
 msgid "Server unavailable"
 msgstr "Palvelin on tavoittamattomissa"
 
 #: ../libpurple/protocols/msn/error.c:158
 #: ../libpurple/protocols/msnp9/error.c:158
-#, c-format
 msgid "Peer notification server down"
 msgstr "Vastapään ilmoituspalvelin ei toiminnassa"
 
 #: ../libpurple/protocols/msn/error.c:162
 #: ../libpurple/protocols/msnp9/error.c:162
-#, c-format
 msgid "Database connect error"
 msgstr "Tietokantayhteysvirhe"
 
 #: ../libpurple/protocols/msn/error.c:167
 #: ../libpurple/protocols/msnp9/error.c:167
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Palvelin on poistumassa toiminnasta (jättäkää laiva)"
 
 #: ../libpurple/protocols/msn/error.c:174
 #: ../libpurple/protocols/msnp9/error.c:174
-#, c-format
 msgid "Error creating connection"
 msgstr "Virhe luotaessa yhteyttä"
 
 #: ../libpurple/protocols/msn/error.c:179
 #: ../libpurple/protocols/msnp9/error.c:179
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-parametrit ovat joko tuntemattomat tai ne eivät ole sallittuja"
 
 #: ../libpurple/protocols/msn/error.c:183
 #: ../libpurple/protocols/msnp9/error.c:183
-#, c-format
 msgid "Unable to write"
 msgstr "Ei kyetty kirjoittamaan"
 
 #: ../libpurple/protocols/msn/error.c:186
 #: ../libpurple/protocols/msnp9/error.c:186
-#, c-format
 msgid "Session overload"
 msgstr "Istunnon ylikuormitus"
 
 #: ../libpurple/protocols/msn/error.c:190
 #: ../libpurple/protocols/msnp9/error.c:190
-#, c-format
 msgid "User is too active"
 msgstr "Käyttäjä on liian aktiivinen"
 
 #: ../libpurple/protocols/msn/error.c:193
 #: ../libpurple/protocols/msnp9/error.c:193
-#, c-format
 msgid "Too many sessions"
 msgstr "Liian monta istuntoa"
 
 #: ../libpurple/protocols/msn/error.c:196
 #: ../libpurple/protocols/msnp9/error.c:196
-#, c-format
 msgid "Passport not verified"
 msgstr "Passport-tiliä ei ole varmistettu"
 
 #: ../libpurple/protocols/msn/error.c:199
 #: ../libpurple/protocols/msnp9/error.c:199
-#, c-format
 msgid "Bad friend file"
 msgstr "Virheellinen tuttavatiedosto"
 
 #: ../libpurple/protocols/msn/error.c:203
 #: ../libpurple/protocols/msnp9/error.c:203
-#, c-format
 msgid "Not expected"
 msgstr "Odottamaton"
 
 #: ../libpurple/protocols/msn/error.c:209
 #: ../libpurple/protocols/msnp9/error.c:209
-#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Tuttavanimi vaihtuu liian usein"
 
 #: ../libpurple/protocols/msn/error.c:218
 #: ../libpurple/protocols/msnp9/error.c:218
-#, c-format
 msgid "Server too busy"
 msgstr "Palvelimella liikaa ruuhkaa "
 
 #: ../libpurple/protocols/msn/error.c:222
 #: ../libpurple/protocols/msnp9/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1377
+#: ../libpurple/protocols/oscar/oscar.c:1418
 #: ../libpurple/protocols/silc/silc.c:338
-#: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1393
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1713
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1399
 msgid "Authentication failed"
 msgstr "Todennus epäonnistui"
 
 #: ../libpurple/protocols/msn/error.c:225
 #: ../libpurple/protocols/msnp9/error.c:225
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Ei sallittu kun poissa linjoilta"
 
 #: ../libpurple/protocols/msn/error.c:233
 #: ../libpurple/protocols/msnp9/error.c:233
-#, c-format
 msgid "Not accepting new users"
 msgstr "Ei ota vastaan uusia käyttäjiä"
 
 #: ../libpurple/protocols/msn/error.c:237
 #: ../libpurple/protocols/msnp9/error.c:237
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Kids Passport - ilman vanhempien hyväksyntää"
 
 #: ../libpurple/protocols/msn/error.c:241
 #: ../libpurple/protocols/msnp9/error.c:241
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport-tiliä ei ole verifioitu"
 
 #: ../libpurple/protocols/msn/error.c:244
 #: ../libpurple/protocols/msnp9/error.c:244
-#, c-format
 msgid "Bad ticket"
 msgstr "Bad ticket"
 
@@ -6730,49 +6875,49 @@ msgstr "MSN-virhe: %s\n"
 msgid "MSN Error: %s\n"
 msgstr "MSN-virhe: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:130 ../libpurple/protocols/msnp9/msn.c:130
+#: ../libpurple/protocols/msn/msn.c:128 ../libpurple/protocols/msnp9/msn.c:129
 msgid "Nudge"
 msgstr "Tönäise"
 
-#: ../libpurple/protocols/msn/msn.c:131 ../libpurple/protocols/msnp9/msn.c:131
+#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "%s has nudged you!"
 msgstr "%s on tönäissyt sinua."
 
-#: ../libpurple/protocols/msn/msn.c:132 ../libpurple/protocols/msnp9/msn.c:132
+#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "Nudging %s..."
 msgstr "Tönäistään tuttavaa %s..."
 
-#: ../libpurple/protocols/msn/msn.c:174 ../libpurple/protocols/msnp9/msn.c:174
+#: ../libpurple/protocols/msn/msn.c:170 ../libpurple/protocols/msnp9/msn.c:171
 msgid "Your new MSN friendly name is too long."
 msgstr "Uusi MSN-tuttavanimesi on liian pitkä."
 
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msnp9/msn.c:282
+#: ../libpurple/protocols/msn/msn.c:282 ../libpurple/protocols/msnp9/msn.c:279
 msgid "Set your friendly name."
 msgstr "Aseta tuttavanimesi."
 
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msnp9/msn.c:283
+#: ../libpurple/protocols/msn/msn.c:283 ../libpurple/protocols/msnp9/msn.c:280
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Tämä on nimi jona MSN-tuttavasi sinut näkevät."
 
-#: ../libpurple/protocols/msn/msn.c:305 ../libpurple/protocols/msnp9/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:301 ../libpurple/protocols/msnp9/msn.c:298
 msgid "Set your home phone number."
 msgstr "Aseta kotipuhelinnumerosi"
 
-#: ../libpurple/protocols/msn/msn.c:322 ../libpurple/protocols/msnp9/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:318 ../libpurple/protocols/msnp9/msn.c:315
 msgid "Set your work phone number."
 msgstr "Aseta työpuhelinnumerosi"
 
-#: ../libpurple/protocols/msn/msn.c:339 ../libpurple/protocols/msnp9/msn.c:335
+#: ../libpurple/protocols/msn/msn.c:335 ../libpurple/protocols/msnp9/msn.c:332
 msgid "Set your mobile phone number."
 msgstr "Aseta matkapuhelinnumerosi"
 
-#: ../libpurple/protocols/msn/msn.c:354 ../libpurple/protocols/msnp9/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:350 ../libpurple/protocols/msnp9/msn.c:347
 msgid "Allow MSN Mobile pages?"
 msgstr "Salli MSN-mobiilihaut"
 
-#: ../libpurple/protocols/msn/msn.c:355 ../libpurple/protocols/msnp9/msn.c:351
+#: ../libpurple/protocols/msn/msn.c:351 ../libpurple/protocols/msnp9/msn.c:348
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6780,390 +6925,409 @@ msgstr ""
 "Haluatko sallia tai estää henkilöitä tuttavissasi lähettämästä MSN- "
 "mobiilihakuja matkapuhelimeesi tai muuhun mobiililaitteeseen?"
 
-#: ../libpurple/protocols/msn/msn.c:361 ../libpurple/protocols/msnp9/msn.c:357
+#: ../libpurple/protocols/msn/msn.c:357 ../libpurple/protocols/msnp9/msn.c:354
 msgid "Allow"
 msgstr "Salli"
 
-#: ../libpurple/protocols/msn/msn.c:362 ../libpurple/protocols/msnp9/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:358 ../libpurple/protocols/msnp9/msn.c:355
 msgid "Disallow"
 msgstr "Kiellä"
 
-#: ../libpurple/protocols/msn/msn.c:378 ../libpurple/protocols/msnp9/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:374 ../libpurple/protocols/msnp9/msn.c:371
 msgid "This Hotmail account may not be active."
 msgstr "Tämä Hotmail-tili ei välttämättä ole aktiivinen."
 
-#: ../libpurple/protocols/msn/msn.c:404 ../libpurple/protocols/msnp9/msn.c:400
+#: ../libpurple/protocols/msn/msn.c:400 ../libpurple/protocols/msnp9/msn.c:397
 msgid "Send a mobile message."
 msgstr "Lähetä mobiiliviestinä"
 
-#: ../libpurple/protocols/msn/msn.c:406 ../libpurple/protocols/msnp9/msn.c:402
+#: ../libpurple/protocols/msn/msn.c:402 ../libpurple/protocols/msnp9/msn.c:399
 msgid "Page"
 msgstr "Lähetä"
 
-#: ../libpurple/protocols/msn/msn.c:688 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/msnp9/msn.c:583
+#: ../libpurple/protocols/msn/msn.c:665 ../libpurple/protocols/msnp9/msn.c:567
+msgid "Home Phone Number"
+msgstr "Kotipuhelinnumero"
+
+#: ../libpurple/protocols/msn/msn.c:669 ../libpurple/protocols/msnp9/msn.c:571
+msgid "Work Phone Number"
+msgstr "Työpuhelinnumero"
+
+#: ../libpurple/protocols/msn/msn.c:673 ../libpurple/protocols/msnp9/msn.c:575
+msgid "Mobile Phone Number"
+msgstr "Matkapuhelinnumero"
+
+#: ../libpurple/protocols/msn/msn.c:696 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/msnp9/msn.c:594
 #: ../libpurple/protocols/msnp9/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3088
-#: ../libpurple/protocols/yahoo/yahoo.c:3772
+#: ../libpurple/protocols/yahoo/yahoo.c:3114
+#: ../libpurple/protocols/yahoo/yahoo.c:3803
 msgid "Be Right Back"
 msgstr "Tulen pian takaisin"
 
-#: ../libpurple/protocols/msn/msn.c:694 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/msnp9/msn.c:587
+#: ../libpurple/protocols/msn/msn.c:702 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msnp9/msn.c:598
 #: ../libpurple/protocols/msnp9/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2839
-#: ../libpurple/protocols/novell/novell.c:2969
+#: ../libpurple/protocols/novell/novell.c:2840
+#: ../libpurple/protocols/novell/novell.c:2970
 #: ../libpurple/protocols/silc/buddy.c:1483
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1483
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3090
-#: ../libpurple/protocols/yahoo/yahoo.c:3775
+#: ../libpurple/protocols/yahoo/yahoo.c:3116
+#: ../libpurple/protocols/yahoo/yahoo.c:3806
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../libpurple/protocols/msn/msn.c:699 ../libpurple/protocols/msnp9/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3098
-#: ../libpurple/protocols/yahoo/yahoo.c:3787
+#: ../libpurple/protocols/msn/msn.c:707 ../libpurple/protocols/msnp9/msn.c:602
+#: ../libpurple/protocols/yahoo/yahoo.c:3124
+#: ../libpurple/protocols/yahoo/yahoo.c:3818
 msgid "On the Phone"
 msgstr "Puhelimessa"
 
-#: ../libpurple/protocols/msn/msn.c:704 ../libpurple/protocols/msnp9/msn.c:595
-#: ../libpurple/protocols/yahoo/yahoo.c:3102
-#: ../libpurple/protocols/yahoo/yahoo.c:3793
+#: ../libpurple/protocols/msn/msn.c:712 ../libpurple/protocols/msnp9/msn.c:606
+#: ../libpurple/protocols/yahoo/yahoo.c:3128
+#: ../libpurple/protocols/yahoo/yahoo.c:3824
 msgid "Out to Lunch"
 msgstr "Lounaalla"
 
-#: ../libpurple/protocols/msn/msn.c:723
+#. primitive
+#. ID
+#. name - use default
+#. savable
+#. should be user_settable some day
+#. independent
+#: ../libpurple/protocols/msn/msn.c:731
+#: ../libpurple/protocols/myspace/myspace.c:170
 msgid "Artist"
 msgstr "Esittäjä"
 
-#: ../libpurple/protocols/msn/msn.c:724
+#: ../libpurple/protocols/msn/msn.c:732
 msgid "Album"
 msgstr "Levy"
 
-#: ../libpurple/protocols/msn/msn.c:742 ../libpurple/protocols/msnp9/msn.c:623
+#: ../libpurple/protocols/msn/msn.c:750 ../libpurple/protocols/msnp9/msn.c:634
 msgid "Set Friendly Name..."
 msgstr "Aseta tuttavanimi..."
 
-#: ../libpurple/protocols/msn/msn.c:747 ../libpurple/protocols/msnp9/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:755 ../libpurple/protocols/msnp9/msn.c:639
 msgid "Set Home Phone Number..."
 msgstr "Aseta kotipuhelinnumero..."
 
-#: ../libpurple/protocols/msn/msn.c:751 ../libpurple/protocols/msnp9/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:759 ../libpurple/protocols/msnp9/msn.c:643
 msgid "Set Work Phone Number..."
 msgstr "Aseta työpuhelinnumero..."
 
-#: ../libpurple/protocols/msn/msn.c:755 ../libpurple/protocols/msnp9/msn.c:636
+#: ../libpurple/protocols/msn/msn.c:763 ../libpurple/protocols/msnp9/msn.c:647
 msgid "Set Mobile Phone Number..."
 msgstr "Aseta matkapuhelinnumero..."
 
-#: ../libpurple/protocols/msn/msn.c:761 ../libpurple/protocols/msnp9/msn.c:642
+#: ../libpurple/protocols/msn/msn.c:769 ../libpurple/protocols/msnp9/msn.c:653
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Aseta päälle/pois mobiililaitteet..."
 
-#: ../libpurple/protocols/msn/msn.c:766 ../libpurple/protocols/msnp9/msn.c:647
+#: ../libpurple/protocols/msn/msn.c:774 ../libpurple/protocols/msnp9/msn.c:658
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Salli/estä mobiilihaut..."
 
-#: ../libpurple/protocols/msn/msn.c:777 ../libpurple/protocols/msnp9/msn.c:658
+#: ../libpurple/protocols/msn/msn.c:785 ../libpurple/protocols/msnp9/msn.c:669
 msgid "Open Hotmail Inbox"
 msgstr "Avaa Hotmailin saapuneet-kansio"
 
-#: ../libpurple/protocols/msn/msn.c:801 ../libpurple/protocols/msnp9/msn.c:682
+#: ../libpurple/protocols/msn/msn.c:809 ../libpurple/protocols/msnp9/msn.c:693
 msgid "Send to Mobile"
 msgstr "Lähetä mobiililaitteeseen"
 
-#: ../libpurple/protocols/msn/msn.c:811 ../libpurple/protocols/msnp9/msn.c:692
-#: ../libpurple/protocols/novell/novell.c:3425
+#: ../libpurple/protocols/msn/msn.c:819 ../libpurple/protocols/msnp9/msn.c:703
+#: ../libpurple/protocols/novell/novell.c:3426
 msgid "Initiate _Chat"
 msgstr "Aloita _ryhmäkeskustelu"
 
-#: ../libpurple/protocols/msn/msn.c:849 ../libpurple/protocols/msnp9/msn.c:731
+#: ../libpurple/protocols/msn/msn.c:857 ../libpurple/protocols/msnp9/msn.c:742
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN vaatii SSL-tuen. Asenna tuettu SSL-kirjasto."
 
-#: ../libpurple/protocols/msn/msn.c:879 ../libpurple/protocols/msnp9/msn.c:761
+#: ../libpurple/protocols/msn/msn.c:887 ../libpurple/protocols/msnp9/msn.c:772
 msgid "Failed to connect to server."
 msgstr "Palvelimeen ei saatu yhteyttä."
 
-#: ../libpurple/protocols/msn/msn.c:1663 ../libpurple/protocols/msn/msn.c:2006
-#: ../libpurple/protocols/msnp9/msn.c:1516
-#: ../libpurple/protocols/msnp9/msn.c:1859
+#: ../libpurple/protocols/msn/msn.c:1671 ../libpurple/protocols/msn/msn.c:2014
+#: ../libpurple/protocols/msnp9/msn.c:1527
+#: ../libpurple/protocols/msnp9/msn.c:1870
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Virhe haettaessa profiilia"
 
-#: ../libpurple/protocols/msn/msn.c:1729
-#: ../libpurple/protocols/msnp9/msn.c:1582 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:360
+#: ../libpurple/protocols/msn/msn.c:1737
+#: ../libpurple/protocols/msnp9/msn.c:1593 ../pidgin/plugins/convcolors.c:371
+#: ../pidgin/plugins/pidginrc.c:372
 msgid "General"
 msgstr "Yleinen"
 
-#: ../libpurple/protocols/msn/msn.c:1736
-#: ../libpurple/protocols/msnp9/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3765
+#: ../libpurple/protocols/msn/msn.c:1744
+#: ../libpurple/protocols/msnp9/msn.c:1600
+#: ../libpurple/protocols/myspace/user.c:125
+#: ../libpurple/protocols/oscar/oscar.c:3788
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:222
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1087
 msgid "Age"
 msgstr "Ikä"
 
-#: ../libpurple/protocols/msn/msn.c:1738
-#: ../libpurple/protocols/msnp9/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1746
+#: ../libpurple/protocols/msnp9/msn.c:1602
 #: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1102
 msgid "Occupation"
 msgstr "Ammatti"
 
-#: ../libpurple/protocols/msn/msn.c:1739
-#: ../libpurple/protocols/msnp9/msn.c:1592
-#: ../libpurple/protocols/myspace/user.c:123
+#: ../libpurple/protocols/msn/msn.c:1747
+#: ../libpurple/protocols/msnp9/msn.c:1603
+#: ../libpurple/protocols/myspace/user.c:133
 #: ../libpurple/protocols/novell/novell.c:1487
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
-#: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1215
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1082
+#: ../libpurple/protocols/zephyr/zephyr.c:802
+#: ../libpurple/protocols/zephyr/zephyr.c:1175
 msgid "Location"
 msgstr "Sijainti"
 
-#: ../libpurple/protocols/msn/msn.c:1744 ../libpurple/protocols/msn/msn.c:1936
-#: ../libpurple/protocols/msn/msn.c:1942 ../libpurple/protocols/msn/msn.c:1949
-#: ../libpurple/protocols/msnp9/msn.c:1597
-#: ../libpurple/protocols/msnp9/msn.c:1789
-#: ../libpurple/protocols/msnp9/msn.c:1795
-#: ../libpurple/protocols/msnp9/msn.c:1802
+#: ../libpurple/protocols/msn/msn.c:1752 ../libpurple/protocols/msn/msn.c:1944
+#: ../libpurple/protocols/msn/msn.c:1950 ../libpurple/protocols/msn/msn.c:1957
+#: ../libpurple/protocols/msnp9/msn.c:1608
+#: ../libpurple/protocols/msnp9/msn.c:1800
+#: ../libpurple/protocols/msnp9/msn.c:1806
+#: ../libpurple/protocols/msnp9/msn.c:1813
 msgid "Hobbies and Interests"
 msgstr "Harrastukset"
 
-#: ../libpurple/protocols/msn/msn.c:1750 ../libpurple/protocols/msn/msn.c:1870
-#: ../libpurple/protocols/msn/msn.c:1876 ../libpurple/protocols/msn/msn.c:1883
-#: ../libpurple/protocols/msn/msn.c:1891 ../libpurple/protocols/msn/msn.c:1898
-#: ../libpurple/protocols/msnp9/msn.c:1603
-#: ../libpurple/protocols/msnp9/msn.c:1723
-#: ../libpurple/protocols/msnp9/msn.c:1729
-#: ../libpurple/protocols/msnp9/msn.c:1736
-#: ../libpurple/protocols/msnp9/msn.c:1744
-#: ../libpurple/protocols/msnp9/msn.c:1751
+#: ../libpurple/protocols/msn/msn.c:1758 ../libpurple/protocols/msn/msn.c:1878
+#: ../libpurple/protocols/msn/msn.c:1884 ../libpurple/protocols/msn/msn.c:1891
+#: ../libpurple/protocols/msn/msn.c:1899 ../libpurple/protocols/msn/msn.c:1906
+#: ../libpurple/protocols/msnp9/msn.c:1614
+#: ../libpurple/protocols/msnp9/msn.c:1734
+#: ../libpurple/protocols/msnp9/msn.c:1740
+#: ../libpurple/protocols/msnp9/msn.c:1747
+#: ../libpurple/protocols/msnp9/msn.c:1755
+#: ../libpurple/protocols/msnp9/msn.c:1762
 msgid "A Little About Me"
 msgstr "Oma kuvaus"
 
-#: ../libpurple/protocols/msn/msn.c:1767
-#: ../libpurple/protocols/msnp9/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msnp9/msn.c:1631
 msgid "Social"
 msgstr "Vapaa-aika"
 
-#: ../libpurple/protocols/msn/msn.c:1769
-#: ../libpurple/protocols/msnp9/msn.c:1622
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
+#: ../libpurple/protocols/msn/msn.c:1777
+#: ../libpurple/protocols/msnp9/msn.c:1633
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1092
 msgid "Marital Status"
 msgstr "Siviilisääty"
 
-#: ../libpurple/protocols/msn/msn.c:1770
-#: ../libpurple/protocols/msnp9/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1778
+#: ../libpurple/protocols/msnp9/msn.c:1634
 msgid "Interests"
 msgstr "Kiinnostukset"
 
-#: ../libpurple/protocols/msn/msn.c:1771
-#: ../libpurple/protocols/msnp9/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msnp9/msn.c:1635
 msgid "Pets"
 msgstr "Lemmikit"
 
-#: ../libpurple/protocols/msn/msn.c:1772
-#: ../libpurple/protocols/msnp9/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1780
+#: ../libpurple/protocols/msnp9/msn.c:1636
 msgid "Hometown"
 msgstr "Kotikunta"
 
-#: ../libpurple/protocols/msn/msn.c:1773
-#: ../libpurple/protocols/msnp9/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1781
+#: ../libpurple/protocols/msnp9/msn.c:1637
 msgid "Places Lived"
 msgstr "Asumispaikat"
 
-#: ../libpurple/protocols/msn/msn.c:1774
-#: ../libpurple/protocols/msnp9/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1782
+#: ../libpurple/protocols/msnp9/msn.c:1638
 msgid "Fashion"
 msgstr "Tyyli"
 
-#: ../libpurple/protocols/msn/msn.c:1775
-#: ../libpurple/protocols/msnp9/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1783
+#: ../libpurple/protocols/msnp9/msn.c:1639
 msgid "Humor"
 msgstr "Huumorintaju"
 
-#: ../libpurple/protocols/msn/msn.c:1776
-#: ../libpurple/protocols/msnp9/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/msnp9/msn.c:1640
 msgid "Music"
 msgstr "Musiikki"
 
-#: ../libpurple/protocols/msn/msn.c:1777 ../libpurple/protocols/msn/msn.c:1958
-#: ../libpurple/protocols/msn/msn.c:1964
-#: ../libpurple/protocols/msnp9/msn.c:1630
-#: ../libpurple/protocols/msnp9/msn.c:1811
-#: ../libpurple/protocols/msnp9/msn.c:1817
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
+#: ../libpurple/protocols/msn/msn.c:1785 ../libpurple/protocols/msn/msn.c:1966
+#: ../libpurple/protocols/msn/msn.c:1972
+#: ../libpurple/protocols/msnp9/msn.c:1641
+#: ../libpurple/protocols/msnp9/msn.c:1822
+#: ../libpurple/protocols/msnp9/msn.c:1828
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1144
 msgid "Favorite Quote"
 msgstr "Lempisanonta"
 
-#: ../libpurple/protocols/msn/msn.c:1794
-#: ../libpurple/protocols/msnp9/msn.c:1647
+#: ../libpurple/protocols/msn/msn.c:1802
+#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Contact Info"
 msgstr "Yhteystiedot"
 
-#: ../libpurple/protocols/msn/msn.c:1795
-#: ../libpurple/protocols/msnp9/msn.c:1648
+#: ../libpurple/protocols/msn/msn.c:1803
+#: ../libpurple/protocols/msnp9/msn.c:1659
 msgid "Personal"
 msgstr "Koti"
 
-#: ../libpurple/protocols/msn/msn.c:1798
-#: ../libpurple/protocols/msnp9/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1806
+#: ../libpurple/protocols/msnp9/msn.c:1662
 msgid "Significant Other"
 msgstr "Elämänkumppani"
 
-#: ../libpurple/protocols/msn/msn.c:1799
-#: ../libpurple/protocols/msnp9/msn.c:1652
+#: ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msnp9/msn.c:1663
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1800
-#: ../libpurple/protocols/msnp9/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msnp9/msn.c:1664
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: ../libpurple/protocols/msn/msn.c:1801
-#: ../libpurple/protocols/msnp9/msn.c:1654
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/msn/msn.c:1809
+#: ../libpurple/protocols/msnp9/msn.c:1665
+#: ../libpurple/protocols/oscar/oscar.c:3826
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: ../libpurple/protocols/msn/msn.c:1802
-#: ../libpurple/protocols/msnp9/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1810
+#: ../libpurple/protocols/msnp9/msn.c:1666
 msgid "Personal Mobile"
 msgstr "Oma matkapuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1803
-#: ../libpurple/protocols/msnp9/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1811
+#: ../libpurple/protocols/msnp9/msn.c:1667
 msgid "Home Fax"
 msgstr "Kotifaksi"
 
-#: ../libpurple/protocols/msn/msn.c:1804
-#: ../libpurple/protocols/msnp9/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1812
+#: ../libpurple/protocols/msnp9/msn.c:1668
 msgid "Personal E-Mail"
 msgstr "Oma sähköposti"
 
-#: ../libpurple/protocols/msn/msn.c:1805
-#: ../libpurple/protocols/msnp9/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1813
+#: ../libpurple/protocols/msnp9/msn.c:1669
 msgid "Personal IM"
 msgstr "Oma pikaviestin"
 
-#: ../libpurple/protocols/msn/msn.c:1807
-#: ../libpurple/protocols/msnp9/msn.c:1660
+#: ../libpurple/protocols/msn/msn.c:1815
+#: ../libpurple/protocols/msnp9/msn.c:1671
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1823
-#: ../libpurple/protocols/msnp9/msn.c:1676
+#: ../libpurple/protocols/msn/msn.c:1831
+#: ../libpurple/protocols/msnp9/msn.c:1687
 msgid "Work"
 msgstr "Työ"
 
-#: ../libpurple/protocols/msn/msn.c:1825
-#: ../libpurple/protocols/msnp9/msn.c:1678
+#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msnp9/msn.c:1689
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Tehtävänimike"
 
-#: ../libpurple/protocols/msn/msn.c:1826
-#: ../libpurple/protocols/msnp9/msn.c:1679
-#: ../libpurple/protocols/oscar/oscar.c:3824
+#: ../libpurple/protocols/msn/msn.c:1834
+#: ../libpurple/protocols/msnp9/msn.c:1690
+#: ../libpurple/protocols/oscar/oscar.c:3847
 msgid "Company"
 msgstr "Yritys"
 
-#: ../libpurple/protocols/msn/msn.c:1827
-#: ../libpurple/protocols/msnp9/msn.c:1680
+#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msnp9/msn.c:1691
 #: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "Osasto"
 
-#: ../libpurple/protocols/msn/msn.c:1828
-#: ../libpurple/protocols/msnp9/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1836
+#: ../libpurple/protocols/msnp9/msn.c:1692
 msgid "Profession"
 msgstr "Ammatti"
 
-#: ../libpurple/protocols/msn/msn.c:1829
-#: ../libpurple/protocols/msnp9/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1837
+#: ../libpurple/protocols/msnp9/msn.c:1693
 msgid "Work Phone"
 msgstr "Työpuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1830
-#: ../libpurple/protocols/msnp9/msn.c:1683
+#: ../libpurple/protocols/msn/msn.c:1838
+#: ../libpurple/protocols/msnp9/msn.c:1694
 msgid "Work Phone 2"
 msgstr "Työpuhelin 2"
 
-#: ../libpurple/protocols/msn/msn.c:1831
-#: ../libpurple/protocols/msnp9/msn.c:1684
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/msn/msn.c:1839
+#: ../libpurple/protocols/msnp9/msn.c:1695
+#: ../libpurple/protocols/oscar/oscar.c:3839
 msgid "Work Address"
 msgstr "Työosoite"
 
-#: ../libpurple/protocols/msn/msn.c:1832
-#: ../libpurple/protocols/msnp9/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1840
+#: ../libpurple/protocols/msnp9/msn.c:1696
 msgid "Work Mobile"
 msgstr "Työmatkapuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1833
-#: ../libpurple/protocols/msnp9/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/msnp9/msn.c:1697
 msgid "Work Pager"
 msgstr "Työhakulaite"
 
-#: ../libpurple/protocols/msn/msn.c:1834
-#: ../libpurple/protocols/msnp9/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1842
+#: ../libpurple/protocols/msnp9/msn.c:1698
 msgid "Work Fax"
 msgstr "Työfaksi"
 
-#: ../libpurple/protocols/msn/msn.c:1835
-#: ../libpurple/protocols/msnp9/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1843
+#: ../libpurple/protocols/msnp9/msn.c:1699
 msgid "Work E-Mail"
 msgstr "Työsähköposti"
 
-#: ../libpurple/protocols/msn/msn.c:1836
-#: ../libpurple/protocols/msnp9/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1844
+#: ../libpurple/protocols/msnp9/msn.c:1700
 msgid "Work IM"
 msgstr "Työ pikaviestin"
 
-#: ../libpurple/protocols/msn/msn.c:1837
-#: ../libpurple/protocols/msnp9/msn.c:1690
+#: ../libpurple/protocols/msn/msn.c:1845
+#: ../libpurple/protocols/msnp9/msn.c:1701
 msgid "Start Date"
 msgstr "Aloituspäivä"
 
-#: ../libpurple/protocols/msn/msn.c:1907 ../libpurple/protocols/msn/msn.c:1913
-#: ../libpurple/protocols/msn/msn.c:1920 ../libpurple/protocols/msn/msn.c:1927
-#: ../libpurple/protocols/msnp9/msn.c:1760
-#: ../libpurple/protocols/msnp9/msn.c:1766
-#: ../libpurple/protocols/msnp9/msn.c:1773
-#: ../libpurple/protocols/msnp9/msn.c:1780
+#: ../libpurple/protocols/msn/msn.c:1915 ../libpurple/protocols/msn/msn.c:1921
+#: ../libpurple/protocols/msn/msn.c:1928 ../libpurple/protocols/msn/msn.c:1935
+#: ../libpurple/protocols/msnp9/msn.c:1771
+#: ../libpurple/protocols/msnp9/msn.c:1777
+#: ../libpurple/protocols/msnp9/msn.c:1784
+#: ../libpurple/protocols/msnp9/msn.c:1791
 msgid "Favorite Things"
 msgstr "Lempiasiat"
 
-#: ../libpurple/protocols/msn/msn.c:1972
-#: ../libpurple/protocols/msnp9/msn.c:1825
+#: ../libpurple/protocols/msn/msn.c:1980
+#: ../libpurple/protocols/msnp9/msn.c:1836
 msgid "Last Updated"
 msgstr "Edellinen päivitys"
 
-#: ../libpurple/protocols/msn/msn.c:1983
-#: ../libpurple/protocols/msnp9/msn.c:1836
+#: ../libpurple/protocols/msn/msn.c:1991
+#: ../libpurple/protocols/msnp9/msn.c:1847
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#: ../libpurple/protocols/msn/msn.c:2007
-#: ../libpurple/protocols/msnp9/msn.c:1860
+#: ../libpurple/protocols/msn/msn.c:2015
+#: ../libpurple/protocols/msnp9/msn.c:1871
 msgid "The user has not created a public profile."
 msgstr "Käyttäjällä ei ole julkista profiilia."
 
-#: ../libpurple/protocols/msn/msn.c:2008
-#: ../libpurple/protocols/msnp9/msn.c:1861
+#: ../libpurple/protocols/msn/msn.c:2016
+#: ../libpurple/protocols/msnp9/msn.c:1872
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -7172,8 +7336,8 @@ msgstr ""
 "MSN ilmoitti ettei käyttäjän profiilia löydy. Tämä tarkoittaa joko sitä että "
 "käyttäjää ei ole tai käyttäjä ei ole luonut julkista profiilia."
 
-#: ../libpurple/protocols/msn/msn.c:2012
-#: ../libpurple/protocols/msnp9/msn.c:1865
+#: ../libpurple/protocols/msn/msn.c:2020
+#: ../libpurple/protocols/msnp9/msn.c:1876
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -7181,9 +7345,9 @@ msgstr ""
 "Käyttäjän profiilista ei löytynyt mitään tietoja. Käyttäjää ei "
 "todennäköisesti ole olemassa."
 
-#: ../libpurple/protocols/msn/msn.c:2020
-#: ../libpurple/protocols/msnp9/msn.c:1873
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
+#: ../libpurple/protocols/msn/msn.c:2028
+#: ../libpurple/protocols/msnp9/msn.c:1884
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1246
 msgid "Profile URL"
 msgstr "Profiilin URL"
 
@@ -7197,27 +7361,27 @@ msgstr "Profiilin URL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2307 ../libpurple/protocols/msn/msn.c:2309
+#: ../libpurple/protocols/msn/msn.c:2315 ../libpurple/protocols/msn/msn.c:2317
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr "Windows Live Messenger -yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/msn/msn.c:2344
-#: ../libpurple/protocols/msnp9/msn.c:2195
+#: ../libpurple/protocols/msn/msn.c:2352
+#: ../libpurple/protocols/msnp9/msn.c:2206
 msgid "Use HTTP Method"
 msgstr "Käytä HTTP-yhteystapaa"
 
-#: ../libpurple/protocols/msn/msn.c:2349
-#: ../libpurple/protocols/msnp9/msn.c:2200
+#: ../libpurple/protocols/msn/msn.c:2357
+#: ../libpurple/protocols/msnp9/msn.c:2211
 msgid "HTTP Method Server"
 msgstr "HTTP-yhteystavan palvelin"
 
-#: ../libpurple/protocols/msn/msn.c:2354
-#: ../libpurple/protocols/msnp9/msn.c:2205
+#: ../libpurple/protocols/msn/msn.c:2362
+#: ../libpurple/protocols/msnp9/msn.c:2216
 msgid "Show custom smileys"
 msgstr "Näytä itse tehdyt / lisätyt hymiöt"
 
-#: ../libpurple/protocols/msn/msn.c:2362
-#: ../libpurple/protocols/msnp9/msn.c:2213
+#: ../libpurple/protocols/msn/msn.c:2370
+#: ../libpurple/protocols/msnp9/msn.c:2224
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: tönäise tuttavaa huomion saamiseksi"
 
@@ -7248,8 +7412,8 @@ msgstr "%s ei ole kelvollinen ryhmä."
 #: ../libpurple/protocols/msn/notification.c:931
 #: ../libpurple/protocols/msn/session.c:387
 #: ../libpurple/protocols/msnp9/notification.c:184
-#: ../libpurple/protocols/msnp9/notification.c:532
-#: ../libpurple/protocols/msnp9/session.c:340
+#: ../libpurple/protocols/msnp9/notification.c:534
+#: ../libpurple/protocols/msnp9/session.c:339
 msgid "Unknown error."
 msgstr "Tuntematon virhe."
 
@@ -7270,57 +7434,57 @@ msgstr "Tuntematon virhe (%d)"
 msgstr "Tuntematon virhe (%d)"
 
 #: ../libpurple/protocols/msn/notification.c:837
-#: ../libpurple/protocols/sametime/sametime.c:4471
+#: ../libpurple/protocols/sametime/sametime.c:4479
 msgid "Unable to add user"
 msgstr "Käyttäjää ei voi lisätä"
 
 #: ../libpurple/protocols/msn/notification.c:897
-#: ../libpurple/protocols/msnp9/notification.c:498
+#: ../libpurple/protocols/msnp9/notification.c:500
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Käyttäjää ei voi lisätä %s (%s)"
 
 #: ../libpurple/protocols/msn/notification.c:901
-#: ../libpurple/protocols/msnp9/notification.c:502
+#: ../libpurple/protocols/msnp9/notification.c:504
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Ei voi estää käyttäjää %s (%s)"
 
 #: ../libpurple/protocols/msn/notification.c:905
-#: ../libpurple/protocols/msnp9/notification.c:506
+#: ../libpurple/protocols/msnp9/notification.c:508
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Käyttäjää ei voi sallia %s (%s)"
 
 #: ../libpurple/protocols/msn/notification.c:913
-#: ../libpurple/protocols/msnp9/notification.c:514
+#: ../libpurple/protocols/msnp9/notification.c:516
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "Käyttäjää %s ei voi lisätä koska tuttavia on liikaa."
 
 #: ../libpurple/protocols/msn/notification.c:922
-#: ../libpurple/protocols/msnp9/notification.c:523
+#: ../libpurple/protocols/msnp9/notification.c:525
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s ei ole kelvollinen passport-tili"
 
 #: ../libpurple/protocols/msn/notification.c:927
-#: ../libpurple/protocols/msnp9/notification.c:528
+#: ../libpurple/protocols/msnp9/notification.c:530
 msgid "Service Temporarily Unavailable."
 msgstr "Palvelu ei tilapäisesti ole käytettävissä."
 
-#: ../libpurple/protocols/msn/notification.c:1263
-#: ../libpurple/protocols/msnp9/notification.c:851
+#: ../libpurple/protocols/msn/notification.c:1276
+#: ../libpurple/protocols/msnp9/notification.c:898
 msgid "Unable to rename group"
 msgstr "Ryhmän uudelleen nimeäminen epäonnistui"
 
-#: ../libpurple/protocols/msn/notification.c:1318
-#: ../libpurple/protocols/msnp9/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:1331
+#: ../libpurple/protocols/msnp9/notification.c:953
 msgid "Unable to delete group"
 msgstr "Ryhmää ei voi poistaa"
 
-#: ../libpurple/protocols/msn/notification.c:1931
-#: ../libpurple/protocols/msnp9/notification.c:1325
+#: ../libpurple/protocols/msn/notification.c:1945
+#: ../libpurple/protocols/msnp9/notification.c:1372
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7365,8 +7529,9 @@ msgstr[1] ""
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:272
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:307
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:338
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1564
+#: ../libpurple/protocols/yahoo/yahoochat.c:1425
+#: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Unable to connect"
 msgstr "Yhteyden muodostaminen epäonnistui"
 
@@ -7391,70 +7556,70 @@ msgstr ""
 "%s"
 
 #: ../libpurple/protocols/msn/session.c:349
-#: ../libpurple/protocols/msnp9/session.c:302
+#: ../libpurple/protocols/msnp9/session.c:301
 msgid "Our protocol is not supported by the server."
 msgstr "Palvelin ei tue yhteyskäytäntöä."
 
 #: ../libpurple/protocols/msn/session.c:354
-#: ../libpurple/protocols/msnp9/session.c:307
+#: ../libpurple/protocols/msnp9/session.c:306
 msgid "Error parsing HTTP."
 msgstr "Virhe jäsennettäessä HTTP:tä."
 
 #: ../libpurple/protocols/msn/session.c:358
-#: ../libpurple/protocols/msnp9/session.c:311
+#: ../libpurple/protocols/msnp9/session.c:310
 #: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:207
+#: ../libpurple/protocols/yahoo/yahoo.c:155
 msgid "You have signed on from another location."
 msgstr "Olet kirjautunut sisään toisesta paikasta."
 
 #: ../libpurple/protocols/msn/session.c:364
-#: ../libpurple/protocols/msnp9/session.c:317
+#: ../libpurple/protocols/msnp9/session.c:316
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN-palvelimet ovat väliaikaisesti tavoittamattomissa. Odota ja yritä "
 "uudelleen."
 
 #: ../libpurple/protocols/msn/session.c:370
-#: ../libpurple/protocols/msnp9/session.c:323
+#: ../libpurple/protocols/msnp9/session.c:322
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN-palvelimet ajetaan alas väliaikaisesti."
 
 #: ../libpurple/protocols/msn/session.c:375
-#: ../libpurple/protocols/msnp9/session.c:328
+#: ../libpurple/protocols/msnp9/session.c:327
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Tunnistautuminen ei onnistu: %s"
 
 #: ../libpurple/protocols/msn/session.c:381
-#: ../libpurple/protocols/msnp9/session.c:334
+#: ../libpurple/protocols/msnp9/session.c:333
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "MSN-tuttavia ei väliaikaisesti voi hakea. Yritä myöhemmin uudelleen."
 
 #: ../libpurple/protocols/msn/session.c:403
 #: ../libpurple/protocols/msn/session.c:405
-#: ../libpurple/protocols/msnp9/session.c:356
-#: ../libpurple/protocols/msnp9/session.c:358
+#: ../libpurple/protocols/msnp9/session.c:355
+#: ../libpurple/protocols/msnp9/session.c:357
 msgid "Handshaking"
 msgstr "Kättely"
 
 #: ../libpurple/protocols/msn/session.c:406
-#: ../libpurple/protocols/msnp9/session.c:359
+#: ../libpurple/protocols/msnp9/session.c:358
 msgid "Starting authentication"
 msgstr "Aloitetaan tunnistautumista"
 
 #: ../libpurple/protocols/msn/session.c:407
-#: ../libpurple/protocols/msnp9/session.c:360
+#: ../libpurple/protocols/msnp9/session.c:359
 msgid "Getting cookie"
 msgstr "Haetaan evästettä"
 
 #: ../libpurple/protocols/msn/session.c:409
-#: ../libpurple/protocols/msnp9/session.c:362
+#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Sending cookie"
 msgstr "Lähetetään evästettä"
 
 #: ../libpurple/protocols/msn/session.c:410
-#: ../libpurple/protocols/msnp9/session.c:363
+#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Retrieving buddy list"
 msgstr "Noudetaan tuttavia"
 
@@ -7473,33 +7638,33 @@ msgstr "Lounaalla"
 msgid "Out To Lunch"
 msgstr "Lounaalla"
 
-#: ../libpurple/protocols/msn/switchboard.c:398
-#: ../libpurple/protocols/msnp9/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:406
+#: ../libpurple/protocols/msnp9/switchboard.c:408
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Viestiä ei välttämättä lähetetty koska tapahtui aikakatkaisu:"
 
-#: ../libpurple/protocols/msn/switchboard.c:406
-#: ../libpurple/protocols/msnp9/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:414
+#: ../libpurple/protocols/msnp9/switchboard.c:416
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Viestien lähetys ei ole sallittu näkymättömänä:"
 
-#: ../libpurple/protocols/msn/switchboard.c:410
-#: ../libpurple/protocols/msnp9/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:418
+#: ../libpurple/protocols/msnp9/switchboard.c:420
 msgid "Message could not be sent because the user is offline:"
 msgstr "Viestiä ei voi lähettää koska käyttäjä on poissa linjoilta:"
 
-#: ../libpurple/protocols/msn/switchboard.c:414
-#: ../libpurple/protocols/msnp9/switchboard.c:416
+#: ../libpurple/protocols/msn/switchboard.c:422
+#: ../libpurple/protocols/msnp9/switchboard.c:424
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Viestiä ei voi lähettää yhteysvirheen vuoksi:"
 
-#: ../libpurple/protocols/msn/switchboard.c:418
-#: ../libpurple/protocols/msnp9/switchboard.c:420
+#: ../libpurple/protocols/msn/switchboard.c:426
+#: ../libpurple/protocols/msnp9/switchboard.c:428
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "Viestiä ei voi lähettää koska viestejä lähetetään liian nopeasti:"
 
-#: ../libpurple/protocols/msn/switchboard.c:422
-#: ../libpurple/protocols/msnp9/switchboard.c:424
+#: ../libpurple/protocols/msn/switchboard.c:430
+#: ../libpurple/protocols/msnp9/switchboard.c:432
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
@@ -7508,26 +7673,26 @@ msgstr ""
 "Tämä on luultavasti ongelma palvelimella, yritä uudelleen muutaman minuutin "
 "päästä:"
 
-#: ../libpurple/protocols/msn/switchboard.c:429
-#: ../libpurple/protocols/msnp9/switchboard.c:431
+#: ../libpurple/protocols/msn/switchboard.c:437
+#: ../libpurple/protocols/msnp9/switchboard.c:439
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "Viestiä ei voi lähettää kytkentäpalvelimen kanssa tapahtuneen virheen vuoksi:"
 
-#: ../libpurple/protocols/msn/switchboard.c:437
-#: ../libpurple/protocols/msnp9/switchboard.c:439
+#: ../libpurple/protocols/msn/switchboard.c:445
+#: ../libpurple/protocols/msnp9/switchboard.c:447
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Viestiä ei voi lähettää tuntemattoman virheen vuoksi:"
 
 #: ../libpurple/protocols/msn/userlist.c:243
-#: ../libpurple/protocols/msnp9/userlist.c:252
+#: ../libpurple/protocols/msnp9/userlist.c:262
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "Käyttäjä %s on lisännyt sinut tuttaviinsa."
 
 #: ../libpurple/protocols/msn/userlist.c:312
-#: ../libpurple/protocols/msnp9/userlist.c:321
+#: ../libpurple/protocols/msnp9/userlist.c:331
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s on poistanut sinut tuttavistaan."
@@ -7536,17 +7701,17 @@ msgstr "%s on poistanut sinut tuttavista
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
 #: ../libpurple/protocols/msn/userlist.c:693
-#: ../libpurple/protocols/msnp9/userlist.c:643
+#: ../libpurple/protocols/msnp9/userlist.c:653
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Ei voi lisätä \"%s\"."
 
 #: ../libpurple/protocols/msn/userlist.c:696
-#: ../libpurple/protocols/msnp9/userlist.c:645
+#: ../libpurple/protocols/msnp9/userlist.c:655
 msgid "The screen name specified is invalid."
 msgstr "Syötetty näyttönimi on virheellinen."
 
-#: ../libpurple/protocols/msnp9/msn.c:549
+#: ../libpurple/protocols/msnp9/msn.c:546
 msgid "Has you"
 msgstr "Olet hänen listallaan"
 
@@ -7560,8 +7725,8 @@ msgstr "Olet hänen listallaan"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msnp9/msn.c:2159
-#: ../libpurple/protocols/msnp9/msn.c:2161
+#: ../libpurple/protocols/msnp9/msn.c:2170
+#: ../libpurple/protocols/msnp9/msn.c:2172
 msgid "MSN Protocol Plugin"
 msgstr "MSN-yhteyskäytäntöliitännäinen"
 
@@ -7581,150 +7746,149 @@ msgstr ""
 "Päivitä libpurpleen jossa RC4-tuki (>= 2.0.1). MySpaceIM-liitännäistä ei "
 "ladattu."
 
-#: ../libpurple/protocols/myspace/myspace.c:286
-#, c-format
-msgid ""
-"Sorry, passwords over %d characters in length (yours is %d) are not "
-"supported by MySpace."
-msgstr ""
-"Pahoittelut, MySpace ei tue salasanoja jotka ovat yli %d kirjainta pitkiä "
-"(sinun on %d kirjainta)."
-
-#. Notify an error message also, because this is important!
-#: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1820
-msgid "MySpaceIM Error"
-msgstr "MySpaceIM-virhe"
-
-#: ../libpurple/protocols/myspace/myspace.c:352
+#: ../libpurple/protocols/myspace/myspace.c:345
 msgid "Reading challenge"
 msgstr "Luetaan tunnistushaastetta"
 
-#: ../libpurple/protocols/myspace/myspace.c:360
+#: ../libpurple/protocols/myspace/myspace.c:353
 msgid "Unexpected challenge length from server"
 msgstr "Odottamaton tunnistushaasteen pituus palvelimelta"
 
-#: ../libpurple/protocols/myspace/myspace.c:364
+#: ../libpurple/protocols/myspace/myspace.c:357
 msgid "Logging in"
 msgstr "Kirjaudutaan sisään"
 
-#: ../libpurple/protocols/myspace/myspace.c:1296
+#: ../libpurple/protocols/myspace/myspace.c:1322
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr "Yhteys palvelimelle katkesi (dataa ei vastaanotettu %d sekunnissa)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1339
+#: ../libpurple/protocols/myspace/myspace.c:1365
 msgid "New mail messages"
 msgstr "Uusia viestejä postilaatikossa"
 
-#: ../libpurple/protocols/myspace/myspace.c:1340
+#: ../libpurple/protocols/myspace/myspace.c:1366
 msgid "New blog comments"
 msgstr "Uusia blogikommentteja"
 
-#: ../libpurple/protocols/myspace/myspace.c:1341
+#: ../libpurple/protocols/myspace/myspace.c:1367
 msgid "New profile comments"
 msgstr "Uusia profiilikommentteja"
 
-#: ../libpurple/protocols/myspace/myspace.c:1342
+#: ../libpurple/protocols/myspace/myspace.c:1368
 msgid "New friend requests!"
 msgstr "Uusia kaveripyyntöjä."
 
-#: ../libpurple/protocols/myspace/myspace.c:1343
+#: ../libpurple/protocols/myspace/myspace.c:1369
 msgid "New picture comments"
 msgstr "Uusia kuvakommentteja"
 
-#: ../libpurple/protocols/myspace/myspace.c:1371
+#: ../libpurple/protocols/myspace/myspace.c:1399
 msgid "MySpace"
 msgstr "MySpace"
 
+#: ../libpurple/protocols/myspace/myspace.c:1585
+msgid "MySpaceIM - No Username Set"
+msgstr "MySpaceIM - Käyttäjänimeä ei asetettu"
+
+#: ../libpurple/protocols/myspace/myspace.c:1586
+msgid "You appear to have no MySpace username."
+msgstr "Sinulla ei näytä olevan MySpace-käyttäjänimeä."
+
+#: ../libpurple/protocols/myspace/myspace.c:1587
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr "Haluatko asettaa sen nyt? (Huom: TÄTÄ EI VOI MUUTTAA)"
+
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1554
+#: ../libpurple/protocols/myspace/myspace.c:1611
 #: ../libpurple/protocols/sametime/sametime.c:1546
 msgid "Connected"
 msgstr "Yhdistetty"
 
-#: ../libpurple/protocols/myspace/myspace.c:1565
-#: ../libpurple/protocols/myspace/myspace.c:1568
-msgid "No username set"
-msgstr "Käyttäjänimeä ei asetettu"
+#: ../libpurple/protocols/myspace/myspace.c:1846
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "Yhteyskäytäntövirhe, virhekoodi %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1566
+#: ../libpurple/protocols/myspace/myspace.c:1868
+#, c-format
 msgid ""
-"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-"username and choose a username and try to login again."
+"%s Your password is %d characters, greater than the expected maximum length "
+"of %d for MySpaceIM. Please shorten your password at http://profileedit."
+"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
+"again."
 msgstr ""
-"Mene osoitteeseen http://editprofile.myspace.com/index.cfm?"
-"fuseaction=profile.username ja valitse käyttäjänimesi. Kirjaudu sitten "
-"uudestaan."
+"%s Salasanasi on %d merkkiä, mikä on enemmän kuin MySpaceIM:n odottama "
+"suurin mahdollinen %d merkkiä. Lyhennä salasanaasi osoitteessa http://profi"
+"leedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
+"ja yritä uudelleen."
 
-#: ../libpurple/protocols/myspace/myspace.c:1794
-#, c-format
-msgid "Protocol error, code %d: %s"
-msgstr "Yhteyskäytäntövirhe, virhekoodi %d: %s"
+#: ../libpurple/protocols/myspace/myspace.c:1891
+msgid "MySpaceIM Error"
+msgstr "MySpaceIM-virhe"
 
-#: ../libpurple/protocols/myspace/myspace.c:1990
-#: ../libpurple/protocols/myspace/myspace.c:2024
+#: ../libpurple/protocols/myspace/myspace.c:2069
+#: ../libpurple/protocols/myspace/myspace.c:2103
 msgid "Failed to add buddy"
 msgstr "Tuttavan lisääminen epäonnistui"
 
-#: ../libpurple/protocols/myspace/myspace.c:1990
+#: ../libpurple/protocols/myspace/myspace.c:2069
 msgid "'addbuddy' command failed."
 msgstr "\"addbuddy\"-komento epäonnistui."
 
-#: ../libpurple/protocols/myspace/myspace.c:2024
-#: ../libpurple/protocols/myspace/myspace.c:2261
+#: ../libpurple/protocols/myspace/myspace.c:2103
+#: ../libpurple/protocols/myspace/myspace.c:2348
 msgid "persist command failed"
 msgstr "persist-komento epäonnistui"
 
-#: ../libpurple/protocols/myspace/myspace.c:2129
+#: ../libpurple/protocols/myspace/myspace.c:2208
 #, c-format
 msgid "No such user: %s"
 msgstr "Käyttäjää ei löydy: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2130
+#: ../libpurple/protocols/myspace/myspace.c:2210
 msgid "User lookup"
 msgstr "Käyttäjän haku"
 
-#: ../libpurple/protocols/myspace/myspace.c:2242
-#: ../libpurple/protocols/myspace/myspace.c:2261
-#: ../libpurple/protocols/myspace/myspace.c:2283
+#: ../libpurple/protocols/myspace/myspace.c:2329
+#: ../libpurple/protocols/myspace/myspace.c:2348
+#: ../libpurple/protocols/myspace/myspace.c:2370
 msgid "Failed to remove buddy"
 msgstr "Tuttavaa poistaminen epäonnistui"
 
-#: ../libpurple/protocols/myspace/myspace.c:2242
+#: ../libpurple/protocols/myspace/myspace.c:2329
 msgid "'delbuddy' command failed"
 msgstr "\"delbuddy\"-komento epäonnistui"
 
-#: ../libpurple/protocols/myspace/myspace.c:2283
+#: ../libpurple/protocols/myspace/myspace.c:2370
 msgid "blocklist command failed"
 msgstr "blocklist-komento epäonnistui"
 
-#: ../libpurple/protocols/myspace/myspace.c:2331
+#: ../libpurple/protocols/myspace/myspace.c:2484
 msgid "Invalid input condition"
 msgstr "Epäkelpo syötetila"
 
-#: ../libpurple/protocols/myspace/myspace.c:2351
-#: ../libpurple/protocols/myspace/myspace.c:2388
-msgid "Read buffer full"
-msgstr "Lukupuskuri täynnä"
+#: ../libpurple/protocols/myspace/myspace.c:2539
+msgid "Read buffer full (2)"
+msgstr "Lukupuskuri täynnä (2)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2430
+#: ../libpurple/protocols/myspace/myspace.c:2582
 msgid "Unparseable message"
 msgstr "Viestin jäsennys epäonnistui"
 
-#: ../libpurple/protocols/myspace/myspace.c:2499
+#: ../libpurple/protocols/myspace/myspace.c:2653
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Yhteyttä isäntään ei voi muodostaa: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2670
+#: ../libpurple/protocols/myspace/myspace.c:2831
 msgid "IM Friends"
 msgstr "Pikaviestikaverit"
 
-#: ../libpurple/protocols/myspace/myspace.c:2769
+#: ../libpurple/protocols/myspace/myspace.c:2931
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
@@ -7733,119 +7897,153 @@ msgstr ""
 "%d tuttavaa lisättiin tai päivitettiin palvelimelta (mukaan lukien jo "
 "palvelinpuolen luettelossa olevat)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2770
+#: ../libpurple/protocols/myspace/myspace.c:2932
 msgid "Add contacts from server"
 msgstr "Lisää tuttavia palvelimelta"
 
-#: ../libpurple/protocols/myspace/myspace.c:2822
-#: ../libpurple/protocols/myspace/myspace.c:2887
+#: ../libpurple/protocols/myspace/myspace.c:2984
+#: ../libpurple/protocols/myspace/myspace.c:3048
 msgid "Add friends from MySpace.com"
 msgstr "Lisää kavereita MySpacesta"
 
-#: ../libpurple/protocols/myspace/myspace.c:2823
+#: ../libpurple/protocols/myspace/myspace.c:2985
 msgid "Importing friends failed"
 msgstr "Kavereiden tuonti epäonnistui"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2879
+#: ../libpurple/protocols/myspace/myspace.c:3041
 msgid "Find people..."
 msgstr "Etsi ihmisiä..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2882
+#: ../libpurple/protocols/myspace/myspace.c:3044
 msgid "Change IM name..."
 msgstr "Vaihda pikaviestinnimeä..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3184
+#: ../libpurple/protocols/myspace/myspace.c:3345
 msgid "myim URL handler"
 msgstr "myim-URL-käsittelijä"
 
-#: ../libpurple/protocols/myspace/myspace.c:3185
+#: ../libpurple/protocols/myspace/myspace.c:3346
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr "Tämän myim-osoitteen avaamiseen sopivaa MySpaceIM-tiliä ei löytynyt."
 
-#: ../libpurple/protocols/myspace/myspace.c:3186
+#: ../libpurple/protocols/myspace/myspace.c:3347
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "Ota sopiva MySpaceIM-käyttäjätili käyttöön ja yritä uudelleen."
 
-#: ../libpurple/protocols/myspace/myspace.c:3309
+#: ../libpurple/protocols/myspace/myspace.c:3470
 msgid "Show display name in status text"
 msgstr "Näytä näyttönimi tilatekstissä"
 
-#: ../libpurple/protocols/myspace/myspace.c:3312
+#: ../libpurple/protocols/myspace/myspace.c:3473
 msgid "Show headline in status text"
 msgstr "Näytä otsikko tilatekstissä"
 
-#: ../libpurple/protocols/myspace/myspace.c:3317
+#: ../libpurple/protocols/myspace/myspace.c:3478
 msgid "Send emoticons"
 msgstr "Lähetä hymiöitä"
 
-#: ../libpurple/protocols/myspace/myspace.c:3322
+#: ../libpurple/protocols/myspace/myspace.c:3483
 msgid "Screen resolution (dots per inch)"
 msgstr "Näytön tarkkuus (pisteitä tuumalla)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3325
+#: ../libpurple/protocols/myspace/myspace.c:3486
 msgid "Base font size (points)"
 msgstr "Peruskirjasinkoko (pisteinä)"
 
-#: ../libpurple/protocols/myspace/user.c:95
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
+#: ../libpurple/protocols/myspace/user.c:105
+#: ../libpurple/protocols/zephyr/zephyr.c:790
+#: ../libpurple/protocols/zephyr/zephyr.c:1164
 msgid "User"
 msgstr "Käyttäjä"
 
-#: ../libpurple/protocols/myspace/user.c:105
-#: ../libpurple/protocols/oscar/oscar.c:2974
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3025
 msgid "Profile"
 msgstr "Profiili"
 
-#: ../libpurple/protocols/myspace/user.c:128
+#: ../libpurple/protocols/myspace/user.c:138
 msgid "Headline"
 msgstr "Otsikko"
 
-#: ../libpurple/protocols/myspace/user.c:133
+#: ../libpurple/protocols/myspace/user.c:153
 msgid "Song"
 msgstr "Kappale"
 
-#: ../libpurple/protocols/myspace/user.c:141
+#: ../libpurple/protocols/myspace/user.c:162
 msgid "Total Friends"
 msgstr "Kavereita yhteensä"
 
-#: ../libpurple/protocols/myspace/user.c:159
+#: ../libpurple/protocols/myspace/user.c:180
 msgid "Client Version"
 msgstr "Asiakasohjelman versio"
 
+#. Protocol won't log in now without a username set.. Disconnect
+#: ../libpurple/protocols/myspace/user.c:570
+msgid "No username set"
+msgstr "Käyttäjänimeä ei asetettu"
+
+#: ../libpurple/protocols/myspace/user.c:577
+#: ../libpurple/protocols/myspace/user.c:671
+msgid "MySpaceIM - Please Set a Username"
+msgstr "MySpaceIM - Aseta käyttäjänimi"
+
+#: ../libpurple/protocols/myspace/user.c:578
+msgid "Please enter a username to check its availability:"
+msgstr "Syötä käyttäjänimi tarkistaaksesi sen saatavuus:"
+
+#: ../libpurple/protocols/myspace/user.c:658
+msgid "MySpaceIM - Username Available"
+msgstr "MySpaceIM - Käyttäjänimi saatavilla"
+
+#: ../libpurple/protocols/myspace/user.c:659
+msgid "This username is available. Would you like to set it?"
+msgstr "Tämä käyttäjänimi on saatavilla. Haluatko ottaa sen käyttöön?"
+
+#: ../libpurple/protocols/myspace/user.c:660
+msgid "ONCE SET, THIS CANNOT BE CHANGED!"
+msgstr "KUN TÄMÄ ON KERRAN ASETETTU, SITÄ EI VOI MUUTTAA"
+
+#: ../libpurple/protocols/myspace/user.c:672
+msgid "This username is unavailable."
+msgstr "Tämä käyttäjänimi ei ole saatavilla."
+
+#: ../libpurple/protocols/myspace/user.c:673
+msgid "Please try another username:"
+msgstr "Yritä toista käyttäjänimeä:"
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
 #. * projectile or weapon."  This term often has an electrical
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
-#: ../libpurple/protocols/myspace/zap.c:51
-#: ../libpurple/protocols/myspace/zap.c:214
+#: ../libpurple/protocols/myspace/zap.c:48
+#: ../libpurple/protocols/myspace/zap.c:221
 msgid "Zap"
 msgstr "Läimäise"
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:48
 #, c-format
 msgid "%s has zapped you!"
 msgstr "%s läimäisi sinua."
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:49
 #, c-format
 msgid "Zapping %s..."
 msgstr "Läimäise tuttavaa %s..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
-#: ../libpurple/protocols/myspace/zap.c:54
+#: ../libpurple/protocols/myspace/zap.c:52
 msgid "Whack"
 msgstr "Mätkäytä"
 
-#: ../libpurple/protocols/myspace/zap.c:54
+#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "%s has whacked you!"
 msgstr "%s mätkäisi sinua."
 
-#: ../libpurple/protocols/myspace/zap.c:54
+#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "Whacking %s..."
 msgstr "Mätkäistään tuttavaa %s..."
@@ -7853,7 +8051,7 @@ msgstr "Mätkäistään tuttavaa %s..."
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#: ../libpurple/protocols/myspace/zap.c:59
+#: ../libpurple/protocols/myspace/zap.c:58
 msgid "Torch"
 msgstr "Liekitä"
 
@@ -7872,57 +8070,57 @@ msgstr "Syleile"
 msgid "Smooch"
 msgstr "Syleile"
 
-#: ../libpurple/protocols/myspace/zap.c:62
+#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "%s has smooched you!"
 msgstr "%s syleili sinua."
 
-#: ../libpurple/protocols/myspace/zap.c:62
+#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "Smooching %s..."
 msgstr "Syleillään tuttavaa %s..."
 
 #. A hug is a display of affection; wrapping your arms around someone
-#: ../libpurple/protocols/myspace/zap.c:65
+#: ../libpurple/protocols/myspace/zap.c:66
 msgid "Hug"
 msgstr "Halaa"
 
-#: ../libpurple/protocols/myspace/zap.c:65
+#: ../libpurple/protocols/myspace/zap.c:66
 #, c-format
 msgid "%s has hugged you!"
 msgstr "%s halasi sinua."
 
-#: ../libpurple/protocols/myspace/zap.c:65
+#: ../libpurple/protocols/myspace/zap.c:67
 #, c-format
 msgid "Hugging %s..."
 msgstr "Halataan tuttavaa %s..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#: ../libpurple/protocols/myspace/zap.c:68
+#: ../libpurple/protocols/myspace/zap.c:70
 msgid "Slap"
 msgstr "Läpäytä"
 
-#: ../libpurple/protocols/myspace/zap.c:68
+#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "%s has slapped you!"
 msgstr "%s läpäytti sinua."
 
-#: ../libpurple/protocols/myspace/zap.c:68
+#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "Slapping %s..."
 msgstr "Läpäytetään tuttavaa %s..."
 
 #. Goose means "to pinch someone on their butt"
-#: ../libpurple/protocols/myspace/zap.c:71
+#: ../libpurple/protocols/myspace/zap.c:74
 msgid "Goose"
 msgstr "Purista"
 
-#: ../libpurple/protocols/myspace/zap.c:71
+#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "%s has goosed you!"
 msgstr "%s puristi sinua."
 
-#: ../libpurple/protocols/myspace/zap.c:71
+#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "Goosing %s..."
 msgstr "Puristetaan tuttavaa %s..."
@@ -7930,16 +8128,16 @@ msgstr "Puristetaan tuttavaa %s..."
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
-#: ../libpurple/protocols/myspace/zap.c:76
+#: ../libpurple/protocols/myspace/zap.c:80
 msgid "High-five"
 msgstr "Yläfemmaa"
 
-#: ../libpurple/protocols/myspace/zap.c:76
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "%s has high-fived you!"
 msgstr "%s yläfemmasi sinulle."
 
-#: ../libpurple/protocols/myspace/zap.c:76
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "High-fiving %s..."
 msgstr "Yläfemmataan tuttavalle %s..."
@@ -7947,16 +8145,16 @@ msgstr "Yläfemmataan tuttavalle %s..."
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
-#: ../libpurple/protocols/myspace/zap.c:81
+#: ../libpurple/protocols/myspace/zap.c:86
 msgid "Punk"
 msgstr "Kujeile"
 
-#: ../libpurple/protocols/myspace/zap.c:81
+#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "%s has punk'd you!"
 msgstr "%s kujeili sinulle."
 
-#: ../libpurple/protocols/myspace/zap.c:81
+#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "Punking %s..."
 msgstr "Kujeillaan tuttavalle %s..."
@@ -7968,16 +8166,16 @@ msgstr "Kujeillaan tuttavalle %s..."
 #. * gesture, so it does not carry a harsh negative
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
-#: ../libpurple/protocols/myspace/zap.c:90
+#: ../libpurple/protocols/myspace/zap.c:96
 msgid "Raspberry"
 msgstr "Rutise"
 
-#: ../libpurple/protocols/myspace/zap.c:90
+#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "%s has raspberried you!"
 msgstr "%s rutisi nenäsi edessä."
 
-#: ../libpurple/protocols/myspace/zap.c:90
+#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "Raspberrying %s..."
 msgstr "Rutistaan tuttavalle %s..."
@@ -8222,7 +8420,7 @@ msgstr "Mailstop"
 msgstr "Mailstop"
 
 #: ../libpurple/protocols/novell/novell.c:1511
-#: ../libpurple/protocols/sametime/sametime.c:4168
+#: ../libpurple/protocols/sametime/sametime.c:4176
 msgid "User ID"
 msgstr "Käyttäjän ID"
 
@@ -8277,19 +8475,19 @@ msgstr "Haluatko liittyä keskusteluun?"
 msgid "Would you like to join the conversation?"
 msgstr "Haluatko liittyä keskusteluun?"
 
-#: ../libpurple/protocols/novell/novell.c:2027
+#: ../libpurple/protocols/novell/novell.c:2028
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Sinut on kirjattu ulos koska olet kirjautunut sisään toiselta työasemalta."
 
-#: ../libpurple/protocols/novell/novell.c:2084
+#: ../libpurple/protocols/novell/novell.c:2085
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "%s näyttää olevan poissa linjoilta eikä saanut viestiä jonka juuri lähetit."
 
-#: ../libpurple/protocols/novell/novell.c:2184
+#: ../libpurple/protocols/novell/novell.c:2185
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8297,12 +8495,11 @@ msgstr ""
 "Palvelimeen ei voi yhdistää. Ole hyvä, syötä palvelimen osoite jolle haluat "
 "yhdistää."
 
-#: ../libpurple/protocols/novell/novell.c:2213
+#: ../libpurple/protocols/novell/novell.c:2214
 msgid "Error. SSL support is not installed."
 msgstr "Virhe. SSL-tuki ei ole asennettu."
 
-#: ../libpurple/protocols/novell/novell.c:2521
-#, c-format
+#: ../libpurple/protocols/novell/novell.c:2522
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Tämä konferenssi on suljettu. Uusia viestejä ei voi lähettää."
 
@@ -8316,33 +8513,41 @@ msgstr "Tämä konferenssi on suljettu. 
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3535
-#: ../libpurple/protocols/novell/novell.c:3537
+#: ../libpurple/protocols/novell/novell.c:3536
+#: ../libpurple/protocols/novell/novell.c:3538
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger -yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/novell/novell.c:3562
+#: ../libpurple/protocols/novell/novell.c:3563
 msgid "Server address"
 msgstr "Palvelimen osoite"
 
-#: ../libpurple/protocols/novell/novell.c:3566
+#: ../libpurple/protocols/novell/novell.c:3567
 msgid "Server port"
 msgstr "Palvelimen portti"
 
+#: ../libpurple/protocols/oscar/family_chatnav.c:62
+msgid "Could not join chat room"
+msgstr "Keskusteluhuoneeseen ei voi liittyä"
+
+#: ../libpurple/protocols/oscar/family_chatnav.c:63
+msgid "Invalid chat room name"
+msgstr "Epäkelpo keskusteluhuoneen nimi"
+
 #: ../libpurple/protocols/oscar/flap_connection.c:391
-#: ../libpurple/protocols/yahoo/yahoo.c:2473
-#: ../libpurple/protocols/yahoo/yahoo.c:2641
+#: ../libpurple/protocols/yahoo/yahoo.c:2487
+#: ../libpurple/protocols/yahoo/yahoo.c:2655
 #: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:584
-#: ../libpurple/proxy.c:1129 ../libpurple/proxy.c:1238
-#: ../libpurple/proxy.c:1338 ../libpurple/proxy.c:1466
+#: ../libpurple/proxy.c:1135 ../libpurple/proxy.c:1244
+#: ../libpurple/proxy.c:1344 ../libpurple/proxy.c:1472
 msgid "Server closed the connection."
 msgstr "Palvelin on katkaissut yhteyden."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:393
-#: ../libpurple/protocols/yahoo/yahoo.c:2466
-#: ../libpurple/protocols/yahoo/yahoo.c:2634 ../libpurple/proxy.c:596
-#: ../libpurple/proxy.c:1141 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1350 ../libpurple/proxy.c:1478
+#: ../libpurple/protocols/yahoo/yahoo.c:2480
+#: ../libpurple/protocols/yahoo/yahoo.c:2648 ../libpurple/proxy.c:596
+#: ../libpurple/proxy.c:1147 ../libpurple/proxy.c:1256
+#: ../libpurple/proxy.c:1356 ../libpurple/proxy.c:1484
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8352,9 +8557,9 @@ msgstr ""
 "%s"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:396
-#: ../libpurple/proxy.c:1158 ../libpurple/proxy.c:1263
-#: ../libpurple/proxy.c:1362 ../libpurple/proxy.c:1434
-#: ../libpurple/proxy.c:1491
+#: ../libpurple/proxy.c:1164 ../libpurple/proxy.c:1269
+#: ../libpurple/proxy.c:1368 ../libpurple/proxy.c:1440
+#: ../libpurple/proxy.c:1497
 msgid "Received invalid data on connection with server."
 msgstr "Palvelimeen yhdistettäessä vastaanotettiin virheellisiä tietoja."
 
@@ -8389,8 +8594,8 @@ msgstr "ICQ-yhteyskäytäntöliitännäi
 msgstr "ICQ-yhteyskäytäntöliitännäinen"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
-#: ../libpurple/protocols/zephyr/zephyr.c:2997
+#: ../libpurple/protocols/yahoo/yahoo.c:4432
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Encoding"
 msgstr "Merkistö"
 
@@ -8434,103 +8639,103 @@ msgstr ""
 msgstr ""
 "Tiedosto %s on kooltaan %s, mikä on enemmän kuin suurin sallittu koko %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:116
+#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid error"
 msgstr "Epäkelpo virhe"
 
-#: ../libpurple/protocols/oscar/oscar.c:117
+#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Invalid SNAC"
 msgstr "Epäkelpo SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
+#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to host"
 msgstr "Nopeus isäntään"
 
-#: ../libpurple/protocols/oscar/oscar.c:119
+#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Rate to client"
 msgstr "Nopeus asiakasohjelmaan"
 
-#: ../libpurple/protocols/oscar/oscar.c:121
+#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Service unavailable"
 msgstr "Palvelu ei ole käytettävissä"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
+#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Service not defined"
 msgstr "Palvelua ei määritelty"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
+#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Obsolete SNAC"
 msgstr "Vanhentunut SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
+#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by host"
 msgstr "Ei tuettu verkkoisännässä"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
+#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Not supported by client"
 msgstr "Ei tuettu asiakasohjelmassa"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
+#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Refused by client"
 msgstr "Asiakasohjelma torjui"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
+#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Reply too big"
 msgstr "Vastaus liian suuri"
 
-#: ../libpurple/protocols/oscar/oscar.c:128
+#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Responses lost"
 msgstr "Vastaukset menetetty"
 
-#: ../libpurple/protocols/oscar/oscar.c:129
+#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Request denied"
 msgstr "Pyyntö evätty"
 
-#: ../libpurple/protocols/oscar/oscar.c:130
+#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Busted SNAC payload"
 msgstr "Rikkoutunut SNAC-data"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
+#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Insufficient rights"
 msgstr "Liian vähän oikeuksia"
 
-#: ../libpurple/protocols/oscar/oscar.c:132
+#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "In local permit/deny"
 msgstr "Paikallisessa sallittujen/estettyjen listassa"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
+#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "Too evil (sender)"
 msgstr "Lähettäjä liian paha(evil)"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
+#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "Too evil (receiver)"
 msgstr "Vastaanottaja liian paha(evil)"
 
-#: ../libpurple/protocols/oscar/oscar.c:135
+#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "User temporarily unavailable"
 msgstr "Käyttäjä ei tilapäisesti saatavilla."
 
-#: ../libpurple/protocols/oscar/oscar.c:136
+#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "No match"
 msgstr "Ei tuloksia"
 
-#: ../libpurple/protocols/oscar/oscar.c:137
+#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "List overflow"
 msgstr "Lista-ylivuoto"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
+#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Request ambiguous"
 msgstr "Pyyntö ei ole yksiselitteinen"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
+#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Queue full"
 msgstr "Jono täynnä"
 
-#: ../libpurple/protocols/oscar/oscar.c:140
+#: ../libpurple/protocols/oscar/oscar.c:141
 msgid "Not while on AOL"
 msgstr "Ei kun AOL on käytössä"
 
-#: ../libpurple/protocols/oscar/oscar.c:348
+#: ../libpurple/protocols/oscar/oscar.c:347
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -8542,7 +8747,7 @@ msgstr ""
 "merkistöä hän käyttää, voit määritellä sen AIM/ICQ-käyttäjätilisi "
 "lisäasetuksissa.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:457
+#: ../libpurple/protocols/oscar/oscar.c:456
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -8553,153 +8758,135 @@ msgstr ""
 "asiakasohjelma.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2392
-#: ../pidgin/gtkutils.c:2422
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2444
+#: ../pidgin/gtkutils.c:2474
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "Tuttavakuvake"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:641
 msgid "Voice"
 msgstr "Ääni"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:644
 msgid "AIM Direct IM"
 msgstr "AIM:n suora pikaviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/util.c:559
-#: ../libpurple/protocols/silc10/silc.c:679
-#: ../libpurple/protocols/silc10/util.c:549
-msgid "Chat"
-msgstr "Keskustelu"
-
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6060
+#: ../libpurple/protocols/oscar/oscar.c:650
+#: ../libpurple/protocols/oscar/oscar.c:6113
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Games"
 msgstr "Pelit"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "Add-Ins"
 msgstr "Lisäykset"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Send Buddy List"
 msgstr "Lähetä tuttavat"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "ICQ Direct Connect"
 msgstr "ICQ-suorayhteys"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "AP User"
 msgstr "AP-käyttäjä"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Nihilist"
 msgstr "Nihilistinen"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "ICQ Server Relay"
 msgstr "ICQ-palvelimen välitys"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:681
 msgid "Old ICQ UTF8"
 msgstr "Vanha ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:684
 msgid "Trillian Encryption"
 msgstr "Trillian-salaus"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:687
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:691
+#: ../libpurple/protocols/oscar/oscar.c:690
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:694
+#: ../libpurple/protocols/oscar/oscar.c:693
 msgid "Security Enabled"
 msgstr "Turvatoimet käytössä"
 
-#: ../libpurple/protocols/oscar/oscar.c:697
+#: ../libpurple/protocols/oscar/oscar.c:696
 msgid "Video Chat"
 msgstr "Videokeskustelu"
 
-#: ../libpurple/protocols/oscar/oscar.c:701
+#: ../libpurple/protocols/oscar/oscar.c:700
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:704
+#: ../libpurple/protocols/oscar/oscar.c:703
 msgid "Live Video"
 msgstr "Live-video"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:706
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5830
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:724
+#: ../libpurple/protocols/oscar/oscar.c:5883
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5865
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5918
 msgid "Not Available"
 msgstr "Ei tavoitettavissa"
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5851
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5904
 msgid "Occupied"
 msgstr "Varattu"
 
-#: ../libpurple/protocols/oscar/oscar.c:735
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:734
 msgid "Web Aware"
 msgstr "Net-tietoinen"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:184
+#: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:184
 #: ../libpurple/protocols/qq/qq.c:289
-#: ../libpurple/protocols/yahoo/yahoo.c:3106 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1060
-#, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:3132 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1084
 msgid "Invisible"
 msgstr "Näkymätön"
 
-#: ../libpurple/protocols/oscar/oscar.c:739
-#, c-format
-msgid "Online"
-msgstr "Linjoilla"
-
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3717
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1156
+#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:3740
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1100
 msgid "IP Address"
 msgstr "IP-osoite"
 
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2901
+#: ../libpurple/protocols/oscar/oscar.c:844
+#: ../libpurple/protocols/oscar/oscar.c:2952
 msgid "Warning Level"
 msgstr "Varoitustaso"
 
-#: ../libpurple/protocols/oscar/oscar.c:855
+#: ../libpurple/protocols/oscar/oscar.c:854
 msgid "Buddy Comment"
 msgstr "Tuttavakommentti"
 
-#: ../libpurple/protocols/oscar/oscar.c:995
+#: ../libpurple/protocols/oscar/oscar.c:994
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -8708,7 +8895,7 @@ msgstr ""
 "Ei saatu yhteyttä todentamispalvelimeen:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1003
+#: ../libpurple/protocols/oscar/oscar.c:1002
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -8717,20 +8904,20 @@ msgstr ""
 "Ei saatu yhteyttä BOS-palvelimeen:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1043
+#: ../libpurple/protocols/oscar/oscar.c:1042
 msgid "Screen name sent"
 msgstr "Näyttönimi lähetetty"
 
-#: ../libpurple/protocols/oscar/oscar.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:1047
 msgid "Connection established, cookie sent"
 msgstr "Yhteys muodostettu, eväste lähetetty"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
+#: ../libpurple/protocols/oscar/oscar.c:1076
 msgid "Finalizing connection"
 msgstr "Viimeistellään yhteyttä"
 
-#: ../libpurple/protocols/oscar/oscar.c:1262
+#: ../libpurple/protocols/oscar/oscar.c:1302
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8743,32 +8930,32 @@ msgstr ""
 "sisältää vain numeroita."
 
 #. Unregistered screen name
-#: ../libpurple/protocols/oscar/oscar.c:1347
-#: ../libpurple/protocols/yahoo/yahoo.c:2108
+#: ../libpurple/protocols/oscar/oscar.c:1388
+#: ../libpurple/protocols/yahoo/yahoo.c:2109
 msgid "Invalid screen name."
 msgstr "Epäkelpo näyttönimi."
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1394
 #: ../libpurple/protocols/qq/login_logout.c:485
 #: ../libpurple/protocols/simple/simple.c:1112
-#: ../libpurple/protocols/yahoo/yahoo.c:2130
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
 msgid "Incorrect password."
 msgstr "Virheellinen salasana."
 
 #. Suspended account
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1398
 msgid "Your account is currently suspended."
 msgstr "Käyttäjätilisi palvelu on parhaillaan keskeytetty."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1361
+#: ../libpurple/protocols/oscar/oscar.c:1402
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL-pikaviestipalvelu ei tilapäisesti ole käytössä."
 
 #. screen name connecting too frequently
 #. IP address connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1365
-#: ../libpurple/protocols/oscar/oscar.c:1374
+#: ../libpurple/protocols/oscar/oscar.c:1406
+#: ../libpurple/protocols/oscar/oscar.c:1415
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -8778,52 +8965,43 @@ msgstr ""
 "pidempään."
 
 #. client too old
-#: ../libpurple/protocols/oscar/oscar.c:1369
+#: ../libpurple/protocols/oscar/oscar.c:1410
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Asiakasohjelmasi versio on liian vanha. Päivitä osoitteessa %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1407
+#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Could Not Connect"
 msgstr "Yhteyttä ei voi muodostaa"
 
-#: ../libpurple/protocols/oscar/oscar.c:1411
+#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Received authorization"
 msgstr "Saatiin lupa"
 
-#: ../libpurple/protocols/oscar/oscar.c:1434
+#: ../libpurple/protocols/oscar/oscar.c:1475
 msgid "The SecurID key entered is invalid."
 msgstr "Syötetty SecurID-avain on virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:1447
+#: ../libpurple/protocols/oscar/oscar.c:1488
 msgid "Enter SecurID"
 msgstr "Syötä SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1448
+#: ../libpurple/protocols/oscar/oscar.c:1489
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Syötä 6 numeroinen luku digitaaliselta näytöltä."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#. *
-#. * @since 2.3.0
 #.
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#. *
-#. * @deprecated Please use purple_request_ok_cancel_with_hint instead.
-#.
-#: ../libpurple/protocols/oscar/oscar.c:1450
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2291
-#: ../libpurple/protocols/oscar/oscar.c:5935
-#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1828
-#: ../libpurple/request.h:1841
+#: ../libpurple/protocols/oscar/oscar.c:1491
+#: ../libpurple/protocols/oscar/oscar.c:2293
+#: ../libpurple/protocols/oscar/oscar.c:2342
+#: ../libpurple/protocols/oscar/oscar.c:5988
+#: ../libpurple/protocols/oscar/oscar.c:6269 ../libpurple/request.h:1458
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1489
-#: ../libpurple/protocols/oscar/oscar.c:1532
+#: ../libpurple/protocols/oscar/oscar.c:1530
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8832,53 +9010,54 @@ msgstr ""
 "Yhteytesi saatetaan katkaista kohta. Saatat haluta käyttää TOC-"
 "yhteyskäytäntöä kunnes tämä on korjattu. Tarkista päivitykset: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1492
-#: ../libpurple/protocols/oscar/oscar.c:1535
+#: ../libpurple/protocols/oscar/oscar.c:1533
+#: ../libpurple/protocols/oscar/oscar.c:1577
 msgid "Unable to get a valid AIM login hash."
 msgstr "Kelvollista AIM-sisäänkirjautumistiivistettä ei saatu."
 
-#: ../libpurple/protocols/oscar/oscar.c:1620
+#: ../libpurple/protocols/oscar/oscar.c:1574
+#: ../libpurple/protocols/oscar/oscar.c:1673
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Yhteytesi saatetaan katkaista kohta. Tarkista päivitykset: %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1623
+#: ../libpurple/protocols/oscar/oscar.c:1676
 msgid "Unable to get a valid login hash."
 msgstr "Kelvollista sisäänkirjautumistiivistettä ei saatu."
 
-#: ../libpurple/protocols/oscar/oscar.c:1653
+#: ../libpurple/protocols/oscar/oscar.c:1706
 msgid "Password sent"
 msgstr "Salasana lähetetty"
 
-#: ../libpurple/protocols/oscar/oscar.c:1709
+#: ../libpurple/protocols/oscar/oscar.c:1762
 msgid "Unable to initialize connection"
 msgstr "Yhteyden luominen epäonnistui"
 
-#: ../libpurple/protocols/oscar/oscar.c:2200
+#: ../libpurple/protocols/oscar/oscar.c:2251
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Valtuuttaisitko minut, jotta voin lisätä sinut tuttaviini?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2240
+#: ../libpurple/protocols/oscar/oscar.c:2291
 msgid "Authorization Request Message:"
 msgstr "Valtuutuksen pyyntöviesti:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
+#: ../libpurple/protocols/oscar/oscar.c:2292
 msgid "Please authorize me!"
 msgstr "Voisitko valtuuttaa minut?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:2290
-#: ../libpurple/protocols/oscar/oscar.c:2417
-#: ../libpurple/protocols/oscar/oscar.c:5311
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
+#: ../libpurple/protocols/oscar/oscar.c:2333
+#: ../libpurple/protocols/oscar/oscar.c:2341
+#: ../libpurple/protocols/oscar/oscar.c:2468
+#: ../libpurple/protocols/oscar/oscar.c:5360
+#: ../libpurple/protocols/yahoo/yahoo.c:991
 msgid "No reason given."
 msgstr "Syytä ei annettu."
 
-#: ../libpurple/protocols/oscar/oscar.c:2289
+#: ../libpurple/protocols/oscar/oscar.c:2340
 msgid "Authorization Denied Message:"
 msgstr "Valtuutuspyyntö evätty:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:2468
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8888,17 +9067,17 @@ msgstr ""
 "Käyttäjä %u on evännyt pyyntösi lisätä hänet tuttaviisi seuraavasta syystä:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2418
+#: ../libpurple/protocols/oscar/oscar.c:2469
 msgid "ICQ authorization denied."
 msgstr "ICQ-valtuutus evätty."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2425
+#: ../libpurple/protocols/oscar/oscar.c:2476
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Käyttäjä %u on hyväksynyt pyyntösi lisätä hänet tuttaviisi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2433
+#: ../libpurple/protocols/oscar/oscar.c:2484
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8911,7 +9090,7 @@ msgstr ""
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2441
+#: ../libpurple/protocols/oscar/oscar.c:2492
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8924,7 +9103,7 @@ msgstr ""
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2449
+#: ../libpurple/protocols/oscar/oscar.c:2500
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8937,38 +9116,38 @@ msgstr ""
 "Viesti on:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2470
+#: ../libpurple/protocols/oscar/oscar.c:2521
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ-käyttäjä %u on lähettänyt sinulle tuttavan: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2527
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Haluatko lisätä hänet tuttaviisi?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:318
+#: ../libpurple/protocols/oscar/oscar.c:2532 ../pidgin/gtkroomlist.c:320
 msgid "_Add"
 msgstr "_Lisää"
 
-#: ../libpurple/protocols/oscar/oscar.c:2482
+#: ../libpurple/protocols/oscar/oscar.c:2533
 msgid "_Decline"
 msgstr "_Kieltäydy"
 
-#: ../libpurple/protocols/oscar/oscar.c:2606
+#: ../libpurple/protocols/oscar/oscar.c:2657
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Et saanut %hu viestiä %s:lta koska se oli epäkelpo."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska ne olivat epäkelpoja."
 
-#: ../libpurple/protocols/oscar/oscar.c:2615
+#: ../libpurple/protocols/oscar/oscar.c:2666
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Et saanut %hu viestiä %s:lta koska se oli liian suuri."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska ne olivat liian suuria."
 
-#: ../libpurple/protocols/oscar/oscar.c:2624
+#: ../libpurple/protocols/oscar/oscar.c:2675
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8977,21 +9156,21 @@ msgstr[1] "Et saanut %hu viestiä %s:lta
 msgstr[0] "Et saanut %hu viestiä %s:lta koska taajuusraja ylittyi."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska taajuusraja ylittyi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2633
+#: ../libpurple/protocols/oscar/oscar.c:2684
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "Et saanut %hu viestiä %s:lta koska hän on liian hirveä."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska hän on liian hirveä."
 
-#: ../libpurple/protocols/oscar/oscar.c:2642
+#: ../libpurple/protocols/oscar/oscar.c:2693
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Et saanut %hu viestiä %s:lta koska olet liian hirveä."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska olet liian hirveä."
 
-#: ../libpurple/protocols/oscar/oscar.c:2651
+#: ../libpurple/protocols/oscar/oscar.c:2702
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -8999,47 +9178,47 @@ msgstr[1] "Et saanut %hu viestiä %s:lta
 msgstr[1] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2806
+#: ../libpurple/protocols/oscar/oscar.c:2857
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Viestiä ei voi lähettää: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2806
-#: ../libpurple/protocols/oscar/oscar.c:2811
-#: ../libpurple/protocols/oscar/oscar.c:2875
+#: ../libpurple/protocols/oscar/oscar.c:2857
+#: ../libpurple/protocols/oscar/oscar.c:2862
+#: ../libpurple/protocols/oscar/oscar.c:2926
 msgid "Unknown reason."
 msgstr "Tuntematon syy."
 
-#: ../libpurple/protocols/oscar/oscar.c:2809
-#: ../libpurple/protocols/sametime/sametime.c:2451
+#: ../libpurple/protocols/oscar/oscar.c:2860
+#: ../libpurple/protocols/sametime/sametime.c:2459
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Viestiä ei voi lähettää käyttäjälle %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:2875
+#: ../libpurple/protocols/oscar/oscar.c:2926
 #, c-format
 msgid "User information not available: %s"
 msgstr "Käyttäjätiedot eivät ole saatavilla: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2957
 msgid "Online Since"
 msgstr "Kirjautunut"
 
-#: ../libpurple/protocols/oscar/oscar.c:2911
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
+#: ../libpurple/protocols/oscar/oscar.c:2962
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1191
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
-#: ../libpurple/protocols/oscar/oscar.c:2946
+#: ../libpurple/protocols/oscar/oscar.c:2997
 msgid "Available Message"
 msgstr "Paikallaoloviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:3054
+#: ../libpurple/protocols/oscar/oscar.c:3101
 msgid "Your AIM connection may be lost."
 msgstr "AIM-yhteytesi saattaa olla katkennut."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3242
+#: ../libpurple/protocols/oscar/oscar.c:3289
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -9047,7 +9226,7 @@ msgstr ""
 "[Viestiä tältä käyttäjältä ei voi näyttää koska se sisälsi epäkelpoja "
 "merkkejä.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3406
+#: ../libpurple/protocols/oscar/oscar.c:3453
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9055,83 +9234,82 @@ msgstr ""
 "Viimeistä viestiä ei lähetetty koska olet ylittänyt taajuusrajan. Odota 10 "
 "sekuntia ja yritä uudelleen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3489
+#: ../libpurple/protocols/oscar/oscar.c:3538
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
 
-#: ../libpurple/protocols/oscar/oscar.c:3739
+#: ../libpurple/protocols/oscar/oscar.c:3762
 #: ../libpurple/protocols/silc/util.c:591
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../libpurple/protocols/oscar/oscar.c:3792
 msgid "Personal Web Page"
 msgstr "Henkilökohtainen kotisivu"
 
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/oscar/oscar.c:3816
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Lisätiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:3801
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/oscar/oscar.c:3824
+#: ../libpurple/protocols/oscar/oscar.c:3837
 msgid "Zip Code"
 msgstr "Postinumero"
 
-#: ../libpurple/protocols/oscar/oscar.c:3825
+#: ../libpurple/protocols/oscar/oscar.c:3848
 msgid "Division"
 msgstr "Osasto"
 
-#: ../libpurple/protocols/oscar/oscar.c:3826
+#: ../libpurple/protocols/oscar/oscar.c:3849
 msgid "Position"
 msgstr "Asema"
 
-#: ../libpurple/protocols/oscar/oscar.c:3828
+#: ../libpurple/protocols/oscar/oscar.c:3851
 msgid "Web Page"
 msgstr "Kotisivu"
 
-#: ../libpurple/protocols/oscar/oscar.c:3831
+#: ../libpurple/protocols/oscar/oscar.c:3854
 msgid "Work Information"
 msgstr "Työtiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:3887
+#: ../libpurple/protocols/oscar/oscar.c:3910
 msgid "Pop-Up Message"
 msgstr "Ponnahdusviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:3927
+#: ../libpurple/protocols/oscar/oscar.c:3950
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Seuraava näyttönimi on assosioitu %s kanssa"
 msgstr[1] "Seuraavat näyttönimet on assosioitu %s kanssa"
 
-#: ../libpurple/protocols/oscar/oscar.c:3932
+#: ../libpurple/protocols/oscar/oscar.c:3955
 msgid "Screen name"
 msgstr "Näyttönimi"
 
-#: ../libpurple/protocols/oscar/oscar.c:3958
+#: ../libpurple/protocols/oscar/oscar.c:3981
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Ei hakutuloksia sähköpostiosoitteelle %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3979
+#: ../libpurple/protocols/oscar/oscar.c:4002
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Sinun tulisi saada sähköpostiviesti %s:n varmistusta varten."
 
-#: ../libpurple/protocols/oscar/oscar.c:3981
+#: ../libpurple/protocols/oscar/oscar.c:4004
 msgid "Account Confirmation Requested"
 msgstr "Tilin varmistusta pyydetty"
 
-#: ../libpurple/protocols/oscar/oscar.c:4012
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4035
 msgid "Error Changing Account Info"
 msgstr "Virhe muutettaessa käyttäjätilin tietoja"
 
-#: ../libpurple/protocols/oscar/oscar.c:4015
+#: ../libpurple/protocols/oscar/oscar.c:4038
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9140,14 +9318,14 @@ msgstr ""
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi eroaa "
 "alkuperäisestä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4018
+#: ../libpurple/protocols/oscar/oscar.c:4041
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4021
+#: ../libpurple/protocols/oscar/oscar.c:4044
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9156,7 +9334,7 @@ msgstr ""
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4024
+#: ../libpurple/protocols/oscar/oscar.c:4047
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -9165,7 +9343,7 @@ msgstr ""
 "Virhe 0x%04x: Sähköpostiosoitetta ei voi muuttaa koska tälle näyttönimelle "
 "on jo käsittelemätön muutospyyntö."
 
-#: ../libpurple/protocols/oscar/oscar.c:4027
+#: ../libpurple/protocols/oscar/oscar.c:4050
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -9174,7 +9352,7 @@ msgstr ""
 "Virhe 0x%04x: Sähköpostiosoitetta ei voi muuttaa koska annettu osoite on "
 "assosioitu liian moneen näyttönimeen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4030
+#: ../libpurple/protocols/oscar/oscar.c:4053
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -9183,32 +9361,32 @@ msgstr ""
 "Virhe 0x%04x: Sähköpostiosoitetta ei voi muuttaa koska annettu osoite on "
 "virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+#: ../libpurple/protocols/oscar/oscar.c:4056
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Virhe 0x%04x: Tuntematon virhe."
 
-#: ../libpurple/protocols/oscar/oscar.c:4043
+#: ../libpurple/protocols/oscar/oscar.c:4066
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s:n sähköpostiosoite on %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4045
+#: ../libpurple/protocols/oscar/oscar.c:4068
 msgid "Account Info"
 msgstr "Tilin tiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:4228
+#: ../libpurple/protocols/oscar/oscar.c:4251
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Pikaviesti kuvaasi ei lähetetty. Sinun tulee käyttää suorayhteyttä "
 "lähettääksesi pikaviestikuvia."
 
-#: ../libpurple/protocols/oscar/oscar.c:4499
+#: ../libpurple/protocols/oscar/oscar.c:4520
 msgid "Unable to set AIM profile."
 msgstr "AIM-profiilia ei saatu asetettua."
 
-#: ../libpurple/protocols/oscar/oscar.c:4500
+#: ../libpurple/protocols/oscar/oscar.c:4521
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -9218,7 +9396,7 @@ msgstr ""
 "suoritettua loppuun. Profiilia ei asetettu. Yritä asettaa se kun "
 "kirjautuminen on suoritettu."
 
-#: ../libpurple/protocols/oscar/oscar.c:4514
+#: ../libpurple/protocols/oscar/oscar.c:4535
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -9231,11 +9409,11 @@ msgstr[1] ""
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty.  Se on nyt lyhennetty puolestasi."
 
-#: ../libpurple/protocols/oscar/oscar.c:4519
+#: ../libpurple/protocols/oscar/oscar.c:4540
 msgid "Profile too long."
 msgstr "Profiili on liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4564
+#: ../libpurple/protocols/oscar/oscar.c:4584
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9250,11 +9428,11 @@ msgstr[1] ""
 "Maksimi poissaoloviestin koko %d tavua ylitetty. Viesti lyhennettiin "
 "puolestasi."
 
-#: ../libpurple/protocols/oscar/oscar.c:4569
+#: ../libpurple/protocols/oscar/oscar.c:4589
 msgid "Away message too long."
 msgstr "Poissaoloviesti on liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4642
+#: ../libpurple/protocols/oscar/oscar.c:4662
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9265,17 +9443,17 @@ msgstr ""
 "tulee olla oikea sähköpostiosoite, tai alkaa kirjaimella ja sisältää vain "
 "kirjaimia, numeroita ja välilyöntejä, tai sisältää vain numeroita."
 
-#: ../libpurple/protocols/oscar/oscar.c:4644
-#: ../libpurple/protocols/oscar/oscar.c:5097
-#: ../libpurple/protocols/oscar/oscar.c:5112
+#: ../libpurple/protocols/oscar/oscar.c:4664
+#: ../libpurple/protocols/oscar/oscar.c:5129
+#: ../libpurple/protocols/oscar/oscar.c:5144
 msgid "Unable To Add"
 msgstr "Lisääminen epäonnistui"
 
-#: ../libpurple/protocols/oscar/oscar.c:4763
+#: ../libpurple/protocols/oscar/oscar.c:4783
 msgid "Unable To Retrieve Buddy List"
 msgstr "Tuttavien nouto ei onnistunut"
 
-#: ../libpurple/protocols/oscar/oscar.c:4764
+#: ../libpurple/protocols/oscar/oscar.c:4784
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few minutes."
@@ -9284,15 +9462,15 @@ msgstr ""
 "Tuttavasi eivät ole kadonneet, ne tulevat luultavasti näkyville muutamassa "
 "minuutissa."
 
-#: ../libpurple/protocols/oscar/oscar.c:4947
-#: ../libpurple/protocols/oscar/oscar.c:4949
-#: ../libpurple/protocols/oscar/oscar.c:5177
-#: ../libpurple/protocols/oscar/oscar.c:5178
-#: ../libpurple/protocols/oscar/oscar.c:5183
+#: ../libpurple/protocols/oscar/oscar.c:4979
+#: ../libpurple/protocols/oscar/oscar.c:4981
+#: ../libpurple/protocols/oscar/oscar.c:5211
+#: ../libpurple/protocols/oscar/oscar.c:5212
+#: ../libpurple/protocols/oscar/oscar.c:5217
 msgid "Orphans"
 msgstr "Orvot"
 
-#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:5127
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9301,17 +9479,17 @@ msgstr ""
 "Tuttavaa %s ei voi lisätä koska tuttaviasi on liian monta. Ole hyvä ja "
 "poista joku ja yritä uudelleen."
 
-#: ../libpurple/protocols/oscar/oscar.c:5095
-#: ../libpurple/protocols/oscar/oscar.c:5110
+#: ../libpurple/protocols/oscar/oscar.c:5127
+#: ../libpurple/protocols/oscar/oscar.c:5142
 msgid "(no name)"
 msgstr "(nimetön)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5109
+#: ../libpurple/protocols/oscar/oscar.c:5141
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Tuttavaa %s ei voi lisätä tuntemattomasta syystä."
 
-#: ../libpurple/protocols/oscar/oscar.c:5226
+#: ../libpurple/protocols/oscar/oscar.c:5275
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9320,22 +9498,22 @@ msgstr ""
 "Käyttäjä %s on antanut sinulle oikeuden lisätä itsesi hänen tuttaviinsa. "
 "Haluatko lisätä hänet omallesi?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5234
+#: ../libpurple/protocols/oscar/oscar.c:5283
 msgid "Authorization Given"
 msgstr "Valtuutus annettu"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5307
+#: ../libpurple/protocols/oscar/oscar.c:5356
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Käyttäjä %s on hyväksynyt pyyntösi lisätä hänet tuttaviisi."
 
-#: ../libpurple/protocols/oscar/oscar.c:5308
+#: ../libpurple/protocols/oscar/oscar.c:5357
 msgid "Authorization Granted"
 msgstr "Valtuutus hyväksytty"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5311
+#: ../libpurple/protocols/oscar/oscar.c:5360
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9345,53 +9523,49 @@ msgstr ""
 "Käyttäjä %s on evännyt pyyntösi lisätä hänet tuttaviisi seuraavasta syystä:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5312
+#: ../libpurple/protocols/oscar/oscar.c:5361
 msgid "Authorization Denied"
 msgstr "Valtuutus evätty"
 
-#: ../libpurple/protocols/oscar/oscar.c:5348
+#: ../libpurple/protocols/oscar/oscar.c:5397
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Vaihto:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5388
-msgid "Invalid chat name specified."
-msgstr "Virheellinen ryhmäkeskustelun nimi annettu."
-
-#: ../libpurple/protocols/oscar/oscar.c:5457
+#: ../libpurple/protocols/oscar/oscar.c:5510
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Pikaviestikuvaasi ei lähetetty. Et voi lähettää pikaviestikuvia AIM- "
 "ryhmäkeskustelussa."
 
-#: ../libpurple/protocols/oscar/oscar.c:5619
-#: ../libpurple/protocols/oscar/oscar.c:5624
+#: ../libpurple/protocols/oscar/oscar.c:5672
+#: ../libpurple/protocols/oscar/oscar.c:5677
 msgid "Away Message"
 msgstr "Poissaoloviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5624
+#: ../libpurple/protocols/oscar/oscar.c:5677
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(vastaanotetaan)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5824
+#: ../libpurple/protocols/oscar/oscar.c:5877
 msgid "iTunes Music Store Link"
 msgstr "iTunes-musiikkikauppalinkki"
 
-#: ../libpurple/protocols/oscar/oscar.c:5932
+#: ../libpurple/protocols/oscar/oscar.c:5985
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Tuttavakommentti käyttäjälle %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5933
+#: ../libpurple/protocols/oscar/oscar.c:5986
 msgid "Buddy Comment:"
 msgstr "Kommentti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5980
+#: ../libpurple/protocols/oscar/oscar.c:6033
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Olet päättänyt avata suoran pikaviestiyhteyden %s:n kanssa."
 
-#: ../libpurple/protocols/oscar/oscar.c:5984
+#: ../libpurple/protocols/oscar/oscar.c:6037
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9399,66 +9573,66 @@ msgstr ""
 "Koska tämä paljastaa IP-osoitteesi, sitä voidaan pitää turvallisuusriskinä.  "
 "Haluatko jatkaa?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5990
+#: ../libpurple/protocols/oscar/oscar.c:6043
 #: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "Y_hdistä"
 
-#: ../libpurple/protocols/oscar/oscar.c:6025
+#: ../libpurple/protocols/oscar/oscar.c:6078
 msgid "Get AIM Info"
 msgstr "Hae AIM-tiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
+#: ../libpurple/protocols/oscar/oscar.c:6084
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
-#: ../libpurple/protocols/oscar/oscar.c:6039
+#: ../libpurple/protocols/oscar/oscar.c:6092
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:6052
+#: ../libpurple/protocols/oscar/oscar.c:6105
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:6074
+#: ../libpurple/protocols/oscar/oscar.c:6127
 msgid "Re-request Authorization"
 msgstr "Pyydä valtuutus uudelleen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6133
+#: ../libpurple/protocols/oscar/oscar.c:6186
 msgid "Require authorization"
 msgstr "Pyydä valtuutusta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6136
+#: ../libpurple/protocols/oscar/oscar.c:6189
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web-tietoinen (tämän käyttö altistaa sinut roskaposteille)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
+#: ../libpurple/protocols/oscar/oscar.c:6194
 msgid "ICQ Privacy Options"
 msgstr "ICQ-yksityisyysvalinnat"
 
-#: ../libpurple/protocols/oscar/oscar.c:6160
+#: ../libpurple/protocols/oscar/oscar.c:6213
 msgid "The new formatting is invalid."
 msgstr "Uusi muotoilu on virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:6161
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Näyttönimen muotoilu voi vaikuttaa ainoastaan alkukirjaimeen sekä "
 "välilyönteihin."
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
+#: ../libpurple/protocols/oscar/oscar.c:6267
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6260
+#: ../libpurple/protocols/oscar/oscar.c:6313
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Et odota valtuutusta</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6263
+#: ../libpurple/protocols/oscar/oscar.c:6316
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Odotat valtuutusta seuraavilta tuttavilta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6264
+#: ../libpurple/protocols/oscar/oscar.c:6317
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9466,79 +9640,74 @@ msgstr ""
 "Voit pyytää valtuutuksen uudelleen näiltä tuttavilta napsauttamalla oikeaa "
 "nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
 
-#: ../libpurple/protocols/oscar/oscar.c:6281
+#: ../libpurple/protocols/oscar/oscar.c:6334
 msgid "Find Buddy by E-Mail"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6282
+#: ../libpurple/protocols/oscar/oscar.c:6335
 msgid "Search for a buddy by e-mail address"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6283
+#: ../libpurple/protocols/oscar/oscar.c:6336
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Syötä etsimäsi tuttavan sähköpostiosoite."
 
-#: ../libpurple/protocols/oscar/oscar.c:6286
+#: ../libpurple/protocols/oscar/oscar.c:6339
 msgid "_Search"
 msgstr "_Etsi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6444
+#: ../libpurple/protocols/oscar/oscar.c:6497
 msgid "Set User Info (URL)..."
 msgstr "Aseta käyttäjätiedot (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6455
+#: ../libpurple/protocols/oscar/oscar.c:6508
 msgid "Change Password (URL)"
 msgstr "Vaihda salasana (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6459
+#: ../libpurple/protocols/oscar/oscar.c:6512
 msgid "Configure IM Forwarding (URL)"
 msgstr "Aseta pikaviestien edelleenlähetys (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6469
+#: ../libpurple/protocols/oscar/oscar.c:6522
 msgid "Set Privacy Options..."
 msgstr "Aseta yksityisyysvalinnat..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6476
+#: ../libpurple/protocols/oscar/oscar.c:6529
 msgid "Confirm Account"
 msgstr "Vahvista tili"
 
-#: ../libpurple/protocols/oscar/oscar.c:6480
+#: ../libpurple/protocols/oscar/oscar.c:6533
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Näytä tällä hetkellä rekisteröity sähköpostiosoite"
 
-#: ../libpurple/protocols/oscar/oscar.c:6484
+#: ../libpurple/protocols/oscar/oscar.c:6537
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Muuta tällä hetkellä rekisteröityä sähköpostiosoitetta..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6491
+#: ../libpurple/protocols/oscar/oscar.c:6544
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6497
+#: ../libpurple/protocols/oscar/oscar.c:6550
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Etsi tuttavaa sähköpostiosoitteen perusteella..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6502
+#: ../libpurple/protocols/oscar/oscar.c:6555
 msgid "Search for Buddy by Information"
 msgstr "Etsi tuttavaa tietojen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6570
-msgid "Use recent buddies group"
-msgstr "Käytä viimeaikaisten tuttavien ryhmää"
-
-#: ../libpurple/protocols/oscar/oscar.c:6573
-msgid "Show how long you have been idle"
-msgstr "Näyttää kuinka kauan olet ollut jouten."
-
-#: ../libpurple/protocols/oscar/oscar.c:6728
+#: ../libpurple/protocols/oscar/oscar.c:6754
 msgid ""
-"Always use ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
+"Always use AIM/ICQ proxy server for\n"
+"file transfers and direct IM (slower,\n"
+"but does not reveal your IP address)"
 msgstr ""
-"Käytä aina ICQ-välipalvelinta tiedostonsiirroille\n"
-"(hitaampi, mutta ei paljasta IP-osoitettasi)"
+"Käytä aina AIM/ICQ-välipalvelinta\n"
+"tiedostonsiirroille ja suoriin pika-\n"
+"viesteihin (hitaampi, mutta ei\n"
+"paljasta IP-osoitettasi)"
 
 #: ../libpurple/protocols/oscar/peer.c:699
 #, c-format
@@ -9552,7 +9721,6 @@ msgstr "Yritetään yhdistää kohteesee
 msgstr "Yritetään yhdistää kohteeseen %s:%hu."
 
 #: ../libpurple/protocols/oscar/peer.c:858
-#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Yritetään yhdistämistä välipalvelimen kautta."
 
@@ -9750,7 +9918,7 @@ msgstr "Epäkelpo QQ-kuva (face)"
 msgstr "Epäkelpo QQ-kuva (face)"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:136
+#: ../libpurple/protocols/qq/group_opt.c:112
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Kieltäydyit %d:n pyynnöstä"
@@ -9765,7 +9933,7 @@ msgstr "Kieltäydy pyynnöstä"
 
 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:141
+#: ../libpurple/protocols/qq/group_opt.c:117
 msgid "Sorry, you are not my type..."
 msgstr "Pahoittelut, en ole kiinnostunut..."
 
@@ -9804,7 +9972,7 @@ msgstr "Haluaisitko olla kaverini?"
 #. hint
 #: ../libpurple/protocols/qq/buddy_opt.c:408
 #: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_opt.c:143
+#: ../libpurple/protocols/qq/group_opt.c:119
 msgid "Send"
 msgstr "Lähetä"
 
@@ -9860,7 +10028,7 @@ msgstr "Käyttäjä %d haki ryhmän %d j
 
 #: ../libpurple/protocols/qq/group_im.c:127
 #: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:193
+#: ../libpurple/protocols/qq/sys_msg.c:196
 #, c-format
 msgid "Reason: %s"
 msgstr "Syy: %s"
@@ -9872,16 +10040,16 @@ msgstr "Syy: %s"
 #: ../libpurple/protocols/qq/group_im.c:292
 #: ../libpurple/protocols/qq/group_join.c:233
 #: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:235
-#: ../libpurple/protocols/qq/group_opt.c:305
-#: ../libpurple/protocols/qq/group_opt.c:391
+#: ../libpurple/protocols/qq/group_opt.c:211
+#: ../libpurple/protocols/qq/group_opt.c:281
+#: ../libpurple/protocols/qq/group_opt.c:367
 msgid "QQ Qun Operation"
 msgstr "QQ Qun -toiminta"
 
 #: ../libpurple/protocols/qq/group_im.c:141
-#: ../libpurple/protocols/qq/group_opt.c:128
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:248
+#: ../libpurple/protocols/qq/group_opt.c:104
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "Hyväksy"
 
@@ -9973,32 +10141,32 @@ msgstr "Ryhmätoimintovirhe"
 msgstr "Ryhmätoimintovirhe"
 
 #. we want to see window
-#: ../libpurple/protocols/qq/group_opt.c:124
+#: ../libpurple/protocols/qq/group_opt.c:99
 #: ../libpurple/protocols/qq/sys_msg.c:87
 msgid "Do you want to approve the request?"
 msgstr "Haluatko hyväksyä pyynnön?"
 
-#: ../libpurple/protocols/qq/group_opt.c:137
+#: ../libpurple/protocols/qq/group_opt.c:113
 msgid "Enter your reason:"
 msgstr "Anna syy:"
 
-#: ../libpurple/protocols/qq/group_opt.c:235
+#: ../libpurple/protocols/qq/group_opt.c:211
 msgid "You have successfully modified Qun member"
 msgstr "Qun-jäsentä muokattu onnistuneesti"
 
-#: ../libpurple/protocols/qq/group_opt.c:305
+#: ../libpurple/protocols/qq/group_opt.c:281
 msgid "You have successfully modified Qun information"
 msgstr "Qun-tietojen muokkaus onnistui"
 
-#: ../libpurple/protocols/qq/group_opt.c:392
+#: ../libpurple/protocols/qq/group_opt.c:368
 msgid "You have successfully created a Qun"
 msgstr "Qun:n luonti onnistui"
 
-#: ../libpurple/protocols/qq/group_opt.c:394
+#: ../libpurple/protocols/qq/group_opt.c:370
 msgid "Would you like to set up the Qun details now?"
 msgstr "Haluatko asettaa Qun:n yksityiskohdat nyt?"
 
-#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/group_opt.c:374
 msgid "Setup"
 msgstr "Asetukset"
 
@@ -10019,14 +10187,19 @@ msgstr "Virhe pyydettäessä kirjautumis
 msgid "Error requesting login token"
 msgstr "Virhe pyydettäessä kirjautumispolettia"
 
-#: ../libpurple/protocols/qq/login_logout.c:489
-msgid "Unable to login, check debug log"
-msgstr "Ei kyetty kirjautumaan, tarkista virheenjäljitysloki"
+#: ../libpurple/protocols/qq/login_logout.c:490
+msgid "Unable to login. Check debug log."
+msgstr "Ei voi kirjautua. Tarkista virheenjäljitysloki."
 
+#: ../libpurple/protocols/qq/login_logout.c:493
+msgid "Unable to login"
+msgstr "Ei voi kirjautua"
+
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../libpurple/protocols/qq/qq.c:140 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:158
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:238
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1194
 #: ../libpurple/protocols/yahoo/ycht.c:550
 msgid "Unable to connect."
 msgstr "Yhteyden muodostaminen epäonnistui."
@@ -10165,48 +10338,48 @@ msgstr "Kirjautuminen epäonnistui, ei v
 msgid "Login failed, no reply"
 msgstr "Kirjautuminen epäonnistui, ei vastausta"
 
-#: ../libpurple/protocols/qq/sys_msg.c:110
+#: ../libpurple/protocols/qq/sys_msg.c:111
 msgid "Do you want to add this buddy?"
 msgstr "Haluatko lisätä tämän tuttavan?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:166
+#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "Sinut on lisännyt %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:169
-#: ../libpurple/protocols/qq/sys_msg.c:263
+#: ../libpurple/protocols/qq/sys_msg.c:171
+#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "Haluatko lisätä hänet?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:179
 #, c-format
 msgid "%s has added you [%s] to his or her buddy list"
 msgstr "Käyttäjä %s on lisännyt sinut [%s] tuttaviisi"
 
-#: ../libpurple/protocols/qq/sys_msg.c:192
+#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "User %s rejected your request"
 msgstr "Käyttäjä %s on kieltäytynyt pyynnöstäsi"
 
-#: ../libpurple/protocols/qq/sys_msg.c:212
+#: ../libpurple/protocols/qq/sys_msg.c:215
 #, c-format
 msgid "User %s approved your request"
 msgstr "Käyttäjä %s on hyväksynyt pyyntösi"
 
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:238
+#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wants to add you [%s] as a friend"
 msgstr "Käyttäjä %s tahtoo lisätä sinut [%s] kaverikseen"
 
-#: ../libpurple/protocols/qq/sys_msg.c:239
+#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "Viesti: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:261
+#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s ei ole tuttavissasi"
@@ -10284,65 +10457,65 @@ msgstr "Sametime-ylläpitäjän tiedote"
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime-ylläpitäjän tiedote"
 
-#: ../libpurple/protocols/sametime/sametime.c:1734
+#: ../libpurple/protocols/sametime/sametime.c:1736
 msgid "Connection reset"
 msgstr "Yhteys suljettu"
 
-#: ../libpurple/protocols/sametime/sametime.c:1746
+#: ../libpurple/protocols/sametime/sametime.c:1748
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Virhe luettaessa socketista: %s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1771
-#: ../libpurple/protocols/sametime/sametime.c:3772
+#: ../libpurple/protocols/sametime/sametime.c:1773
+#: ../libpurple/protocols/sametime/sametime.c:3780
 msgid "Unable to connect to host"
 msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä"
 
-#: ../libpurple/protocols/sametime/sametime.c:1812
+#: ../libpurple/protocols/sametime/sametime.c:1814
 #, c-format
 msgid "Announcement from %s"
 msgstr "Ilmoitus käyttäjältä %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1986
+#: ../libpurple/protocols/sametime/sametime.c:1988
 msgid "Conference Closed"
 msgstr "Neuvottelu suljettu"
 
-#: ../libpurple/protocols/sametime/sametime.c:2445
+#: ../libpurple/protocols/sametime/sametime.c:2453
 msgid "Unable to send message: "
 msgstr "Viestiä ei voi lähettää: "
 
-#: ../libpurple/protocols/sametime/sametime.c:3001
+#: ../libpurple/protocols/sametime/sametime.c:3009
 msgid "Place Closed"
 msgstr "Paikka suljettu"
 
-#: ../libpurple/protocols/sametime/sametime.c:3271
+#: ../libpurple/protocols/sametime/sametime.c:3279
 msgid "Microphone"
 msgstr "Mikrofoni"
 
-#: ../libpurple/protocols/sametime/sametime.c:3272
+#: ../libpurple/protocols/sametime/sametime.c:3280
 msgid "Speakers"
 msgstr "Kaiuttimet"
 
-#: ../libpurple/protocols/sametime/sametime.c:3273
+#: ../libpurple/protocols/sametime/sametime.c:3281
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3311
-#: ../libpurple/protocols/sametime/sametime.c:4191
+#: ../libpurple/protocols/sametime/sametime.c:3319
+#: ../libpurple/protocols/sametime/sametime.c:4199
 msgid "Supports"
 msgstr "Tukee"
 
-#: ../libpurple/protocols/sametime/sametime.c:3316
-#: ../libpurple/protocols/sametime/sametime.c:4165
+#: ../libpurple/protocols/sametime/sametime.c:3324
+#: ../libpurple/protocols/sametime/sametime.c:4173
 msgid "External User"
 msgstr "Ulkoinen käyttäjä"
 
-#: ../libpurple/protocols/sametime/sametime.c:3422
+#: ../libpurple/protocols/sametime/sametime.c:3430
 msgid "Create conference with user"
 msgstr "Aloita neuvottelu käyttäjän kanssa"
 
-#: ../libpurple/protocols/sametime/sametime.c:3423
+#: ../libpurple/protocols/sametime/sametime.c:3431
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -10351,27 +10524,27 @@ msgstr ""
 "Kirjoita uuden neuvottelun puheenaihe sekä kutsuviesti joka lähetetään "
 "käyttäjälle %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3427
+#: ../libpurple/protocols/sametime/sametime.c:3435
 msgid "New Conference"
 msgstr "Aloita neuvottelu"
 
-#: ../libpurple/protocols/sametime/sametime.c:3429
+#: ../libpurple/protocols/sametime/sametime.c:3437
 msgid "Create"
 msgstr "Aloita"
 
-#: ../libpurple/protocols/sametime/sametime.c:3494
+#: ../libpurple/protocols/sametime/sametime.c:3502
 msgid "Available Conferences"
 msgstr "Käynnissä olevat neuvottelut"
 
-#: ../libpurple/protocols/sametime/sametime.c:3500
+#: ../libpurple/protocols/sametime/sametime.c:3508
 msgid "Create New Conference..."
 msgstr "Aloita uusi neuvottelu..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3507
+#: ../libpurple/protocols/sametime/sametime.c:3515
 msgid "Invite user to a conference"
 msgstr "Kutsu käyttäjä neuvotteluun"
 
-#: ../libpurple/protocols/sametime/sametime.c:3508
+#: ../libpurple/protocols/sametime/sametime.c:3516
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10382,27 +10555,27 @@ msgstr ""
 "Valitse \"Aloita uusi neuvottelu\" jos haluat aloittaa uuden neuvottelun ja "
 "kutsua tämän käyttäjän sinne."
 
-#: ../libpurple/protocols/sametime/sametime.c:3513
+#: ../libpurple/protocols/sametime/sametime.c:3521
 msgid "Invite to Conference"
 msgstr "Kutsu neuvotteluun"
 
-#: ../libpurple/protocols/sametime/sametime.c:3604
+#: ../libpurple/protocols/sametime/sametime.c:3612
 msgid "Invite to Conference..."
 msgstr "Kutsu neuvotteluun..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3609
+#: ../libpurple/protocols/sametime/sametime.c:3617
 msgid "Send TEST Announcement"
 msgstr "Lähetä TEST-ilmoitus"
 
-#: ../libpurple/protocols/sametime/sametime.c:3628 ../pidgin/gtkconv.c:4437
+#: ../libpurple/protocols/sametime/sametime.c:3636 ../pidgin/gtkconv.c:4426
 msgid "Topic:"
 msgstr "Aihe:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3656
+#: ../libpurple/protocols/sametime/sametime.c:3664
 msgid "No Sametime Community Server specified"
 msgstr "Sametime-yhteisöpalvelinta ei ole määritelty"
 
-#: ../libpurple/protocols/sametime/sametime.c:3681
+#: ../libpurple/protocols/sametime/sametime.c:3689
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10411,42 +10584,42 @@ msgstr ""
 "Isäntää tai IP-osoitetta ei ole asetettu Meanwhile-käyttäjätilille %s. Lisää "
 "sellainen alle ennen kirjautumista sisään."
 
-#: ../libpurple/protocols/sametime/sametime.c:3686
+#: ../libpurple/protocols/sametime/sametime.c:3694
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhilen yhteysasetukset"
 
-#: ../libpurple/protocols/sametime/sametime.c:3687
+#: ../libpurple/protocols/sametime/sametime.c:3695
 msgid "No Sametime Community Server Specified"
 msgstr "Sametime-yhteisöpalvelinta ei ole määritelty"
 
-#: ../libpurple/protocols/sametime/sametime.c:3689
+#: ../libpurple/protocols/sametime/sametime.c:3697
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: ../libpurple/protocols/sametime/sametime.c:4181
+#: ../libpurple/protocols/sametime/sametime.c:4189
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Tuntematon (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4183
+#: ../libpurple/protocols/sametime/sametime.c:4191
 msgid "Last Known Client"
 msgstr "Viimeksi nähty asiakasohjelma"
 
-#: ../libpurple/protocols/sametime/sametime.c:4347
-#: ../libpurple/protocols/sametime/sametime.c:5552
+#: ../libpurple/protocols/sametime/sametime.c:4355
+#: ../libpurple/protocols/sametime/sametime.c:5560
 msgid "User Name"
 msgstr "Käyttäjänimi"
 
-#: ../libpurple/protocols/sametime/sametime.c:4350
-#: ../libpurple/protocols/sametime/sametime.c:5555
+#: ../libpurple/protocols/sametime/sametime.c:4358
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "Sametime ID"
 msgstr "Sametime-tunnus"
 
-#: ../libpurple/protocols/sametime/sametime.c:4374
+#: ../libpurple/protocols/sametime/sametime.c:4382
 msgid "An ambiguous user ID was entered"
 msgstr "Epäselvä käyttäjätunnus syötetty"
 
-#: ../libpurple/protocols/sametime/sametime.c:4375
+#: ../libpurple/protocols/sametime/sametime.c:4383
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10455,15 +10628,15 @@ msgstr ""
 "Tunniste '%s' voi viitata keneen tahansa seuraavista käyttäjistä. Valitse "
 "oikea käyttäjä alla olevasta luettelosta lisätäksesi hänet tuttaviisi."
 
-#: ../libpurple/protocols/sametime/sametime.c:4380
+#: ../libpurple/protocols/sametime/sametime.c:4388
 msgid "Select User"
 msgstr "Valitse käyttäjä"
 
-#: ../libpurple/protocols/sametime/sametime.c:4464
+#: ../libpurple/protocols/sametime/sametime.c:4472
 msgid "Unable to add user: user not found"
 msgstr "Käyttäjää ei voi lisätä: käyttäjää ei löydy"
 
-#: ../libpurple/protocols/sametime/sametime.c:4466
+#: ../libpurple/protocols/sametime/sametime.c:4474
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -10472,7 +10645,7 @@ msgstr ""
 "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisöstäsi. Tämä hakusana on "
 "poistettu tuttavistasi."
 
-#: ../libpurple/protocols/sametime/sametime.c:5057
+#: ../libpurple/protocols/sametime/sametime.c:5065
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10481,64 +10654,64 @@ msgstr ""
 "Virhe luettaessa tiedostoa %s:  \n"
 "%s.\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5192
+#: ../libpurple/protocols/sametime/sametime.c:5200
 msgid "Remotely Stored Buddy List"
 msgstr "Etätallennetut tuttavat"
 
 # NOTE source: gftt glossary
-#: ../libpurple/protocols/sametime/sametime.c:5197
+#: ../libpurple/protocols/sametime/sametime.c:5205
 msgid "Buddy List Storage Mode"
 msgstr "Tuttavien tallennustapa"
 
-#: ../libpurple/protocols/sametime/sametime.c:5200
+#: ../libpurple/protocols/sametime/sametime.c:5208
 msgid "Local Buddy List Only"
 msgstr "Vain paikalliset tuttavat"
 
-#: ../libpurple/protocols/sametime/sametime.c:5202
+#: ../libpurple/protocols/sametime/sametime.c:5210
 msgid "Merge List from Server"
 msgstr "Yhdistä tuttavat palvelimelta"
 
-#: ../libpurple/protocols/sametime/sametime.c:5204
+#: ../libpurple/protocols/sametime/sametime.c:5212
 msgid "Merge and Save List to Server"
 msgstr "Yhdistä ja tallenna tuttavat palvelimelle"
 
-#: ../libpurple/protocols/sametime/sametime.c:5206
+#: ../libpurple/protocols/sametime/sametime.c:5214
 msgid "Synchronize List with Server"
 msgstr "Täsmää tuttavat palvelimen kanssa"
 
-#: ../libpurple/protocols/sametime/sametime.c:5261
+#: ../libpurple/protocols/sametime/sametime.c:5269
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Tuo Sametime-tuttavat käyttäjätililtä %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5301
+#: ../libpurple/protocols/sametime/sametime.c:5309
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Vie Sametime-tuttavat käyttäjätilille %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5355
+#: ../libpurple/protocols/sametime/sametime.c:5363
 msgid "Unable to add group: group exists"
 msgstr "Ryhmää ei voi lisätä: ryhmä on jo olemassa"
 
-#: ../libpurple/protocols/sametime/sametime.c:5356
+#: ../libpurple/protocols/sametime/sametime.c:5364
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Ryhmä '%s' on jo tuttavissasi."
 
-#: ../libpurple/protocols/sametime/sametime.c:5359
-#: ../libpurple/protocols/sametime/sametime.c:5489
+#: ../libpurple/protocols/sametime/sametime.c:5367
+#: ../libpurple/protocols/sametime/sametime.c:5497
 msgid "Unable to add group"
 msgstr "Ryhmää ei voi lisätä"
 
-#: ../libpurple/protocols/sametime/sametime.c:5418
+#: ../libpurple/protocols/sametime/sametime.c:5426
 msgid "Possible Matches"
 msgstr "Mahdollisia osumia"
 
-#: ../libpurple/protocols/sametime/sametime.c:5434
+#: ../libpurple/protocols/sametime/sametime.c:5442
 msgid "Notes Address Book group results"
 msgstr "Notesin osoitekirjan ryhmätulokset"
 
-#: ../libpurple/protocols/sametime/sametime.c:5435
+#: ../libpurple/protocols/sametime/sametime.c:5443
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10549,15 +10722,15 @@ msgstr ""
 "ryhmistä. Valitse oikea ryhmä alla olevasta luettelosta lisätäksesi sen "
 "tuttaviisi."
 
-#: ../libpurple/protocols/sametime/sametime.c:5440
+#: ../libpurple/protocols/sametime/sametime.c:5448
 msgid "Select Notes Address Book"
 msgstr "Valitse Notesin osoitekirja"
 
-#: ../libpurple/protocols/sametime/sametime.c:5483
+#: ../libpurple/protocols/sametime/sametime.c:5491
 msgid "Unable to add group: group not found"
 msgstr "Ryhmää ei voi lisätä: ryhmää ei löytynyt"
 
-#: ../libpurple/protocols/sametime/sametime.c:5485
+#: ../libpurple/protocols/sametime/sametime.c:5493
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -10566,11 +10739,11 @@ msgstr ""
 "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisösi Notesin osoitekirjan "
 "ryhmistä."
 
-#: ../libpurple/protocols/sametime/sametime.c:5526
+#: ../libpurple/protocols/sametime/sametime.c:5534
 msgid "Notes Address Book Group"
 msgstr "Notesin osoitekirjan ryhmä"
 
-#: ../libpurple/protocols/sametime/sametime.c:5527
+#: ../libpurple/protocols/sametime/sametime.c:5535
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -10578,12 +10751,12 @@ msgstr ""
 "Kirjoita Notesin osoitekirjan ryhmän nimi alla olevaan kenttään lisätäksesi "
 "ryhmän ja sen jäsenet tuttaviisi."
 
-#: ../libpurple/protocols/sametime/sametime.c:5576
+#: ../libpurple/protocols/sametime/sametime.c:5584
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Hakutulokset haulle '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5577
+#: ../libpurple/protocols/sametime/sametime.c:5585
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10594,28 +10767,28 @@ msgstr ""
 "lisätä nämä käyttäjät tuttaviisi tai lähettää heille viestejä alla olevilla "
 "painikkeilla."
 
-#: ../libpurple/protocols/sametime/sametime.c:5584 ../pidgin/gtknotify.c:763
+#: ../libpurple/protocols/sametime/sametime.c:5592 ../pidgin/gtknotify.c:770
 msgid "Search Results"
 msgstr "Hakutulokset"
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
+#: ../libpurple/protocols/sametime/sametime.c:5617
 msgid "No matches"
 msgstr "Ei tuloksia"
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5618
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisöstäsi."
 
-#: ../libpurple/protocols/sametime/sametime.c:5614
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "No Matches"
 msgstr "Ei tuloksia"
 
-#: ../libpurple/protocols/sametime/sametime.c:5651
+#: ../libpurple/protocols/sametime/sametime.c:5659
 msgid "Search for a user"
 msgstr "Etsi käyttäjiä"
 
-#: ../libpurple/protocols/sametime/sametime.c:5652
+#: ../libpurple/protocols/sametime/sametime.c:5660
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -10623,32 +10796,32 @@ msgstr ""
 "Kirjoita nimi tai osittainen käyttäjätunnus alla olevaan kenttään etsiäksesi "
 "käyttäjiä Sametime-yhteisöstäsi."
 
-#: ../libpurple/protocols/sametime/sametime.c:5655
+#: ../libpurple/protocols/sametime/sametime.c:5663
 msgid "User Search"
 msgstr "Käyttäjähaku"
 
-#: ../libpurple/protocols/sametime/sametime.c:5668
+#: ../libpurple/protocols/sametime/sametime.c:5676
 msgid "Import Sametime List..."
 msgstr "Tuo Sametime-tuttavat..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5672
+#: ../libpurple/protocols/sametime/sametime.c:5680
 msgid "Export Sametime List..."
 msgstr "Vie Sametime-tuttavat..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5676
+#: ../libpurple/protocols/sametime/sametime.c:5684
 msgid "Add Notes Address Book Group..."
 msgstr "Lisää Notesin osoitekirjan ryhmä..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5680
+#: ../libpurple/protocols/sametime/sametime.c:5688
 msgid "User Search..."
 msgstr "Käyttäjähaku..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5786
+#: ../libpurple/protocols/sametime/sametime.c:5794
 msgid "Force login (ignore server redirects)"
 msgstr "Pakota sisäänkirjautuminen (älä välitä palvelinuudelleenohjauksista)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5796
+#: ../libpurple/protocols/sametime/sametime.c:5804
 msgid "Hide client identity"
 msgstr "Piilota asiakasohjelman tunniste"
 
@@ -10936,7 +11109,7 @@ msgstr "Robotti"
 #: ../libpurple/protocols/silc/silc.c:886
 #: ../libpurple/protocols/silc/util.c:522
 #: ../libpurple/protocols/silc10/buddy.c:1496
-#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc10/silc.c:660
 #: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Onnellinen"
@@ -10945,7 +11118,7 @@ msgstr "Onnellinen"
 #: ../libpurple/protocols/silc/silc.c:888
 #: ../libpurple/protocols/silc/util.c:524
 #: ../libpurple/protocols/silc10/buddy.c:1498
-#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc10/silc.c:662
 #: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Surullinen"
@@ -10954,7 +11127,7 @@ msgstr "Surullinen"
 #: ../libpurple/protocols/silc/silc.c:890
 #: ../libpurple/protocols/silc/util.c:526
 #: ../libpurple/protocols/silc10/buddy.c:1500
-#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc10/silc.c:664
 #: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Vihainen"
@@ -10963,7 +11136,7 @@ msgstr "Vihainen"
 #: ../libpurple/protocols/silc/silc.c:892
 #: ../libpurple/protocols/silc/util.c:528
 #: ../libpurple/protocols/silc10/buddy.c:1502
-#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/silc.c:666
 #: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Mustasukkainen"
@@ -10972,7 +11145,7 @@ msgstr "Mustasukkainen"
 #: ../libpurple/protocols/silc/silc.c:894
 #: ../libpurple/protocols/silc/util.c:530
 #: ../libpurple/protocols/silc10/buddy.c:1504
-#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/silc.c:668
 #: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Häpeää"
@@ -10981,7 +11154,7 @@ msgstr "Häpeää"
 #: ../libpurple/protocols/silc/silc.c:896
 #: ../libpurple/protocols/silc/util.c:532
 #: ../libpurple/protocols/silc10/buddy.c:1506
-#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/silc.c:670
 #: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Haavoittumaton"
@@ -10997,7 +11170,7 @@ msgstr "Rakastunut"
 #: ../libpurple/protocols/silc/silc.c:900
 #: ../libpurple/protocols/silc/util.c:536
 #: ../libpurple/protocols/silc10/buddy.c:1510
-#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/silc.c:674
 #: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Unelias"
@@ -11006,7 +11179,7 @@ msgstr "Unelias"
 #: ../libpurple/protocols/silc/silc.c:902
 #: ../libpurple/protocols/silc/util.c:538
 #: ../libpurple/protocols/silc10/buddy.c:1512
-#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/silc.c:676
 #: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Tylsistynyt"
@@ -11015,7 +11188,7 @@ msgstr "Tylsistynyt"
 #: ../libpurple/protocols/silc/silc.c:904
 #: ../libpurple/protocols/silc/util.c:540
 #: ../libpurple/protocols/silc10/buddy.c:1514
-#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc10/silc.c:678
 #: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Innostunut"
@@ -11024,7 +11197,7 @@ msgstr "Innostunut"
 #: ../libpurple/protocols/silc/silc.c:906
 #: ../libpurple/protocols/silc/util.c:542
 #: ../libpurple/protocols/silc10/buddy.c:1516
-#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/silc.c:680
 #: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Levoton"
@@ -11061,8 +11234,8 @@ msgstr "Laite"
 #: ../libpurple/protocols/silc/ops.c:1239
 #: ../libpurple/protocols/silc10/buddy.c:1580
 #: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:722
-#: ../libpurple/protocols/silc10/silc.c:724
+#: ../libpurple/protocols/silc10/silc.c:728
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
@@ -11169,7 +11342,6 @@ msgstr "<br><b>Kanavan aihe:</b><br>%s"
 
 #: ../libpurple/protocols/silc/chat.c:153
 #: ../libpurple/protocols/silc10/chat.c:152
-#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanavan tilat:</b> "
 
@@ -11208,7 +11380,6 @@ msgstr "Kanavan julkisten avainten luett
 
 #: ../libpurple/protocols/silc/chat.c:437
 #: ../libpurple/protocols/silc10/chat.c:413
-#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -11251,8 +11422,8 @@ msgstr "Ryhmän nimi"
 #: ../libpurple/protocols/silc/ops.c:1817
 #: ../libpurple/protocols/silc/silc.c:1163
 #: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1901
-#: ../libpurple/protocols/silc10/silc.c:931
+#: ../libpurple/protocols/silc10/ops.c:1907
+#: ../libpurple/protocols/silc10/silc.c:937
 msgid "Passphrase"
 msgstr "Salasana"
 
@@ -11359,21 +11530,21 @@ msgstr "Yksityiseen ryhmään ei voi lii
 #: ../libpurple/protocols/silc/chat.c:1245
 #: ../libpurple/protocols/silc/silc.c:1360
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1140
+#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Call Command"
 msgstr "Kutsu komentoa"
 
 #: ../libpurple/protocols/silc/chat.c:1245
 #: ../libpurple/protocols/silc/silc.c:1361
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1140
+#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Cannot call command"
 msgstr "Komentoa ei voi kutsua"
 
 #: ../libpurple/protocols/silc/chat.c:1246
 #: ../libpurple/protocols/silc/silc.c:1362
 #: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1141
+#: ../libpurple/protocols/silc10/silc.c:1144
 msgid "Unknown command"
 msgstr "Tuntematon komento"
 
@@ -11533,7 +11704,7 @@ msgstr "Asema työssä"
 #: ../libpurple/protocols/silc/ops.c:1018
 #: ../libpurple/protocols/silc/silc.c:1156
 #: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:924
+#: ../libpurple/protocols/silc10/silc.c:930
 msgid "Organization"
 msgstr "Organisaatio"
 
@@ -11568,7 +11739,7 @@ msgstr "Kanavan perustaja kanavalla <I>%
 #: ../libpurple/protocols/silc/ops.c:1328
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1077
 msgid "Real Name"
 msgstr "Oikea nimi"
 
@@ -11599,7 +11770,7 @@ msgstr "_Lisää..."
 #: ../libpurple/protocols/silc/ops.c:1373
 #: ../libpurple/protocols/silc/silc.c:1220
 #: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:991
+#: ../libpurple/protocols/silc10/silc.c:994
 msgid "Detach From Server"
 msgstr "Irrota palvelimelta"
 
@@ -11727,24 +11898,24 @@ msgstr "Et voi tarkkailla käyttäjää"
 #: ../libpurple/protocols/silc/ops.c:1728
 #: ../libpurple/protocols/silc/ops.c:1779
 #: ../libpurple/protocols/silc/silc.c:385
-#: ../libpurple/protocols/silc10/ops.c:1811
-#: ../libpurple/protocols/silc10/ops.c:1858
-#: ../libpurple/protocols/silc10/silc.c:190
+#: ../libpurple/protocols/silc10/ops.c:1817
+#: ../libpurple/protocols/silc10/ops.c:1864
+#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Resuming session"
 msgstr "Palautetaan istunto"
 
 #: ../libpurple/protocols/silc/ops.c:1730
-#: ../libpurple/protocols/silc10/ops.c:1813
+#: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr "Todennetaan yhteys"
 
 #: ../libpurple/protocols/silc/ops.c:1781
-#: ../libpurple/protocols/silc10/ops.c:1860
+#: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr "Tarkistetaan palvelimen julkinen avain"
 
 #: ../libpurple/protocols/silc/ops.c:1818
-#: ../libpurple/protocols/silc10/ops.c:1902
+#: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr "Vaatii salasanan"
 
@@ -11790,22 +11961,22 @@ msgstr "Julkisen avaimen tyyppiä ei tue
 msgstr "Julkisen avaimen tyyppiä ei tuettu"
 
 #: ../libpurple/protocols/silc/silc.c:319
-#: ../libpurple/protocols/silc10/ops.c:1749
+#: ../libpurple/protocols/silc10/ops.c:1755
 msgid "Disconnected by server"
 msgstr "Palvelin katkaisi yhteyden"
 
 #: ../libpurple/protocols/silc/silc.c:327
-#: ../libpurple/protocols/silc10/ops.c:1700
+#: ../libpurple/protocols/silc10/ops.c:1701
 msgid "Error during connecting to SILC Server"
 msgstr "Virhe luotaessa yhteyttä SILC-palvelimelle"
 
 #: ../libpurple/protocols/silc/silc.c:333
-#: ../libpurple/protocols/silc10/ops.c:1705
+#: ../libpurple/protocols/silc10/ops.c:1707
 msgid "Key Exchange failed"
 msgstr "Avaintenvaihto epäonnistui"
 
 #: ../libpurple/protocols/silc/silc.c:343
-#: ../libpurple/protocols/silc10/ops.c:1714
+#: ../libpurple/protocols/silc10/ops.c:1718
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
@@ -11814,62 +11985,63 @@ msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:373
 #: ../libpurple/protocols/silc/silc.c:420
-#: ../libpurple/protocols/silc10/silc.c:161
+#: ../libpurple/protocols/silc10/silc.c:163
 msgid "Connection failed"
 msgstr "Yhteys epäonnistui"
 
 #: ../libpurple/protocols/silc/silc.c:388
-#: ../libpurple/protocols/silc10/silc.c:193
+#: ../libpurple/protocols/silc10/silc.c:196
 msgid "Performing key exchange"
 msgstr "Suoritetaan avaintenvaihto"
 
 #. Progress
 #: ../libpurple/protocols/silc/silc.c:445
-#: ../libpurple/protocols/silc10/silc.c:325
+#: ../libpurple/protocols/silc10/silc.c:329
 msgid "Connecting to SILC Server"
 msgstr "Yhdistetään SILC-palvelimelle"
 
 #: ../libpurple/protocols/silc/silc.c:455
+#: ../libpurple/protocols/silc10/silc.c:340
 msgid "Could not load SILC key pair"
 msgstr "SILC-avainparia ei voi ladata"
 
 #: ../libpurple/protocols/silc/silc.c:469
-#: ../libpurple/protocols/silc10/silc.c:355
+#: ../libpurple/protocols/silc10/silc.c:361
 msgid "Unable to create connection"
 msgstr "Yhteyden luominen epäonnistui"
 
 #: ../libpurple/protocols/silc/silc.c:499
-#: ../libpurple/protocols/silc10/silc.c:267
+#: ../libpurple/protocols/silc10/silc.c:271
 msgid "Out of memory"
 msgstr "Muisti loppu"
 
 #: ../libpurple/protocols/silc/silc.c:550
-#: ../libpurple/protocols/silc10/silc.c:313
+#: ../libpurple/protocols/silc10/silc.c:317
 msgid "Cannot initialize SILC protocol"
 msgstr "SILC-yhteyskäytäntöä ei voi alustaa"
 
 #: ../libpurple/protocols/silc/silc.c:559
+#: ../libpurple/protocols/silc10/silc.c:324
 msgid "Error loading SILC key pair"
 msgstr "Virhe ladattaessa SILC-avainparia"
 
 #: ../libpurple/protocols/silc/silc.c:882
-#: ../libpurple/protocols/silc10/silc.c:650
+#: ../libpurple/protocols/silc10/silc.c:656
 msgid "Your Current Mood"
 msgstr "Tämänhetkinen mielialasi"
 
 #: ../libpurple/protocols/silc/silc.c:884
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1741
-#, c-format
+#: ../libpurple/protocols/silc10/silc.c:658 ../pidgin/gtkprefs.c:1685
 msgid "Normal"
 msgstr "Normaali"
 
 #: ../libpurple/protocols/silc/silc.c:898
-#: ../libpurple/protocols/silc10/silc.c:666
+#: ../libpurple/protocols/silc10/silc.c:672
 msgid "In love"
 msgstr "Rakastunut"
 
 #: ../libpurple/protocols/silc/silc.c:909
-#: ../libpurple/protocols/silc10/silc.c:677
+#: ../libpurple/protocols/silc10/silc.c:683
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11879,45 +12051,45 @@ msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:917
 #: ../libpurple/protocols/silc/util.c:567
-#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/silc.c:691
 #: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
 #: ../libpurple/protocols/silc/silc.c:919
 #: ../libpurple/protocols/silc/util.c:569
-#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/silc.c:693
 #: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
 #: ../libpurple/protocols/silc/silc.c:921
-#: ../libpurple/protocols/silc10/silc.c:689
+#: ../libpurple/protocols/silc10/silc.c:695
 msgid "Video conferencing"
 msgstr "Videoneuvottelu"
 
 #: ../libpurple/protocols/silc/silc.c:926
-#: ../libpurple/protocols/silc10/silc.c:694
+#: ../libpurple/protocols/silc10/silc.c:700
 msgid "Your Current Status"
 msgstr "Tämänhetkinen tilasi"
 
 #: ../libpurple/protocols/silc/silc.c:933
-#: ../libpurple/protocols/silc10/silc.c:701
+#: ../libpurple/protocols/silc10/silc.c:707
 msgid "Online Services"
 msgstr "Online-palvelut"
 
 #: ../libpurple/protocols/silc/silc.c:936
-#: ../libpurple/protocols/silc10/silc.c:704
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what services you are using"
 msgstr "Anna muiden nähdä mitä palveluja käytät"
 
 #: ../libpurple/protocols/silc/silc.c:942
-#: ../libpurple/protocols/silc10/silc.c:710
+#: ../libpurple/protocols/silc10/silc.c:716
 msgid "Let others see what computer you are using"
 msgstr "Anna muiden nähdä mitä tietokonetta käytät"
 
 #: ../libpurple/protocols/silc/silc.c:949
-#: ../libpurple/protocols/silc10/silc.c:717
+#: ../libpurple/protocols/silc10/silc.c:723
 msgid "Your VCard File"
 msgstr "VCard-tiedostosi"
 
@@ -11927,13 +12099,13 @@ msgstr "Aikavyöhyke (UTC)"
 
 #: ../libpurple/protocols/silc/silc.c:959
 #: ../libpurple/protocols/silc/silc.c:960
-#: ../libpurple/protocols/silc10/silc.c:729
-#: ../libpurple/protocols/silc10/silc.c:730
+#: ../libpurple/protocols/silc10/silc.c:735
+#: ../libpurple/protocols/silc10/silc.c:736
 msgid "User Online Status Attributes"
 msgstr "Käyttäjän paikallaolo-ominaisuudet"
 
 #: ../libpurple/protocols/silc/silc.c:961
-#: ../libpurple/protocols/silc10/silc.c:731
+#: ../libpurple/protocols/silc10/silc.c:737
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -11946,21 +12118,21 @@ msgstr ""
 #: ../libpurple/protocols/silc/silc.c:1002
 #: ../libpurple/protocols/silc/silc.c:1008
 #: ../libpurple/protocols/silc/silc.c:1629
-#: ../libpurple/protocols/silc10/silc.c:772
 #: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1418
+#: ../libpurple/protocols/silc10/silc.c:784
+#: ../libpurple/protocols/silc10/silc.c:1421
 msgid "Message of the Day"
 msgstr "Päivän viesti"
 
 #: ../libpurple/protocols/silc/silc.c:1002
-#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
 msgid "No Message of the Day available"
 msgstr "Päivän viestiä ei ole"
 
 #: ../libpurple/protocols/silc/silc.c:1003
 #: ../libpurple/protocols/silc/silc.c:1624
-#: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1413
+#: ../libpurple/protocols/silc10/silc.c:779
+#: ../libpurple/protocols/silc10/silc.c:1416
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Ei ole Päivän viestiä joka olisi assosioitu tälle yhteydelle."
 
@@ -11968,187 +12140,187 @@ msgstr "Ei ole Päivän viestiä joka ol
 #: ../libpurple/protocols/silc/silc.c:1100
 #: ../libpurple/protocols/silc/silc.c:1171
 #: ../libpurple/protocols/silc/silc.c:1172
-#: ../libpurple/protocols/silc10/silc.c:824
-#: ../libpurple/protocols/silc10/silc.c:868
-#: ../libpurple/protocols/silc10/silc.c:939
-#: ../libpurple/protocols/silc10/silc.c:940
+#: ../libpurple/protocols/silc10/silc.c:830
+#: ../libpurple/protocols/silc10/silc.c:874
+#: ../libpurple/protocols/silc10/silc.c:945
+#: ../libpurple/protocols/silc10/silc.c:946
 msgid "Create New SILC Key Pair"
 msgstr "Luo uusi SILC-avainpari"
 
 #: ../libpurple/protocols/silc/silc.c:1054
-#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc10/silc.c:830
 msgid "Passphrases do not match"
 msgstr "Salasanat eivät täsmää"
 
 #: ../libpurple/protocols/silc/silc.c:1100
-#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc10/silc.c:874
 msgid "Key Pair Generation failed"
 msgstr "Avainparin luonti epäonnistui"
 
 #: ../libpurple/protocols/silc/silc.c:1139
-#: ../libpurple/protocols/silc10/silc.c:907
+#: ../libpurple/protocols/silc10/silc.c:913
 msgid "Key length"
 msgstr "Avaimen pituus"
 
 #: ../libpurple/protocols/silc/silc.c:1141
-#: ../libpurple/protocols/silc10/silc.c:909
+#: ../libpurple/protocols/silc10/silc.c:915
 msgid "Public key file"
 msgstr "Julkinen avaintiedosto"
 
 #: ../libpurple/protocols/silc/silc.c:1143
-#: ../libpurple/protocols/silc10/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:917
 msgid "Private key file"
 msgstr "Yksityinen avaintiedosto"
 
 #: ../libpurple/protocols/silc/silc.c:1166
-#: ../libpurple/protocols/silc10/silc.c:934
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Passphrase (retype)"
 msgstr "Salasana (uudelleen)"
 
 #: ../libpurple/protocols/silc/silc.c:1173
-#: ../libpurple/protocols/silc10/silc.c:941
+#: ../libpurple/protocols/silc10/silc.c:947
 msgid "Generate Key Pair"
 msgstr "Luo avainpari"
 
 #: ../libpurple/protocols/silc/silc.c:1216
-#: ../libpurple/protocols/silc10/silc.c:987
+#: ../libpurple/protocols/silc10/silc.c:990
 msgid "Online Status"
 msgstr "Tila"
 
 #: ../libpurple/protocols/silc/silc.c:1224
-#: ../libpurple/protocols/silc10/silc.c:995
+#: ../libpurple/protocols/silc10/silc.c:998
 msgid "View Message of the Day"
 msgstr "Näytä päivän viesti"
 
 #: ../libpurple/protocols/silc/silc.c:1228
-#: ../libpurple/protocols/silc10/silc.c:999
+#: ../libpurple/protocols/silc10/silc.c:1002
 msgid "Create SILC Key Pair..."
 msgstr "Luo SILC-avainpari..."
 
 #: ../libpurple/protocols/silc/silc.c:1320
-#: ../libpurple/protocols/silc10/silc.c:1098
+#: ../libpurple/protocols/silc10/silc.c:1101
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Käyttäjä <I>%s</I> ei ole verkossa"
 
 #: ../libpurple/protocols/silc/silc.c:1500
-#: ../libpurple/protocols/silc10/silc.c:1289
+#: ../libpurple/protocols/silc10/silc.c:1292
 msgid "Topic too long"
 msgstr "Aihe liian pitkä"
 
 #: ../libpurple/protocols/silc/silc.c:1581
-#: ../libpurple/protocols/silc10/silc.c:1370
+#: ../libpurple/protocols/silc10/silc.c:1373
 msgid "You must specify a nick"
 msgstr "Sinun täytyy syöttää lempinimi"
 
 #: ../libpurple/protocols/silc/silc.c:1683
-#: ../libpurple/protocols/silc10/silc.c:1472
+#: ../libpurple/protocols/silc10/silc.c:1475
 #, c-format
 msgid "channel %s not found"
 msgstr "Kanavaa %s ei löydy"
 
 #: ../libpurple/protocols/silc/silc.c:1688
-#: ../libpurple/protocols/silc10/silc.c:1477
+#: ../libpurple/protocols/silc10/silc.c:1480
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "kanavan tilat kanavalle %s: %s"
 
 #: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1479
+#: ../libpurple/protocols/silc10/silc.c:1482
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "ei kanavan tiloja asetettu kanavalle %s"
 
 #: ../libpurple/protocols/silc/silc.c:1703
-#: ../libpurple/protocols/silc10/silc.c:1492
+#: ../libpurple/protocols/silc10/silc.c:1495
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "cmodes asetus epäonnistui, %s"
 
 #: ../libpurple/protocols/silc/silc.c:1733
-#: ../libpurple/protocols/silc10/silc.c:1522
+#: ../libpurple/protocols/silc10/silc.c:1525
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Tuntematon komento: %s, (mahdollisesti asiakasohjelman virhe)"
 
 #: ../libpurple/protocols/silc/silc.c:1796
-#: ../libpurple/protocols/silc10/silc.c:1585
+#: ../libpurple/protocols/silc10/silc.c:1588
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanava]:  Poistu keskustelusta"
 
 #: ../libpurple/protocols/silc/silc.c:1800
-#: ../libpurple/protocols/silc10/silc.c:1589
+#: ../libpurple/protocols/silc10/silc.c:1592
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanava]:  Poistu keskustelusta"
 
 #: ../libpurple/protocols/silc/silc.c:1804
-#: ../libpurple/protocols/silc10/silc.c:1593
+#: ../libpurple/protocols/silc10/silc.c:1596
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;uusi aihe&gt;]: Näytä tai aseta aihe"
 
 #: ../libpurple/protocols/silc/silc.c:1809
-#: ../libpurple/protocols/silc10/silc.c:1598
+#: ../libpurple/protocols/silc10/silc.c:1601
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;kanava&gt; [&lt;salasana&gt;]: Liity kanavalle tässä verkossa"
 
 #: ../libpurple/protocols/silc/silc.c:1813
-#: ../libpurple/protocols/silc10/silc.c:1602
+#: ../libpurple/protocols/silc10/silc.c:1605
 msgid "list:  List channels on this network"
 msgstr "list: Listaa kanavat tässä verkossa"
 
 #: ../libpurple/protocols/silc/silc.c:1817
-#: ../libpurple/protocols/silc10/silc.c:1606
+#: ../libpurple/protocols/silc10/silc.c:1609
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nimi&gt;: Näytä nimen tiedot"
 
 #: ../libpurple/protocols/silc/silc.c:1821
-#: ../libpurple/protocols/silc10/silc.c:1610
-#: ../libpurple/protocols/zephyr/zephyr.c:2685
+#: ../libpurple/protocols/silc10/silc.c:1613
+#: ../libpurple/protocols/zephyr/zephyr.c:2697
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;nimi&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle"
 
 #: ../libpurple/protocols/silc/silc.c:1825
-#: ../libpurple/protocols/silc10/silc.c:1614
+#: ../libpurple/protocols/silc10/silc.c:1617
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;nimi&gt; [&lt;viesti&gt;]: Lähetä yksityisviesti käyttäjälle"
 
 #: ../libpurple/protocols/silc/silc.c:1829
-#: ../libpurple/protocols/silc10/silc.c:1618
+#: ../libpurple/protocols/silc10/silc.c:1621
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: Näytä palvelimen päivän viesti"
 
 #: ../libpurple/protocols/silc/silc.c:1833
-#: ../libpurple/protocols/silc10/silc.c:1622
+#: ../libpurple/protocols/silc10/silc.c:1625
 msgid "detach:  Detach this session"
 msgstr "detach: Irrota tämä istunto"
 
 #: ../libpurple/protocols/silc/silc.c:1837
-#: ../libpurple/protocols/silc10/silc.c:1626
+#: ../libpurple/protocols/silc10/silc.c:1629
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [viesti]: Katkaise yhteys palvelimelle, valinnainen viesti"
 
 #: ../libpurple/protocols/silc/silc.c:1841
-#: ../libpurple/protocols/silc10/silc.c:1630
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;komento&gt;: Kutsu mitä vain silc:n asiakaskomentoa."
 
 #: ../libpurple/protocols/silc/silc.c:1847
-#: ../libpurple/protocols/silc10/silc.c:1636
+#: ../libpurple/protocols/silc10/silc.c:1639
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nimi&gt; [-pubkey|&lt;syy&gt;]: Tuhoa nimi"
 
 #: ../libpurple/protocols/silc/silc.c:1851
-#: ../libpurple/protocols/silc10/silc.c:1640
+#: ../libpurple/protocols/silc10/silc.c:1643
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;uusi nimi&gt;: Muuta (lempi)nimesi."
 
 #: ../libpurple/protocols/silc/silc.c:1855
-#: ../libpurple/protocols/silc10/silc.c:1644
+#: ../libpurple/protocols/silc10/silc.c:1647
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nimi&gt;: Näytä nimen tiedot"
 
 #: ../libpurple/protocols/silc/silc.c:1859
-#: ../libpurple/protocols/silc10/silc.c:1648
+#: ../libpurple/protocols/silc10/silc.c:1651
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -12157,7 +12329,7 @@ msgstr ""
 "tilat."
 
 #: ../libpurple/protocols/silc/silc.c:1863
-#: ../libpurple/protocols/silc10/silc.c:1652
+#: ../libpurple/protocols/silc10/silc.c:1655
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -12166,17 +12338,17 @@ msgstr ""
 "kanavalla."
 
 #: ../libpurple/protocols/silc/silc.c:1867
-#: ../libpurple/protocols/silc10/silc.c:1656
+#: ../libpurple/protocols/silc10/silc.c:1659
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;käyttäjätilat&gt;: Aseta omat tilasi verkossa"
 
 #: ../libpurple/protocols/silc/silc.c:1871
-#: ../libpurple/protocols/silc10/silc.c:1660
+#: ../libpurple/protocols/silc10/silc.c:1663
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nimi&gt; [-pubkey]: Palvelinoperaattorin oikeudet"
 
 #: ../libpurple/protocols/silc/silc.c:1875
-#: ../libpurple/protocols/silc10/silc.c:1664
+#: ../libpurple/protocols/silc10/silc.c:1667
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -12185,44 +12357,44 @@ msgstr ""
 "kanavan kutsulistalta"
 
 #: ../libpurple/protocols/silc/silc.c:1879
-#: ../libpurple/protocols/silc10/silc.c:1668
+#: ../libpurple/protocols/silc10/silc.c:1671
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;kanava&gt; &lt;nimi&gt; [kommentti]: Poista käyttäjä kanavalta"
 
 #: ../libpurple/protocols/silc/silc.c:1883
-#: ../libpurple/protocols/silc10/silc.c:1672
+#: ../libpurple/protocols/silc10/silc.c:1675
 msgid "info [server]:  View server administrative details"
 msgstr "info [palvelin]: Näytä palvelimen ylläpidolliset yksityiskohdat"
 
 #: ../libpurple/protocols/silc/silc.c:1887
-#: ../libpurple/protocols/silc10/silc.c:1676
+#: ../libpurple/protocols/silc10/silc.c:1679
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [%lt;kanava%gt; +|-&lt;nimi&gt;]: Kiellä käyttäjä kanavalta"
 
 #: ../libpurple/protocols/silc/silc.c:1891
-#: ../libpurple/protocols/silc10/silc.c:1680
+#: ../libpurple/protocols/silc10/silc.c:1683
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;nimi|palvelin&gt;: Hae käyttäjän tai palvelimen julkinen avain"
 
 #: ../libpurple/protocols/silc/silc.c:1895
-#: ../libpurple/protocols/silc10/silc.c:1684
+#: ../libpurple/protocols/silc10/silc.c:1687
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Näytä palvelimen ja verkon tilastot"
 
 #: ../libpurple/protocols/silc/silc.c:1899
-#: ../libpurple/protocols/silc10/silc.c:1688
+#: ../libpurple/protocols/silc10/silc.c:1691
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Lähetä PING palvelimelle, johon ollaan yhteydessä"
 
 #: ../libpurple/protocols/silc/silc.c:1904
-#: ../libpurple/protocols/silc10/silc.c:1693
+#: ../libpurple/protocols/silc10/silc.c:1696
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanava&gt;: Näytä käyttäjät kanavalla"
 
 #: ../libpurple/protocols/silc/silc.c:1908
-#: ../libpurple/protocols/silc10/silc.c:1697
+#: ../libpurple/protocols/silc10/silc.c:1700
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -12240,38 +12412,38 @@ msgstr ""
 #. *< version
 #. *  summary
 #: ../libpurple/protocols/silc/silc.c:2019
-#: ../libpurple/protocols/silc10/silc.c:1822
+#: ../libpurple/protocols/silc10/silc.c:1825
 msgid "SILC Protocol Plugin"
 msgstr "SILC-yhteyskäytäntöliitännäinen"
 
 #. *  description
 #: ../libpurple/protocols/silc/silc.c:2021
-#: ../libpurple/protocols/silc10/silc.c:1824
+#: ../libpurple/protocols/silc10/silc.c:1827
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) -yhteyskäytäntö"
 
 #: ../libpurple/protocols/silc/silc.c:2053
-#: ../libpurple/protocols/silc10/silc.c:1856 ../pidgin/gtkprefs.c:2138
+#: ../libpurple/protocols/silc10/silc.c:1859 ../pidgin/gtkprefs.c:2040
 msgid "Network"
 msgstr "Verkko"
 
 #: ../libpurple/protocols/silc/silc.c:2064
-#: ../libpurple/protocols/silc10/silc.c:1867
+#: ../libpurple/protocols/silc10/silc.c:1870
 msgid "Public Key file"
 msgstr "Julkinen avaintiedosto"
 
 #: ../libpurple/protocols/silc/silc.c:2068
-#: ../libpurple/protocols/silc10/silc.c:1871
+#: ../libpurple/protocols/silc10/silc.c:1874
 msgid "Private Key file"
 msgstr "Yksityinen avaintiedosto"
 
 #: ../libpurple/protocols/silc/silc.c:2078
-#: ../libpurple/protocols/silc10/silc.c:1881
+#: ../libpurple/protocols/silc10/silc.c:1884
 msgid "Cipher"
 msgstr "Salaus"
 
 #: ../libpurple/protocols/silc/silc.c:2088
-#: ../libpurple/protocols/silc10/silc.c:1891
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "HMAC"
 msgstr "HMAC"
 
@@ -12280,27 +12452,27 @@ msgstr "Käytä täydellistä jatkosalai
 msgstr "Käytä täydellistä jatkosalaisuutta (PFS)"
 
 #: ../libpurple/protocols/silc/silc.c:2095
-#: ../libpurple/protocols/silc10/silc.c:1894
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Public key authentication"
 msgstr "Julkisella avaimella todentaminen"
 
 #: ../libpurple/protocols/silc/silc.c:2098
-#: ../libpurple/protocols/silc10/silc.c:1897
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block IMs without Key Exchange"
 msgstr "Estä pikaviestit ilman avaintenvaihtoa"
 
 #: ../libpurple/protocols/silc/silc.c:2101
-#: ../libpurple/protocols/silc10/silc.c:1900
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Block messages to whiteboard"
 msgstr "Estä viestit kirjoitustaululle"
 
 #: ../libpurple/protocols/silc/silc.c:2104
-#: ../libpurple/protocols/silc10/silc.c:1903
+#: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Automatically open whiteboard"
 msgstr "Avaa kirjoitustaulu automaattisesti"
 
 #: ../libpurple/protocols/silc/silc.c:2107
-#: ../libpurple/protocols/silc10/silc.c:1906
+#: ../libpurple/protocols/silc10/silc.c:1909
 msgid "Digitally sign and verify all messages"
 msgstr "Allekirjoita ja tarkista kaikki viestit digitaalisesti"
 
@@ -12449,69 +12621,55 @@ msgstr "Palvelimen tilastoja ei saatavil
 msgid "No server statistics available"
 msgstr "Palvelimen tilastoja ei saatavilla."
 
-#: ../libpurple/protocols/silc10/ops.c:1931
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1937
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Virhe: Versioepäyhteensopivuus, päivitä ohjelmasi"
 
-#: ../libpurple/protocols/silc10/ops.c:1934
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1940
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Virhe: Etäkone ei luota/tue julkista avaintasi"
 
-#: ../libpurple/protocols/silc10/ops.c:1937
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1943
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Virhe: Etäkone ei tue ehdotettua KE-ryhmää"
 
-#: ../libpurple/protocols/silc10/ops.c:1940
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1946
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Virhe: Etäkone ei tue ehdotettua salausta"
 
-#: ../libpurple/protocols/silc10/ops.c:1943
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1949
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Virhe: Etäkone ei tuo ehdotettua PKCS:aa"
 
-#: ../libpurple/protocols/silc10/ops.c:1946
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1952
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Virhe: Etäkone ei tue ehdotettua tiivistysfunktiota"
 
-#: ../libpurple/protocols/silc10/ops.c:1949
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1955
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Virhe: Etäkone ei tue ehdotettua HMAC:ia"
 
-#: ../libpurple/protocols/silc10/ops.c:1951
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1957
 msgid "Failure: Incorrect signature"
 msgstr "Virhe: Virheellinen allekirjoitus"
 
-#: ../libpurple/protocols/silc10/ops.c:1953
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1959
 msgid "Failure: Invalid cookie"
 msgstr "Virhe: Virheellinen eväste"
 
-#: ../libpurple/protocols/silc10/ops.c:1964
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1970
 msgid "Failure: Authentication failed"
 msgstr "Virhe: Todennus epäonnistui"
 
-#: ../libpurple/protocols/silc10/silc.c:182
+#: ../libpurple/protocols/silc10/silc.c:185
 msgid "Cannot initialize SILC Client connection"
 msgstr "SILC-asiakasyhteyttä ei voi alustaa"
 
-#: ../libpurple/protocols/silc10/silc.c:290
+#: ../libpurple/protocols/silc10/silc.c:294
 msgid "John Noname"
 msgstr "Pertti Perusnimi"
 
-#: ../libpurple/protocols/silc10/silc.c:320
-msgid "Cannot find/access ~/.silc directory"
-msgstr "~/.silc-hakemistoa ei voi löytää/käyttää"
-
-#: ../libpurple/protocols/silc10/silc.c:334
+#: ../libpurple/protocols/silc10/silc.c:338
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "SILC-avainparia ei voi ladata: %s"
@@ -12521,7 +12679,7 @@ msgstr "Kirjoittaminen ei onnistu"
 msgstr "Kirjoittaminen ei onnistu"
 
 #: ../libpurple/protocols/simple/simple.c:443
-#: ../libpurple/protocols/simple/simple.c:1691
+#: ../libpurple/protocols/simple/simple.c:1713
 msgid "Could not connect"
 msgstr "Yhdistäminen ei onnistu"
 
@@ -12529,22 +12687,22 @@ msgstr "Tuntematon palvelinvastaus."
 msgid "Unknown server response."
 msgstr "Tuntematon palvelinvastaus."
 
-#: ../libpurple/protocols/simple/simple.c:1727
-#: ../libpurple/protocols/simple/simple.c:1773
-#: ../libpurple/protocols/simple/simple.c:1788
-#: ../libpurple/protocols/simple/simple.c:1843
+#: ../libpurple/protocols/simple/simple.c:1749
+#: ../libpurple/protocols/simple/simple.c:1795
+#: ../libpurple/protocols/simple/simple.c:1810
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Could not create listen socket"
 msgstr "Kuuntelupistokkeen luominen epäonnistui"
 
-#: ../libpurple/protocols/simple/simple.c:1752
+#: ../libpurple/protocols/simple/simple.c:1774
 msgid "Couldn't resolve host"
 msgstr "Yhteyttä isäntään ei voi löytää"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1875
 msgid "Could not resolve hostname"
 msgstr "Isäntänimeä ei voi selvittää"
 
-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:1893
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP-näyttönimissä ei tule olla välilyöntejä tai @-merkkejä"
 
@@ -12556,36 +12714,36 @@ msgstr "SIP-näyttönimissä ei tule oll
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:2057
+#: ../libpurple/protocols/simple/simple.c:2073
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-yhteyskäytäntöliitännäinen"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:2058
+#: ../libpurple/protocols/simple/simple.c:2074
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/simple/simple.c:2086
+#: ../libpurple/protocols/simple/simple.c:2102
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Julkaise tilasi (huom: kuka tahansa voi seurata tilaasi)"
 
-#: ../libpurple/protocols/simple/simple.c:2092
+#: ../libpurple/protocols/simple/simple.c:2108
 msgid "Use UDP"
 msgstr "Käytä UDP:tä"
 
-#: ../libpurple/protocols/simple/simple.c:2094
+#: ../libpurple/protocols/simple/simple.c:2110
 msgid "Use proxy"
 msgstr "Käytä välipalvelinta"
 
-#: ../libpurple/protocols/simple/simple.c:2096
+#: ../libpurple/protocols/simple/simple.c:2112
 msgid "Proxy"
 msgstr "Välipalvelin"
 
-#: ../libpurple/protocols/simple/simple.c:2098
+#: ../libpurple/protocols/simple/simple.c:2114
 msgid "Auth User"
 msgstr "Todennus/käyttäjä"
 
-#: ../libpurple/protocols/simple/simple.c:2100
+#: ../libpurple/protocols/simple/simple.c:2116
 msgid "Auth Domain"
 msgstr "Todennus/verkkoalue"
 
@@ -12630,7 +12788,6 @@ msgstr "%s:n varoittaminen ei ole sallit
 msgstr "%s:n varoittaminen ei ole sallittua."
 
 #: ../libpurple/protocols/toc/toc.c:503
-#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Viesti on hylätty, ylität palvelimen nopeusrajan."
 
@@ -12655,47 +12812,38 @@ msgstr "Et saanut %s:n pikaviestiä kosk
 msgstr "Et saanut %s:n pikaviestiä koska se lähetettiin liian nopeasti."
 
 #: ../libpurple/protocols/toc/toc.c:518
-#, c-format
 msgid "Failure."
 msgstr "Epäonnistuminen."
 
 #: ../libpurple/protocols/toc/toc.c:521
-#, c-format
 msgid "Too many matches."
 msgstr "Liian monta tulosta."
 
 #: ../libpurple/protocols/toc/toc.c:524
-#, c-format
 msgid "Need more qualifiers."
 msgstr "Tarvitaan lisää määritteitä."
 
 #: ../libpurple/protocols/toc/toc.c:527
-#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Hakemistopalvelu ei tilapäisesti ole käytettävissä."
 
 #: ../libpurple/protocols/toc/toc.c:530
-#, c-format
 msgid "E-mail lookup restricted."
 msgstr "Sähköpostin katsominen rajoitettu."
 
 #: ../libpurple/protocols/toc/toc.c:533
-#, c-format
 msgid "Keyword ignored."
 msgstr "Avainsanasta ei välitetty."
 
 #: ../libpurple/protocols/toc/toc.c:536
-#, c-format
 msgid "No keywords."
 msgstr "Ei avainsanoja."
 
 #: ../libpurple/protocols/toc/toc.c:539
-#, c-format
 msgid "User has no directory information."
 msgstr "Käyttäjällä ei ole hakemistotietoja."
 
 #: ../libpurple/protocols/toc/toc.c:543
-#, c-format
 msgid "Country not supported."
 msgstr "Maa ei tuettu."
 
@@ -12705,22 +12853,18 @@ msgstr "Tunnistamaton epäonnistuminen: 
 msgstr "Tunnistamaton epäonnistuminen: %s."
 
 #: ../libpurple/protocols/toc/toc.c:549
-#, c-format
 msgid "Incorrect screen name or password."
 msgstr "Virheellinen näyttönimi tai salasana."
 
 #: ../libpurple/protocols/toc/toc.c:552
-#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "Palvelu ei tilapäisesti ole käytössä."
 
 #: ../libpurple/protocols/toc/toc.c:555
-#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "Varoitustasosi on parhaillaan liian korkea kirjautuaksesi sisään."
 
 #: ../libpurple/protocols/toc/toc.c:558
-#, c-format
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -12759,8 +12903,8 @@ msgstr "Salasanan vaihto onnistui"
 msgid "Password Change Successful"
 msgstr "Salasanan vaihto onnistui"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6280
-#: ../pidgin/gtkblist.c:6638
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6399
+#: ../pidgin/gtkblist.c:6736
 msgid "_Group:"
 msgstr "_Ryhmä:"
 
@@ -12821,25 +12965,25 @@ msgstr "TOC-yhteyskäytäntöliitännäi
 msgid "TOC Protocol Plugin"
 msgstr "TOC-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:784
+#: ../libpurple/protocols/yahoo/yahoo.c:745
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr "%s on lähettänyt webkamera-kutsun, mikä ei ole vielä tuettuna."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:840
+#: ../libpurple/protocols/yahoo/yahoo.c:803
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-viestiäsi ei lähetetty."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:962
+#: ../libpurple/protocols/yahoo/yahoo.c:916
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo!-järjestelmäviesti käyttäjälle %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
+#: ../libpurple/protocols/yahoo/yahoo.c:990
 msgid "Authorization denied message:"
 msgstr "Valtuutuksen eväysviesti:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1049
+#: ../libpurple/protocols/yahoo/yahoo.c:1008
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -12848,17 +12992,17 @@ msgstr ""
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet tuttaviisi "
 "seuraavasta syystä: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#: ../libpurple/protocols/yahoo/yahoo.c:1011
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet tuttaviisi."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1054
+#: ../libpurple/protocols/yahoo/yahoo.c:1013
 msgid "Add buddy rejected"
 msgstr "Tuttavan lisääminen estetty"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1996
+#: ../libpurple/protocols/yahoo/yahoo.c:1997
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12869,11 +13013,11 @@ msgstr ""
 "luultavasti mahdollista kirjautua Yahoo-palveluun tällä asiakasohjelmalla. "
 "Tarkista päivitykset osoitteesta: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1999
+#: ../libpurple/protocols/yahoo/yahoo.c:2000
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!:n todennus epäonnistui"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2065
+#: ../libpurple/protocols/yahoo/yahoo.c:2066
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12883,51 +13027,51 @@ msgstr ""
 "Painaessasi \"Kyllä\" poistat hänet tuttavistasi eikä häneltä saapuneista "
 "viesteistä enää välitetä."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2068
+#: ../libpurple/protocols/yahoo/yahoo.c:2069
 msgid "Ignore buddy?"
 msgstr "Jätä tuttava huomiotta?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2133
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Käyttäjätilisi on lukittu, kirjaudu sisään yahoo-websivustolta."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2136
+#: ../libpurple/protocols/yahoo/yahoo.c:2137
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Tuntematon viesti numero %d. Kirjautumalla Yahoo! verkkosivuille saattaa "
 "korjata tämän."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
+#: ../libpurple/protocols/yahoo/yahoo.c:2190
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Tuttavaa %s ei voi lisätä ryhmään %s palvelimen tuttavissa, tilillä %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2192
+#: ../libpurple/protocols/yahoo/yahoo.c:2193
 msgid "Could not add buddy to server list"
 msgstr "Tuttavaa ei voi lisätä palvelimen tuttaviin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2311
+#: ../libpurple/protocols/yahoo/yahoo.c:2315
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Ääniäinen %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2657
+#: ../libpurple/protocols/yahoo/yahoo.c:2671
 msgid "Received unexpected HTTP response from server."
 msgstr "Odottamaton HTTP-vastaus palvelimelta."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2682
-#: ../libpurple/protocols/yahoo/yahoo.c:2870
-#: ../libpurple/protocols/yahoo/yahoo.c:2974
-#: ../libpurple/protocols/yahoo/yahoo.c:2985
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+#: ../libpurple/protocols/yahoo/yahoo.c:2700
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:2993
+#: ../libpurple/protocols/yahoo/yahoo.c:3004
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1595
 #: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "Yhteysvirhe"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2708
+#: ../libpurple/protocols/yahoo/yahoo.c:2726
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12936,7 +13080,7 @@ msgstr ""
 "Yhteys palvelimeen %s katkesi:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2733
+#: ../libpurple/protocols/yahoo/yahoo.c:2751
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12945,103 +13089,103 @@ msgstr ""
 "Yhteyttä ei voi muodostaa palvelimeen %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3092
-#: ../libpurple/protocols/yahoo/yahoo.c:3778
+#: ../libpurple/protocols/yahoo/yahoo.c:3118
+#: ../libpurple/protocols/yahoo/yahoo.c:3809
 msgid "Not at Home"
 msgstr "Poissa kotoa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3094
-#: ../libpurple/protocols/yahoo/yahoo.c:3781
+#: ../libpurple/protocols/yahoo/yahoo.c:3120
+#: ../libpurple/protocols/yahoo/yahoo.c:3812
 msgid "Not at Desk"
 msgstr "Poissa työpöydältä"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
-#: ../libpurple/protocols/yahoo/yahoo.c:3784
+#: ../libpurple/protocols/yahoo/yahoo.c:3122
+#: ../libpurple/protocols/yahoo/yahoo.c:3815
 msgid "Not in Office"
 msgstr "Poissa toimistolta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3100
-#: ../libpurple/protocols/yahoo/yahoo.c:3790
+#: ../libpurple/protocols/yahoo/yahoo.c:3126
+#: ../libpurple/protocols/yahoo/yahoo.c:3821
 msgid "On Vacation"
 msgstr "Lomalla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3104
-#: ../libpurple/protocols/yahoo/yahoo.c:3796
+#: ../libpurple/protocols/yahoo/yahoo.c:3130
+#: ../libpurple/protocols/yahoo/yahoo.c:3827
 msgid "Stepped Out"
 msgstr "Piipahdan ulkona"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3197
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
+#: ../libpurple/protocols/yahoo/yahoo.c:3223
+#: ../libpurple/protocols/yahoo/yahoo.c:3253
 msgid "Not on server list"
 msgstr "Ei palvelimen tuttavissa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3244
-#: ../libpurple/protocols/yahoo/yahoo.c:3302
+#: ../libpurple/protocols/yahoo/yahoo.c:3270
+#: ../libpurple/protocols/yahoo/yahoo.c:3328
 msgid "Appear Online"
 msgstr "Näytä linjoilla olevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3247
-#: ../libpurple/protocols/yahoo/yahoo.c:3323
+#: ../libpurple/protocols/yahoo/yahoo.c:3273
+#: ../libpurple/protocols/yahoo/yahoo.c:3349
 msgid "Appear Permanently Offline"
 msgstr "Näytä pysyvästi poissa linjoilta olevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3265
+#: ../libpurple/protocols/yahoo/yahoo.c:3291
 msgid "Presence"
 msgstr "Läsnäolo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3308
+#: ../libpurple/protocols/yahoo/yahoo.c:3334
 msgid "Appear Offline"
 msgstr "Näytä poissa linjoilta olevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3317
+#: ../libpurple/protocols/yahoo/yahoo.c:3343
 msgid "Don't Appear Permanently Offline"
 msgstr "Älä näytä pysyvästi poissa linjoilta olevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3365
+#: ../libpurple/protocols/yahoo/yahoo.c:3391
 msgid "Join in Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3371
+#: ../libpurple/protocols/yahoo/yahoo.c:3397
 msgid "Initiate Conference"
 msgstr "Aloita neuvottelu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3399
+#: ../libpurple/protocols/yahoo/yahoo.c:3425
 msgid "Presence Settings"
 msgstr "Läsnäoloasetukset"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3405
+#: ../libpurple/protocols/yahoo/yahoo.c:3431
 msgid "Start Doodling"
 msgstr "Aloita piirtely"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
+#: ../libpurple/protocols/yahoo/yahoo.c:3537
 msgid "Activate which ID?"
 msgstr "Mikä tunnus (ID) aktivoidaan?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3517
-msgid "Join who in chat?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3548
+msgid "Join whom in chat?"
 msgstr "Kenen seuraan liitytään ryhmäkeskustelussa?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3529
+#: ../libpurple/protocols/yahoo/yahoo.c:3560
 msgid "Activate ID..."
 msgstr "Aktivoi tunnus (ID)..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3533
+#: ../libpurple/protocols/yahoo/yahoo.c:3564
 msgid "Join User in Chat..."
 msgstr "Liity käyttäjän seuraan ryhmäkeskustelussa..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3538
+#: ../libpurple/protocols/yahoo/yahoo.c:3569
 msgid "Open Inbox"
 msgstr "Avaa saapuneet-kansio"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4147
+#: ../libpurple/protocols/yahoo/yahoo.c:4158
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;huone&gt;: Liity keskusteluhuoneeseen Yahoo-verkossa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4152
+#: ../libpurple/protocols/yahoo/yahoo.c:4163
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Listaa kanavat Yahoo-verkossa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4160
+#: ../libpurple/protocols/yahoo/yahoo.c:4171
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Pyydä käyttäjää aloittamaan piirtelyistunto"
 
@@ -13055,56 +13199,56 @@ msgstr "doodle: Pyydä käyttäjää alo
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4369
-#: ../libpurple/protocols/yahoo/yahoo.c:4371
+#: ../libpurple/protocols/yahoo/yahoo.c:4380
+#: ../libpurple/protocols/yahoo/yahoo.c:4382
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4394
+#: ../libpurple/protocols/yahoo/yahoo.c:4405
 msgid "Yahoo Japan"
 msgstr "Yahoo Japani"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4397
+#: ../libpurple/protocols/yahoo/yahoo.c:4408
 msgid "Pager server"
 msgstr "Hakulaitepalvelin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4400
+#: ../libpurple/protocols/yahoo/yahoo.c:4411
 msgid "Japan Pager server"
 msgstr "Hakulaitepalvelin (Japani)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4403
+#: ../libpurple/protocols/yahoo/yahoo.c:4414
 msgid "Pager port"
 msgstr "Hakulaiteportti"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4406
+#: ../libpurple/protocols/yahoo/yahoo.c:4417
 msgid "File transfer server"
 msgstr "Tiedostonsiirtopalvelin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4409
+#: ../libpurple/protocols/yahoo/yahoo.c:4420
 msgid "Japan file transfer server"
 msgstr "Tiedostonsiirtopalvelin (Japani)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4412
+#: ../libpurple/protocols/yahoo/yahoo.c:4423
 msgid "File transfer port"
 msgstr "Tiedostonsiirtoportti"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4426
 msgid "Chat room locale"
 msgstr "Keskusteluhuoneen paikallisasetus"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4429
 msgid "Ignore conference and chatroom invitations"
 msgstr "Jätä konferenssi- ja keskusteluhuonekutsut huomiotta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4426
+#: ../libpurple/protocols/yahoo/yahoo.c:4437
 msgid "Chat room list URL"
 msgstr "Keskusteluhuoneluettelon URL"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4429
+#: ../libpurple/protocols/yahoo/yahoo.c:4440
 msgid "Yahoo Chat server"
 msgstr "Yahoo-ryhmäkeskustelupalvelin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4432
+#: ../libpurple/protocols/yahoo/yahoo.c:4443
 msgid "Yahoo Chat port"
 msgstr "Yahoo-ryhmäkeskustelupalvelimen portti"
 
@@ -13115,12 +13259,19 @@ msgstr "Lähetä piirtelypyyntö (doodle
 msgid "Sent Doodle request."
 msgstr "Lähetä piirtelypyyntö (doodle)."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:319
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:328
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:337
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1110
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1514
 msgid "Unable to establish file descriptor."
 msgstr "Ei kyetty muodostamaan tiedostokahvaa."
 
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1409
+#, c-format
+msgid "%s is trying to send you a group of %d files.\n"
+msgstr "%s tarjoaa %d tiedoston tiedostoryhmää.\n"
+
 #: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "Virhe kirjoituksessa"
@@ -13149,47 +13300,47 @@ msgstr ""
 "Jos haluat katsoa tätä profiilia, sinun tulee seurata tätä linkkiä "
 "selaimessasi:"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1040
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1115
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1119
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1123
 msgid "Hobbies"
 msgstr "Harrastukset"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1133
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1137
 msgid "Latest News"
 msgstr "Uutiset"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1158
 msgid "Home Page"
 msgstr "Kotisivu"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1173
 msgid "Cool Link 1"
 msgstr "Linkki 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1178
 msgid "Cool Link 2"
 msgstr "Linkki 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1182
 msgid "Cool Link 3"
 msgstr "Linkki 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1196
 msgid "Last Update"
 msgstr "Edellinen päivitys"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1211
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
@@ -13197,7 +13348,7 @@ msgstr ""
 "Tämä profiili näyttää käyttävän kieltä tai muotoa jota ei tueta tällä "
 "hetkellä."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1227
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -13205,7 +13356,7 @@ msgstr ""
 "Käyttäjän profiilia ei voi hakea. Tämä on todennäköisesti väliaikainen "
 "palvelimen ongelma. Ole hyvä ja yritä myöhemmin uudestaan."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1230
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -13216,39 +13367,39 @@ msgstr ""
 "profiilin. Jos olet varma että käyttäjä on olemassa, yritä myöhemmin "
 "uudelleen."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1237
 msgid "The user's profile is empty."
 msgstr "Käyttäjän profiili on tyhjä."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:217
+#: ../libpurple/protocols/yahoo/yahoochat.c:222
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s kieltäytyi kutsustasi huoneeseen \"%s\" koska \"%s\"."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:219
+#: ../libpurple/protocols/yahoo/yahoochat.c:224
 msgid "Invitation Rejected"
 msgstr "Kutsusta kieltäydytty"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:438
+#: ../libpurple/protocols/yahoo/yahoochat.c:443
 msgid "Failed to join chat"
 msgstr "Ryhmäkeskusteluun liittyminen epäonnistui"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:441
+#: ../libpurple/protocols/yahoo/yahoochat.c:446
 msgid "Unknown room"
 msgstr "Tuntematon huone"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:444
+#: ../libpurple/protocols/yahoo/yahoochat.c:449
 msgid "Maybe the room is full"
 msgstr "Ehkä huone on täynnä"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:447
+#: ../libpurple/protocols/yahoo/yahoochat.c:452
 msgid "Not available"
 msgstr "Ei olemassa"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:451
+#: ../libpurple/protocols/yahoo/yahoochat.c:456
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -13256,38 +13407,38 @@ msgstr ""
 "Tuntematon virhe. Voi olla että sinun pitää kirjautua ulos ja odottaa viisi "
 "minuuttia ennen uudelleenliittymistä keskusteluhuoneeseen"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:534
+#: ../libpurple/protocols/yahoo/yahoochat.c:539
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Olet nyt keskustelemassa huoneessa %s"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:719
+#: ../libpurple/protocols/yahoo/yahoochat.c:728
 msgid "Failed to join buddy in chat"
 msgstr "Liittyminen tuttavan seuraan keskusteluhuoneeseen epäonnistui"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:720
+#: ../libpurple/protocols/yahoo/yahoochat.c:729
 msgid "Maybe they're not in a chat?"
 msgstr "Ehkä he eivät ole ryhmäkeskustelussa?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+#: ../libpurple/protocols/yahoo/yahoochat.c:1425
+#: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Fetching the room list failed."
 msgstr "Huoneluettelon haku epäonnistui."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1500
+#: ../libpurple/protocols/yahoo/yahoochat.c:1511
 msgid "Voices"
 msgstr "Äänet"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1503
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
 msgid "Webcams"
 msgstr "Web-kamerat"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1595
 msgid "Unable to fetch room list."
 msgstr "Huoneluetteloa ei voi hakea."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1577
+#: ../libpurple/protocols/yahoo/yahoochat.c:1588
 msgid "User Rooms"
 msgstr "Käyttäjän huoneet"
 
@@ -13304,7 +13455,7 @@ msgstr ""
 "Yhteys palvelimeen katkesi\n"
 "%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:354
+#: ../libpurple/protocols/zephyr/zephyr.c:358
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -13312,77 +13463,77 @@ msgstr ""
 "(Tämän viestin muunnoksessa oli virhe.\t Tarkista \"Merkistö\"-valinta tilin "
 "muokkausikkunasta)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:752
+#: ../libpurple/protocols/zephyr/zephyr.c:756
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Ryhmäkeskusteluun ei voi lähettää %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1210
+#: ../libpurple/protocols/zephyr/zephyr.c:795
+#: ../libpurple/protocols/zephyr/zephyr.c:1170
 msgid "Hidden or not logged-in"
 msgstr "Näkymättömänä tai poissa linjoilta"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1212
+#: ../libpurple/protocols/zephyr/zephyr.c:801
+#: ../libpurple/protocols/zephyr/zephyr.c:1172
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Paikassa: %s saapunut: %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1546
-#: ../libpurple/protocols/zephyr/zephyr.c:1547
+#: ../libpurple/protocols/zephyr/zephyr.c:1510
+#: ../libpurple/protocols/zephyr/zephyr.c:1511
 msgid "Anyone"
 msgstr "Kuka tahansa"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2354
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Class:"
 msgstr "_Luokka:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2360
+#: ../libpurple/protocols/zephyr/zephyr.c:2372
 msgid "_Instance:"
 msgstr "_Ilmentymä:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2366
+#: ../libpurple/protocols/zephyr/zephyr.c:2378
 msgid "_Recipient:"
 msgstr "_Vastaanottaja:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2377
+#: ../libpurple/protocols/zephyr/zephyr.c:2389
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Yritys tilata %s,%s,%s epäonnistui"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2690
+#: ../libpurple/protocols/zephyr/zephyr.c:2702
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nimi&gt;: Paikanna käyttäjä"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2695
+#: ../libpurple/protocols/zephyr/zephyr.c:2707
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nimi&gt;: Paikanna käyttäjä"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2700
+#: ../libpurple/protocols/zephyr/zephyr.c:2712
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;ilmentymä&gt;: Aseta ilmentymä jota käytetään tässä luokassa"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2705
+#: ../libpurple/protocols/zephyr/zephyr.c:2717
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;ilmentymä&gt;: Aseta ilmentymä jota käytetään tässä luokassa"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2710
+#: ../libpurple/protocols/zephyr/zephyr.c:2722
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;ilmentymä&gt;: Aseta ilmentymä jota käytetään tässä luokassa"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2716
+#: ../libpurple/protocols/zephyr/zephyr.c:2728
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;luokka&gt; &lt;ilmentymä&gt; &lt;vastaanottaja&gt;: Liity uuteen "
 "ryhmäkeskusteluun"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2721
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;ilmentymä&gt;: Lähetä viesti &lt;viesti,<i>ilmentymä</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2727
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -13390,7 +13541,7 @@ msgstr ""
 "zci &lt;luokka&gt; &lt;ilmentymä&gt;: Lähetä viesti &lt;<i>luokka</i>,"
 "<i>ilmentymä</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2733
+#: ../libpurple/protocols/zephyr/zephyr.c:2745
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -13398,7 +13549,7 @@ msgstr ""
 "zcir &lt;luokka&gt; &lt;ilmentymä&gt; &lt;vastaanottaja&gt;: Lähetä viesti "
 "&lt;<i>luokka</i>,<i>ilmentymä</i>,<i>vastaanottaja</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2739
+#: ../libpurple/protocols/zephyr/zephyr.c:2751
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -13406,15 +13557,15 @@ msgstr ""
 "zir &lt;ilmentymä&gt; &lt;vastaanottaja&gt;: Lähetä viesti &lt;VIESTI,"
 "<i>ilmentymä</i>,<i>vastaanottaja</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2744
+#: ../libpurple/protocols/zephyr/zephyr.c:2756
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;luokka&gt;: Lähetä viesti &lt;<i>luokka</i>,YKSITYINEN,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2850
+#: ../libpurple/protocols/zephyr/zephyr.c:2832
 msgid "Resubscribe"
 msgstr "Tilaa uudelleen"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2853
+#: ../libpurple/protocols/zephyr/zephyr.c:2835
 msgid "Retrieve subscriptions from server"
 msgstr "Hae tilaukset palvelimelta"
 
@@ -13428,45 +13579,45 @@ msgstr "Hae tilaukset palvelimelta"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2946
-#: ../libpurple/protocols/zephyr/zephyr.c:2948
+#: ../libpurple/protocols/zephyr/zephyr.c:2928
+#: ../libpurple/protocols/zephyr/zephyr.c:2930
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
+#: ../libpurple/protocols/zephyr/zephyr.c:2955
 msgid "Use tzc"
 msgstr "Käytä tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
+#: ../libpurple/protocols/zephyr/zephyr.c:2958
 msgid "tzc command"
 msgstr "tzc-komento"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
+#: ../libpurple/protocols/zephyr/zephyr.c:2961
 msgid "Export to .anyone"
 msgstr "Vie tiedostoon .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
+#: ../libpurple/protocols/zephyr/zephyr.c:2964
 msgid "Export to .zephyr.subs"
 msgstr "Vie tiedostoon .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2985
+#: ../libpurple/protocols/zephyr/zephyr.c:2967
 msgid "Import from .anyone"
 msgstr "Tuo tiedostosta .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2988
+#: ../libpurple/protocols/zephyr/zephyr.c:2970
 msgid "Import from .zephyr.subs"
 msgstr "Tuo tiedostosta .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2991
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Realm"
 msgstr "Alue (realm)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2994
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "Exposure"
 msgstr "Altistus"
 
-#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:902 ../libpurple/proxy.c:1061
-#: ../libpurple/proxy.c:1632
+#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:908 ../libpurple/proxy.c:1067
+#: ../libpurple/proxy.c:1638
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13480,55 +13631,41 @@ msgstr "Vastausta HTTP-välipalvelimelta
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "Vastausta HTTP-välipalvelimelta ei voi jäsentää: %s\n"
 
-#: ../libpurple/proxy.c:702 ../libpurple/proxy.c:750 ../libpurple/proxy.c:786
-#: ../libpurple/proxy.c:798
+#: ../libpurple/proxy.c:702 ../libpurple/proxy.c:751 ../libpurple/proxy.c:789
+#: ../libpurple/proxy.c:801
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-välipalvelimen yhteysvirhe %d"
 
-#: ../libpurple/proxy.c:794
+#: ../libpurple/proxy.c:797
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "Pääsy evätty: HTTP-välipalvelin estää portin %d tunneloinnin."
 
-#: ../libpurple/proxy.c:1022
+#: ../libpurple/proxy.c:1028
 #, c-format
 msgid "Error resolving %s"
 msgstr "Virhe selvitettäessä %s"
 
-#: ../libpurple/proxy.c:1730
+#: ../libpurple/proxy.c:1736
 msgid "Could not resolve host name"
 msgstr "Isäntänimeä ei voi selvittää"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
-#. *
-#. * @since 2.3.0
 #.
-#. *
-#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
-#. *
-#. * @deprecated Please use purple_request_yes_no_with_hint instead.
-#.
-#: ../libpurple/request.h:1802 ../libpurple/request.h:1815
+#: ../libpurple/request.h:1448
 msgid "_Yes"
 msgstr "_Kyllä"
 
-#: ../libpurple/request.h:1802 ../libpurple/request.h:1815
+#: ../libpurple/request.h:1448
 msgid "_No"
 msgstr "_Ei"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
-#. *
-#. * @since 2.3.0
 #.
-#. *
-#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
-#. *
-#. * @deprecated Please use purple_request_accept_cancel_with_hint instead.
-#.
-#: ../libpurple/request.h:1854 ../libpurple/request.h:1867
+#: ../libpurple/request.h:1468
 msgid "_Accept"
 msgstr "_Hyväksy"
 
@@ -13539,26 +13676,26 @@ msgstr "En ole täällä juuri nyt"
 msgid "I'm not here right now"
 msgstr "En ole täällä juuri nyt"
 
-#: ../libpurple/savedstatuses.c:535
+#: ../libpurple/savedstatuses.c:537
 msgid "saved statuses"
 msgstr "tallennetut tilat"
 
-#: ../libpurple/server.c:234
+#: ../libpurple/server.c:265
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s on nyt nimeltään %s.\n"
 
-#: ../libpurple/server.c:302
+#: ../libpurple/server.c:333
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Pyydetään käyttäjän %s huomiota..."
 
-#: ../libpurple/server.c:347
+#: ../libpurple/server.c:378
 #, c-format
 msgid "%s has requested your attention!"
 msgstr "%s pyysi huomiotasi"
 
-#: ../libpurple/server.c:793
+#: ../libpurple/server.c:875
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13567,12 +13704,12 @@ msgstr ""
 "Käyttäjä %s on kutsunut käyttäjän %s keskusteluhuoneeseen %s:\n"
 "%s"
 
-#: ../libpurple/server.c:798
+#: ../libpurple/server.c:880
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "Käyttäjä %s on kutsunut käyttäjän %s keskusteluhuoneeseen %s\n"
 
-#: ../libpurple/server.c:802
+#: ../libpurple/server.c:884
 msgid "Accept chat invitation?"
 msgstr "Hyväksy ryhmäkeskustelukutsu?"
 
@@ -13597,7 +13734,7 @@ msgstr "Poista asetus"
 msgstr "Poista asetus"
 
 #: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
-#: ../pidgin/gtkstatusbox.c:1059
+#: ../pidgin/gtkstatusbox.c:1083
 msgid "Do not disturb"
 msgstr "Älä häiritse"
 
@@ -13615,50 +13752,35 @@ msgstr "Kuuntelee musiikkia"
 
 #: ../libpurple/status.c:610
 #, c-format
-msgid "%s changed status from %s to %s"
-msgstr "%s on vaihtanut tilasta %s tilaan %s"
-
-#: ../libpurple/status.c:613
-#, c-format
 msgid "%s (%s) changed status from %s to %s"
 msgstr "%s (%s) on vaihtanut tilasta %s tilaan %s"
 
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:621
 #, c-format
-msgid "%s is now %s"
-msgstr "%s on nyt %s"
-
-#: ../libpurple/status.c:626
-#, c-format
 msgid "%s (%s) is now %s"
 msgstr "%s (%s) on nyt %s"
 
-#: ../libpurple/status.c:632
+#: ../libpurple/status.c:627
 #, c-format
-msgid "%s is no longer %s"
-msgstr "%s ei ole enää %s"
-
-#: ../libpurple/status.c:634
-#, c-format
 msgid "%s (%s) is no longer %s"
 msgstr "%s (%s) ei ole enää %s"
 
-#: ../libpurple/status.c:1247
+#: ../libpurple/status.c:1242
 #, c-format
 msgid "%s became idle"
 msgstr "%s on jouten"
 
-#: ../libpurple/status.c:1264
+#: ../libpurple/status.c:1262
 #, c-format
 msgid "%s became unidle"
 msgstr "%s on aktiivinen"
 
-#: ../libpurple/status.c:1327
+#: ../libpurple/status.c:1328
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s on jouten"
 
-#: ../libpurple/status.c:1329
+#: ../libpurple/status.c:1330
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s on aktiivinen"
@@ -13668,12 +13790,12 @@ msgstr "%x %X"
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2783
+#: ../libpurple/util.c:2804
 #, c-format
 msgid "Error Reading %s"
 msgstr "Virhe luettaessa %s"
 
-#: ../libpurple/util.c:2784
+#: ../libpurple/util.c:2805
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13682,67 +13804,67 @@ msgstr ""
 "%s:n lukemisessa tapahtui virhe. Niitä ei ladattu ja vanha tiedosto on "
 "nimetty uudelleen nimellä %s~."
 
-#: ../libpurple/util.c:3281
+#: ../libpurple/util.c:3304
 msgid "Calculating..."
 msgstr "Lasketaan..."
 
-#: ../libpurple/util.c:3284
+#: ../libpurple/util.c:3307
 msgid "Unknown."
 msgstr "Tuntematon."
 
-#: ../libpurple/util.c:3310
+#: ../libpurple/util.c:3333
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekunti"
 msgstr[1] "%d sekuntia"
 
-#: ../libpurple/util.c:3322
+#: ../libpurple/util.c:3345
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d päivä"
 msgstr[1] "%d päivää"
 
-#: ../libpurple/util.c:3330
+#: ../libpurple/util.c:3353
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d tunti"
 msgstr[1] "%s, %d tuntia"
 
-#: ../libpurple/util.c:3336
+#: ../libpurple/util.c:3359
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tunti"
 msgstr[1] "%d tuntia"
 
-#: ../libpurple/util.c:3344
+#: ../libpurple/util.c:3367
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuutti"
 msgstr[1] "%s, %d minuuttia"
 
-#: ../libpurple/util.c:3350
+#: ../libpurple/util.c:3373
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuutti"
 msgstr[1] "%d minuuttia"
 
-#: ../libpurple/util.c:3610
+#: ../libpurple/util.c:3633
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "%s:n avaaminen epäonnistui: uudelleenohjattu liian monta kertaa"
 
-#: ../libpurple/util.c:3647 ../libpurple/util.c:3943
+#: ../libpurple/util.c:3670 ../libpurple/util.c:3966
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Kohteeseen %s ei kyetty muodostamaan yhteyttä"
 
-#: ../libpurple/util.c:3770
+#: ../libpurple/util.c:3793
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -13751,21 +13873,55 @@ msgstr ""
 "Riittävästi muistia ei voi varata säilyttämään kohteen %s sisältö. "
 "Verkkopalvelin voi olla yrittämässä tehdä jotain pahantahtoista."
 
-#: ../libpurple/util.c:3805
+#: ../libpurple/util.c:3828
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Virhe luettaessa kohteesta %s: %s"
 
-#: ../libpurple/util.c:3836
+#: ../libpurple/util.c:3859
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Virhe kirjoitettaessa kohteeseen %s: %s"
 
-#: ../libpurple/util.c:3861
+#: ../libpurple/util.c:3884
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Kohteeseen %s ei voi yhdistää: %s"
 
+#: ../libpurple/util.c:4686
+#, c-format
+msgid " - %s"
+msgstr " - %s"
+
+#: ../libpurple/util.c:4692
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#. 10053
+#: ../libpurple/win32/libc_interface.c:322
+#, c-format
+msgid "Connection interrupted by other software on your computer."
+msgstr "Yhteys keskeytyi tietokoneella olevan toisen ohjelman takia."
+
+#. 10054
+#: ../libpurple/win32/libc_interface.c:324
+#, c-format
+msgid "Remote host closed connection."
+msgstr "Etäkone on katkaissut yhteyden."
+
+#. 10060
+#: ../libpurple/win32/libc_interface.c:326
+#, c-format
+msgid "Connection timed out."
+msgstr "Ei yhteyttä määräajassa."
+
+#. 10061
+#: ../libpurple/win32/libc_interface.c:328
+#, c-format
+msgid "Connection refused."
+msgstr "Yhteys torjuttu."
+
 #: ../pidgin.desktop.in.h:1
 msgid "Internet Messenger"
 msgstr "Pikaviestin"
@@ -13787,71 +13943,71 @@ msgstr "Ilmoitusalueen asento."
 msgstr "Ilmoitusalueen asento."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:410
+#: ../pidgin/gtkaccount.c:379
 msgid "Login Options"
 msgstr "Sisäänkirjautumisvalinnat"
 
-#: ../pidgin/gtkaccount.c:431
+#: ../pidgin/gtkaccount.c:400
 msgid "Pro_tocol:"
 msgstr "Yhteyskäy_täntö:"
 
-#: ../pidgin/gtkaccount.c:442
+#: ../pidgin/gtkaccount.c:411
 msgid "Screen _name:"
 msgstr "Näyttö_nimi:"
 
-#: ../pidgin/gtkaccount.c:532
+#: ../pidgin/gtkaccount.c:501
 msgid "_Local alias:"
 msgstr "Paika_llinen lempinimi:"
 
-#: ../pidgin/gtkaccount.c:536
+#: ../pidgin/gtkaccount.c:505
 msgid "Remember pass_word"
 msgstr "Muista _salasana"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:594
+#: ../pidgin/gtkaccount.c:563
 msgid "User Options"
 msgstr "Käyttäjän valinnat"
 
-#: ../pidgin/gtkaccount.c:607
+#: ../pidgin/gtkaccount.c:576
 msgid "New _mail notifications"
 msgstr "Il_moita uudesta sähköpostista"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:612
+#: ../pidgin/gtkaccount.c:581
 msgid "Use this buddy _icon for this account:"
 msgstr "Käytä tätä tuttavakuvaketta tälle käyttäjät_ilille:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:734
+#: ../pidgin/gtkaccount.c:703
 #, c-format
 msgid "%s Options"
 msgstr "%s-valinnat"
 
-#: ../pidgin/gtkaccount.c:939
+#: ../pidgin/gtkaccount.c:908
 msgid "Use GNOME Proxy Settings"
 msgstr "Käytä Gnomen välipalvelinasetuksia"
 
-#: ../pidgin/gtkaccount.c:940
+#: ../pidgin/gtkaccount.c:909
 msgid "Use Global Proxy Settings"
 msgstr "Käytä yleisiä välipalvelinasetuksia"
 
-#: ../pidgin/gtkaccount.c:946
+#: ../pidgin/gtkaccount.c:915
 msgid "No Proxy"
 msgstr "Ei välipalvelinta"
 
-#: ../pidgin/gtkaccount.c:952
+#: ../pidgin/gtkaccount.c:921
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:958
+#: ../pidgin/gtkaccount.c:927
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:964
+#: ../pidgin/gtkaccount.c:933
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:970 ../pidgin/gtkprefs.c:1283
+#: ../pidgin/gtkaccount.c:939 ../pidgin/gtkprefs.c:1230
 msgid "Use Environmental Settings"
 msgstr "Käytä ympäristöasetuksia"
 
@@ -13860,72 +14016,73 @@ msgstr "Käytä ympäristöasetuksia"
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:1009
+#: ../pidgin/gtkaccount.c:978
 msgid "If you look real closely"
 msgstr "Jos katsot todella tarkkaan"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1012
+#: ../pidgin/gtkaccount.c:981
 msgid "you can see the butterflies mating"
 msgstr "voit nähdä perhosten parittelevan"
 
-#: ../pidgin/gtkaccount.c:1033
+#: ../pidgin/gtkaccount.c:1002
 msgid "Proxy Options"
 msgstr "Välipalvelinvalinnat"
 
-#: ../pidgin/gtkaccount.c:1047 ../pidgin/gtkprefs.c:1277
+#: ../pidgin/gtkaccount.c:1016 ../pidgin/gtkprefs.c:1224
 msgid "Proxy _type:"
 msgstr "Välipalvelimen _tyyppi:"
 
-#: ../pidgin/gtkaccount.c:1056 ../pidgin/gtkprefs.c:1298
+#: ../pidgin/gtkaccount.c:1025 ../pidgin/gtkprefs.c:1245
 msgid "_Host:"
 msgstr "P_alvelin:"
 
-#: ../pidgin/gtkaccount.c:1060 ../pidgin/gtkprefs.c:1316
+#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1263
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: ../pidgin/gtkaccount.c:1068
+#: ../pidgin/gtkaccount.c:1037
 msgid "_Username:"
 msgstr "_Käyttäjänimi:"
 
-#: ../pidgin/gtkaccount.c:1075 ../pidgin/gtkprefs.c:1353
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1300
 msgid "Pa_ssword:"
 msgstr "_Salasana:"
 
-#: ../pidgin/gtkaccount.c:1199
+#: ../pidgin/gtkaccount.c:1169
 msgid "Unable to save new account"
 msgstr "Uuden käyttäjätilin tallentaminen ei onnistu."
 
-#: ../pidgin/gtkaccount.c:1200
+#: ../pidgin/gtkaccount.c:1170
 msgid "An account already exists with the specified criteria."
 msgstr "Määritelty käyttäjätili on jo olemassa."
 
-#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkaccount.c:1447
 msgid "Add Account"
 msgstr "Lisää tili"
 
-#: ../pidgin/gtkaccount.c:1497
+#: ../pidgin/gtkaccount.c:1464
 msgid "_Basic"
 msgstr "_Perus"
 
-#: ../pidgin/gtkaccount.c:1504
+#: ../pidgin/gtkaccount.c:1471
 msgid "Create this new account on the server"
 msgstr "Luo tämä uusi käyttäjätili palvelimelle"
 
-#: ../pidgin/gtkaccount.c:1520
+#: ../pidgin/gtkaccount.c:1485
 msgid "_Advanced"
 msgstr "_Lisäasetukset"
 
-#: ../pidgin/gtkaccount.c:1978 ../pidgin/gtkplugin.c:595
+#: ../pidgin/gtkaccount.c:1906 ../pidgin/gtkplugin.c:639
+#: ../pidgin/plugins/convcolors.c:327
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: ../pidgin/gtkaccount.c:2006
+#: ../pidgin/gtkaccount.c:1934
 msgid "Protocol"
 msgstr "Yhteyskäytäntö"
 
-#: ../pidgin/gtkaccount.c:2207
+#: ../pidgin/gtkaccount.c:2137
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -13948,7 +14105,7 @@ msgstr ""
 "Voit palata tähän ikkunaan lisäämään, muokkaamaan tai poistamaan tilejä "
 "valitsemalla <b>Käyttäjätilit->Lisää/muokkaa</b> Tuttavat-ikkunassa."
 
-#: ../pidgin/gtkblist.c:543
+#: ../pidgin/gtkblist.c:549
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -13956,7 +14113,7 @@ msgstr[1] "Sinulla on %d kontaktia joide
 msgstr[0] "Sinulla on %d kontakti jonka nimi on %s. Haluatko yhdistää ne?"
 msgstr[1] "Sinulla on %d kontaktia joiden nimi on %s. Haluatko yhdistää ne?"
 
-#: ../pidgin/gtkblist.c:544
+#: ../pidgin/gtkblist.c:550
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
 "list and use a single conversation window. You can separate them again by "
@@ -13966,117 +14123,121 @@ msgstr ""
 "ja kontakteille käytetään jatkossa vain yhtä keskusteluikkunaa. Ne voidaan "
 "erottaa valitsemalla \"Laajenna\" kontaktin oikean napin valikosta"
 
-#: ../pidgin/gtkblist.c:546
+#: ../pidgin/gtkblist.c:552
 msgid "_Merge"
 msgstr "_Yhdistä"
 
-#: ../pidgin/gtkblist.c:961
+#: ../pidgin/gtkblist.c:953 ../pidgin/gtkblist.c:6683
+msgid "Room _List"
+msgstr "Huone_luettelo"
+
+#: ../pidgin/gtkblist.c:973
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Syötä tiedot ryhmäkeskustelusta, johon haluaisit liittyä.\n"
 
-#: ../pidgin/gtkblist.c:972 ../pidgin/gtkblist.c:6599
-#: ../pidgin/gtkpounce.c:554 ../pidgin/gtkroomlist.c:709
+#: ../pidgin/gtkblist.c:985 ../pidgin/gtkblist.c:6718
+#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:547
 msgid "_Account:"
 msgstr "_Käyttäjätili:"
 
-#: ../pidgin/gtkblist.c:1261 ../pidgin/gtkprivacy.c:605
-#: ../pidgin/gtkprivacy.c:619
+#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkprivacy.c:549
+#: ../pidgin/gtkprivacy.c:563
 msgid "_Block"
 msgstr "_Estä"
 
-#: ../pidgin/gtkblist.c:1261
+#: ../pidgin/gtkblist.c:1263
 msgid "Un_block"
 msgstr "_Poista esto"
 
-#: ../pidgin/gtkblist.c:1304
+#: ../pidgin/gtkblist.c:1306
 msgid "Move to"
 msgstr "Siirrä"
 
-#: ../pidgin/gtkblist.c:1344
+#: ../pidgin/gtkblist.c:1346
 msgid "Get _Info"
 msgstr "Hae _tiedot"
 
-#: ../pidgin/gtkblist.c:1347 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1349 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_Pikaviesti"
 
-#: ../pidgin/gtkblist.c:1353
+#: ../pidgin/gtkblist.c:1355
 msgid "_Send File..."
 msgstr "_Lähetä tiedosto..."
 
-#: ../pidgin/gtkblist.c:1360
+#: ../pidgin/gtkblist.c:1362
 msgid "Add Buddy _Pounce..."
 msgstr "Lisää tuttava_ilmoitin..."
 
-#: ../pidgin/gtkblist.c:1365 ../pidgin/gtkblist.c:1369
-#: ../pidgin/gtkblist.c:1484 ../pidgin/gtkblist.c:1507
+#: ../pidgin/gtkblist.c:1367 ../pidgin/gtkblist.c:1371
+#: ../pidgin/gtkblist.c:1486 ../pidgin/gtkblist.c:1509
 msgid "View _Log"
 msgstr "Näytä _loki"
 
-#: ../pidgin/gtkblist.c:1375
+#: ../pidgin/gtkblist.c:1377
 msgid "Hide when offline"
 msgstr "Piilota kun poissa linjoilta"
 
-#: ../pidgin/gtkblist.c:1375
+#: ../pidgin/gtkblist.c:1377
 msgid "Show when offline"
 msgstr "Näytä kun poissa linjoilta"
 
-#: ../pidgin/gtkblist.c:1389 ../pidgin/gtkblist.c:1398
-#: ../pidgin/gtkblist.c:1492 ../pidgin/gtkblist.c:1513
+#: ../pidgin/gtkblist.c:1391 ../pidgin/gtkblist.c:1400
+#: ../pidgin/gtkblist.c:1494 ../pidgin/gtkblist.c:1515
 msgid "_Alias..."
-msgstr "_Alias..."
+msgstr "_Lempinimi..."
 
-#: ../pidgin/gtkblist.c:1392 ../pidgin/gtkblist.c:1400
-#: ../pidgin/gtkblist.c:1494 ../pidgin/gtkblist.c:1515
+#: ../pidgin/gtkblist.c:1394 ../pidgin/gtkblist.c:1402
+#: ../pidgin/gtkblist.c:1496 ../pidgin/gtkblist.c:1517
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../pidgin/gtkblist.c:1450
+#: ../pidgin/gtkblist.c:1452
 msgid "Add _Buddy..."
 msgstr "Lisää _tuttava..."
 
-#: ../pidgin/gtkblist.c:1453
+#: ../pidgin/gtkblist.c:1455
 msgid "Add C_hat..."
 msgstr "Lisää ry_hmäkeskustelu..."
 
-#: ../pidgin/gtkblist.c:1456
+#: ../pidgin/gtkblist.c:1458
 msgid "_Delete Group"
 msgstr "_Poista ryhmä"
 
-#: ../pidgin/gtkblist.c:1458
+#: ../pidgin/gtkblist.c:1460
 msgid "_Rename"
 msgstr "Nimeä _uudelleen"
 
 #. join button
-#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkroomlist.c:316
-#: ../pidgin/gtkroomlist.c:773 ../pidgin/pidginstock.c:88
+#: ../pidgin/gtkblist.c:1480 ../pidgin/gtkroomlist.c:318
+#: ../pidgin/gtkroomlist.c:594 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Liity"
 
-#: ../pidgin/gtkblist.c:1480
+#: ../pidgin/gtkblist.c:1482
 msgid "Auto-Join"
 msgstr "Liity automaattisesti"
 
-#: ../pidgin/gtkblist.c:1482
+#: ../pidgin/gtkblist.c:1484
 msgid "Persistent"
 msgstr "Pysyvä"
 
-#: ../pidgin/gtkblist.c:1520 ../pidgin/gtkblist.c:1543
+#: ../pidgin/gtkblist.c:1522 ../pidgin/gtkblist.c:1545
 msgid "_Collapse"
 msgstr "_Pienennä"
 
-#: ../pidgin/gtkblist.c:1548
+#: ../pidgin/gtkblist.c:1550
 msgid "_Expand"
 msgstr "_Laajenna"
 
-#: ../pidgin/gtkblist.c:1799 ../pidgin/gtkblist.c:1811
-#: ../pidgin/gtkblist.c:5264 ../pidgin/gtkblist.c:5277
+#: ../pidgin/gtkblist.c:1801 ../pidgin/gtkblist.c:1813
+#: ../pidgin/gtkblist.c:5364 ../pidgin/gtkblist.c:5377
 msgid "/Tools/Mute Sounds"
 msgstr "/Työkalut/Vaimenna äänet"
 
-#: ../pidgin/gtkblist.c:2271 ../pidgin/gtkconv.c:4922
+#: ../pidgin/gtkblist.c:2273 ../pidgin/gtkconv.c:4813
 #: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -14084,219 +14245,239 @@ msgstr ""
 "Et ole kirjautuneena millään käyttäjätilillä jolla voisi lisätä kyseisen "
 "tuttavan."
 
+#. I don't believe this can happen currently, I think
+#. * everything that calls this function checks for one of the
+#. * above node types first.
+#: ../pidgin/gtkblist.c:2618
+msgid "Unknown node type"
+msgstr "Tuntematon solmutyyppi"
+
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3103
+#: ../pidgin/gtkblist.c:3054
 msgid "/_Buddies"
 msgstr "/_Tuttavat"
 
-#: ../pidgin/gtkblist.c:3104
+#: ../pidgin/gtkblist.c:3055
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Tuttavat/Uusi _pikaviesti..."
 
-#: ../pidgin/gtkblist.c:3105
+#: ../pidgin/gtkblist.c:3056
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Tuttavat/Liity _ryhmäkeskusteluun..."
 
-#: ../pidgin/gtkblist.c:3106
+#: ../pidgin/gtkblist.c:3057
 msgid "/Buddies/Get User _Info..."
 msgstr "/Tuttavat/Hae _käyttäjätiedot..."
 
-#: ../pidgin/gtkblist.c:3107
+#: ../pidgin/gtkblist.c:3058
 msgid "/Buddies/View User _Log..."
 msgstr "/Tuttavat/Näytä käyttäjä_loki..."
 
-#: ../pidgin/gtkblist.c:3109
+#: ../pidgin/gtkblist.c:3060
 msgid "/Buddies/Sh_ow"
 msgstr "/Tuttavat/Nä_ytä"
 
-#: ../pidgin/gtkblist.c:3110
+#: ../pidgin/gtkblist.c:3061
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Tuttavat/Näytä/_Poissaolevat tuttavat"
 
-#: ../pidgin/gtkblist.c:3111
+#: ../pidgin/gtkblist.c:3062
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Tuttavat/Näytä/_Tyhjät ryhmät"
 
-#: ../pidgin/gtkblist.c:3112
+#: ../pidgin/gtkblist.c:3063
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Tuttavat/Näytä/Tuttavien tie_dot"
 
-#: ../pidgin/gtkblist.c:3113
+#: ../pidgin/gtkblist.c:3064
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Tuttavat/Näytä/_Joutenoloajat"
 
-#: ../pidgin/gtkblist.c:3114
+#: ../pidgin/gtkblist.c:3065
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Tuttavat/Näytä/_Yhteyskäytäntökuvakkeet"
 
-#: ../pidgin/gtkblist.c:3115
+#: ../pidgin/gtkblist.c:3066
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Tuttavat/L_ajittele tuttavat"
 
-#: ../pidgin/gtkblist.c:3117
+#: ../pidgin/gtkblist.c:3068
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Tuttavat/_Lisää tuttava..."
 
-#: ../pidgin/gtkblist.c:3118
+#: ../pidgin/gtkblist.c:3069
 msgid "/Buddies/Add C_hat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../pidgin/gtkblist.c:3119
+#: ../pidgin/gtkblist.c:3070
 msgid "/Buddies/Add _Group..."
 msgstr "/Tuttavat/Lisää _ryhmä..."
 
-#: ../pidgin/gtkblist.c:3121
+#: ../pidgin/gtkblist.c:3072
 msgid "/Buddies/_Quit"
 msgstr "/Tuttavat/_Lopeta"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3124
+#: ../pidgin/gtkblist.c:3075
 msgid "/_Accounts"
 msgstr "/_Käyttäjätilit"
 
-#: ../pidgin/gtkblist.c:3125 ../pidgin/gtkblist.c:7301
+#: ../pidgin/gtkblist.c:3076 ../pidgin/gtkblist.c:7403
 msgid "/Accounts/Manage"
 msgstr "/Käyttäjätilit/Hallinta"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3128
+#: ../pidgin/gtkblist.c:3079
 msgid "/_Tools"
 msgstr "/T_yökalut"
 
-#: ../pidgin/gtkblist.c:3129
+#: ../pidgin/gtkblist.c:3080
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Työkalut/Tuttava_ilmoittimet"
 
-#: ../pidgin/gtkblist.c:3130
+#: ../pidgin/gtkblist.c:3081
 msgid "/Tools/_Certificates"
 msgstr "/Työkalut/_Varmenteet"
 
-#: ../pidgin/gtkblist.c:3131
+#: ../pidgin/gtkblist.c:3082
 msgid "/Tools/Plu_gins"
 msgstr "/Työkalut/_Liitännäiset"
 
-#: ../pidgin/gtkblist.c:3132
+#: ../pidgin/gtkblist.c:3083
 msgid "/Tools/Pr_eferences"
 msgstr "/Työkalut/A_setukset"
 
-#: ../pidgin/gtkblist.c:3133
+#: ../pidgin/gtkblist.c:3084
 msgid "/Tools/Pr_ivacy"
 msgstr "/Työkalut/Yks_ityisyys"
 
-#: ../pidgin/gtkblist.c:3135
+#: ../pidgin/gtkblist.c:3086
 msgid "/Tools/_File Transfers"
 msgstr "/Työkalut/_Tiedostonsiirrot..."
 
-#: ../pidgin/gtkblist.c:3136
+#: ../pidgin/gtkblist.c:3087
 msgid "/Tools/R_oom List"
 msgstr "/Työkalut/Huone_luettelo"
 
-#: ../pidgin/gtkblist.c:3137
+#: ../pidgin/gtkblist.c:3088
 msgid "/Tools/System _Log"
 msgstr "/Työkalut/Järjestelmä_loki"
 
-#: ../pidgin/gtkblist.c:3139
+#: ../pidgin/gtkblist.c:3090
 msgid "/Tools/Mute _Sounds"
 msgstr "/Työkalut/Vaimenna _äänet"
 
 #. Help
-#: ../pidgin/gtkblist.c:3141
+#: ../pidgin/gtkblist.c:3092
 msgid "/_Help"
 msgstr "/O_hje"
 
-#: ../pidgin/gtkblist.c:3142
+#: ../pidgin/gtkblist.c:3093
 msgid "/Help/Online _Help"
 msgstr "/Ohje/O_hjeita verkossa"
 
-#: ../pidgin/gtkblist.c:3143
+#: ../pidgin/gtkblist.c:3094
 msgid "/Help/_Debug Window"
 msgstr "/Ohje/_Virheenjäljitysikkuna"
 
-#: ../pidgin/gtkblist.c:3145 ../pidgin/gtkblist.c:3147
+#: ../pidgin/gtkblist.c:3096 ../pidgin/gtkblist.c:3098
 msgid "/Help/_About"
 msgstr "/Ohje/Tietoj_a"
 
-#: ../pidgin/gtkblist.c:3176
+#: ../pidgin/gtkblist.c:3128
 #, c-format
+msgid "<b>Account:</b> %s"
+msgstr "<b>Käyttäjätili:</b> %s"
+
+#: ../pidgin/gtkblist.c:3136
+#, c-format
 msgid ""
 "\n"
-"<b>Account:</b> %s"
+"<b>Topic:</b> %s"
 msgstr ""
 "\n"
-"<b>Käyttäjätili:</b> %s"
+"<b>Aihe:</b> %s"
 
-#: ../pidgin/gtkblist.c:3254
+#: ../pidgin/gtkblist.c:3136
+msgid "(no topic set)"
+msgstr "(aihetta ei ole asetettu)"
+
+#: ../pidgin/gtkblist.c:3213
 msgid "Buddy Alias"
 msgstr "Tuttavan lempinimi"
 
-#: ../pidgin/gtkblist.c:3283
+#: ../pidgin/gtkblist.c:3242
 msgid "Logged In"
 msgstr "Kirjautumisesta aikaa"
 
-#: ../pidgin/gtkblist.c:3329
+#: ../pidgin/gtkblist.c:3288
 msgid "Last Seen"
 msgstr "Näkemisestä aikaa"
 
-#: ../pidgin/gtkblist.c:3350
+#: ../pidgin/gtkblist.c:3309
 msgid "Spooky"
 msgstr "Aavemainen"
 
-#: ../pidgin/gtkblist.c:3352
+#: ../pidgin/gtkblist.c:3311
 msgid "Awesome"
 msgstr "Mahtava"
 
-#: ../pidgin/gtkblist.c:3354
+#: ../pidgin/gtkblist.c:3313
 msgid "Rockin'"
 msgstr "Rokkaava"
 
-#: ../pidgin/gtkblist.c:3693
+#: ../pidgin/gtkblist.c:3329
+msgid "Total Buddies"
+msgstr "Tuttavia yhteensä"
+
+#: ../pidgin/gtkblist.c:3696
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Jouten %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3695
+#: ../pidgin/gtkblist.c:3698
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Jouten %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3697
+#: ../pidgin/gtkblist.c:3700
 #, c-format
 msgid "Idle %dm"
 msgstr "Jouten %dm"
 
-#: ../pidgin/gtkblist.c:3851
+#: ../pidgin/gtkblist.c:3854
 msgid "/Buddies/New Instant Message..."
 msgstr "/Tuttavat/Uusi pikaviesti..."
 
-#: ../pidgin/gtkblist.c:3852 ../pidgin/gtkblist.c:3885
+#: ../pidgin/gtkblist.c:3855 ../pidgin/gtkblist.c:3888
 msgid "/Buddies/Join a Chat..."
 msgstr "/Tuttavat/Liity ryhmäkeskusteluun..."
 
-#: ../pidgin/gtkblist.c:3853
+#: ../pidgin/gtkblist.c:3856
 msgid "/Buddies/Get User Info..."
 msgstr "/Tuttavat/Hae käyttäjätiedot..."
 
-#: ../pidgin/gtkblist.c:3854
+#: ../pidgin/gtkblist.c:3857
 msgid "/Buddies/Add Buddy..."
 msgstr "/Tuttavat/Lisää tuttava..."
 
-#: ../pidgin/gtkblist.c:3855 ../pidgin/gtkblist.c:3888
+#: ../pidgin/gtkblist.c:3858 ../pidgin/gtkblist.c:3891
 msgid "/Buddies/Add Chat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../pidgin/gtkblist.c:3856
+#: ../pidgin/gtkblist.c:3859
 msgid "/Buddies/Add Group..."
 msgstr "/Tuttavat/Lisää ryhmä..."
 
-#: ../pidgin/gtkblist.c:3891
+#: ../pidgin/gtkblist.c:3894
 msgid "/Tools/Privacy"
 msgstr "/Työkalut/Yksityisyys"
 
-#: ../pidgin/gtkblist.c:3894
+#: ../pidgin/gtkblist.c:3897
 msgid "/Tools/Room List"
 msgstr "/Työkalut/Huoneluettelo"
 
-#: ../pidgin/gtkblist.c:4026 ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkblist.c:4029 ../pidgin/gtkdocklet.c:155
 #: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
@@ -14304,69 +14485,68 @@ msgstr[1] "%d lukematonta viestiä käyt
 msgstr[0] "%d lukematon viesti käyttäjältä %s\n"
 msgstr[1] "%d lukematonta viestiä käyttäjältä %s\n"
 
-#: ../pidgin/gtkblist.c:4189
+#: ../pidgin/gtkblist.c:4192
 msgid "Manually"
 msgstr "Käsin"
 
-#: ../pidgin/gtkblist.c:4192
+#: ../pidgin/gtkblist.c:4195
 msgid "By status"
 msgstr "Tilan mukaan"
 
-#: ../pidgin/gtkblist.c:4193
+#: ../pidgin/gtkblist.c:4196
 msgid "By log size"
 msgstr "Lokin koon mukaan"
 
-#: ../pidgin/gtkblist.c:4492
+#: ../pidgin/gtkblist.c:4533
 #, c-format
 msgid "%s disconnected"
 msgstr "Yhteys katkennut kohteeseen %s"
 
-#: ../pidgin/gtkblist.c:4494
+#: ../pidgin/gtkblist.c:4535
 #, c-format
 msgid "%s disabled"
 msgstr "%s pois käytöstä"
 
-#: ../pidgin/gtkblist.c:4498
+#: ../pidgin/gtkblist.c:4539
 msgid "Reconnect"
 msgstr "Yhdistä uudelleen"
 
-#: ../pidgin/gtkblist.c:4498 ../pidgin/gtkblist.c:4606
+#: ../pidgin/gtkblist.c:4539 ../pidgin/gtkblist.c:4658
 msgid "Re-enable"
 msgstr "Ota uudelleen käyttöön"
 
-#: ../pidgin/gtkblist.c:4502 ../pidgin/gtkblist.c:4609
-#: ../pidgin/gtkconv.c:1679
-msgid "Ignore"
-msgstr "Jätä huomiotta"
+#: ../pidgin/gtkblist.c:4656
+msgid "Welcome back!"
+msgstr "Tervetuloa takaisin."
 
-#: ../pidgin/gtkblist.c:4633
+#: ../pidgin/gtkblist.c:4692
 #, c-format
-msgid "%d account was disabled because you signed on from another location."
+msgid "%d account was disabled because you signed on from another location:"
 msgid_plural ""
-"%d accounts were disabled because you signed on from another location."
+"%d accounts were disabled because you signed on from another location:"
 msgstr[0] ""
-"%d tili poistettiin käytöstä koska toisesta paikasta kirjauduttiin sisään."
+"%d tili poistettiin käytöstä koska toisesta paikasta kirjauduttiin sisään:"
 msgstr[1] ""
-"%d tiliä poistettiin käytöstä koska toisesta paikasta kirjauduttiin sisään."
+"%d tiliä poistettiin käytöstä koska toisesta paikasta kirjauduttiin sisään:"
 
-#: ../pidgin/gtkblist.c:4870
+#: ../pidgin/gtkblist.c:4971
 msgid "<b>Username:</b>"
 msgstr "<b>Käyttäjänimi:</b>"
 
-#: ../pidgin/gtkblist.c:4877
+#: ../pidgin/gtkblist.c:4978
 msgid "<b>Password:</b>"
 msgstr "<b>Salasana:</b>"
 
-#: ../pidgin/gtkblist.c:4888
+#: ../pidgin/gtkblist.c:4989
 msgid "_Login"
 msgstr "_Sisäänkirjautuminen"
 
-#: ../pidgin/gtkblist.c:4973
+#: ../pidgin/gtkblist.c:5073
 msgid "/Accounts"
 msgstr "/Käyttäjätilit"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4987
+#: ../pidgin/gtkblist.c:5087
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -14385,27 +14565,27 @@ msgstr ""
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:5258
+#: ../pidgin/gtkblist.c:5358
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Tuttavat/Näytä/Poissaolevat tuttavat"
 
-#: ../pidgin/gtkblist.c:5261
+#: ../pidgin/gtkblist.c:5361
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Tuttavat/Näytä/Tyhjät ryhmät"
 
-#: ../pidgin/gtkblist.c:5267
+#: ../pidgin/gtkblist.c:5367
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Tuttavat/Näytä/Tuttavien tiedot"
 
-#: ../pidgin/gtkblist.c:5270
+#: ../pidgin/gtkblist.c:5370
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Tuttavat/Näytä/Joutenoloajat"
 
-#: ../pidgin/gtkblist.c:5273
+#: ../pidgin/gtkblist.c:5373
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Tuttavat/Näytä/Yhteyskäytäntökuvakkeet"
 
-#: ../pidgin/gtkblist.c:6205
+#: ../pidgin/gtkblist.c:6324
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -14416,24 +14596,24 @@ msgstr ""
 "kuin mahdollista.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:6228
+#: ../pidgin/gtkblist.c:6347
 msgid "A_ccount:"
 msgstr "_Käyttäjätili:"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:6240
+#: ../pidgin/gtkblist.c:6359
 msgid "_Screen name:"
 msgstr "_Näyttönimi:"
 
-#: ../pidgin/gtkblist.c:6262 ../pidgin/gtkblist.c:6620
+#: ../pidgin/gtkblist.c:6381 ../pidgin/gtkblist.c:6731
 msgid "A_lias:"
-msgstr "A_lias:"
+msgstr "_Lempinimi:"
 
-#: ../pidgin/gtkblist.c:6530
+#: ../pidgin/gtkblist.c:6648
 msgid "This protocol does not support chat rooms."
 msgstr "Tämä yhteyskäytäntö ei tue keskusteluhuoneita."
 
-#: ../pidgin/gtkblist.c:6546
+#: ../pidgin/gtkblist.c:6664
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -14441,7 +14621,7 @@ msgstr ""
 "Et ole kirjautuneena millään yhteyskäytännöllä jolla voisi käyttää "
 "ryhmäkeskustelua."
 
-#: ../pidgin/gtkblist.c:6589
+#: ../pidgin/gtkblist.c:6708
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -14449,254 +14629,258 @@ msgstr ""
 "Anna lempinimi, ja tiedot ryhmäkeskustelusta jonka haluat lisätä "
 "tuttaviisi.\n"
 
-#: ../pidgin/gtkblist.c:6648
-msgid "Autojoin when account becomes online."
-msgstr "Liity automaattisesti kun käyttäjätili pääsee linjoille."
+#: ../pidgin/gtkblist.c:6738
+msgid "Auto_join when account becomes online."
+msgstr "Liity automaattisesti kun käyttä_jätili pääsee linjoille."
 
-#: ../pidgin/gtkblist.c:6649
-msgid "Hide chat when the window is closed."
-msgstr "Piilota ryhmäkeskustelu kun ikkuna on suljettu."
+#: ../pidgin/gtkblist.c:6739
+msgid "_Hide chat when the window is closed."
+msgstr "Piilota ry_hmäkeskustelu kun ikkuna on suljettu."
 
-#: ../pidgin/gtkblist.c:6675
+#: ../pidgin/gtkblist.c:6765
 msgid "Please enter the name of the group to be added."
 msgstr "Anna lisättävän ryhmän nimi."
 
-#: ../pidgin/gtkblist.c:7321
+#: ../pidgin/gtkblist.c:7423
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Käyttäjätilit/"
 
-#: ../pidgin/gtkblist.c:7345
+#: ../pidgin/gtkblist.c:7447
 msgid "_Edit Account"
 msgstr "_Muokkaa käyttäjätiliä"
 
-#: ../pidgin/gtkblist.c:7358 ../pidgin/gtkconv.c:3146
+#: ../pidgin/gtkblist.c:7460 ../pidgin/gtkconv.c:3132
 msgid "No actions available"
 msgstr "Ei toimintoja saatavilla."
 
-#: ../pidgin/gtkblist.c:7366
+#: ../pidgin/gtkblist.c:7468
 msgid "_Disable"
 msgstr "_Poista käytöstä"
 
-#: ../pidgin/gtkblist.c:7378
+#: ../pidgin/gtkblist.c:7480
 msgid "Enable Account"
 msgstr "Ota tili käyttöön"
 
-#: ../pidgin/gtkblist.c:7384
+#: ../pidgin/gtkblist.c:7486
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Käyttäjätilit/Ota tili käyttöön"
 
-#: ../pidgin/gtkblist.c:7433
+#: ../pidgin/gtkblist.c:7535
 msgid "/Tools"
 msgstr "/Työkalut"
 
-#: ../pidgin/gtkblist.c:7503
+#: ../pidgin/gtkblist.c:7605
 msgid "/Buddies/Sort Buddies"
 msgstr "/Tuttavat/Lajittele tuttavat"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:531
+#: ../pidgin/gtkcertmgr.c:541
 msgid "SSL Servers"
 msgstr "SSL-palvelimet"
 
-#: ../pidgin/gtkconv.c:524
+#: ../pidgin/gtkconv.c:485
 msgid "Unknown command."
 msgstr "Tuntematon komento."
 
-#: ../pidgin/gtkconv.c:796 ../pidgin/gtkconv.c:822
+#: ../pidgin/gtkconv.c:755 ../pidgin/gtkconv.c:781
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Tuttava ei käytä samaa yhteyskäytäntöä kuin tämä ryhmäkeskustelu."
 
-#: ../pidgin/gtkconv.c:816
+#: ../pidgin/gtkconv.c:775
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Et ole kirjautuneena millään käyttäjätilillä jolla voisi kutsua tämän "
 "tuttavan."
 
-#: ../pidgin/gtkconv.c:869
+#: ../pidgin/gtkconv.c:828
 msgid "Invite Buddy Into Chat Room"
 msgstr "Kutsu tuttava keskusteluhuoneeseen"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:899
+#: ../pidgin/gtkconv.c:858
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "Anna kutsuttavan käyttäjän nimi sekä vapaaehtoinen viesti."
 
-#: ../pidgin/gtkconv.c:920
+#: ../pidgin/gtkconv.c:879
 msgid "_Buddy:"
 msgstr "_Tuttava:"
 
-#: ../pidgin/gtkconv.c:931 ../pidgin/gtksavedstatuses.c:1200
-#: ../pidgin/gtksavedstatuses.c:1536
+#: ../pidgin/gtkconv.c:890 ../pidgin/gtksavedstatuses.c:1166
+#: ../pidgin/gtksavedstatuses.c:1484
 msgid "_Message:"
 msgstr "_Viesti:"
 
-#: ../pidgin/gtkconv.c:995
+#: ../pidgin/gtkconv.c:954
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Keskustelu käyttäjän %s kanssa</h1>\n"
 
-#: ../pidgin/gtkconv.c:1033
+#: ../pidgin/gtkconv.c:992
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
-#: ../pidgin/gtkconv.c:1179 ../pidgin/gtkdebug.c:168 ../pidgin/gtkdebug.c:748
+#: ../pidgin/gtkconv.c:1138 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:740
 msgid "Find"
 msgstr "Etsi"
 
-#: ../pidgin/gtkconv.c:1205 ../pidgin/gtkdebug.c:196
+#: ../pidgin/gtkconv.c:1164 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_Haettava termi:"
 
-#: ../pidgin/gtkconv.c:1676
+#: ../pidgin/gtkconv.c:1665
 msgid "Un-Ignore"
 msgstr "Huomioi"
 
-#: ../pidgin/gtkconv.c:1699
+#: ../pidgin/gtkconv.c:1668
+msgid "Ignore"
+msgstr "Jätä huomiotta"
+
+#: ../pidgin/gtkconv.c:1688
 msgid "Get Away Message"
 msgstr "Hae poissaoloviesti"
 
-#: ../pidgin/gtkconv.c:1722
+#: ../pidgin/gtkconv.c:1711
 msgid "Last said"
 msgstr "Viimeksi sanottu"
 
-#: ../pidgin/gtkconv.c:2671
+#: ../pidgin/gtkconv.c:2664
 msgid "Unable to save icon file to disk."
 msgstr "Kuvaketiedostoa ei voi tallentaa levylle."
 
-#: ../pidgin/gtkconv.c:2722
+#: ../pidgin/gtkconv.c:2715
 msgid "Save Icon"
 msgstr "Tallenna kuvake"
 
-#: ../pidgin/gtkconv.c:2774
+#: ../pidgin/gtkconv.c:2767
 msgid "Animate"
 msgstr "Animoi"
 
-#: ../pidgin/gtkconv.c:2779
+#: ../pidgin/gtkconv.c:2772
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: ../pidgin/gtkconv.c:2782
+#: ../pidgin/gtkconv.c:2775
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimellä..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2779
 msgid "Set Custom Icon..."
 msgstr "Aseta oma kuvake..."
 
-#: ../pidgin/gtkconv.c:2799
+#: ../pidgin/gtkconv.c:2792
 msgid "Remove Custom Icon"
 msgstr "Poista oma kuvake"
 
-#: ../pidgin/gtkconv.c:2931
+#: ../pidgin/gtkconv.c:2917
 msgid "Show All"
 msgstr "Näytä kaikki"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2950
+#: ../pidgin/gtkconv.c:2936
 msgid "/_Conversation"
 msgstr "/_Keskustelu"
 
-#: ../pidgin/gtkconv.c:2952
+#: ../pidgin/gtkconv.c:2938
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Keskustelu/Uusi _pikaviesti..."
 
-#: ../pidgin/gtkconv.c:2957
+#: ../pidgin/gtkconv.c:2943
 msgid "/Conversation/_Find..."
 msgstr "/Keskustelu/_Etsi..."
 
-#: ../pidgin/gtkconv.c:2959
+#: ../pidgin/gtkconv.c:2945
 msgid "/Conversation/View _Log"
 msgstr "/Keskustelu/Näytä l_oki..."
 
-#: ../pidgin/gtkconv.c:2960
+#: ../pidgin/gtkconv.c:2946
 msgid "/Conversation/_Save As..."
 msgstr "/Keskustelu/_Tallenna nimellä..."
 
-#: ../pidgin/gtkconv.c:2962
+#: ../pidgin/gtkconv.c:2948
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Keskustelu/T_yhjennä takaisinvieritys"
 
-#: ../pidgin/gtkconv.c:2966
+#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/Se_nd File..."
 msgstr "/Keskustelu/_Lähetä tiedosto..."
 
-#: ../pidgin/gtkconv.c:2967
+#: ../pidgin/gtkconv.c:2953
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Keskustelu/Lisää tuttava_ilmoitin..."
 
-#: ../pidgin/gtkconv.c:2969
+#: ../pidgin/gtkconv.c:2955
 msgid "/Conversation/_Get Info"
 msgstr "/Keskustelu/_Hae tiedot..."
 
-#: ../pidgin/gtkconv.c:2971
+#: ../pidgin/gtkconv.c:2957
 msgid "/Conversation/In_vite..."
 msgstr "/Keskustelu/Kut_su..."
 
-#: ../pidgin/gtkconv.c:2973
+#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/M_ore"
 msgstr "/Keskustelu/Lis_ää"
 
-#: ../pidgin/gtkconv.c:2977
+#: ../pidgin/gtkconv.c:2963
 msgid "/Conversation/Al_ias..."
-msgstr "/Keskustelu/_Alias..."
+msgstr "/Keskustelu/Lemp_inimi..."
 
-#: ../pidgin/gtkconv.c:2979
+#: ../pidgin/gtkconv.c:2965
 msgid "/Conversation/_Block..."
 msgstr "/Keskustelu/E_stä..."
 
-#: ../pidgin/gtkconv.c:2981
+#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/_Unblock..."
 msgstr "/Keskustelu/Poista est_o..."
 
-#: ../pidgin/gtkconv.c:2983
+#: ../pidgin/gtkconv.c:2969
 msgid "/Conversation/_Add..."
 msgstr "/Keskustelu/_Lisää..."
 
-#: ../pidgin/gtkconv.c:2985
+#: ../pidgin/gtkconv.c:2971
 msgid "/Conversation/_Remove..."
 msgstr "/Keskustelu/_Poista..."
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:2976
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Keskustelu/Lisää lin_kki..."
 
-#: ../pidgin/gtkconv.c:2992
+#: ../pidgin/gtkconv.c:2978
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Keskustelu/Liitä _kuva..."
 
-#: ../pidgin/gtkconv.c:2998
+#: ../pidgin/gtkconv.c:2984
 msgid "/Conversation/_Close"
 msgstr "/Keskustelu/_Sulje"
 
 #. Options
-#: ../pidgin/gtkconv.c:3002
+#: ../pidgin/gtkconv.c:2988
 msgid "/_Options"
 msgstr "/_Valinnat"
 
-#: ../pidgin/gtkconv.c:3003
+#: ../pidgin/gtkconv.c:2989
 msgid "/Options/Enable _Logging"
 msgstr "/Valinnat/_Lokiinkirjaus"
 
-#: ../pidgin/gtkconv.c:3004
+#: ../pidgin/gtkconv.c:2990
 msgid "/Options/Enable _Sounds"
 msgstr "/Valinnat/S_oita merkkiäänet"
 
-#: ../pidgin/gtkconv.c:3006
+#: ../pidgin/gtkconv.c:2992
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Valinnat/Näytä muokkaus-_työkalurivit"
 
-#: ../pidgin/gtkconv.c:3007
+#: ../pidgin/gtkconv.c:2993
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Valinnat/Näytä aika_leima"
 
-#: ../pidgin/gtkconv.c:3134
+#: ../pidgin/gtkconv.c:3120
 msgid "/Conversation/More"
 msgstr "/Keskustelu/Lisää"
 
-#: ../pidgin/gtkconv.c:3190
+#: ../pidgin/gtkconv.c:3176
 msgid "/Options"
 msgstr "/Valinnat"
 
@@ -14705,237 +14889,242 @@ msgstr "/Valinnat"
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3225 ../pidgin/gtkconv.c:3257
+#: ../pidgin/gtkconv.c:3211 ../pidgin/gtkconv.c:3243
 msgid "/Conversation"
 msgstr "/Keskustelu"
 
-#: ../pidgin/gtkconv.c:3265
+#: ../pidgin/gtkconv.c:3251
 msgid "/Conversation/View Log"
 msgstr "/Keskustelu/Näytä loki..."
 
-#: ../pidgin/gtkconv.c:3271
+#: ../pidgin/gtkconv.c:3257
 msgid "/Conversation/Send File..."
 msgstr "/Keskustelu/Lähetä tiedosto..."
 
-#: ../pidgin/gtkconv.c:3275
+#: ../pidgin/gtkconv.c:3261
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Keskustelu/Lisää tuttavailmoitin..."
 
-#: ../pidgin/gtkconv.c:3281
+#: ../pidgin/gtkconv.c:3267
 msgid "/Conversation/Get Info"
 msgstr "/Keskustelu/Hae tiedot..."
 
-#: ../pidgin/gtkconv.c:3285
+#: ../pidgin/gtkconv.c:3271
 msgid "/Conversation/Invite..."
 msgstr "/Keskustelu/Kutsu..."
 
-#: ../pidgin/gtkconv.c:3291
+#: ../pidgin/gtkconv.c:3277
 msgid "/Conversation/Alias..."
-msgstr "/Keskustelu/Alias..."
+msgstr "/Keskustelu/Lempinimi..."
 
-#: ../pidgin/gtkconv.c:3295
+#: ../pidgin/gtkconv.c:3281
 msgid "/Conversation/Block..."
 msgstr "/Keskustelu/Estä..."
 
-#: ../pidgin/gtkconv.c:3299
+#: ../pidgin/gtkconv.c:3285
 msgid "/Conversation/Unblock..."
 msgstr "/Keskustelu/Poista esto..."
 
-#: ../pidgin/gtkconv.c:3303
+#: ../pidgin/gtkconv.c:3289
 msgid "/Conversation/Add..."
 msgstr "/Keskustelu/Lisää..."
 
-#: ../pidgin/gtkconv.c:3307
+#: ../pidgin/gtkconv.c:3293
 msgid "/Conversation/Remove..."
 msgstr "/Keskustelu/Poista..."
 
-#: ../pidgin/gtkconv.c:3313
+#: ../pidgin/gtkconv.c:3299
 msgid "/Conversation/Insert Link..."
 msgstr "/Keskustelu/Lisää linkki..."
 
-#: ../pidgin/gtkconv.c:3317
+#: ../pidgin/gtkconv.c:3303
 msgid "/Conversation/Insert Image..."
 msgstr "/Keskustelu/Lisää kuva..."
 
-#: ../pidgin/gtkconv.c:3323
+#: ../pidgin/gtkconv.c:3309
 msgid "/Options/Enable Logging"
 msgstr "/Valinnat/Lokiinkirjaus"
 
-#: ../pidgin/gtkconv.c:3326
+#: ../pidgin/gtkconv.c:3312
 msgid "/Options/Enable Sounds"
 msgstr "/Valinnat/Soita merkkiäänet"
 
-#: ../pidgin/gtkconv.c:3339
+#: ../pidgin/gtkconv.c:3325
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Valinnat/Näytä muokkaustyökalurivit"
 
-#: ../pidgin/gtkconv.c:3342
+#: ../pidgin/gtkconv.c:3328
 msgid "/Options/Show Timestamps"
 msgstr "/Valinnat/Näytä aikaleima"
 
-#: ../pidgin/gtkconv.c:3419 ../pidgin/gtkconv.c:3461
+#: ../pidgin/gtkconv.c:3406
 msgid "User is typing..."
 msgstr "Käyttäjä kirjoittaa..."
 
-#: ../pidgin/gtkconv.c:3464
-msgid "User has typed something and stopped"
-msgstr "Käyttäjä kirjoitti jotain ja keskeytti"
+#: ../pidgin/gtkconv.c:3476
+#, c-format
+msgid ""
+"\n"
+"%s has stopped typing"
+msgstr ""
+"\n"
+"%s on lopettanut kirjoittamisen"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3648 ../pidgin/gtkconv.c:8248
+#: ../pidgin/gtkconv.c:3642 ../pidgin/gtkconv.c:8313
 msgid "S_end To"
 msgstr "Läh_etä henkilölle"
 
-#: ../pidgin/gtkconv.c:4360
+#: ../pidgin/gtkconv.c:4354
 msgid "_Send"
 msgstr "_Lähetä"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4473
+#: ../pidgin/gtkconv.c:4492
 msgid "0 people in room"
 msgstr "0 ihmistä huoneessa"
 
-#: ../pidgin/gtkconv.c:5846 ../pidgin/gtkconv.c:5967
+#: ../pidgin/gtkconv.c:5791 ../pidgin/gtkconv.c:5912
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d ihminen huoneessa"
 msgstr[1] "%d ihmistä huoneessa"
 
-#: ../pidgin/gtkconv.c:6574 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6539 ../pidgin/gtkstatusbox.c:679
 msgid "Typing"
 msgstr "Kirjoittaa"
 
-#: ../pidgin/gtkconv.c:6578
+#: ../pidgin/gtkconv.c:6543
 msgid "Stopped Typing"
 msgstr "Lopetti kirjoittamisen"
 
-#: ../pidgin/gtkconv.c:6581
+#: ../pidgin/gtkconv.c:6546
 msgid "Nick Said"
 msgstr "Sanoi"
 
-#: ../pidgin/gtkconv.c:6584 ../pidgin/gtkdocklet.c:685
+#: ../pidgin/gtkconv.c:6549 ../pidgin/gtkdocklet.c:686
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../pidgin/gtkconv.c:6590
+#: ../pidgin/gtkconv.c:6555
 msgid "New Event"
 msgstr "Uusi tapahtuma"
 
-#: ../pidgin/gtkconv.c:7767
+#: ../pidgin/gtkconv.c:7785
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Tyhjentää kaikki keskustelut"
 
-#: ../pidgin/gtkconv.c:7930
+#: ../pidgin/gtkconv.c:7989
 msgid "Confirm close"
 msgstr "Vahvista sulkeminen"
 
-#: ../pidgin/gtkconv.c:7962
+#: ../pidgin/gtkconv.c:8021
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Sinulla on lukemattomia viestejä. Haluatko varmasti sulkea tämän ikkunan?"
 
-#: ../pidgin/gtkconv.c:8581
+#: ../pidgin/gtkconv.c:8654
 msgid "Close other tabs"
 msgstr "Sulje muut välilehdet"
 
-#: ../pidgin/gtkconv.c:8587
+#: ../pidgin/gtkconv.c:8660
 msgid "Close all tabs"
 msgstr "Sulje kaikki välilehdet"
 
-#: ../pidgin/gtkconv.c:8595
+#: ../pidgin/gtkconv.c:8668
 msgid "Detach this tab"
 msgstr "Irrota tämä välilehti"
 
-#: ../pidgin/gtkconv.c:8601
+#: ../pidgin/gtkconv.c:8674
 msgid "Close this tab"
 msgstr "Sulje tämä välilehti"
 
-#: ../pidgin/gtkconv.c:9106
+#: ../pidgin/gtkconv.c:9188
 msgid "Close conversation"
 msgstr "Sulje keskustelu"
 
-#: ../pidgin/gtkconv.c:9708
+#: ../pidgin/gtkconv.c:9792
 msgid "Last created window"
 msgstr "Viimeksi luotu ikkuna"
 
-#: ../pidgin/gtkconv.c:9710
+#: ../pidgin/gtkconv.c:9794
 msgid "Separate IM and Chat windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut eri ikkunoissa"
 
-#: ../pidgin/gtkconv.c:9712 ../pidgin/gtkprefs.c:1510
+#: ../pidgin/gtkconv.c:9796 ../pidgin/gtkprefs.c:1466
 msgid "New window"
 msgstr "Uusi ikkuna"
 
-#: ../pidgin/gtkconv.c:9714
+#: ../pidgin/gtkconv.c:9798
 msgid "By group"
 msgstr "Ryhmän mukaan"
 
-#: ../pidgin/gtkconv.c:9716
+#: ../pidgin/gtkconv.c:9800
 msgid "By account"
 msgstr "Tilin mukaan"
 
-#: ../pidgin/gtkdebug.c:235
+#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr "Tallenna virheenjäljitysloki"
 
-#: ../pidgin/gtkdebug.c:583
+#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr "Käännä"
 
-#: ../pidgin/gtkdebug.c:586
+#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
 msgstr "Korosta osumat"
 
-#: ../pidgin/gtkdebug.c:653
+#: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
 msgstr "Vain _kuvake"
 
-#: ../pidgin/gtkdebug.c:654
+#: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
 msgstr "Vain _teksti"
 
-#: ../pidgin/gtkdebug.c:655
+#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
 msgstr "_Sekä kuvake että teksti"
 
-#: ../pidgin/gtkdebug.c:780
+#: ../pidgin/gtkdebug.c:772
 msgid "Filter"
 msgstr "Suodin"
 
-#: ../pidgin/gtkdebug.c:799
+#: ../pidgin/gtkdebug.c:791
 msgid "Right click for more options."
 msgstr "Näytä lisää valintoja oikealla hiiren painikkeella."
 
-#: ../pidgin/gtkdebug.c:829
+#: ../pidgin/gtkdebug.c:821
 msgid "Level "
 msgstr "Taso "
 
-#: ../pidgin/gtkdebug.c:830 ../pidgin/gtkdebug.c:836
+#: ../pidgin/gtkdebug.c:822 ../pidgin/gtkdebug.c:828
 msgid "Select the debug filter level."
 msgstr "Valitse virheenjäljityssuodattimen taso."
 
-#: ../pidgin/gtkdebug.c:838
+#: ../pidgin/gtkdebug.c:830
 msgid "All"
 msgstr "Kaikki"
 
-#: ../pidgin/gtkdebug.c:839
+#: ../pidgin/gtkdebug.c:831
 msgid "Misc"
 msgstr "Muut"
 
-#: ../pidgin/gtkdebug.c:841
+#: ../pidgin/gtkdebug.c:833
 msgid "Warning"
 msgstr "Varoitukset"
 
-#: ../pidgin/gtkdebug.c:842
+#: ../pidgin/gtkdebug.c:834
 msgid "Error "
 msgstr "Virheet "
 
-#: ../pidgin/gtkdebug.c:843
+#: ../pidgin/gtkdebug.c:835
 msgid "Fatal Error"
 msgstr "Vakavat virheet"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:118
 msgid "lead developer"
 msgstr "pääkehittäjä"
 
@@ -14948,6 +15137,7 @@ msgstr "pääkehittäjä"
 #: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
 #: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:90
 #: ../pidgin/gtkdialogs.c:92 ../pidgin/gtkdialogs.c:93
+#: ../pidgin/gtkdialogs.c:94
 msgid "developer"
 msgstr "kehittäjä"
 
@@ -14959,343 +15149,343 @@ msgstr "tuki/laadunvarmistus"
 msgid "support/QA"
 msgstr "tuki/laadunvarmistus"
 
-#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:113
 msgid "developer & webmaster"
 msgstr "kehittäjä & verkkosivujen ylläpitäjä"
 
-#: ../pidgin/gtkdialogs.c:99
+#: ../pidgin/gtkdialogs.c:100
 msgid "Senior Contributor/QA"
 msgstr "Vanhempi osallistuja/laadunvarmistus"
 
-#: ../pidgin/gtkdialogs.c:108
+#: ../pidgin/gtkdialogs.c:109
 msgid "win32 port"
 msgstr "win32-käännös"
 
-#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
 msgid "maintainer"
 msgstr "ylläpitäjä"
 
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:112
 msgid "libfaim maintainer"
 msgstr "libfaim-ylläpitäjä"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:115
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hakkeri ja kuski [laiska pummi]"
 
-#: ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:116
 msgid "XMPP developer"
 msgstr "XMPP-kehittäjä"
 
-#: ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:117
 msgid "original author"
 msgstr "alkuperäinen tekijä"
 
-#: ../pidgin/gtkdialogs.c:133
+#: ../pidgin/gtkdialogs.c:134
 msgid "Afrikaans"
 msgstr "afrikaans"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:229
 msgid "Arabic"
 msgstr "arabia"
 
-#: ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:136
 msgid "Belarusian Latin"
 msgstr "valkovenäjä latinalainen"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:138
+#: ../pidgin/gtkdialogs.c:230
 msgid "Bulgarian"
 msgstr "bulgaria"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:139 ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
 msgid "Bengali"
 msgstr "bengali"
 
-#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:143
 msgid "Bosnian"
 msgstr "bosnia"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Catalan"
 msgstr "katalaani"
 
-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
 msgid "Valencian-Catalan"
 msgstr "valencian katalaani"
 
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:233
 msgid "Czech"
 msgstr "tšekki"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
 msgid "Danish"
 msgstr "tanska"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:234
 msgid "German"
 msgstr "saksa"
 
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154
 msgid "Dzongkha"
 msgstr "dzongkha"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156
 msgid "Greek"
 msgstr "kreikka"
 
-#: ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:157
 msgid "Australian English"
 msgstr "australian englanti"
 
-#: ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:158
 msgid "Canadian English"
 msgstr "kanadan englanti"
 
-#: ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:159
 msgid "British English"
 msgstr "brittienglanti"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:160
 msgid "Esperanto"
 msgstr "esperanto"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "Spanish"
 msgstr "espanja"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:162
 msgid "Estonian"
 msgstr "viro"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:164
 msgid "Euskera(Basque)"
 msgstr "euskara (baski)"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
-#: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:167
 msgid "Persian"
 msgstr "persia"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:240
 msgid "Finnish"
 msgstr "suomi"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241 ../pidgin/gtkdialogs.c:242
-#: ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:244
 msgid "French"
 msgstr "ranska"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:245
 msgid "Galician"
 msgstr "galego"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:173
 msgid "Gujarati"
 msgstr "gudžarati"
 
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:173
 msgid "Gujarati Language Team"
 msgstr "Gujaratin kääntäjäryhmä"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:246
 msgid "Hebrew"
 msgstr "heprea"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:175
 msgid "Hindi"
 msgstr "hindi"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:247
 msgid "Hungarian"
 msgstr "unkari"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
 msgid "Indonesian"
 msgstr "indonesia"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:248
 msgid "Italian"
 msgstr "italia"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:248
-#: ../pidgin/gtkdialogs.c:249 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:250 ../pidgin/gtkdialogs.c:251
 msgid "Japanese"
 msgstr "japani"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:252
 msgid "Georgian"
 msgstr "georgia"
 
-#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:180
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntun georgian kääntäjät"
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181
 msgid "Kannada"
 msgstr "kannada"
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181
 msgid "Kannada Translation team"
 msgstr "Kannadan kääntäjäryhmä"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:254
 msgid "Korean"
 msgstr "korea"
 
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:185
 msgid "Kurdish"
 msgstr "kurdi"
 
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:186
 msgid "Lao"
 msgstr "lao"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:254
-#: ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:256
 msgid "Lithuanian"
 msgstr "liettua"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:257
 msgid "Macedonian"
 msgstr "makedonia"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:257
-#: ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:259
 msgid "Bokmål Norwegian"
 msgstr "kirjanorja"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192
 msgid "Nepali"
 msgstr "nepal"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:193
 msgid "Dutch, Flemish"
 msgstr "hollanti, flaami"
 
-#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:194
 msgid "Norwegian Nynorsk"
 msgstr "norja (uusnorja)"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:195
 msgid "Punjabi"
 msgstr "punjabi"
 
-#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:196
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:260
 msgid "Polish"
 msgstr "puola"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:199
 msgid "Portuguese"
 msgstr "portugali"
 
-#: ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:200
 msgid "Portuguese-Brazil"
 msgstr "portugali (brasilialainen)"
 
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:201
 msgid "Pashto"
 msgstr "paštu"
 
-#: ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:202
 msgid "Romanian"
 msgstr "romania"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:260
-#: ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:262
 msgid "Russian"
 msgstr "venäjä"
 
-#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
-#: ../pidgin/gtkdialogs.c:262 ../pidgin/gtkdialogs.c:263
-#: ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:263 ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:265
 msgid "Slovak"
 msgstr "slovakki"
 
-#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:266
 msgid "Slovenian"
 msgstr "sloveeni"
 
-#: ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:207
 msgid "Albanian"
 msgstr "albania"
 
-#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:208
-#: ../pidgin/gtkdialogs.c:266 ../pidgin/gtkdialogs.c:267
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:267 ../pidgin/gtkdialogs.c:268
 msgid "Serbian"
 msgstr "serbia"
 
-#: ../pidgin/gtkdialogs.c:209 ../pidgin/gtkdialogs.c:268
-#: ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:270
 msgid "Swedish"
 msgstr "ruotsi"
 
-#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211
 msgid "Tamil"
 msgstr "tamil"
 
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:212
 msgid "Telugu"
 msgstr "telugu"
 
-#: ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Thai"
 msgstr "thai"
 
-#: ../pidgin/gtkdialogs.c:213 ../pidgin/gtkdialogs.c:270
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:271
 msgid "Turkish"
 msgstr "turkki"
 
-#: ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
 msgid "Urdu"
 msgstr "urdu"
 
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:216
 msgid "Vietnamese"
 msgstr "vietnam"
 
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:216
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M Thanh ja Gnomen Vi-työryhmä"
 
-#: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:271
+#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:272
 msgid "Simplified Chinese"
 msgstr "kiina (yksinkertaistettu)"
 
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:220
 msgid "Hong Kong Chinese"
 msgstr "Hong Kongin kiina"
 
-#: ../pidgin/gtkdialogs.c:220 ../pidgin/gtkdialogs.c:221
-#: ../pidgin/gtkdialogs.c:272
+#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:273
 msgid "Traditional Chinese"
 msgstr "kiina (perinteinen)"
 
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228
 msgid "Amharic"
 msgstr "amhara"
 
-#: ../pidgin/gtkdialogs.c:370
+#: ../pidgin/gtkdialogs.c:358
 #, c-format
 msgid "About %s"
 msgstr "Tietoja %sistä"
 
-#: ../pidgin/gtkdialogs.c:413
+#: ../pidgin/gtkdialogs.c:394
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -15319,105 +15509,100 @@ msgstr ""
 "luettelo osallistuneista löytyy \"COPYRIGHT\"-tiedostosta. Tekijät eivät "
 "anna ohjelmalle minkäänlaista takuuta.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:431
-#, c-format
+#: ../pidgin/gtkdialogs.c:412
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> #pidgin palvelimella irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:436
+#: ../pidgin/gtkdialogs.c:417
 msgid "Current Developers"
 msgstr "Nykyiset kehittäjät"
 
-#: ../pidgin/gtkdialogs.c:451
+#: ../pidgin/gtkdialogs.c:432
 msgid "Crazy Patch Writers"
 msgstr "Villit korjauspäivitysten kirjoittajat"
 
-#: ../pidgin/gtkdialogs.c:466
+#: ../pidgin/gtkdialogs.c:447
 msgid "Retired Developers"
 msgstr "Lopettaneet kehittäjät"
 
-#: ../pidgin/gtkdialogs.c:481
+#: ../pidgin/gtkdialogs.c:462
 msgid "Retired Crazy Patch Writers"
 msgstr "Lopettaneet korjauspäivitysten kirjoittajat"
 
-#: ../pidgin/gtkdialogs.c:496
+#: ../pidgin/gtkdialogs.c:477
 msgid "Artists"
 msgstr "Graafikot"
 
-#: ../pidgin/gtkdialogs.c:511
+#: ../pidgin/gtkdialogs.c:492
 msgid "Current Translators"
 msgstr "Nykyiset kielenkääntäjät"
 
-#: ../pidgin/gtkdialogs.c:531
+#: ../pidgin/gtkdialogs.c:512
 msgid "Past Translators"
 msgstr "Aikaisemmat kielenkääntäjät"
 
-#: ../pidgin/gtkdialogs.c:549
+#: ../pidgin/gtkdialogs.c:530
 msgid "Debugging Information"
 msgstr "Virheenjäljitystietoja"
 
-#: ../pidgin/gtkdialogs.c:766 ../pidgin/gtkdialogs.c:909
-#: ../pidgin/gtkdialogs.c:990
+#: ../pidgin/gtkdialogs.c:746 ../pidgin/gtkdialogs.c:885
+#: ../pidgin/gtkdialogs.c:966
 msgid "_Name"
 msgstr "_Nimi"
 
-#: ../pidgin/gtkdialogs.c:771
-msgid "Buddy"
-msgstr "Tuttava"
-
-#: ../pidgin/gtkdialogs.c:775 ../pidgin/gtkdialogs.c:914
-#: ../pidgin/gtkdialogs.c:995
+#: ../pidgin/gtkdialogs.c:751 ../pidgin/gtkdialogs.c:890
+#: ../pidgin/gtkdialogs.c:971
 msgid "_Account"
 msgstr "_Käyttäjätili"
 
-#: ../pidgin/gtkdialogs.c:922
+#: ../pidgin/gtkdialogs.c:898
 msgid "Get User Info"
 msgstr "Hae käyttäjätiedot"
 
-#: ../pidgin/gtkdialogs.c:924
+#: ../pidgin/gtkdialogs.c:900
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr ""
 "Syötä sen henkilön näyttönimi tai lempinimi, jonka tiedot haluat nähdä."
 
-#: ../pidgin/gtkdialogs.c:1014
+#: ../pidgin/gtkdialogs.c:990
 msgid "View User Log"
 msgstr "Näytä käyttäjäloki"
 
-#: ../pidgin/gtkdialogs.c:1016
+#: ../pidgin/gtkdialogs.c:992
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "Syötä sen henkilön näyttönimi jonka lokia haluat katsella."
 
-#: ../pidgin/gtkdialogs.c:1036
+#: ../pidgin/gtkdialogs.c:1012
 msgid "Alias Contact"
 msgstr "Anna kontaktiryhmälle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:1037
+#: ../pidgin/gtkdialogs.c:1013
 msgid "Enter an alias for this contact."
 msgstr "Anna lempinimi tälle kontaktiryhmälle."
 
-#: ../pidgin/gtkdialogs.c:1059
+#: ../pidgin/gtkdialogs.c:1035
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Anna %s:n lempinimi."
 
-#: ../pidgin/gtkdialogs.c:1061
+#: ../pidgin/gtkdialogs.c:1037
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:1082
+#: ../pidgin/gtkdialogs.c:1058
 msgid "Alias Chat"
 msgstr "Anna ryhmäkeskustelulle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:1083
+#: ../pidgin/gtkdialogs.c:1059
 msgid "Enter an alias for this chat."
 msgstr "Syötä lempinimi tälle ryhmäkeskustelulle."
 
-#: ../pidgin/gtkdialogs.c:1122
+#: ../pidgin/gtkdialogs.c:1098
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15432,59 +15617,59 @@ msgstr[1] ""
 "Olet poistamassa kontaktin, jossa on %s sekä %d muuta tuttavaa tuttavistasi. "
 "Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1130
+#: ../pidgin/gtkdialogs.c:1106
 msgid "Remove Contact"
 msgstr "Poista kontakti"
 
-#: ../pidgin/gtkdialogs.c:1133
+#: ../pidgin/gtkdialogs.c:1109
 msgid "_Remove Contact"
 msgstr "_Poista kontakti"
 
-#: ../pidgin/gtkdialogs.c:1164
+#: ../pidgin/gtkdialogs.c:1140
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "Olet yhdistämässä ryhmää \"%s\" ryhmään \"%s\".  Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1171
+#: ../pidgin/gtkdialogs.c:1147
 msgid "Merge Groups"
 msgstr "Yhdistä ryhmät"
 
-#: ../pidgin/gtkdialogs.c:1174
+#: ../pidgin/gtkdialogs.c:1150
 msgid "_Merge Groups"
 msgstr "_Yhdistä ryhmät"
 
-#: ../pidgin/gtkdialogs.c:1224
+#: ../pidgin/gtkdialogs.c:1200
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr "Olet poistamassa ryhmää nimeltä \"%s\" tuttavistasi.  Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1227
+#: ../pidgin/gtkdialogs.c:1203
 msgid "Remove Group"
 msgstr "Poista ryhmä"
 
-#: ../pidgin/gtkdialogs.c:1230
+#: ../pidgin/gtkdialogs.c:1206
 msgid "_Remove Group"
 msgstr "_Poista ryhmä"
 
-#: ../pidgin/gtkdialogs.c:1263
+#: ../pidgin/gtkdialogs.c:1239
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Olet poistamassa \"%s\":n tuttavistasi.  Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1266
+#: ../pidgin/gtkdialogs.c:1242
 msgid "Remove Buddy"
 msgstr "Poista tuttava"
 
-#: ../pidgin/gtkdialogs.c:1269
+#: ../pidgin/gtkdialogs.c:1245
 msgid "_Remove Buddy"
 msgstr "_Poista tuttava"
 
-#: ../pidgin/gtkdialogs.c:1290
+#: ../pidgin/gtkdialogs.c:1266
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -15493,11 +15678,11 @@ msgstr ""
 "Olet poistamassa ryhmäkeskustelun nimeltä \"%s\" tuttavistasi. Haluatko "
 "jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1293
+#: ../pidgin/gtkdialogs.c:1269
 msgid "Remove Chat"
 msgstr "Poista ryhmäkeskustelu"
 
-#: ../pidgin/gtkdialogs.c:1296
+#: ../pidgin/gtkdialogs.c:1272
 msgid "_Remove Chat"
 msgstr "_Poista ryhmäkeskustelu"
 
@@ -15509,23 +15694,23 @@ msgstr "Vaihda tila"
 msgid "Change Status"
 msgstr "Vaihda tila"
 
-#: ../pidgin/gtkdocklet.c:680
+#: ../pidgin/gtkdocklet.c:681
 msgid "Show Buddy List"
 msgstr "Näytä tuttavat"
 
-#: ../pidgin/gtkdocklet.c:706
+#: ../pidgin/gtkdocklet.c:707
 msgid "New Message..."
 msgstr "Uusi viesti..."
 
-#: ../pidgin/gtkdocklet.c:721
+#: ../pidgin/gtkdocklet.c:722
 msgid "Mute Sounds"
 msgstr "Vaimenna äänet"
 
-#: ../pidgin/gtkdocklet.c:728
+#: ../pidgin/gtkdocklet.c:729
 msgid "Blink on New Message"
 msgstr "Vilkuta uuden viestin saapuessa"
 
-#: ../pidgin/gtkdocklet.c:738
+#: ../pidgin/gtkdocklet.c:739
 msgid "Quit"
 msgstr "Lopeta"
 
@@ -15592,66 +15777,98 @@ msgstr "Aikaa jäljellä:"
 msgid "Time Remaining:"
 msgstr "Aikaa jäljellä:"
 
-#: ../pidgin/gtkft.c:784
+#: ../pidgin/gtkft.c:781
 msgid "Close this window when all transfers _finish"
 msgstr "Sulje tämä ikkuna kun kaikki siirrot ovat _valmiita"
 
-#: ../pidgin/gtkft.c:794
+#: ../pidgin/gtkft.c:791
 msgid "C_lear finished transfers"
 msgstr "_Poista valmiit siirrot"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:803
+#: ../pidgin/gtkft.c:800
 msgid "File transfer _details"
 msgstr "Tiedostonsiirron yksityiskohdat"
 
 #. Pause button
-#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
+#: ../pidgin/gtkft.c:818 ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "_Tauko"
 
 #. Resume button
-#: ../pidgin/gtkft.c:843
+#: ../pidgin/gtkft.c:823
 msgid "_Resume"
 msgstr "_Jatka"
 
-#: ../pidgin/gtkimhtml.c:815
+#: ../pidgin/gtkimhtml.c:816
 msgid "Paste as Plain _Text"
 msgstr "Liimaa pelkkänä _tekstinä"
 
-#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1199
+#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1197
 msgid "_Reset formatting"
 msgstr "_Poista muotoilu"
 
-#: ../pidgin/gtkimhtml.c:1357
+#: ../pidgin/gtkimhtml.c:1391
 msgid "Hyperlink color"
 msgstr "Hyperlinkin väri"
 
-#: ../pidgin/gtkimhtml.c:1358
+#: ../pidgin/gtkimhtml.c:1392
 msgid "Color to draw hyperlinks."
 msgstr "Väri jolla piirretään hyperlinkit"
 
-#: ../pidgin/gtkimhtml.c:1361
+#: ../pidgin/gtkimhtml.c:1395
 msgid "Hyperlink prelight color"
 msgstr "Hyperlinkin ensiväri"
 
-#: ../pidgin/gtkimhtml.c:1362
+#: ../pidgin/gtkimhtml.c:1396
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Väri jolla piirretään hyperlinkit kun hiiren kursori on niiden päällä."
 
-#: ../pidgin/gtkimhtml.c:1579
+#: ../pidgin/gtkimhtml.c:1399 ../pidgin/plugins/pidginrc.c:52
+msgid "Sent Message Name Color"
+msgstr "Lähetetyn viestin nimen väri"
+
+#: ../pidgin/gtkimhtml.c:1400
+msgid "Color to draw the name of a message you sent."
+msgstr "Väri jolla näytetään lähetetyn viestin nimi."
+
+#: ../pidgin/gtkimhtml.c:1403 ../pidgin/plugins/pidginrc.c:53
+msgid "Received Message Name Color"
+msgstr "Vastaanotetun viestin nimen väri"
+
+#: ../pidgin/gtkimhtml.c:1404
+msgid "Color to draw the name of a message you received."
+msgstr "Väri jolla näytetään vastaanotetun viestin nimi."
+
+#: ../pidgin/gtkimhtml.c:1407
+msgid "\"Attention\" Name Color"
+msgstr "\"Huomio\"-ilmoituksen nimen väri"
+
+#: ../pidgin/gtkimhtml.c:1408
+msgid "Color to draw the name of a message you received containing your name."
+msgstr "Väri jolla näytetään nimesi sisältävän vastaanotetun viestin nimi."
+
+#: ../pidgin/gtkimhtml.c:1411 ../pidgin/plugins/pidginrc.c:55
+msgid "Action Message Name Color"
+msgstr "Toimintoviestin nimen väri"
+
+#: ../pidgin/gtkimhtml.c:1412
+msgid "Color to draw the name of an action message."
+msgstr "Väri jolla näytetään toimintoviestin nimi."
+
+#: ../pidgin/gtkimhtml.c:1632
 msgid "_Copy E-Mail Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: ../pidgin/gtkimhtml.c:1591
+#: ../pidgin/gtkimhtml.c:1644
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: ../pidgin/gtkimhtml.c:1601
+#: ../pidgin/gtkimhtml.c:1654
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin osoite"
 
-#: ../pidgin/gtkimhtml.c:3356
+#: ../pidgin/gtkimhtml.c:3421
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15661,7 +15878,7 @@ msgstr ""
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../pidgin/gtkimhtml.c:3359
+#: ../pidgin/gtkimhtml.c:3424
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15671,7 +15888,7 @@ msgstr ""
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../pidgin/gtkimhtml.c:3388
+#: ../pidgin/gtkimhtml.c:3453
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15682,7 +15899,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3391
+#: ../pidgin/gtkimhtml.c:3456
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15693,16 +15910,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3469 ../pidgin/gtkimhtml.c:3481
+#: ../pidgin/gtkimhtml.c:3537 ../pidgin/gtkimhtml.c:3549
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../pidgin/gtkimhtml.c:3509
-#, c-format
+#: ../pidgin/gtkimhtml.c:3577
 msgid "_Save Image..."
 msgstr "_Tallenna kuva nimellä..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:163
+#: ../pidgin/gtkimhtmltoolbar.c:164
 msgid "Select Font"
 msgstr "Valitse kirjasin"
 
@@ -15710,19 +15926,19 @@ msgstr "Valitse tekstin väri"
 msgid "Select Text Color"
 msgstr "Valitse tekstin väri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:323
+#: ../pidgin/gtkimhtmltoolbar.c:324
 msgid "Select Background Color"
 msgstr "Valitse taustaväri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:412
+#: ../pidgin/gtkimhtmltoolbar.c:413
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: ../pidgin/gtkimhtmltoolbar.c:421
 msgid "_Description"
 msgstr "_Kuvaus"
 
-#: ../pidgin/gtkimhtmltoolbar.c:423
+#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -15730,156 +15946,163 @@ msgstr ""
 "Syötä URL, jonka haluat liittää, sekä sen kuvaus. \n"
 "Kuvaus on valinnainen."
 
-#: ../pidgin/gtkimhtmltoolbar.c:427
+#: ../pidgin/gtkimhtmltoolbar.c:428
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Syötä URL jonka haluat liittää."
 
-#: ../pidgin/gtkimhtmltoolbar.c:432 ../pidgin/gtkimhtmltoolbar.c:1106
+#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Insert Link"
 msgstr "Lisää linkki"
 
-#: ../pidgin/gtkimhtmltoolbar.c:436 ../pidgin/gtkimhtmltoolbar.c:1267
+#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtkimhtmltoolbar.c:1265
 msgid "_Insert"
 msgstr "_Lisää"
 
-#: ../pidgin/gtkimhtmltoolbar.c:516
+#: ../pidgin/gtkimhtmltoolbar.c:518
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Kuvan tallennus epäonnistui: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:542 ../pidgin/gtkimhtmltoolbar.c:552
+#: ../pidgin/gtkimhtmltoolbar.c:544 ../pidgin/gtkimhtmltoolbar.c:554
 msgid "Insert Image"
 msgstr "Liitä kuva"
 
-#: ../pidgin/gtkimhtmltoolbar.c:765
-msgid "This theme has no available smileys."
-msgstr "Tälle teemalle ei ole saatavissa hymiöitä."
-
-#. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:782
+#: ../pidgin/gtkimhtmltoolbar.c:712
 msgid "Smile!"
 msgstr "Hymyile!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:850 ../pidgin/gtkimhtmltoolbar.c:1224
+#: ../pidgin/gtkimhtmltoolbar.c:764
+msgid "This theme has no available smileys."
+msgstr "Tälle teemalle ei ole saatavissa hymiöitä."
+
+#: ../pidgin/gtkimhtmltoolbar.c:848 ../pidgin/gtkimhtmltoolbar.c:1222
 msgid "_Font"
 msgstr "Ki_rjasin"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1058
+#: ../pidgin/gtkimhtmltoolbar.c:1056
 msgid "Group Items"
 msgstr "Ryhmittele kohteet"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1058
+#: ../pidgin/gtkimhtmltoolbar.c:1056
 msgid "Ungroup Items"
 msgstr "Pura kohteiden ryhmitys"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:342
 msgid "Bold"
 msgstr "Lihavoi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1091 ../pidgin/plugins/convcolors.c:351
 msgid "Italic"
 msgstr "Kursivoi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:360
 msgid "Underline"
 msgstr "Alleviivaa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1095
+#: ../pidgin/gtkimhtmltoolbar.c:1093
 msgid "Strikethrough"
 msgstr "Yliviivaa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
+#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Increase Font Size"
 msgstr "Suurenna kirjasimen kokoa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
+#: ../pidgin/gtkimhtmltoolbar.c:1096
 msgid "Decrease Font Size"
 msgstr "Pienennä kirjasimen kokoa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
+#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Font Face"
 msgstr "Kirjasintyyppi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1101
+#: ../pidgin/gtkimhtmltoolbar.c:1099
 msgid "Background Color"
 msgstr "Taustaväri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1102
+#: ../pidgin/gtkimhtmltoolbar.c:1100
 msgid "Foreground Color"
 msgstr "Etualaväri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
+#: ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Reset Formatting"
 msgstr "Poista muotoilu"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1107
+#: ../pidgin/gtkimhtmltoolbar.c:1105
 msgid "Insert IM Image"
 msgstr "Lisää IM-kuva"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1108
+#: ../pidgin/gtkimhtmltoolbar.c:1106
 msgid "Insert Smiley"
 msgstr "Lisää hymiö"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1184
+#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<b>_Bold</b>"
 msgstr "<b>_Lihavoi</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<i>_Italic</i>"
 msgstr "<i>_Kursivoi</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1186
+#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<u>_Underline</u>"
 msgstr "<u>_Alleviivaa</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>Yliviivaa</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1188
+#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Suurempi</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1190
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "_Normal"
 msgstr "_Normaali"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1192
+#: ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>_Pienempi</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1196
+#: ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "_Font face"
 msgstr "Ki_rjasintyyppi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1197
+#: ../pidgin/gtkimhtmltoolbar.c:1195
 msgid "Foreground _color"
 msgstr "Etuala_väri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1198
+#: ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "Bac_kground color"
 msgstr "_Taustaväri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1275
+#: ../pidgin/gtkimhtmltoolbar.c:1273
 msgid "_Image"
 msgstr "Ku_va"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1281
+#: ../pidgin/gtkimhtmltoolbar.c:1279
 msgid "_Link"
 msgstr "_Linkki"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1287
+#: ../pidgin/gtkimhtmltoolbar.c:1285
 msgid "_Horizontal rule"
 msgstr "_Vaakaviiva"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1309
+#: ../pidgin/gtkimhtmltoolbar.c:1307
 msgid "_Smile!"
 msgstr "_Hymyile!"
 
-#: ../pidgin/gtklog.c:293
+#: ../pidgin/gtklog.c:245
+msgid "Log Deletion Failed"
+msgstr "Lokin poistaminen epäonnistui"
+
+#: ../pidgin/gtklog.c:246
+msgid "Check permissions and try again."
+msgstr "Tarkista oikeudet ja yritä uudelleen."
+
+#: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -15888,7 +16111,7 @@ msgstr ""
 "Haluatko varmasti poistaa käyttäjän %s kanssa käydyn viestilokin joka alkoi %"
 "s?"
 
-#: ../pidgin/gtklog.c:304
+#: ../pidgin/gtklog.c:303
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -15896,13 +16119,21 @@ msgstr ""
 msgstr ""
 "Haluatko varmasti poistaa kohteessa %s käydyn viestilokin joka alkoi %s?"
 
-#: ../pidgin/gtklog.c:309
+#: ../pidgin/gtklog.c:308
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
 msgstr "Haluatko varmasti poistaa järjestelmälokin joka alkoi %s?"
 
+#: ../pidgin/gtklog.c:323
+msgid "Delete Log?"
+msgstr "Poista loki?"
+
+#: ../pidgin/gtklog.c:334
+msgid "Delete Log..."
+msgstr "Poista loki..."
+
 #: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
@@ -15914,66 +16145,17 @@ msgstr ""
 msgstr ""
 "<span size='larger' weight='bold'>Keskustelu käyttäjän %s kanssa %s</span>"
 
-#: ../pidgin/gtklog.c:503
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: ../pidgin/gtklog.c:550
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-"Järjestelmätapahtumat kirjataan lokiin vain jos \"Kirjaa kaikki "
-"tilamuutokset järjestelmälokiin\" on asetettu."
-
-#: ../pidgin/gtklog.c:554
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-"Pikaviestit kirjataan lokiin vain jos \"Kirjaa kaikki pikaviestit lokiin\" "
-"on asetettu."
-
-#: ../pidgin/gtklog.c:557
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-"Ryhmäkeskustelut kirjataan lokiin vain jos \"Kirjaa kaikki ryhmäkeskustelut "
-"lokiin\" on asetettu."
-
-#: ../pidgin/gtklog.c:561
-msgid "No logs were found"
-msgstr "Lokeja ei löytynyt"
-
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:576
+#: ../pidgin/gtklog.c:581
 msgid "_Browse logs folder"
 msgstr "_Selaa lokikansiota"
 
-#: ../pidgin/gtklog.c:640
-msgid "Total log size:"
-msgstr "Lokin kokonaiskoko:"
-
-#: ../pidgin/gtklog.c:714
-#, c-format
-msgid "Conversations in %s"
-msgstr "Keskustelut paikassa %s"
-
-#: ../pidgin/gtklog.c:722 ../pidgin/gtklog.c:793
-#, c-format
-msgid "Conversations with %s"
-msgstr "Keskustelut käyttäjän %s kanssa"
-
-#: ../pidgin/gtklog.c:823
-msgid "System Log"
-msgstr "Järjestelmäloki"
-
 #: ../pidgin/gtkmain.c:398
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Kirjoita \"%s -h\" saadaksesi lisää tietoja.\n"
 
-#: ../pidgin/gtkmain.c:400
+#: ../pidgin/gtkmain.c:401
 #, c-format
 msgid ""
 "%s %s\n"
@@ -16002,9 +16184,36 @@ msgstr ""
 "  --display=NÄYTTÖ    käytettävä X-näyttö\n"
 "  -v, --version       näytä nykyinen versionumero ja poistu\n"
 
-#: ../pidgin/gtkmain.c:528
+#: ../pidgin/gtkmain.c:413
 #, c-format
 msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, separated by commas)\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s %s\n"
+"Käyttö: %s [VALITSIN]...\n"
+"\n"
+"  -c, --config=HAK    käytä hakemistoa HAK asetustiedostoille\n"
+"  -d, --debug         kirjoita virheenjäljitysviestit putkeen stdout\n"
+"  -h, --help          näytä tämä ohje ja poistu\n"
+"  -m, --multiple      älä pitäydy vain yhdessä instanssissa\n"
+"  -n, --nologin       älä kirjaudu automaattisesti\n"
+"  -l, --login[=NIMI]  kirjaudu automaattisesti (valinnainen NIMI \n"
+"                      määrittelee käytettävät tilit pilkuin eroteltuina)\n"
+"  -v, --version       näytä nykyinen versionumero ja poistu\n"
+
+#: ../pidgin/gtkmain.c:540
+#, c-format
+msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
@@ -16043,69 +16252,69 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:718 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:731 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:350
+#: ../pidgin/gtknotify.c:354
 msgid "Open All Messages"
 msgstr "Avaa kaikki viestit"
 
-#: ../pidgin/gtknotify.c:403
+#: ../pidgin/gtknotify.c:408
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Sinulle on postia!</span>"
 
-#: ../pidgin/gtknotify.c:546
+#: ../pidgin/gtknotify.c:551
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s:lla on %d uusi viesti."
 msgstr[1] "%s:lla on %d uutta viestiä."
 
-#: ../pidgin/gtknotify.c:570
+#: ../pidgin/gtknotify.c:575
 #, c-format
 msgid "<b>%d new e-mail.</b>"
 msgid_plural "<b>%d new e-mails.</b>"
 msgstr[0] "<b>%d uusi sähköposti.</b>"
 msgstr[1] "<b>%d uutta sähköpostia.</b>"
 
-#: ../pidgin/gtknotify.c:998
+#: ../pidgin/gtknotify.c:1008
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Selainkomento \"%s\" on virheellinen."
 
-#: ../pidgin/gtknotify.c:1000 ../pidgin/gtknotify.c:1012
-#: ../pidgin/gtknotify.c:1025 ../pidgin/gtknotify.c:1153
+#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1022
+#: ../pidgin/gtknotify.c:1035 ../pidgin/gtknotify.c:1172
 msgid "Unable to open URL"
 msgstr "URL:n avaaminen epäonnistui"
 
-#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1023
+#: ../pidgin/gtknotify.c:1020 ../pidgin/gtknotify.c:1033
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Virhe käynnistettäessä \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1154
+#: ../pidgin/gtknotify.c:1173
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Oma selainkomento -asetus valittu, mutta komentoa ei ole asetettu."
 
-#: ../pidgin/gtkplugin.c:265
+#: ../pidgin/gtkplugin.c:266
 msgid "The following plugins will be unloaded."
 msgstr "Seuraavat liitännäiset otetaan pois käytöstä."
 
-#: ../pidgin/gtkplugin.c:284
+#: ../pidgin/gtkplugin.c:285
 msgid "Multiple plugins will be unloaded."
 msgstr "Useita liitännäisiä otetaan pois käytöstä."
 
-#: ../pidgin/gtkplugin.c:288
+#: ../pidgin/gtkplugin.c:289
 msgid "Unload Plugins"
 msgstr "Poista liitännäiset käytöstä"
 
-#: ../pidgin/gtkplugin.c:308
+#: ../pidgin/gtkplugin.c:309
 msgid "Could not unload plugin"
 msgstr "Liitännäistä ei voi poistaa käytöstä"
 
-#: ../pidgin/gtkplugin.c:309
+#: ../pidgin/gtkplugin.c:310
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
@@ -16113,7 +16322,7 @@ msgstr ""
 "Liitännäistä ei voi poistaa käytöstä nyt, mutta se poistetaan käytöstä "
 "seuraavalla käynnistymiskerralla."
 
-#: ../pidgin/gtkplugin.c:417
+#: ../pidgin/gtkplugin.c:418
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -16124,7 +16333,7 @@ msgstr ""
 "<span weight=\"bold\">Web-sivusto:</span>\t\t%s\n"
 "<span weight=\"bold\">Tiedostopolku:</span>\t%s"
 
-#: ../pidgin/gtkplugin.c:427
+#: ../pidgin/gtkplugin.c:428
 #, c-format
 msgid ""
 "%s\n"
@@ -16135,11 +16344,11 @@ msgstr ""
 "<span foreground=\"#ff0000\" weight=\"bold\">Virhe: %s\n"
 "Tarkista onko liitännäiswebsivustolla päivitystä.</span>"
 
-#: ../pidgin/gtkplugin.c:562
+#: ../pidgin/gtkplugin.c:606
 msgid "Configure Pl_ugin"
 msgstr "Liitännäisen _asetukset"
 
-#: ../pidgin/gtkplugin.c:625
+#: ../pidgin/gtkplugin.c:673
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Liitännäisen yksityiskohdat</b>"
 
@@ -16148,112 +16357,107 @@ msgstr "Valitse tiedosto"
 msgstr "Valitse tiedosto"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:547
+#: ../pidgin/gtkpounce.c:539
 msgid "Pounce on Whom"
 msgstr "Kenestä ilmoitetaan"
 
-#: ../pidgin/gtkpounce.c:574
+#: ../pidgin/gtkpounce.c:566
 msgid "_Buddy name:"
 msgstr "_Tuttavan nimi:"
 
-#: ../pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:600
 msgid "Si_gns on"
 msgstr "_kirjautuu sisään"
 
-#: ../pidgin/gtkpounce.c:610
+#: ../pidgin/gtkpounce.c:602
 msgid "Signs o_ff"
 msgstr "kirjautuu _ulos"
 
-#: ../pidgin/gtkpounce.c:612
+#: ../pidgin/gtkpounce.c:604
 msgid "Goes a_way"
 msgstr "poi_stuu"
 
-#: ../pidgin/gtkpounce.c:614
+#: ../pidgin/gtkpounce.c:606
 msgid "Ret_urns from away"
 msgstr "_palaa"
 
-#: ../pidgin/gtkpounce.c:616
+#: ../pidgin/gtkpounce.c:608
 msgid "Becomes _idle"
 msgstr "on _jouten"
 
-#: ../pidgin/gtkpounce.c:618
+#: ../pidgin/gtkpounce.c:610
 msgid "Is no longer i_dle"
 msgstr "ei enää ole j_outen"
 
-#: ../pidgin/gtkpounce.c:620
+#: ../pidgin/gtkpounce.c:612
 msgid "Starts _typing"
 msgstr "_alkaa kirjoittaa"
 
-#: ../pidgin/gtkpounce.c:622
+#: ../pidgin/gtkpounce.c:614
 msgid "P_auses while typing"
 msgstr "_keskeyttää kirjoittamisen"
 
-#: ../pidgin/gtkpounce.c:624
+#: ../pidgin/gtkpounce.c:616
 msgid "Stops t_yping"
 msgstr "lope_ttaa kirjoittamisen"
 
-#: ../pidgin/gtkpounce.c:626
+#: ../pidgin/gtkpounce.c:618
 msgid "Sends a _message"
 msgstr "lähettää _viestin"
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:661
 msgid "Ope_n an IM window"
 msgstr "Avaa pikav_iesti-ikkuna"
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:663
 msgid "_Pop up a notification"
 msgstr "_Ponnahdusilmoitus"
 
-#: ../pidgin/gtkpounce.c:673
+#: ../pidgin/gtkpounce.c:665
 msgid "Send a _message"
 msgstr "Lähetä _viesti"
 
-#: ../pidgin/gtkpounce.c:675
+#: ../pidgin/gtkpounce.c:667
 msgid "E_xecute a command"
 msgstr "Suorita _komento"
 
-#: ../pidgin/gtkpounce.c:677
+#: ../pidgin/gtkpounce.c:669
 msgid "P_lay a sound"
 msgstr "S_oita ääni"
 
-#: ../pidgin/gtkpounce.c:683
+#: ../pidgin/gtkpounce.c:675
 msgid "Brows_e..."
 msgstr "_Selaa"
 
-#: ../pidgin/gtkpounce.c:685
+#: ../pidgin/gtkpounce.c:677
 msgid "Br_owse..."
 msgstr "S_elaa"
 
-#: ../pidgin/gtkpounce.c:686
+#: ../pidgin/gtkpounce.c:678
 msgid "Pre_view"
 msgstr "_Esikatselu"
 
-#: ../pidgin/gtkpounce.c:818
+#: ../pidgin/gtkpounce.c:810
 msgid "P_ounce only when my status is not Available"
-msgstr "I_lmoita vain kun tilani on \"tavoittamattomissa\""
+msgstr "I_lmoita vain kun tilani ei ole Tavoitettavissa"
 
-#: ../pidgin/gtkpounce.c:823
+#: ../pidgin/gtkpounce.c:815
 msgid "_Recurring"
 msgstr "_Toistuva"
 
-#: ../pidgin/gtkpounce.c:1266
+#: ../pidgin/gtkpounce.c:1259
 msgid "Pounce Target"
 msgstr "Ilmoituksen kohde"
 
-#: ../pidgin/gtkprefs.c:386
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-msgid "Default"
-msgstr "Oletus"
-
-#: ../pidgin/gtkprefs.c:517
+#: ../pidgin/gtkprefs.c:458
 msgid "Smiley theme failed to unpack."
 msgstr "Hymiöteeman purkaminen epäonnistui."
 
-#: ../pidgin/gtkprefs.c:644
+#: ../pidgin/gtkprefs.c:593
 msgid "Install Theme"
 msgstr "Asenna teema"
 
-#: ../pidgin/gtkprefs.c:698
+#: ../pidgin/gtkprefs.c:646
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -16261,136 +16465,136 @@ msgstr ""
 "Valitse haluamasi hymiöteema alla olevasta listasta. Uudet teemat voi "
 "asentaa vedä&pudota-menetelmällä pudottamalla ne teemalistaan."
 
-#: ../pidgin/gtkprefs.c:733
+#: ../pidgin/gtkprefs.c:681
 msgid "Icon"
 msgstr "Kuvake"
 
-#: ../pidgin/gtkprefs.c:895
+#: ../pidgin/gtkprefs.c:843
 msgid "System Tray Icon"
 msgstr "Tarjotinkuvake"
 
-#: ../pidgin/gtkprefs.c:896
+#: ../pidgin/gtkprefs.c:844
 msgid "_Show system tray icon:"
 msgstr "_Näytä tarjotinkuvake:"
 
-#: ../pidgin/gtkprefs.c:899
+#: ../pidgin/gtkprefs.c:847
 msgid "On unread messages"
 msgstr "Kun lukemattomia viestejä"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:853
 msgid "Conversation Window Hiding"
 msgstr "Keskusteluikkunan piilottaminen"
 
-#: ../pidgin/gtkprefs.c:906
+#: ../pidgin/gtkprefs.c:854
 msgid "_Hide new IM conversations:"
 msgstr "_Piilota uudet pikaviestikeskustelut:"
 
-#: ../pidgin/gtkprefs.c:909 ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:857 ../pidgin/gtkprefs.c:1965
 msgid "When away"
 msgstr "Poissaollessa"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:917
+#: ../pidgin/gtkprefs.c:865
 msgid "Tabs"
 msgstr "Välilehdet"
 
-#: ../pidgin/gtkprefs.c:919
+#: ../pidgin/gtkprefs.c:867
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut _jaetuissa ikkunoissa"
 
-#: ../pidgin/gtkprefs.c:933
+#: ../pidgin/gtkprefs.c:881
 msgid "Show close b_utton on tabs"
 msgstr "Näytä _sulkemispainikkeet välilehdissä"
 
-#: ../pidgin/gtkprefs.c:936
+#: ../pidgin/gtkprefs.c:884
 msgid "_Placement:"
 msgstr "_Asettelu:"
 
-#: ../pidgin/gtkprefs.c:938
+#: ../pidgin/gtkprefs.c:886
 msgid "Top"
 msgstr "Ylhäällä"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:887
 msgid "Bottom"
 msgstr "Alhaalla"
 
-#: ../pidgin/gtkprefs.c:940
+#: ../pidgin/gtkprefs.c:888
 msgid "Left"
 msgstr "Vasemmalla"
 
-#: ../pidgin/gtkprefs.c:941
+#: ../pidgin/gtkprefs.c:889
 msgid "Right"
 msgstr "Oikealla"
 
-#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:891
 msgid "Left Vertical"
 msgstr "Vasemmalla pystysuuntaisesti"
 
-#: ../pidgin/gtkprefs.c:944
+#: ../pidgin/gtkprefs.c:892
 msgid "Right Vertical"
 msgstr "Oikealla pystysuuntaisesti"
 
-#: ../pidgin/gtkprefs.c:951
+#: ../pidgin/gtkprefs.c:899
 msgid "N_ew conversations:"
 msgstr "_Uudet keskustelut:"
 
-#: ../pidgin/gtkprefs.c:997
+#: ../pidgin/gtkprefs.c:944
 msgid "Show _formatting on incoming messages"
 msgstr "Näytä _muotoilu tulevissa viesteissä"
 
-#: ../pidgin/gtkprefs.c:999
+#: ../pidgin/gtkprefs.c:946
 msgid "Close IMs immediately when the tab is closed"
 msgstr "Sulje pikaviestit heti kun välilehti on suljettu"
 
-#: ../pidgin/gtkprefs.c:1002
+#: ../pidgin/gtkprefs.c:949
 msgid "Show _detailed information"
 msgstr "Näytä _yksityiskohtaiset tiedot"
 
-#: ../pidgin/gtkprefs.c:1004
+#: ../pidgin/gtkprefs.c:951
 msgid "Enable buddy ic_on animation"
 msgstr "Näytä tuttavakuvakkeen a_nimaatio"
 
-#: ../pidgin/gtkprefs.c:1011
+#: ../pidgin/gtkprefs.c:958
 msgid "_Notify buddies that you are typing to them"
 msgstr "Ilmoita tuttaville kun _kirjoitat heille"
 
-#: ../pidgin/gtkprefs.c:1014
+#: ../pidgin/gtkprefs.c:961
 msgid "Highlight _misspelled words"
 msgstr "Korosta _väärinkirjoitetut sanat"
 
-#: ../pidgin/gtkprefs.c:1018
+#: ../pidgin/gtkprefs.c:965
 msgid "Use smooth-scrolling"
 msgstr "Käytä portaatonta tekstinvieritystä"
 
-#: ../pidgin/gtkprefs.c:1021
+#: ../pidgin/gtkprefs.c:968
 msgid "F_lash window when IMs are received"
 msgstr "_Vilkuta ikkunaa pikaviestien saapuessa"
 
-#: ../pidgin/gtkprefs.c:1023
+#: ../pidgin/gtkprefs.c:970
 msgid "Minimi_ze new conversation windows"
 msgstr "Piene_nnä uudet keskusteluikkunat"
 
-#: ../pidgin/gtkprefs.c:1027
+#: ../pidgin/gtkprefs.c:974
 msgid "Font"
 msgstr "Kirjasin"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:976
 msgid "Use document font from _theme"
 msgstr "Käytä asiakirjojen kirjasinta _teemasta"
 
-#: ../pidgin/gtkprefs.c:1031
+#: ../pidgin/gtkprefs.c:978
 msgid "Use font from _theme"
 msgstr "Käytä kirjasinta _teemasta"
 
-#: ../pidgin/gtkprefs.c:1033
+#: ../pidgin/gtkprefs.c:984
 msgid "Conversation _font:"
 msgstr "Keskustelujen _kirjasin:"
 
-#: ../pidgin/gtkprefs.c:1047
+#: ../pidgin/gtkprefs.c:991
 msgid "Default Formatting"
 msgstr "Oletusmuotoilu"
 
-#: ../pidgin/gtkprefs.c:1066
+#: ../pidgin/gtkprefs.c:1010
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -16398,59 +16602,63 @@ msgstr ""
 "Tältä ulosmenevä viesti näyttää kun käytät yhteyskäytäntöä joka tukee "
 "muotoiluja."
 
-#: ../pidgin/gtkprefs.c:1126
+#: ../pidgin/gtkprefs.c:1070
 msgid "Cannot start proxy configuration program."
 msgstr "Välipalvelimen asetusohjelmaa ei voi käynnistää."
 
-#: ../pidgin/gtkprefs.c:1138
+#: ../pidgin/gtkprefs.c:1082
 msgid "Cannot start browser configuration program."
 msgstr "Selaimen asetusohjelmaa ei voi käynnistää."
 
-#: ../pidgin/gtkprefs.c:1158
+#: ../pidgin/gtkprefs.c:1102
 msgid "ST_UN server:"
 msgstr "ST_UN-palvelin:"
 
-#: ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkprefs.c:1114
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Esimerkki: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1174
+#: ../pidgin/gtkprefs.c:1118
 msgid "_Autodetect IP address"
 msgstr "_Hae IP-osoite automaattisesti"
 
-#: ../pidgin/gtkprefs.c:1183
+#: ../pidgin/gtkprefs.c:1127
 msgid "Public _IP:"
 msgstr "Julkinen _IP:"
 
-#: ../pidgin/gtkprefs.c:1214
+#: ../pidgin/gtkprefs.c:1158
 msgid "Ports"
 msgstr "Portit"
 
-#: ../pidgin/gtkprefs.c:1217
+#: ../pidgin/gtkprefs.c:1161
+msgid "_Enable automatic router port forwarding"
+msgstr "_Ota käyttöön automaattinen reitittimen porttien uudelleenohjaus"
+
+#: ../pidgin/gtkprefs.c:1164
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Aseta kuunneltava porttialue"
 
-#: ../pidgin/gtkprefs.c:1220
+#: ../pidgin/gtkprefs.c:1167
 msgid "_Start port:"
 msgstr "_Ensimmäinen portti:"
 
-#: ../pidgin/gtkprefs.c:1227
+#: ../pidgin/gtkprefs.c:1174
 msgid "_End port:"
 msgstr "Viimeinen _portti:"
 
-#: ../pidgin/gtkprefs.c:1235
+#: ../pidgin/gtkprefs.c:1182
 msgid "Proxy Server &amp; Browser"
 msgstr "Välipalvelin &amp; selain"
 
-#: ../pidgin/gtkprefs.c:1243
+#: ../pidgin/gtkprefs.c:1190
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr "<b>Välipalvelimen asetusohjelmaa ei löydy.</b>"
 
-#: ../pidgin/gtkprefs.c:1251
+#: ../pidgin/gtkprefs.c:1198
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr "<b>Selaimen asetusohjelmaa ei löydy.</b>"
 
-#: ../pidgin/gtkprefs.c:1256
+#: ../pidgin/gtkprefs.c:1203
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
@@ -16458,95 +16666,99 @@ msgstr ""
 "Välipalvelimen & selaimen asetukset määritetään \n"
 "Gnomen asetuksissa"
 
-#: ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkprefs.c:1210
 msgid "Configure _Proxy"
 msgstr "Aseta _välipalvelin"
 
-#: ../pidgin/gtkprefs.c:1268
+#: ../pidgin/gtkprefs.c:1215
 msgid "Configure _Browser"
 msgstr "Aseta _selain"
 
-#: ../pidgin/gtkprefs.c:1274
+#: ../pidgin/gtkprefs.c:1221
 msgid "Proxy Server"
 msgstr "Välipalvelin"
 
-#: ../pidgin/gtkprefs.c:1279
+#: ../pidgin/gtkprefs.c:1226
 msgid "No proxy"
 msgstr "Ei välipalvelinta"
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1282
 msgid "_User:"
 msgstr "_Käyttäjä:"
 
-#: ../pidgin/gtkprefs.c:1423
+#: ../pidgin/gtkprefs.c:1370
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1424
+#: ../pidgin/gtkprefs.c:1371
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1425
+#: ../pidgin/gtkprefs.c:1372
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1426
+#: ../pidgin/gtkprefs.c:1373
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1427
+#: ../pidgin/gtkprefs.c:1374
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1428
+#: ../pidgin/gtkprefs.c:1375
+msgid "Desktop Default"
+msgstr "Työpöydän oletus"
+
+#: ../pidgin/gtkprefs.c:1376
 msgid "GNOME Default"
 msgstr "Gnomen oletus"
 
-#: ../pidgin/gtkprefs.c:1429
+#: ../pidgin/gtkprefs.c:1377
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1378
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1431
+#: ../pidgin/gtkprefs.c:1379
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1432
+#: ../pidgin/gtkprefs.c:1380
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1441
+#: ../pidgin/gtkprefs.c:1389
 msgid "Manual"
 msgstr "Oma komento"
 
-#: ../pidgin/gtkprefs.c:1494
+#: ../pidgin/gtkprefs.c:1450
 msgid "Browser Selection"
 msgstr "Selaimen valinta"
 
-#: ../pidgin/gtkprefs.c:1498
+#: ../pidgin/gtkprefs.c:1454
 msgid "_Browser:"
 msgstr "_Selain:"
 
-#: ../pidgin/gtkprefs.c:1506
+#: ../pidgin/gtkprefs.c:1462
 msgid "_Open link in:"
 msgstr "_Avaa linkki:"
 
-#: ../pidgin/gtkprefs.c:1508
+#: ../pidgin/gtkprefs.c:1464
 msgid "Browser default"
 msgstr "Selaimen oletus"
 
-#: ../pidgin/gtkprefs.c:1509
+#: ../pidgin/gtkprefs.c:1465
 msgid "Existing window"
 msgstr "Olemassaolevaan ikkunaan"
 
-#: ../pidgin/gtkprefs.c:1511
+#: ../pidgin/gtkprefs.c:1467
 msgid "New tab"
 msgstr "Uuteen välilehteen"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1484
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16555,69 +16767,63 @@ msgstr ""
 "_Komento:\n"
 "(URL:ksi %s)"
 
-#: ../pidgin/gtkprefs.c:1566
+#: ../pidgin/gtkprefs.c:1510
 msgid "Log _format:"
 msgstr "Lokin _muoto:"
 
-#: ../pidgin/gtkprefs.c:1571
+#: ../pidgin/gtkprefs.c:1515
 msgid "Log all _instant messages"
 msgstr "Kirjaa kaikki pikaviestit _lokiin"
 
-#: ../pidgin/gtkprefs.c:1573
+#: ../pidgin/gtkprefs.c:1517
 msgid "Log all c_hats"
 msgstr "Kirjaa kaikki ryhmä_keskustelut lokiin"
 
-#: ../pidgin/gtkprefs.c:1575
+#: ../pidgin/gtkprefs.c:1519
 msgid "Log all _status changes to system log"
 msgstr "Kirjaa kaikki _tilamuutokset järjestelmälokiin"
 
-#: ../pidgin/gtkprefs.c:1725
+#: ../pidgin/gtkprefs.c:1669
 msgid "Sound Selection"
 msgstr "Äänivalinta"
 
-#: ../pidgin/gtkprefs.c:1735
-#, c-format
+#: ../pidgin/gtkprefs.c:1679
 msgid "Quietest"
 msgstr "Hiljaisin"
 
-#: ../pidgin/gtkprefs.c:1737
-#, c-format
+#: ../pidgin/gtkprefs.c:1681
 msgid "Quieter"
 msgstr "Hiljaisempi"
 
-#: ../pidgin/gtkprefs.c:1739
-#, c-format
+#: ../pidgin/gtkprefs.c:1683
 msgid "Quiet"
 msgstr "Hiljainen"
 
-#: ../pidgin/gtkprefs.c:1743
-#, c-format
+#: ../pidgin/gtkprefs.c:1687
 msgid "Loud"
 msgstr "Äänekäs"
 
-#: ../pidgin/gtkprefs.c:1745
-#, c-format
+#: ../pidgin/gtkprefs.c:1689
 msgid "Louder"
 msgstr "Äänekkäämpi"
 
-#: ../pidgin/gtkprefs.c:1747
-#, c-format
+#: ../pidgin/gtkprefs.c:1691
 msgid "Loudest"
 msgstr "Äänekkäin"
 
-#: ../pidgin/gtkprefs.c:1813
+#: ../pidgin/gtkprefs.c:1754
 msgid "_Method:"
 msgstr "_Menetelmä:"
 
-#: ../pidgin/gtkprefs.c:1815
+#: ../pidgin/gtkprefs.c:1756
 msgid "Console beep"
 msgstr "Konsoliäänimerkki"
 
-#: ../pidgin/gtkprefs.c:1822
+#: ../pidgin/gtkprefs.c:1763
 msgid "No sounds"
 msgstr "Ei ääniä"
 
-#: ../pidgin/gtkprefs.c:1830
+#: ../pidgin/gtkprefs.c:1776
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16626,201 +16832,200 @@ msgstr ""
 "Äänik_omento:\n"
 "(%s tiedostonimeksi)"
 
-#: ../pidgin/gtkprefs.c:1857
+#: ../pidgin/gtkprefs.c:1785
 msgid "Sounds when conversation has _focus"
 msgstr "Äänet kun keskusteluikkuna on _aktiivinen"
 
-#: ../pidgin/gtkprefs.c:1859
+#: ../pidgin/gtkprefs.c:1787
 msgid "Enable sounds:"
 msgstr "Ota äänet käyttöön:"
 
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1804
 msgid "Volume:"
 msgstr "Äänenvoimakkuus:"
 
-#: ../pidgin/gtkprefs.c:1950
+#: ../pidgin/gtkprefs.c:1871
 msgid "Play"
 msgstr "Soita"
 
-#: ../pidgin/gtkprefs.c:2028
+#: ../pidgin/gtkprefs.c:1948
 msgid "_Report idle time:"
 msgstr "_Ilmoita joutenoloaika:"
 
-#: ../pidgin/gtkprefs.c:2033
+#: ../pidgin/gtkprefs.c:1953
 msgid "Based on keyboard or mouse use"
 msgstr "Perustuen näppäimistön tai hiiren käyttöön"
 
-#: ../pidgin/gtkprefs.c:2042
+#: ../pidgin/gtkprefs.c:1962
 msgid "_Auto-reply:"
 msgstr "_Automaattivastaus:"
 
-#: ../pidgin/gtkprefs.c:2046
+#: ../pidgin/gtkprefs.c:1966
 msgid "When both away and idle"
 msgstr "Poissa ja jouten ollessa"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:2052
+#: ../pidgin/gtkprefs.c:1972
 msgid "Auto-away"
 msgstr "Automaattinen poissaoloasetus"
 
-#: ../pidgin/gtkprefs.c:2054
+#: ../pidgin/gtkprefs.c:1974
 msgid "Change status when _idle"
 msgstr "Vaihda tila, kun ollaan _jouten"
 
-#: ../pidgin/gtkprefs.c:2058
+#: ../pidgin/gtkprefs.c:1978
 msgid "_Minutes before becoming idle:"
 msgstr "_Minuutteja ennen jouten olevaksi asettamista:"
 
-#: ../pidgin/gtkprefs.c:2066
+#: ../pidgin/gtkprefs.c:1985
 msgid "Change _status to:"
 msgstr "Vaihda tila seuraavaksi:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:2087
+#: ../pidgin/gtkprefs.c:1998
 msgid "Status at Startup"
 msgstr "Tila käynnistettäessä"
 
-#: ../pidgin/gtkprefs.c:2089
+#: ../pidgin/gtkprefs.c:2000
 msgid "Use status from last _exit at startup"
 msgstr "Käytä viimeksi poistuttaessa ollutta tilaa"
 
-#: ../pidgin/gtkprefs.c:2095
+#: ../pidgin/gtkprefs.c:2007
 msgid "Status to a_pply at startup:"
 msgstr "Tila jota _käytetään käynnistettäessä:"
 
-#: ../pidgin/gtkprefs.c:2134
+#: ../pidgin/gtkprefs.c:2036
 msgid "Interface"
 msgstr "Käyttöliittymä"
 
-#: ../pidgin/gtkprefs.c:2136
+#: ../pidgin/gtkprefs.c:2038
 msgid "Smiley Themes"
 msgstr "Hymiöteemat"
 
-#: ../pidgin/gtkprefs.c:2143
+#: ../pidgin/gtkprefs.c:2045
 msgid "Browser"
 msgstr "Selain"
 
-#: ../pidgin/gtkprefs.c:2147
+#: ../pidgin/gtkprefs.c:2049
 msgid "Status / Idle"
 msgstr "Tila / jouten"
 
-#: ../pidgin/gtkprivacy.c:80
+#: ../pidgin/gtkprivacy.c:81
 msgid "Allow all users to contact me"
 msgstr "Salli kaikkien käyttäjien ottaa minuun yhteyttä"
 
-#: ../pidgin/gtkprivacy.c:81
+#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users on my buddy list"
 msgstr "Salli vain käyttäjät tuttavissa"
 
-#: ../pidgin/gtkprivacy.c:82
+#: ../pidgin/gtkprivacy.c:83
 msgid "Allow only the users below"
 msgstr "Salli vain alla olevat käyttäjät"
 
-#: ../pidgin/gtkprivacy.c:83
+#: ../pidgin/gtkprivacy.c:84
 msgid "Block all users"
 msgstr "Estä kaikki käyttäjät"
 
-#: ../pidgin/gtkprivacy.c:84
+#: ../pidgin/gtkprivacy.c:85
 msgid "Block only the users below"
 msgstr "Estä vain alla olevat käyttäjät"
 
-#: ../pidgin/gtkprivacy.c:372
+#: ../pidgin/gtkprivacy.c:352
 msgid "Privacy"
 msgstr "Yksityisyys"
 
-#: ../pidgin/gtkprivacy.c:384
+#: ../pidgin/gtkprivacy.c:362
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Muutokset yksityisyysasetuksiin tulevat voimaan heti."
 
-#. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:396
+#: ../pidgin/gtkprivacy.c:371
 msgid "Set privacy for:"
 msgstr "Yksityisyysasetukset tilille:"
 
-#: ../pidgin/gtkprivacy.c:559 ../pidgin/gtkprivacy.c:576
+#. Remove All button
+#: ../pidgin/gtkprivacy.c:417
+msgid "Remove Al_l"
+msgstr "Poista kaik_ki"
+
+#: ../pidgin/gtkprivacy.c:503 ../pidgin/gtkprivacy.c:520
 msgid "Permit User"
 msgstr "Salli käyttäjä"
 
-#: ../pidgin/gtkprivacy.c:560
+#: ../pidgin/gtkprivacy.c:504
 msgid "Type a user you permit to contact you."
 msgstr "Kirjoita tuttavan nimi jonka valtuutat ottamaan yhteyttä sinuun."
 
-#: ../pidgin/gtkprivacy.c:561
+#: ../pidgin/gtkprivacy.c:505
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Syötä käyttäjän nimi, jonka tahdot voivan ottaa sinuun yhteyttä."
 
-#: ../pidgin/gtkprivacy.c:564 ../pidgin/gtkprivacy.c:580
+#: ../pidgin/gtkprivacy.c:508 ../pidgin/gtkprivacy.c:524
 msgid "_Permit"
 msgstr "_Salli"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:514
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Sallitaanko %s:n yhteydenotot?"
 
-#: ../pidgin/gtkprivacy.c:572
+#: ../pidgin/gtkprivacy.c:516
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Sallitaanko varmasti %s:n yhteydenotot?"
 
-#: ../pidgin/gtkprivacy.c:601 ../pidgin/gtkprivacy.c:615
+#: ../pidgin/gtkprivacy.c:545 ../pidgin/gtkprivacy.c:559
 msgid "Block User"
 msgstr "Estä käyttäjää"
 
-#: ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkprivacy.c:546
 msgid "Type a user to block."
 msgstr "Kirjoita estettävä käyttäjä."
 
-#: ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:547
 msgid "Please enter the name of the user you wish to block."
 msgstr "Kirjoita käyttäjän nimi jonka tahdot estää ottamasta yhteyttä."
 
-#: ../pidgin/gtkprivacy.c:611
+#: ../pidgin/gtkprivacy.c:555
 #, c-format
 msgid "Block %s?"
 msgstr "Estetäänkö %s?"
 
-#: ../pidgin/gtkprivacy.c:613
+#: ../pidgin/gtkprivacy.c:557
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Haluatko varmasti estää %s?"
 
-#: ../pidgin/gtkrequest.c:322
+#: ../pidgin/gtkrequest.c:274
 msgid "Apply"
 msgstr "Toteuta"
 
-#: ../pidgin/gtkrequest.c:1651
+#: ../pidgin/gtkrequest.c:1503
 msgid "That file already exists"
 msgstr "Tiedosto on jo olemassa"
 
-#: ../pidgin/gtkrequest.c:1652
+#: ../pidgin/gtkrequest.c:1504
 msgid "Would you like to overwrite it?"
 msgstr "Haluatko korvata sen?"
 
-#: ../pidgin/gtkrequest.c:1655
+#: ../pidgin/gtkrequest.c:1507
 msgid "Overwrite"
 msgstr "Korvaa"
 
-#: ../pidgin/gtkrequest.c:1656
+#: ../pidgin/gtkrequest.c:1508
 msgid "Choose New Name"
 msgstr "Valitse uusi nimi"
 
-#: ../pidgin/gtkrequest.c:1797 ../pidgin/gtkrequest.c:1811
+#: ../pidgin/gtkrequest.c:1649 ../pidgin/gtkrequest.c:1663
 msgid "Select Folder..."
 msgstr "Valitse kansio..."
 
-#. Create the window.
-#: ../pidgin/gtkroomlist.c:518 ../pidgin/gtkroomlist.c:688
-msgid "Room List"
-msgstr "Huoneluettelo"
-
 #. list button
-#: ../pidgin/gtkroomlist.c:756
+#: ../pidgin/gtkroomlist.c:577
 msgid "_Get List"
 msgstr "_Hae luettelo"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:764
+#: ../pidgin/gtkroomlist.c:585
 msgid "_Add Chat"
 msgstr "_Lisää ryhmäkeskustelu"
 
@@ -16829,72 +17034,72 @@ msgstr "Haluatko varmasti poistaa valitu
 msgstr "Haluatko varmasti poistaa valitut tallennetut tilat?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1273
+#: ../pidgin/gtksavedstatuses.c:616 ../pidgin/gtksavedstatuses.c:1229
 msgid "_Use"
 msgstr "_Käytä"
 
-#: ../pidgin/gtksavedstatuses.c:780
+#: ../pidgin/gtksavedstatuses.c:765
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Otsikko on käytössä. Sinun täytyy valita yksilöllinen otsikko."
 
-#: ../pidgin/gtksavedstatuses.c:976
+#: ../pidgin/gtksavedstatuses.c:961
 msgid "Different"
 msgstr "Eriävyys"
 
-#: ../pidgin/gtksavedstatuses.c:1165
+#: ../pidgin/gtksavedstatuses.c:1153
 msgid "_Title:"
 msgstr "_Otsikko"
 
-#: ../pidgin/gtksavedstatuses.c:1184 ../pidgin/gtksavedstatuses.c:1505
+#: ../pidgin/gtksavedstatuses.c:1161 ../pidgin/gtksavedstatuses.c:1453
 msgid "_Status:"
 msgstr "_Tila:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1217
+#: ../pidgin/gtksavedstatuses.c:1177
 msgid "Use a _different status for some accounts"
 msgstr "Käytä eri tilaa joillekin käyttäjätileille"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1281
+#: ../pidgin/gtksavedstatuses.c:1236
 msgid "Sa_ve & Use"
 msgstr "Tallenna ja _käytä"
 
-#: ../pidgin/gtksavedstatuses.c:1488
+#: ../pidgin/gtksavedstatuses.c:1437
 #, c-format
 msgid "Status for %s"
 msgstr "%s:n tila"
 
-#: ../pidgin/gtkstatusbox.c:664
+#: ../pidgin/gtkstatusbox.c:683
 msgid "Waiting for network connection"
 msgstr "Odotetaan verkkoyhteyttä"
 
-#: ../pidgin/gtkstatusbox.c:1072
+#: ../pidgin/gtkstatusbox.c:1096
 msgid "New status..."
 msgstr "Uusi tila..."
 
-#: ../pidgin/gtkstatusbox.c:1073
+#: ../pidgin/gtkstatusbox.c:1097
 msgid "Saved statuses..."
 msgstr "Tallennetut tilat..."
 
-#: ../pidgin/gtkutils.c:634
+#: ../pidgin/gtkutils.c:683
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1424
+#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1473
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Seuraava virhe esiintyi ladattaessa komponenttia %s: %s"
 
-#: ../pidgin/gtkutils.c:1404 ../pidgin/gtkutils.c:1426
+#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1475
 msgid "Failed to load image"
 msgstr "Kuvan avaus epäonnistui"
 
-#: ../pidgin/gtkutils.c:1500
+#: ../pidgin/gtkutils.c:1549
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Kansiota %s ei voi lähettää."
 
-#: ../pidgin/gtkutils.c:1501
+#: ../pidgin/gtkutils.c:1550
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -16903,12 +17108,12 @@ msgstr ""
 "%s ei voi siirtää kansiota. Kansion sisältämät tiedostot täytyy lähettää "
 "erikseen."
 
-#: ../pidgin/gtkutils.c:1535 ../pidgin/gtkutils.c:1547
-#: ../pidgin/gtkutils.c:1554
+#: ../pidgin/gtkutils.c:1584 ../pidgin/gtkutils.c:1596
+#: ../pidgin/gtkutils.c:1603
 msgid "You have dragged an image"
 msgstr "Olet raahannut kuvan"
 
-#: ../pidgin/gtkutils.c:1536
+#: ../pidgin/gtkutils.c:1585
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -16916,23 +17121,23 @@ msgstr ""
 "Voit lähettää tämän kuvan tiedostonsiirtona, sisällyttää sen tähän viestiin "
 "tai käyttää sitä tuttavakuvakkeena tälle käyttäjälle."
 
-#: ../pidgin/gtkutils.c:1542 ../pidgin/gtkutils.c:1562
+#: ../pidgin/gtkutils.c:1591 ../pidgin/gtkutils.c:1611
 msgid "Set as buddy icon"
 msgstr "Aseta tuttavakuvakkeeksi"
 
-#: ../pidgin/gtkutils.c:1543 ../pidgin/gtkutils.c:1563
+#: ../pidgin/gtkutils.c:1592 ../pidgin/gtkutils.c:1612
 msgid "Send image file"
 msgstr "Lähetä kuvatiedosto"
 
-#: ../pidgin/gtkutils.c:1544 ../pidgin/gtkutils.c:1563
+#: ../pidgin/gtkutils.c:1593 ../pidgin/gtkutils.c:1612
 msgid "Insert in message"
 msgstr "Liitä viestiin"
 
-#: ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1597
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Haluatko asettaa sen tuttavakuvakkeeksi tälle käyttäjälle?"
 
-#: ../pidgin/gtkutils.c:1555
+#: ../pidgin/gtkutils.c:1604
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -16940,7 +17145,7 @@ msgstr ""
 "Voit lähettää tämän kuvan tiedostonsiirtona tai käyttää sitä "
 "tuttavakuvakkeena tälle käyttäjälle."
 
-#: ../pidgin/gtkutils.c:1556
+#: ../pidgin/gtkutils.c:1605
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -16953,11 +17158,11 @@ msgstr ""
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1615
+#: ../pidgin/gtkutils.c:1664
 msgid "Cannot send launcher"
 msgstr "Käynnistintä ei voi lähettää"
 
-#: ../pidgin/gtkutils.c:1615
+#: ../pidgin/gtkutils.c:1664
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -16965,7 +17170,7 @@ msgstr ""
 "Raahasit työpöytäkäynnistimen. Luultavasti halusit lähettää tiedoston johon "
 "käynnistin osoittaa, käynnistimen itsensä sijaan."
 
-#: ../pidgin/gtkutils.c:2350
+#: ../pidgin/gtkutils.c:2402
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16976,25 +17181,25 @@ msgstr ""
 "<b>Tiedoston koko:</b> %s\n"
 "<b>Kuvan koko:</b> %d × %d"
 
-#: ../pidgin/gtkutils.c:2646
+#: ../pidgin/gtkutils.c:2704
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "Tiedosto \"%s\" on liian suuri \"%s\":lle. Kokeile pienempää kuvaa.\n"
 
-#: ../pidgin/gtkutils.c:2648
+#: ../pidgin/gtkutils.c:2706
 msgid "Icon Error"
 msgstr "Kuvakevirhe"
 
-#: ../pidgin/gtkutils.c:2649
+#: ../pidgin/gtkutils.c:2707
 msgid "Could not set icon"
 msgstr "Kuvaketta ei voi asettaa"
 
-#: ../pidgin/gtkutils.c:2749
+#: ../pidgin/gtkutils.c:2807
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Tiedostoa \"%s\" ei voi avata: %s"
 
-#: ../pidgin/gtkutils.c:2798
+#: ../pidgin/gtkutils.c:2856
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -17012,7 +17217,7 @@ msgid "_Alias"
 
 #: ../pidgin/pidginstock.c:87
 msgid "_Alias"
-msgstr "_Alias"
+msgstr "_Lempinimi"
 
 #: ../pidgin/pidginstock.c:89
 msgid "Close _tabs"
@@ -17034,6 +17239,10 @@ msgstr "_Avaa sähköposti"
 msgid "_Open Mail"
 msgstr "_Avaa sähköposti"
 
+#: ../pidgin/pidgintooltip.c:100
+msgid "Pidgin Tooltip"
+msgstr "Pidgin-työkaluvihje"
+
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Pidgin-hymiöt"
@@ -17050,35 +17259,31 @@ msgstr "ei mitään"
 msgid "none"
 msgstr "ei mitään"
 
-#: ../pidgin/plugins/cap/cap.c:451
-msgid "Display Statistics"
-msgstr "Näytä tilastot"
-
-#: ../pidgin/plugins/cap/cap.c:464 ../pidgin/plugins/cap/cap.c:467
+#: ../pidgin/plugins/cap/cap.c:444 ../pidgin/plugins/cap/cap.c:447
 msgid "Response Probability:"
 msgstr "Vastaustodennäköisyys:"
 
-#: ../pidgin/plugins/cap/cap.c:813
+#: ../pidgin/plugins/cap/cap.c:772
 msgid "Statistics Configuration"
 msgstr "Tilastoinnin asetukset"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:816
+#: ../pidgin/plugins/cap/cap.c:775
 msgid "Maximum response timeout:"
 msgstr "Suurin vastauksen aikakatkaisu:"
 
-#: ../pidgin/plugins/cap/cap.c:819 ../pidgin/plugins/cap/cap.c:826
-#: ../pidgin/plugins/cap/cap.c:833 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:778 ../pidgin/plugins/cap/cap.c:785
+#: ../pidgin/plugins/cap/cap.c:792 ../pidgin/plugins/timestamp.c:148
 msgid "minutes"
 msgstr "minuuttia"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:823
+#: ../pidgin/plugins/cap/cap.c:782
 msgid "Maximum last-seen difference:"
 msgstr "Suurin viimeksi-nähty -arvon ero:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:830
+#: ../pidgin/plugins/cap/cap.c:789
 msgid "Threshold:"
 msgstr "Kynnys:"
 
@@ -17088,18 +17293,18 @@ msgstr "Kynnys:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:897
 msgid "Contact Availability Prediction"
 msgstr "Tuttavan paikallaolon ennustus"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:940
+#: ../pidgin/plugins/cap/cap.c:899
 msgid "Contact Availability Prediction plugin."
 msgstr "Tuttavan paikallaolon ennustava liitännäinen."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:941
+#: ../pidgin/plugins/cap/cap.c:900
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -17182,40 +17387,40 @@ msgstr "Aseta keskusteluikkunan värit"
 msgid "Customize colors in the conversation window"
 msgstr "Aseta keskusteluikkunan värit"
 
-#: ../pidgin/plugins/convcolors.c:82
+#: ../pidgin/plugins/convcolors.c:87
 msgid "Error Messages"
 msgstr "Virheilmoitukset"
 
-#: ../pidgin/plugins/convcolors.c:83
+#: ../pidgin/plugins/convcolors.c:88
 msgid "Highlighted Messages"
 msgstr "Korostetut"
 
-#: ../pidgin/plugins/convcolors.c:84
+#: ../pidgin/plugins/convcolors.c:89
 msgid "System Messages"
 msgstr "Järjestelmäviestit"
 
-#: ../pidgin/plugins/convcolors.c:85
+#: ../pidgin/plugins/convcolors.c:90
 msgid "Sent Messages"
 msgstr "Lähetetyt viestit"
 
-#: ../pidgin/plugins/convcolors.c:86
+#: ../pidgin/plugins/convcolors.c:91
 msgid "Received Messages"
 msgstr "Vastaanotetut viestit"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245
+#: ../pidgin/plugins/convcolors.c:223 ../pidgin/plugins/pidginrc.c:257
 #, c-format
 msgid "Select Color for %s"
 msgstr "Valitse %s:n väri"
 
-#: ../pidgin/plugins/convcolors.c:310
+#: ../pidgin/plugins/convcolors.c:372
 msgid "Ignore incoming format"
 msgstr "Älä välitä sisääntulevien viestien muotoiluista"
 
-#: ../pidgin/plugins/convcolors.c:311
+#: ../pidgin/plugins/convcolors.c:373
 msgid "Apply in Chats"
 msgstr "Käytä asetuksia ryhmäkeskusteluissa"
 
-#: ../pidgin/plugins/convcolors.c:312
+#: ../pidgin/plugins/convcolors.c:374
 msgid "Apply in IMs"
 msgstr "Käytä asetuksia pikaviesteissä"
 
@@ -17713,53 +17918,56 @@ msgstr ""
 "- Lähettää viestin listalla oleville tuttavillesi aina kun he kirjautuvat "
 "sisään"
 
-#: ../pidgin/plugins/pidginrc.c:41
+#: ../pidgin/plugins/pidginrc.c:49
 msgid "Cursor Color"
 msgstr "Kohdistimen väri"
 
-#: ../pidgin/plugins/pidginrc.c:42
+#: ../pidgin/plugins/pidginrc.c:50
 msgid "Secondary Cursor Color"
 msgstr "Toissijainen kohdistimen väri"
 
-#: ../pidgin/plugins/pidginrc.c:43
+#: ../pidgin/plugins/pidginrc.c:51
 msgid "Hyperlink Color"
 msgstr "Hyperlinkin väri"
 
 #: ../pidgin/plugins/pidginrc.c:54
+msgid "Highlighted Message Name Color"
+msgstr "Korostetun viestin nimen väri"
+
+#: ../pidgin/plugins/pidginrc.c:66
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView - leveyssuuntainen erotus"
 
-#: ../pidgin/plugins/pidginrc.c:69
+#: ../pidgin/plugins/pidginrc.c:81
 msgid "Conversation Entry"
 msgstr "Keskustelumerkintä"
 
-#: ../pidgin/plugins/pidginrc.c:70
+#: ../pidgin/plugins/pidginrc.c:82
 msgid "Request Dialog"
 msgstr "Pyyntövalintaikkuna"
 
-#: ../pidgin/plugins/pidginrc.c:71
+#: ../pidgin/plugins/pidginrc.c:83
 msgid "Notify Dialog"
 msgstr "Huomautusvalintaikunna"
 
-#: ../pidgin/plugins/pidginrc.c:247
+#: ../pidgin/plugins/pidginrc.c:259
 msgid "Select Color"
 msgstr "Valitse väri"
 
-#: ../pidgin/plugins/pidginrc.c:294
-#, c-format
+#: ../pidgin/plugins/pidginrc.c:306
 msgid "Select Interface Font"
 msgstr "Valitse käyttöliittymän kirjasin"
 
-#: ../pidgin/plugins/pidginrc.c:297
+#: ../pidgin/plugins/pidginrc.c:309
 #, c-format
 msgid "Select Font for %s"
 msgstr "Valitse %s:n kirjasin"
 
-#: ../pidgin/plugins/pidginrc.c:365
+#: ../pidgin/plugins/pidginrc.c:377
 msgid "GTK+ Interface Font"
 msgstr "GTK+-käyttöliittymän kirjasin"
 
-#: ../pidgin/plugins/pidginrc.c:385
+#: ../pidgin/plugins/pidginrc.c:397
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+-tekstioikopolkuteema"
 
@@ -17783,36 +17991,36 @@ msgstr "GTK+-tekstioikopolkuteema"
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:422
+#: ../pidgin/plugins/pidginrc.c:434
 msgid "Interface colors"
 msgstr "Käyttöliittymän värit"
 
-#: ../pidgin/plugins/pidginrc.c:446
+#: ../pidgin/plugins/pidginrc.c:458
 msgid "Widget Sizes"
 msgstr "Säädinkoot"
 
-#: ../pidgin/plugins/pidginrc.c:467
+#: ../pidgin/plugins/pidginrc.c:479
 msgid "Fonts"
 msgstr "Kirjasimet"
 
-#: ../pidgin/plugins/pidginrc.c:491
+#: ../pidgin/plugins/pidginrc.c:503
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc-tiedostotyökalut"
 
-#: ../pidgin/plugins/pidginrc.c:496
+#: ../pidgin/plugins/pidginrc.c:508
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Kirjoita asetukset tiedostoon %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:505
+#: ../pidgin/plugins/pidginrc.c:517
 msgid "Re-read gtkrc files"
 msgstr "Lue uudelleen gtkrc-tiedostot"
 
-#: ../pidgin/plugins/pidginrc.c:543
+#: ../pidgin/plugins/pidginrc.c:555
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+-teemanhallinta"
 
-#: ../pidgin/plugins/pidginrc.c:545 ../pidgin/plugins/pidginrc.c:546
+#: ../pidgin/plugins/pidginrc.c:557 ../pidgin/plugins/pidginrc.c:558
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Antaa pääsyn usein käytettyihin gtkrc-asetuksiin."
 
@@ -17887,62 +18095,62 @@ msgstr "Määritetty sana on jo korjausl
 msgid "The specified word already exists in the correction list."
 msgstr "Määritetty sana on jo korjauslistassa."
 
-#: ../pidgin/plugins/spellchk.c:2177
+#: ../pidgin/plugins/spellchk.c:2176
 msgid "Text Replacements"
 msgstr "Tekstin korvaus"
 
-#: ../pidgin/plugins/spellchk.c:2200
+#: ../pidgin/plugins/spellchk.c:2199
 msgid "You type"
 msgstr "Kirjoitettu"
 
-#: ../pidgin/plugins/spellchk.c:2214
+#: ../pidgin/plugins/spellchk.c:2213
 msgid "You send"
 msgstr "Lähetetty"
 
-#: ../pidgin/plugins/spellchk.c:2228
+#: ../pidgin/plugins/spellchk.c:2227
 msgid "Whole words only"
 msgstr "Vain kokonaiset sanat"
 
-#: ../pidgin/plugins/spellchk.c:2240
+#: ../pidgin/plugins/spellchk.c:2239
 msgid "Case sensitive"
 msgstr "Sama kirjainkoko"
 
-#: ../pidgin/plugins/spellchk.c:2266
+#: ../pidgin/plugins/spellchk.c:2265
 msgid "Add a new text replacement"
 msgstr "Lisää uusi korvausehto"
 
-#: ../pidgin/plugins/spellchk.c:2282
+#: ../pidgin/plugins/spellchk.c:2281
 msgid "You _type:"
 msgstr "_Kirjoitettu:"
 
-#: ../pidgin/plugins/spellchk.c:2299
+#: ../pidgin/plugins/spellchk.c:2285
 msgid "You _send:"
 msgstr "_Lähetetty:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2311
+#: ../pidgin/plugins/spellchk.c:2288
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr ""
 "_Ehdoton kirjainkoon täsmäys (poista valinta jos haluat automaattisen "
 "kirjainkoon hallinnan)"
 
-#: ../pidgin/plugins/spellchk.c:2313
+#: ../pidgin/plugins/spellchk.c:2290
 msgid "Only replace _whole words"
 msgstr "Korvaa vain _kokonaiset sanat"
 
-#: ../pidgin/plugins/spellchk.c:2338
+#: ../pidgin/plugins/spellchk.c:2315
 msgid "General Text Replacement Options"
 msgstr "Tekstin korvauksen yleiset valinnat"
 
-#: ../pidgin/plugins/spellchk.c:2339
+#: ../pidgin/plugins/spellchk.c:2316
 msgid "Enable replacement of last word on send"
 msgstr "Salli viimeisen sanan korvaus lähetettäessä"
 
-#: ../pidgin/plugins/spellchk.c:2372
+#: ../pidgin/plugins/spellchk.c:2349
 msgid "Text replacement"
 msgstr "Tekstin korvaus"
 
-#: ../pidgin/plugins/spellchk.c:2374 ../pidgin/plugins/spellchk.c:2375
+#: ../pidgin/plugins/spellchk.c:2351 ../pidgin/plugins/spellchk.c:2352
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Korvaa lähetettävän tekstin käyttäjän määritelmän mukaan."
 
@@ -17964,7 +18172,7 @@ msgstr "Vaakatasossa rullaava versio tut
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Vaakatasossa rullaava versio tuttavista."
 
-#: ../pidgin/plugins/timestamp.c:137
+#: ../pidgin/plugins/timestamp.c:135
 msgid "Display Timestamps Every"
 msgstr "Näytä aikaleimat joka"
 
@@ -17974,19 +18182,19 @@ msgstr "Näytä aikaleimat joka"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:202
+#: ../pidgin/plugins/timestamp.c:200
 msgid "Timestamp"
 msgstr "Aikaleima"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:205
+#: ../pidgin/plugins/timestamp.c:203
 msgid "Display iChat-style timestamps"
 msgstr "Näytä iChat-tyyliset aikaleimat"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:207
+#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "Näytä iChat-tyyliset aikaleimat N minuutin välein."
 
@@ -17995,7 +18203,6 @@ msgstr "Aikaleiman muotoiluasetukset"
 msgstr "Aikaleiman muotoiluasetukset"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Pakota 24 tunnin aikamuoto"
 
@@ -18219,6 +18426,61 @@ msgstr ""
 "Tätä liitännäistä voidaan käyttää XMPP-palvelimien tai -asiakasohjelmien "
 "virheenjäljitykseen."
 
+#~ msgid "Pounce only when my status is not available"
+#~ msgstr "Ilmoita vain kun tilani on \"tavoittamattomissa\""
+
+#~ msgid "Current media"
+#~ msgstr "Nykyinen media"
+
+#~ msgid ""
+#~ "Sorry, passwords over %d characters in length (yours is %d) are not "
+#~ "supported by MySpace."
+#~ msgstr ""
+#~ "Pahoittelut, MySpace ei tue salasanoja jotka ovat yli %d kirjainta pitkiä "
+#~ "(sinun on %d kirjainta)."
+
+#~ msgid ""
+#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+#~ "username and choose a username and try to login again."
+#~ msgstr ""
+#~ "Mene osoitteeseen http://editprofile.myspace.com/index.cfm?"
+#~ "fuseaction=profile.username ja valitse käyttäjänimesi. Kirjaudu sitten "
+#~ "uudestaan."
+
+#~ msgid "Invalid chat name specified."
+#~ msgstr "Virheellinen ryhmäkeskustelun nimi annettu."
+
+#~ msgid "Use recent buddies group"
+#~ msgstr "Käytä viimeaikaisten tuttavien ryhmää"
+
+#~ msgid "Show how long you have been idle"
+#~ msgstr "Näyttää kuinka kauan olet ollut jouten."
+
+#~ msgid ""
+#~ "Always use ICQ proxy server for file transfers\n"
+#~ "(slower, but does not reveal your IP address)"
+#~ msgstr ""
+#~ "Käytä aina ICQ-välipalvelinta tiedostonsiirroille\n"
+#~ "(hitaampi, mutta ei paljasta IP-osoitettasi)"
+
+#~ msgid "Cannot find/access ~/.silc directory"
+#~ msgstr "~/.silc-hakemistoa ei voi löytää/käyttää"
+
+#~ msgid "%s changed status from %s to %s"
+#~ msgstr "%s on vaihtanut tilasta %s tilaan %s"
+
+#~ msgid "%s is now %s"
+#~ msgstr "%s on nyt %s"
+
+#~ msgid "%s is no longer %s"
+#~ msgstr "%s ei ole enää %s"
+
+#~ msgid "User has typed something and stopped"
+#~ msgstr "Käyttäjä kirjoitti jotain ja keskeytti"
+
+#~ msgid "Display Statistics"
+#~ msgstr "Näytä tilastot"
+
 #~ msgid "There were errors unloading the plugin."
 #~ msgstr "Poistettaessa liitännäistä käytöstä tapahtui virheitä."
 
@@ -18378,9 +18640,6 @@ msgstr ""
 #~ msgid "Socket send error"
 #~ msgstr "Pistokkeen lähetysvirhe"
 
-#~ msgid "Connection refused"
-#~ msgstr "Yhteys torjuttu"
-
 #~ msgid "_Bold"
 #~ msgstr "_Lihavoi"
 
@@ -18606,9 +18865,6 @@ msgstr ""
 #~ msgid "GtkTreeView Indent Expanders"
 #~ msgstr "Sisennä laajentajat"
 
-#~ msgid "Pidgwin Options"
-#~ msgstr "Pidgwin-valinnat"
-
 #~ msgid "<span size='larger' weight='bold'>Welcome to "
 #~ msgstr "<span size='larger' weight='bold'>Tervetuloa "
 
@@ -18665,13 +18921,6 @@ msgstr ""
 #~ msgid "Pidgin encountered errors loading the plugin."
 #~ msgstr "Liitännäistä ladattaessa tapahtui virheitä."
 
-#~ msgid ""
-#~ "Always use AIM/ICQ proxy server for file transfers\n"
-#~ "(slower, but does not reveal your IP address)"
-#~ msgstr ""
-#~ "Käytä aina AIM/ICQ-välipalvelinta tiedostonsiirroille\n"
-#~ "(hitaampi, mutta ei paljasta IP-osoitettasi)"
-
 #~ msgid "SNAC threw error: %s\n"
 #~ msgstr "SNAC antoi virheen: %s\n"
 
@@ -18821,13 +19070,6 @@ msgstr ""
 #~ msgid "Client:"
 #~ msgstr "Asiakasohjelma:"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-
 #~ msgid "<b>Alias:</b> %s<br>"
 #~ msgstr "<b>Alias:</b> %s<br>"
 
@@ -18976,9 +19218,6 @@ msgstr ""
 #~ msgid "Please wait for new version"
 #~ msgstr "Odota uutta versiota"
 
-#~ msgid "Message (optional) :"
-#~ msgstr "Viesti (valinnainen) :"
-
 #~ msgid "Invalid username."
 #~ msgstr "Epäkelpo käyttäjänimi."
 
@@ -19219,9 +19458,6 @@ msgstr ""
 #~ msgid "Re-type Passphrase"
 #~ msgstr "Kirjoita salasana uudelleen"
 
-#~ msgid "%s came back"
-#~ msgstr "%s palasi"
-
 #~ msgid "%s went away"
 #~ msgstr "%s on poissa"
 
@@ -19318,9 +19554,6 @@ msgstr ""
 #~ msgid "GtkTreeView Expander Indentation"
 #~ msgstr "GtkTreeView - laajentajan sisennys"
 
-#~ msgid "Conversation in %s on %s"
-#~ msgstr "Keskustelu paikassa %s aiheesta %s"
-
 #~ msgid ""
 #~ "Pidgin has segfaulted and attempted to dump a core file.\n"
 #~ "This is a bug in the software and has happened through\n"


More information about the Commits mailing list