changeset 22534:13275974efbf

Update fi.po for Pidgin 2.4.1.
author Timo Jyrinki <timo.jyrinki@iki.fi>
date Tue, 25 Mar 2008 09:08:25 +0000
parents fe7f6fffc02d
children 042284a7c9f3 95230b5572c8
files po/fi.po
diffstat 1 files changed, 2305 insertions(+), 2176 deletions(-) [+]
line wrap: on
line diff
--- a/po/fi.po	Tue Mar 25 08:42:23 2008 +0000
+++ b/po/fi.po	Tue Mar 25 09:08:25 2008 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-26 03:22-0500\n"
-"PO-Revision-Date: 2008-02-26 16:48+0200\n"
+"POT-Creation-Date: 2008-03-25 10:56+0200\n"
+"PO-Revision-Date: 2008-03-25 11:07+0200\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -52,7 +52,7 @@
 "  -n, --nologin       älä kirjaudu automaattisesti\n"
 "  -v, --version       näytä nykyinen versionumero ja poistu\n"
 
-#: ../finch/finch.c:327 ../pidgin/gtkmain.c:743
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:737
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -68,13 +68,13 @@
 #: ../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:2036
+#: ../libpurple/protocols/jabber/buddy.c:2079
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1594
 #: ../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
+#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:76
+#: ../libpurple/protocols/silc/ops.c:1475
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Virhe"
@@ -104,7 +104,7 @@
 msgstr "(Unohdit luultavasti suorittaa \"make install\".)"
 
 #: ../finch/gntaccount.c:496 ../finch/gntconn.c:138
-#: ../pidgin/gtkaccount.c:1447 ../pidgin/gtkblist.c:4542
+#: ../pidgin/gtkaccount.c:1447 ../pidgin/gtkblist.c:4588
 msgid "Modify Account"
 msgstr "Muokkaa tiliä"
 
@@ -117,7 +117,7 @@
 msgstr "Yhteyskäytäntö:"
 
 #: ../finch/gntaccount.c:529
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:294
 msgid "Screen name:"
 msgstr "Näyttönimi:"
 
@@ -134,37 +134,37 @@
 #: ../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/gntblist.c:1437 ../finch/gntblist.c:2604 ../finch/gntblist.c:2655
+#: ../finch/gntblist.c:2719 ../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/gntsound.c:1064 ../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/account.c:1118 ../libpurple/account.c:1421
+#: ../libpurple/account.c:1456 ../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/buddy.c:758
+#: ../libpurple/protocols/jabber/buddy.c:2473
+#: ../libpurple/protocols/jabber/buddy.c:2509
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1053
-#: ../libpurple/protocols/jabber/jabber.c:1062
-#: ../libpurple/protocols/jabber/jabber.c:1777
+#: ../libpurple/protocols/jabber/jabber.c:1063
+#: ../libpurple/protocols/jabber/jabber.c:1072
+#: ../libpurple/protocols/jabber/jabber.c:1787
 #: ../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: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/jabber/xdata.c:403
+#: ../libpurple/protocols/msn/msn.c:301 ../libpurple/protocols/msn/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:335 ../libpurple/protocols/msn/msn.c:352
+#: ../libpurple/protocols/msn/msn.c:373 ../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/oscar.c:6223
 #: ../libpurple/protocols/oscar/peer.c:1048
 #: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -177,18 +177,18 @@
 #: ../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/sametime/sametime.c:3439
+#: ../libpurple/protocols/sametime/sametime.c:3525
+#: ../libpurple/protocols/sametime/sametime.c:3699
+#: ../libpurple/protocols/sametime/sametime.c:5452
+#: ../libpurple/protocols/sametime/sametime.c:5542
+#: ../libpurple/protocols/sametime/sametime.c:5667
 #: ../libpurple/protocols/silc/buddy.c:455
 #: ../libpurple/protocols/silc/buddy.c:1079
 #: ../libpurple/protocols/silc/buddy.c:1194
 #: ../libpurple/protocols/silc/chat.c:620
 #: ../libpurple/protocols/silc/chat.c:750
-#: ../libpurple/protocols/silc/ops.c:1820
+#: ../libpurple/protocols/silc/ops.c:1835
 #: ../libpurple/protocols/silc/silc.c:966
 #: ../libpurple/protocols/silc/silc.c:1174
 #: ../libpurple/protocols/silc10/buddy.c:468
@@ -200,17 +200,17 @@
 #: ../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
+#: ../libpurple/protocols/yahoo/yahoo.c:3560
+#: ../libpurple/protocols/yahoo/yahoo.c:3571 ../pidgin/gtkaccount.c:1841
+#: ../pidgin/gtkaccount.c:2402 ../pidgin/gtkblist.c:6796
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:766
+#: ../pidgin/gtkdialogs.c:905 ../pidgin/gtkdialogs.c:997
+#: ../pidgin/gtkdialogs.c:1017 ../pidgin/gtkdialogs.c:1041
+#: ../pidgin/gtkdialogs.c:1063 ../pidgin/gtkdialogs.c:1111
+#: ../pidgin/gtkdialogs.c:1152 ../pidgin/gtkdialogs.c:1208
+#: ../pidgin/gtkdialogs.c:1247 ../pidgin/gtkdialogs.c:1274
 #: ../pidgin/gtkimhtmltoolbar.c:438 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkplugin.c:290 ../pidgin/gtkpounce.c:1113
+#: ../pidgin/gtkplugin.c:294 ../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
@@ -222,9 +222,9 @@
 #. Save
 #: ../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
+#: ../finch/gntsound.c:1061 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
+#: ../libpurple/account.c:1455 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:757 ../pidgin/gtkdebug.c:746
 #: ../pidgin/gtkrequest.c:279
 msgid "Save"
 msgstr "Tallenna"
@@ -249,7 +249,7 @@
 msgid "Delete"
 msgstr "Poista"
 
-#: ../finch/gntaccount.c:670 ../finch/gntblist.c:2469 ../finch/gntui.c:94
+#: ../finch/gntaccount.c:670 ../finch/gntblist.c:2471 ../finch/gntui.c:94
 #: ../pidgin/gtkaccount.c:2261 ../pidgin/gtkdocklet.c:716
 msgid "Accounts"
 msgstr "Käyttäjätilit"
@@ -261,16 +261,16 @@
 
 #. Add button
 #: ../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/gntblist.c:698 ../finch/gntblist.c:733 ../finch/gntblist.c:2823
 #: ../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/sametime/sametime.c:5541
 #: ../libpurple/protocols/silc/chat.c:619
 #: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2401
-#: ../pidgin/gtkblist.c:6767 ../pidgin/gtkconv.c:1702
+#: ../pidgin/gtkblist.c:6795 ../pidgin/gtkconv.c:1696
 #: ../pidgin/gtkrequest.c:277
 msgid "Add"
 msgstr "Lisää"
@@ -358,8 +358,8 @@
 msgid "Error adding buddy"
 msgstr "Virhe lisättäessä tuttavaa"
 
-#: ../finch/gntblist.c:601 ../libpurple/protocols/oscar/oscar.c:2949
-#: ../pidgin/gtkaccount.c:1914 ../pidgin/gtksavedstatuses.c:971
+#: ../finch/gntblist.c:601 ../pidgin/gtkaccount.c:1914
+#: ../pidgin/gtksavedstatuses.c:971
 msgid "Screen Name"
 msgstr "Näyttönimi"
 
@@ -372,11 +372,11 @@
 msgstr "Lisää ryhmään"
 
 #: ../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/gntblist.c:2585 ../finch/gntblist.c:2641 ../finch/gntblist.c:2706
 #: ../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
+#: ../pidgin/gtkblist.c:3237 ../pidgin/gtknotify.c:517
+#: ../pidgin/gtkpounce.c:1281 ../pidgin/plugins/gevolution/gevolution.c:447
 msgid "Account"
 msgstr "Tili"
 
@@ -389,8 +389,8 @@
 #: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/buddy.c:1083
 #: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/yahoo.c:3380 ../pidgin/gtkblist.c:6298
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
+#: ../libpurple/protocols/yahoo/yahoo.c:3400 ../pidgin/gtkblist.c:6344
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:449
 msgid "Add Buddy"
 msgstr "Lisää tuttava"
 
@@ -403,15 +403,15 @@
 msgstr "Ryhmäkeskustelut"
 
 #. Extract their Name and put it in
-#: ../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
+#: ../finch/gntblist.c:684 ../finch/gntblist.c:2580 ../finch/gntblist.c:2636
+#: ../finch/gntroomlist.c:298 ../libpurple/protocols/jabber/jabber.c:991
+#: ../libpurple/protocols/jabber/jabber.c:994
+#: ../libpurple/protocols/msn/msn.c:1754 ../libpurple/protocols/msn/msn.c:1819
+#: ../libpurple/protocols/msn/msn.c:1846
+#: ../libpurple/protocols/msnp9/msn.c:1595
+#: ../libpurple/protocols/msnp9/msn.c:1660
+#: ../libpurple/protocols/msnp9/msn.c:1687
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:656
 #: ../pidgin/gtkroomlist.c:749
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
@@ -419,19 +419,19 @@
 msgstr "Nimi"
 
 #: ../finch/gntblist.c:687 ../finch/gntblist.c:1589
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1573
 #: ../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
+#: ../libpurple/protocols/zephyr/zephyr.c:1167 ../pidgin/gtkdialogs.c:1016
+#: ../pidgin/gtkdialogs.c:1040 ../pidgin/gtkdialogs.c:1062
 #: ../pidgin/gtkrequest.c:280
 msgid "Alias"
 msgstr "Lempinimi"
 
-#: ../finch/gntblist.c:690 ../finch/gntblist.c:2835
+#: ../finch/gntblist.c:690 ../finch/gntblist.c:2839
 msgid "Group"
 msgstr "Ryhmä"
 
@@ -439,7 +439,7 @@
 msgid "Auto-join"
 msgstr "Liity automaattisesti"
 
-#: ../finch/gntblist.c:696 ../finch/gntblist.c:1128 ../pidgin/gtkblist.c:6681
+#: ../finch/gntblist.c:696 ../finch/gntblist.c:1128 ../pidgin/gtkblist.c:6709
 msgid "Add Chat"
 msgstr "Lisää ryhmäkeskustelu"
 
@@ -460,8 +460,8 @@
 msgstr "Valitun niminen ryhmä on jo olemassa"
 
 #: ../finch/gntblist.c:731 ../finch/gntblist.c:1130
-#: ../libpurple/protocols/sametime/sametime.c:5450
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtkblist.c:6764
+#: ../libpurple/protocols/sametime/sametime.c:5451
+#: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtkblist.c:6792
 msgid "Add Group"
 msgstr "Lisää ryhmä"
 
@@ -506,13 +506,13 @@
 #. if (q_bud && is_online(q_bud->status)) {
 #: ../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
+#: ../libpurple/protocols/oscar/oscar.c:655 ../libpurple/protocols/qq/qq.c:588
+#: ../pidgin/gtkconv.c:1644
 msgid "Send File"
 msgstr "Lähetä tiedosto"
 
 #: ../finch/gntblist.c:1210 ../libpurple/protocols/gg/gg.c:1629
-#: ../libpurple/protocols/msn/msn.c:660 ../libpurple/protocols/msnp9/msn.c:562
+#: ../libpurple/protocols/msn/msn.c:674 ../libpurple/protocols/msnp9/msn.c:562
 msgid "Blocked"
 msgstr "Estetty"
 
@@ -556,14 +556,14 @@
 msgstr "Vahvista poistaminen"
 
 #: ../finch/gntblist.c:1436 ../finch/gntblist.c:1591 ../finch/gntft.c:243
-#: ../pidgin/gtkconv.c:1699 ../pidgin/gtkrequest.c:278
+#: ../pidgin/gtkconv.c:1693 ../pidgin/gtkrequest.c:278
 #: ../pidgin/gtkstatusbox.c:267
 msgid "Remove"
 msgstr "Poista"
 
 #. Buddy List
-#: ../finch/gntblist.c:1565 ../finch/gntblist.c:2876 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:95 ../pidgin/gtkblist.c:5037
+#: ../finch/gntblist.c:1565 ../finch/gntblist.c:2880 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:95 ../pidgin/gtkblist.c:5083
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Tuttavat"
@@ -580,46 +580,46 @@
 #: ../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: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/jabber/buddy.c:314
+#: ../libpurple/protocols/jabber/buddy.c:1284
+#: ../libpurple/protocols/jabber/buddy.c:2264
+#: ../libpurple/protocols/jabber/buddy.c:2456
+#: ../libpurple/protocols/jabber/jabber.c:1002
+#: ../libpurple/protocols/jabber/jabber.c:1614
+#: ../libpurple/protocols/jabber/jabber.c:1628
+#: ../libpurple/protocols/jabber/jabber.c:1642
+#: ../libpurple/protocols/jabber/jabber.c:1656
+#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/msn/msn.c:1581 ../libpurple/protocols/msn/msn.c:1757
 #: ../libpurple/protocols/msnp9/msn.c:1421
-#: ../libpurple/protocols/msnp9/msn.c:1599
+#: ../libpurple/protocols/msnp9/msn.c:1598
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1538
-#: ../libpurple/protocols/silc/ops.c:1002
-#: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1324
+#: ../libpurple/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:1201
+#: ../libpurple/protocols/silc/ops.c:1339
 #: ../libpurple/protocols/silc10/buddy.c:1538
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072 ../pidgin/gtkblist.c:3225
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1073 ../pidgin/gtkblist.c:3261
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
 #. Idle stuff
 #: ../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/jabber/buddy.c:817
+#: ../libpurple/protocols/jabber/buddy.c:981
+#: ../libpurple/protocols/msn/msn.c:621 ../libpurple/protocols/msn/msn.c:639
+#: ../libpurple/protocols/msn/msn.c:647 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/msnp9/msn.c:541
 #: ../libpurple/protocols/msnp9/state.c:32
 #: ../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
+#: ../libpurple/protocols/oscar/oscar.c:2980
+#: ../libpurple/protocols/yahoo/yahoo.c:3154
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3289
+#: ../pidgin/gtkblist.c:3749 ../pidgin/gtkprefs.c:1946
 msgid "Idle"
 msgstr "Jouten"
 
@@ -627,32 +627,32 @@
 msgid "On Mobile"
 msgstr "Liikkeellä"
 
-#: ../finch/gntblist.c:1976 ../pidgin/gtkdocklet.c:582
+#: ../finch/gntblist.c:1978 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "Uusi..."
 
-#: ../finch/gntblist.c:1983 ../pidgin/gtkdocklet.c:583
+#: ../finch/gntblist.c:1985 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "Tallennettu..."
 
-#: ../finch/gntblist.c:2437 ../finch/gntplugin.c:352 ../finch/gntui.c:100
-#: ../pidgin/gtkdocklet.c:717 ../pidgin/gtkplugin.c:601
+#: ../finch/gntblist.c:2439 ../finch/gntplugin.c:352 ../finch/gntui.c:100
+#: ../pidgin/gtkdocklet.c:717 ../pidgin/gtkplugin.c:605
 msgid "Plugins"
 msgstr "Liitännäiset"
 
-#: ../finch/gntblist.c:2591 ../finch/gntblist.c:2596
+#: ../finch/gntblist.c:2593 ../finch/gntblist.c:2598
 msgid "Block/Unblock"
 msgstr "Estä/poista esto"
 
-#: ../finch/gntblist.c:2592 ../libpurple/protocols/gg/gg.c:1665
+#: ../finch/gntblist.c:2594 ../libpurple/protocols/gg/gg.c:1665
 msgid "Block"
 msgstr "Estä"
 
-#: ../finch/gntblist.c:2593 ../libpurple/protocols/gg/gg.c:1661
+#: ../finch/gntblist.c:2595 ../libpurple/protocols/gg/gg.c:1661
 msgid "Unblock"
 msgstr "Poista esto"
 
-#: ../finch/gntblist.c:2598
+#: ../finch/gntblist.c:2600
 msgid ""
 "Please enter the screen name or alias of the person you would like to Block/"
 "Unblock."
@@ -663,29 +663,29 @@
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2601 ../finch/gntblist.c:2650 ../finch/gntcertmgr.c:89
+#: ../finch/gntblist.c:2603 ../finch/gntblist.c:2654 ../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
+#: ../finch/plugins/gnthistory.c:177 ../libpurple/account.c:1117
+#: ../libpurple/account.c:1420 ../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:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/jabber/jabber.c:1786
+#: ../libpurple/protocols/jabber/xdata.c:402
+#: ../libpurple/protocols/msn/msn.c:300 ../libpurple/protocols/msn/msn.c:317
+#: ../libpurple/protocols/msn/msn.c:334 ../libpurple/protocols/msn/msn.c:351
 #: ../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/oscar/oscar.c:6222
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1193
 #: ../libpurple/protocols/silc/chat.c:449
 #: ../libpurple/protocols/silc/chat.c:486
 #: ../libpurple/protocols/silc/chat.c:749
-#: ../libpurple/protocols/silc/ops.c:1293
-#: ../libpurple/protocols/silc/ops.c:1819
+#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc/ops.c:1834
 #: ../libpurple/protocols/silc/silc.c:965
 #: ../libpurple/protocols/silc10/buddy.c:467
 #: ../libpurple/protocols/silc10/buddy.c:1191
@@ -696,98 +696,98 @@
 #: ../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
+#: ../libpurple/protocols/yahoo/yahoo.c:3559
+#: ../libpurple/protocols/yahoo/yahoo.c:3570 ../pidgin/gtkcertmgr.c:195
+#: ../pidgin/gtkdialogs.c:765 ../pidgin/gtkdialogs.c:904
+#: ../pidgin/gtkdialogs.c:996 ../pidgin/gtkrequest.c:272
 msgid "OK"
 msgstr "OK"
 
-#: ../finch/gntblist.c:2645 ../pidgin/gtkdialogs.c:759
+#: ../finch/gntblist.c:2649 ../pidgin/gtkdialogs.c:760
 msgid "New Instant Message"
 msgstr "Uusi pikaviesti"
 
-#: ../finch/gntblist.c:2647 ../pidgin/gtkdialogs.c:761
+#: ../finch/gntblist.c:2651 ../pidgin/gtkdialogs.c:762
 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
+#: ../finch/gntblist.c:2702
 msgid "Channel"
 msgstr "Kanava"
 
-#: ../finch/gntblist.c:2710 ../pidgin/gtkblist.c:951
+#: ../finch/gntblist.c:2714 ../pidgin/gtkblist.c:962
 msgid "Join a Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../finch/gntblist.c:2712
+#: ../finch/gntblist.c:2716
 msgid "Please enter the name of the chat you want to join."
 msgstr "Syötä liityttävän ryhmäkeskustelun nimi."
 
-#: ../finch/gntblist.c:2714 ../finch/gntnotify.c:394
+#: ../finch/gntblist.c:2718 ../finch/gntnotify.c:394
 msgid "Join"
 msgstr "Liity"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2759 ../finch/gntpounce.c:459 ../pidgin/gtkpounce.c:802
+#: ../finch/gntblist.c:2763 ../finch/gntpounce.c:459 ../pidgin/gtkpounce.c:802
 msgid "Options"
 msgstr "Valinnat"
 
-#: ../finch/gntblist.c:2765
+#: ../finch/gntblist.c:2769
 msgid "Send IM..."
 msgstr "Lähetä pikaviesti..."
 
-#: ../finch/gntblist.c:2770
+#: ../finch/gntblist.c:2774
 msgid "Block/Unblock..."
 msgstr "Estä/poista esto..."
 
-#: ../finch/gntblist.c:2775
+#: ../finch/gntblist.c:2779
 msgid "Join Chat..."
 msgstr "Liity ryhmäkeskusteluun..."
 
-#: ../finch/gntblist.c:2780
+#: ../finch/gntblist.c:2784
 msgid "Show"
 msgstr "Näytä"
 
-#: ../finch/gntblist.c:2785
+#: ../finch/gntblist.c:2789
 msgid "Empty groups"
 msgstr "Tyhjät ryhmät"
 
-#: ../finch/gntblist.c:2792
+#: ../finch/gntblist.c:2796
 msgid "Offline buddies"
 msgstr "Poissa linjoilta olevat tuttavat"
 
-#: ../finch/gntblist.c:2799
+#: ../finch/gntblist.c:2803
 msgid "Sort"
 msgstr "Lajittele"
 
-#: ../finch/gntblist.c:2804
+#: ../finch/gntblist.c:2808
 msgid "By Status"
 msgstr "Tilan mukaan"
 
-#: ../finch/gntblist.c:2809 ../pidgin/gtkblist.c:4194
+#: ../finch/gntblist.c:2813 ../pidgin/gtkblist.c:4240
 msgid "Alphabetically"
 msgstr "Aakkosittain"
 
-#: ../finch/gntblist.c:2814
+#: ../finch/gntblist.c:2818
 msgid "By Log Size"
 msgstr "Lokin koon mukaan"
 
-#: ../finch/gntblist.c:2825
+#: ../finch/gntblist.c:2829
 msgid "Buddy"
 msgstr "Tuttava"
 
-#: ../finch/gntblist.c:2830 ../libpurple/protocols/oscar/oscar.c:647
+#: ../finch/gntblist.c:2834 ../libpurple/protocols/oscar/oscar.c:649
 #: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/util.c:563
 #: ../libpurple/protocols/silc10/silc.c:685
-#: ../libpurple/protocols/silc10/util.c:549
+#: ../libpurple/protocols/silc10/util.c:553
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: ../finch/gntblist.c:2840 ../finch/plugins/grouping.c:255
+#: ../finch/gntblist.c:2844 ../finch/plugins/grouping.c:255
 msgid "Grouping"
 msgstr "Ryhmittely"
 
@@ -887,7 +887,7 @@
 msgid "Hostname"
 msgstr "Isäntä"
 
-#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1678
+#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1672
 #: ../pidgin/gtkdebug.c:832
 msgid "Info"
 msgstr "Tiedot"
@@ -896,7 +896,7 @@
 #: ../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/msn/msn.c:417 ../libpurple/protocols/msnp9/msn.c:400
 #: ../libpurple/protocols/silc/util.c:388
 #: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2375
 #: ../pidgin/gtkrequest.c:275
@@ -977,7 +977,7 @@
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:296 ../finch/gntconv.c:880 ../pidgin/gtkconv.c:3474
+#: ../finch/gntconv.c:296 ../finch/gntconv.c:882 ../pidgin/gtkconv.c:3470
 #, c-format
 msgid ""
 "\n"
@@ -990,12 +990,12 @@
 msgid "You have left this chat."
 msgstr "Olet poistunut tästä keskustelusta."
 
-#: ../finch/gntconv.c:433 ../pidgin/gtkconv.c:1384
+#: ../finch/gntconv.c:433 ../pidgin/gtkconv.c:1378
 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:437 ../pidgin/gtkconv.c:1392
+#: ../finch/gntconv.c:437 ../pidgin/gtkconv.c:1386
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
@@ -1034,24 +1034,24 @@
 msgid "Enable Sounds"
 msgstr "Ota äänet käyttöön"
 
-#: ../finch/gntconv.c:833
+#: ../finch/gntconv.c:835
 msgid "<AUTO-REPLY> "
 msgstr "<AUTOMAATTIVASTAUS> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:968
+#: ../finch/gntconv.c:970
 msgid "List of users:\n"
 msgstr "Luettelo käyttäjistä:\n"
 
-#: ../finch/gntconv.c:1130 ../pidgin/gtkconv.c:337
+#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:337
 msgid "Supported debug options are:  version"
 msgstr "Tuetut vianjäljitysvalinnat ovat: versio"
 
-#: ../finch/gntconv.c:1166 ../pidgin/gtkconv.c:389
+#: ../finch/gntconv.c:1168 ../pidgin/gtkconv.c:389
 msgid "No such command (in this context)."
 msgstr "Komento ei saatavilla (tässä kontekstissa)."
 
-#: ../finch/gntconv.c:1169 ../pidgin/gtkconv.c:392
+#: ../finch/gntconv.c:1171 ../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"
@@ -1059,7 +1059,7 @@
 "Kirjoita \"/help &lt;komento&gt;\" saadaksesi ohjeen tietystä komennosta.\n"
 "Seuraavat komennot ovat saatavilla tässä kontekstissa:\n"
 
-#: ../finch/gntconv.c:1242 ../pidgin/gtkconv.c:7773
+#: ../finch/gntconv.c:1244 ../pidgin/gtkconv.c:7769
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -1067,56 +1067,56 @@
 "say &lt;viesti&gt;: Lähetä viesti normaalisti, niin kuin et olisi "
 "käyttämässä komentoa."
 
-#: ../finch/gntconv.c:1245 ../pidgin/gtkconv.c:7776
+#: ../finch/gntconv.c:1247 ../pidgin/gtkconv.c:7772
 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:1248 ../pidgin/gtkconv.c:7779
+#: ../finch/gntconv.c:1250 ../pidgin/gtkconv.c:7775
 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:1251 ../pidgin/gtkconv.c:7782
+#: ../finch/gntconv.c:1253 ../pidgin/gtkconv.c:7778
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Tyhjentää keskustelun"
 
-#: ../finch/gntconv.c:1254 ../pidgin/gtkconv.c:7788
+#: ../finch/gntconv.c:1256 ../pidgin/gtkconv.c:7784
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;komento&gt;: Ohje tietylle komennolle."
 
-#: ../finch/gntconv.c:1257
+#: ../finch/gntconv.c:1259
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Näytä luettelo keskustelussa olevista käyttäjistä"
 
-#: ../finch/gntconv.c:1262
+#: ../finch/gntconv.c:1264
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Näytä liitännäiset-ikkuna."
 
-#: ../finch/gntconv.c:1265
+#: ../finch/gntconv.c:1267
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Näytä tuttavaluettelo."
 
-#: ../finch/gntconv.c:1268
+#: ../finch/gntconv.c:1270
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Näytä käyttäjätilit-ikkuna."
 
-#: ../finch/gntconv.c:1271
+#: ../finch/gntconv.c:1273
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Näytä virheenjäljitysikkuna."
 
-#: ../finch/gntconv.c:1274
+#: ../finch/gntconv.c:1276
 msgid "prefs: Show the preference window."
 msgstr "prefs: Näytä asetukset-ikkuna."
 
-#: ../finch/gntconv.c:1277
+#: ../finch/gntconv.c:1279
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Näytä tallennetut tilat -ikkuna"
 
-#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:948 ../pidgin/gtkconv.c:2656
+#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:942 ../pidgin/gtkconv.c:2652
 #: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
 msgid "Unable to open file."
 msgstr "Tiedoston avaaminen epäonnistui."
@@ -1177,23 +1177,23 @@
 #: ../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: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/jabber/buddy.c:808
+#: ../libpurple/protocols/jabber/buddy.c:812
+#: ../libpurple/protocols/jabber/buddy.c:971
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/msn/msn.c:631 ../libpurple/protocols/msn/msn.c:641
+#: ../libpurple/protocols/msn/msn.c:646 ../libpurple/protocols/msn/msn.c:649
 #: ../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:822
 #: ../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
+#: ../libpurple/protocols/oscar/oscar.c:829
+#: ../libpurple/protocols/oscar/oscar.c:2768
+#: ../libpurple/protocols/oscar/oscar.c:3827
+#: ../libpurple/protocols/sametime/sametime.c:3314
+#: ../libpurple/protocols/sametime/sametime.c:4205
+#: ../libpurple/protocols/yahoo/yahoo.c:3305 ../pidgin/gtkblist.c:3333
+#: ../pidgin/gtkblist.c:3347 ../pidgin/gtkblist.c:3349
 #: ../pidgin/gtksavedstatuses.c:990 ../pidgin/gtksavedstatuses.c:1134
 msgid "Status"
 msgstr "Tila"
@@ -1233,7 +1233,7 @@
 msgstr "Tiedosto tallennettiin nimellä %s."
 
 #: ../finch/gntft.c:446 ../finch/gntft.c:447 ../pidgin/gtkft.c:160
-#: ../pidgin/gtkft.c:1077
+#: ../pidgin/gtkft.c:1080
 msgid "Finished"
 msgstr "Valmis"
 
@@ -1297,13 +1297,13 @@
 msgid "Conversations in %s"
 msgstr "Keskustelut paikassa %s"
 
-#: ../finch/gntlog.c:390 ../finch/gntlog.c:447 ../pidgin/gtklog.c:724
+#: ../finch/gntlog.c:390 ../finch/gntlog.c:448 ../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
+#: ../finch/gntlog.c:473 ../pidgin/gtklog.c:824
 msgid "System Log"
 msgstr "Järjestelmäloki"
 
@@ -1348,11 +1348,11 @@
 msgid "Continue"
 msgstr "Jatka"
 
-#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1639
+#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1633
 msgid "IM"
 msgstr "Pikaviesti"
 
-#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3523
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3524
 msgid "Invite"
 msgstr "Kutsu"
 
@@ -1614,6 +1614,7 @@
 msgstr "%s on lähettämässä sinulle viestiä. (%s)"
 
 #: ../finch/gntpounce.c:845 ../pidgin/gtkpounce.c:1455
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Tuntematon ilmoitinviesti. Raportoi tästä!"
 
@@ -1757,56 +1758,56 @@
 msgid "Someone says your screen name in chat"
 msgstr "Joku sanoo kutsumanimesi ryhmäkeskustelussa"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:306
+#: ../finch/gntsound.c:367 ../pidgin/gtksound.c:309
 msgid "GStreamer Failure"
 msgstr "GStreamer-virhe"
 
-#: ../finch/gntsound.c:363 ../pidgin/gtksound.c:307
+#: ../finch/gntsound.c:368 ../pidgin/gtksound.c:310
 msgid "GStreamer failed to initialize."
 msgstr "GStreameria ei voi alustaa."
 
-#: ../finch/gntsound.c:717 ../finch/gntsound.c:803 ../pidgin/gtkprefs.c:1631
+#: ../finch/gntsound.c:722 ../finch/gntsound.c:808 ../pidgin/gtkprefs.c:1631
 #: ../pidgin/gtkprefs.c:1720 ../pidgin/gtkprefs.c:1893
 msgid "(default)"
 msgstr "(oletus)"
 
-#: ../finch/gntsound.c:730
+#: ../finch/gntsound.c:735
 msgid "Select Sound File ..."
 msgstr "Valitse äänitiedosto..."
 
-#: ../finch/gntsound.c:905
+#: ../finch/gntsound.c:910
 msgid "Sound Preferences"
 msgstr "Ääniasetukset"
 
-#: ../finch/gntsound.c:916
+#: ../finch/gntsound.c:921
 msgid "Profiles"
 msgstr "Profiilit"
 
-#: ../finch/gntsound.c:955 ../pidgin/gtkprefs.c:1758
+#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1758
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: ../finch/gntsound.c:958
+#: ../finch/gntsound.c:963
 msgid "Console Beep"
 msgstr "Konsoliäänimerkki"
 
-#: ../finch/gntsound.c:959 ../pidgin/gtkprefs.c:1762
+#: ../finch/gntsound.c:964 ../pidgin/gtkprefs.c:1762
 msgid "Command"
 msgstr "Komento"
 
-#: ../finch/gntsound.c:960
+#: ../finch/gntsound.c:965
 msgid "No Sound"
 msgstr "Ei ääntä"
 
-#: ../finch/gntsound.c:962 ../pidgin/gtkprefs.c:1753
+#: ../finch/gntsound.c:967 ../pidgin/gtkprefs.c:1753
 msgid "Sound Method"
 msgstr "Äänimenetelmä"
 
-#: ../finch/gntsound.c:967
+#: ../finch/gntsound.c:972
 msgid "Method: "
 msgstr "Menetelmä: "
 
-#: ../finch/gntsound.c:974
+#: ../finch/gntsound.c:979
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1816,55 +1817,55 @@
 "(%s tiedostonimeksi)"
 
 #. Sound options
-#: ../finch/gntsound.c:982 ../pidgin/gtkprefs.c:1784
+#: ../finch/gntsound.c:987 ../pidgin/gtkprefs.c:1784
 msgid "Sound Options"
 msgstr "Äänivalinnat"
 
-#: ../finch/gntsound.c:983
+#: ../finch/gntsound.c:988
 msgid "Sounds when conversation has focus"
 msgstr "Äänet kun keskusteluikkuna on aktiivinen"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:846 ../pidgin/gtkprefs.c:858
+#: ../finch/gntsound.c:996 ../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:992 ../pidgin/gtkprefs.c:1789
+#: ../finch/gntsound.c:997 ../pidgin/gtkprefs.c:1789
 msgid "Only when available"
 msgstr "Kun tavoitettavissa"
 
-#: ../finch/gntsound.c:993 ../pidgin/gtkprefs.c:1790
+#: ../finch/gntsound.c:998 ../pidgin/gtkprefs.c:1790
 msgid "Only when not available"
 msgstr "Kun ei tavoitettavissa"
 
-#: ../finch/gntsound.c:1000
+#: ../finch/gntsound.c:1005
 msgid "Volume(0-100):"
 msgstr "Äänenvoimakkuus(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1819
+#: ../finch/gntsound.c:1024 ../pidgin/gtkprefs.c:1819
 msgid "Sound Events"
 msgstr "Äänitapahtumat"
 
-#: ../finch/gntsound.c:1021 ../pidgin/gtkprefs.c:1878
+#: ../finch/gntsound.c:1026 ../pidgin/gtkprefs.c:1878
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: ../finch/gntsound.c:1021
+#: ../finch/gntsound.c:1026
 msgid "File"
 msgstr "Tiedosto"
 
-#: ../finch/gntsound.c:1040 ../pidgin/gtkprefs.c:1897
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1897
 msgid "Test"
 msgstr "Kokeile"
 
-#: ../finch/gntsound.c:1043 ../pidgin/gtkprefs.c:1901
+#: ../finch/gntsound.c:1048 ../pidgin/gtkprefs.c:1901
 msgid "Reset"
 msgstr "Nollaa"
 
-#: ../finch/gntsound.c:1046 ../pidgin/gtkprefs.c:1905
+#: ../finch/gntsound.c:1051 ../pidgin/gtkprefs.c:1905
 msgid "Choose..."
 msgstr "Valitse..."
 
@@ -1882,9 +1883,9 @@
 msgstr "Tallennetut tilat"
 
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
-#: ../libpurple/protocols/jabber/buddy.c:298
-#: ../libpurple/protocols/jabber/buddy.c:1363
-#: ../libpurple/protocols/msn/msn.c:733
+#: ../libpurple/protocols/jabber/buddy.c:326
+#: ../libpurple/protocols/jabber/buddy.c:1396
+#: ../libpurple/protocols/msn/msn.c:747
 #: ../libpurple/protocols/myspace/myspace.c:171
 #: ../libpurple/protocols/novell/novell.c:1493
 #: ../pidgin/gtksavedstatuses.c:500
@@ -1911,36 +1912,36 @@
 #: ../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: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/jabber/jabber.c:1611
+#: ../libpurple/protocols/jabber/jabber.c:1625
+#: ../libpurple/protocols/jabber/jabber.c:1639
+#: ../libpurple/protocols/jabber/jabber.c:1653
+#: ../libpurple/protocols/jabber/jabber.c:1667
+#: ../libpurple/protocols/jabber/jabber.c:1683
+#: ../libpurple/protocols/msn/msn.c:699 ../libpurple/protocols/msn/msn.c:705
+#: ../libpurple/protocols/msn/msn.c:711 ../libpurple/protocols/msn/msn.c:717
+#: ../libpurple/protocols/msn/msn.c:722 ../libpurple/protocols/msn/msn.c:727
 #: ../libpurple/protocols/myspace/myspace.c:148
 #: ../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/oscar/oscar.c:5683
+#: ../libpurple/protocols/oscar/oscar.c:5901
+#: ../libpurple/protocols/oscar/oscar.c:5915
+#: ../libpurple/protocols/oscar/oscar.c:5931
+#: ../libpurple/protocols/oscar/oscar.c:5938
+#: ../libpurple/protocols/oscar/oscar.c:5945
+#: ../libpurple/protocols/sametime/sametime.c:3337
+#: ../libpurple/protocols/sametime/sametime.c:3343
+#: ../libpurple/protocols/sametime/sametime.c:3349
+#: ../libpurple/protocols/sametime/sametime.c:3428
 #: ../libpurple/protocols/silc/buddy.c:1554
 #: ../libpurple/protocols/silc10/buddy.c:1554
 #: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/yahoo.c:3793
-#: ../libpurple/protocols/yahoo/yahoo.c:3799
-#: ../libpurple/protocols/zephyr/zephyr.c:2349
+#: ../libpurple/protocols/yahoo/yahoo.c:3813
+#: ../libpurple/protocols/yahoo/yahoo.c:3819
+#: ../libpurple/protocols/zephyr/zephyr.c:2352
 #: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1001
 msgid "Message"
 msgstr "Viesti"
@@ -2135,25 +2136,26 @@
 "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
+#: ../finch/plugins/grouping.c:42 ../libpurple/protocols/oscar/oscar.c:740
+#, c-format
 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/jabber/buddy.c:2081
 #: ../libpurple/protocols/novell/novell.c:2846
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5707
+#: ../libpurple/protocols/oscar/oscar.c:829
+#: ../libpurple/protocols/oscar/oscar.c:5733
 #: ../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
+#: ../libpurple/protocols/yahoo/yahoo.c:3156 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3333 ../pidgin/gtkblist.c:3725
 #: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1085
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
-#: ../finch/plugins/grouping.c:117 ../pidgin/gtkblist.c:3336
+#: ../finch/plugins/grouping.c:117 ../pidgin/gtkblist.c:3369
 msgid "Online Buddies"
 msgstr "Tuttavat linjoilla"
 
@@ -2194,80 +2196,80 @@
 msgid "Lastlog plugin."
 msgstr "Lastlog-liitännäinen."
 
-#: ../libpurple/account.c:886
+#: ../libpurple/account.c:887
 msgid "accounts"
 msgstr "käyttäjätilit"
 
-#: ../libpurple/account.c:1061 ../libpurple/protocols/jabber/auth.c:199
+#: ../libpurple/account.c:1063 ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
 msgstr "Salasana tarvitaan kirjautumiseen."
 
-#: ../libpurple/account.c:1095
+#: ../libpurple/account.c:1097
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Anna salasana käyttäjätilille %s (%s)"
 
-#: ../libpurple/account.c:1102
+#: ../libpurple/account.c:1104
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: ../libpurple/account.c:1107
+#: ../libpurple/account.c:1109
 msgid "Save password"
 msgstr "Tallenna salasana"
 
-#: ../libpurple/account.c:1142 ../libpurple/connection.c:118
+#: ../libpurple/account.c:1144 ../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:1144 ../libpurple/connection.c:121
+#: ../libpurple/account.c:1146 ../libpurple/connection.c:121
 msgid "Connection Error"
 msgstr "Yhteysvirhe"
 
-#: ../libpurple/account.c:1355 ../libpurple/protocols/gg/gg.c:708
-#: ../libpurple/protocols/jabber/jabber.c:1729
+#: ../libpurple/account.c:1357 ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/jabber/jabber.c:1739
 msgid "New passwords do not match."
 msgstr "Uudet salasanat eivät täsmää."
 
-#: ../libpurple/account.c:1364
+#: ../libpurple/account.c:1366
 msgid "Fill out all fields completely."
 msgstr "Täytä kaikki kentät kokonaan."
 
-#: ../libpurple/account.c:1387
+#: ../libpurple/account.c:1389
 msgid "Original password"
 msgstr "Vanha salasana"
 
-#: ../libpurple/account.c:1394
+#: ../libpurple/account.c:1396
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: ../libpurple/account.c:1401
+#: ../libpurple/account.c:1403
 msgid "New password (again)"
 msgstr "Uusi salasana (uudelleen)"
 
-#: ../libpurple/account.c:1407
+#: ../libpurple/account.c:1409
 #, c-format
 msgid "Change password for %s"
 msgstr "Vaihda %s:n salasana"
 
-#: ../libpurple/account.c:1415
+#: ../libpurple/account.c:1417
 msgid "Please enter your current password and your new password."
 msgstr "Anna nykyinen sekä uusi salasana."
 
-#: ../libpurple/account.c:1446
+#: ../libpurple/account.c:1448
 #, c-format
 msgid "Change user information for %s"
 msgstr "Vaihda käyttäjätietoja - %s"
 
-#: ../libpurple/account.c:1449 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1451 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Aseta käyttäjätiedot"
 
-#: ../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/account.c:1922 ../libpurple/protocols/gg/gg.c:1019
+#: ../libpurple/protocols/jabber/buddy.c:812
+#: ../libpurple/protocols/jabber/buddy.c:2077
+#: ../libpurple/protocols/jabber/buddy.c:2094
 #: ../libpurple/protocols/novell/novell.c:2849
 #: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:166
 msgid "Unknown"
@@ -2275,7 +2277,7 @@
 
 #: ../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
+#: ../libpurple/protocols/myspace/myspace.c:3435 ../pidgin/gtkblist.c:6234
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2461,7 +2463,7 @@
 msgstr "+++ %s kirjautui ulos"
 
 #: ../libpurple/connection.c:530 ../libpurple/plugin.c:277
-#: ../libpurple/protocols/jabber/buddy.c:2354
+#: ../libpurple/protocols/jabber/buddy.c:2397
 #: ../libpurple/protocols/msn/servconn.c:141
 #: ../libpurple/protocols/msn/session.c:377
 #: ../libpurple/protocols/msnp9/servconn.c:139
@@ -2526,18 +2528,18 @@
 msgid "%s left the room (%s)."
 msgstr "%s poistui huoneesta (%s)."
 
-#: ../libpurple/dbus-server.c:584
+#: ../libpurple/dbus-server.c:586
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Yhteyden saaminen epäonnistui: %s"
 
 # c-format
-#: ../libpurple/dbus-server.c:596
+#: ../libpurple/dbus-server.c:598
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Nimen saaminen epäonnistui: %s"
 
-#: ../libpurple/dbus-server.c:610
+#: ../libpurple/dbus-server.c:612
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Palvelinnimen saaminen epäonnistui: %s"
@@ -2583,6 +2585,7 @@
 "%s"
 
 #: ../libpurple/dnsquery.c:599
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "EOF luettaessa selvitysprosessista"
 
@@ -2691,6 +2694,7 @@
 msgstr "Tiedoston %s siirto valmis"
 
 #: ../libpurple/ft.c:703
+#, c-format
 msgid "File transfer complete"
 msgstr "Tiedostonsiirto valmis"
 
@@ -2700,6 +2704,7 @@
 msgstr "Peruutit tiedoston %s siirron"
 
 #: ../libpurple/ft.c:1143
+#, c-format
 msgid "File transfer cancelled"
 msgstr "Tiedostonsiirto peruutettu"
 
@@ -2957,6 +2962,7 @@
 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)."
 
@@ -3035,14 +3041,14 @@
 
 #: ../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: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
+#: ../libpurple/protocols/oscar/oscar.c:1496
+#: ../libpurple/protocols/oscar/oscar.c:2301
+#: ../libpurple/protocols/oscar/oscar.c:2350
+#: ../libpurple/protocols/oscar/oscar.c:6015
+#: ../libpurple/protocols/oscar/oscar.c:6070
+#: ../libpurple/protocols/oscar/oscar.c:6297
+#: ../libpurple/protocols/oscar/oscar.c:6367 ../libpurple/request.h:1401
+#: ../libpurple/request.h:1411
 msgid "_Cancel"
 msgstr "_Peru"
 
@@ -3084,10 +3090,10 @@
 "valmis\n"
 "(vain kun keskustelua lähettäjän kanssa ei avoinna)"
 
-#: ../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
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1830
+#: ../libpurple/protocols/msn/msn.c:1860
+#: ../libpurple/protocols/msnp9/msn.c:1671
+#: ../libpurple/protocols/msnp9/msn.c:1701
 msgid "Notes"
 msgstr "Merkinnät"
 
@@ -3268,15 +3274,15 @@
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "Testiliitännäinen - IPC palvelimena. Tämä rekisteröi IPC-komennot."
 
-#: ../libpurple/plugins/joinpart.c:229
+#: ../libpurple/plugins/joinpart.c:228
 msgid "Join/Part Hiding Configuration"
 msgstr "Liittymisen/poistumisen piilotuksen asetukset"
 
-#: ../libpurple/plugins/joinpart.c:233
+#: ../libpurple/plugins/joinpart.c:232
 msgid "Minimum Room Size"
 msgstr "Huoneen minimikoko"
 
-#: ../libpurple/plugins/joinpart.c:239
+#: ../libpurple/plugins/joinpart.c:238
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "Käyttäjän inaktiivisuuden aikakatkaisu (minuuteissa)"
 
@@ -3286,19 +3292,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:270
+#: ../libpurple/plugins/joinpart.c:269
 msgid "Join/Part Hiding"
 msgstr "Liity/poistu piilotus"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:273
+#: ../libpurple/plugins/joinpart.c:272
 msgid "Hides extraneous join/part messages."
 msgstr "Piilottaa ylimääräiset liittymis/poistumisviestit."
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:275
+#: ../libpurple/plugins/joinpart.c:274
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
@@ -3543,7 +3549,7 @@
 
 #: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:661
+#: ../libpurple/protocols/msn/msn.c:675
 #: ../libpurple/protocols/msnp9/dialog.c:133
 #: ../libpurple/protocols/msnp9/msn.c:547
 #: ../libpurple/protocols/msnp9/msn.c:563
@@ -3558,7 +3564,7 @@
 
 #: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:661
+#: ../libpurple/protocols/msn/msn.c:675
 #: ../libpurple/protocols/msnp9/dialog.c:134
 #: ../libpurple/protocols/msnp9/msn.c:547
 #: ../libpurple/protocols/msnp9/msn.c:563
@@ -3836,27 +3842,27 @@
 #: ../libpurple/protocols/bonjour/bonjour.c:392
 #: ../libpurple/protocols/bonjour/bonjour.c:698
 #: ../libpurple/protocols/gg/gg.c:633
-#: ../libpurple/protocols/jabber/jabber.c:996
+#: ../libpurple/protocols/jabber/jabber.c:1006
 msgid "First name"
 msgstr "Etunimi"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:394
 #: ../libpurple/protocols/bonjour/bonjour.c:701
 #: ../libpurple/protocols/gg/gg.c:628
-#: ../libpurple/protocols/jabber/jabber.c:1000
+#: ../libpurple/protocols/jabber/jabber.c:1010
 msgid "Last name"
 msgstr "Sukunimi"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:398
-#: ../libpurple/protocols/jabber/buddy.c:295
-#: ../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/jabber/buddy.c:323
+#: ../libpurple/protocols/jabber/buddy.c:1362
+#: ../libpurple/protocols/jabber/buddy.c:1372
+#: ../libpurple/protocols/jabber/buddy.c:2266
+#: ../libpurple/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/util.c:565
 #: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
+#: ../libpurple/protocols/silc10/util.c:555
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1068
 msgid "E-Mail"
 msgstr "Sähköposti"
 
@@ -3891,7 +3897,7 @@
 
 #: ../libpurple/protocols/bonjour/bonjour.c:704
 #: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:988
+#: ../libpurple/protocols/jabber/jabber.c:998
 #: ../libpurple/protocols/silc/silc.c:913
 #: ../libpurple/protocols/silc/silc.c:1154
 #: ../libpurple/protocols/silc10/silc.c:687
@@ -3936,11 +3942,11 @@
 msgid "Error communicating with local mDNSResponder."
 msgstr "Virhe viestittäessä paikallisen mDNSResponderin kanssa."
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1851
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1908
 msgid "Invalid proxy settings"
 msgstr "Epäkelvot välipalvelinvalinnat"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1851
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1908
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -4012,9 +4018,9 @@
 msgstr "Rekisteröinti onnistui!"
 
 #: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:776
-#: ../libpurple/protocols/jabber/jabber.c:971
-#: ../libpurple/protocols/jabber/jabber.c:974
-#: ../libpurple/protocols/jabber/jabber.c:1762
+#: ../libpurple/protocols/jabber/jabber.c:981
+#: ../libpurple/protocols/jabber/jabber.c:984
+#: ../libpurple/protocols/jabber/jabber.c:1772
 msgid "Password"
 msgstr "Salasana"
 
@@ -4040,9 +4046,9 @@
 
 #: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
 #: ../libpurple/protocols/gg/gg.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:1008
-#: ../libpurple/protocols/oscar/oscar.c:3822
-#: ../libpurple/protocols/oscar/oscar.c:3835
+#: ../libpurple/protocols/jabber/jabber.c:1018
+#: ../libpurple/protocols/oscar/oscar.c:3836
+#: ../libpurple/protocols/oscar/oscar.c:3849
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Paikkakunta"
@@ -4051,14 +4057,14 @@
 msgid "Year of birth"
 msgstr "Syntymävuosi"
 
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1745
-#: ../libpurple/protocols/msnp9/msn.c:1601
+#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1759
+#: ../libpurple/protocols/msnp9/msn.c:1600
 #: ../libpurple/protocols/myspace/user.c:129
-#: ../libpurple/protocols/oscar/oscar.c:3765
+#: ../libpurple/protocols/oscar/oscar.c:3779
 #: ../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:1097
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1098
 msgid "Gender"
 msgstr "Sukupuoli"
 
@@ -4067,14 +4073,14 @@
 msgstr "Mies vai nainen"
 
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3765
+#: ../libpurple/protocols/oscar/oscar.c:3779
 #: ../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:3765
+#: ../libpurple/protocols/oscar/oscar.c:3779
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
@@ -4134,7 +4140,7 @@
 msgstr "Lisää ryhmäkeskusteluun..."
 
 #: ../libpurple/protocols/gg/gg.c:1013
-#: ../libpurple/protocols/jabber/buddy.c:2040
+#: ../libpurple/protocols/jabber/buddy.c:2083
 #: ../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
@@ -4143,7 +4149,7 @@
 #: ../libpurple/protocols/msnp9/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2834
 #: ../libpurple/protocols/qq/qq.c:281
-#: ../libpurple/protocols/yahoo/yahoo.c:3138 ../libpurple/status.c:155
+#: ../libpurple/protocols/yahoo/yahoo.c:3158 ../libpurple/status.c:155
 #: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1081
 msgid "Available"
 msgstr "Tavoitettavissa"
@@ -4153,31 +4159,32 @@
 #. Away stuff
 #: ../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/jabber/buddy.c:2087
 #: ../libpurple/protocols/novell/novell.c:2837
-#: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:5735
+#: ../libpurple/protocols/oscar/oscar.c:734
+#: ../libpurple/protocols/oscar/oscar.c:5761
 #: ../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:3695
-#: ../libpurple/protocols/yahoo/yahoo.c:3769 ../libpurple/status.c:158
+#: ../libpurple/protocols/yahoo/yahoo.c:3715
+#: ../libpurple/protocols/yahoo/yahoo.c:3789 ../libpurple/status.c:158
 #: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:1960
 #: ../pidgin/gtkstatusbox.c:1082
+#, c-format
 msgid "Away"
 msgstr "Poissa"
 
 #: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1119
-#: ../libpurple/protocols/oscar/oscar.c:2760
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:2767
+#: ../libpurple/protocols/oscar/oscar.c:3746
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
-#: ../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/jabber/buddy.c:2260
+#: ../libpurple/protocols/jabber/buddy.c:2446
+#: ../libpurple/protocols/oscar/oscar.c:3757
+#: ../libpurple/protocols/silc/ops.c:1005
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Etunimi"
@@ -4187,7 +4194,7 @@
 msgstr "Syntymävuosi"
 
 #: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
-#: ../libpurple/protocols/oscar/oscar.c:3944
+#: ../libpurple/protocols/oscar/oscar.c:3958
 msgid "Unable to display the search results."
 msgstr "Hakutuloksia ei voi näyttää."
 
@@ -4310,7 +4317,7 @@
 msgid "Unknown command: %s"
 msgstr "Tuntematon komento: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:511
+#: ../libpurple/protocols/irc/cmds.c:509
 #: ../libpurple/protocols/jabber/chat.c:591
 #: ../libpurple/protocols/silc/silc.c:1488
 #: ../libpurple/protocols/silc10/silc.c:1280
@@ -4318,7 +4325,7 @@
 msgid "current topic is: %s"
 msgstr "nykyinen aihe on: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:515
+#: ../libpurple/protocols/irc/cmds.c:513
 #: ../libpurple/protocols/jabber/chat.c:595
 #: ../libpurple/protocols/silc/silc.c:1492
 #: ../libpurple/protocols/silc10/silc.c:1284
@@ -4360,7 +4367,7 @@
 
 #: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
 #: ../libpurple/protocols/irc/irc.c:633 ../libpurple/protocols/irc/irc.c:662
-#: ../libpurple/protocols/myspace/myspace.c:2530
+#: ../libpurple/protocols/myspace/myspace.c:2532
 msgid "Server has disconnected"
 msgstr "Palvelin on katkaissut yhteyden"
 
@@ -4385,23 +4392,23 @@
 #. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:332
-#: ../libpurple/protocols/jabber/jabber.c:1336
+#: ../libpurple/protocols/jabber/jabber.c:1346
 #: ../libpurple/protocols/msn/session.c:402
 #: ../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/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3776
+#: ../libpurple/protocols/sametime/sametime.c:3777
 #: ../libpurple/protocols/simple/simple.c:1915
-#: ../libpurple/protocols/yahoo/yahoo.c:2966
+#: ../libpurple/protocols/yahoo/yahoo.c:2984
 #: ../libpurple/protocols/zephyr/zephyr.c:1585 ../pidgin/gtkstatusbox.c:681
 msgid "Connecting"
 msgstr "Yhdistetään"
 
 #: ../libpurple/protocols/irc/irc.c:342
-#: ../libpurple/protocols/jabber/jabber.c:664
-#: ../libpurple/protocols/jabber/jabber.c:1145
+#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:1155
 msgid "SSL support unavailable"
 msgstr "SSL-tuki ei saatavilla"
 
@@ -4413,12 +4420,12 @@
 msgstr "Pistokkeen luominen epäonnistui"
 
 #: ../libpurple/protocols/irc/irc.c:437
-#: ../libpurple/protocols/oscar/oscar.c:1327
+#: ../libpurple/protocols/oscar/oscar.c:1331
 msgid "Couldn't connect to host"
 msgstr "Yhteyttä isäntään ei voi muodostaa"
 
 #: ../libpurple/protocols/irc/irc.c:628 ../libpurple/protocols/irc/irc.c:657
-#: ../libpurple/protocols/myspace/myspace.c:2524
+#: ../libpurple/protocols/myspace/myspace.c:2526
 msgid "Read error"
 msgstr "Virhe luettaessa"
 
@@ -4430,9 +4437,9 @@
 msgstr "Käyttäjät"
 
 #: ../libpurple/protocols/irc/irc.c:801
-#: ../libpurple/protocols/sametime/sametime.c:3424
+#: ../libpurple/protocols/sametime/sametime.c:3425
 #: ../libpurple/protocols/silc/chat.c:1401
-#: ../libpurple/protocols/silc/ops.c:1393
+#: ../libpurple/protocols/silc/ops.c:1408
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1517
@@ -4458,13 +4465,13 @@
 
 #. host to connect to
 #: ../libpurple/protocols/irc/irc.c:965 ../libpurple/protocols/irc/msgs.c:325
-#: ../libpurple/protocols/msn/msn.c:2343
+#: ../libpurple/protocols/msn/msn.c:2357
 #: ../libpurple/protocols/msnp9/msn.c:2197
-#: ../libpurple/protocols/oscar/oscar.c:6747
+#: ../libpurple/protocols/oscar/oscar.c:6763
 #: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5781
-#: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1343
+#: ../libpurple/protocols/sametime/sametime.c:5782
+#: ../libpurple/protocols/silc/ops.c:1264
+#: ../libpurple/protocols/silc/ops.c:1358
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
 #: ../libpurple/protocols/simple/simple.c:2099
@@ -4473,11 +4480,11 @@
 msgstr "Palvelin"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:968 ../libpurple/protocols/msn/msn.c:2348
+#: ../libpurple/protocols/irc/irc.c:968 ../libpurple/protocols/msn/msn.c:2362
 #: ../libpurple/protocols/msnp9/msn.c:2202
-#: ../libpurple/protocols/oscar/oscar.c:6750
+#: ../libpurple/protocols/oscar/oscar.c:6766
 #: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5786
+#: ../libpurple/protocols/sametime/sametime.c:5787
 #: ../libpurple/protocols/silc/silc.c:2061
 #: ../libpurple/protocols/silc10/silc.c:1867
 #: ../libpurple/protocols/toc/toc.c:2331
@@ -4489,13 +4496,15 @@
 msgstr "Merkistöt"
 
 #: ../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/jabber/jabber.c:974
+#: ../libpurple/protocols/jabber/jabber.c:976
+#: ../libpurple/protocols/oscar/oscar.c:2956
+#: ../libpurple/protocols/oscar/oscar.c:3969
 #: ../libpurple/protocols/silc/buddy.c:1542
-#: ../libpurple/protocols/silc/ops.c:1197
-#: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1336
-#: ../libpurple/protocols/silc/ops.c:1339
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc/ops.c:1215
+#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc/ops.c:1354
 #: ../libpurple/protocols/silc/silc.c:1148
 #: ../libpurple/protocols/silc10/buddy.c:1542
 #: ../libpurple/protocols/silc10/ops.c:1191
@@ -4547,14 +4556,14 @@
 msgstr "<i>(tunnistettu)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:305
-#: ../libpurple/protocols/oscar/oscar.c:3733
-#: ../libpurple/protocols/silc/ops.c:1422
+#: ../libpurple/protocols/oscar/oscar.c:3747
+#: ../libpurple/protocols/silc/ops.c:1437
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Kutsumanimi"
 
 #: ../libpurple/protocols/irc/msgs.c:331
-#: ../libpurple/protocols/silc/ops.c:1268
+#: ../libpurple/protocols/silc/ops.c:1283
 #: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Tällä hetkellä"
@@ -4608,66 +4617,66 @@
 msgid "Users on %s: %s"
 msgstr "Käyttäjät %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:577
+#: ../libpurple/protocols/irc/msgs.c:579
 msgid "Time Response"
 msgstr "Vastaus time-komentoon "
 
-#: ../libpurple/protocols/irc/msgs.c:578
+#: ../libpurple/protocols/irc/msgs.c:580
 msgid "The IRC server's local time is:"
 msgstr "IRC palvelimen paikallinen aika:"
 
-#: ../libpurple/protocols/irc/msgs.c:589
+#: ../libpurple/protocols/irc/msgs.c:591
 msgid "No such channel"
 msgstr "Kanavaa ei ole"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:600
+#: ../libpurple/protocols/irc/msgs.c:602
 msgid "no such channel"
 msgstr "kanavaa ei ole"
 
-#: ../libpurple/protocols/irc/msgs.c:603
+#: ../libpurple/protocols/irc/msgs.c:605
 msgid "User is not logged in"
 msgstr "Käyttäjä ei ole kirjautuneena sisään"
 
-#: ../libpurple/protocols/irc/msgs.c:608
+#: ../libpurple/protocols/irc/msgs.c:610
 msgid "No such nick or channel"
 msgstr "Kutsumanimeä/kanavaa ei ole olemassa"
 
-#: ../libpurple/protocols/irc/msgs.c:628
+#: ../libpurple/protocols/irc/msgs.c:630
 msgid "Could not send"
 msgstr "Lähettäminen ei onnistu"
 
-#: ../libpurple/protocols/irc/msgs.c:684
+#: ../libpurple/protocols/irc/msgs.c:686
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Liittyminen kanavalle %s vaatii kutsun."
 
-#: ../libpurple/protocols/irc/msgs.c:685
+#: ../libpurple/protocols/irc/msgs.c:687
 msgid "Invitation only"
 msgstr "Vain kutsu"
 
-#: ../libpurple/protocols/irc/msgs.c:801
+#: ../libpurple/protocols/irc/msgs.c:803
 #, 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:806 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:808 ../libpurple/protocols/silc/ops.c:714
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s potkaisi (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:829
+#: ../libpurple/protocols/irc/msgs.c:831
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "moodin (%s %s) asetti %s"
 
-#: ../libpurple/protocols/irc/msgs.c:914 ../libpurple/protocols/irc/msgs.c:915
+#: ../libpurple/protocols/irc/msgs.c:919 ../libpurple/protocols/irc/msgs.c:920
 msgid "Invalid nickname"
 msgstr "Virheellinen lempinimi"
 
-#: ../libpurple/protocols/irc/msgs.c:916
+#: ../libpurple/protocols/irc/msgs.c:921
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4675,7 +4684,7 @@
 "Palvelin hylkäsi valitsemasi kutsumanimen. Siinä on todennäköisesti "
 "kiellettyjä merkkejä."
 
-#: ../libpurple/protocols/irc/msgs.c:921
+#: ../libpurple/protocols/irc/msgs.c:926
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4683,44 +4692,44 @@
 "Palvelin hylkäsi valitsemasi tilinimen. Siinä on todennäköisesti kiellettyjä "
 "merkkejä."
 
-#: ../libpurple/protocols/irc/msgs.c:960
+#: ../libpurple/protocols/irc/msgs.c:965
 msgid "Cannot change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../libpurple/protocols/irc/msgs.c:960
+#: ../libpurple/protocols/irc/msgs.c:965
 msgid "Could not change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../libpurple/protocols/irc/msgs.c:981
+#: ../libpurple/protocols/irc/msgs.c:986
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Olet poistunut kanavalta %s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1023
+#: ../libpurple/protocols/irc/msgs.c:1028
 msgid "Error: invalid PONG from server"
 msgstr "Virhe: epäkelpo PONG palvelimelta"
 
-#: ../libpurple/protocols/irc/msgs.c:1025
+#: ../libpurple/protocols/irc/msgs.c:1030
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING vastaus -- Viive: %lu sekuntia"
 
-#: ../libpurple/protocols/irc/msgs.c:1116
+#: ../libpurple/protocols/irc/msgs.c:1121
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Kohteeseen %s ei voi liittyä: vaatii rekisteröinnin."
 
-#: ../libpurple/protocols/irc/msgs.c:1117
-#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/irc/msgs.c:1122
+#: ../libpurple/protocols/silc/ops.c:1108
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Kanavalle ei voi liittyä"
 
-#: ../libpurple/protocols/irc/msgs.c:1151
+#: ../libpurple/protocols/irc/msgs.c:1156
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Kutsumanimi tai kanava ei tilapäisesti ole käytössä."
 
-#: ../libpurple/protocols/irc/msgs.c:1163
+#: ../libpurple/protocols/irc/msgs.c:1168
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops %s:ltä"
@@ -4828,7 +4837,7 @@
 msgstr "names [kanava]: Listaa kanavalla olevat käyttäjät."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2348
+#: ../libpurple/protocols/jabber/jabber.c:2358
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;uusi nimi&gt;: Muuta nimesi."
 
@@ -4961,9 +4970,9 @@
 msgstr "Yhteys katkennut."
 
 #: ../libpurple/protocols/jabber/adhoccommands.c:143
-#: ../libpurple/protocols/jabber/jabber.c:725
-#: ../libpurple/protocols/jabber/jabber.c:755
-#: ../libpurple/protocols/jabber/jabber.c:1932
+#: ../libpurple/protocols/jabber/jabber.c:735
+#: ../libpurple/protocols/jabber/jabber.c:765
+#: ../libpurple/protocols/jabber/jabber.c:1942
 msgid "Unknown Error"
 msgstr "Tuntematon virhe"
 
@@ -4986,7 +4995,7 @@
 "Palvelin vaatii salaamattoman tunnistautumisen salaamattoman yhteyden yli"
 
 #: ../libpurple/protocols/jabber/auth.c:323
-#: ../libpurple/protocols/jabber/auth.c:526
+#: ../libpurple/protocols/jabber/auth.c:532
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4997,29 +5006,29 @@
 
 #: ../libpurple/protocols/jabber/auth.c:325
 #: ../libpurple/protocols/jabber/auth.c:326
-#: ../libpurple/protocols/jabber/auth.c:528
-#: ../libpurple/protocols/jabber/auth.c:529
-#: ../libpurple/protocols/jabber/auth.c:720
-#: ../libpurple/protocols/jabber/auth.c:721
+#: ../libpurple/protocols/jabber/auth.c:534
+#: ../libpurple/protocols/jabber/auth.c:535
+#: ../libpurple/protocols/jabber/auth.c:726
+#: ../libpurple/protocols/jabber/auth.c:727
 msgid "Plaintext Authentication"
 msgstr "Tekstipohjainen tunnistus"
 
 #: ../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/auth.c:659
+#: ../libpurple/protocols/jabber/auth.c:907
+#: ../libpurple/protocols/jabber/auth.c:1058
+#: ../libpurple/protocols/jabber/auth.c:1085
+#: ../libpurple/protocols/jabber/auth.c:1109
 #: ../libpurple/protocols/jabber/jabber.c:127
 msgid "Invalid response from server."
 msgstr "Kelvoton vastaus palvelimelta."
 
-#: ../libpurple/protocols/jabber/auth.c:542
-#: ../libpurple/protocols/jabber/auth.c:733
+#: ../libpurple/protocols/jabber/auth.c:548
+#: ../libpurple/protocols/jabber/auth.c:739
 msgid "Server does not use any supported authentication method"
 msgstr "Palvelin ei käytä mitään tuetuista tunnistautumismenetelmistä"
 
-#: ../libpurple/protocols/jabber/auth.c:722
+#: ../libpurple/protocols/jabber/auth.c:728
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -5027,115 +5036,115 @@
 "Tämä palvelin vaatii tekstipohjaisen tunnistautumisen salaamattoman yhteyden "
 "yli. Sallitaanko tämä ja jatketaan?"
 
-#: ../libpurple/protocols/jabber/auth.c:924
-#: ../libpurple/protocols/jabber/auth.c:949
+#: ../libpurple/protocols/jabber/auth.c:930
+#: ../libpurple/protocols/jabber/auth.c:955
 msgid "Invalid challenge from server"
 msgstr "Virheellinen tunnistushaaste palvelimelta"
 
-#: ../libpurple/protocols/jabber/auth.c:1023
+#: ../libpurple/protocols/jabber/auth.c:1031
 msgid "SASL error"
 msgstr "SASL-virhe"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:1223
-#: ../libpurple/protocols/sametime/sametime.c:4182
-#: ../libpurple/protocols/silc/ops.c:986
+#: ../libpurple/protocols/jabber/buddy.c:311
+#: ../libpurple/protocols/jabber/buddy.c:1256
+#: ../libpurple/protocols/sametime/sametime.c:4183
+#: ../libpurple/protocols/silc/ops.c:1001
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:1235
-#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/jabber/buddy.c:312
+#: ../libpurple/protocols/jabber/buddy.c:1268
+#: ../libpurple/protocols/silc/ops.c:1013
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Sukunimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:1238
+#: ../libpurple/protocols/jabber/buddy.c:313
+#: ../libpurple/protocols/jabber/buddy.c:1271
 msgid "Given Name"
 msgstr "Etunimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:1024
+#: ../libpurple/protocols/jabber/buddy.c:315
+#: ../libpurple/protocols/jabber/jabber.c:1034
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:1286
+#: ../libpurple/protocols/jabber/buddy.c:316
+#: ../libpurple/protocols/jabber/buddy.c:1319
 msgid "Street Address"
 msgstr "Katuosoite"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:1283
+#: ../libpurple/protocols/jabber/buddy.c:317
+#: ../libpurple/protocols/jabber/buddy.c:1316
 msgid "Extended Address"
 msgstr "Laajennettu osoite"
 
-#: ../libpurple/protocols/jabber/buddy.c:290
-#: ../libpurple/protocols/jabber/buddy.c:1289
+#: ../libpurple/protocols/jabber/buddy.c:318
+#: ../libpurple/protocols/jabber/buddy.c:1322
 msgid "Locality"
 msgstr "Alue"
 
-#: ../libpurple/protocols/jabber/buddy.c:291
-#: ../libpurple/protocols/jabber/buddy.c:1292
+#: ../libpurple/protocols/jabber/buddy.c:319
+#: ../libpurple/protocols/jabber/buddy.c:1325
 msgid "Region"
 msgstr "Seutu"
 
-#: ../libpurple/protocols/jabber/buddy.c:292
-#: ../libpurple/protocols/jabber/buddy.c:1295
+#: ../libpurple/protocols/jabber/buddy.c:320
+#: ../libpurple/protocols/jabber/buddy.c:1328
 msgid "Postal Code"
 msgstr "Postinumero"
 
-#: ../libpurple/protocols/jabber/buddy.c:293
-#: ../libpurple/protocols/jabber/buddy.c:1299
+#: ../libpurple/protocols/jabber/buddy.c:321
+#: ../libpurple/protocols/jabber/buddy.c:1332
 #: ../libpurple/protocols/silc/silc.c:1158
 #: ../libpurple/protocols/silc10/silc.c:932
 msgid "Country"
 msgstr "Maa"
 
-#: ../libpurple/protocols/jabber/buddy.c:294
-#: ../libpurple/protocols/jabber/buddy.c:1310
-#: ../libpurple/protocols/jabber/buddy.c:1317
+#: ../libpurple/protocols/jabber/buddy.c:322
+#: ../libpurple/protocols/jabber/buddy.c:1343
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: ../libpurple/protocols/jabber/buddy.c:296
-#: ../libpurple/protocols/jabber/buddy.c:1354
+#: ../libpurple/protocols/jabber/buddy.c:324
+#: ../libpurple/protocols/jabber/buddy.c:1387
 msgid "Organization Name"
 msgstr "Organisaation nimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:297
-#: ../libpurple/protocols/jabber/buddy.c:1357
+#: ../libpurple/protocols/jabber/buddy.c:325
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "Organization Unit"
 msgstr "Organisaatioyksikkö"
 
-#: ../libpurple/protocols/jabber/buddy.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1366
+#: ../libpurple/protocols/jabber/buddy.c:327
+#: ../libpurple/protocols/jabber/buddy.c:1399
 msgid "Role"
 msgstr "Asema"
 
-#: ../libpurple/protocols/jabber/buddy.c:300
-#: ../libpurple/protocols/jabber/buddy.c:1254
-#: ../libpurple/protocols/msn/msn.c:1814
-#: ../libpurple/protocols/msnp9/msn.c:1670
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/jabber/buddy.c:328
+#: ../libpurple/protocols/jabber/buddy.c:1287
+#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msnp9/msn.c:1669
+#: ../libpurple/protocols/oscar/oscar.c:3796
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: ../libpurple/protocols/jabber/buddy.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1369
+#: ../libpurple/protocols/jabber/buddy.c:329
+#: ../libpurple/protocols/jabber/buddy.c:1402
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3309
-#: ../pidgin/gtkprefs.c:688
+#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3345
+#: ../pidgin/gtkplugin.c:568 ../pidgin/gtkprefs.c:688
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../libpurple/protocols/jabber/buddy.c:724
-#: ../libpurple/protocols/jabber/buddy.c:725
+#: ../libpurple/protocols/jabber/buddy.c:752
+#: ../libpurple/protocols/jabber/buddy.c:753
 msgid "Edit XMPP vCard"
 msgstr "Muokkaa XMPP-vCardia"
 
-#: ../libpurple/protocols/jabber/buddy.c:726
+#: ../libpurple/protocols/jabber/buddy.c:754
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5143,385 +5152,386 @@
 "Kaikki alla olevat kentät ovat valinnaisia. Kirjoita vain tiedot, joiden "
 "luovuttamista pidät sopivana."
 
-#: ../libpurple/protocols/jabber/buddy.c:797
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:990
 msgid "Client"
 msgstr "Asiakasohjelma"
 
-#: ../libpurple/protocols/jabber/buddy.c:801
-#: ../libpurple/protocols/jabber/buddy.c:966
+#: ../libpurple/protocols/jabber/buddy.c:829
+#: ../libpurple/protocols/jabber/buddy.c:994
 msgid "Operating System"
 msgstr "Käyttöjärjestelmä"
 
-#: ../libpurple/protocols/jabber/buddy.c:817
-#: ../libpurple/protocols/jabber/buddy.c:977
-msgid "Last Activity"
-msgstr "Viimeisin aktiivisena olo"
-
-#: ../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:821
-#: ../libpurple/protocols/jabber/buddy.c:981
-msgid "Service Discovery Items"
-msgstr "Palvelulöytökohteet"
-
-#: ../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:825
-#: ../libpurple/protocols/jabber/buddy.c:985
-msgid "Multi-User Chat"
-msgstr "Monen käyttäjän keskustelu"
-
-#: ../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:829
-#: ../libpurple/protocols/jabber/buddy.c:989
-msgid "In-Band Bytestreams"
-msgstr "In-band-tavujonot"
-
-#: ../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:833
-#: ../libpurple/protocols/jabber/buddy.c:993
-msgid "PubSub Service"
-msgstr "PubSub-palvelu"
-
-#: ../libpurple/protocols/jabber/buddy.c:835
-#: ../libpurple/protocols/jabber/buddy.c:995
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5-tavujonot"
-
-#: ../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:839
-#: ../libpurple/protocols/jabber/buddy.c:999
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-#: ../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:843
-#: ../libpurple/protocols/jabber/buddy.c:1003
-msgid "User Location"
-msgstr "Käyttäjän sijainti"
-
 #: ../libpurple/protocols/jabber/buddy.c:845
 #: ../libpurple/protocols/jabber/buddy.c:1005
-msgid "User Avatar"
-msgstr "Käyttäjän hahmo"
+msgid "Last Activity"
+msgstr "Viimeisin aktiivisena olo"
 
 #: ../libpurple/protocols/jabber/buddy.c:847
 #: ../libpurple/protocols/jabber/buddy.c:1007
-msgid "Chat State Notifications"
-msgstr "Keskustelun tilan ilmoitukset"
+msgid "Service Discovery Info"
+msgstr "Palvelulöytötiedot"
 
 #: ../libpurple/protocols/jabber/buddy.c:849
 #: ../libpurple/protocols/jabber/buddy.c:1009
-msgid "Software Version"
-msgstr "Ohjelmistoversio"
+msgid "Service Discovery Items"
+msgstr "Palvelulöytökohteet"
 
 #: ../libpurple/protocols/jabber/buddy.c:851
 #: ../libpurple/protocols/jabber/buddy.c:1011
-msgid "Stream Initiation"
-msgstr "Virtauksen alustus"
+msgid "Extended Stanza Addressing"
+msgstr "Laajennettu raakalohko-osoitus"
 
 #: ../libpurple/protocols/jabber/buddy.c:853
 #: ../libpurple/protocols/jabber/buddy.c:1013
-#: ../libpurple/protocols/sametime/sametime.c:3285
-msgid "File Transfer"
-msgstr "Tiedostonsiirto"
+msgid "Multi-User Chat"
+msgstr "Monen käyttäjän keskustelu"
 
 #: ../libpurple/protocols/jabber/buddy.c:855
 #: ../libpurple/protocols/jabber/buddy.c:1015
-msgid "User Mood"
-msgstr "Käyttäjän mieliala"
+msgid "Multi-User Chat Extended Presence Information"
+msgstr "Monen käyttäjän keskustelun laajennetut läsnäolotiedot"
 
 #: ../libpurple/protocols/jabber/buddy.c:857
 #: ../libpurple/protocols/jabber/buddy.c:1017
-msgid "User Activity"
-msgstr "Käyttäjän aktiivisuus"
+msgid "In-Band Bytestreams"
+msgstr "In-band-tavujonot"
 
 #: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/jabber/buddy.c:1019
-msgid "Entity Capabilities"
-msgstr "Entiteetin ominaisuudet"
+msgid "Ad-Hoc Commands"
+msgstr "Ad-Hoc-komennot"
 
 #: ../libpurple/protocols/jabber/buddy.c:861
 #: ../libpurple/protocols/jabber/buddy.c:1021
-msgid "Encrypted Session Negotiations"
-msgstr "Salatut istuntojen neuvottelut"
+msgid "PubSub Service"
+msgstr "PubSub-palvelu"
 
 #: ../libpurple/protocols/jabber/buddy.c:863
 #: ../libpurple/protocols/jabber/buddy.c:1023
-msgid "User Tune"
-msgstr "Käyttäjänimi"
+msgid "SOCKS5 Bytestreams"
+msgstr "SOCKS5-tavujonot"
 
 #: ../libpurple/protocols/jabber/buddy.c:865
 #: ../libpurple/protocols/jabber/buddy.c:1025
-msgid "Roster Item Exchange"
-msgstr "Tuttavaluetteloiden vaihto"
+msgid "Out of Band Data"
+msgstr "Out of band -tiedot"
 
 #: ../libpurple/protocols/jabber/buddy.c:867
 #: ../libpurple/protocols/jabber/buddy.c:1027
-msgid "Reachability Address"
-msgstr "Tavoitettavuusosoite"
+msgid "XHTML-IM"
+msgstr "XHTML-IM"
 
 #: ../libpurple/protocols/jabber/buddy.c:869
 #: ../libpurple/protocols/jabber/buddy.c:1029
-msgid "User Profile"
-msgstr "Käyttäjän profiili"
+msgid "In-Band Registration"
+msgstr "Rekisteröinti \"in-band\""
 
 #: ../libpurple/protocols/jabber/buddy.c:871
 #: ../libpurple/protocols/jabber/buddy.c:1031
-msgid "Jingle"
-msgstr "Jingle"
+msgid "User Location"
+msgstr "Käyttäjän sijainti"
 
 #: ../libpurple/protocols/jabber/buddy.c:873
 #: ../libpurple/protocols/jabber/buddy.c:1033
-msgid "Jingle Audio"
-msgstr "Jingle-ääni"
+msgid "User Avatar"
+msgstr "Käyttäjän hahmo"
 
 #: ../libpurple/protocols/jabber/buddy.c:875
 #: ../libpurple/protocols/jabber/buddy.c:1035
-msgid "User Nickname"
-msgstr "Käyttäjän kutsumanimi"
+msgid "Chat State Notifications"
+msgstr "Keskustelun tilan ilmoitukset"
 
 #: ../libpurple/protocols/jabber/buddy.c:877
 #: ../libpurple/protocols/jabber/buddy.c:1037
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
+msgid "Software Version"
+msgstr "Ohjelmistoversio"
 
 #: ../libpurple/protocols/jabber/buddy.c:879
 #: ../libpurple/protocols/jabber/buddy.c:1039
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
+msgid "Stream Initiation"
+msgstr "Virtauksen alustus"
 
 #: ../libpurple/protocols/jabber/buddy.c:881
 #: ../libpurple/protocols/jabber/buddy.c:1041
-msgid "Jingle Raw UDP"
-msgstr "Jingle raaka-UDP"
+#: ../libpurple/protocols/sametime/sametime.c:3286
+msgid "File Transfer"
+msgstr "Tiedostonsiirto"
 
 #: ../libpurple/protocols/jabber/buddy.c:883
 #: ../libpurple/protocols/jabber/buddy.c:1043
-msgid "Jingle Video"
-msgstr "Jingle-video"
+msgid "User Mood"
+msgstr "Käyttäjän mieliala"
 
 #: ../libpurple/protocols/jabber/buddy.c:885
 #: ../libpurple/protocols/jabber/buddy.c:1045
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
+msgid "User Activity"
+msgstr "Käyttäjän aktiivisuus"
 
 #: ../libpurple/protocols/jabber/buddy.c:887
 #: ../libpurple/protocols/jabber/buddy.c:1047
-msgid "Message Receipts"
-msgstr "Viestikuittaukset"
+msgid "Entity Capabilities"
+msgstr "Entiteetin ominaisuudet"
 
 #: ../libpurple/protocols/jabber/buddy.c:889
 #: ../libpurple/protocols/jabber/buddy.c:1049
-msgid "Public Key Publishing"
-msgstr "Julkisen avaimen julkaiseminen"
+msgid "Encrypted Session Negotiations"
+msgstr "Salatut istuntojen neuvottelut"
 
 #: ../libpurple/protocols/jabber/buddy.c:891
 #: ../libpurple/protocols/jabber/buddy.c:1051
-msgid "User Chatting"
-msgstr "Käyttäjä keskustelee"
+msgid "User Tune"
+msgstr "Käyttäjänimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:893
 #: ../libpurple/protocols/jabber/buddy.c:1053
-msgid "User Browsing"
-msgstr "Käyttäjä selaa"
+msgid "Roster Item Exchange"
+msgstr "Tuttavaluetteloiden vaihto"
 
 #: ../libpurple/protocols/jabber/buddy.c:895
 #: ../libpurple/protocols/jabber/buddy.c:1055
-msgid "User Gaming"
-msgstr "Käyttäjä pelaa"
+msgid "Reachability Address"
+msgstr "Tavoitettavuusosoite"
 
 #: ../libpurple/protocols/jabber/buddy.c:897
 #: ../libpurple/protocols/jabber/buddy.c:1057
-msgid "User Viewing"
-msgstr "Käyttäjä katselee"
+msgid "User Profile"
+msgstr "Käyttäjän profiili"
 
 #: ../libpurple/protocols/jabber/buddy.c:899
 #: ../libpurple/protocols/jabber/buddy.c:1059
-#: ../libpurple/protocols/silc/ops.c:1600
-#: ../libpurple/protocols/silc/ops.c:1605
+msgid "Jingle"
+msgstr "Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:901
+#: ../libpurple/protocols/jabber/buddy.c:1061
+msgid "Jingle Audio"
+msgstr "Jingle-ääni"
+
+#: ../libpurple/protocols/jabber/buddy.c:903
+#: ../libpurple/protocols/jabber/buddy.c:1063
+msgid "User Nickname"
+msgstr "Käyttäjän kutsumanimi"
+
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:1065
+msgid "Jingle ICE UDP"
+msgstr "Jingle ICE UDP"
+
+#: ../libpurple/protocols/jabber/buddy.c:907
+#: ../libpurple/protocols/jabber/buddy.c:1067
+msgid "Jingle ICE TCP"
+msgstr "Jingle ICE TCP"
+
+#: ../libpurple/protocols/jabber/buddy.c:909
+#: ../libpurple/protocols/jabber/buddy.c:1069
+msgid "Jingle Raw UDP"
+msgstr "Jingle raaka-UDP"
+
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:1071
+msgid "Jingle Video"
+msgstr "Jingle-video"
+
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1073
+msgid "Jingle DTMF"
+msgstr "Jingle DTMF"
+
+#: ../libpurple/protocols/jabber/buddy.c:915
+#: ../libpurple/protocols/jabber/buddy.c:1075
+msgid "Message Receipts"
+msgstr "Viestikuittaukset"
+
+#: ../libpurple/protocols/jabber/buddy.c:917
+#: ../libpurple/protocols/jabber/buddy.c:1077
+msgid "Public Key Publishing"
+msgstr "Julkisen avaimen julkaiseminen"
+
+#: ../libpurple/protocols/jabber/buddy.c:919
+#: ../libpurple/protocols/jabber/buddy.c:1079
+msgid "User Chatting"
+msgstr "Käyttäjä keskustelee"
+
+#: ../libpurple/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:1081
+msgid "User Browsing"
+msgstr "Käyttäjä selaa"
+
+#: ../libpurple/protocols/jabber/buddy.c:923
+#: ../libpurple/protocols/jabber/buddy.c:1083
+msgid "User Gaming"
+msgstr "Käyttäjä pelaa"
+
+#: ../libpurple/protocols/jabber/buddy.c:925
+#: ../libpurple/protocols/jabber/buddy.c:1085
+msgid "User Viewing"
+msgstr "Käyttäjä katselee"
+
+#: ../libpurple/protocols/jabber/buddy.c:927
+#: ../libpurple/protocols/jabber/buddy.c:1087
+#: ../libpurple/protocols/silc/ops.c:1615
+#: ../libpurple/protocols/silc/ops.c:1620
 #: ../libpurple/protocols/silc10/ops.c:1612
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/jabber/buddy.c:901
-#: ../libpurple/protocols/jabber/buddy.c:1061
+#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:1089
 msgid "Stanza Encryption"
 msgstr "Raakalohkojen salaus"
 
-#: ../libpurple/protocols/jabber/buddy.c:903
-#: ../libpurple/protocols/jabber/buddy.c:1063
+#: ../libpurple/protocols/jabber/buddy.c:931
+#: ../libpurple/protocols/jabber/buddy.c:1091
 msgid "Entity Time"
 msgstr "Entiteetin aika"
 
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:1065
+#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/buddy.c:1093
 msgid "Delayed Delivery"
 msgstr "Viivästetty toimitus"
 
-#: ../libpurple/protocols/jabber/buddy.c:907
-#: ../libpurple/protocols/jabber/buddy.c:1067
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/buddy.c:1095
 msgid "Collaborative Data Objects"
 msgstr "Yhteistyötä tekevät dataobjektit"
 
-#: ../libpurple/protocols/jabber/buddy.c:909
-#: ../libpurple/protocols/jabber/buddy.c:1069
+#: ../libpurple/protocols/jabber/buddy.c:937
+#: ../libpurple/protocols/jabber/buddy.c:1097
 msgid "File Repository and Sharing"
 msgstr "Tiedostovarasto ja jakaminen"
 
-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/jabber/buddy.c:1071
+#: ../libpurple/protocols/jabber/buddy.c:939
+#: ../libpurple/protocols/jabber/buddy.c:1099
 msgid "STUN Service Discovery for Jingle"
 msgstr "STUN-palvelun löytäminen Jinglelle"
 
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1073
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/buddy.c:1101
 msgid "Simplified Encrypted Session Negotiation"
 msgstr "Yksinkertaistettu salatun istunnon neuvottelu"
 
-#: ../libpurple/protocols/jabber/buddy.c:915
-#: ../libpurple/protocols/jabber/buddy.c:1075
+#: ../libpurple/protocols/jabber/buddy.c:943
+#: ../libpurple/protocols/jabber/buddy.c:1103
 msgid "Hop Check"
 msgstr "Hyppytarkistus"
 
-#: ../libpurple/protocols/jabber/buddy.c:923
-#: ../libpurple/protocols/jabber/buddy.c:1083
-#: ../libpurple/protocols/oscar/oscar.c:2967
+#: ../libpurple/protocols/jabber/buddy.c:951
+#: ../libpurple/protocols/jabber/buddy.c:1111
+#: ../libpurple/protocols/oscar/oscar.c:2974
 msgid "Capabilities"
 msgstr "Kyvyt"
 
-#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/buddy.c:963
 #: ../libpurple/protocols/jabber/libxmpp.c:209
 #: ../libpurple/protocols/jabber/si.c:1094
 msgid "Resource"
 msgstr "Sijainti"
 
-#: ../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
+#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/jabber.c:1610
+#: ../libpurple/protocols/jabber/jabber.c:1624
+#: ../libpurple/protocols/jabber/jabber.c:1638
+#: ../libpurple/protocols/jabber/jabber.c:1652
+#: ../libpurple/protocols/jabber/jabber.c:1666
 msgid "Priority"
 msgstr "Tärkeys"
 
-#: ../libpurple/protocols/jabber/buddy.c:1241
-#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/jabber/buddy.c:1274
+#: ../libpurple/protocols/silc/ops.c:1009
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
-#: ../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/jabber/buddy.c:1307
+#: ../libpurple/protocols/jabber/jabber.c:1014
+#: ../libpurple/protocols/oscar/oscar.c:3835
+#: ../libpurple/protocols/oscar/oscar.c:3848
 #: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc/ops.c:1045
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Osoite"
 
-#: ../libpurple/protocols/jabber/buddy.c:1280
+#: ../libpurple/protocols/jabber/buddy.c:1313
 msgid "P.O. Box"
 msgstr "Postilokero"
 
-#: ../libpurple/protocols/jabber/buddy.c:1390
+#: ../libpurple/protocols/jabber/buddy.c:1423
 msgid "Photo"
 msgstr "Valokuva"
 
-#: ../libpurple/protocols/jabber/buddy.c:1390
+#: ../libpurple/protocols/jabber/buddy.c:1423
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1949
+#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Un-hide From"
 msgstr "\"Tule esiin\""
 
-#: ../libpurple/protocols/jabber/buddy.c:1953
+#: ../libpurple/protocols/jabber/buddy.c:1996
 msgid "Temporarily Hide From"
 msgstr "Piiloudu väliaikaisesti tuttavalta"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1961
+#: ../libpurple/protocols/jabber/buddy.c:2004
 msgid "Cancel Presence Notification"
 msgstr "Peru paikallaoloilmoitus"
 
-#: ../libpurple/protocols/jabber/buddy.c:1968
+#: ../libpurple/protocols/jabber/buddy.c:2011
 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:1977
+#: ../libpurple/protocols/jabber/buddy.c:2020
 msgid "Unsubscribe"
 msgstr "Poista listalta"
 
-#: ../libpurple/protocols/jabber/buddy.c:1992
+#: ../libpurple/protocols/jabber/buddy.c:2035
 msgid "Log In"
 msgstr "Kirjaudu sisään"
 
-#: ../libpurple/protocols/jabber/buddy.c:1996
+#: ../libpurple/protocols/jabber/buddy.c:2039
 msgid "Log Out"
 msgstr "Kirjaudu ulos"
 
-#: ../libpurple/protocols/jabber/buddy.c:2042
-#: ../libpurple/protocols/jabber/jabber.c:1613
+#: ../libpurple/protocols/jabber/buddy.c:2085
+#: ../libpurple/protocols/jabber/jabber.c:1623
 msgid "Chatty"
 msgstr "Juttelutuulella"
 
-#: ../libpurple/protocols/jabber/buddy.c:2046
+#: ../libpurple/protocols/jabber/buddy.c:2089
 msgid "Extended Away"
 msgstr "Pidennetty poissaolo"
 
-#: ../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
+#: ../libpurple/protocols/jabber/buddy.c:2091
+#: ../libpurple/protocols/jabber/jabber.c:1665
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5937
+#: ../libpurple/protocols/sametime/sametime.c:3348
+#, c-format
 msgid "Do Not Disturb"
 msgstr "Älä häiritse"
 
-#: ../libpurple/protocols/jabber/buddy.c:2215
+#: ../libpurple/protocols/jabber/buddy.c:2258
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2219
-#: ../libpurple/protocols/jabber/buddy.c:2408
-#: ../libpurple/protocols/oscar/oscar.c:3744
+#: ../libpurple/protocols/jabber/buddy.c:2262
+#: ../libpurple/protocols/jabber/buddy.c:2451
+#: ../libpurple/protocols/oscar/oscar.c:3758
 msgid "Last Name"
 msgstr "Sukunimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:2251
+#: ../libpurple/protocols/jabber/buddy.c:2294
 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:2336
+#: ../libpurple/protocols/jabber/buddy.c:2379
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -5529,68 +5539,68 @@
 "Etsi henkilöä syöttämällä hakukriteerit kenttiin. Huom: jokainen kenttä "
 "tukee jokerimerkkejä (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:2356
+#: ../libpurple/protocols/jabber/buddy.c:2399
 msgid "Directory Query Failed"
 msgstr "Hakemistohaku epäonnistui"
 
-#: ../libpurple/protocols/jabber/buddy.c:2357
+#: ../libpurple/protocols/jabber/buddy.c:2400
 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:2391
+#: ../libpurple/protocols/jabber/buddy.c:2434
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Palvelimen ohjeet: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2398
+#: ../libpurple/protocols/jabber/buddy.c:2441
 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:2418
+#: ../libpurple/protocols/jabber/buddy.c:2461
 #: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:3747
-#: ../libpurple/protocols/oscar/oscar.c:3756
+#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/oscar/oscar.c:3770
 msgid "E-Mail Address"
 msgstr "Sähköpostiosoite"
 
-#: ../libpurple/protocols/jabber/buddy.c:2427
-#: ../libpurple/protocols/jabber/buddy.c:2428
+#: ../libpurple/protocols/jabber/buddy.c:2470
+#: ../libpurple/protocols/jabber/buddy.c:2471
 msgid "Search for XMPP users"
 msgstr "Etsi XMPP-käyttäjiä"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2429
+#: ../libpurple/protocols/jabber/buddy.c:2472
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../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
+#: ../libpurple/protocols/sametime/sametime.c:5666
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:474
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Etsi"
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
+#: ../libpurple/protocols/jabber/buddy.c:2487
 msgid "Invalid Directory"
 msgstr "Virheellinen kansio"
 
-#: ../libpurple/protocols/jabber/buddy.c:2461
+#: ../libpurple/protocols/jabber/buddy.c:2504
 msgid "Enter a User Directory"
 msgstr "Syötä käyttäjähakemisto"
 
-#: ../libpurple/protocols/jabber/buddy.c:2462
+#: ../libpurple/protocols/jabber/buddy.c:2505
 msgid "Select a user directory to search"
 msgstr "Valitse käyttäjähakemisto, josta haetaan"
 
-#: ../libpurple/protocols/jabber/buddy.c:2465
+#: ../libpurple/protocols/jabber/buddy.c:2508
 msgid "Search Directory"
 msgstr "Etsi hakemistosta"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5391
+#: ../libpurple/protocols/oscar/oscar.c:5417
 #: ../libpurple/protocols/yahoo/yahoochat.c:1057
 msgid "_Room:"
 msgstr "_Huone:"
@@ -5660,7 +5670,7 @@
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1460
+#: ../libpurple/protocols/silc/ops.c:1475
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Virhe haettaessa huoneluetteloa"
@@ -5695,15 +5705,15 @@
 msgid "Ping timeout"
 msgstr "Pingin aikakatkaisu"
 
-#: ../libpurple/protocols/jabber/jabber.c:448
-#: ../libpurple/protocols/jabber/jabber.c:488
+#: ../libpurple/protocols/jabber/jabber.c:451
+#: ../libpurple/protocols/jabber/jabber.c:491
 msgid "Read Error"
 msgstr "Virhe luettaessa"
 
-#: ../libpurple/protocols/jabber/jabber.c:525
+#: ../libpurple/protocols/jabber/jabber.c:528
 #: ../libpurple/protocols/oscar/flap_connection.c:398
-#: ../libpurple/protocols/yahoo/yahoo.c:2576
-#: ../libpurple/protocols/yahoo/yahoo.c:2608
+#: ../libpurple/protocols/yahoo/yahoo.c:2594
+#: ../libpurple/protocols/yahoo/yahoo.c:2626
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5712,601 +5722,601 @@
 "Yhteyttä palvelimeen ei voi muodostaa:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:575
+#: ../libpurple/protocols/jabber/jabber.c:585
 msgid "Unable to create socket"
 msgstr "Pistokkeen luonti epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:625
-#: ../libpurple/protocols/jabber/jabber.c:1110
+#: ../libpurple/protocols/jabber/jabber.c:635
+#: ../libpurple/protocols/jabber/jabber.c:1120
 msgid "Invalid XMPP ID"
 msgstr "Epäkelpo XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:632
+#: ../libpurple/protocols/jabber/jabber.c:642
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Epäkelpo XMPP-ID. Verkkoalue pitää olla asetettu."
 
-#: ../libpurple/protocols/jabber/jabber.c:710
+#: ../libpurple/protocols/jabber/jabber.c:720
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s:n rekisteröinti onnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:716
+#: ../libpurple/protocols/jabber/jabber.c:726
 #, c-format
 msgid "Registration to %s successful"
 msgstr "Rekisteröinti kohteeseen %s onnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:718
-#: ../libpurple/protocols/jabber/jabber.c:719
+#: ../libpurple/protocols/jabber/jabber.c:728
+#: ../libpurple/protocols/jabber/jabber.c:729
 msgid "Registration Successful"
 msgstr "Rekisteröinti onnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:727
-#: ../libpurple/protocols/jabber/jabber.c:728
+#: ../libpurple/protocols/jabber/jabber.c:737
+#: ../libpurple/protocols/jabber/jabber.c:738
 msgid "Registration Failed"
 msgstr "Rekisteröinti epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:746
+#: ../libpurple/protocols/jabber/jabber.c:756
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr "Rekisteröinti kohteesta %s onnistuneesti poistettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:748
-#: ../libpurple/protocols/jabber/jabber.c:749
+#: ../libpurple/protocols/jabber/jabber.c:758
+#: ../libpurple/protocols/jabber/jabber.c:759
 msgid "Unregistration Successful"
 msgstr "Rekisteröinnin poisto onnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:757
-#: ../libpurple/protocols/jabber/jabber.c:758
+#: ../libpurple/protocols/jabber/jabber.c:767
+#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Unregistration Failed"
 msgstr "Rekisteröinnin poisto epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:924
-#: ../libpurple/protocols/jabber/jabber.c:925
+#: ../libpurple/protocols/jabber/jabber.c:934
+#: ../libpurple/protocols/jabber/jabber.c:935
 msgid "Already Registered"
 msgstr "Valmiiksi rekisteröity"
 
-#: ../libpurple/protocols/jabber/jabber.c:1012
-#: ../libpurple/protocols/oscar/oscar.c:3823
-#: ../libpurple/protocols/oscar/oscar.c:3836
+#: ../libpurple/protocols/jabber/jabber.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:3837
+#: ../libpurple/protocols/oscar/oscar.c:3850
 msgid "State"
 msgstr "Lääni"
 
-#: ../libpurple/protocols/jabber/jabber.c:1016
+#: ../libpurple/protocols/jabber/jabber.c:1026
 msgid "Postal code"
 msgstr "Postinumero"
 
-#: ../libpurple/protocols/jabber/jabber.c:1020
-#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/jabber/jabber.c:1030
+#: ../libpurple/protocols/silc/ops.c:1050
 #: ../libpurple/protocols/silc/silc.c:915
-#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc/util.c:567
 #: ../libpurple/protocols/silc10/ops.c:1069
 #: ../libpurple/protocols/silc10/silc.c:689
-#: ../libpurple/protocols/silc10/util.c:553
+#: ../libpurple/protocols/silc10/util.c:557
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../libpurple/protocols/jabber/jabber.c:1028
+#: ../libpurple/protocols/jabber/jabber.c:1038
 msgid "Date"
 msgstr "Päiväys"
 
-#: ../libpurple/protocols/jabber/jabber.c:1032
+#: ../libpurple/protocols/jabber/jabber.c:1042
 msgid "Unregister"
 msgstr "Rekisteröinnin poisto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1039
+#: ../libpurple/protocols/jabber/jabber.c:1049
 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:1042
+#: ../libpurple/protocols/jabber/jabber.c:1052
 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:1050
-#: ../libpurple/protocols/jabber/jabber.c:1051
+#: ../libpurple/protocols/jabber/jabber.c:1060
+#: ../libpurple/protocols/jabber/jabber.c:1061
 msgid "Register New XMPP Account"
 msgstr "Rekisteröi uusi XMPP-tili"
 
-#: ../libpurple/protocols/jabber/jabber.c:1052
-#: ../libpurple/protocols/jabber/jabber.c:1061
+#: ../libpurple/protocols/jabber/jabber.c:1062
+#: ../libpurple/protocols/jabber/jabber.c:1071
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1057
+#: ../libpurple/protocols/jabber/jabber.c:1067
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "Vaihda tilin rekisteröitymistä kohteessa %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1058
+#: ../libpurple/protocols/jabber/jabber.c:1068
 #, c-format
 msgid "Register New Account at %s"
 msgstr "Rekisteröi uusi tili kohteessa %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1061
+#: ../libpurple/protocols/jabber/jabber.c:1071
 msgid "Change Registration"
 msgstr "Muuta rekisteröitymistä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
-#: ../libpurple/protocols/jabber/jabber.c:1171
+#: ../libpurple/protocols/jabber/jabber.c:1180
+#: ../libpurple/protocols/jabber/jabber.c:1181
 msgid "Error unregistering account"
 msgstr "Virhe poistettaessa käyttäjätilin rekisteröitymistä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1176
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1186
+#: ../libpurple/protocols/jabber/jabber.c:1187
 msgid "Account successfully unregistered"
 msgstr "Käyttäjätilin rekisteröinti poistettiin onnistuneesti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1340
+#: ../libpurple/protocols/jabber/jabber.c:1350
 msgid "Initializing Stream"
 msgstr "Alustetaan datavirtaa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1345
+#: ../libpurple/protocols/jabber/jabber.c:1355
 msgid "Initializing SSL/TLS"
 msgstr "Alustetaan SSL/TLS-salausta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1349
+#: ../libpurple/protocols/jabber/jabber.c:1359
 #: ../libpurple/protocols/msn/session.c:408
 #: ../libpurple/protocols/msnp9/session.c:360
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: ../libpurple/protocols/jabber/jabber.c:1358
+#: ../libpurple/protocols/jabber/jabber.c:1368
 msgid "Re-initializing Stream"
 msgstr "Uudelleenalustetaan datavirtaa"
 
-#: ../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
+#: ../libpurple/protocols/jabber/jabber.c:1462
+#: ../libpurple/protocols/jabber/jabber.c:1920
+#: ../libpurple/protocols/jabber/jabber.c:1963
+#: ../libpurple/protocols/jabber/jabber.c:2001
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:5731
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Both"
 msgstr "molemmille"
 
-#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "From (To pending)"
 msgstr "vain sinulle (odottaa lupaa)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "From"
 msgstr "Lähettäjä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/jabber/jabber.c:1517
 msgid "To"
 msgstr "vain sinulta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1509
+#: ../libpurple/protocols/jabber/jabber.c:1519
 msgid "None (To pending)"
 msgstr "Ei mitään (odottaa lupaa)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1511
+#: ../libpurple/protocols/jabber/jabber.c:1521
 #: ../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:1514
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Subscription"
 msgstr "Tilailmoitus"
 
-#: ../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/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1612
+#: ../libpurple/protocols/jabber/jabber.c:1626
+#: ../libpurple/protocols/jabber/jabber.c:1640
+#: ../libpurple/protocols/jabber/jabber.c:1654
+#: ../libpurple/protocols/jabber/jabber.c:1668
 #: ../libpurple/protocols/jabber/usermood.c:184
 #: ../libpurple/protocols/silc/buddy.c:1560
-#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc/ops.c:1227
 #: ../libpurple/protocols/silc10/buddy.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Mieliala"
 
-#: ../libpurple/protocols/jabber/jabber.c:1536
-#: ../libpurple/protocols/msn/msn.c:642
+#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/msn/msn.c:656
 msgid "Now Listening"
 msgstr "Kuuntelee nyt"
 
-#: ../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
+#: ../libpurple/protocols/jabber/jabber.c:1613
+#: ../libpurple/protocols/jabber/jabber.c:1627
+#: ../libpurple/protocols/jabber/jabber.c:1641
+#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/jabber/jabber.c:1669
 msgid "Mood Text"
 msgstr "Mielialan teksti"
 
-#: ../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
+#: ../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:1671
 msgid "Allow Buzz"
 msgstr "Salli äänimerkki"
 
-#: ../libpurple/protocols/jabber/jabber.c:1679
+#: ../libpurple/protocols/jabber/jabber.c:1689
 msgid "Tune Artist"
 msgstr "Kappaleen esittäjä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1680
+#: ../libpurple/protocols/jabber/jabber.c:1690
 msgid "Tune Title"
 msgstr "Kappaleen nimi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1681
+#: ../libpurple/protocols/jabber/jabber.c:1691
 msgid "Tune Album"
 msgstr "Kappaleen levy"
 
-#: ../libpurple/protocols/jabber/jabber.c:1682
+#: ../libpurple/protocols/jabber/jabber.c:1692
 msgid "Tune Genre"
 msgstr "Kappaleen tyylilaji"
 
-#: ../libpurple/protocols/jabber/jabber.c:1683
+#: ../libpurple/protocols/jabber/jabber.c:1693
 msgid "Tune Comment"
 msgstr "Kappaleen kommentti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1684
+#: ../libpurple/protocols/jabber/jabber.c:1694
 msgid "Tune Track"
 msgstr "Kappaleen numero"
 
-#: ../libpurple/protocols/jabber/jabber.c:1685
+#: ../libpurple/protocols/jabber/jabber.c:1695
 msgid "Tune Time"
 msgstr "Kappaleen kesto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1686
+#: ../libpurple/protocols/jabber/jabber.c:1696
 msgid "Tune Year"
 msgstr "Kappaleen vuosi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1687
+#: ../libpurple/protocols/jabber/jabber.c:1697
 msgid "Tune URL"
 msgstr "Kappaleen URL"
 
-#: ../libpurple/protocols/jabber/jabber.c:1703
+#: ../libpurple/protocols/jabber/jabber.c:1713
 msgid "Password Changed"
 msgstr "Salasana muutettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1704
+#: ../libpurple/protocols/jabber/jabber.c:1714
 msgid "Your password has been changed."
 msgstr "Salasana vaihdettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1710
-#: ../libpurple/protocols/jabber/jabber.c:1711
+#: ../libpurple/protocols/jabber/jabber.c:1720
+#: ../libpurple/protocols/jabber/jabber.c:1721
 msgid "Error changing password"
 msgstr "Virhe vaihdettaessa salasanaa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1768
+#: ../libpurple/protocols/jabber/jabber.c:1778
 msgid "Password (again)"
 msgstr "Salasana (uudelleen)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1774
-#: ../libpurple/protocols/jabber/jabber.c:1775
+#: ../libpurple/protocols/jabber/jabber.c:1784
+#: ../libpurple/protocols/jabber/jabber.c:1785
 msgid "Change XMPP Password"
 msgstr "Vaihda XMPP-salasana"
 
-#: ../libpurple/protocols/jabber/jabber.c:1775
+#: ../libpurple/protocols/jabber/jabber.c:1785
 msgid "Please enter your new password"
 msgstr "Anna uusi salasanasi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1789
-#: ../libpurple/protocols/oscar/oscar.c:6491
+#: ../libpurple/protocols/jabber/jabber.c:1799
+#: ../libpurple/protocols/oscar/oscar.c:6518
 #: ../libpurple/protocols/silc/silc.c:1236
 #: ../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:1794
-#: ../libpurple/protocols/oscar/oscar.c:6502
+#: ../libpurple/protocols/jabber/jabber.c:1804
+#: ../libpurple/protocols/oscar/oscar.c:6529
 #: ../libpurple/protocols/silc/silc.c:1232
 #: ../libpurple/protocols/silc10/silc.c:1006
 msgid "Change Password..."
 msgstr "Vaihda salasana..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1799
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "Search for Users..."
 msgstr "Etsi käyttäjiä..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1890
+#: ../libpurple/protocols/jabber/jabber.c:1900
 msgid "Bad Request"
 msgstr "Virheellinen pyyntö"
 
-#: ../libpurple/protocols/jabber/jabber.c:1892
+#: ../libpurple/protocols/jabber/jabber.c:1902
 msgid "Conflict"
 msgstr "Ristiriita"
 
-#: ../libpurple/protocols/jabber/jabber.c:1894
+#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Feature Not Implemented"
 msgstr "Ominaisuutta ei ole implementoitu."
 
-#: ../libpurple/protocols/jabber/jabber.c:1896
+#: ../libpurple/protocols/jabber/jabber.c:1906
 msgid "Forbidden"
 msgstr "Estetty"
 
-#: ../libpurple/protocols/jabber/jabber.c:1898
+#: ../libpurple/protocols/jabber/jabber.c:1908
 msgid "Gone"
 msgstr "Poistunut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1900
-#: ../libpurple/protocols/jabber/jabber.c:1981
+#: ../libpurple/protocols/jabber/jabber.c:1910
+#: ../libpurple/protocols/jabber/jabber.c:1991
 msgid "Internal Server Error"
 msgstr "Sisäinen palvelinvirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1902
+#: ../libpurple/protocols/jabber/jabber.c:1912
 msgid "Item Not Found"
 msgstr "Kohdetta ei löytynyt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1904
+#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Malformed XMPP ID"
 msgstr "Muodoltaan virheellinen XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1906
+#: ../libpurple/protocols/jabber/jabber.c:1916
 msgid "Not Acceptable"
 msgstr "Ei kelvollinen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1908
+#: ../libpurple/protocols/jabber/jabber.c:1918
 msgid "Not Allowed"
 msgstr "Ei sallittu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1912
+#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Payment Required"
 msgstr "Vaatii maksun"
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Recipient Unavailable"
 msgstr "Vastaanottaja ei saatavilla."
 
-#: ../libpurple/protocols/jabber/jabber.c:1918
+#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Registration Required"
 msgstr "Vaatii rekisteröinnin"
 
-#: ../libpurple/protocols/jabber/jabber.c:1920
+#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Remote Server Not Found"
 msgstr "Palvelinta ei löytynyt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1932
 msgid "Remote Server Timeout"
 msgstr "Palvelin aikakatkaisi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1924
+#: ../libpurple/protocols/jabber/jabber.c:1934
 msgid "Server Overloaded"
 msgstr "Palvelin ylikuormitettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1926
+#: ../libpurple/protocols/jabber/jabber.c:1936
 msgid "Service Unavailable"
 msgstr "Palvelu ei käytettävissä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1928
+#: ../libpurple/protocols/jabber/jabber.c:1938
 msgid "Subscription Required"
 msgstr "Vaatii tilailmoitukset"
 
-#: ../libpurple/protocols/jabber/jabber.c:1930
+#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Unexpected Request"
 msgstr "Odottamaton pyyntö"
 
-#: ../libpurple/protocols/jabber/jabber.c:1938
+#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "Authorization Aborted"
 msgstr "Valtuutus keskeytetty"
 
-#: ../libpurple/protocols/jabber/jabber.c:1940
+#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "Incorrect encoding in authorization"
 msgstr "Väärä merkistö valtuutusviestissä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1942
+#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Invalid authzid"
 msgstr "Epäkelpo authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1944
+#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Invalid Authorization Mechanism"
 msgstr "Epäkelpo tunnistautumismekanismi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1947
+#: ../libpurple/protocols/jabber/jabber.c:1957
 msgid "Authorization mechanism too weak"
 msgstr "Tunnistautumismekanismi liian heikko"
 
-#: ../libpurple/protocols/jabber/jabber.c:1955
+#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Temporary Authentication Failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1958
+#: ../libpurple/protocols/jabber/jabber.c:1968
 msgid "Authentication Failure"
 msgstr "Todennus epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:1966
+#: ../libpurple/protocols/jabber/jabber.c:1976
 msgid "Bad Format"
 msgstr "Väärä muoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1968
+#: ../libpurple/protocols/jabber/jabber.c:1978
 msgid "Bad Namespace Prefix"
 msgstr "Väärä nimiavaruuden etuliite"
 
-#: ../libpurple/protocols/jabber/jabber.c:1971
+#: ../libpurple/protocols/jabber/jabber.c:1981
 msgid "Resource Conflict"
 msgstr "Sijaintikonflikti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1973
+#: ../libpurple/protocols/jabber/jabber.c:1983
 #: ../libpurple/protocols/silc/silc.c:350
 #: ../libpurple/protocols/silc10/ops.c:1725
 msgid "Connection Timeout"
 msgstr "Ei yhteyttä määräajassa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1975
+#: ../libpurple/protocols/jabber/jabber.c:1985
 msgid "Host Gone"
 msgstr "Verkkoisäntä kadonnut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1977
+#: ../libpurple/protocols/jabber/jabber.c:1987
 msgid "Host Unknown"
 msgstr "Tuntematon isäntä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1979
+#: ../libpurple/protocols/jabber/jabber.c:1989
 msgid "Improper Addressing"
 msgstr "Vääränlainen osoitus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1983
+#: ../libpurple/protocols/jabber/jabber.c:1993
 msgid "Invalid ID"
 msgstr "Epäkelpo ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1985
+#: ../libpurple/protocols/jabber/jabber.c:1995
 msgid "Invalid Namespace"
 msgstr "Väärä nimiavaruus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1987
+#: ../libpurple/protocols/jabber/jabber.c:1997
 msgid "Invalid XML"
 msgstr "Epäkelpo XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1989
+#: ../libpurple/protocols/jabber/jabber.c:1999
 msgid "Non-matching Hosts"
 msgstr "Verkkoisännät eivät täsmää"
 
-#: ../libpurple/protocols/jabber/jabber.c:1993
+#: ../libpurple/protocols/jabber/jabber.c:2003
 msgid "Policy Violation"
 msgstr "Menettelykäytäntörikkomus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1995
+#: ../libpurple/protocols/jabber/jabber.c:2005
 msgid "Remote Connection Failed"
 msgstr "Etäyhteydessä yhteydessä virhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1997
+#: ../libpurple/protocols/jabber/jabber.c:2007
 msgid "Resource Constraint"
 msgstr "Sijaintirajoite"
 
-#: ../libpurple/protocols/jabber/jabber.c:1999
+#: ../libpurple/protocols/jabber/jabber.c:2009
 msgid "Restricted XML"
 msgstr "Rajoitettu XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:2001
+#: ../libpurple/protocols/jabber/jabber.c:2011
 msgid "See Other Host"
 msgstr "Etsi toinen isäntä"
 
-#: ../libpurple/protocols/jabber/jabber.c:2003
+#: ../libpurple/protocols/jabber/jabber.c:2013
 msgid "System Shutdown"
 msgstr "Järjestelmän alasajo"
 
-#: ../libpurple/protocols/jabber/jabber.c:2005
+#: ../libpurple/protocols/jabber/jabber.c:2015
 msgid "Undefined Condition"
 msgstr "Määrittelemätön tila"
 
-#: ../libpurple/protocols/jabber/jabber.c:2007
+#: ../libpurple/protocols/jabber/jabber.c:2017
 msgid "Unsupported Encoding"
 msgstr "Merkistöä ei tueta"
 
-#: ../libpurple/protocols/jabber/jabber.c:2009
+#: ../libpurple/protocols/jabber/jabber.c:2019
 msgid "Unsupported Stanza Type"
 msgstr "Säkeistötyyppiä (stanza type) ei tuettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:2011
+#: ../libpurple/protocols/jabber/jabber.c:2021
 msgid "Unsupported Version"
 msgstr "Versiota ei tueta"
 
-#: ../libpurple/protocols/jabber/jabber.c:2013
+#: ../libpurple/protocols/jabber/jabber.c:2023
 msgid "XML Not Well Formed"
 msgstr "Huonosti muotoiltua XML:ää"
 
-#: ../libpurple/protocols/jabber/jabber.c:2015
+#: ../libpurple/protocols/jabber/jabber.c:2025
 msgid "Stream Error"
 msgstr "Datavirtavirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:2100
+#: ../libpurple/protocols/jabber/jabber.c:2110
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Käyttäjää %s ei voi estää"
 
-#: ../libpurple/protocols/jabber/jabber.c:2120
+#: ../libpurple/protocols/jabber/jabber.c:2130
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Tuntematon kytkös: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2125
+#: ../libpurple/protocols/jabber/jabber.c:2135
 #, 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:2144
+#: ../libpurple/protocols/jabber/jabber.c:2154
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Tuntematon rooli: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2149
+#: ../libpurple/protocols/jabber/jabber.c:2159
 #, 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:2202
+#: ../libpurple/protocols/jabber/jabber.c:2212
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Käyttäjää %s ei voi potkaista ulos."
 
-#: ../libpurple/protocols/jabber/jabber.c:2233
+#: ../libpurple/protocols/jabber/jabber.c:2243
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "Käyttäjää %s ei voi pingata."
 
-#: ../libpurple/protocols/jabber/jabber.c:2251
-#: ../libpurple/protocols/jabber/jabber.c:2262
+#: ../libpurple/protocols/jabber/jabber.c:2261
+#: ../libpurple/protocols/jabber/jabber.c:2272
 #, 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:2257
+#: ../libpurple/protocols/jabber/jabber.c:2267
 #, 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:2288
+#: ../libpurple/protocols/jabber/jabber.c:2298
 #, 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ä."
 
 #. 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
+#: ../libpurple/protocols/jabber/jabber.c:2318
+#: ../libpurple/protocols/yahoo/yahoo.c:4163
 msgid "Buzz"
 msgstr "Tööttää"
 
-#: ../libpurple/protocols/jabber/jabber.c:2309
+#: ../libpurple/protocols/jabber/jabber.c:2319
 #: ../libpurple/protocols/jabber/message.c:308
-#: ../libpurple/protocols/yahoo/yahoo.c:4144
+#: ../libpurple/protocols/yahoo/yahoo.c:4164
 #, c-format
 msgid "%s has buzzed you!"
 msgstr "%s on töötännyt sinulle."
 
-#: ../libpurple/protocols/jabber/jabber.c:2309
-#: ../libpurple/protocols/yahoo/yahoo.c:4144
+#: ../libpurple/protocols/jabber/jabber.c:2319
+#: ../libpurple/protocols/yahoo/yahoo.c:4164
 #, c-format
 msgid "Buzzing %s..."
 msgstr "Töötätään tuttavalle %s..."
 
-#: ../libpurple/protocols/jabber/jabber.c:2340
+#: ../libpurple/protocols/jabber/jabber.c:2350
 msgid "config:  Configure a chat room."
 msgstr "config: Konfiguroi ryhmäkeskusteluhuone."
 
-#: ../libpurple/protocols/jabber/jabber.c:2344
+#: ../libpurple/protocols/jabber/jabber.c:2354
 msgid "configure:  Configure a chat room."
 msgstr "configure: Konfiguroi ryhmäkeskusteluhuone."
 
-#: ../libpurple/protocols/jabber/jabber.c:2353
+#: ../libpurple/protocols/jabber/jabber.c:2363
 msgid "part [room]:  Leave the room."
 msgstr "part [huone]: Poistu huoneesta."
 
-#: ../libpurple/protocols/jabber/jabber.c:2358
+#: ../libpurple/protocols/jabber/jabber.c:2368
 msgid "register:  Register with a chat room."
 msgstr "register: Rekisteröidy ryhmäkeskusteluhuoneeseen."
 
-#: ../libpurple/protocols/jabber/jabber.c:2364
+#: ../libpurple/protocols/jabber/jabber.c:2374
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [uusi aihe]: Näytä tai vaihda aihe."
 
-#: ../libpurple/protocols/jabber/jabber.c:2370
+#: ../libpurple/protocols/jabber/jabber.c:2380
 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:2376
+#: ../libpurple/protocols/jabber/jabber.c:2386
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6314,7 +6324,7 @@
 "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:2382
+#: ../libpurple/protocols/jabber/jabber.c:2392
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6322,31 +6332,31 @@
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Aseta "
 "käyttäjän rooli huoneessa."
 
-#: ../libpurple/protocols/jabber/jabber.c:2388
+#: ../libpurple/protocols/jabber/jabber.c:2398
 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:2394
+#: ../libpurple/protocols/jabber/jabber.c:2404
 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:2400
+#: ../libpurple/protocols/jabber/jabber.c:2410
 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:2405
+#: ../libpurple/protocols/jabber/jabber.c:2415
 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:2411
+#: ../libpurple/protocols/jabber/jabber.c:2421
 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:2416
-#: ../libpurple/protocols/yahoo/yahoo.c:4167
+#: ../libpurple/protocols/jabber/jabber.c:2426
+#: ../libpurple/protocols/yahoo/yahoo.c:4187
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Tööttää tuttavalle äänimerkki huomion saamiseksi"
 
@@ -6382,8 +6392,12 @@
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Salli salaamaton tunnistautuminen salaamattoman yhteyden yli"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:227
-#: ../libpurple/protocols/myspace/myspace.c:3466
+#: ../libpurple/protocols/jabber/libxmpp.c:229
+msgid "Use GSSAPI (Kerberos v5) for authentication"
+msgstr "Käytä tunnistautumiseen GSSAPIa (Kerberos v5)"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:235
+#: ../libpurple/protocols/myspace/myspace.c:3468
 #: ../libpurple/protocols/simple/simple.c:2105
 msgid "Connect port"
 msgstr "Yhdistä porttiin"
@@ -6391,14 +6405,14 @@
 #. TODO: default to automatically try different ports. Make the user be
 #. * 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:3463
+#: ../libpurple/protocols/jabber/libxmpp.c:239
+#: ../libpurple/protocols/myspace/myspace.c:3465
 #: ../libpurple/protocols/silc/silc.c:2057
 #: ../libpurple/protocols/silc10/silc.c:1863 ../pidgin/gtkaccount.c:809
 msgid "Connect server"
 msgstr "Yhdistä palvelimeen"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:236
+#: ../libpurple/protocols/jabber/libxmpp.c:244
 msgid "File transfer proxies"
 msgstr "Tiedostonsiirron välipalvelimet"
 
@@ -6550,11 +6564,11 @@
 msgid "Set Nickname..."
 msgstr "Aseta kutsumanimi..."
 
-#: ../libpurple/protocols/jabber/xdata.c:378
+#: ../libpurple/protocols/jabber/xdata.c:381
 msgid "Actions"
 msgstr "Toiminnot"
 
-#: ../libpurple/protocols/jabber/xdata.c:380
+#: ../libpurple/protocols/jabber/xdata.c:383
 msgid "Select an action"
 msgstr "Valitse toiminto"
 
@@ -6590,163 +6604,195 @@
 
 #: ../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:760
+#, c-format
 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:121
+#, c-format
 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"
 
@@ -6756,110 +6802,131 @@
 #: ../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:1418
+#: ../libpurple/protocols/oscar/oscar.c:1422
 #: ../libpurple/protocols/silc/silc.c:338
 #: ../libpurple/protocols/silc10/ops.c:1713
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1399
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1448
+#, c-format
 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"
 
@@ -6893,31 +6960,31 @@
 msgid "Your new MSN friendly name is too long."
 msgstr "Uusi MSN-tuttavanimesi on liian pitkä."
 
-#: ../libpurple/protocols/msn/msn.c:282 ../libpurple/protocols/msnp9/msn.c:279
+#: ../libpurple/protocols/msn/msn.c:296 ../libpurple/protocols/msnp9/msn.c:279
 msgid "Set your friendly name."
 msgstr "Aseta tuttavanimesi."
 
-#: ../libpurple/protocols/msn/msn.c:283 ../libpurple/protocols/msnp9/msn.c:280
+#: ../libpurple/protocols/msn/msn.c:297 ../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:301 ../libpurple/protocols/msnp9/msn.c:298
+#: ../libpurple/protocols/msn/msn.c:315 ../libpurple/protocols/msnp9/msn.c:298
 msgid "Set your home phone number."
 msgstr "Aseta kotipuhelinnumerosi"
 
-#: ../libpurple/protocols/msn/msn.c:318 ../libpurple/protocols/msnp9/msn.c:315
+#: ../libpurple/protocols/msn/msn.c:332 ../libpurple/protocols/msnp9/msn.c:315
 msgid "Set your work phone number."
 msgstr "Aseta työpuhelinnumerosi"
 
-#: ../libpurple/protocols/msn/msn.c:335 ../libpurple/protocols/msnp9/msn.c:332
+#: ../libpurple/protocols/msn/msn.c:349 ../libpurple/protocols/msnp9/msn.c:332
 msgid "Set your mobile phone number."
 msgstr "Aseta matkapuhelinnumerosi"
 
-#: ../libpurple/protocols/msn/msn.c:350 ../libpurple/protocols/msnp9/msn.c:347
+#: ../libpurple/protocols/msn/msn.c:364 ../libpurple/protocols/msnp9/msn.c:347
 msgid "Allow MSN Mobile pages?"
 msgstr "Salli MSN-mobiilihaut"
 
-#: ../libpurple/protocols/msn/msn.c:351 ../libpurple/protocols/msnp9/msn.c:348
+#: ../libpurple/protocols/msn/msn.c:365 ../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?"
@@ -6925,47 +6992,47 @@
 "Haluatko sallia tai estää henkilöitä tuttavissasi lähettämästä MSN- "
 "mobiilihakuja matkapuhelimeesi tai muuhun mobiililaitteeseen?"
 
-#: ../libpurple/protocols/msn/msn.c:357 ../libpurple/protocols/msnp9/msn.c:354
+#: ../libpurple/protocols/msn/msn.c:371 ../libpurple/protocols/msnp9/msn.c:354
 msgid "Allow"
 msgstr "Salli"
 
-#: ../libpurple/protocols/msn/msn.c:358 ../libpurple/protocols/msnp9/msn.c:355
+#: ../libpurple/protocols/msn/msn.c:372 ../libpurple/protocols/msnp9/msn.c:355
 msgid "Disallow"
 msgstr "Kiellä"
 
-#: ../libpurple/protocols/msn/msn.c:374 ../libpurple/protocols/msnp9/msn.c:371
+#: ../libpurple/protocols/msn/msn.c:388 ../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:400 ../libpurple/protocols/msnp9/msn.c:397
+#: ../libpurple/protocols/msn/msn.c:414 ../libpurple/protocols/msnp9/msn.c:397
 msgid "Send a mobile message."
 msgstr "Lähetä mobiiliviestinä"
 
-#: ../libpurple/protocols/msn/msn.c:402 ../libpurple/protocols/msnp9/msn.c:399
+#: ../libpurple/protocols/msn/msn.c:416 ../libpurple/protocols/msnp9/msn.c:399
 msgid "Page"
 msgstr "Lähetä"
 
-#: ../libpurple/protocols/msn/msn.c:665 ../libpurple/protocols/msnp9/msn.c:567
+#: ../libpurple/protocols/msn/msn.c:679 ../libpurple/protocols/msnp9/msn.c:567
 msgid "Home Phone Number"
 msgstr "Kotipuhelinnumero"
 
-#: ../libpurple/protocols/msn/msn.c:669 ../libpurple/protocols/msnp9/msn.c:571
+#: ../libpurple/protocols/msn/msn.c:683 ../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
+#: ../libpurple/protocols/msn/msn.c:687 ../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/msn/msn.c:710 ../libpurple/protocols/msn/state.c:33
 #: ../libpurple/protocols/msnp9/msn.c:594
 #: ../libpurple/protocols/msnp9/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3114
-#: ../libpurple/protocols/yahoo/yahoo.c:3803
+#: ../libpurple/protocols/yahoo/yahoo.c:3134
+#: ../libpurple/protocols/yahoo/yahoo.c:3823
 msgid "Be Right Back"
 msgstr "Tulen pian takaisin"
 
-#: ../libpurple/protocols/msn/msn.c:702 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msn/msn.c:716 ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/msnp9/msn.c:598
 #: ../libpurple/protocols/msnp9/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2840
@@ -6974,20 +7041,20 @@
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1483
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3116
-#: ../libpurple/protocols/yahoo/yahoo.c:3806
+#: ../libpurple/protocols/yahoo/yahoo.c:3136
+#: ../libpurple/protocols/yahoo/yahoo.c:3826
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../libpurple/protocols/msn/msn.c:707 ../libpurple/protocols/msnp9/msn.c:602
-#: ../libpurple/protocols/yahoo/yahoo.c:3124
-#: ../libpurple/protocols/yahoo/yahoo.c:3818
+#: ../libpurple/protocols/msn/msn.c:721 ../libpurple/protocols/msnp9/msn.c:602
+#: ../libpurple/protocols/yahoo/yahoo.c:3144
+#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "On the Phone"
 msgstr "Puhelimessa"
 
-#: ../libpurple/protocols/msn/msn.c:712 ../libpurple/protocols/msnp9/msn.c:606
-#: ../libpurple/protocols/yahoo/yahoo.c:3128
-#: ../libpurple/protocols/yahoo/yahoo.c:3824
+#: ../libpurple/protocols/msn/msn.c:726 ../libpurple/protocols/msnp9/msn.c:606
+#: ../libpurple/protocols/yahoo/yahoo.c:3148
+#: ../libpurple/protocols/yahoo/yahoo.c:3844
 msgid "Out to Lunch"
 msgstr "Lounaalla"
 
@@ -6997,337 +7064,337 @@
 #. savable
 #. should be user_settable some day
 #. independent
-#: ../libpurple/protocols/msn/msn.c:731
+#: ../libpurple/protocols/msn/msn.c:745
 #: ../libpurple/protocols/myspace/myspace.c:170
 msgid "Artist"
 msgstr "Esittäjä"
 
-#: ../libpurple/protocols/msn/msn.c:732
+#: ../libpurple/protocols/msn/msn.c:746
 msgid "Album"
 msgstr "Levy"
 
-#: ../libpurple/protocols/msn/msn.c:750 ../libpurple/protocols/msnp9/msn.c:634
+#: ../libpurple/protocols/msn/msn.c:764 ../libpurple/protocols/msnp9/msn.c:634
 msgid "Set Friendly Name..."
 msgstr "Aseta tuttavanimi..."
 
-#: ../libpurple/protocols/msn/msn.c:755 ../libpurple/protocols/msnp9/msn.c:639
+#: ../libpurple/protocols/msn/msn.c:769 ../libpurple/protocols/msnp9/msn.c:639
 msgid "Set Home Phone Number..."
 msgstr "Aseta kotipuhelinnumero..."
 
-#: ../libpurple/protocols/msn/msn.c:759 ../libpurple/protocols/msnp9/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:773 ../libpurple/protocols/msnp9/msn.c:643
 msgid "Set Work Phone Number..."
 msgstr "Aseta työpuhelinnumero..."
 
-#: ../libpurple/protocols/msn/msn.c:763 ../libpurple/protocols/msnp9/msn.c:647
+#: ../libpurple/protocols/msn/msn.c:777 ../libpurple/protocols/msnp9/msn.c:647
 msgid "Set Mobile Phone Number..."
 msgstr "Aseta matkapuhelinnumero..."
 
-#: ../libpurple/protocols/msn/msn.c:769 ../libpurple/protocols/msnp9/msn.c:653
+#: ../libpurple/protocols/msn/msn.c:783 ../libpurple/protocols/msnp9/msn.c:653
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Aseta päälle/pois mobiililaitteet..."
 
-#: ../libpurple/protocols/msn/msn.c:774 ../libpurple/protocols/msnp9/msn.c:658
+#: ../libpurple/protocols/msn/msn.c:788 ../libpurple/protocols/msnp9/msn.c:658
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Salli/estä mobiilihaut..."
 
-#: ../libpurple/protocols/msn/msn.c:785 ../libpurple/protocols/msnp9/msn.c:669
+#: ../libpurple/protocols/msn/msn.c:799 ../libpurple/protocols/msnp9/msn.c:669
 msgid "Open Hotmail Inbox"
 msgstr "Avaa Hotmailin saapuneet-kansio"
 
-#: ../libpurple/protocols/msn/msn.c:809 ../libpurple/protocols/msnp9/msn.c:693
+#: ../libpurple/protocols/msn/msn.c:823 ../libpurple/protocols/msnp9/msn.c:693
 msgid "Send to Mobile"
 msgstr "Lähetä mobiililaitteeseen"
 
-#: ../libpurple/protocols/msn/msn.c:819 ../libpurple/protocols/msnp9/msn.c:703
+#: ../libpurple/protocols/msn/msn.c:833 ../libpurple/protocols/msnp9/msn.c:703
 #: ../libpurple/protocols/novell/novell.c:3426
 msgid "Initiate _Chat"
 msgstr "Aloita _ryhmäkeskustelu"
 
-#: ../libpurple/protocols/msn/msn.c:857 ../libpurple/protocols/msnp9/msn.c:742
+#: ../libpurple/protocols/msn/msn.c:871 ../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:887 ../libpurple/protocols/msnp9/msn.c:772
+#: ../libpurple/protocols/msn/msn.c:901 ../libpurple/protocols/msnp9/msn.c:772
 msgid "Failed to connect to server."
 msgstr "Palvelimeen ei saatu yhteyttä."
 
-#: ../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/msn/msn.c:1685 ../libpurple/protocols/msn/msn.c:2028
+#: ../libpurple/protocols/msnp9/msn.c:1526
+#: ../libpurple/protocols/msnp9/msn.c:1869
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Virhe haettaessa profiilia"
 
-#: ../libpurple/protocols/msn/msn.c:1737
-#: ../libpurple/protocols/msnp9/msn.c:1593 ../pidgin/plugins/convcolors.c:371
+#: ../libpurple/protocols/msn/msn.c:1751
+#: ../libpurple/protocols/msnp9/msn.c:1592 ../pidgin/plugins/convcolors.c:371
 #: ../pidgin/plugins/pidginrc.c:372
 msgid "General"
 msgstr "Yleinen"
 
-#: ../libpurple/protocols/msn/msn.c:1744
-#: ../libpurple/protocols/msnp9/msn.c:1600
+#: ../libpurple/protocols/msn/msn.c:1758
+#: ../libpurple/protocols/msnp9/msn.c:1599
 #: ../libpurple/protocols/myspace/user.c:125
-#: ../libpurple/protocols/oscar/oscar.c:3788
+#: ../libpurple/protocols/oscar/oscar.c:3802
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:222
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1087
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1088
 msgid "Age"
 msgstr "Ikä"
 
-#: ../libpurple/protocols/msn/msn.c:1746
-#: ../libpurple/protocols/msnp9/msn.c:1602
+#: ../libpurple/protocols/msn/msn.c:1760
+#: ../libpurple/protocols/msnp9/msn.c:1601
 #: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1102
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
 msgid "Occupation"
 msgstr "Ammatti"
 
-#: ../libpurple/protocols/msn/msn.c:1747
-#: ../libpurple/protocols/msnp9/msn.c:1603
+#: ../libpurple/protocols/msn/msn.c:1761
+#: ../libpurple/protocols/msnp9/msn.c:1602
 #: ../libpurple/protocols/myspace/user.c:133
 #: ../libpurple/protocols/novell/novell.c:1487
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1082
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1083
 #: ../libpurple/protocols/zephyr/zephyr.c:802
 #: ../libpurple/protocols/zephyr/zephyr.c:1175
 msgid "Location"
 msgstr "Sijainti"
 
-#: ../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
+#: ../libpurple/protocols/msn/msn.c:1766 ../libpurple/protocols/msn/msn.c:1958
+#: ../libpurple/protocols/msn/msn.c:1964 ../libpurple/protocols/msn/msn.c:1971
+#: ../libpurple/protocols/msnp9/msn.c:1607
+#: ../libpurple/protocols/msnp9/msn.c:1799
+#: ../libpurple/protocols/msnp9/msn.c:1805
+#: ../libpurple/protocols/msnp9/msn.c:1812
 msgid "Hobbies and Interests"
 msgstr "Harrastukset"
 
-#: ../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
+#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1892
+#: ../libpurple/protocols/msn/msn.c:1898 ../libpurple/protocols/msn/msn.c:1905
+#: ../libpurple/protocols/msn/msn.c:1913 ../libpurple/protocols/msn/msn.c:1920
+#: ../libpurple/protocols/msnp9/msn.c:1613
+#: ../libpurple/protocols/msnp9/msn.c:1733
+#: ../libpurple/protocols/msnp9/msn.c:1739
+#: ../libpurple/protocols/msnp9/msn.c:1746
+#: ../libpurple/protocols/msnp9/msn.c:1754
+#: ../libpurple/protocols/msnp9/msn.c:1761
 msgid "A Little About Me"
 msgstr "Oma kuvaus"
 
-#: ../libpurple/protocols/msn/msn.c:1775
-#: ../libpurple/protocols/msnp9/msn.c:1631
+#: ../libpurple/protocols/msn/msn.c:1789
+#: ../libpurple/protocols/msnp9/msn.c:1630
 msgid "Social"
 msgstr "Vapaa-aika"
 
-#: ../libpurple/protocols/msn/msn.c:1777
-#: ../libpurple/protocols/msnp9/msn.c:1633
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1092
+#: ../libpurple/protocols/msn/msn.c:1791
+#: ../libpurple/protocols/msnp9/msn.c:1632
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
 msgid "Marital Status"
 msgstr "Siviilisääty"
 
-#: ../libpurple/protocols/msn/msn.c:1778
-#: ../libpurple/protocols/msnp9/msn.c:1634
+#: ../libpurple/protocols/msn/msn.c:1792
+#: ../libpurple/protocols/msnp9/msn.c:1633
 msgid "Interests"
 msgstr "Kiinnostukset"
 
-#: ../libpurple/protocols/msn/msn.c:1779
-#: ../libpurple/protocols/msnp9/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msnp9/msn.c:1634
 msgid "Pets"
 msgstr "Lemmikit"
 
-#: ../libpurple/protocols/msn/msn.c:1780
-#: ../libpurple/protocols/msnp9/msn.c:1636
+#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msnp9/msn.c:1635
 msgid "Hometown"
 msgstr "Kotikunta"
 
-#: ../libpurple/protocols/msn/msn.c:1781
-#: ../libpurple/protocols/msnp9/msn.c:1637
+#: ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msnp9/msn.c:1636
 msgid "Places Lived"
 msgstr "Asumispaikat"
 
-#: ../libpurple/protocols/msn/msn.c:1782
-#: ../libpurple/protocols/msnp9/msn.c:1638
+#: ../libpurple/protocols/msn/msn.c:1796
+#: ../libpurple/protocols/msnp9/msn.c:1637
 msgid "Fashion"
 msgstr "Tyyli"
 
-#: ../libpurple/protocols/msn/msn.c:1783
-#: ../libpurple/protocols/msnp9/msn.c:1639
+#: ../libpurple/protocols/msn/msn.c:1797
+#: ../libpurple/protocols/msnp9/msn.c:1638
 msgid "Humor"
 msgstr "Huumorintaju"
 
-#: ../libpurple/protocols/msn/msn.c:1784
-#: ../libpurple/protocols/msnp9/msn.c:1640
+#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msnp9/msn.c:1639
 msgid "Music"
 msgstr "Musiikki"
 
-#: ../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
+#: ../libpurple/protocols/msn/msn.c:1799 ../libpurple/protocols/msn/msn.c:1980
+#: ../libpurple/protocols/msn/msn.c:1986
+#: ../libpurple/protocols/msnp9/msn.c:1640
+#: ../libpurple/protocols/msnp9/msn.c:1821
+#: ../libpurple/protocols/msnp9/msn.c:1827
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1145
 msgid "Favorite Quote"
 msgstr "Lempisanonta"
 
-#: ../libpurple/protocols/msn/msn.c:1802
-#: ../libpurple/protocols/msnp9/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msnp9/msn.c:1657
 msgid "Contact Info"
 msgstr "Yhteystiedot"
 
-#: ../libpurple/protocols/msn/msn.c:1803
-#: ../libpurple/protocols/msnp9/msn.c:1659
+#: ../libpurple/protocols/msn/msn.c:1817
+#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Personal"
 msgstr "Koti"
 
-#: ../libpurple/protocols/msn/msn.c:1806
-#: ../libpurple/protocols/msnp9/msn.c:1662
+#: ../libpurple/protocols/msn/msn.c:1820
+#: ../libpurple/protocols/msnp9/msn.c:1661
 msgid "Significant Other"
 msgstr "Elämänkumppani"
 
-#: ../libpurple/protocols/msn/msn.c:1807
-#: ../libpurple/protocols/msnp9/msn.c:1663
+#: ../libpurple/protocols/msn/msn.c:1821
+#: ../libpurple/protocols/msnp9/msn.c:1662
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1808
-#: ../libpurple/protocols/msnp9/msn.c:1664
+#: ../libpurple/protocols/msn/msn.c:1822
+#: ../libpurple/protocols/msnp9/msn.c:1663
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: ../libpurple/protocols/msn/msn.c:1809
-#: ../libpurple/protocols/msnp9/msn.c:1665
-#: ../libpurple/protocols/oscar/oscar.c:3826
+#: ../libpurple/protocols/msn/msn.c:1823
+#: ../libpurple/protocols/msnp9/msn.c:1664
+#: ../libpurple/protocols/oscar/oscar.c:3840
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msnp9/msn.c:1666
+#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msnp9/msn.c:1665
 msgid "Personal Mobile"
 msgstr "Oma matkapuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1811
-#: ../libpurple/protocols/msnp9/msn.c:1667
+#: ../libpurple/protocols/msn/msn.c:1825
+#: ../libpurple/protocols/msnp9/msn.c:1666
 msgid "Home Fax"
 msgstr "Kotifaksi"
 
-#: ../libpurple/protocols/msn/msn.c:1812
-#: ../libpurple/protocols/msnp9/msn.c:1668
+#: ../libpurple/protocols/msn/msn.c:1826
+#: ../libpurple/protocols/msnp9/msn.c:1667
 msgid "Personal E-Mail"
 msgstr "Oma sähköposti"
 
-#: ../libpurple/protocols/msn/msn.c:1813
-#: ../libpurple/protocols/msnp9/msn.c:1669
+#: ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msnp9/msn.c:1668
 msgid "Personal IM"
 msgstr "Oma pikaviestin"
 
-#: ../libpurple/protocols/msn/msn.c:1815
-#: ../libpurple/protocols/msnp9/msn.c:1671
+#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msnp9/msn.c:1670
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1831
-#: ../libpurple/protocols/msnp9/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1845
+#: ../libpurple/protocols/msnp9/msn.c:1686
 msgid "Work"
 msgstr "Työ"
 
-#: ../libpurple/protocols/msn/msn.c:1833
-#: ../libpurple/protocols/msnp9/msn.c:1689
-#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/msn/msn.c:1847
+#: ../libpurple/protocols/msnp9/msn.c:1688
+#: ../libpurple/protocols/silc/ops.c:1025
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Tehtävänimike"
 
-#: ../libpurple/protocols/msn/msn.c:1834
-#: ../libpurple/protocols/msnp9/msn.c:1690
-#: ../libpurple/protocols/oscar/oscar.c:3847
+#: ../libpurple/protocols/msn/msn.c:1848
+#: ../libpurple/protocols/msnp9/msn.c:1689
+#: ../libpurple/protocols/oscar/oscar.c:3861
 msgid "Company"
 msgstr "Yritys"
 
-#: ../libpurple/protocols/msn/msn.c:1835
-#: ../libpurple/protocols/msnp9/msn.c:1691
+#: ../libpurple/protocols/msn/msn.c:1849
+#: ../libpurple/protocols/msnp9/msn.c:1690
 #: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "Osasto"
 
-#: ../libpurple/protocols/msn/msn.c:1836
-#: ../libpurple/protocols/msnp9/msn.c:1692
+#: ../libpurple/protocols/msn/msn.c:1850
+#: ../libpurple/protocols/msnp9/msn.c:1691
 msgid "Profession"
 msgstr "Ammatti"
 
-#: ../libpurple/protocols/msn/msn.c:1837
-#: ../libpurple/protocols/msnp9/msn.c:1693
+#: ../libpurple/protocols/msn/msn.c:1851
+#: ../libpurple/protocols/msnp9/msn.c:1692
 msgid "Work Phone"
 msgstr "Työpuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1838
-#: ../libpurple/protocols/msnp9/msn.c:1694
+#: ../libpurple/protocols/msn/msn.c:1852
+#: ../libpurple/protocols/msnp9/msn.c:1693
 msgid "Work Phone 2"
 msgstr "Työpuhelin 2"
 
-#: ../libpurple/protocols/msn/msn.c:1839
-#: ../libpurple/protocols/msnp9/msn.c:1695
-#: ../libpurple/protocols/oscar/oscar.c:3839
+#: ../libpurple/protocols/msn/msn.c:1853
+#: ../libpurple/protocols/msnp9/msn.c:1694
+#: ../libpurple/protocols/oscar/oscar.c:3853
 msgid "Work Address"
 msgstr "Työosoite"
 
-#: ../libpurple/protocols/msn/msn.c:1840
-#: ../libpurple/protocols/msnp9/msn.c:1696
+#: ../libpurple/protocols/msn/msn.c:1854
+#: ../libpurple/protocols/msnp9/msn.c:1695
 msgid "Work Mobile"
 msgstr "Työmatkapuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1841
-#: ../libpurple/protocols/msnp9/msn.c:1697
+#: ../libpurple/protocols/msn/msn.c:1855
+#: ../libpurple/protocols/msnp9/msn.c:1696
 msgid "Work Pager"
 msgstr "Työhakulaite"
 
-#: ../libpurple/protocols/msn/msn.c:1842
-#: ../libpurple/protocols/msnp9/msn.c:1698
+#: ../libpurple/protocols/msn/msn.c:1856
+#: ../libpurple/protocols/msnp9/msn.c:1697
 msgid "Work Fax"
 msgstr "Työfaksi"
 
-#: ../libpurple/protocols/msn/msn.c:1843
-#: ../libpurple/protocols/msnp9/msn.c:1699
+#: ../libpurple/protocols/msn/msn.c:1857
+#: ../libpurple/protocols/msnp9/msn.c:1698
 msgid "Work E-Mail"
 msgstr "Työsähköposti"
 
-#: ../libpurple/protocols/msn/msn.c:1844
-#: ../libpurple/protocols/msnp9/msn.c:1700
+#: ../libpurple/protocols/msn/msn.c:1858
+#: ../libpurple/protocols/msnp9/msn.c:1699
 msgid "Work IM"
 msgstr "Työ pikaviestin"
 
-#: ../libpurple/protocols/msn/msn.c:1845
-#: ../libpurple/protocols/msnp9/msn.c:1701
+#: ../libpurple/protocols/msn/msn.c:1859
+#: ../libpurple/protocols/msnp9/msn.c:1700
 msgid "Start Date"
 msgstr "Aloituspäivä"
 
-#: ../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
+#: ../libpurple/protocols/msn/msn.c:1929 ../libpurple/protocols/msn/msn.c:1935
+#: ../libpurple/protocols/msn/msn.c:1942 ../libpurple/protocols/msn/msn.c:1949
+#: ../libpurple/protocols/msnp9/msn.c:1770
+#: ../libpurple/protocols/msnp9/msn.c:1776
+#: ../libpurple/protocols/msnp9/msn.c:1783
+#: ../libpurple/protocols/msnp9/msn.c:1790
 msgid "Favorite Things"
 msgstr "Lempiasiat"
 
-#: ../libpurple/protocols/msn/msn.c:1980
-#: ../libpurple/protocols/msnp9/msn.c:1836
+#: ../libpurple/protocols/msn/msn.c:1994
+#: ../libpurple/protocols/msnp9/msn.c:1835
 msgid "Last Updated"
 msgstr "Edellinen päivitys"
 
-#: ../libpurple/protocols/msn/msn.c:1991
-#: ../libpurple/protocols/msnp9/msn.c:1847
+#: ../libpurple/protocols/msn/msn.c:2005
+#: ../libpurple/protocols/msnp9/msn.c:1846
 #: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#: ../libpurple/protocols/msn/msn.c:2015
-#: ../libpurple/protocols/msnp9/msn.c:1871
+#: ../libpurple/protocols/msn/msn.c:2029
+#: ../libpurple/protocols/msnp9/msn.c:1870
 msgid "The user has not created a public profile."
 msgstr "Käyttäjällä ei ole julkista profiilia."
 
-#: ../libpurple/protocols/msn/msn.c:2016
-#: ../libpurple/protocols/msnp9/msn.c:1872
+#: ../libpurple/protocols/msn/msn.c:2030
+#: ../libpurple/protocols/msnp9/msn.c:1871
 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 "
@@ -7336,8 +7403,8 @@
 "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:2020
-#: ../libpurple/protocols/msnp9/msn.c:1876
+#: ../libpurple/protocols/msn/msn.c:2034
+#: ../libpurple/protocols/msnp9/msn.c:1875
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -7345,9 +7412,9 @@
 "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:2028
-#: ../libpurple/protocols/msnp9/msn.c:1884
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1246
+#: ../libpurple/protocols/msn/msn.c:2042
+#: ../libpurple/protocols/msnp9/msn.c:1883
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1247
 msgid "Profile URL"
 msgstr "Profiilin URL"
 
@@ -7361,26 +7428,26 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2315 ../libpurple/protocols/msn/msn.c:2317
+#: ../libpurple/protocols/msn/msn.c:2329 ../libpurple/protocols/msn/msn.c:2331
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr "Windows Live Messenger -yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/msn/msn.c:2352
+#: ../libpurple/protocols/msn/msn.c:2366
 #: ../libpurple/protocols/msnp9/msn.c:2206
 msgid "Use HTTP Method"
 msgstr "Käytä HTTP-yhteystapaa"
 
-#: ../libpurple/protocols/msn/msn.c:2357
+#: ../libpurple/protocols/msn/msn.c:2371
 #: ../libpurple/protocols/msnp9/msn.c:2211
 msgid "HTTP Method Server"
 msgstr "HTTP-yhteystavan palvelin"
 
-#: ../libpurple/protocols/msn/msn.c:2362
+#: ../libpurple/protocols/msn/msn.c:2376
 #: ../libpurple/protocols/msnp9/msn.c:2216
 msgid "Show custom smileys"
 msgstr "Näytä itse tehdyt / lisätyt hymiöt"
 
-#: ../libpurple/protocols/msn/msn.c:2370
+#: ../libpurple/protocols/msn/msn.c:2384
 #: ../libpurple/protocols/msnp9/msn.c:2224
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: tönäise tuttavaa huomion saamiseksi"
@@ -7434,7 +7501,7 @@
 msgstr "Tuntematon virhe (%d)"
 
 #: ../libpurple/protocols/msn/notification.c:837
-#: ../libpurple/protocols/sametime/sametime.c:4479
+#: ../libpurple/protocols/sametime/sametime.c:4480
 msgid "Unable to add user"
 msgstr "Käyttäjää ei voi lisätä"
 
@@ -7473,17 +7540,17 @@
 msgid "Service Temporarily Unavailable."
 msgstr "Palvelu ei tilapäisesti ole käytettävissä."
 
-#: ../libpurple/protocols/msn/notification.c:1276
+#: ../libpurple/protocols/msn/notification.c:1328
 #: ../libpurple/protocols/msnp9/notification.c:898
 msgid "Unable to rename group"
 msgstr "Ryhmän uudelleen nimeäminen epäonnistui"
 
-#: ../libpurple/protocols/msn/notification.c:1331
+#: ../libpurple/protocols/msn/notification.c:1383
 #: ../libpurple/protocols/msnp9/notification.c:953
 msgid "Unable to delete group"
 msgstr "Ryhmää ei voi poistaa"
 
-#: ../libpurple/protocols/msn/notification.c:1945
+#: ../libpurple/protocols/msn/notification.c:1997
 #: ../libpurple/protocols/msnp9/notification.c:1372
 #, c-format
 msgid ""
@@ -7700,13 +7767,13 @@
 #. only notify the user about problems adding to the friends list
 #. * 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/msn/userlist.c:714
 #: ../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/msn/userlist.c:717
 #: ../libpurple/protocols/msnp9/userlist.c:655
 msgid "The screen name specified is invalid."
 msgstr "Syötetty näyttönimi on virheellinen."
@@ -7750,70 +7817,70 @@
 msgid "Reading challenge"
 msgstr "Luetaan tunnistushaastetta"
 
-#: ../libpurple/protocols/myspace/myspace.c:353
+#: ../libpurple/protocols/myspace/myspace.c:355
 msgid "Unexpected challenge length from server"
 msgstr "Odottamaton tunnistushaasteen pituus palvelimelta"
 
-#: ../libpurple/protocols/myspace/myspace.c:357
+#: ../libpurple/protocols/myspace/myspace.c:359
 msgid "Logging in"
 msgstr "Kirjaudutaan sisään"
 
-#: ../libpurple/protocols/myspace/myspace.c:1322
+#: ../libpurple/protocols/myspace/myspace.c:1324
 #, 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:1365
+#: ../libpurple/protocols/myspace/myspace.c:1367
 msgid "New mail messages"
 msgstr "Uusia viestejä postilaatikossa"
 
-#: ../libpurple/protocols/myspace/myspace.c:1366
+#: ../libpurple/protocols/myspace/myspace.c:1368
 msgid "New blog comments"
 msgstr "Uusia blogikommentteja"
 
-#: ../libpurple/protocols/myspace/myspace.c:1367
-msgid "New profile comments"
-msgstr "Uusia profiilikommentteja"
-
-#: ../libpurple/protocols/myspace/myspace.c:1368
-msgid "New friend requests!"
-msgstr "Uusia kaveripyyntöjä."
-
 #: ../libpurple/protocols/myspace/myspace.c:1369
+msgid "New profile comments"
+msgstr "Uusia profiilikommentteja"
+
+#: ../libpurple/protocols/myspace/myspace.c:1370
+msgid "New friend requests!"
+msgstr "Uusia kaveripyyntöjä."
+
+#: ../libpurple/protocols/myspace/myspace.c:1371
 msgid "New picture comments"
 msgstr "Uusia kuvakommentteja"
 
-#: ../libpurple/protocols/myspace/myspace.c:1399
+#: ../libpurple/protocols/myspace/myspace.c:1401
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../libpurple/protocols/myspace/myspace.c:1585
+#: ../libpurple/protocols/myspace/myspace.c:1587
 msgid "MySpaceIM - No Username Set"
 msgstr "MySpaceIM - Käyttäjänimeä ei asetettu"
 
-#: ../libpurple/protocols/myspace/myspace.c:1586
+#: ../libpurple/protocols/myspace/myspace.c:1588
 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
+#: ../libpurple/protocols/myspace/myspace.c:1589
 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:1611
-#: ../libpurple/protocols/sametime/sametime.c:1546
+#: ../libpurple/protocols/myspace/myspace.c:1613
+#: ../libpurple/protocols/sametime/sametime.c:1547
 msgid "Connected"
 msgstr "Yhdistetty"
 
-#: ../libpurple/protocols/myspace/myspace.c:1846
+#: ../libpurple/protocols/myspace/myspace.c:1848
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Yhteyskäytäntövirhe, virhekoodi %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1868
+#: ../libpurple/protocols/myspace/myspace.c:1870
 #, c-format
 msgid ""
 "%s Your password is %d characters, greater than the expected maximum length "
@@ -7822,73 +7889,73 @@
 "again."
 msgstr ""
 "%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 "
+"suurin mahdollinen %d merkkiä. Lyhennä salasanaasi osoitteessa http://"
+"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
 "ja yritä uudelleen."
 
-#: ../libpurple/protocols/myspace/myspace.c:1891
+#: ../libpurple/protocols/myspace/myspace.c:1893
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM-virhe"
 
-#: ../libpurple/protocols/myspace/myspace.c:2069
-#: ../libpurple/protocols/myspace/myspace.c:2103
+#: ../libpurple/protocols/myspace/myspace.c:2071
+#: ../libpurple/protocols/myspace/myspace.c:2105
 msgid "Failed to add buddy"
 msgstr "Tuttavan lisääminen epäonnistui"
 
-#: ../libpurple/protocols/myspace/myspace.c:2069
+#: ../libpurple/protocols/myspace/myspace.c:2071
 msgid "'addbuddy' command failed."
 msgstr "\"addbuddy\"-komento epäonnistui."
 
-#: ../libpurple/protocols/myspace/myspace.c:2103
-#: ../libpurple/protocols/myspace/myspace.c:2348
+#: ../libpurple/protocols/myspace/myspace.c:2105
+#: ../libpurple/protocols/myspace/myspace.c:2350
 msgid "persist command failed"
 msgstr "persist-komento epäonnistui"
 
-#: ../libpurple/protocols/myspace/myspace.c:2208
+#: ../libpurple/protocols/myspace/myspace.c:2210
 #, c-format
 msgid "No such user: %s"
 msgstr "Käyttäjää ei löydy: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2210
+#: ../libpurple/protocols/myspace/myspace.c:2212
 msgid "User lookup"
 msgstr "Käyttäjän haku"
 
-#: ../libpurple/protocols/myspace/myspace.c:2329
-#: ../libpurple/protocols/myspace/myspace.c:2348
-#: ../libpurple/protocols/myspace/myspace.c:2370
+#: ../libpurple/protocols/myspace/myspace.c:2331
+#: ../libpurple/protocols/myspace/myspace.c:2350
+#: ../libpurple/protocols/myspace/myspace.c:2372
 msgid "Failed to remove buddy"
 msgstr "Tuttavaa poistaminen epäonnistui"
 
-#: ../libpurple/protocols/myspace/myspace.c:2329
+#: ../libpurple/protocols/myspace/myspace.c:2331
 msgid "'delbuddy' command failed"
 msgstr "\"delbuddy\"-komento epäonnistui"
 
-#: ../libpurple/protocols/myspace/myspace.c:2370
+#: ../libpurple/protocols/myspace/myspace.c:2372
 msgid "blocklist command failed"
 msgstr "blocklist-komento epäonnistui"
 
-#: ../libpurple/protocols/myspace/myspace.c:2484
+#: ../libpurple/protocols/myspace/myspace.c:2486
 msgid "Invalid input condition"
 msgstr "Epäkelpo syötetila"
 
-#: ../libpurple/protocols/myspace/myspace.c:2539
+#: ../libpurple/protocols/myspace/myspace.c:2541
 msgid "Read buffer full (2)"
 msgstr "Lukupuskuri täynnä (2)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2582
+#: ../libpurple/protocols/myspace/myspace.c:2584
 msgid "Unparseable message"
 msgstr "Viestin jäsennys epäonnistui"
 
-#: ../libpurple/protocols/myspace/myspace.c:2653
+#: ../libpurple/protocols/myspace/myspace.c:2655
 #, 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:2831
+#: ../libpurple/protocols/myspace/myspace.c:2833
 msgid "IM Friends"
 msgstr "Pikaviestikaverit"
 
-#: ../libpurple/protocols/myspace/myspace.c:2931
+#: ../libpurple/protocols/myspace/myspace.c:2933
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
@@ -7897,57 +7964,57 @@
 "%d tuttavaa lisättiin tai päivitettiin palvelimelta (mukaan lukien jo "
 "palvelinpuolen luettelossa olevat)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2932
+#: ../libpurple/protocols/myspace/myspace.c:2934
 msgid "Add contacts from server"
 msgstr "Lisää tuttavia palvelimelta"
 
-#: ../libpurple/protocols/myspace/myspace.c:2984
-#: ../libpurple/protocols/myspace/myspace.c:3048
+#: ../libpurple/protocols/myspace/myspace.c:2986
+#: ../libpurple/protocols/myspace/myspace.c:3050
 msgid "Add friends from MySpace.com"
 msgstr "Lisää kavereita MySpacesta"
 
-#: ../libpurple/protocols/myspace/myspace.c:2985
+#: ../libpurple/protocols/myspace/myspace.c:2987
 msgid "Importing friends failed"
 msgstr "Kavereiden tuonti epäonnistui"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:3041
+#: ../libpurple/protocols/myspace/myspace.c:3043
 msgid "Find people..."
 msgstr "Etsi ihmisiä..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3044
+#: ../libpurple/protocols/myspace/myspace.c:3046
 msgid "Change IM name..."
 msgstr "Vaihda pikaviestinnimeä..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3345
+#: ../libpurple/protocols/myspace/myspace.c:3347
 msgid "myim URL handler"
 msgstr "myim-URL-käsittelijä"
 
-#: ../libpurple/protocols/myspace/myspace.c:3346
+#: ../libpurple/protocols/myspace/myspace.c:3348
 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:3347
+#: ../libpurple/protocols/myspace/myspace.c:3349
 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:3470
+#: ../libpurple/protocols/myspace/myspace.c:3472
 msgid "Show display name in status text"
 msgstr "Näytä näyttönimi tilatekstissä"
 
-#: ../libpurple/protocols/myspace/myspace.c:3473
+#: ../libpurple/protocols/myspace/myspace.c:3475
 msgid "Show headline in status text"
 msgstr "Näytä otsikko tilatekstissä"
 
-#: ../libpurple/protocols/myspace/myspace.c:3478
+#: ../libpurple/protocols/myspace/myspace.c:3480
 msgid "Send emoticons"
 msgstr "Lähetä hymiöitä"
 
-#: ../libpurple/protocols/myspace/myspace.c:3483
+#: ../libpurple/protocols/myspace/myspace.c:3485
 msgid "Screen resolution (dots per inch)"
 msgstr "Näytön tarkkuus (pisteitä tuumalla)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3486
+#: ../libpurple/protocols/myspace/myspace.c:3488
 msgid "Base font size (points)"
 msgstr "Peruskirjasinkoko (pisteinä)"
 
@@ -7958,7 +8025,7 @@
 msgstr "Käyttäjä"
 
 #: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3025
+#: ../libpurple/protocols/oscar/oscar.c:3032
 msgid "Profile"
 msgstr "Profiili"
 
@@ -8420,7 +8487,7 @@
 msgstr "Mailstop"
 
 #: ../libpurple/protocols/novell/novell.c:1511
-#: ../libpurple/protocols/sametime/sametime.c:4176
+#: ../libpurple/protocols/sametime/sametime.c:4177
 msgid "User ID"
 msgstr "Käyttäjän ID"
 
@@ -8500,6 +8567,7 @@
 msgstr "Virhe. SSL-tuki ei ole asennettu."
 
 #: ../libpurple/protocols/novell/novell.c:2522
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Tämä konferenssi on suljettu. Uusia viestejä ei voi lähettää."
 
@@ -8535,19 +8603,19 @@
 msgstr "Epäkelpo keskusteluhuoneen nimi"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:391
-#: ../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:1135 ../libpurple/proxy.c:1244
-#: ../libpurple/proxy.c:1344 ../libpurple/proxy.c:1472
+#: ../libpurple/protocols/yahoo/yahoo.c:2505
+#: ../libpurple/protocols/yahoo/yahoo.c:2673
+#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:609
+#: ../libpurple/proxy.c:1161 ../libpurple/proxy.c:1270
+#: ../libpurple/proxy.c:1376 ../libpurple/proxy.c:1529
 msgid "Server closed the connection."
 msgstr "Palvelin on katkaissut yhteyden."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:393
-#: ../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
+#: ../libpurple/protocols/yahoo/yahoo.c:2498
+#: ../libpurple/protocols/yahoo/yahoo.c:2666 ../libpurple/proxy.c:621
+#: ../libpurple/proxy.c:1173 ../libpurple/proxy.c:1282
+#: ../libpurple/proxy.c:1388 ../libpurple/proxy.c:1541
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8557,9 +8625,9 @@
 "%s"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:396
-#: ../libpurple/proxy.c:1164 ../libpurple/proxy.c:1269
-#: ../libpurple/proxy.c:1368 ../libpurple/proxy.c:1440
-#: ../libpurple/proxy.c:1497
+#: ../libpurple/proxy.c:1190 ../libpurple/proxy.c:1295
+#: ../libpurple/proxy.c:1400 ../libpurple/proxy.c:1490
+#: ../libpurple/proxy.c:1554
 msgid "Received invalid data on connection with server."
 msgstr "Palvelimeen yhdistettäessä vastaanotettiin virheellisiä tietoja."
 
@@ -8594,8 +8662,8 @@
 msgstr "ICQ-yhteyskäytäntöliitännäinen"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4432
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
+#: ../libpurple/protocols/yahoo/yahoo.c:4452
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Encoding"
 msgstr "Merkistö"
 
@@ -8735,7 +8803,7 @@
 msgid "Not while on AOL"
 msgstr "Ei kun AOL on käytössä"
 
-#: ../libpurple/protocols/oscar/oscar.c:347
+#: ../libpurple/protocols/oscar/oscar.c:349
 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 "
@@ -8747,7 +8815,7 @@
 "merkistöä hän käyttää, voit määritellä sen AIM/ICQ-käyttäjätilisi "
 "lisäasetuksissa.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:456
+#: ../libpurple/protocols/oscar/oscar.c:458
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -8758,135 +8826,140 @@
 "asiakasohjelma.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2444
+#: ../libpurple/protocols/oscar/oscar.c:640 ../pidgin/gtkutils.c:2444
 #: ../pidgin/gtkutils.c:2474
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:332
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:336
 msgid "Buddy Icon"
 msgstr "Tuttavakuvake"
 
-#: ../libpurple/protocols/oscar/oscar.c:641
+#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Voice"
 msgstr "Ääni"
 
-#: ../libpurple/protocols/oscar/oscar.c:644
+#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "AIM Direct IM"
 msgstr "AIM:n suora pikaviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:650
-#: ../libpurple/protocols/oscar/oscar.c:6113
+#: ../libpurple/protocols/oscar/oscar.c:652
+#: ../libpurple/protocols/oscar/oscar.c:6139
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:659
 msgid "Games"
 msgstr "Pelit"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:662
 msgid "Add-Ins"
 msgstr "Lisäykset"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:665
 msgid "Send Buddy List"
 msgstr "Lähetä tuttavat"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:668
 msgid "ICQ Direct Connect"
 msgstr "ICQ-suorayhteys"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:671
 msgid "AP User"
 msgstr "AP-käyttäjä"
 
-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:674
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:677
 msgid "Nihilist"
 msgstr "Nihilistinen"
 
-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:680
 msgid "ICQ Server Relay"
 msgstr "ICQ-palvelimen välitys"
 
-#: ../libpurple/protocols/oscar/oscar.c:681
+#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "Old ICQ UTF8"
 msgstr "Vanha ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:684
+#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Trillian Encryption"
 msgstr "Trillian-salaus"
 
-#: ../libpurple/protocols/oscar/oscar.c:687
+#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:690
+#: ../libpurple/protocols/oscar/oscar.c:692
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:693
+#: ../libpurple/protocols/oscar/oscar.c:695
 msgid "Security Enabled"
 msgstr "Turvatoimet käytössä"
 
-#: ../libpurple/protocols/oscar/oscar.c:696
+#: ../libpurple/protocols/oscar/oscar.c:698
 msgid "Video Chat"
 msgstr "Videokeskustelu"
 
-#: ../libpurple/protocols/oscar/oscar.c:700
+#: ../libpurple/protocols/oscar/oscar.c:702
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:703
+#: ../libpurple/protocols/oscar/oscar.c:705
 msgid "Live Video"
 msgstr "Live-video"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
+#: ../libpurple/protocols/oscar/oscar.c:708
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../libpurple/protocols/oscar/oscar.c:724
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:726
+#: ../libpurple/protocols/oscar/oscar.c:5909
+#, c-format
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
 
-#: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5918
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5944
+#, c-format
 msgid "Not Available"
 msgstr "Ei tavoitettavissa"
 
-#: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5904
+#: ../libpurple/protocols/oscar/oscar.c:732
+#: ../libpurple/protocols/oscar/oscar.c:5930
+#, c-format
 msgid "Occupied"
 msgstr "Varattu"
 
-#: ../libpurple/protocols/oscar/oscar.c:734
+#: ../libpurple/protocols/oscar/oscar.c:736
+#, c-format
 msgid "Web Aware"
 msgstr "Net-tietoinen"
 
-#: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:184
+#: ../libpurple/protocols/oscar/oscar.c:738 ../libpurple/protocols/qq/qq.c:184
 #: ../libpurple/protocols/qq/qq.c:289
-#: ../libpurple/protocols/yahoo/yahoo.c:3132 ../libpurple/status.c:157
+#: ../libpurple/protocols/yahoo/yahoo.c:3152 ../libpurple/status.c:157
 #: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1084
+#, c-format
 msgid "Invisible"
 msgstr "Näkymätön"
 
-#: ../libpurple/protocols/oscar/oscar.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3740
+#: ../libpurple/protocols/oscar/oscar.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3754
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1100
 msgid "IP Address"
 msgstr "IP-osoite"
 
-#: ../libpurple/protocols/oscar/oscar.c:844
-#: ../libpurple/protocols/oscar/oscar.c:2952
+#: ../libpurple/protocols/oscar/oscar.c:846
+#: ../libpurple/protocols/oscar/oscar.c:2959
 msgid "Warning Level"
 msgstr "Varoitustaso"
 
-#: ../libpurple/protocols/oscar/oscar.c:854
+#: ../libpurple/protocols/oscar/oscar.c:856
 msgid "Buddy Comment"
 msgstr "Tuttavakommentti"
 
-#: ../libpurple/protocols/oscar/oscar.c:994
+#: ../libpurple/protocols/oscar/oscar.c:996
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -8895,7 +8968,7 @@
 "Ei saatu yhteyttä todentamispalvelimeen:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1002
+#: ../libpurple/protocols/oscar/oscar.c:1004
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -8904,58 +8977,57 @@
 "Ei saatu yhteyttä BOS-palvelimeen:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1042
-msgid "Screen name sent"
-msgstr "Näyttönimi lähetetty"
-
-#: ../libpurple/protocols/oscar/oscar.c:1047
+#: ../libpurple/protocols/oscar/oscar.c:1044
+msgid "Username sent"
+msgstr "Käyttäjänimi lähetetty"
+
+#: ../libpurple/protocols/oscar/oscar.c:1049
 msgid "Connection established, cookie sent"
 msgstr "Yhteys muodostettu, eväste lähetetty"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1076
+#: ../libpurple/protocols/oscar/oscar.c:1078
 msgid "Finalizing connection"
 msgstr "Viimeistellään yhteyttä"
 
-#: ../libpurple/protocols/oscar/oscar.c:1302
-#, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must be a valid email address, or start with a letter "
-"and contain only letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"Kirjautuminen epäonnistui: käyttäjänä %s ei voi kirjautua koska näyttönimi "
-"on virheellinen. Näyttönimen 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:1306
+#, c-format
+msgid ""
+"Unable to login: Could not sign on as %s because the username is invalid.  "
+"Usernames must be a valid email address, or start with a letter and contain "
+"only letters, numbers and spaces, or contain only numbers."
+msgstr ""
+"Kirjautuminen epäonnistui: käyttäjänä %s ei voi kirjautua koska "
+"käyttäjänimi on virheellinen. Käyttäjänimen tulee olla oikea "
+"sähköpostiosoite, tai alkaa kirjaimella ja sisältää vain kirjaimia, "
+"numeroita ja välilyöntejä, tai sisältää vain numeroita."
 
 #. Unregistered screen name
-#: ../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:1394
+#: ../libpurple/protocols/oscar/oscar.c:1392
+msgid "Invalid username."
+msgstr "Epäkelpo käyttäjänimi."
+
+#: ../libpurple/protocols/oscar/oscar.c:1398
 #: ../libpurple/protocols/qq/login_logout.c:485
 #: ../libpurple/protocols/simple/simple.c:1112
-#: ../libpurple/protocols/yahoo/yahoo.c:2131
+#: ../libpurple/protocols/yahoo/yahoo.c:2149
 msgid "Incorrect password."
 msgstr "Virheellinen salasana."
 
 #. Suspended account
-#: ../libpurple/protocols/oscar/oscar.c:1398
+#: ../libpurple/protocols/oscar/oscar.c:1402
 msgid "Your account is currently suspended."
 msgstr "Käyttäjätilisi palvelu on parhaillaan keskeytetty."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1402
+#: ../libpurple/protocols/oscar/oscar.c:1406
 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:1406
-#: ../libpurple/protocols/oscar/oscar.c:1415
+#: ../libpurple/protocols/oscar/oscar.c:1410
+#: ../libpurple/protocols/oscar/oscar.c:1419
 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."
@@ -8965,43 +9037,43 @@
 "pidempään."
 
 #. client too old
-#: ../libpurple/protocols/oscar/oscar.c:1410
+#: ../libpurple/protocols/oscar/oscar.c:1414
 #, 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:1448
+#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Could Not Connect"
 msgstr "Yhteyttä ei voi muodostaa"
 
-#: ../libpurple/protocols/oscar/oscar.c:1452
+#: ../libpurple/protocols/oscar/oscar.c:1456
 msgid "Received authorization"
 msgstr "Saatiin lupa"
 
-#: ../libpurple/protocols/oscar/oscar.c:1475
+#: ../libpurple/protocols/oscar/oscar.c:1479
 msgid "The SecurID key entered is invalid."
 msgstr "Syötetty SecurID-avain on virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:1488
+#: ../libpurple/protocols/oscar/oscar.c:1492
 msgid "Enter SecurID"
 msgstr "Syötä SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1489
+#: ../libpurple/protocols/oscar/oscar.c:1493
 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.
 #.
-#: ../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
+#: ../libpurple/protocols/oscar/oscar.c:1495
+#: ../libpurple/protocols/oscar/oscar.c:2300
+#: ../libpurple/protocols/oscar/oscar.c:2349
+#: ../libpurple/protocols/oscar/oscar.c:6014
+#: ../libpurple/protocols/oscar/oscar.c:6296 ../libpurple/request.h:1401
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1530
+#: ../libpurple/protocols/oscar/oscar.c:1534
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -9010,54 +9082,54 @@
 "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:1533
-#: ../libpurple/protocols/oscar/oscar.c:1577
+#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:1581
 msgid "Unable to get a valid AIM login hash."
 msgstr "Kelvollista AIM-sisäänkirjautumistiivistettä ei saatu."
 
-#: ../libpurple/protocols/oscar/oscar.c:1574
-#: ../libpurple/protocols/oscar/oscar.c:1673
+#: ../libpurple/protocols/oscar/oscar.c:1578
+#: ../libpurple/protocols/oscar/oscar.c:1677
 #, 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:1676
+#: ../libpurple/protocols/oscar/oscar.c:1680
 msgid "Unable to get a valid login hash."
 msgstr "Kelvollista sisäänkirjautumistiivistettä ei saatu."
 
-#: ../libpurple/protocols/oscar/oscar.c:1706
+#: ../libpurple/protocols/oscar/oscar.c:1710
 msgid "Password sent"
 msgstr "Salasana lähetetty"
 
-#: ../libpurple/protocols/oscar/oscar.c:1762
+#: ../libpurple/protocols/oscar/oscar.c:1766
 msgid "Unable to initialize connection"
 msgstr "Yhteyden luominen epäonnistui"
 
-#: ../libpurple/protocols/oscar/oscar.c:2251
+#: ../libpurple/protocols/oscar/oscar.c:2256
 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:2291
+#: ../libpurple/protocols/oscar/oscar.c:2298
 msgid "Authorization Request Message:"
 msgstr "Valtuutuksen pyyntöviesti:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2292
+#: ../libpurple/protocols/oscar/oscar.c:2299
 msgid "Please authorize me!"
 msgstr "Voisitko valtuuttaa minut?"
 
-#: ../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/oscar/oscar.c:2340
+#: ../libpurple/protocols/oscar/oscar.c:2348
+#: ../libpurple/protocols/oscar/oscar.c:2475
+#: ../libpurple/protocols/oscar/oscar.c:5386
 #: ../libpurple/protocols/yahoo/yahoo.c:991
 msgid "No reason given."
 msgstr "Syytä ei annettu."
 
-#: ../libpurple/protocols/oscar/oscar.c:2340
+#: ../libpurple/protocols/oscar/oscar.c:2347
 msgid "Authorization Denied Message:"
 msgstr "Valtuutuspyyntö evätty:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2468
+#: ../libpurple/protocols/oscar/oscar.c:2475
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -9067,17 +9139,17 @@
 "Käyttäjä %u on evännyt pyyntösi lisätä hänet tuttaviisi seuraavasta syystä:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2469
+#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "ICQ authorization denied."
 msgstr "ICQ-valtuutus evätty."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2483
 #, 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:2484
+#: ../libpurple/protocols/oscar/oscar.c:2491
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9090,7 +9162,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2492
+#: ../libpurple/protocols/oscar/oscar.c:2499
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9103,7 +9175,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2500
+#: ../libpurple/protocols/oscar/oscar.c:2507
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -9116,38 +9188,38 @@
 "Viesti on:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2521
+#: ../libpurple/protocols/oscar/oscar.c:2528
 #, 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:2527
+#: ../libpurple/protocols/oscar/oscar.c:2534
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Haluatko lisätä hänet tuttaviisi?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2532 ../pidgin/gtkroomlist.c:320
+#: ../libpurple/protocols/oscar/oscar.c:2539 ../pidgin/gtkroomlist.c:320
 msgid "_Add"
 msgstr "_Lisää"
 
-#: ../libpurple/protocols/oscar/oscar.c:2533
+#: ../libpurple/protocols/oscar/oscar.c:2540
 msgid "_Decline"
 msgstr "_Kieltäydy"
 
-#: ../libpurple/protocols/oscar/oscar.c:2657
+#: ../libpurple/protocols/oscar/oscar.c:2664
 #, 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:2666
+#: ../libpurple/protocols/oscar/oscar.c:2673
 #, 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:2675
+#: ../libpurple/protocols/oscar/oscar.c:2682
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -9156,21 +9228,21 @@
 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:2684
+#: ../libpurple/protocols/oscar/oscar.c:2691
 #, 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:2693
+#: ../libpurple/protocols/oscar/oscar.c:2700
 #, 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:2702
+#: ../libpurple/protocols/oscar/oscar.c:2709
 #, 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."
@@ -9178,47 +9250,47 @@
 msgstr[1] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2857
+#: ../libpurple/protocols/oscar/oscar.c:2864
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Viestiä ei voi lähettää: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2857
-#: ../libpurple/protocols/oscar/oscar.c:2862
-#: ../libpurple/protocols/oscar/oscar.c:2926
+#: ../libpurple/protocols/oscar/oscar.c:2864
+#: ../libpurple/protocols/oscar/oscar.c:2869
+#: ../libpurple/protocols/oscar/oscar.c:2933
 msgid "Unknown reason."
 msgstr "Tuntematon syy."
 
-#: ../libpurple/protocols/oscar/oscar.c:2860
-#: ../libpurple/protocols/sametime/sametime.c:2459
+#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/sametime/sametime.c:2460
 #, 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:2926
+#: ../libpurple/protocols/oscar/oscar.c:2933
 #, c-format
 msgid "User information not available: %s"
 msgstr "Käyttäjätiedot eivät ole saatavilla: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2957
+#: ../libpurple/protocols/oscar/oscar.c:2964
 msgid "Online Since"
 msgstr "Kirjautunut"
 
-#: ../libpurple/protocols/oscar/oscar.c:2962
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1191
+#: ../libpurple/protocols/oscar/oscar.c:2969
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1192
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
-#: ../libpurple/protocols/oscar/oscar.c:2997
+#: ../libpurple/protocols/oscar/oscar.c:3004
 msgid "Available Message"
 msgstr "Paikallaoloviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:3101
+#: ../libpurple/protocols/oscar/oscar.c:3108
 msgid "Your AIM connection may be lost."
 msgstr "AIM-yhteytesi saattaa olla katkennut."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3289
+#: ../libpurple/protocols/oscar/oscar.c:3296
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -9226,7 +9298,7 @@
 "[Viestiä tältä käyttäjältä ei voi näyttää koska se sisälsi epäkelpoja "
 "merkkejä.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3453
+#: ../libpurple/protocols/oscar/oscar.c:3460
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9234,125 +9306,117 @@
 "Viimeistä viestiä ei lähetetty koska olet ylittänyt taajuusrajan. Odota 10 "
 "sekuntia ja yritä uudelleen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3538
+#: ../libpurple/protocols/oscar/oscar.c:3545
 #: ../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:3762
-#: ../libpurple/protocols/silc/util.c:591
-#: ../libpurple/protocols/silc10/util.c:581
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/silc/util.c:596
+#: ../libpurple/protocols/silc10/util.c:586
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: ../libpurple/protocols/oscar/oscar.c:3792
+#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Personal Web Page"
 msgstr "Henkilökohtainen kotisivu"
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3830
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Lisätiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:3824
-#: ../libpurple/protocols/oscar/oscar.c:3837
+#: ../libpurple/protocols/oscar/oscar.c:3838
+#: ../libpurple/protocols/oscar/oscar.c:3851
 msgid "Zip Code"
 msgstr "Postinumero"
 
-#: ../libpurple/protocols/oscar/oscar.c:3848
+#: ../libpurple/protocols/oscar/oscar.c:3862
 msgid "Division"
 msgstr "Osasto"
 
-#: ../libpurple/protocols/oscar/oscar.c:3849
+#: ../libpurple/protocols/oscar/oscar.c:3863
 msgid "Position"
 msgstr "Asema"
 
-#: ../libpurple/protocols/oscar/oscar.c:3851
+#: ../libpurple/protocols/oscar/oscar.c:3865
 msgid "Web Page"
 msgstr "Kotisivu"
 
-#: ../libpurple/protocols/oscar/oscar.c:3854
+#: ../libpurple/protocols/oscar/oscar.c:3868
 msgid "Work Information"
 msgstr "Työtiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:3910
+#: ../libpurple/protocols/oscar/oscar.c:3924
 msgid "Pop-Up Message"
 msgstr "Ponnahdusviesti"
 
-#: ../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:3955
-msgid "Screen name"
-msgstr "Näyttönimi"
-
-#: ../libpurple/protocols/oscar/oscar.c:3981
+#: ../libpurple/protocols/oscar/oscar.c:3964
+#, c-format
+msgid "The following username is associated with %s"
+msgid_plural "The following usernames are associated with %s"
+msgstr[0] "Seuraava käyttäjänimi on assosioitu %s kanssa"
+msgstr[1] "Seuraavat käyttäjänimet on assosioitu %s kanssa"
+
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Ei hakutuloksia sähköpostiosoitteelle %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
+#: ../libpurple/protocols/oscar/oscar.c:4016
 #, 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:4004
+#: ../libpurple/protocols/oscar/oscar.c:4018
 msgid "Account Confirmation Requested"
 msgstr "Tilin varmistusta pyydetty"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
-msgid "Error Changing Account Info"
-msgstr "Virhe muutettaessa käyttäjätilin tietoja"
-
-#: ../libpurple/protocols/oscar/oscar.c:4038
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
-msgstr ""
-"Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi eroaa "
-"alkuperäisestä."
-
-#: ../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 "
+#: ../libpurple/protocols/oscar/oscar.c:4051
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name differs "
+"from the original."
+msgstr ""
+"Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty käyttäjänimi "
+"eroaa alkuperäisestä."
+
+#: ../libpurple/protocols/oscar/oscar.c:4053
+#, c-format
+msgid "Error 0x%04x: Unable to format username because it is invalid."
+msgstr ""
+"Virhe 0x%04x: Käyttäjänimeä ei voi muotoilla koska pyydetty nimi on "
 "virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4044
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"is too long."
-msgstr ""
-"Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
+#: ../libpurple/protocols/oscar/oscar.c:4055
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
+msgstr ""
+"Virhe 0x%04x: Käyttäjänimeä ei voi muotoilla koska pyydetty nimi on "
 "liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4047
+#: ../libpurple/protocols/oscar/oscar.c:4057
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
-"request pending for this screen name."
-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:4050
+"request pending for this username."
+msgstr ""
+"Virhe 0x%04x: Sähköpostiosoitetta ei voi muuttaa koska tälle "
+"käyttäjänimelle on jo käsittelemätön muutospyyntö."
+
+#: ../libpurple/protocols/oscar/oscar.c:4059
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
-"too many screen names associated with it."
+"too many usernames associated with it."
 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:4053
+"assosioitu liian moneen käyttäjänimeen."
+
+#: ../libpurple/protocols/oscar/oscar.c:4061
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -9361,32 +9425,36 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voi muuttaa koska annettu osoite on "
 "virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4056
+#: ../libpurple/protocols/oscar/oscar.c:4063
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Virhe 0x%04x: Tuntematon virhe."
 
-#: ../libpurple/protocols/oscar/oscar.c:4066
+#: ../libpurple/protocols/oscar/oscar.c:4065
+msgid "Error Changing Account Info"
+msgstr "Virhe muutettaessa käyttäjätilin tietoja"
+
+#: ../libpurple/protocols/oscar/oscar.c:4071
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s:n sähköpostiosoite on %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4068
+#: ../libpurple/protocols/oscar/oscar.c:4073
 msgid "Account Info"
 msgstr "Tilin tiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:4251
+#: ../libpurple/protocols/oscar/oscar.c:4259
 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:4520
+#: ../libpurple/protocols/oscar/oscar.c:4530
 msgid "Unable to set AIM profile."
 msgstr "AIM-profiilia ei saatu asetettua."
 
-#: ../libpurple/protocols/oscar/oscar.c:4521
+#: ../libpurple/protocols/oscar/oscar.c:4531
 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 "
@@ -9396,7 +9464,7 @@
 "suoritettua loppuun. Profiilia ei asetettu. Yritä asettaa se kun "
 "kirjautuminen on suoritettu."
 
-#: ../libpurple/protocols/oscar/oscar.c:4535
+#: ../libpurple/protocols/oscar/oscar.c:4545
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -9409,11 +9477,11 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty.  Se on nyt lyhennetty puolestasi."
 
-#: ../libpurple/protocols/oscar/oscar.c:4540
+#: ../libpurple/protocols/oscar/oscar.c:4550
 msgid "Profile too long."
 msgstr "Profiili on liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4584
+#: ../libpurple/protocols/oscar/oscar.c:4594
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9428,32 +9496,32 @@
 "Maksimi poissaoloviestin koko %d tavua ylitetty. Viesti lyhennettiin "
 "puolestasi."
 
-#: ../libpurple/protocols/oscar/oscar.c:4589
+#: ../libpurple/protocols/oscar/oscar.c:4599
 msgid "Away message too long."
 msgstr "Poissaoloviesti on liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4662
-#, c-format
-msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must be a valid email address, or start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"Tuttavaa %s ei voi lisätä koska näyttönimi on virheellinen. Näyttönimen "
+#: ../libpurple/protocols/oscar/oscar.c:4672
+#, c-format
+msgid ""
+"Could not add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+"Tuttavaa %s ei voi lisätä koska käyttäjänimi on virheellinen. Käyttäjänimen "
 "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:4664
-#: ../libpurple/protocols/oscar/oscar.c:5129
-#: ../libpurple/protocols/oscar/oscar.c:5144
+#: ../libpurple/protocols/oscar/oscar.c:4674
+#: ../libpurple/protocols/oscar/oscar.c:5155
+#: ../libpurple/protocols/oscar/oscar.c:5170
 msgid "Unable To Add"
 msgstr "Lisääminen epäonnistui"
 
-#: ../libpurple/protocols/oscar/oscar.c:4783
+#: ../libpurple/protocols/oscar/oscar.c:4793
 msgid "Unable To Retrieve Buddy List"
 msgstr "Tuttavien nouto ei onnistunut"
 
-#: ../libpurple/protocols/oscar/oscar.c:4784
+#: ../libpurple/protocols/oscar/oscar.c:4794
 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."
@@ -9462,15 +9530,15 @@
 "Tuttavasi eivät ole kadonneet, ne tulevat luultavasti näkyville muutamassa "
 "minuutissa."
 
-#: ../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
+#: ../libpurple/protocols/oscar/oscar.c:4996
+#: ../libpurple/protocols/oscar/oscar.c:4998
+#: ../libpurple/protocols/oscar/oscar.c:5237
+#: ../libpurple/protocols/oscar/oscar.c:5238
+#: ../libpurple/protocols/oscar/oscar.c:5243
 msgid "Orphans"
 msgstr "Orvot"
 
-#: ../libpurple/protocols/oscar/oscar.c:5127
+#: ../libpurple/protocols/oscar/oscar.c:5153
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9479,17 +9547,17 @@
 "Tuttavaa %s ei voi lisätä koska tuttaviasi on liian monta. Ole hyvä ja "
 "poista joku ja yritä uudelleen."
 
-#: ../libpurple/protocols/oscar/oscar.c:5127
-#: ../libpurple/protocols/oscar/oscar.c:5142
+#: ../libpurple/protocols/oscar/oscar.c:5153
+#: ../libpurple/protocols/oscar/oscar.c:5168
 msgid "(no name)"
 msgstr "(nimetön)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5141
+#: ../libpurple/protocols/oscar/oscar.c:5167
 #, 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:5275
+#: ../libpurple/protocols/oscar/oscar.c:5301
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9498,22 +9566,22 @@
 "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:5283
+#: ../libpurple/protocols/oscar/oscar.c:5309
 msgid "Authorization Given"
 msgstr "Valtuutus annettu"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5356
+#: ../libpurple/protocols/oscar/oscar.c:5382
 #, 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:5357
+#: ../libpurple/protocols/oscar/oscar.c:5383
 msgid "Authorization Granted"
 msgstr "Valtuutus hyväksytty"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5360
+#: ../libpurple/protocols/oscar/oscar.c:5386
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9523,49 +9591,49 @@
 "Käyttäjä %s on evännyt pyyntösi lisätä hänet tuttaviisi seuraavasta syystä:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5361
+#: ../libpurple/protocols/oscar/oscar.c:5387
 msgid "Authorization Denied"
 msgstr "Valtuutus evätty"
 
-#: ../libpurple/protocols/oscar/oscar.c:5397
+#: ../libpurple/protocols/oscar/oscar.c:5423
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Vaihto:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5510
+#: ../libpurple/protocols/oscar/oscar.c:5536
 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:5672
-#: ../libpurple/protocols/oscar/oscar.c:5677
+#: ../libpurple/protocols/oscar/oscar.c:5698
+#: ../libpurple/protocols/oscar/oscar.c:5703
 msgid "Away Message"
 msgstr "Poissaoloviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5677
+#: ../libpurple/protocols/oscar/oscar.c:5703
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(vastaanotetaan)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5877
+#: ../libpurple/protocols/oscar/oscar.c:5903
 msgid "iTunes Music Store Link"
 msgstr "iTunes-musiikkikauppalinkki"
 
-#: ../libpurple/protocols/oscar/oscar.c:5985
+#: ../libpurple/protocols/oscar/oscar.c:6011
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Tuttavakommentti käyttäjälle %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5986
+#: ../libpurple/protocols/oscar/oscar.c:6012
 msgid "Buddy Comment:"
 msgstr "Kommentti"
 
-#: ../libpurple/protocols/oscar/oscar.c:6033
+#: ../libpurple/protocols/oscar/oscar.c:6059
 #, 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:6037
+#: ../libpurple/protocols/oscar/oscar.c:6063
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9573,66 +9641,66 @@
 "Koska tämä paljastaa IP-osoitteesi, sitä voidaan pitää turvallisuusriskinä.  "
 "Haluatko jatkaa?"
 
-#: ../libpurple/protocols/oscar/oscar.c:6043
+#: ../libpurple/protocols/oscar/oscar.c:6069
 #: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "Y_hdistä"
 
-#: ../libpurple/protocols/oscar/oscar.c:6078
+#: ../libpurple/protocols/oscar/oscar.c:6104
 msgid "Get AIM Info"
 msgstr "Hae AIM-tiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:6084
+#: ../libpurple/protocols/oscar/oscar.c:6110
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
-#: ../libpurple/protocols/oscar/oscar.c:6092
+#: ../libpurple/protocols/oscar/oscar.c:6118
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:6105
+#: ../libpurple/protocols/oscar/oscar.c:6131
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:6127
+#: ../libpurple/protocols/oscar/oscar.c:6153
 msgid "Re-request Authorization"
 msgstr "Pyydä valtuutus uudelleen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6186
+#: ../libpurple/protocols/oscar/oscar.c:6212
 msgid "Require authorization"
 msgstr "Pyydä valtuutusta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6189
+#: ../libpurple/protocols/oscar/oscar.c:6215
 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:6194
+#: ../libpurple/protocols/oscar/oscar.c:6220
 msgid "ICQ Privacy Options"
 msgstr "ICQ-yksityisyysvalinnat"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
+#: ../libpurple/protocols/oscar/oscar.c:6240
 msgid "The new formatting is invalid."
 msgstr "Uusi muotoilu on virheellinen."
 
-#: ../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ä "
+#: ../libpurple/protocols/oscar/oscar.c:6241
+msgid "Username formatting can change only capitalization and whitespace."
+msgstr ""
+"Käyttäjänimen muotoilu voi vaikuttaa ainoastaan alkukirjaimeen sekä "
 "välilyönteihin."
 
-#: ../libpurple/protocols/oscar/oscar.c:6267
+#: ../libpurple/protocols/oscar/oscar.c:6294
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6313
+#: ../libpurple/protocols/oscar/oscar.c:6340
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Et odota valtuutusta</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6316
+#: ../libpurple/protocols/oscar/oscar.c:6343
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Odotat valtuutusta seuraavilta tuttavilta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6317
+#: ../libpurple/protocols/oscar/oscar.c:6344
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9640,65 +9708,65 @@
 "Voit pyytää valtuutuksen uudelleen näiltä tuttavilta napsauttamalla oikeaa "
 "nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
 
-#: ../libpurple/protocols/oscar/oscar.c:6334
+#: ../libpurple/protocols/oscar/oscar.c:6361
 msgid "Find Buddy by E-Mail"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6335
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Search for a buddy by e-mail address"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6336
+#: ../libpurple/protocols/oscar/oscar.c:6363
 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:6339
+#: ../libpurple/protocols/oscar/oscar.c:6366
 msgid "_Search"
 msgstr "_Etsi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6497
-msgid "Set User Info (URL)..."
-msgstr "Aseta käyttäjätiedot (URL)..."
-
-#: ../libpurple/protocols/oscar/oscar.c:6508
-msgid "Change Password (URL)"
-msgstr "Vaihda salasana (URL)"
-
-#: ../libpurple/protocols/oscar/oscar.c:6512
-msgid "Configure IM Forwarding (URL)"
-msgstr "Aseta pikaviestien edelleenlähetys (URL)"
+#: ../libpurple/protocols/oscar/oscar.c:6524
+msgid "Set User Info (web)..."
+msgstr "Aseta käyttäjätiedot (WWW)..."
+
+#: ../libpurple/protocols/oscar/oscar.c:6535
+msgid "Change Password (web)"
+msgstr "Vaihda salasana (WWW)"
+
+#: ../libpurple/protocols/oscar/oscar.c:6539
+msgid "Configure IM Forwarding (web)"
+msgstr "Aseta pikaviestien edelleenlähetys (WWW)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6522
+#: ../libpurple/protocols/oscar/oscar.c:6549
 msgid "Set Privacy Options..."
 msgstr "Aseta yksityisyysvalinnat..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6529
+#: ../libpurple/protocols/oscar/oscar.c:6556
 msgid "Confirm Account"
 msgstr "Vahvista tili"
 
-#: ../libpurple/protocols/oscar/oscar.c:6533
+#: ../libpurple/protocols/oscar/oscar.c:6560
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Näytä tällä hetkellä rekisteröity sähköpostiosoite"
 
-#: ../libpurple/protocols/oscar/oscar.c:6537
+#: ../libpurple/protocols/oscar/oscar.c:6564
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Muuta tällä hetkellä rekisteröityä sähköpostiosoitetta..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6544
+#: ../libpurple/protocols/oscar/oscar.c:6571
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6550
+#: ../libpurple/protocols/oscar/oscar.c:6577
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Etsi tuttavaa sähköpostiosoitteen perusteella..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6555
+#: ../libpurple/protocols/oscar/oscar.c:6582
 msgid "Search for Buddy by Information"
 msgstr "Etsi tuttavaa tietojen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6754
+#: ../libpurple/protocols/oscar/oscar.c:6770
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9721,6 +9789,7 @@
 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."
 
@@ -10384,138 +10453,138 @@
 msgid "%s is not in your buddy list"
 msgstr "%s ei ole tuttavissasi"
 
-#: ../libpurple/protocols/sametime/sametime.c:419
+#: ../libpurple/protocols/sametime/sametime.c:420
 msgid "Connection closed (writing)"
 msgstr "Yhteys suljettu (kirjoitus)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1292
+#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Ryhmän nimi:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1293
+#: ../libpurple/protocols/sametime/sametime.c:1294
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notesin ryhmä-ID:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
+#: ../libpurple/protocols/sametime/sametime.c:1296
 #, c-format
 msgid "Info for Group %s"
 msgstr "Tietoja ryhmästä %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1297
+#: ../libpurple/protocols/sametime/sametime.c:1298
 msgid "Notes Address Book Information"
 msgstr "Notesin osoitekirjatiedot"
 
-#: ../libpurple/protocols/sametime/sametime.c:1329
+#: ../libpurple/protocols/sametime/sametime.c:1330
 msgid "Invite Group to Conference..."
 msgstr "Kutsu ryhmä neuvotteluun..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1339
+#: ../libpurple/protocols/sametime/sametime.c:1340
 msgid "Get Notes Address Book Info"
 msgstr "Hae Notesin osoitekirjatiedot"
 
-#: ../libpurple/protocols/sametime/sametime.c:1506
+#: ../libpurple/protocols/sametime/sametime.c:1507
 msgid "Sending Handshake"
 msgstr "Lähetetään kättelyä"
 
-#: ../libpurple/protocols/sametime/sametime.c:1511
+#: ../libpurple/protocols/sametime/sametime.c:1512
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Odotetaan kättelyn vahvistusta"
 
-#: ../libpurple/protocols/sametime/sametime.c:1516
+#: ../libpurple/protocols/sametime/sametime.c:1517
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Kättely vahvistettu, kirjaudutaan"
 
-#: ../libpurple/protocols/sametime/sametime.c:1521
+#: ../libpurple/protocols/sametime/sametime.c:1522
 msgid "Waiting for Login Acknowledgement"
 msgstr "Odotetaan kirjautumisen vahvistusta"
 
-#: ../libpurple/protocols/sametime/sametime.c:1526
+#: ../libpurple/protocols/sametime/sametime.c:1527
 msgid "Login Redirected"
 msgstr "Sisäänkirjautuminen uudelleenohjattu"
 
-#: ../libpurple/protocols/sametime/sametime.c:1532
+#: ../libpurple/protocols/sametime/sametime.c:1533
 msgid "Forcing Login"
 msgstr "Pakotetaan sisäänkirjautuminen"
 
-#: ../libpurple/protocols/sametime/sametime.c:1536
+#: ../libpurple/protocols/sametime/sametime.c:1537
 msgid "Login Acknowledged"
 msgstr "Kirjautuminen vahvistettu"
 
-#: ../libpurple/protocols/sametime/sametime.c:1541
+#: ../libpurple/protocols/sametime/sametime.c:1542
 msgid "Starting Services"
 msgstr "Käynnistetään palveluja"
 
-#: ../libpurple/protocols/sametime/sametime.c:1678
+#: ../libpurple/protocols/sametime/sametime.c:1679
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr "Sametime-ylläpitäjä on julkaissut seuraavan tiedotteen palvelimella %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1683
+#: ../libpurple/protocols/sametime/sametime.c:1684
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime-ylläpitäjän tiedote"
 
-#: ../libpurple/protocols/sametime/sametime.c:1736
+#: ../libpurple/protocols/sametime/sametime.c:1737
 msgid "Connection reset"
 msgstr "Yhteys suljettu"
 
-#: ../libpurple/protocols/sametime/sametime.c:1748
+#: ../libpurple/protocols/sametime/sametime.c:1749
 #, 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:1773
-#: ../libpurple/protocols/sametime/sametime.c:3780
+#: ../libpurple/protocols/sametime/sametime.c:1774
+#: ../libpurple/protocols/sametime/sametime.c:3781
 msgid "Unable to connect to host"
 msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä"
 
-#: ../libpurple/protocols/sametime/sametime.c:1814
+#: ../libpurple/protocols/sametime/sametime.c:1815
 #, c-format
 msgid "Announcement from %s"
 msgstr "Ilmoitus käyttäjältä %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1988
+#: ../libpurple/protocols/sametime/sametime.c:1989
 msgid "Conference Closed"
 msgstr "Neuvottelu suljettu"
 
-#: ../libpurple/protocols/sametime/sametime.c:2453
+#: ../libpurple/protocols/sametime/sametime.c:2454
 msgid "Unable to send message: "
 msgstr "Viestiä ei voi lähettää: "
 
-#: ../libpurple/protocols/sametime/sametime.c:3009
+#: ../libpurple/protocols/sametime/sametime.c:3010
 msgid "Place Closed"
 msgstr "Paikka suljettu"
 
-#: ../libpurple/protocols/sametime/sametime.c:3279
+#: ../libpurple/protocols/sametime/sametime.c:3280
 msgid "Microphone"
 msgstr "Mikrofoni"
 
-#: ../libpurple/protocols/sametime/sametime.c:3280
+#: ../libpurple/protocols/sametime/sametime.c:3281
 msgid "Speakers"
 msgstr "Kaiuttimet"
 
-#: ../libpurple/protocols/sametime/sametime.c:3281
+#: ../libpurple/protocols/sametime/sametime.c:3282
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3319
-#: ../libpurple/protocols/sametime/sametime.c:4199
+#: ../libpurple/protocols/sametime/sametime.c:3320
+#: ../libpurple/protocols/sametime/sametime.c:4200
 msgid "Supports"
 msgstr "Tukee"
 
-#: ../libpurple/protocols/sametime/sametime.c:3324
-#: ../libpurple/protocols/sametime/sametime.c:4173
+#: ../libpurple/protocols/sametime/sametime.c:3325
+#: ../libpurple/protocols/sametime/sametime.c:4174
 msgid "External User"
 msgstr "Ulkoinen käyttäjä"
 
-#: ../libpurple/protocols/sametime/sametime.c:3430
+#: ../libpurple/protocols/sametime/sametime.c:3431
 msgid "Create conference with user"
 msgstr "Aloita neuvottelu käyttäjän kanssa"
 
-#: ../libpurple/protocols/sametime/sametime.c:3431
+#: ../libpurple/protocols/sametime/sametime.c:3432
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -10524,27 +10593,27 @@
 "Kirjoita uuden neuvottelun puheenaihe sekä kutsuviesti joka lähetetään "
 "käyttäjälle %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3435
+#: ../libpurple/protocols/sametime/sametime.c:3436
 msgid "New Conference"
 msgstr "Aloita neuvottelu"
 
-#: ../libpurple/protocols/sametime/sametime.c:3437
+#: ../libpurple/protocols/sametime/sametime.c:3438
 msgid "Create"
 msgstr "Aloita"
 
-#: ../libpurple/protocols/sametime/sametime.c:3502
+#: ../libpurple/protocols/sametime/sametime.c:3503
 msgid "Available Conferences"
 msgstr "Käynnissä olevat neuvottelut"
 
-#: ../libpurple/protocols/sametime/sametime.c:3508
+#: ../libpurple/protocols/sametime/sametime.c:3509
 msgid "Create New Conference..."
 msgstr "Aloita uusi neuvottelu..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3515
+#: ../libpurple/protocols/sametime/sametime.c:3516
 msgid "Invite user to a conference"
 msgstr "Kutsu käyttäjä neuvotteluun"
 
-#: ../libpurple/protocols/sametime/sametime.c:3516
+#: ../libpurple/protocols/sametime/sametime.c:3517
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10555,27 +10624,27 @@
 "Valitse \"Aloita uusi neuvottelu\" jos haluat aloittaa uuden neuvottelun ja "
 "kutsua tämän käyttäjän sinne."
 
-#: ../libpurple/protocols/sametime/sametime.c:3521
+#: ../libpurple/protocols/sametime/sametime.c:3522
 msgid "Invite to Conference"
 msgstr "Kutsu neuvotteluun"
 
-#: ../libpurple/protocols/sametime/sametime.c:3612
+#: ../libpurple/protocols/sametime/sametime.c:3613
 msgid "Invite to Conference..."
 msgstr "Kutsu neuvotteluun..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3617
+#: ../libpurple/protocols/sametime/sametime.c:3618
 msgid "Send TEST Announcement"
 msgstr "Lähetä TEST-ilmoitus"
 
-#: ../libpurple/protocols/sametime/sametime.c:3636 ../pidgin/gtkconv.c:4426
+#: ../libpurple/protocols/sametime/sametime.c:3637 ../pidgin/gtkconv.c:4420
 msgid "Topic:"
 msgstr "Aihe:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3664
+#: ../libpurple/protocols/sametime/sametime.c:3665
 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:3690
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10584,42 +10653,42 @@
 "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:3694
+#: ../libpurple/protocols/sametime/sametime.c:3695
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhilen yhteysasetukset"
 
-#: ../libpurple/protocols/sametime/sametime.c:3695
+#: ../libpurple/protocols/sametime/sametime.c:3696
 msgid "No Sametime Community Server Specified"
 msgstr "Sametime-yhteisöpalvelinta ei ole määritelty"
 
-#: ../libpurple/protocols/sametime/sametime.c:3697
+#: ../libpurple/protocols/sametime/sametime.c:3698
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: ../libpurple/protocols/sametime/sametime.c:4189
+#: ../libpurple/protocols/sametime/sametime.c:4190
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Tuntematon (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4191
+#: ../libpurple/protocols/sametime/sametime.c:4192
 msgid "Last Known Client"
 msgstr "Viimeksi nähty asiakasohjelma"
 
-#: ../libpurple/protocols/sametime/sametime.c:4355
-#: ../libpurple/protocols/sametime/sametime.c:5560
+#: ../libpurple/protocols/sametime/sametime.c:4356
+#: ../libpurple/protocols/sametime/sametime.c:5561
 msgid "User Name"
 msgstr "Käyttäjänimi"
 
-#: ../libpurple/protocols/sametime/sametime.c:4358
-#: ../libpurple/protocols/sametime/sametime.c:5563
+#: ../libpurple/protocols/sametime/sametime.c:4359
+#: ../libpurple/protocols/sametime/sametime.c:5564
 msgid "Sametime ID"
 msgstr "Sametime-tunnus"
 
-#: ../libpurple/protocols/sametime/sametime.c:4382
+#: ../libpurple/protocols/sametime/sametime.c:4383
 msgid "An ambiguous user ID was entered"
 msgstr "Epäselvä käyttäjätunnus syötetty"
 
-#: ../libpurple/protocols/sametime/sametime.c:4383
+#: ../libpurple/protocols/sametime/sametime.c:4384
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10628,15 +10697,15 @@
 "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:4388
+#: ../libpurple/protocols/sametime/sametime.c:4389
 msgid "Select User"
 msgstr "Valitse käyttäjä"
 
-#: ../libpurple/protocols/sametime/sametime.c:4472
+#: ../libpurple/protocols/sametime/sametime.c:4473
 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:4474
+#: ../libpurple/protocols/sametime/sametime.c:4475
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -10645,7 +10714,7 @@
 "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisöstäsi. Tämä hakusana on "
 "poistettu tuttavistasi."
 
-#: ../libpurple/protocols/sametime/sametime.c:5065
+#: ../libpurple/protocols/sametime/sametime.c:5066
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10654,64 +10723,64 @@
 "Virhe luettaessa tiedostoa %s:  \n"
 "%s.\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5200
+#: ../libpurple/protocols/sametime/sametime.c:5201
 msgid "Remotely Stored Buddy List"
 msgstr "Etätallennetut tuttavat"
 
 # NOTE source: gftt glossary
-#: ../libpurple/protocols/sametime/sametime.c:5205
+#: ../libpurple/protocols/sametime/sametime.c:5206
 msgid "Buddy List Storage Mode"
 msgstr "Tuttavien tallennustapa"
 
-#: ../libpurple/protocols/sametime/sametime.c:5208
+#: ../libpurple/protocols/sametime/sametime.c:5209
 msgid "Local Buddy List Only"
 msgstr "Vain paikalliset tuttavat"
 
-#: ../libpurple/protocols/sametime/sametime.c:5210
+#: ../libpurple/protocols/sametime/sametime.c:5211
 msgid "Merge List from Server"
 msgstr "Yhdistä tuttavat palvelimelta"
 
-#: ../libpurple/protocols/sametime/sametime.c:5212
+#: ../libpurple/protocols/sametime/sametime.c:5213
 msgid "Merge and Save List to Server"
 msgstr "Yhdistä ja tallenna tuttavat palvelimelle"
 
-#: ../libpurple/protocols/sametime/sametime.c:5214
+#: ../libpurple/protocols/sametime/sametime.c:5215
 msgid "Synchronize List with Server"
 msgstr "Täsmää tuttavat palvelimen kanssa"
 
-#: ../libpurple/protocols/sametime/sametime.c:5269
+#: ../libpurple/protocols/sametime/sametime.c:5270
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Tuo Sametime-tuttavat käyttäjätililtä %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5309
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Vie Sametime-tuttavat käyttäjätilille %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5363
+#: ../libpurple/protocols/sametime/sametime.c:5364
 msgid "Unable to add group: group exists"
 msgstr "Ryhmää ei voi lisätä: ryhmä on jo olemassa"
 
-#: ../libpurple/protocols/sametime/sametime.c:5364
+#: ../libpurple/protocols/sametime/sametime.c:5365
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Ryhmä '%s' on jo tuttavissasi."
 
-#: ../libpurple/protocols/sametime/sametime.c:5367
-#: ../libpurple/protocols/sametime/sametime.c:5497
+#: ../libpurple/protocols/sametime/sametime.c:5368
+#: ../libpurple/protocols/sametime/sametime.c:5498
 msgid "Unable to add group"
 msgstr "Ryhmää ei voi lisätä"
 
-#: ../libpurple/protocols/sametime/sametime.c:5426
+#: ../libpurple/protocols/sametime/sametime.c:5427
 msgid "Possible Matches"
 msgstr "Mahdollisia osumia"
 
-#: ../libpurple/protocols/sametime/sametime.c:5442
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Notes Address Book group results"
 msgstr "Notesin osoitekirjan ryhmätulokset"
 
-#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5444
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10722,15 +10791,15 @@
 "ryhmistä. Valitse oikea ryhmä alla olevasta luettelosta lisätäksesi sen "
 "tuttaviisi."
 
-#: ../libpurple/protocols/sametime/sametime.c:5448
+#: ../libpurple/protocols/sametime/sametime.c:5449
 msgid "Select Notes Address Book"
 msgstr "Valitse Notesin osoitekirja"
 
-#: ../libpurple/protocols/sametime/sametime.c:5491
+#: ../libpurple/protocols/sametime/sametime.c:5492
 msgid "Unable to add group: group not found"
 msgstr "Ryhmää ei voi lisätä: ryhmää ei löytynyt"
 
-#: ../libpurple/protocols/sametime/sametime.c:5493
+#: ../libpurple/protocols/sametime/sametime.c:5494
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -10739,11 +10808,11 @@
 "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisösi Notesin osoitekirjan "
 "ryhmistä."
 
-#: ../libpurple/protocols/sametime/sametime.c:5534
+#: ../libpurple/protocols/sametime/sametime.c:5535
 msgid "Notes Address Book Group"
 msgstr "Notesin osoitekirjan ryhmä"
 
-#: ../libpurple/protocols/sametime/sametime.c:5535
+#: ../libpurple/protocols/sametime/sametime.c:5536
 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."
@@ -10751,12 +10820,12 @@
 "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:5584
+#: ../libpurple/protocols/sametime/sametime.c:5585
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Hakutulokset haulle '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5585
+#: ../libpurple/protocols/sametime/sametime.c:5586
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10767,28 +10836,28 @@
 "lisätä nämä käyttäjät tuttaviisi tai lähettää heille viestejä alla olevilla "
 "painikkeilla."
 
-#: ../libpurple/protocols/sametime/sametime.c:5592 ../pidgin/gtknotify.c:770
+#: ../libpurple/protocols/sametime/sametime.c:5593 ../pidgin/gtknotify.c:770
 msgid "Search Results"
 msgstr "Hakutulokset"
 
-#: ../libpurple/protocols/sametime/sametime.c:5617
+#: ../libpurple/protocols/sametime/sametime.c:5618
 msgid "No matches"
 msgstr "Ei tuloksia"
 
-#: ../libpurple/protocols/sametime/sametime.c:5618
+#: ../libpurple/protocols/sametime/sametime.c:5619
 #, 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:5622
+#: ../libpurple/protocols/sametime/sametime.c:5623
 msgid "No Matches"
 msgstr "Ei tuloksia"
 
-#: ../libpurple/protocols/sametime/sametime.c:5659
+#: ../libpurple/protocols/sametime/sametime.c:5660
 msgid "Search for a user"
 msgstr "Etsi käyttäjiä"
 
-#: ../libpurple/protocols/sametime/sametime.c:5660
+#: ../libpurple/protocols/sametime/sametime.c:5661
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -10796,32 +10865,32 @@
 "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:5663
+#: ../libpurple/protocols/sametime/sametime.c:5664
 msgid "User Search"
 msgstr "Käyttäjähaku"
 
-#: ../libpurple/protocols/sametime/sametime.c:5676
+#: ../libpurple/protocols/sametime/sametime.c:5677
 msgid "Import Sametime List..."
 msgstr "Tuo Sametime-tuttavat..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5680
+#: ../libpurple/protocols/sametime/sametime.c:5681
 msgid "Export Sametime List..."
 msgstr "Vie Sametime-tuttavat..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5684
+#: ../libpurple/protocols/sametime/sametime.c:5685
 msgid "Add Notes Address Book Group..."
 msgstr "Lisää Notesin osoitekirjan ryhmä..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5688
+#: ../libpurple/protocols/sametime/sametime.c:5689
 msgid "User Search..."
 msgstr "Käyttäjähaku..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5794
+#: ../libpurple/protocols/sametime/sametime.c:5795
 msgid "Force login (ignore server redirects)"
 msgstr "Pakota sisäänkirjautuminen (älä välitä palvelinuudelleenohjauksista)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5804
+#: ../libpurple/protocols/sametime/sametime.c:5805
 msgid "Hide client identity"
 msgstr "Piilota asiakasohjelman tunniste"
 
@@ -10952,8 +11021,8 @@
 #: ../libpurple/protocols/silc/buddy.c:496
 #: ../libpurple/protocols/silc/buddy.c:507
 #: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1503
-#: ../libpurple/protocols/silc/ops.c:1514
+#: ../libpurple/protocols/silc/ops.c:1518
+#: ../libpurple/protocols/silc/ops.c:1529
 #: ../libpurple/protocols/silc10/buddy.c:513
 #: ../libpurple/protocols/silc10/buddy.c:548
 #: ../libpurple/protocols/silc10/ops.c:1494
@@ -10962,8 +11031,8 @@
 msgstr "Hae julkinen avain"
 
 #: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1504
-#: ../libpurple/protocols/silc/ops.c:1515
+#: ../libpurple/protocols/silc/ops.c:1519
+#: ../libpurple/protocols/silc/ops.c:1530
 #: ../libpurple/protocols/silc10/buddy.c:549
 #: ../libpurple/protocols/silc10/ops.c:1495
 #: ../libpurple/protocols/silc10/ops.c:1506
@@ -10987,11 +11056,11 @@
 msgstr "Julkista avainta ei voi ladata"
 
 #: ../libpurple/protocols/silc/buddy.c:701
-#: ../libpurple/protocols/silc/ops.c:1053
-#: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1290
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1309
+#: ../libpurple/protocols/silc/ops.c:1068
+#: ../libpurple/protocols/silc/ops.c:1183
+#: ../libpurple/protocols/silc/ops.c:1305
+#: ../libpurple/protocols/silc/ops.c:1306
+#: ../libpurple/protocols/silc/ops.c:1324
 #: ../libpurple/protocols/silc10/buddy.c:713
 #: ../libpurple/protocols/silc10/ops.c:1087
 #: ../libpurple/protocols/silc10/ops.c:1159
@@ -11002,8 +11071,8 @@
 msgstr "Käyttäjätiedot"
 
 #: ../libpurple/protocols/silc/buddy.c:702
-#: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1310
+#: ../libpurple/protocols/silc/ops.c:1184
+#: ../libpurple/protocols/silc/ops.c:1325
 #: ../libpurple/protocols/silc10/buddy.c:714
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
@@ -11107,131 +11176,131 @@
 
 #: ../libpurple/protocols/silc/buddy.c:1496
 #: ../libpurple/protocols/silc/silc.c:886
-#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/util.c:525
 #: ../libpurple/protocols/silc10/buddy.c:1496
 #: ../libpurple/protocols/silc10/silc.c:660
-#: ../libpurple/protocols/silc10/util.c:512
+#: ../libpurple/protocols/silc10/util.c:515
 msgid "Happy"
 msgstr "Onnellinen"
 
 #: ../libpurple/protocols/silc/buddy.c:1498
 #: ../libpurple/protocols/silc/silc.c:888
-#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/util.c:527
 #: ../libpurple/protocols/silc10/buddy.c:1498
 #: ../libpurple/protocols/silc10/silc.c:662
-#: ../libpurple/protocols/silc10/util.c:514
+#: ../libpurple/protocols/silc10/util.c:517
 msgid "Sad"
 msgstr "Surullinen"
 
 #: ../libpurple/protocols/silc/buddy.c:1500
 #: ../libpurple/protocols/silc/silc.c:890
-#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/util.c:529
 #: ../libpurple/protocols/silc10/buddy.c:1500
 #: ../libpurple/protocols/silc10/silc.c:664
-#: ../libpurple/protocols/silc10/util.c:516
+#: ../libpurple/protocols/silc10/util.c:519
 msgid "Angry"
 msgstr "Vihainen"
 
 #: ../libpurple/protocols/silc/buddy.c:1502
 #: ../libpurple/protocols/silc/silc.c:892
-#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/util.c:531
 #: ../libpurple/protocols/silc10/buddy.c:1502
 #: ../libpurple/protocols/silc10/silc.c:666
-#: ../libpurple/protocols/silc10/util.c:518
+#: ../libpurple/protocols/silc10/util.c:521
 msgid "Jealous"
 msgstr "Mustasukkainen"
 
 #: ../libpurple/protocols/silc/buddy.c:1504
 #: ../libpurple/protocols/silc/silc.c:894
-#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/util.c:533
 #: ../libpurple/protocols/silc10/buddy.c:1504
 #: ../libpurple/protocols/silc10/silc.c:668
-#: ../libpurple/protocols/silc10/util.c:520
+#: ../libpurple/protocols/silc10/util.c:523
 msgid "Ashamed"
 msgstr "Häpeää"
 
 #: ../libpurple/protocols/silc/buddy.c:1506
 #: ../libpurple/protocols/silc/silc.c:896
-#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/util.c:535
 #: ../libpurple/protocols/silc10/buddy.c:1506
 #: ../libpurple/protocols/silc10/silc.c:670
-#: ../libpurple/protocols/silc10/util.c:522
+#: ../libpurple/protocols/silc10/util.c:525
 msgid "Invincible"
 msgstr "Haavoittumaton"
 
 #: ../libpurple/protocols/silc/buddy.c:1508
-#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc/util.c:537
 #: ../libpurple/protocols/silc10/buddy.c:1508
-#: ../libpurple/protocols/silc10/util.c:524
+#: ../libpurple/protocols/silc10/util.c:527
 msgid "In Love"
 msgstr "Rakastunut"
 
 #: ../libpurple/protocols/silc/buddy.c:1510
 #: ../libpurple/protocols/silc/silc.c:900
-#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc/util.c:539
 #: ../libpurple/protocols/silc10/buddy.c:1510
 #: ../libpurple/protocols/silc10/silc.c:674
-#: ../libpurple/protocols/silc10/util.c:526
+#: ../libpurple/protocols/silc10/util.c:529
 msgid "Sleepy"
 msgstr "Unelias"
 
 #: ../libpurple/protocols/silc/buddy.c:1512
 #: ../libpurple/protocols/silc/silc.c:902
-#: ../libpurple/protocols/silc/util.c:538
+#: ../libpurple/protocols/silc/util.c:541
 #: ../libpurple/protocols/silc10/buddy.c:1512
 #: ../libpurple/protocols/silc10/silc.c:676
-#: ../libpurple/protocols/silc10/util.c:528
+#: ../libpurple/protocols/silc10/util.c:531
 msgid "Bored"
 msgstr "Tylsistynyt"
 
 #: ../libpurple/protocols/silc/buddy.c:1514
 #: ../libpurple/protocols/silc/silc.c:904
-#: ../libpurple/protocols/silc/util.c:540
+#: ../libpurple/protocols/silc/util.c:543
 #: ../libpurple/protocols/silc10/buddy.c:1514
 #: ../libpurple/protocols/silc10/silc.c:678
-#: ../libpurple/protocols/silc10/util.c:530
+#: ../libpurple/protocols/silc10/util.c:533
 msgid "Excited"
 msgstr "Innostunut"
 
 #: ../libpurple/protocols/silc/buddy.c:1516
 #: ../libpurple/protocols/silc/silc.c:906
-#: ../libpurple/protocols/silc/util.c:542
+#: ../libpurple/protocols/silc/util.c:545
 #: ../libpurple/protocols/silc10/buddy.c:1516
 #: ../libpurple/protocols/silc10/silc.c:680
-#: ../libpurple/protocols/silc10/util.c:532
+#: ../libpurple/protocols/silc10/util.c:535
 msgid "Anxious"
 msgstr "Levoton"
 
 #: ../libpurple/protocols/silc/buddy.c:1548
-#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/ops.c:1222
 #: ../libpurple/protocols/silc10/buddy.c:1548
 #: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Käyttäjätilat"
 
 #: ../libpurple/protocols/silc/buddy.c:1565
-#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/ops.c:1239
 #: ../libpurple/protocols/silc10/buddy.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Suosikkituttava"
 
 #: ../libpurple/protocols/silc/buddy.c:1570
-#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/ops.c:1244
 #: ../libpurple/protocols/silc10/buddy.c:1570
 #: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Ensisijainen kieli"
 
 #: ../libpurple/protocols/silc/buddy.c:1575
-#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc10/buddy.c:1575
 #: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Laite"
 
 #: ../libpurple/protocols/silc/buddy.c:1580
-#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/ops.c:1254
 #: ../libpurple/protocols/silc10/buddy.c:1580
 #: ../libpurple/protocols/silc10/ops.c:1234
 #: ../libpurple/protocols/silc10/silc.c:728
@@ -11240,7 +11309,7 @@
 msgstr "Aikavyöhyke"
 
 #: ../libpurple/protocols/silc/buddy.c:1585
-#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc/ops.c:1259
 #: ../libpurple/protocols/silc10/buddy.c:1585
 #: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
@@ -11267,7 +11336,7 @@
 msgstr "Hae julkinen avain..."
 
 #: ../libpurple/protocols/silc/buddy.c:1671
-#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1627
 #: ../libpurple/protocols/silc10/buddy.c:1670
 #: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
@@ -11342,6 +11411,7 @@
 
 #: ../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> "
 
@@ -11380,6 +11450,7 @@
 
 #: ../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 "
@@ -11419,7 +11490,7 @@
 msgstr "Ryhmän nimi"
 
 #: ../libpurple/protocols/silc/chat.c:605
-#: ../libpurple/protocols/silc/ops.c:1817
+#: ../libpurple/protocols/silc/ops.c:1832
 #: ../libpurple/protocols/silc/silc.c:1163
 #: ../libpurple/protocols/silc10/chat.c:585
 #: ../libpurple/protocols/silc10/ops.c:1907
@@ -11620,12 +11691,12 @@
 msgid "Cannot send file"
 msgstr "Tiedoston lähetys ei onnistu"
 
-#: ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/silc/ops.c:76
 msgid "Error occurred"
 msgstr "Tapahtui virhe"
 
-#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
-#: ../libpurple/protocols/silc/ops.c:551
+#: ../libpurple/protocols/silc/ops.c:548 ../libpurple/protocols/silc/ops.c:557
+#: ../libpurple/protocols/silc/ops.c:566
 #: ../libpurple/protocols/silc10/ops.c:554
 #: ../libpurple/protocols/silc10/ops.c:563
 #: ../libpurple/protocols/silc10/ops.c:572
@@ -11633,38 +11704,38 @@
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s on vaihtanut <I>%s</I> aiheeksi: %s"
 
-#: ../libpurple/protocols/silc/ops.c:617
+#: ../libpurple/protocols/silc/ops.c:632
 #: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> muutti kanavan <I>%s</I> tilaa: %s"
 
-#: ../libpurple/protocols/silc/ops.c:621
+#: ../libpurple/protocols/silc/ops.c:636
 #: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> muutti kaikki kanavan <I>%s</I> tilat"
 
-#: ../libpurple/protocols/silc/ops.c:654
+#: ../libpurple/protocols/silc/ops.c:669
 #: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> asetti <I>%s</I> tilan: %s"
 
-#: ../libpurple/protocols/silc/ops.c:662
+#: ../libpurple/protocols/silc/ops.c:677
 #: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> poisti kaikki <I>%s</I> tilat"
 
-#: ../libpurple/protocols/silc/ops.c:691
+#: ../libpurple/protocols/silc/ops.c:706
 #: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Sinut on poistettu <I>%s</I> käyttäjä <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
-#: ../libpurple/protocols/silc/ops.c:728
+#: ../libpurple/protocols/silc/ops.c:733 ../libpurple/protocols/silc/ops.c:738
+#: ../libpurple/protocols/silc/ops.c:743
 #: ../libpurple/protocols/silc10/ops.c:742
 #: ../libpurple/protocols/silc10/ops.c:747
 #: ../libpurple/protocols/silc10/ops.c:752
@@ -11672,8 +11743,8 @@
 msgid "You have been killed by %s (%s)"
 msgstr "Sinut on poistanut %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
-#: ../libpurple/protocols/silc/ops.c:759
+#: ../libpurple/protocols/silc/ops.c:764 ../libpurple/protocols/silc/ops.c:769
+#: ../libpurple/protocols/silc/ops.c:774
 #: ../libpurple/protocols/silc10/ops.c:773
 #: ../libpurple/protocols/silc10/ops.c:778
 #: ../libpurple/protocols/silc10/ops.c:783
@@ -11681,157 +11752,157 @@
 msgid "Killed by %s (%s)"
 msgstr "Poistettu käyttäjän %s toimesta (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:796
+#: ../libpurple/protocols/silc/ops.c:811
 #: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Kirjaudu ulos palvelimelta"
 
-#: ../libpurple/protocols/silc/ops.c:983
+#: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Henkilökohtaiset tiedot"
 
-#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc/ops.c:1021
 #: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Syntymäpäivä"
 
-#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc/ops.c:1029
 #: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Asema työssä"
 
-#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/ops.c:1033
 #: ../libpurple/protocols/silc/silc.c:1156
 #: ../libpurple/protocols/silc10/ops.c:1052
 #: ../libpurple/protocols/silc10/silc.c:930
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc/ops.c:1037
 #: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Yksikkö"
 
-#: ../libpurple/protocols/silc/ops.c:1046
+#: ../libpurple/protocols/silc/ops.c:1061
 #: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Huomautus"
 
-#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc/ops.c:1108
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../libpurple/protocols/silc/ops.c:1127
+#: ../libpurple/protocols/silc/ops.c:1142
 #: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Olet kanavan perustaja kanavalla <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1131
+#: ../libpurple/protocols/silc/ops.c:1146
 #: ../libpurple/protocols/silc10/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Kanavan perustaja kanavalla <I>%s</I> on <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1328
+#: ../libpurple/protocols/silc/ops.c:1205
+#: ../libpurple/protocols/silc/ops.c:1343
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1077
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1078
 msgid "Real Name"
 msgstr "Oikea nimi"
 
-#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc/ops.c:1233
 #: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Tilateksti"
 
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1354
+#: ../libpurple/protocols/silc/ops.c:1295
+#: ../libpurple/protocols/silc/ops.c:1369
 #: ../libpurple/protocols/silc10/ops.c:1285
 #: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Julkisen avaimen sormenjälki"
 
-#: ../libpurple/protocols/silc/ops.c:1281
-#: ../libpurple/protocols/silc/ops.c:1355
+#: ../libpurple/protocols/silc/ops.c:1296
+#: ../libpurple/protocols/silc/ops.c:1370
 #: ../libpurple/protocols/silc10/ops.c:1286
 #: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Julkisen avaimen \"babbleprint\""
 
-#: ../libpurple/protocols/silc/ops.c:1294
+#: ../libpurple/protocols/silc/ops.c:1309
 #: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Lisää..."
 
-#: ../libpurple/protocols/silc/ops.c:1373
+#: ../libpurple/protocols/silc/ops.c:1388
 #: ../libpurple/protocols/silc/silc.c:1220
 #: ../libpurple/protocols/silc10/ops.c:1371
 #: ../libpurple/protocols/silc10/silc.c:994
 msgid "Detach From Server"
 msgstr "Irrota palvelimelta"
 
-#: ../libpurple/protocols/silc/ops.c:1373
+#: ../libpurple/protocols/silc/ops.c:1388
 #: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Irrottaminen ei onnistu"
 
-#: ../libpurple/protocols/silc/ops.c:1393
+#: ../libpurple/protocols/silc/ops.c:1408
 #: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Aihetta ei voi asettaa"
 
-#: ../libpurple/protocols/silc/ops.c:1422
+#: ../libpurple/protocols/silc/ops.c:1437
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Kutsumanimeä ei onnistuttu muuttamaan"
 
-#: ../libpurple/protocols/silc/ops.c:1471
+#: ../libpurple/protocols/silc/ops.c:1486
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Huoneluettelo"
 
-#: ../libpurple/protocols/silc/ops.c:1471
+#: ../libpurple/protocols/silc/ops.c:1486
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Huoneluetteloa ei saatu"
 
-#: ../libpurple/protocols/silc/ops.c:1472
+#: ../libpurple/protocols/silc/ops.c:1487
 msgid "Network is empty"
 msgstr "Verkko on tyhjä"
 
-#: ../libpurple/protocols/silc/ops.c:1516
+#: ../libpurple/protocols/silc/ops.c:1531
 #: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Ei saatu julkista avainta"
 
-#: ../libpurple/protocols/silc/ops.c:1528
-#: ../libpurple/protocols/silc/ops.c:1541
+#: ../libpurple/protocols/silc/ops.c:1543
+#: ../libpurple/protocols/silc/ops.c:1556
 #: ../libpurple/protocols/silc10/ops.c:1519
 #: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Palvelimen tiedot"
 
-#: ../libpurple/protocols/silc/ops.c:1529
+#: ../libpurple/protocols/silc/ops.c:1544
 #: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Ei saada palvelimen tietoja"
 
-#: ../libpurple/protocols/silc/ops.c:1552
+#: ../libpurple/protocols/silc/ops.c:1567
 #: ../libpurple/protocols/silc10/ops.c:1549
 #: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Palvelimen tilastoja"
 
-#: ../libpurple/protocols/silc/ops.c:1553
+#: ../libpurple/protocols/silc/ops.c:1568
 #: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Ei saatu palvelimen tilastoja"
 
-#: ../libpurple/protocols/silc/ops.c:1560
+#: ../libpurple/protocols/silc/ops.c:1575
 #: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
@@ -11867,36 +11938,36 @@
 "Palvelinoperaattorit yhteensä: %d\n"
 "Reititinoperaattorit yhteensä: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1592
+#: ../libpurple/protocols/silc/ops.c:1607
 #: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Verkkotilastoja"
 
-#: ../libpurple/protocols/silc/ops.c:1600
+#: ../libpurple/protocols/silc/ops.c:1615
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping epäonnistui"
 
-#: ../libpurple/protocols/silc/ops.c:1605
+#: ../libpurple/protocols/silc/ops.c:1620
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Ping-vastaus saatu palvelimelta"
 
-#: ../libpurple/protocols/silc/ops.c:1613
+#: ../libpurple/protocols/silc/ops.c:1628
 #: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Käyttäjää ei voi poistaa"
 
-#: ../libpurple/protocols/silc/ops.c:1652
+#: ../libpurple/protocols/silc/ops.c:1667
 msgid "WATCH"
 msgstr "TARKKAILE"
 
-#: ../libpurple/protocols/silc/ops.c:1652
+#: ../libpurple/protocols/silc/ops.c:1667
 msgid "Cannot watch user"
 msgstr "Et voi tarkkailla käyttäjää"
 
-#: ../libpurple/protocols/silc/ops.c:1728
-#: ../libpurple/protocols/silc/ops.c:1779
+#: ../libpurple/protocols/silc/ops.c:1743
+#: ../libpurple/protocols/silc/ops.c:1794
 #: ../libpurple/protocols/silc/silc.c:385
 #: ../libpurple/protocols/silc10/ops.c:1817
 #: ../libpurple/protocols/silc10/ops.c:1864
@@ -11904,17 +11975,17 @@
 msgid "Resuming session"
 msgstr "Palautetaan istunto"
 
-#: ../libpurple/protocols/silc/ops.c:1730
+#: ../libpurple/protocols/silc/ops.c:1745
 #: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr "Todennetaan yhteys"
 
-#: ../libpurple/protocols/silc/ops.c:1781
+#: ../libpurple/protocols/silc/ops.c:1796
 #: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr "Tarkistetaan palvelimen julkinen avain"
 
-#: ../libpurple/protocols/silc/ops.c:1818
+#: ../libpurple/protocols/silc/ops.c:1833
 #: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr "Vaatii salasanan"
@@ -12032,6 +12103,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:884
 #: ../libpurple/protocols/silc10/silc.c:658 ../pidgin/gtkprefs.c:1685
+#, c-format
 msgid "Normal"
 msgstr "Normaali"
 
@@ -12050,16 +12122,16 @@
 "Suosimasi yhteystavat"
 
 #: ../libpurple/protocols/silc/silc.c:917
-#: ../libpurple/protocols/silc/util.c:567
+#: ../libpurple/protocols/silc/util.c:571
 #: ../libpurple/protocols/silc10/silc.c:691
-#: ../libpurple/protocols/silc10/util.c:557
+#: ../libpurple/protocols/silc10/util.c:561
 msgid "SMS"
 msgstr "SMS"
 
 #: ../libpurple/protocols/silc/silc.c:919
-#: ../libpurple/protocols/silc/util.c:569
+#: ../libpurple/protocols/silc/util.c:573
 #: ../libpurple/protocols/silc10/silc.c:693
-#: ../libpurple/protocols/silc10/util.c:559
+#: ../libpurple/protocols/silc10/util.c:563
 msgid "MMS"
 msgstr "MMS"
 
@@ -12275,7 +12347,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:1821
 #: ../libpurple/protocols/silc10/silc.c:1613
-#: ../libpurple/protocols/zephyr/zephyr.c:2697
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 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"
 
@@ -12573,28 +12645,28 @@
 msgid "Public Key Information"
 msgstr "Julkisen avaimen tiedot"
 
-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/util.c:555
+#: ../libpurple/protocols/silc/util.c:569
+#: ../libpurple/protocols/silc10/util.c:559
 msgid "Paging"
 msgstr "Kaukohaku"
 
-#: ../libpurple/protocols/silc/util.c:571
-#: ../libpurple/protocols/silc10/util.c:561
+#: ../libpurple/protocols/silc/util.c:575
+#: ../libpurple/protocols/silc10/util.c:565
 msgid "Video Conferencing"
 msgstr "Videoneuvottelu"
 
-#: ../libpurple/protocols/silc/util.c:589
-#: ../libpurple/protocols/silc10/util.c:579
+#: ../libpurple/protocols/silc/util.c:594
+#: ../libpurple/protocols/silc10/util.c:584
 msgid "Computer"
 msgstr "Tietokone"
 
-#: ../libpurple/protocols/silc/util.c:593
-#: ../libpurple/protocols/silc10/util.c:583
+#: ../libpurple/protocols/silc/util.c:598
+#: ../libpurple/protocols/silc10/util.c:588
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:595
-#: ../libpurple/protocols/silc10/util.c:585
+#: ../libpurple/protocols/silc/util.c:600
+#: ../libpurple/protocols/silc10/util.c:590
 msgid "Terminal"
 msgstr "Pääte"
 
@@ -12622,42 +12694,52 @@
 msgstr "Palvelimen tilastoja ei saatavilla."
 
 #: ../libpurple/protocols/silc10/ops.c:1937
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Virhe: Versioepäyhteensopivuus, päivitä ohjelmasi"
 
 #: ../libpurple/protocols/silc10/ops.c:1940
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Virhe: Etäkone ei luota/tue julkista avaintasi"
 
 #: ../libpurple/protocols/silc10/ops.c:1943
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Virhe: Etäkone ei tue ehdotettua KE-ryhmää"
 
 #: ../libpurple/protocols/silc10/ops.c:1946
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Virhe: Etäkone ei tue ehdotettua salausta"
 
 #: ../libpurple/protocols/silc10/ops.c:1949
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Virhe: Etäkone ei tuo ehdotettua PKCS:aa"
 
 #: ../libpurple/protocols/silc10/ops.c:1952
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Virhe: Etäkone ei tue ehdotettua tiivistysfunktiota"
 
 #: ../libpurple/protocols/silc10/ops.c:1955
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Virhe: Etäkone ei tue ehdotettua HMAC:ia"
 
 #: ../libpurple/protocols/silc10/ops.c:1957
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Virhe: Virheellinen allekirjoitus"
 
 #: ../libpurple/protocols/silc10/ops.c:1959
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Virhe: Virheellinen eväste"
 
 #: ../libpurple/protocols/silc10/ops.c:1970
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Virhe: Todennus epäonnistui"
 
@@ -12788,6 +12870,7 @@
 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."
 
@@ -12812,38 +12895,47 @@
 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."
 
@@ -12853,18 +12945,22 @@
 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."
@@ -12903,8 +12999,7 @@
 msgid "Password Change Successful"
 msgstr "Salasanan vaihto onnistui"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6399
-#: ../pidgin/gtkblist.c:6736
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6764
 msgid "_Group:"
 msgstr "_Ryhmä:"
 
@@ -13017,7 +13112,7 @@
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!:n todennus epäonnistui"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
+#: ../libpurple/protocols/yahoo/yahoo.c:2078
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -13027,51 +13122,55 @@
 "Painaessasi \"Kyllä\" poistat hänet tuttavistasi eikä häneltä saapuneista "
 "viesteistä enää välitetä."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2069
+#: ../libpurple/protocols/yahoo/yahoo.c:2081
 msgid "Ignore buddy?"
 msgstr "Jätä tuttava huomiotta?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2134
+#: ../libpurple/protocols/yahoo/yahoo.c:2127
+msgid "Invalid screen name."
+msgstr "Epäkelpo näyttönimi."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2152
 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:2137
+#: ../libpurple/protocols/yahoo/yahoo.c:2155
 #, 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:2190
+#: ../libpurple/protocols/yahoo/yahoo.c:2208
 #, 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:2193
+#: ../libpurple/protocols/yahoo/yahoo.c:2211
 msgid "Could not add buddy to server list"
 msgstr "Tuttavaa ei voi lisätä palvelimen tuttaviin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2315
+#: ../libpurple/protocols/yahoo/yahoo.c:2333
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Ääniäinen %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2671
+#: ../libpurple/protocols/yahoo/yahoo.c:2689
 msgid "Received unexpected HTTP response from server."
 msgstr "Odottamaton HTTP-vastaus palvelimelta."
 
-#: ../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/yahoo.c:2718
+#: ../libpurple/protocols/yahoo/yahoo.c:2906
+#: ../libpurple/protocols/yahoo/yahoo.c:3011
+#: ../libpurple/protocols/yahoo/yahoo.c:3022
 #: ../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:2726
+#: ../libpurple/protocols/yahoo/yahoo.c:2744
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -13080,7 +13179,7 @@
 "Yhteys palvelimeen %s katkesi:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2751
+#: ../libpurple/protocols/yahoo/yahoo.c:2769
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -13089,103 +13188,103 @@
 "Yhteyttä ei voi muodostaa palvelimeen %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3118
-#: ../libpurple/protocols/yahoo/yahoo.c:3809
+#: ../libpurple/protocols/yahoo/yahoo.c:3138
+#: ../libpurple/protocols/yahoo/yahoo.c:3829
 msgid "Not at Home"
 msgstr "Poissa kotoa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3120
-#: ../libpurple/protocols/yahoo/yahoo.c:3812
+#: ../libpurple/protocols/yahoo/yahoo.c:3140
+#: ../libpurple/protocols/yahoo/yahoo.c:3832
 msgid "Not at Desk"
 msgstr "Poissa työpöydältä"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3122
-#: ../libpurple/protocols/yahoo/yahoo.c:3815
+#: ../libpurple/protocols/yahoo/yahoo.c:3142
+#: ../libpurple/protocols/yahoo/yahoo.c:3835
 msgid "Not in Office"
 msgstr "Poissa toimistolta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3126
-#: ../libpurple/protocols/yahoo/yahoo.c:3821
+#: ../libpurple/protocols/yahoo/yahoo.c:3146
+#: ../libpurple/protocols/yahoo/yahoo.c:3841
 msgid "On Vacation"
 msgstr "Lomalla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3130
-#: ../libpurple/protocols/yahoo/yahoo.c:3827
+#: ../libpurple/protocols/yahoo/yahoo.c:3150
+#: ../libpurple/protocols/yahoo/yahoo.c:3847
 msgid "Stepped Out"
 msgstr "Piipahdan ulkona"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3223
-#: ../libpurple/protocols/yahoo/yahoo.c:3253
+#: ../libpurple/protocols/yahoo/yahoo.c:3243
+#: ../libpurple/protocols/yahoo/yahoo.c:3273
 msgid "Not on server list"
 msgstr "Ei palvelimen tuttavissa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3270
-#: ../libpurple/protocols/yahoo/yahoo.c:3328
+#: ../libpurple/protocols/yahoo/yahoo.c:3290
+#: ../libpurple/protocols/yahoo/yahoo.c:3348
 msgid "Appear Online"
 msgstr "Näytä linjoilla olevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3273
-#: ../libpurple/protocols/yahoo/yahoo.c:3349
+#: ../libpurple/protocols/yahoo/yahoo.c:3293
+#: ../libpurple/protocols/yahoo/yahoo.c:3369
 msgid "Appear Permanently Offline"
 msgstr "Näytä pysyvästi poissa linjoilta olevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
+#: ../libpurple/protocols/yahoo/yahoo.c:3311
 msgid "Presence"
 msgstr "Läsnäolo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3334
+#: ../libpurple/protocols/yahoo/yahoo.c:3354
 msgid "Appear Offline"
 msgstr "Näytä poissa linjoilta olevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3343
+#: ../libpurple/protocols/yahoo/yahoo.c:3363
 msgid "Don't Appear Permanently Offline"
 msgstr "Älä näytä pysyvästi poissa linjoilta olevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3391
+#: ../libpurple/protocols/yahoo/yahoo.c:3411
 msgid "Join in Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3397
+#: ../libpurple/protocols/yahoo/yahoo.c:3417
 msgid "Initiate Conference"
 msgstr "Aloita neuvottelu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3425
+#: ../libpurple/protocols/yahoo/yahoo.c:3445
 msgid "Presence Settings"
 msgstr "Läsnäoloasetukset"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3431
+#: ../libpurple/protocols/yahoo/yahoo.c:3451
 msgid "Start Doodling"
 msgstr "Aloita piirtely"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3537
+#: ../libpurple/protocols/yahoo/yahoo.c:3557
 msgid "Activate which ID?"
 msgstr "Mikä tunnus (ID) aktivoidaan?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3548
+#: ../libpurple/protocols/yahoo/yahoo.c:3568
 msgid "Join whom in chat?"
 msgstr "Kenen seuraan liitytään ryhmäkeskustelussa?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3560
+#: ../libpurple/protocols/yahoo/yahoo.c:3580
 msgid "Activate ID..."
 msgstr "Aktivoi tunnus (ID)..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3564
+#: ../libpurple/protocols/yahoo/yahoo.c:3584
 msgid "Join User in Chat..."
 msgstr "Liity käyttäjän seuraan ryhmäkeskustelussa..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3569
+#: ../libpurple/protocols/yahoo/yahoo.c:3589
 msgid "Open Inbox"
 msgstr "Avaa saapuneet-kansio"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4158
+#: ../libpurple/protocols/yahoo/yahoo.c:4178
 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:4163
+#: ../libpurple/protocols/yahoo/yahoo.c:4183
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Listaa kanavat Yahoo-verkossa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4171
+#: ../libpurple/protocols/yahoo/yahoo.c:4191
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Pyydä käyttäjää aloittamaan piirtelyistunto"
 
@@ -13199,56 +13298,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4380
-#: ../libpurple/protocols/yahoo/yahoo.c:4382
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
+#: ../libpurple/protocols/yahoo/yahoo.c:4402
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4405
+#: ../libpurple/protocols/yahoo/yahoo.c:4425
 msgid "Yahoo Japan"
 msgstr "Yahoo Japani"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4408
+#: ../libpurple/protocols/yahoo/yahoo.c:4428
 msgid "Pager server"
 msgstr "Hakulaitepalvelin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4411
+#: ../libpurple/protocols/yahoo/yahoo.c:4431
 msgid "Japan Pager server"
 msgstr "Hakulaitepalvelin (Japani)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4414
+#: ../libpurple/protocols/yahoo/yahoo.c:4434
 msgid "Pager port"
 msgstr "Hakulaiteportti"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4417
+#: ../libpurple/protocols/yahoo/yahoo.c:4437
 msgid "File transfer server"
 msgstr "Tiedostonsiirtopalvelin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4420
+#: ../libpurple/protocols/yahoo/yahoo.c:4440
 msgid "Japan file transfer server"
 msgstr "Tiedostonsiirtopalvelin (Japani)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4423
+#: ../libpurple/protocols/yahoo/yahoo.c:4443
 msgid "File transfer port"
 msgstr "Tiedostonsiirtoportti"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4426
+#: ../libpurple/protocols/yahoo/yahoo.c:4446
 msgid "Chat room locale"
 msgstr "Keskusteluhuoneen paikallisasetus"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4429
+#: ../libpurple/protocols/yahoo/yahoo.c:4449
 msgid "Ignore conference and chatroom invitations"
 msgstr "Jätä konferenssi- ja keskusteluhuonekutsut huomiotta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4437
+#: ../libpurple/protocols/yahoo/yahoo.c:4457
 msgid "Chat room list URL"
 msgstr "Keskusteluhuoneluettelon URL"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4440
+#: ../libpurple/protocols/yahoo/yahoo.c:4460
 msgid "Yahoo Chat server"
 msgstr "Yahoo-ryhmäkeskustelupalvelin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4443
+#: ../libpurple/protocols/yahoo/yahoo.c:4463
 msgid "Yahoo Chat port"
 msgstr "Yahoo-ryhmäkeskustelupalvelimen portti"
 
@@ -13304,43 +13403,43 @@
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1115
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1119
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1123
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1116
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1120
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1124
 msgid "Hobbies"
 msgstr "Harrastukset"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1133
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1137
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1134
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Latest News"
 msgstr "Uutiset"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1158
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1159
 msgid "Home Page"
 msgstr "Kotisivu"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1173
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1174
 msgid "Cool Link 1"
 msgstr "Linkki 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1178
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1179
 msgid "Cool Link 2"
 msgstr "Linkki 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1182
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1183
 msgid "Cool Link 3"
 msgstr "Linkki 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1196
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
 msgid "Last Update"
 msgstr "Edellinen päivitys"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1206
 #, 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:1211
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1212
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
@@ -13348,7 +13447,7 @@
 "Tämä profiili näyttää käyttävän kieltä tai muotoa jota ei tueta tällä "
 "hetkellä."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1227
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1228
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -13356,7 +13455,7 @@
 "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:1230
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 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 "
@@ -13367,7 +13466,7 @@
 "profiilin. Jos olet varma että käyttäjä on olemassa, yritä myöhemmin "
 "uudelleen."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1237
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1238
 msgid "The user's profile is empty."
 msgstr "Käyttäjän profiili on tyhjä."
 
@@ -13484,56 +13583,56 @@
 msgid "Anyone"
 msgstr "Kuka tahansa"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2366
+#: ../libpurple/protocols/zephyr/zephyr.c:2369
 msgid "_Class:"
 msgstr "_Luokka:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2372
+#: ../libpurple/protocols/zephyr/zephyr.c:2375
 msgid "_Instance:"
 msgstr "_Ilmentymä:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2378
+#: ../libpurple/protocols/zephyr/zephyr.c:2381
 msgid "_Recipient:"
 msgstr "_Vastaanottaja:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2389
+#: ../libpurple/protocols/zephyr/zephyr.c:2392
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Yritys tilata %s,%s,%s epäonnistui"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2702
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nimi&gt;: Paikanna käyttäjä"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2707
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nimi&gt;: Paikanna käyttäjä"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2712
+#: ../libpurple/protocols/zephyr/zephyr.c:2715
 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:2717
+#: ../libpurple/protocols/zephyr/zephyr.c:2720
 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:2722
+#: ../libpurple/protocols/zephyr/zephyr.c:2725
 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:2728
+#: ../libpurple/protocols/zephyr/zephyr.c:2731
 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:2733
+#: ../libpurple/protocols/zephyr/zephyr.c:2736
 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:2739
+#: ../libpurple/protocols/zephyr/zephyr.c:2742
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -13541,7 +13640,7 @@
 "zci &lt;luokka&gt; &lt;ilmentymä&gt;: Lähetä viesti &lt;<i>luokka</i>,"
 "<i>ilmentymä</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2745
+#: ../libpurple/protocols/zephyr/zephyr.c:2748
 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;"
@@ -13549,7 +13648,7 @@
 "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:2751
+#: ../libpurple/protocols/zephyr/zephyr.c:2754
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -13557,15 +13656,15 @@
 "zir &lt;ilmentymä&gt; &lt;vastaanottaja&gt;: Lähetä viesti &lt;VIESTI,"
 "<i>ilmentymä</i>,<i>vastaanottaja</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2756
+#: ../libpurple/protocols/zephyr/zephyr.c:2759
 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:2832
+#: ../libpurple/protocols/zephyr/zephyr.c:2835
 msgid "Resubscribe"
 msgstr "Tilaa uudelleen"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2835
+#: ../libpurple/protocols/zephyr/zephyr.c:2838
 msgid "Retrieve subscriptions from server"
 msgstr "Hae tilaukset palvelimelta"
 
@@ -13579,45 +13678,45 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2928
-#: ../libpurple/protocols/zephyr/zephyr.c:2930
+#: ../libpurple/protocols/zephyr/zephyr.c:2931
+#: ../libpurple/protocols/zephyr/zephyr.c:2933
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2955
+#: ../libpurple/protocols/zephyr/zephyr.c:2958
 msgid "Use tzc"
 msgstr "Käytä tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2958
+#: ../libpurple/protocols/zephyr/zephyr.c:2961
 msgid "tzc command"
 msgstr "tzc-komento"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2961
+#: ../libpurple/protocols/zephyr/zephyr.c:2964
 msgid "Export to .anyone"
 msgstr "Vie tiedostoon .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2964
+#: ../libpurple/protocols/zephyr/zephyr.c:2967
 msgid "Export to .zephyr.subs"
 msgstr "Vie tiedostoon .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2967
+#: ../libpurple/protocols/zephyr/zephyr.c:2970
 msgid "Import from .anyone"
 msgstr "Tuo tiedostosta .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2970
-msgid "Import from .zephyr.subs"
-msgstr "Tuo tiedostosta .zephyr.subs"
-
 #: ../libpurple/protocols/zephyr/zephyr.c:2973
-msgid "Realm"
-msgstr "Alue (realm)"
+msgid "Import from .zephyr.subs"
+msgstr "Tuo tiedostosta .zephyr.subs"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2976
+msgid "Realm"
+msgstr "Alue (realm)"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Exposure"
 msgstr "Altistus"
 
-#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:908 ../libpurple/proxy.c:1067
-#: ../libpurple/proxy.c:1638
+#: ../libpurple/proxy.c:486 ../libpurple/proxy.c:933 ../libpurple/proxy.c:1092
+#: ../libpurple/proxy.c:1695
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13626,46 +13725,46 @@
 "Pistokkeen luonti epäonnistui:\n"
 "%s"
 
-#: ../libpurple/proxy.c:662
+#: ../libpurple/proxy.c:687
 #, c-format
 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:751 ../libpurple/proxy.c:789
-#: ../libpurple/proxy.c:801
+#: ../libpurple/proxy.c:727 ../libpurple/proxy.c:776 ../libpurple/proxy.c:814
+#: ../libpurple/proxy.c:826
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-välipalvelimen yhteysvirhe %d"
 
-#: ../libpurple/proxy.c:797
+#: ../libpurple/proxy.c:822
 #, 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:1028
+#: ../libpurple/proxy.c:1053
 #, c-format
 msgid "Error resolving %s"
 msgstr "Virhe selvitettäessä %s"
 
-#: ../libpurple/proxy.c:1736
+#: ../libpurple/proxy.c:1793
 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.
 #.
-#: ../libpurple/request.h:1448
+#: ../libpurple/request.h:1391 ../pidgin/gtkblist.c:552
 msgid "_Yes"
 msgstr "_Kyllä"
 
-#: ../libpurple/request.h:1448
+#: ../libpurple/request.h:1391 ../pidgin/gtkblist.c:552
 msgid "_No"
 msgstr "_Ei"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1468
+#: ../libpurple/request.h:1411
 msgid "_Accept"
 msgstr "_Hyväksy"
 
@@ -13685,17 +13784,17 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s on nyt nimeltään %s.\n"
 
-#: ../libpurple/server.c:333
+#: ../libpurple/server.c:356
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Pyydetään käyttäjän %s huomiota..."
 
-#: ../libpurple/server.c:378
+#: ../libpurple/server.c:401
 #, c-format
 msgid "%s has requested your attention!"
 msgstr "%s pyysi huomiotasi"
 
-#: ../libpurple/server.c:875
+#: ../libpurple/server.c:898
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13704,12 +13803,12 @@
 "Käyttäjä %s on kutsunut käyttäjän %s keskusteluhuoneeseen %s:\n"
 "%s"
 
-#: ../libpurple/server.c:880
+#: ../libpurple/server.c:903
 #, 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:884
+#: ../libpurple/server.c:907
 msgid "Accept chat invitation?"
 msgstr "Hyväksy ryhmäkeskustelukutsu?"
 
@@ -13888,12 +13987,12 @@
 msgid "Unable to connect to %s: %s"
 msgstr "Kohteeseen %s ei voi yhdistää: %s"
 
-#: ../libpurple/util.c:4686
+#: ../libpurple/util.c:4697
 #, c-format
 msgid " - %s"
 msgstr " - %s"
 
-#: ../libpurple/util.c:4692
+#: ../libpurple/util.c:4703
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
@@ -13905,19 +14004,19 @@
 msgstr "Yhteys keskeytyi tietokoneella olevan toisen ohjelman takia."
 
 #. 10054
-#: ../libpurple/win32/libc_interface.c:324
+#: ../libpurple/win32/libc_interface.c:325
 #, c-format
 msgid "Remote host closed connection."
 msgstr "Etäkone on katkaissut yhteyden."
 
 #. 10060
-#: ../libpurple/win32/libc_interface.c:326
+#: ../libpurple/win32/libc_interface.c:328
 #, c-format
 msgid "Connection timed out."
 msgstr "Ei yhteyttä määräajassa."
 
 #. 10061
-#: ../libpurple/win32/libc_interface.c:328
+#: ../libpurple/win32/libc_interface.c:331
 #, c-format
 msgid "Connection refused."
 msgstr "Yhteys torjuttu."
@@ -14073,7 +14172,7 @@
 msgid "_Advanced"
 msgstr "_Lisäasetukset"
 
-#: ../pidgin/gtkaccount.c:1906 ../pidgin/gtkplugin.c:639
+#: ../pidgin/gtkaccount.c:1906 ../pidgin/gtkplugin.c:643
 #: ../pidgin/plugins/convcolors.c:327
 msgid "Enabled"
 msgstr "Käytössä"
@@ -14123,121 +14222,117 @@
 "ja kontakteille käytetään jatkossa vain yhtä keskusteluikkunaa. Ne voidaan "
 "erottaa valitsemalla \"Laajenna\" kontaktin oikean napin valikosta"
 
-#: ../pidgin/gtkblist.c:552
-msgid "_Merge"
-msgstr "_Yhdistä"
-
-#: ../pidgin/gtkblist.c:953 ../pidgin/gtkblist.c:6683
+#: ../pidgin/gtkblist.c:964 ../pidgin/gtkblist.c:6711
 msgid "Room _List"
 msgstr "Huone_luettelo"
 
-#: ../pidgin/gtkblist.c:973
+#: ../pidgin/gtkblist.c:984
 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:985 ../pidgin/gtkblist.c:6718
+#: ../pidgin/gtkblist.c:996 ../pidgin/gtkblist.c:6746
 #: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:547
 msgid "_Account:"
 msgstr "_Käyttäjätili:"
 
-#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkprivacy.c:549
+#: ../pidgin/gtkblist.c:1274 ../pidgin/gtkprivacy.c:549
 #: ../pidgin/gtkprivacy.c:563
 msgid "_Block"
 msgstr "_Estä"
 
-#: ../pidgin/gtkblist.c:1263
+#: ../pidgin/gtkblist.c:1274
 msgid "Un_block"
 msgstr "_Poista esto"
 
-#: ../pidgin/gtkblist.c:1306
+#: ../pidgin/gtkblist.c:1317
 msgid "Move to"
 msgstr "Siirrä"
 
-#: ../pidgin/gtkblist.c:1346
+#: ../pidgin/gtkblist.c:1357
 msgid "Get _Info"
 msgstr "Hae _tiedot"
 
-#: ../pidgin/gtkblist.c:1349 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1360 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_Pikaviesti"
 
-#: ../pidgin/gtkblist.c:1355
+#: ../pidgin/gtkblist.c:1366
 msgid "_Send File..."
 msgstr "_Lähetä tiedosto..."
 
-#: ../pidgin/gtkblist.c:1362
+#: ../pidgin/gtkblist.c:1373
 msgid "Add Buddy _Pounce..."
 msgstr "Lisää tuttava_ilmoitin..."
 
-#: ../pidgin/gtkblist.c:1367 ../pidgin/gtkblist.c:1371
-#: ../pidgin/gtkblist.c:1486 ../pidgin/gtkblist.c:1509
+#: ../pidgin/gtkblist.c:1378 ../pidgin/gtkblist.c:1382
+#: ../pidgin/gtkblist.c:1502 ../pidgin/gtkblist.c:1525
 msgid "View _Log"
 msgstr "Näytä _loki"
 
-#: ../pidgin/gtkblist.c:1377
+#: ../pidgin/gtkblist.c:1388 ../pidgin/gtkblist.c:1475
 msgid "Hide when offline"
 msgstr "Piilota kun poissa linjoilta"
 
-#: ../pidgin/gtkblist.c:1377
+#: ../pidgin/gtkblist.c:1388 ../pidgin/gtkblist.c:1475
 msgid "Show when offline"
 msgstr "Näytä kun poissa linjoilta"
 
-#: ../pidgin/gtkblist.c:1391 ../pidgin/gtkblist.c:1400
-#: ../pidgin/gtkblist.c:1494 ../pidgin/gtkblist.c:1515
+#: ../pidgin/gtkblist.c:1402 ../pidgin/gtkblist.c:1411
+#: ../pidgin/gtkblist.c:1510 ../pidgin/gtkblist.c:1531
 msgid "_Alias..."
 msgstr "_Lempinimi..."
 
-#: ../pidgin/gtkblist.c:1394 ../pidgin/gtkblist.c:1402
-#: ../pidgin/gtkblist.c:1496 ../pidgin/gtkblist.c:1517
+#: ../pidgin/gtkblist.c:1405 ../pidgin/gtkblist.c:1413
+#: ../pidgin/gtkblist.c:1512 ../pidgin/gtkblist.c:1533
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../pidgin/gtkblist.c:1452
+#: ../pidgin/gtkblist.c:1463
 msgid "Add _Buddy..."
 msgstr "Lisää _tuttava..."
 
-#: ../pidgin/gtkblist.c:1455
+#: ../pidgin/gtkblist.c:1466
 msgid "Add C_hat..."
 msgstr "Lisää ry_hmäkeskustelu..."
 
-#: ../pidgin/gtkblist.c:1458
+#: ../pidgin/gtkblist.c:1469
 msgid "_Delete Group"
 msgstr "_Poista ryhmä"
 
-#: ../pidgin/gtkblist.c:1460
+#: ../pidgin/gtkblist.c:1471
 msgid "_Rename"
 msgstr "Nimeä _uudelleen"
 
 #. join button
-#: ../pidgin/gtkblist.c:1480 ../pidgin/gtkroomlist.c:318
+#: ../pidgin/gtkblist.c:1496 ../pidgin/gtkroomlist.c:318
 #: ../pidgin/gtkroomlist.c:594 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Liity"
 
-#: ../pidgin/gtkblist.c:1482
+#: ../pidgin/gtkblist.c:1498
 msgid "Auto-Join"
 msgstr "Liity automaattisesti"
 
-#: ../pidgin/gtkblist.c:1484
+#: ../pidgin/gtkblist.c:1500
 msgid "Persistent"
 msgstr "Pysyvä"
 
-#: ../pidgin/gtkblist.c:1522 ../pidgin/gtkblist.c:1545
+#: ../pidgin/gtkblist.c:1538 ../pidgin/gtkblist.c:1561
 msgid "_Collapse"
 msgstr "_Pienennä"
 
-#: ../pidgin/gtkblist.c:1550
+#: ../pidgin/gtkblist.c:1566
 msgid "_Expand"
 msgstr "_Laajenna"
 
-#: ../pidgin/gtkblist.c:1801 ../pidgin/gtkblist.c:1813
-#: ../pidgin/gtkblist.c:5364 ../pidgin/gtkblist.c:5377
+#: ../pidgin/gtkblist.c:1817 ../pidgin/gtkblist.c:1829
+#: ../pidgin/gtkblist.c:5410 ../pidgin/gtkblist.c:5423
 msgid "/Tools/Mute Sounds"
 msgstr "/Työkalut/Vaimenna äänet"
 
-#: ../pidgin/gtkblist.c:2273 ../pidgin/gtkconv.c:4813
+#: ../pidgin/gtkblist.c:2289 ../pidgin/gtkconv.c:4807
 #: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -14248,148 +14343,148 @@
 #. 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
+#: ../pidgin/gtkblist.c:2640
 msgid "Unknown node type"
 msgstr "Tuntematon solmutyyppi"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3054
+#: ../pidgin/gtkblist.c:3076
 msgid "/_Buddies"
 msgstr "/_Tuttavat"
 
-#: ../pidgin/gtkblist.c:3055
+#: ../pidgin/gtkblist.c:3077
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Tuttavat/Uusi _pikaviesti..."
 
-#: ../pidgin/gtkblist.c:3056
+#: ../pidgin/gtkblist.c:3078
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Tuttavat/Liity _ryhmäkeskusteluun..."
 
-#: ../pidgin/gtkblist.c:3057
+#: ../pidgin/gtkblist.c:3079
 msgid "/Buddies/Get User _Info..."
 msgstr "/Tuttavat/Hae _käyttäjätiedot..."
 
-#: ../pidgin/gtkblist.c:3058
+#: ../pidgin/gtkblist.c:3080
 msgid "/Buddies/View User _Log..."
 msgstr "/Tuttavat/Näytä käyttäjä_loki..."
 
-#: ../pidgin/gtkblist.c:3060
+#: ../pidgin/gtkblist.c:3082
 msgid "/Buddies/Sh_ow"
 msgstr "/Tuttavat/Nä_ytä"
 
-#: ../pidgin/gtkblist.c:3061
+#: ../pidgin/gtkblist.c:3083
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Tuttavat/Näytä/_Poissaolevat tuttavat"
 
-#: ../pidgin/gtkblist.c:3062
+#: ../pidgin/gtkblist.c:3084
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Tuttavat/Näytä/_Tyhjät ryhmät"
 
-#: ../pidgin/gtkblist.c:3063
+#: ../pidgin/gtkblist.c:3085
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Tuttavat/Näytä/Tuttavien tie_dot"
 
-#: ../pidgin/gtkblist.c:3064
+#: ../pidgin/gtkblist.c:3086
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Tuttavat/Näytä/_Joutenoloajat"
 
-#: ../pidgin/gtkblist.c:3065
+#: ../pidgin/gtkblist.c:3087
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Tuttavat/Näytä/_Yhteyskäytäntökuvakkeet"
 
-#: ../pidgin/gtkblist.c:3066
+#: ../pidgin/gtkblist.c:3088
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Tuttavat/L_ajittele tuttavat"
 
-#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtkblist.c:3090
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Tuttavat/_Lisää tuttava..."
 
-#: ../pidgin/gtkblist.c:3069
+#: ../pidgin/gtkblist.c:3091
 msgid "/Buddies/Add C_hat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:3092
 msgid "/Buddies/Add _Group..."
 msgstr "/Tuttavat/Lisää _ryhmä..."
 
-#: ../pidgin/gtkblist.c:3072
+#: ../pidgin/gtkblist.c:3094
 msgid "/Buddies/_Quit"
 msgstr "/Tuttavat/_Lopeta"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3075
+#: ../pidgin/gtkblist.c:3097
 msgid "/_Accounts"
 msgstr "/_Käyttäjätilit"
 
-#: ../pidgin/gtkblist.c:3076 ../pidgin/gtkblist.c:7403
+#: ../pidgin/gtkblist.c:3098 ../pidgin/gtkblist.c:7431
 msgid "/Accounts/Manage"
 msgstr "/Käyttäjätilit/Hallinta"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3079
+#: ../pidgin/gtkblist.c:3101
 msgid "/_Tools"
 msgstr "/T_yökalut"
 
-#: ../pidgin/gtkblist.c:3080
+#: ../pidgin/gtkblist.c:3102
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Työkalut/Tuttava_ilmoittimet"
 
-#: ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkblist.c:3103
 msgid "/Tools/_Certificates"
 msgstr "/Työkalut/_Varmenteet"
 
-#: ../pidgin/gtkblist.c:3082
+#: ../pidgin/gtkblist.c:3104
 msgid "/Tools/Plu_gins"
 msgstr "/Työkalut/_Liitännäiset"
 
-#: ../pidgin/gtkblist.c:3083
+#: ../pidgin/gtkblist.c:3105
 msgid "/Tools/Pr_eferences"
 msgstr "/Työkalut/A_setukset"
 
-#: ../pidgin/gtkblist.c:3084
+#: ../pidgin/gtkblist.c:3106
 msgid "/Tools/Pr_ivacy"
 msgstr "/Työkalut/Yks_ityisyys"
 
-#: ../pidgin/gtkblist.c:3086
+#: ../pidgin/gtkblist.c:3108
 msgid "/Tools/_File Transfers"
 msgstr "/Työkalut/_Tiedostonsiirrot..."
 
-#: ../pidgin/gtkblist.c:3087
+#: ../pidgin/gtkblist.c:3109
 msgid "/Tools/R_oom List"
 msgstr "/Työkalut/Huone_luettelo"
 
-#: ../pidgin/gtkblist.c:3088
+#: ../pidgin/gtkblist.c:3110
 msgid "/Tools/System _Log"
 msgstr "/Työkalut/Järjestelmä_loki"
 
-#: ../pidgin/gtkblist.c:3090
+#: ../pidgin/gtkblist.c:3112
 msgid "/Tools/Mute _Sounds"
 msgstr "/Työkalut/Vaimenna _äänet"
 
 #. Help
-#: ../pidgin/gtkblist.c:3092
+#: ../pidgin/gtkblist.c:3114
 msgid "/_Help"
 msgstr "/O_hje"
 
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:3115
 msgid "/Help/Online _Help"
 msgstr "/Ohje/O_hjeita verkossa"
 
-#: ../pidgin/gtkblist.c:3094
+#: ../pidgin/gtkblist.c:3116
 msgid "/Help/_Debug Window"
 msgstr "/Ohje/_Virheenjäljitysikkuna"
 
-#: ../pidgin/gtkblist.c:3096 ../pidgin/gtkblist.c:3098
+#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
 msgid "/Help/_About"
 msgstr "/Ohje/Tietoj_a"
 
-#: ../pidgin/gtkblist.c:3128
+#: ../pidgin/gtkblist.c:3151
 #, c-format
 msgid "<b>Account:</b> %s"
 msgstr "<b>Käyttäjätili:</b> %s"
 
-#: ../pidgin/gtkblist.c:3136
+#: ../pidgin/gtkblist.c:3171
 #, c-format
 msgid ""
 "\n"
@@ -14398,86 +14493,86 @@
 "\n"
 "<b>Aihe:</b> %s"
 
-#: ../pidgin/gtkblist.c:3136
+#: ../pidgin/gtkblist.c:3171
 msgid "(no topic set)"
 msgstr "(aihetta ei ole asetettu)"
 
-#: ../pidgin/gtkblist.c:3213
+#: ../pidgin/gtkblist.c:3249
 msgid "Buddy Alias"
 msgstr "Tuttavan lempinimi"
 
-#: ../pidgin/gtkblist.c:3242
+#: ../pidgin/gtkblist.c:3278
 msgid "Logged In"
 msgstr "Kirjautumisesta aikaa"
 
-#: ../pidgin/gtkblist.c:3288
+#: ../pidgin/gtkblist.c:3324
 msgid "Last Seen"
 msgstr "Näkemisestä aikaa"
 
-#: ../pidgin/gtkblist.c:3309
+#: ../pidgin/gtkblist.c:3345
 msgid "Spooky"
 msgstr "Aavemainen"
 
-#: ../pidgin/gtkblist.c:3311
+#: ../pidgin/gtkblist.c:3347
 msgid "Awesome"
 msgstr "Mahtava"
 
-#: ../pidgin/gtkblist.c:3313
+#: ../pidgin/gtkblist.c:3349
 msgid "Rockin'"
 msgstr "Rokkaava"
 
-#: ../pidgin/gtkblist.c:3329
+#: ../pidgin/gtkblist.c:3380
 msgid "Total Buddies"
 msgstr "Tuttavia yhteensä"
 
-#: ../pidgin/gtkblist.c:3696
+#: ../pidgin/gtkblist.c:3742
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Jouten %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3698
+#: ../pidgin/gtkblist.c:3744
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Jouten %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3700
+#: ../pidgin/gtkblist.c:3746
 #, c-format
 msgid "Idle %dm"
 msgstr "Jouten %dm"
 
-#: ../pidgin/gtkblist.c:3854
+#: ../pidgin/gtkblist.c:3900
 msgid "/Buddies/New Instant Message..."
 msgstr "/Tuttavat/Uusi pikaviesti..."
 
-#: ../pidgin/gtkblist.c:3855 ../pidgin/gtkblist.c:3888
+#: ../pidgin/gtkblist.c:3901 ../pidgin/gtkblist.c:3934
 msgid "/Buddies/Join a Chat..."
 msgstr "/Tuttavat/Liity ryhmäkeskusteluun..."
 
-#: ../pidgin/gtkblist.c:3856
+#: ../pidgin/gtkblist.c:3902
 msgid "/Buddies/Get User Info..."
 msgstr "/Tuttavat/Hae käyttäjätiedot..."
 
-#: ../pidgin/gtkblist.c:3857
+#: ../pidgin/gtkblist.c:3903
 msgid "/Buddies/Add Buddy..."
 msgstr "/Tuttavat/Lisää tuttava..."
 
-#: ../pidgin/gtkblist.c:3858 ../pidgin/gtkblist.c:3891
+#: ../pidgin/gtkblist.c:3904 ../pidgin/gtkblist.c:3937
 msgid "/Buddies/Add Chat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../pidgin/gtkblist.c:3859
+#: ../pidgin/gtkblist.c:3905
 msgid "/Buddies/Add Group..."
 msgstr "/Tuttavat/Lisää ryhmä..."
 
-#: ../pidgin/gtkblist.c:3894
+#: ../pidgin/gtkblist.c:3940
 msgid "/Tools/Privacy"
 msgstr "/Työkalut/Yksityisyys"
 
-#: ../pidgin/gtkblist.c:3897
+#: ../pidgin/gtkblist.c:3943
 msgid "/Tools/Room List"
 msgstr "/Työkalut/Huoneluettelo"
 
-#: ../pidgin/gtkblist.c:4029 ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkblist.c:4075 ../pidgin/gtkdocklet.c:155
 #: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
@@ -14485,41 +14580,41 @@
 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:4192
+#: ../pidgin/gtkblist.c:4238
 msgid "Manually"
 msgstr "Käsin"
 
-#: ../pidgin/gtkblist.c:4195
+#: ../pidgin/gtkblist.c:4241
 msgid "By status"
 msgstr "Tilan mukaan"
 
-#: ../pidgin/gtkblist.c:4196
+#: ../pidgin/gtkblist.c:4242
 msgid "By log size"
 msgstr "Lokin koon mukaan"
 
-#: ../pidgin/gtkblist.c:4533
+#: ../pidgin/gtkblist.c:4579
 #, c-format
 msgid "%s disconnected"
 msgstr "Yhteys katkennut kohteeseen %s"
 
-#: ../pidgin/gtkblist.c:4535
+#: ../pidgin/gtkblist.c:4581
 #, c-format
 msgid "%s disabled"
 msgstr "%s pois käytöstä"
 
-#: ../pidgin/gtkblist.c:4539
+#: ../pidgin/gtkblist.c:4585
 msgid "Reconnect"
 msgstr "Yhdistä uudelleen"
 
-#: ../pidgin/gtkblist.c:4539 ../pidgin/gtkblist.c:4658
+#: ../pidgin/gtkblist.c:4585 ../pidgin/gtkblist.c:4704
 msgid "Re-enable"
 msgstr "Ota uudelleen käyttöön"
 
-#: ../pidgin/gtkblist.c:4656
+#: ../pidgin/gtkblist.c:4702
 msgid "Welcome back!"
 msgstr "Tervetuloa takaisin."
 
-#: ../pidgin/gtkblist.c:4692
+#: ../pidgin/gtkblist.c:4738
 #, c-format
 msgid "%d account was disabled because you signed on from another location:"
 msgid_plural ""
@@ -14529,24 +14624,24 @@
 msgstr[1] ""
 "%d tiliä poistettiin käytöstä koska toisesta paikasta kirjauduttiin sisään:"
 
-#: ../pidgin/gtkblist.c:4971
+#: ../pidgin/gtkblist.c:5017
 msgid "<b>Username:</b>"
 msgstr "<b>Käyttäjänimi:</b>"
 
-#: ../pidgin/gtkblist.c:4978
+#: ../pidgin/gtkblist.c:5024
 msgid "<b>Password:</b>"
 msgstr "<b>Salasana:</b>"
 
-#: ../pidgin/gtkblist.c:4989
+#: ../pidgin/gtkblist.c:5035
 msgid "_Login"
 msgstr "_Sisäänkirjautuminen"
 
-#: ../pidgin/gtkblist.c:5073
+#: ../pidgin/gtkblist.c:5119
 msgid "/Accounts"
 msgstr "/Käyttäjätilit"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:5087
+#: ../pidgin/gtkblist.c:5133
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -14565,55 +14660,47 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:5358
+#: ../pidgin/gtkblist.c:5404
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Tuttavat/Näytä/Poissaolevat tuttavat"
 
-#: ../pidgin/gtkblist.c:5361
+#: ../pidgin/gtkblist.c:5407
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Tuttavat/Näytä/Tyhjät ryhmät"
 
-#: ../pidgin/gtkblist.c:5367
+#: ../pidgin/gtkblist.c:5413
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Tuttavat/Näytä/Tuttavien tiedot"
 
-#: ../pidgin/gtkblist.c:5370
+#: ../pidgin/gtkblist.c:5416
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Tuttavat/Näytä/Joutenoloajat"
 
-#: ../pidgin/gtkblist.c:5373
+#: ../pidgin/gtkblist.c:5419
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Tuttavat/Näytä/Yhteyskäytäntökuvakkeet"
 
-#: ../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. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"Syötä sen henkilön näyttönimi, jonka haluat lisätä tuttaviisi. Voit myös "
-"valita lempinimen tuttavalle. Lempinimi näytetään näyttönimen sijasta aina "
-"kuin mahdollista.\n"
-
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:6347
-msgid "A_ccount:"
-msgstr "_Käyttäjätili:"
-
-#. End of account box
-#: ../pidgin/gtkblist.c:6359
-msgid "_Screen name:"
-msgstr "_Näyttönimi:"
-
-#: ../pidgin/gtkblist.c:6381 ../pidgin/gtkblist.c:6731
-msgid "A_lias:"
-msgstr "_Lempinimi:"
-
-#: ../pidgin/gtkblist.c:6648
+#: ../pidgin/gtkblist.c:6372
+msgid "Add a buddy.\n"
+msgstr "Lisää tuttava.\n"
+
+#: ../pidgin/gtkblist.c:6387
+msgid "Buddy's _screen name:"
+msgstr "Tuttavan _näyttönimi:"
+
+#: ../pidgin/gtkblist.c:6409
+msgid "(Optional) A_lias:"
+msgstr "(Valinnainen) _Lempinimi:"
+
+#: ../pidgin/gtkblist.c:6427
+msgid "Add buddy to _group:"
+msgstr "Lisää tuttava _ryhmään:"
+
+#: ../pidgin/gtkblist.c:6676
 msgid "This protocol does not support chat rooms."
 msgstr "Tämä yhteyskäytäntö ei tue keskusteluhuoneita."
 
-#: ../pidgin/gtkblist.c:6664
+#: ../pidgin/gtkblist.c:6692
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -14621,7 +14708,7 @@
 "Et ole kirjautuneena millään yhteyskäytännöllä jolla voisi käyttää "
 "ryhmäkeskustelua."
 
-#: ../pidgin/gtkblist.c:6708
+#: ../pidgin/gtkblist.c:6736
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -14629,47 +14716,51 @@
 "Anna lempinimi, ja tiedot ryhmäkeskustelusta jonka haluat lisätä "
 "tuttaviisi.\n"
 
-#: ../pidgin/gtkblist.c:6738
+#: ../pidgin/gtkblist.c:6759
+msgid "A_lias:"
+msgstr "_Lempinimi:"
+
+#: ../pidgin/gtkblist.c:6766
 msgid "Auto_join when account becomes online."
 msgstr "Liity automaattisesti kun käyttä_jätili pääsee linjoille."
 
-#: ../pidgin/gtkblist.c:6739
+#: ../pidgin/gtkblist.c:6767
 msgid "_Hide chat when the window is closed."
 msgstr "Piilota ry_hmäkeskustelu kun ikkuna on suljettu."
 
-#: ../pidgin/gtkblist.c:6765
+#: ../pidgin/gtkblist.c:6793
 msgid "Please enter the name of the group to be added."
 msgstr "Anna lisättävän ryhmän nimi."
 
-#: ../pidgin/gtkblist.c:7423
+#: ../pidgin/gtkblist.c:7451
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Käyttäjätilit/"
 
-#: ../pidgin/gtkblist.c:7447
+#: ../pidgin/gtkblist.c:7475
 msgid "_Edit Account"
 msgstr "_Muokkaa käyttäjätiliä"
 
-#: ../pidgin/gtkblist.c:7460 ../pidgin/gtkconv.c:3132
+#: ../pidgin/gtkblist.c:7488 ../pidgin/gtkconv.c:3128
 msgid "No actions available"
 msgstr "Ei toimintoja saatavilla."
 
-#: ../pidgin/gtkblist.c:7468
+#: ../pidgin/gtkblist.c:7496
 msgid "_Disable"
 msgstr "_Poista käytöstä"
 
-#: ../pidgin/gtkblist.c:7480
+#: ../pidgin/gtkblist.c:7508
 msgid "Enable Account"
 msgstr "Ota tili käyttöön"
 
-#: ../pidgin/gtkblist.c:7486
+#: ../pidgin/gtkblist.c:7514
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Käyttäjätilit/Ota tili käyttöön"
 
-#: ../pidgin/gtkblist.c:7535
+#: ../pidgin/gtkblist.c:7563
 msgid "/Tools"
 msgstr "/Työkalut"
 
-#: ../pidgin/gtkblist.c:7605
+#: ../pidgin/gtkblist.c:7633
 msgid "/Buddies/Sort Buddies"
 msgstr "/Tuttavat/Lajittele tuttavat"
 
@@ -14682,205 +14773,205 @@
 msgid "Unknown command."
 msgstr "Tuntematon komento."
 
-#: ../pidgin/gtkconv.c:755 ../pidgin/gtkconv.c:781
+#: ../pidgin/gtkconv.c:749 ../pidgin/gtkconv.c:775
 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:775
+#: ../pidgin/gtkconv.c:769
 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:828
+#: ../pidgin/gtkconv.c:822
 msgid "Invite Buddy Into Chat Room"
 msgstr "Kutsu tuttava keskusteluhuoneeseen"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:858
+#: ../pidgin/gtkconv.c:852
 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:879
+#: ../pidgin/gtkconv.c:873
 msgid "_Buddy:"
 msgstr "_Tuttava:"
 
-#: ../pidgin/gtkconv.c:890 ../pidgin/gtksavedstatuses.c:1166
+#: ../pidgin/gtkconv.c:884 ../pidgin/gtksavedstatuses.c:1166
 #: ../pidgin/gtksavedstatuses.c:1484
 msgid "_Message:"
 msgstr "_Viesti:"
 
-#: ../pidgin/gtkconv.c:954
+#: ../pidgin/gtkconv.c:948
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Keskustelu käyttäjän %s kanssa</h1>\n"
 
-#: ../pidgin/gtkconv.c:992
+#: ../pidgin/gtkconv.c:986
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
-#: ../pidgin/gtkconv.c:1138 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:740
+#: ../pidgin/gtkconv.c:1132 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:740
 msgid "Find"
 msgstr "Etsi"
 
-#: ../pidgin/gtkconv.c:1164 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1158 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_Haettava termi:"
 
-#: ../pidgin/gtkconv.c:1665
+#: ../pidgin/gtkconv.c:1659
 msgid "Un-Ignore"
 msgstr "Huomioi"
 
-#: ../pidgin/gtkconv.c:1668
+#: ../pidgin/gtkconv.c:1662
 msgid "Ignore"
 msgstr "Jätä huomiotta"
 
-#: ../pidgin/gtkconv.c:1688
+#: ../pidgin/gtkconv.c:1682
 msgid "Get Away Message"
 msgstr "Hae poissaoloviesti"
 
-#: ../pidgin/gtkconv.c:1711
+#: ../pidgin/gtkconv.c:1705
 msgid "Last said"
 msgstr "Viimeksi sanottu"
 
-#: ../pidgin/gtkconv.c:2664
+#: ../pidgin/gtkconv.c:2660
 msgid "Unable to save icon file to disk."
 msgstr "Kuvaketiedostoa ei voi tallentaa levylle."
 
-#: ../pidgin/gtkconv.c:2715
+#: ../pidgin/gtkconv.c:2711
 msgid "Save Icon"
 msgstr "Tallenna kuvake"
 
-#: ../pidgin/gtkconv.c:2767
+#: ../pidgin/gtkconv.c:2763
 msgid "Animate"
 msgstr "Animoi"
 
-#: ../pidgin/gtkconv.c:2772
+#: ../pidgin/gtkconv.c:2768
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: ../pidgin/gtkconv.c:2775
+#: ../pidgin/gtkconv.c:2771
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimellä..."
 
-#: ../pidgin/gtkconv.c:2779
+#: ../pidgin/gtkconv.c:2775
 msgid "Set Custom Icon..."
 msgstr "Aseta oma kuvake..."
 
-#: ../pidgin/gtkconv.c:2792
+#: ../pidgin/gtkconv.c:2788
 msgid "Remove Custom Icon"
 msgstr "Poista oma kuvake"
 
-#: ../pidgin/gtkconv.c:2917
+#: ../pidgin/gtkconv.c:2913
 msgid "Show All"
 msgstr "Näytä kaikki"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2936
+#: ../pidgin/gtkconv.c:2932
 msgid "/_Conversation"
 msgstr "/_Keskustelu"
 
-#: ../pidgin/gtkconv.c:2938
+#: ../pidgin/gtkconv.c:2934
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Keskustelu/Uusi _pikaviesti..."
 
-#: ../pidgin/gtkconv.c:2943
+#: ../pidgin/gtkconv.c:2939
 msgid "/Conversation/_Find..."
 msgstr "/Keskustelu/_Etsi..."
 
-#: ../pidgin/gtkconv.c:2945
+#: ../pidgin/gtkconv.c:2941
 msgid "/Conversation/View _Log"
 msgstr "/Keskustelu/Näytä l_oki..."
 
-#: ../pidgin/gtkconv.c:2946
+#: ../pidgin/gtkconv.c:2942
 msgid "/Conversation/_Save As..."
 msgstr "/Keskustelu/_Tallenna nimellä..."
 
-#: ../pidgin/gtkconv.c:2948
+#: ../pidgin/gtkconv.c:2944
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Keskustelu/T_yhjennä takaisinvieritys"
 
-#: ../pidgin/gtkconv.c:2952
+#: ../pidgin/gtkconv.c:2948
 msgid "/Conversation/Se_nd File..."
 msgstr "/Keskustelu/_Lähetä tiedosto..."
 
-#: ../pidgin/gtkconv.c:2953
+#: ../pidgin/gtkconv.c:2949
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Keskustelu/Lisää tuttava_ilmoitin..."
 
-#: ../pidgin/gtkconv.c:2955
+#: ../pidgin/gtkconv.c:2951
 msgid "/Conversation/_Get Info"
 msgstr "/Keskustelu/_Hae tiedot..."
 
-#: ../pidgin/gtkconv.c:2957
+#: ../pidgin/gtkconv.c:2953
 msgid "/Conversation/In_vite..."
 msgstr "/Keskustelu/Kut_su..."
 
-#: ../pidgin/gtkconv.c:2959
+#: ../pidgin/gtkconv.c:2955
 msgid "/Conversation/M_ore"
 msgstr "/Keskustelu/Lis_ää"
 
+#: ../pidgin/gtkconv.c:2959
+msgid "/Conversation/Al_ias..."
+msgstr "/Keskustelu/Lemp_inimi..."
+
+#: ../pidgin/gtkconv.c:2961
+msgid "/Conversation/_Block..."
+msgstr "/Keskustelu/E_stä..."
+
 #: ../pidgin/gtkconv.c:2963
-msgid "/Conversation/Al_ias..."
-msgstr "/Keskustelu/Lemp_inimi..."
-
-#: ../pidgin/gtkconv.c:2965
-msgid "/Conversation/_Block..."
-msgstr "/Keskustelu/E_stä..."
-
-#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/_Unblock..."
 msgstr "/Keskustelu/Poista est_o..."
 
-#: ../pidgin/gtkconv.c:2969
+#: ../pidgin/gtkconv.c:2965
 msgid "/Conversation/_Add..."
 msgstr "/Keskustelu/_Lisää..."
 
-#: ../pidgin/gtkconv.c:2971
+#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/_Remove..."
 msgstr "/Keskustelu/_Poista..."
 
-#: ../pidgin/gtkconv.c:2976
+#: ../pidgin/gtkconv.c:2972
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Keskustelu/Lisää lin_kki..."
 
-#: ../pidgin/gtkconv.c:2978
+#: ../pidgin/gtkconv.c:2974
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Keskustelu/Liitä _kuva..."
 
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:2980
 msgid "/Conversation/_Close"
 msgstr "/Keskustelu/_Sulje"
 
 #. Options
-#: ../pidgin/gtkconv.c:2988
+#: ../pidgin/gtkconv.c:2984
 msgid "/_Options"
 msgstr "/_Valinnat"
 
-#: ../pidgin/gtkconv.c:2989
+#: ../pidgin/gtkconv.c:2985
 msgid "/Options/Enable _Logging"
 msgstr "/Valinnat/_Lokiinkirjaus"
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:2986
 msgid "/Options/Enable _Sounds"
 msgstr "/Valinnat/S_oita merkkiäänet"
 
-#: ../pidgin/gtkconv.c:2992
+#: ../pidgin/gtkconv.c:2988
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Valinnat/Näytä muokkaus-_työkalurivit"
 
-#: ../pidgin/gtkconv.c:2993
+#: ../pidgin/gtkconv.c:2989
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Valinnat/Näytä aika_leima"
 
-#: ../pidgin/gtkconv.c:3120
+#: ../pidgin/gtkconv.c:3116
 msgid "/Conversation/More"
 msgstr "/Keskustelu/Lisää"
 
-#: ../pidgin/gtkconv.c:3176
+#: ../pidgin/gtkconv.c:3172
 msgid "/Options"
 msgstr "/Valinnat"
 
@@ -14889,79 +14980,79 @@
 #. 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:3211 ../pidgin/gtkconv.c:3243
+#: ../pidgin/gtkconv.c:3207 ../pidgin/gtkconv.c:3239
 msgid "/Conversation"
 msgstr "/Keskustelu"
 
-#: ../pidgin/gtkconv.c:3251
+#: ../pidgin/gtkconv.c:3247
 msgid "/Conversation/View Log"
 msgstr "/Keskustelu/Näytä loki..."
 
-#: ../pidgin/gtkconv.c:3257
+#: ../pidgin/gtkconv.c:3253
 msgid "/Conversation/Send File..."
 msgstr "/Keskustelu/Lähetä tiedosto..."
 
-#: ../pidgin/gtkconv.c:3261
+#: ../pidgin/gtkconv.c:3257
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Keskustelu/Lisää tuttavailmoitin..."
 
+#: ../pidgin/gtkconv.c:3263
+msgid "/Conversation/Get Info"
+msgstr "/Keskustelu/Hae tiedot..."
+
 #: ../pidgin/gtkconv.c:3267
-msgid "/Conversation/Get Info"
-msgstr "/Keskustelu/Hae tiedot..."
-
-#: ../pidgin/gtkconv.c:3271
 msgid "/Conversation/Invite..."
 msgstr "/Keskustelu/Kutsu..."
 
+#: ../pidgin/gtkconv.c:3273
+msgid "/Conversation/Alias..."
+msgstr "/Keskustelu/Lempinimi..."
+
 #: ../pidgin/gtkconv.c:3277
-msgid "/Conversation/Alias..."
-msgstr "/Keskustelu/Lempinimi..."
+msgid "/Conversation/Block..."
+msgstr "/Keskustelu/Estä..."
 
 #: ../pidgin/gtkconv.c:3281
-msgid "/Conversation/Block..."
-msgstr "/Keskustelu/Estä..."
+msgid "/Conversation/Unblock..."
+msgstr "/Keskustelu/Poista esto..."
 
 #: ../pidgin/gtkconv.c:3285
-msgid "/Conversation/Unblock..."
-msgstr "/Keskustelu/Poista esto..."
+msgid "/Conversation/Add..."
+msgstr "/Keskustelu/Lisää..."
 
 #: ../pidgin/gtkconv.c:3289
-msgid "/Conversation/Add..."
-msgstr "/Keskustelu/Lisää..."
-
-#: ../pidgin/gtkconv.c:3293
 msgid "/Conversation/Remove..."
 msgstr "/Keskustelu/Poista..."
 
+#: ../pidgin/gtkconv.c:3295
+msgid "/Conversation/Insert Link..."
+msgstr "/Keskustelu/Lisää linkki..."
+
 #: ../pidgin/gtkconv.c:3299
-msgid "/Conversation/Insert Link..."
-msgstr "/Keskustelu/Lisää linkki..."
-
-#: ../pidgin/gtkconv.c:3303
 msgid "/Conversation/Insert Image..."
 msgstr "/Keskustelu/Lisää kuva..."
 
-#: ../pidgin/gtkconv.c:3309
+#: ../pidgin/gtkconv.c:3305
 msgid "/Options/Enable Logging"
 msgstr "/Valinnat/Lokiinkirjaus"
 
-#: ../pidgin/gtkconv.c:3312
+#: ../pidgin/gtkconv.c:3308
 msgid "/Options/Enable Sounds"
 msgstr "/Valinnat/Soita merkkiäänet"
 
-#: ../pidgin/gtkconv.c:3325
+#: ../pidgin/gtkconv.c:3321
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Valinnat/Näytä muokkaustyökalurivit"
 
-#: ../pidgin/gtkconv.c:3328
+#: ../pidgin/gtkconv.c:3324
 msgid "/Options/Show Timestamps"
 msgstr "/Valinnat/Näytä aikaleima"
 
-#: ../pidgin/gtkconv.c:3406
+#: ../pidgin/gtkconv.c:3402
 msgid "User is typing..."
 msgstr "Käyttäjä kirjoittaa..."
 
-#: ../pidgin/gtkconv.c:3476
+#: ../pidgin/gtkconv.c:3472
 #, c-format
 msgid ""
 "\n"
@@ -14971,96 +15062,96 @@
 "%s on lopettanut kirjoittamisen"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3642 ../pidgin/gtkconv.c:8313
+#: ../pidgin/gtkconv.c:3638 ../pidgin/gtkconv.c:8309
 msgid "S_end To"
 msgstr "Läh_etä henkilölle"
 
-#: ../pidgin/gtkconv.c:4354
+#: ../pidgin/gtkconv.c:4350
 msgid "_Send"
 msgstr "_Lähetä"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4492
+#: ../pidgin/gtkconv.c:4486
 msgid "0 people in room"
 msgstr "0 ihmistä huoneessa"
 
-#: ../pidgin/gtkconv.c:5791 ../pidgin/gtkconv.c:5912
+#: ../pidgin/gtkconv.c:5784 ../pidgin/gtkconv.c:5905
 #, 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:6539 ../pidgin/gtkstatusbox.c:679
+#: ../pidgin/gtkconv.c:6535 ../pidgin/gtkstatusbox.c:679
 msgid "Typing"
 msgstr "Kirjoittaa"
 
-#: ../pidgin/gtkconv.c:6543
+#: ../pidgin/gtkconv.c:6539
 msgid "Stopped Typing"
 msgstr "Lopetti kirjoittamisen"
 
-#: ../pidgin/gtkconv.c:6546
+#: ../pidgin/gtkconv.c:6542
 msgid "Nick Said"
 msgstr "Sanoi"
 
-#: ../pidgin/gtkconv.c:6549 ../pidgin/gtkdocklet.c:686
+#: ../pidgin/gtkconv.c:6545 ../pidgin/gtkdocklet.c:686
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../pidgin/gtkconv.c:6555
+#: ../pidgin/gtkconv.c:6551
 msgid "New Event"
 msgstr "Uusi tapahtuma"
 
-#: ../pidgin/gtkconv.c:7785
+#: ../pidgin/gtkconv.c:7781
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Tyhjentää kaikki keskustelut"
 
-#: ../pidgin/gtkconv.c:7989
+#: ../pidgin/gtkconv.c:7985
 msgid "Confirm close"
 msgstr "Vahvista sulkeminen"
 
-#: ../pidgin/gtkconv.c:8021
+#: ../pidgin/gtkconv.c:8017
 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:8654
+#: ../pidgin/gtkconv.c:8650
 msgid "Close other tabs"
 msgstr "Sulje muut välilehdet"
 
-#: ../pidgin/gtkconv.c:8660
+#: ../pidgin/gtkconv.c:8656
 msgid "Close all tabs"
 msgstr "Sulje kaikki välilehdet"
 
-#: ../pidgin/gtkconv.c:8668
+#: ../pidgin/gtkconv.c:8664
 msgid "Detach this tab"
 msgstr "Irrota tämä välilehti"
 
-#: ../pidgin/gtkconv.c:8674
+#: ../pidgin/gtkconv.c:8670
 msgid "Close this tab"
 msgstr "Sulje tämä välilehti"
 
-#: ../pidgin/gtkconv.c:9188
+#: ../pidgin/gtkconv.c:9184
 msgid "Close conversation"
 msgstr "Sulje keskustelu"
 
-#: ../pidgin/gtkconv.c:9792
+#: ../pidgin/gtkconv.c:9788
 msgid "Last created window"
 msgstr "Viimeksi luotu ikkuna"
 
-#: ../pidgin/gtkconv.c:9794
+#: ../pidgin/gtkconv.c:9790
 msgid "Separate IM and Chat windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut eri ikkunoissa"
 
-#: ../pidgin/gtkconv.c:9796 ../pidgin/gtkprefs.c:1466
+#: ../pidgin/gtkconv.c:9792 ../pidgin/gtkprefs.c:1466
 msgid "New window"
 msgstr "Uusi ikkuna"
 
-#: ../pidgin/gtkconv.c:9798
+#: ../pidgin/gtkconv.c:9794
 msgid "By group"
 msgstr "Ryhmän mukaan"
 
-#: ../pidgin/gtkconv.c:9800
+#: ../pidgin/gtkconv.c:9796
 msgid "By account"
 msgstr "Tilin mukaan"
 
@@ -15124,7 +15215,7 @@
 msgid "Fatal Error"
 msgstr "Vakavat virheet"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:118
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:119
 msgid "lead developer"
 msgstr "pääkehittäjä"
 
@@ -15149,36 +15240,36 @@
 msgid "support/QA"
 msgstr "tuki/laadunvarmistus"
 
-#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:113
+#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:114
 msgid "developer & webmaster"
 msgstr "kehittäjä & verkkosivujen ylläpitäjä"
 
-#: ../pidgin/gtkdialogs.c:100
+#: ../pidgin/gtkdialogs.c:101
 msgid "Senior Contributor/QA"
 msgstr "Vanhempi osallistuja/laadunvarmistus"
 
-#: ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:110
 msgid "win32 port"
 msgstr "win32-käännös"
 
-#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:111 ../pidgin/gtkdialogs.c:112
 msgid "maintainer"
 msgstr "ylläpitäjä"
 
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:113
 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:115
+#: ../pidgin/gtkdialogs.c:116
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hakkeri ja kuski [laiska pummi]"
 
-#: ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:117
 msgid "XMPP developer"
 msgstr "XMPP-kehittäjä"
 
-#: ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:118
 msgid "original author"
 msgstr "alkuperäinen tekijä"
 
@@ -15186,7 +15277,7 @@
 msgid "Afrikaans"
 msgstr "afrikaans"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:230
 msgid "Arabic"
 msgstr "arabia"
 
@@ -15195,7 +15286,7 @@
 msgstr "valkovenäjä latinalainen"
 
 #: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:138
-#: ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:231
 msgid "Bulgarian"
 msgstr "bulgaria"
 
@@ -15208,8 +15299,8 @@
 msgid "Bosnian"
 msgstr "bosnia"
 
-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:233
 msgid "Catalan"
 msgstr "katalaani"
 
@@ -15217,7 +15308,7 @@
 msgid "Valencian-Catalan"
 msgstr "valencian katalaani"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:234
 msgid "Czech"
 msgstr "tšekki"
 
@@ -15226,7 +15317,7 @@
 msgstr "tanska"
 
 #: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "German"
 msgstr "saksa"
 
@@ -15255,9 +15346,9 @@
 msgid "Esperanto"
 msgstr "esperanto"
 
-#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:235
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:239
 msgid "Spanish"
 msgstr "espanja"
 
@@ -15274,19 +15365,19 @@
 msgid "Persian"
 msgstr "persia"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:239
-#: ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Finnish"
 msgstr "suomi"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:241
-#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
-#: ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:243 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:245
 msgid "French"
 msgstr "ranska"
 
 #: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
-#: ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:246
 msgid "Galician"
 msgstr "galego"
 
@@ -15298,7 +15389,7 @@
 msgid "Gujarati Language Team"
 msgstr "Gujaratin kääntäjäryhmä"
 
-#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:247
 msgid "Hebrew"
 msgstr "heprea"
 
@@ -15306,7 +15397,7 @@
 msgid "Hindi"
 msgstr "hindi"
 
-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:248
 msgid "Hungarian"
 msgstr "unkari"
 
@@ -15314,16 +15405,16 @@
 msgid "Indonesian"
 msgstr "indonesia"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:249
 msgid "Italian"
 msgstr "italia"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
-#: ../pidgin/gtkdialogs.c:250 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:251 ../pidgin/gtkdialogs.c:252
 msgid "Japanese"
 msgstr "japani"
 
-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:253
 msgid "Georgian"
 msgstr "georgia"
 
@@ -15339,8 +15430,8 @@
 msgid "Kannada Translation team"
 msgstr "Kannadan kääntäjäryhmä"
 
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:253
-#: ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Korean"
 msgstr "korea"
 
@@ -15353,18 +15444,18 @@
 msgid "Lao"
 msgstr "lao"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:257
 msgid "Lithuanian"
 msgstr "liettua"
 
 #: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:258
 msgid "Macedonian"
 msgstr "makedonia"
 
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:260
 msgid "Bokmål Norwegian"
 msgstr "kirjanorja"
 
@@ -15385,7 +15476,7 @@
 msgstr "punjabi"
 
 #: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:197
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:260
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:261
 msgid "Polish"
 msgstr "puola"
 
@@ -15405,18 +15496,18 @@
 msgid "Romanian"
 msgstr "romania"
 
-#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:263
 msgid "Russian"
 msgstr "venäjä"
 
 #: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:205
-#: ../pidgin/gtkdialogs.c:263 ../pidgin/gtkdialogs.c:264
-#: ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:266
 msgid "Slovak"
 msgstr "slovakki"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:266
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:267
 msgid "Slovenian"
 msgstr "sloveeni"
 
@@ -15425,67 +15516,71 @@
 msgstr "albania"
 
 #: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:209
-#: ../pidgin/gtkdialogs.c:267 ../pidgin/gtkdialogs.c:268
+#: ../pidgin/gtkdialogs.c:268 ../pidgin/gtkdialogs.c:269
 msgid "Serbian"
 msgstr "serbia"
 
-#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:269
-#: ../pidgin/gtkdialogs.c:270
+#: ../pidgin/gtkdialogs.c:210
+msgid "Sinhala"
+msgstr "sinhali"
+
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:270
+#: ../pidgin/gtkdialogs.c:271
 msgid "Swedish"
 msgstr "ruotsi"
 
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:212
 msgid "Tamil"
 msgstr "tamil"
 
-#: ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Telugu"
 msgstr "telugu"
 
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:214
 msgid "Thai"
 msgstr "thai"
 
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:271
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:272
 msgid "Turkish"
 msgstr "turkki"
 
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:216
 msgid "Urdu"
 msgstr "urdu"
 
-#: ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
 msgid "Vietnamese"
 msgstr "vietnam"
 
-#: ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M Thanh ja Gnomen Vi-työryhmä"
 
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:272
+#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:273
 msgid "Simplified Chinese"
 msgstr "kiina (yksinkertaistettu)"
 
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
 msgid "Hong Kong Chinese"
 msgstr "Hong Kongin kiina"
 
-#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:273
+#: ../pidgin/gtkdialogs.c:222 ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:274
 msgid "Traditional Chinese"
 msgstr "kiina (perinteinen)"
 
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:229
 msgid "Amharic"
 msgstr "amhara"
 
-#: ../pidgin/gtkdialogs.c:358
+#: ../pidgin/gtkdialogs.c:359
 #, c-format
 msgid "About %s"
 msgstr "Tietoja %sistä"
 
-#: ../pidgin/gtkdialogs.c:394
+#: ../pidgin/gtkdialogs.c:395
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -15509,100 +15604,101 @@
 "luettelo osallistuneista löytyy \"COPYRIGHT\"-tiedostosta. Tekijät eivät "
 "anna ohjelmalle minkäänlaista takuuta.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:412
+#: ../pidgin/gtkdialogs.c:413
+#, c-format
 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:417
+#: ../pidgin/gtkdialogs.c:418
 msgid "Current Developers"
 msgstr "Nykyiset kehittäjät"
 
-#: ../pidgin/gtkdialogs.c:432
+#: ../pidgin/gtkdialogs.c:433
 msgid "Crazy Patch Writers"
 msgstr "Villit korjauspäivitysten kirjoittajat"
 
-#: ../pidgin/gtkdialogs.c:447
+#: ../pidgin/gtkdialogs.c:448
 msgid "Retired Developers"
 msgstr "Lopettaneet kehittäjät"
 
-#: ../pidgin/gtkdialogs.c:462
+#: ../pidgin/gtkdialogs.c:463
 msgid "Retired Crazy Patch Writers"
 msgstr "Lopettaneet korjauspäivitysten kirjoittajat"
 
-#: ../pidgin/gtkdialogs.c:477
+#: ../pidgin/gtkdialogs.c:478
 msgid "Artists"
 msgstr "Graafikot"
 
-#: ../pidgin/gtkdialogs.c:492
+#: ../pidgin/gtkdialogs.c:493
 msgid "Current Translators"
 msgstr "Nykyiset kielenkääntäjät"
 
-#: ../pidgin/gtkdialogs.c:512
+#: ../pidgin/gtkdialogs.c:513
 msgid "Past Translators"
 msgstr "Aikaisemmat kielenkääntäjät"
 
-#: ../pidgin/gtkdialogs.c:530
+#: ../pidgin/gtkdialogs.c:531
 msgid "Debugging Information"
 msgstr "Virheenjäljitystietoja"
 
-#: ../pidgin/gtkdialogs.c:746 ../pidgin/gtkdialogs.c:885
-#: ../pidgin/gtkdialogs.c:966
+#: ../pidgin/gtkdialogs.c:747 ../pidgin/gtkdialogs.c:886
+#: ../pidgin/gtkdialogs.c:967
 msgid "_Name"
 msgstr "_Nimi"
 
-#: ../pidgin/gtkdialogs.c:751 ../pidgin/gtkdialogs.c:890
-#: ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:752 ../pidgin/gtkdialogs.c:891
+#: ../pidgin/gtkdialogs.c:972
 msgid "_Account"
 msgstr "_Käyttäjätili"
 
-#: ../pidgin/gtkdialogs.c:898
+#: ../pidgin/gtkdialogs.c:899
 msgid "Get User Info"
 msgstr "Hae käyttäjätiedot"
 
-#: ../pidgin/gtkdialogs.c:900
+#: ../pidgin/gtkdialogs.c:901
 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:990
+#: ../pidgin/gtkdialogs.c:991
 msgid "View User Log"
 msgstr "Näytä käyttäjäloki"
 
-#: ../pidgin/gtkdialogs.c:992
+#: ../pidgin/gtkdialogs.c:993
 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:1012
+#: ../pidgin/gtkdialogs.c:1013
 msgid "Alias Contact"
 msgstr "Anna kontaktiryhmälle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:1013
+#: ../pidgin/gtkdialogs.c:1014
 msgid "Enter an alias for this contact."
 msgstr "Anna lempinimi tälle kontaktiryhmälle."
 
-#: ../pidgin/gtkdialogs.c:1035
+#: ../pidgin/gtkdialogs.c:1036
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Anna %s:n lempinimi."
 
-#: ../pidgin/gtkdialogs.c:1037
+#: ../pidgin/gtkdialogs.c:1038
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:1058
+#: ../pidgin/gtkdialogs.c:1059
 msgid "Alias Chat"
 msgstr "Anna ryhmäkeskustelulle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:1059
+#: ../pidgin/gtkdialogs.c:1060
 msgid "Enter an alias for this chat."
 msgstr "Syötä lempinimi tälle ryhmäkeskustelulle."
 
-#: ../pidgin/gtkdialogs.c:1098
+#: ../pidgin/gtkdialogs.c:1099
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15617,59 +15713,59 @@
 "Olet poistamassa kontaktin, jossa on %s sekä %d muuta tuttavaa tuttavistasi. "
 "Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1107
 msgid "Remove Contact"
 msgstr "Poista kontakti"
 
-#: ../pidgin/gtkdialogs.c:1109
+#: ../pidgin/gtkdialogs.c:1110
 msgid "_Remove Contact"
 msgstr "_Poista kontakti"
 
-#: ../pidgin/gtkdialogs.c:1140
+#: ../pidgin/gtkdialogs.c:1141
 #, 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:1147
+#: ../pidgin/gtkdialogs.c:1148
 msgid "Merge Groups"
 msgstr "Yhdistä ryhmät"
 
-#: ../pidgin/gtkdialogs.c:1150
+#: ../pidgin/gtkdialogs.c:1151
 msgid "_Merge Groups"
 msgstr "_Yhdistä ryhmät"
 
-#: ../pidgin/gtkdialogs.c:1200
+#: ../pidgin/gtkdialogs.c:1201
 #, 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:1203
+#: ../pidgin/gtkdialogs.c:1204
 msgid "Remove Group"
 msgstr "Poista ryhmä"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1207
 msgid "_Remove Group"
 msgstr "_Poista ryhmä"
 
-#: ../pidgin/gtkdialogs.c:1239
+#: ../pidgin/gtkdialogs.c:1240
 #, 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:1242
+#: ../pidgin/gtkdialogs.c:1243
 msgid "Remove Buddy"
 msgstr "Poista tuttava"
 
-#: ../pidgin/gtkdialogs.c:1245
+#: ../pidgin/gtkdialogs.c:1246
 msgid "_Remove Buddy"
 msgstr "_Poista tuttava"
 
-#: ../pidgin/gtkdialogs.c:1266
+#: ../pidgin/gtkdialogs.c:1267
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -15678,11 +15774,11 @@
 "Olet poistamassa ryhmäkeskustelun nimeltä \"%s\" tuttavistasi. Haluatko "
 "jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1269
+#: ../pidgin/gtkdialogs.c:1270
 msgid "Remove Chat"
 msgstr "Poista ryhmäkeskustelu"
 
-#: ../pidgin/gtkdialogs.c:1272
+#: ../pidgin/gtkdialogs.c:1273
 msgid "_Remove Chat"
 msgstr "_Poista ryhmäkeskustelu"
 
@@ -15800,75 +15896,75 @@
 msgid "_Resume"
 msgstr "_Jatka"
 
-#: ../pidgin/gtkimhtml.c:816
+#: ../pidgin/gtkimhtml.c:820
 msgid "Paste as Plain _Text"
 msgstr "Liimaa pelkkänä _tekstinä"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1197
+#: ../pidgin/gtkimhtml.c:837 ../pidgin/gtkimhtmltoolbar.c:1197
 msgid "_Reset formatting"
 msgstr "_Poista muotoilu"
 
-#: ../pidgin/gtkimhtml.c:1391
-msgid "Hyperlink color"
-msgstr "Hyperlinkin väri"
-
-#: ../pidgin/gtkimhtml.c:1392
-msgid "Color to draw hyperlinks."
-msgstr "Väri jolla piirretään hyperlinkit"
-
 #: ../pidgin/gtkimhtml.c:1395
+msgid "Hyperlink color"
+msgstr "Hyperlinkin väri"
+
+#: ../pidgin/gtkimhtml.c:1396
+msgid "Color to draw hyperlinks."
+msgstr "Väri jolla piirretään hyperlinkit"
+
+#: ../pidgin/gtkimhtml.c:1399
 msgid "Hyperlink prelight color"
 msgstr "Hyperlinkin ensiväri"
 
-#: ../pidgin/gtkimhtml.c:1396
+#: ../pidgin/gtkimhtml.c:1400
 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:1399 ../pidgin/plugins/pidginrc.c:52
+#: ../pidgin/gtkimhtml.c:1403 ../pidgin/plugins/pidginrc.c:52
 msgid "Sent Message Name Color"
 msgstr "Lähetetyn viestin nimen väri"
 
-#: ../pidgin/gtkimhtml.c:1400
+#: ../pidgin/gtkimhtml.c:1404
 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
+#: ../pidgin/gtkimhtml.c:1407 ../pidgin/plugins/pidginrc.c:53
 msgid "Received Message Name Color"
 msgstr "Vastaanotetun viestin nimen väri"
 
-#: ../pidgin/gtkimhtml.c:1404
+#: ../pidgin/gtkimhtml.c:1408
 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
+#: ../pidgin/gtkimhtml.c:1411
 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 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:1415 ../pidgin/plugins/pidginrc.c:55
+msgid "Action Message Name Color"
+msgstr "Toimintoviestin nimen väri"
+
+#: ../pidgin/gtkimhtml.c:1416
 msgid "Color to draw the name of an action message."
 msgstr "Väri jolla näytetään toimintoviestin nimi."
 
-#: ../pidgin/gtkimhtml.c:1632
+#: ../pidgin/gtkimhtml.c:1636
 msgid "_Copy E-Mail Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: ../pidgin/gtkimhtml.c:1644
+#: ../pidgin/gtkimhtml.c:1648
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: ../pidgin/gtkimhtml.c:1654
+#: ../pidgin/gtkimhtml.c:1658
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin osoite"
 
-#: ../pidgin/gtkimhtml.c:3421
+#: ../pidgin/gtkimhtml.c:3425
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15878,7 +15974,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../pidgin/gtkimhtml.c:3424
+#: ../pidgin/gtkimhtml.c:3428
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15888,7 +15984,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../pidgin/gtkimhtml.c:3453
+#: ../pidgin/gtkimhtml.c:3457
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15899,7 +15995,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3456
+#: ../pidgin/gtkimhtml.c:3460
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15910,11 +16006,12 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3537 ../pidgin/gtkimhtml.c:3549
+#: ../pidgin/gtkimhtml.c:3541 ../pidgin/gtkimhtml.c:3553
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../pidgin/gtkimhtml.c:3577
+#: ../pidgin/gtkimhtml.c:3581
+#, c-format
 msgid "_Save Image..."
 msgstr "_Tallenna kuva nimellä..."
 
@@ -16150,12 +16247,12 @@
 msgid "_Browse logs folder"
 msgstr "_Selaa lokikansiota"
 
-#: ../pidgin/gtkmain.c:398
+#: ../pidgin/gtkmain.c:385
 #, 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:401
+#: ../pidgin/gtkmain.c:388
 #, c-format
 msgid ""
 "%s %s\n"
@@ -16166,8 +16263,9 @@
 "  -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"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
 "  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
@@ -16180,11 +16278,12 @@
 "  -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"
+"                      määrittelee käytettävät tilit pilkuin eroteltuina.\n"
+"                      Ilman tätä vain ensimmäinen tili otetaan käyttöön).\n"
 "  --display=NÄYTTÖ    käytettävä X-näyttö\n"
 "  -v, --version       näytä nykyinen versionumero ja poistu\n"
 
-#: ../pidgin/gtkmain.c:413
+#: ../pidgin/gtkmain.c:401
 #, c-format
 msgid ""
 "%s %s\n"
@@ -16195,8 +16294,9 @@
 "  -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"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
@@ -16208,10 +16308,11 @@
 "  -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"
+"                      määrittelee käytettävät tilit pilkuin eroteltuina.\n"
+"                      Ilman tätä vain ensimmäinen tili otetaan käyttöön).\n"
 "  -v, --version       näytä nykyinen versionumero ja poistu\n"
 
-#: ../pidgin/gtkmain.c:540
+#: ../pidgin/gtkmain.c:531
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -16252,7 +16353,7 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:731 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:725 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
@@ -16298,23 +16399,23 @@
 "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:266
+#: ../pidgin/gtkplugin.c:270
 msgid "The following plugins will be unloaded."
 msgstr "Seuraavat liitännäiset otetaan pois käytöstä."
 
-#: ../pidgin/gtkplugin.c:285
-msgid "Multiple plugins will be unloaded."
-msgstr "Useita liitännäisiä otetaan pois käytöstä."
-
 #: ../pidgin/gtkplugin.c:289
+msgid "Multiple plugins will be unloaded."
+msgstr "Useita liitännäisiä otetaan pois käytöstä."
+
+#: ../pidgin/gtkplugin.c:293
 msgid "Unload Plugins"
 msgstr "Poista liitännäiset käytöstä"
 
-#: ../pidgin/gtkplugin.c:309
+#: ../pidgin/gtkplugin.c:313
 msgid "Could not unload plugin"
 msgstr "Liitännäistä ei voi poistaa käytöstä"
 
-#: ../pidgin/gtkplugin.c:310
+#: ../pidgin/gtkplugin.c:314
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
@@ -16322,7 +16423,7 @@
 "Liitännäistä ei voi poistaa käytöstä nyt, mutta se poistetaan käytöstä "
 "seuraavalla käynnistymiskerralla."
 
-#: ../pidgin/gtkplugin.c:418
+#: ../pidgin/gtkplugin.c:422
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -16333,7 +16434,7 @@
 "<span weight=\"bold\">Web-sivusto:</span>\t\t%s\n"
 "<span weight=\"bold\">Tiedostopolku:</span>\t%s"
 
-#: ../pidgin/gtkplugin.c:428
+#: ../pidgin/gtkplugin.c:432
 #, c-format
 msgid ""
 "%s\n"
@@ -16344,11 +16445,15 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Virhe: %s\n"
 "Tarkista onko liitännäiswebsivustolla päivitystä.</span>"
 
-#: ../pidgin/gtkplugin.c:606
+#: ../pidgin/gtkplugin.c:569
+msgid "Author"
+msgstr "Tekijä"
+
+#: ../pidgin/gtkplugin.c:610
 msgid "Configure Pl_ugin"
 msgstr "Liitännäisen _asetukset"
 
-#: ../pidgin/gtkplugin.c:673
+#: ../pidgin/gtkplugin.c:677
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Liitännäisen yksityiskohdat</b>"
 
@@ -16788,26 +16893,32 @@
 msgstr "Äänivalinta"
 
 #: ../pidgin/gtkprefs.c:1679
+#, c-format
 msgid "Quietest"
 msgstr "Hiljaisin"
 
 #: ../pidgin/gtkprefs.c:1681
+#, c-format
 msgid "Quieter"
 msgstr "Hiljaisempi"
 
 #: ../pidgin/gtkprefs.c:1683
+#, c-format
 msgid "Quiet"
 msgstr "Hiljainen"
 
 #: ../pidgin/gtkprefs.c:1687
+#, c-format
 msgid "Loud"
 msgstr "Äänekäs"
 
 #: ../pidgin/gtkprefs.c:1689
+#, c-format
 msgid "Louder"
 msgstr "Äänekkäämpi"
 
 #: ../pidgin/gtkprefs.c:1691
+#, c-format
 msgid "Loudest"
 msgstr "Äänekkäin"
 
@@ -17259,31 +17370,31 @@
 msgid "none"
 msgstr "ei mitään"
 
-#: ../pidgin/plugins/cap/cap.c:444 ../pidgin/plugins/cap/cap.c:447
+#: ../pidgin/plugins/cap/cap.c:441 ../pidgin/plugins/cap/cap.c:444
 msgid "Response Probability:"
 msgstr "Vastaustodennäköisyys:"
 
-#: ../pidgin/plugins/cap/cap.c:772
+#: ../pidgin/plugins/cap/cap.c:769
 msgid "Statistics Configuration"
 msgstr "Tilastoinnin asetukset"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:775
+#: ../pidgin/plugins/cap/cap.c:772
 msgid "Maximum response timeout:"
 msgstr "Suurin vastauksen aikakatkaisu:"
 
-#: ../pidgin/plugins/cap/cap.c:778 ../pidgin/plugins/cap/cap.c:785
-#: ../pidgin/plugins/cap/cap.c:792 ../pidgin/plugins/timestamp.c:148
+#: ../pidgin/plugins/cap/cap.c:775 ../pidgin/plugins/cap/cap.c:782
+#: ../pidgin/plugins/cap/cap.c:789 ../pidgin/plugins/timestamp.c:148
 msgid "minutes"
 msgstr "minuuttia"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:782
+#: ../pidgin/plugins/cap/cap.c:779
 msgid "Maximum last-seen difference:"
 msgstr "Suurin viimeksi-nähty -arvon ero:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:789
+#: ../pidgin/plugins/cap/cap.c:786
 msgid "Threshold:"
 msgstr "Kynnys:"
 
@@ -17293,18 +17404,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:897
+#: ../pidgin/plugins/cap/cap.c:894
 msgid "Contact Availability Prediction"
 msgstr "Tuttavan paikallaolon ennustus"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:899
+#: ../pidgin/plugins/cap/cap.c:896
 msgid "Contact Availability Prediction plugin."
 msgstr "Tuttavan paikallaolon ennustava liitännäinen."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:900
+#: ../pidgin/plugins/cap/cap.c:897
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -17532,24 +17643,24 @@
 msgstr "Pikaviestintä"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:461
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Valitse henkilö alla olevasta osoitekirjasta, tai lisää uusi henkilö."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:555
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:305
 msgid "Group:"
 msgstr "Ryhmä:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:252
 msgid "New Person"
 msgstr "Uusi henkilö"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
 msgid "Select Buddy"
 msgstr "Valitse tuttava"
 
@@ -17572,34 +17683,34 @@
 msgid "_Associate Buddy"
 msgstr "_Yhdistä tuttava"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:240
-#: ../pidgin/plugins/gevolution/gevolution.c:246
+#: ../pidgin/plugins/gevolution/gevolution.c:242
+#: ../pidgin/plugins/gevolution/gevolution.c:248
 msgid "Unable to send e-mail"
 msgstr "Sähköpostia ei voi lähettää."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:241
+#: ../pidgin/plugins/gevolution/gevolution.c:243
 msgid "The evolution executable was not found in the PATH."
 msgstr "Suoritettava evolution-tiedosto ei löytynyt PATH-muuttujasta."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:247
+#: ../pidgin/plugins/gevolution/gevolution.c:249
 msgid "An e-mail address was not found for this buddy."
 msgstr "Tälle tuttavalle ei löytynyt sähköpostiosoitetta."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:273
+#: ../pidgin/plugins/gevolution/gevolution.c:275
 msgid "Add to Address Book"
 msgstr "Lisää osoitekirjaan"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:285
+#: ../pidgin/plugins/gevolution/gevolution.c:287
 msgid "Send E-Mail"
 msgstr "Lähetä sähköposti"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:412
+#: ../pidgin/plugins/gevolution/gevolution.c:414
 msgid "Evolution Integration Configuration"
 msgstr "Evolution-integraatioasetukset"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:415
+#: ../pidgin/plugins/gevolution/gevolution.c:417
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Valitse kaikki tilit, joihin tuttavat lisätään automaattisesti."
 
@@ -17609,7 +17720,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:527
+#: ../pidgin/plugins/gevolution/gevolution.c:529
 msgid "Evolution Integration"
 msgstr "Evolution-integrointi"
 
@@ -17617,37 +17728,37 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:530
 #: ../pidgin/plugins/gevolution/gevolution.c:532
+#: ../pidgin/plugins/gevolution/gevolution.c:534
 msgid "Provides integration with Evolution."
 msgstr "Mahdollistaa integroinnin Evolutionin kanssa."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the person's information below."
 msgstr "Syötä henkilön tiedot alle."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:270
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Syötä tuttavan näyttönimi ja käyttäjätilin tyyppi alle."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:286
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
 msgstr "Käyttäjätilin tyyppi:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:313
 msgid "Optional information:"
 msgstr "Valinnaisia tietoja:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:348
 msgid "First name:"
 msgstr "Etunimi:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:360
 msgid "Last name:"
 msgstr "Sukunimi:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:380
 msgid "E-mail:"
 msgstr "Sähköposti:"
 
@@ -17875,7 +17986,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:907
+#: ../pidgin/plugins/notify.c:905
 msgid "Message Notification"
 msgstr "Viestihuomautus"
 
@@ -17883,7 +17994,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
+#: ../pidgin/plugins/notify.c:908 ../pidgin/plugins/notify.c:910
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Ilmoittaa lukemattomista viesteistä monilla tavoilla."
 
@@ -17955,6 +18066,7 @@
 msgstr "Valitse väri"
 
 #: ../pidgin/plugins/pidginrc.c:306
+#, c-format
 msgid "Select Interface Font"
 msgstr "Valitse käyttöliittymän kirjasin"
 
@@ -18087,70 +18199,70 @@
 "Tarkistaa määräajoin onko uusi Pidgin-versio julkaistu ja huomauttaa "
 "käyttäjää näyttämällä muutoslokin."
 
-#: ../pidgin/plugins/spellchk.c:1962
+#: ../pidgin/plugins/spellchk.c:1970
 msgid "Duplicate Correction"
 msgstr "Korjauksen toisinto"
 
-#: ../pidgin/plugins/spellchk.c:1963
+#: ../pidgin/plugins/spellchk.c:1971
 msgid "The specified word already exists in the correction list."
 msgstr "Määritetty sana on jo korjauslistassa."
 
-#: ../pidgin/plugins/spellchk.c:2176
+#: ../pidgin/plugins/spellchk.c:2184
 msgid "Text Replacements"
 msgstr "Tekstin korvaus"
 
-#: ../pidgin/plugins/spellchk.c:2199
+#: ../pidgin/plugins/spellchk.c:2207
 msgid "You type"
 msgstr "Kirjoitettu"
 
-#: ../pidgin/plugins/spellchk.c:2213
+#: ../pidgin/plugins/spellchk.c:2221
 msgid "You send"
 msgstr "Lähetetty"
 
-#: ../pidgin/plugins/spellchk.c:2227
+#: ../pidgin/plugins/spellchk.c:2235
 msgid "Whole words only"
 msgstr "Vain kokonaiset sanat"
 
-#: ../pidgin/plugins/spellchk.c:2239
+#: ../pidgin/plugins/spellchk.c:2247
 msgid "Case sensitive"
 msgstr "Sama kirjainkoko"
 
-#: ../pidgin/plugins/spellchk.c:2265
+#: ../pidgin/plugins/spellchk.c:2273
 msgid "Add a new text replacement"
 msgstr "Lisää uusi korvausehto"
 
-#: ../pidgin/plugins/spellchk.c:2281
+#: ../pidgin/plugins/spellchk.c:2289
 msgid "You _type:"
 msgstr "_Kirjoitettu:"
 
-#: ../pidgin/plugins/spellchk.c:2285
+#: ../pidgin/plugins/spellchk.c:2293
 msgid "You _send:"
 msgstr "_Lähetetty:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2288
+#: ../pidgin/plugins/spellchk.c:2296
 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:2290
+#: ../pidgin/plugins/spellchk.c:2298
 msgid "Only replace _whole words"
 msgstr "Korvaa vain _kokonaiset sanat"
 
-#: ../pidgin/plugins/spellchk.c:2315
+#: ../pidgin/plugins/spellchk.c:2323
 msgid "General Text Replacement Options"
 msgstr "Tekstin korvauksen yleiset valinnat"
 
-#: ../pidgin/plugins/spellchk.c:2316
+#: ../pidgin/plugins/spellchk.c:2324
 msgid "Enable replacement of last word on send"
 msgstr "Salli viimeisen sanan korvaus lähetettäessä"
 
-#: ../pidgin/plugins/spellchk.c:2349
+#: ../pidgin/plugins/spellchk.c:2357
 msgid "Text replacement"
 msgstr "Tekstin korvaus"
 
-#: ../pidgin/plugins/spellchk.c:2351 ../pidgin/plugins/spellchk.c:2352
+#: ../pidgin/plugins/spellchk.c:2359 ../pidgin/plugins/spellchk.c:2360
 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."
 
@@ -18203,6 +18315,7 @@
 msgstr "Aikaleiman muotoiluasetukset"
 
 #: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Pakota 24 tunnin aikamuoto"
 
@@ -18426,6 +18539,28 @@
 "Tätä liitännäistä voidaan käyttää XMPP-palvelimien tai -asiakasohjelmien "
 "virheenjäljitykseen."
 
+#~ msgid "Screen name sent"
+#~ msgstr "Näyttönimi lähetetty"
+
+#~ msgid "Screen name"
+#~ msgstr "Näyttönimi"
+
+#~ msgid "_Merge"
+#~ msgstr "_Yhdistä"
+
+#~ 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. The alias will be displayed in place of the screen name whenever "
+#~ "possible.\n"
+#~ msgstr ""
+#~ "Syötä sen henkilön näyttönimi, jonka haluat lisätä tuttaviisi. Voit myös "
+#~ "valita lempinimen tuttavalle. Lempinimi näytetään näyttönimen sijasta "
+#~ "aina kuin mahdollista.\n"
+
+#~ msgid "A_ccount:"
+#~ msgstr "_Käyttäjätili:"
+
 #~ msgid "Pounce only when my status is not available"
 #~ msgstr "Ilmoita vain kun tilani on \"tavoittamattomissa\""
 
@@ -18535,9 +18670,6 @@
 #~ msgid "Add Buddy _Pounce"
 #~ msgstr "Lisää tuttava_ilmoitin"
 
-#~ msgid "Add a _Buddy"
-#~ msgstr "Lisää _tuttava"
-
 #~ msgid "Add a C_hat"
 #~ msgstr "Lisää _ryhmäkeskustelu"
 
@@ -19218,9 +19350,6 @@
 #~ msgid "Please wait for new version"
 #~ msgstr "Odota uutta versiota"
 
-#~ msgid "Invalid username."
-#~ msgstr "Epäkelpo käyttäjänimi."
-
 #~ msgid "Wrong password!"
 #~ msgstr "Väärä salasana."