changeset 22554:397dec666559

Estonian translation updated (Ivar Smolin) Closes #4517
author Stu Tomlinson <stu@nosnilmot.com>
date Tue, 25 Mar 2008 14:35:22 +0000
parents e8b5b2264db0
children c7ba4d39d635
files po/ChangeLog po/et.po
diffstat 2 files changed, 3993 insertions(+), 3651 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Tue Mar 25 14:34:32 2008 +0000
+++ b/po/ChangeLog	Tue Mar 25 14:35:22 2008 +0000
@@ -2,6 +2,7 @@
 
 version 2.4.1
 	* Arabic translation updated (Khaled Hosny)
+	* Estonian translation updated (Ivar Smolin)
 	* Finnish translation updated (Timo Jyrinki)
 	* French translation updated (Éric Boumaour)
 	* German translation updated (Jochen Kemnade, Björn Voigt)
--- a/po/et.po	Tue Mar 25 14:34:32 2008 +0000
+++ b/po/et.po	Tue Mar 25 14:35:22 2008 +0000
@@ -1,15 +1,15 @@
 # Pidgin'i eesti keele tõlge.
 # Estonian translation of Pidgin.
-# 
-# Copyright (C) 2005-2007 Free Software Foundation, Inc.
-# Ivar Smolin <okul at linux ee>, 2005-2007.
+#
+# Copyright (C) 2005-2008 Free Software Foundation, Inc.
+# Ivar Smolin <okul at linux ee>, 2005-2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim 2.2.3\n"
+"Project-Id-Version: gaim 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-12 03:23-0500\n"
-"PO-Revision-Date: 2007-11-12 22:07+0300\n"
+"POT-Creation-Date: 2008-02-19 03:21-0500\n"
+"PO-Revision-Date: 2008-02-19 23:58+0200\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,8 +17,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
-#: ../finch/finch.c:418
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
+#: ../finch/finch.c:417
 msgid "Finch"
 msgstr "Finch"
 
@@ -50,23 +52,26 @@
 "  -v, --version          käesoleva versiooni kuvamine ja programmi töö\n"
 "                         lõpetamine\n"
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:730
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:743
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
-
-#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:189
-#: ../finch/gntplugin.c:237 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
+"%s tuvastas vea sätete migreerimisel kataloogist %s kataloogi %s. Palun uuri "
+"tekkinud olukorda ja vii migreerumine käsitsi lõpule. Samuti palun teata "
+"sellest veast aadressile http://developer.pidgin.im"
+
+#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:574
+#: ../finch/gntblist.c:710 ../finch/gntblist.c:723 ../finch/gntplugin.c:196
+#: ../finch/gntplugin.c:244 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2032
+#: ../libpurple/protocols/jabber/buddy.c:2036
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/jabber.c:1584
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
 #: ../libpurple/protocols/silc/ops.c:1460
@@ -98,8 +103,8 @@
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Ilmselt unustasid sa käsu 'make install'.)"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
-#: ../pidgin/gtkaccount.c:1478 ../pidgin/gtkblist.c:4492
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:138
+#: ../pidgin/gtkaccount.c:1447 ../pidgin/gtkblist.c:4541
 msgid "Modify Account"
 msgstr "Muuda kontot"
 
@@ -126,37 +131,40 @@
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
-#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
-#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2224 ../finch/gntblist.c:2287
-#: ../finch/gntcertmgr.c:91 ../finch/gntplugin.c:475 ../finch/gntpounce.c:472
-#: ../finch/gntpounce.c:680 ../finch/gntprefs.c:265 ../finch/gntsound.c:1058
-#: ../finch/gntstatus.c:145 ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../libpurple/account.c:1105 ../libpurple/account.c:1394
-#: ../libpurple/account.c:1429 ../libpurple/conversation.c:1215
+#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:639
+#: ../finch/gntaccount.c:890 ../finch/gntblist.c:620 ../finch/gntblist.c:698
+#: ../finch/gntblist.c:733 ../finch/gntblist.c:1077 ../finch/gntblist.c:1303
+#: ../finch/gntblist.c:1437 ../finch/gntblist.c:2602 ../finch/gntblist.c:2651
+#: ../finch/gntblist.c:2715 ../finch/gntcertmgr.c:90 ../finch/gntplugin.c:532
+#: ../finch/gntpounce.c:471 ../finch/gntpounce.c:679 ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1059 ../finch/gntstatus.c:145 ../finch/gntstatus.c:485
+#: ../finch/gntstatus.c:610 ../finch/plugins/gnthistory.c:178
+#: ../libpurple/account.c:1116 ../libpurple/account.c:1419
+#: ../libpurple/account.c:1454 ../libpurple/conversation.c:1219
 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:508
 #: ../libpurple/protocols/gg/gg.c:667 ../libpurple/protocols/gg/gg.c:804
 #: ../libpurple/protocols/gg/gg.c:886
-#: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2426
-#: ../libpurple/protocols/jabber/buddy.c:2462
+#: ../libpurple/protocols/jabber/buddy.c:730
+#: ../libpurple/protocols/jabber/buddy.c:2430
+#: ../libpurple/protocols/jabber/buddy.c:2466
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1035
-#: ../libpurple/protocols/jabber/jabber.c:1044
-#: ../libpurple/protocols/jabber/jabber.c:1746
-#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/jabber/jabber.c:1053
+#: ../libpurple/protocols/jabber/jabber.c:1062
+#: ../libpurple/protocols/jabber/jabber.c:1777
+#: ../libpurple/protocols/jabber/si.c:1109
 #: ../libpurple/protocols/jabber/usermood.c:202
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:291 ../libpurple/protocols/msn/msn.c:308
-#: ../libpurple/protocols/msn/msn.c:325 ../libpurple/protocols/msn/msn.c:342
-#: ../libpurple/protocols/msn/msn.c:363 ../libpurple/protocols/msnp9/msn.c:287
-#: ../libpurple/protocols/msnp9/msn.c:304
-#: ../libpurple/protocols/msnp9/msn.c:321
-#: ../libpurple/protocols/msnp9/msn.c:338
-#: ../libpurple/protocols/msnp9/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6144
+#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:359 ../libpurple/protocols/msnp9/msn.c:284
+#: ../libpurple/protocols/msnp9/msn.c:301
+#: ../libpurple/protocols/msnp9/msn.c:318
+#: ../libpurple/protocols/msnp9/msn.c:335
+#: ../libpurple/protocols/msnp9/msn.c:356
+#: ../libpurple/protocols/myspace/user.c:582
+#: ../libpurple/protocols/myspace/user.c:676
+#: ../libpurple/protocols/oscar/oscar.c:6197
 #: ../libpurple/protocols/oscar/peer.c:1048
 #: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -164,17 +172,17 @@
 #: ../libpurple/protocols/qq/group.c:124
 #: ../libpurple/protocols/qq/group_join.c:140
 #: ../libpurple/protocols/qq/group_join.c:365
-#: ../libpurple/protocols/qq/group_opt.c:144
-#: ../libpurple/protocols/qq/group_opt.c:399
-#: ../libpurple/protocols/qq/sys_msg.c:113
-#: ../libpurple/protocols/qq/sys_msg.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3430
-#: ../libpurple/protocols/sametime/sametime.c:3516
-#: ../libpurple/protocols/sametime/sametime.c:3690
-#: ../libpurple/protocols/sametime/sametime.c:5443
-#: ../libpurple/protocols/sametime/sametime.c:5533
-#: ../libpurple/protocols/sametime/sametime.c:5658
+#: ../libpurple/protocols/qq/group_opt.c:120
+#: ../libpurple/protocols/qq/group_opt.c:375
+#: ../libpurple/protocols/qq/sys_msg.c:115
+#: ../libpurple/protocols/qq/sys_msg.c:175
+#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/sametime/sametime.c:3438
+#: ../libpurple/protocols/sametime/sametime.c:3524
+#: ../libpurple/protocols/sametime/sametime.c:3698
+#: ../libpurple/protocols/sametime/sametime.c:5451
+#: ../libpurple/protocols/sametime/sametime.c:5541
+#: ../libpurple/protocols/sametime/sametime.c:5666
 #: ../libpurple/protocols/silc/buddy.c:455
 #: ../libpurple/protocols/silc/buddy.c:1079
 #: ../libpurple/protocols/silc/buddy.c:1194
@@ -188,41 +196,41 @@
 #: ../libpurple/protocols/silc10/buddy.c:1192
 #: ../libpurple/protocols/silc10/chat.c:600
 #: ../libpurple/protocols/silc10/chat.c:730
-#: ../libpurple/protocols/silc10/ops.c:1904
-#: ../libpurple/protocols/silc10/silc.c:736
-#: ../libpurple/protocols/silc10/silc.c:943
-#: ../libpurple/protocols/yahoo/yahoo.c:1034
-#: ../libpurple/protocols/yahoo/yahoo.c:3509
-#: ../libpurple/protocols/yahoo/yahoo.c:3520 ../pidgin/gtkaccount.c:1913
-#: ../pidgin/gtkaccount.c:2501 ../pidgin/gtkblist.c:6639
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:787
-#: ../pidgin/gtkdialogs.c:926 ../pidgin/gtkdialogs.c:1018
-#: ../pidgin/gtkdialogs.c:1038 ../pidgin/gtkdialogs.c:1062
-#: ../pidgin/gtkdialogs.c:1084 ../pidgin/gtkdialogs.c:1132
-#: ../pidgin/gtkdialogs.c:1173 ../pidgin/gtkdialogs.c:1229
-#: ../pidgin/gtkdialogs.c:1268 ../pidgin/gtkdialogs.c:1295
-#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1121
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
-#: ../pidgin/gtkprivacy.c:606 ../pidgin/gtkprivacy.c:620
-#: ../pidgin/gtkrequest.c:321 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1593
+#: ../libpurple/protocols/silc10/ops.c:1910
+#: ../libpurple/protocols/silc10/silc.c:742
+#: ../libpurple/protocols/silc10/silc.c:948
+#: ../libpurple/protocols/yahoo/yahoo.c:993
+#: ../libpurple/protocols/yahoo/yahoo.c:3535
+#: ../libpurple/protocols/yahoo/yahoo.c:3546 ../pidgin/gtkaccount.c:1841
+#: ../pidgin/gtkaccount.c:2400 ../pidgin/gtkblist.c:6767
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:765
+#: ../pidgin/gtkdialogs.c:904 ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1016 ../pidgin/gtkdialogs.c:1040
+#: ../pidgin/gtkdialogs.c:1062 ../pidgin/gtkdialogs.c:1110
+#: ../pidgin/gtkdialogs.c:1151 ../pidgin/gtkdialogs.c:1207
+#: ../pidgin/gtkdialogs.c:1246 ../pidgin/gtkdialogs.c:1273
+#: ../pidgin/gtkimhtmltoolbar.c:438 ../pidgin/gtklog.c:328
+#: ../pidgin/gtkplugin.c:290 ../pidgin/gtkpounce.c:1113
+#: ../pidgin/gtkprivacy.c:509 ../pidgin/gtkprivacy.c:525
+#: ../pidgin/gtkprivacy.c:550 ../pidgin/gtkprivacy.c:564
+#: ../pidgin/gtkrequest.c:273 ../pidgin/gtksavedstatuses.c:345
+#: ../pidgin/gtkstatusbox.c:1610
 msgid "Cancel"
 msgstr "Loobu"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:297
-#: ../finch/gntplugin.c:475 ../finch/gntpounce.c:478 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1428 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:754
-#: ../pidgin/gtkrequest.c:327
+#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:310 ../finch/gntdebug.c:297
+#: ../finch/gntplugin.c:532 ../finch/gntpounce.c:477 ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1056 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
+#: ../libpurple/account.c:1453 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:729 ../pidgin/gtkdebug.c:746
+#: ../pidgin/gtkrequest.c:279
 msgid "Save"
 msgstr "Salvesta"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1905
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1587
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1832
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1604
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Kas sa soovid kustutada kontot %s?"
@@ -232,127 +240,146 @@
 msgstr "Konto kustutamine"
 
 #. Delete button
-#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:679 ../finch/gntpounce.c:742
+#: ../finch/gntaccount.c:638 ../finch/gntaccount.c:708
+#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:678 ../finch/gntpounce.c:741
 #: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1912 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1120 ../pidgin/gtkrequest.c:324
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1592
+#: ../pidgin/gtkaccount.c:1840 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkpounce.c:1112 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1609
 msgid "Delete"
 msgstr "Kustuta"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2331 ../pidgin/gtkdocklet.c:715
+#: ../finch/gntaccount.c:670 ../finch/gntblist.c:2469 ../finch/gntui.c:94
+#: ../pidgin/gtkaccount.c:2259 ../pidgin/gtkdocklet.c:716
 msgid "Accounts"
 msgstr "Kontod"
 
-#: ../finch/gntaccount.c:675
+#: ../finch/gntaccount.c:676
 msgid "You can enable/disable accounts from the following list."
 msgstr "Selles nimekirjas on võimalik kontosid lubada ja keelata."
 
 #. Add button
-#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2379
-#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:385 ../finch/gntpounce.c:726
-#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:885
-#: ../libpurple/protocols/qq/sys_msg.c:114
-#: ../libpurple/protocols/qq/sys_msg.c:173
-#: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../finch/gntaccount.c:699 ../finch/gntaccount.c:889 ../finch/gntblist.c:619
+#: ../finch/gntblist.c:698 ../finch/gntblist.c:733 ../finch/gntblist.c:2819
+#: ../finch/gntcertmgr.c:305 ../finch/gntnotify.c:385 ../finch/gntpounce.c:725
+#: ../finch/gntroomlist.c:274 ../finch/gntstatus.c:199
+#: ../libpurple/protocols/gg/gg.c:885 ../libpurple/protocols/qq/sys_msg.c:116
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../libpurple/protocols/sametime/sametime.c:5540
 #: ../libpurple/protocols/silc/chat.c:619
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2500
-#: ../pidgin/gtkblist.c:6638 ../pidgin/gtkconv.c:1713
-#: ../pidgin/gtkrequest.c:325
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2399
+#: ../pidgin/gtkblist.c:6766 ../pidgin/gtkconv.c:1702
+#: ../pidgin/gtkrequest.c:277
 msgid "Add"
 msgstr "Lisa"
 
 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:734
+#: ../finch/gntaccount.c:704 ../finch/gntpounce.c:733
 msgid "Modify"
 msgstr "Muuda"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2447
+#: ../finch/gntaccount.c:812 ../pidgin/gtkaccount.c:2346
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s määras kasutaja %s oma sõbraks%s%s"
 
-#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2499
+#: ../finch/gntaccount.c:885 ../pidgin/gtkaccount.c:2398
 msgid "Add buddy to your list?"
 msgstr "Kas lisada sõber sinu nimekirja?"
 
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2557
+#: ../finch/gntaccount.c:945 ../pidgin/gtkaccount.c:2456
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s soovib kasutaja %s lisada oma sõbranimekirja%s%s"
 
-#: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2580
-#: ../pidgin/gtkaccount.c:2586
+#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:973
+#: ../finch/gntaccount.c:1000 ../pidgin/gtkaccount.c:2479
+#: ../pidgin/gtkaccount.c:2486
 msgid "Authorize buddy?"
-msgstr "Autoriseerida sõber?"
-
-#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2581 ../pidgin/gtkaccount.c:2587
+msgstr "Kas autoriseerida sõber?"
+
+#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
+#: ../pidgin/gtkaccount.c:2480 ../pidgin/gtkaccount.c:2487
 msgid "Authorize"
 msgstr "Autoriseeri"
 
-#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2582 ../pidgin/gtkaccount.c:2588
+#: ../finch/gntaccount.c:978 ../finch/gntaccount.c:1005
+#: ../pidgin/gtkaccount.c:2481 ../pidgin/gtkaccount.c:2488
 msgid "Deny"
 msgstr "Keela"
 
-#: ../finch/gntblist.c:289
+#: ../finch/gntblist.c:265
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"Ühendunuid: %d\n"
+"Kokku: %d"
+
+#: ../finch/gntblist.c:274
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Konto: %s (%s)"
+
+#: ../finch/gntblist.c:286
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"Viimati nähtud: %s tagasi"
+
+#: ../finch/gntblist.c:306 ../pidgin/gtkprefs.c:327
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
+msgid "Default"
+msgstr "Vaikimisi"
+
+#: ../finch/gntblist.c:563
 msgid "You must provide a screename for the buddy."
 msgstr "Sa pead sõbrale ekraaninime määrama."
 
-#: ../finch/gntblist.c:291
+#: ../finch/gntblist.c:565
 msgid "You must provide a group."
 msgstr "Sa pead grupi määrama."
 
-#: ../finch/gntblist.c:293
+#: ../finch/gntblist.c:567
 msgid "You must select an account."
 msgstr "Sa pead konto valima."
 
-#: ../finch/gntblist.c:295
+#: ../finch/gntblist.c:569
 msgid "The selected account is not online."
 msgstr "Valitud konto pole hetkel võrgus."
 
-#: ../finch/gntblist.c:300
+#: ../finch/gntblist.c:574
 msgid "Error adding buddy"
 msgstr "Viga sõbra lisamisel"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2898
-#: ../pidgin/gtkaccount.c:1986 ../pidgin/gtksavedstatuses.c:986
+#: ../finch/gntblist.c:601 ../libpurple/protocols/oscar/oscar.c:2949
+#: ../pidgin/gtkaccount.c:1914 ../pidgin/gtksavedstatuses.c:971
 msgid "Screen Name"
 msgstr "Ekraaninimi"
 
-#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1551
-#: ../libpurple/protocols/msnp9/msn.c:1402
-#: ../libpurple/protocols/silc/chat.c:610
-#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1037
-#: ../pidgin/gtkdialogs.c:1061 ../pidgin/gtkdialogs.c:1083
-#: ../pidgin/gtkrequest.c:328
-msgid "Alias"
-msgstr "Alias"
-
-#: ../finch/gntblist.c:331 ../finch/gntblist.c:413
-msgid "Group"
-msgstr "Grupp"
-
-#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntblist.c:2210 ../finch/gntblist.c:2274 ../finch/gntnotify.c:174
-#: ../finch/gntstatus.c:576 ../libpurple/plugins/idle.c:153
-#: ../libpurple/plugins/idle.c:190 ../pidgin/gtkblist.c:3242
-#: ../pidgin/gtknotify.c:512 ../pidgin/gtkpounce.c:1288
-#: ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../finch/gntblist.c:604
+msgid "Alias (optional)"
+msgstr "Alias (valikuline)"
+
+#: ../finch/gntblist.c:607
+msgid "Add in group"
+msgstr ""
+
+#: ../finch/gntblist.c:611 ../finch/gntblist.c:678 ../finch/gntblist.c:1648
+#: ../finch/gntblist.c:2583 ../finch/gntblist.c:2637 ../finch/gntblist.c:2702
+#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:3200 ../pidgin/gtknotify.c:517
+#: ../pidgin/gtkpounce.c:1281 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Konto"
 
-#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
+#: ../finch/gntblist.c:617 ../finch/gntblist.c:1126
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1030
 #: ../libpurple/protocols/silc/buddy.c:1075
@@ -361,189 +388,211 @@
 #: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/buddy.c:1083
 #: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/yahoo.c:3354 ../pidgin/gtkblist.c:6140
+#: ../libpurple/protocols/yahoo/yahoo.c:3380 ../pidgin/gtkblist.c:6297
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Sõbra lisamine"
 
-#: ../finch/gntblist.c:341
+#: ../finch/gntblist.c:617
 msgid "Please enter buddy information."
 msgstr "Palun sisesta sõbra andmed."
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
+#: ../finch/gntblist.c:647 ../libpurple/blist.c:1237
 msgid "Chats"
 msgstr "Jututoad"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../finch/gntblist.c:2205
-#: ../libpurple/protocols/jabber/jabber.c:951
-#: ../libpurple/protocols/jabber/jabber.c:954
-#: ../libpurple/protocols/msn/msn.c:1732 ../libpurple/protocols/msn/msn.c:1797
-#: ../libpurple/protocols/msn/msn.c:1824
-#: ../libpurple/protocols/msnp9/msn.c:1585
-#: ../libpurple/protocols/msnp9/msn.c:1650
-#: ../libpurple/protocols/msnp9/msn.c:1677
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:608
-#: ../pidgin/gtkroomlist.c:931
+#: ../finch/gntblist.c:684 ../finch/gntblist.c:2578 ../finch/gntblist.c:2632
+#: ../finch/gntroomlist.c:298 ../libpurple/protocols/jabber/jabber.c:981
+#: ../libpurple/protocols/jabber/jabber.c:984
+#: ../libpurple/protocols/msn/msn.c:1740 ../libpurple/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msn/msn.c:1832
+#: ../libpurple/protocols/msnp9/msn.c:1596
+#: ../libpurple/protocols/msnp9/msn.c:1661
+#: ../libpurple/protocols/msnp9/msn.c:1688
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:652
+#: ../pidgin/gtkroomlist.c:749
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Nimi"
 
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
+#: ../finch/gntblist.c:687 ../finch/gntblist.c:1589
+#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msnp9/msn.c:1413
+#: ../libpurple/protocols/silc/chat.c:610
+#: ../libpurple/protocols/silc10/chat.c:590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
+#: ../libpurple/protocols/zephyr/zephyr.c:792
+#: ../libpurple/protocols/zephyr/zephyr.c:1167 ../pidgin/gtkdialogs.c:1015
+#: ../pidgin/gtkdialogs.c:1039 ../pidgin/gtkdialogs.c:1061
+#: ../pidgin/gtkrequest.c:280
+msgid "Alias"
+msgstr "Alias"
+
+#: ../finch/gntblist.c:690 ../finch/gntblist.c:2835
+msgid "Group"
+msgstr "Grupp"
+
+#: ../finch/gntblist.c:693 ../finch/gntblist.c:1093
 msgid "Auto-join"
 msgstr "Automaatühendumine"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6524
+#: ../finch/gntblist.c:696 ../finch/gntblist.c:1128 ../pidgin/gtkblist.c:6680
 msgid "Add Chat"
 msgstr "Vestluse lisamine"
 
-#: ../finch/gntblist.c:420
+#: ../finch/gntblist.c:697
 msgid "You can edit more information from the context menu later."
-msgstr ""
-
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
+msgstr "Ülejäänud andmeid on sul võimalik hiljem kontekstimenüüst muuta."
+
+#: ../finch/gntblist.c:710 ../finch/gntblist.c:723
 msgid "Error adding group"
 msgstr "Viga grupi lisamisel"
 
-#: ../finch/gntblist.c:434
+#: ../finch/gntblist.c:711
 msgid "You must give a name for the group to add."
 msgstr "Sa pead lisatavale grupile nime määrama."
 
-#: ../finch/gntblist.c:447
+#: ../finch/gntblist.c:724
 msgid "A group with the name already exists."
 msgstr "Selle nimega grupp on juba olemas."
 
-#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
-#: ../libpurple/protocols/sametime/sametime.c:5442
-#: ../libpurple/protocols/sametime/sametime.c:5530 ../pidgin/gtkblist.c:6635
+#: ../finch/gntblist.c:731 ../finch/gntblist.c:1130
+#: ../libpurple/protocols/sametime/sametime.c:5450
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtkblist.c:6763
 msgid "Add Group"
 msgstr "Grupi lisamine"
 
-#: ../finch/gntblist.c:454
+#: ../finch/gntblist.c:731
 msgid "Enter the name of the group"
 msgstr "Sisesta grupi nimi"
 
-#: ../finch/gntblist.c:802
+#: ../finch/gntblist.c:1076
 msgid "Edit Chat"
 msgstr ""
 
-#: ../finch/gntblist.c:802
+#: ../finch/gntblist.c:1076
 msgid "Please Update the necessary fields."
 msgstr "Palun uuenda tarvilikud väljad."
 
-#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
+#: ../finch/gntblist.c:1077 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Redigeeri"
 
-#: ../finch/gntblist.c:828
+#: ../finch/gntblist.c:1102
 msgid "Edit Settings"
 msgstr "Sätete redigeerimine"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:1138 ../pidgin/gtkutils.c:980
 msgid "Information"
 msgstr "Andmed"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:1138 ../pidgin/gtkutils.c:980
 msgid "Retrieving..."
 msgstr "Vastuvõtmine..."
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:528
+#: ../finch/gntblist.c:1192 ../finch/gntconv.c:591
 #: ../libpurple/protocols/silc/chat.c:903
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Hangi andmeid"
 
-#: ../finch/gntblist.c:908
+#: ../finch/gntblist.c:1196
 msgid "Add Buddy Pounce"
 msgstr "Sõbramärguande lisamine"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:540
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:588
-#: ../pidgin/gtkconv.c:1661
+#: ../finch/gntblist.c:1203 ../finch/gntconv.c:603
+#: ../libpurple/protocols/jabber/si.c:1109
+#: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:588
+#: ../pidgin/gtkconv.c:1650
 msgid "Send File"
 msgstr "Saada fail"
 
-#: ../finch/gntblist.c:919
+#: ../finch/gntblist.c:1210 ../libpurple/protocols/gg/gg.c:1629
+#: ../libpurple/protocols/msn/msn.c:660 ../libpurple/protocols/msnp9/msn.c:562
+msgid "Blocked"
+msgstr "Blokitud"
+
+#: ../finch/gntblist.c:1216 ../finch/gntblist.c:1605
 msgid "View Log"
 msgstr "Logi vaatamine"
 
-#: ../finch/gntblist.c:1000
+#: ../finch/gntblist.c:1298
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Palun sisesta %s jaoks uus nimi"
 
-#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
+#: ../finch/gntblist.c:1300 ../finch/gntblist.c:1589
 msgid "Rename"
 msgstr "Nime muutmine"
 
-#: ../finch/gntblist.c:1002
+#: ../finch/gntblist.c:1300
 msgid "Set Alias"
 msgstr "Määra alias"
 
-#: ../finch/gntblist.c:1003
+#: ../finch/gntblist.c:1301
 msgid "Enter empty string to reset the name."
 msgstr "Nime algkuju määramiseks sisesta tühi string."
 
-#: ../finch/gntblist.c:1079
+#: ../finch/gntblist.c:1415
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "Selle kontakti eemaldamisel kaovad ära ka kõik selle kontakti sõbrad"
 
-#: ../finch/gntblist.c:1087
+#: ../finch/gntblist.c:1423
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr ""
 "Selle grupi eemaldamisel kaovad ära ka kõik selles grupis olevad sõbrad"
 
-#: ../finch/gntblist.c:1092
+#: ../finch/gntblist.c:1428
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Kas sa soovid eemaldada kontot %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1095
+#: ../finch/gntblist.c:1431
 msgid "Confirm Remove"
 msgstr "Eemaldamiskinnitus"
 
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1710 ../pidgin/gtkrequest.c:326
-#: ../pidgin/gtkstatusbox.c:264
+#: ../finch/gntblist.c:1436 ../finch/gntblist.c:1591 ../finch/gntft.c:243
+#: ../pidgin/gtkconv.c:1699 ../pidgin/gtkrequest.c:278
+#: ../pidgin/gtkstatusbox.c:267
 msgid "Remove"
 msgstr "Eemalda"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2432 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:4898
+#: ../finch/gntblist.c:1565 ../finch/gntblist.c:2876 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:95 ../pidgin/gtkblist.c:5036
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Sõbranimekiri"
 
-#: ../finch/gntblist.c:1257
+#: ../finch/gntblist.c:1596
 msgid "Place tagged"
 msgstr ""
 
-#: ../finch/gntblist.c:1262
+#: ../finch/gntblist.c:1601
 msgid "Toggle Tag"
 msgstr ""
 
 #. General
-#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:638
+#: ../finch/gntblist.c:1641 ../libpurple/protocols/gg/gg.c:638
 #: ../libpurple/protocols/gg/gg.c:1052 ../libpurple/protocols/gg/gg.c:1125
 #: ../libpurple/protocols/gg/gg.c:2228
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2217
-#: ../libpurple/protocols/jabber/buddy.c:2409
-#: ../libpurple/protocols/jabber/jabber.c:964
-#: ../libpurple/protocols/jabber/jabber.c:1573
-#: ../libpurple/protocols/jabber/jabber.c:1587
-#: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1615
-#: ../libpurple/protocols/jabber/jabber.c:1629
-#: ../libpurple/protocols/msn/msn.c:1559 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msnp9/msn.c:1410
-#: ../libpurple/protocols/msnp9/msn.c:1588
+#: ../libpurple/protocols/jabber/buddy.c:1251
+#: ../libpurple/protocols/jabber/buddy.c:2221
+#: ../libpurple/protocols/jabber/buddy.c:2413
+#: ../libpurple/protocols/jabber/jabber.c:992
+#: ../libpurple/protocols/jabber/jabber.c:1604
+#: ../libpurple/protocols/jabber/jabber.c:1618
+#: ../libpurple/protocols/jabber/jabber.c:1632
+#: ../libpurple/protocols/jabber/jabber.c:1646
+#: ../libpurple/protocols/jabber/jabber.c:1660
+#: ../libpurple/protocols/msn/msn.c:1567 ../libpurple/protocols/msn/msn.c:1743
+#: ../libpurple/protocols/msnp9/msn.c:1421
+#: ../libpurple/protocols/msnp9/msn.c:1599
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1538
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -553,94 +602,83 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3266
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3224
 msgid "Nickname"
 msgstr "Hüüdnimi"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:358
-#: ../libpurple/protocols/jabber/buddy.c:787
-#: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:611 ../libpurple/protocols/msn/msn.c:629
-#: ../libpurple/protocols/msn/msn.c:637 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/msnp9/msn.c:544
+#: ../finch/gntblist.c:1663 ../finch/gntprefs.c:261
+#: ../libpurple/protocols/bonjour/bonjour.c:376
+#: ../libpurple/protocols/jabber/buddy.c:789
+#: ../libpurple/protocols/jabber/buddy.c:953
+#: ../libpurple/protocols/msn/msn.c:607 ../libpurple/protocols/msn/msn.c:625
+#: ../libpurple/protocols/msn/msn.c:633 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msnp9/msn.c:541
 #: ../libpurple/protocols/msnp9/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2842
-#: ../libpurple/protocols/oscar/oscar.c:2922
-#: ../libpurple/protocols/yahoo/yahoo.c:3108
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3294
-#: ../pidgin/gtkblist.c:3700 ../pidgin/gtkprefs.c:2026
+#: ../libpurple/protocols/novell/novell.c:2843
+#: ../libpurple/protocols/oscar/oscar.c:2973
+#: ../libpurple/protocols/yahoo/yahoo.c:3134
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3252
+#: ../pidgin/gtkblist.c:3702 ../pidgin/gtkprefs.c:1946
 msgid "Idle"
 msgstr "Jõude"
 
-#: ../finch/gntblist.c:1334
+#: ../finch/gntblist.c:1677
 msgid "On Mobile"
 msgstr ""
 
-#: ../finch/gntblist.c:1415
-#, c-format
-msgid ""
-"Online: %d\n"
-"Total: %d"
-msgstr ""
-"Ühendunuid: %d\n"
-"Kokku: %d"
-
-#: ../finch/gntblist.c:1424
-#, c-format
-msgid "Account: %s (%s)"
-msgstr "Konto: %s (%s)"
-
-#: ../finch/gntblist.c:1436
-#, c-format
-msgid ""
-"\n"
-"Last Seen: %s ago"
-msgstr ""
-"\n"
-"Viimati nähtud: %s tagasi"
-
-#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:582
+#: ../finch/gntblist.c:1976 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "Uus..."
 
-#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:583
+#: ../finch/gntblist.c:1983 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "Salvestatud..."
 
-#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:345 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:716 ../pidgin/gtkplugin.c:555
+#: ../finch/gntblist.c:2437 ../finch/gntplugin.c:352 ../finch/gntui.c:100
+#: ../pidgin/gtkdocklet.c:717 ../pidgin/gtkplugin.c:601
 msgid "Plugins"
 msgstr "Pluginad"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:781
-msgid "New Instant Message"
-msgstr "Uus välksõnum"
-
-#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:783
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr ""
-"Palun sisesta isiku ekraaninimi või alias, kellega soovid välksõnumeid "
-"vahetada."
+#: ../finch/gntblist.c:2591 ../finch/gntblist.c:2596
+msgid "Block/Unblock"
+msgstr "Bloki/Eemalda blokk"
+
+#: ../finch/gntblist.c:2592 ../libpurple/protocols/gg/gg.c:1665
+msgid "Block"
+msgstr "Bloki"
+
+#: ../finch/gntblist.c:2593 ../libpurple/protocols/gg/gg.c:1661
+msgid "Unblock"
+msgstr "Võta blokeering maha"
+
+#: ../finch/gntblist.c:2598
+msgid ""
+"Please enter the screen name or alias of the person you would like to Block/"
+"Unblock."
+msgstr ""
+"Palun sisesta isiku ekraaninimi või alias, keda sa soovid blokkida või "
+"kellelt sa soovid blokki eemaldada."
 
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2223 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
-#: ../finch/gntnotify.c:80 ../libpurple/account.c:1104
-#: ../libpurple/account.c:1393 ../libpurple/protocols/gg/gg.c:507
+#: ../finch/gntblist.c:2601 ../finch/gntblist.c:2650 ../finch/gntcertmgr.c:89
+#: ../finch/gntconn.c:137 ../finch/gntnotify.c:80
+#: ../finch/plugins/gnthistory.c:177 ../libpurple/account.c:1115
+#: ../libpurple/account.c:1418 ../libpurple/protocols/gg/gg.c:507
 #: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1745
+#: ../libpurple/protocols/jabber/jabber.c:1776
 #: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
-#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
-#: ../libpurple/protocols/msnp9/msn.c:286
-#: ../libpurple/protocols/msnp9/msn.c:303
-#: ../libpurple/protocols/msnp9/msn.c:320
-#: ../libpurple/protocols/msnp9/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6143
+#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
+#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/msnp9/msn.c:283
+#: ../libpurple/protocols/msnp9/msn.c:300
+#: ../libpurple/protocols/msnp9/msn.c:317
+#: ../libpurple/protocols/msnp9/msn.c:334
+#: ../libpurple/protocols/myspace/user.c:581
+#: ../libpurple/protocols/myspace/user.c:675
+#: ../libpurple/protocols/oscar/oscar.c:6196
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1193
 #: ../libpurple/protocols/silc/chat.c:449
@@ -655,86 +693,117 @@
 #: ../libpurple/protocols/silc10/chat.c:464
 #: ../libpurple/protocols/silc10/chat.c:729
 #: ../libpurple/protocols/silc10/ops.c:1297
-#: ../libpurple/protocols/silc10/ops.c:1903
-#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1033
-#: ../libpurple/protocols/yahoo/yahoo.c:3508
-#: ../libpurple/protocols/yahoo/yahoo.c:3519 ../pidgin/gtkcertmgr.c:195
-#: ../pidgin/gtkdialogs.c:786 ../pidgin/gtkdialogs.c:925
-#: ../pidgin/gtkdialogs.c:1017 ../pidgin/gtkrequest.c:320
+#: ../libpurple/protocols/silc10/ops.c:1909
+#: ../libpurple/protocols/silc10/silc.c:741
+#: ../libpurple/protocols/yahoo/yahoo.c:992
+#: ../libpurple/protocols/yahoo/yahoo.c:3534
+#: ../libpurple/protocols/yahoo/yahoo.c:3545 ../pidgin/gtkcertmgr.c:195
+#: ../pidgin/gtkdialogs.c:764 ../pidgin/gtkdialogs.c:903
+#: ../pidgin/gtkdialogs.c:995 ../pidgin/gtkrequest.c:272
 msgid "OK"
 msgstr "Olgu"
 
-#: ../finch/gntblist.c:2270
+#: ../finch/gntblist.c:2645 ../pidgin/gtkdialogs.c:759
+msgid "New Instant Message"
+msgstr "Uus välksõnum"
+
+#: ../finch/gntblist.c:2647 ../pidgin/gtkdialogs.c:761
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
+msgstr ""
+"Palun sisesta isiku ekraaninimi või alias, kellega soovid välksõnumeid "
+"vahetada."
+
+#: ../finch/gntblist.c:2698
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../finch/gntblist.c:2282 ../pidgin/gtkblist.c:940
+#: ../finch/gntblist.c:2710 ../pidgin/gtkblist.c:951
 msgid "Join a Chat"
 msgstr "Vestlusega ühinemine"
 
-#: ../finch/gntblist.c:2284
+#: ../finch/gntblist.c:2712
 msgid "Please enter the name of the chat you want to join."
 msgstr "Palun sisesta vestluse nimi, millega soovid ühineda."
 
-#: ../finch/gntblist.c:2286 ../finch/gntnotify.c:394
+#: ../finch/gntblist.c:2714 ../finch/gntnotify.c:394
 msgid "Join"
 msgstr "Ühine"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2324 ../finch/gntpounce.c:460 ../pidgin/gtkpounce.c:810
+#: ../finch/gntblist.c:2759 ../finch/gntpounce.c:459 ../pidgin/gtkpounce.c:802
 msgid "Options"
 msgstr "Valikud"
 
-#: ../finch/gntblist.c:2330
+#: ../finch/gntblist.c:2765
 msgid "Send IM..."
 msgstr "Saada välksõnum..."
 
-#: ../finch/gntblist.c:2335
+#: ../finch/gntblist.c:2770
+msgid "Block/Unblock..."
+msgstr "Bloki/Eemalda blokk..."
+
+#: ../finch/gntblist.c:2775
 msgid "Join Chat..."
 msgstr "Ühine vestlusega..."
 
-#: ../finch/gntblist.c:2340
+#: ../finch/gntblist.c:2780
 msgid "Show"
 msgstr "Näita"
 
-#: ../finch/gntblist.c:2345
+#: ../finch/gntblist.c:2785
 msgid "Empty groups"
 msgstr "Tühje gruppe"
 
-#: ../finch/gntblist.c:2352
+#: ../finch/gntblist.c:2792
 msgid "Offline buddies"
 msgstr "Ühendamata sõpru"
 
-#: ../finch/gntblist.c:2359
+#: ../finch/gntblist.c:2799
 msgid "Sort"
 msgstr "Sordi"
 
-#: ../finch/gntblist.c:2364
+#: ../finch/gntblist.c:2804
 msgid "By Status"
 msgstr "Oleku järgi"
 
-#: ../finch/gntblist.c:2369 ../pidgin/gtkblist.c:4191
+#: ../finch/gntblist.c:2809 ../pidgin/gtkblist.c:4193
 msgid "Alphabetically"
 msgstr "Tähestikuliselt"
 
-#: ../finch/gntblist.c:2374
+#: ../finch/gntblist.c:2814
 msgid "By Log Size"
 msgstr "Logi suuruse järgi"
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+#: ../finch/gntblist.c:2825
+msgid "Buddy"
+msgstr "Sõber"
+
+#: ../finch/gntblist.c:2830 ../libpurple/protocols/oscar/oscar.c:647
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:549
+msgid "Chat"
+msgstr "Vestlus"
+
+#: ../finch/gntblist.c:2840 ../finch/plugins/grouping.c:255
+msgid "Grouping"
+msgstr "Grupeerimine"
+
+#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
 msgstr "Sertifikaadi importimine"
 
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
-msgstr "Määra hostinimi"
-
-#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
+msgstr "Hostinime määramine"
+
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
 msgstr "Sisesta hostinimi, mille kohta see sertifikaat mõeldud on."
 
-#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
+#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
@@ -743,19 +812,19 @@
 "Faili %s pole võimalik importida.\n"
 "Veendu, et fail on loetav ja et see on PEM-vormingus.\n"
 
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
 msgstr "Sertifikaadi importimise viga"
 
-#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
 msgstr "Tõrge X.509 sertifikaadi importimisel"
 
-#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
+#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
 msgstr "PEM-vormingus sertifikaadi valimine"
 
-#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
+#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
@@ -764,24 +833,24 @@
 "Tõrge faili %s eksportimisel.\n"
 "Veendu, et sul on lubatud sihtkohta kirjutada\n"
 
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
 msgstr "Sertifikaadi eksportimise viga"
 
-#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
 msgstr "Tõrge X.509 sertifikaadi eksportimisel"
 
-#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
+#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
 msgid "PEM X.509 Certificate Export"
 msgstr "PEM X.509 sertifikaadi eksportimine"
 
-#: ../finch/gntcertmgr.c:188
+#: ../finch/gntcertmgr.c:187
 #, c-format
 msgid "Certificate for %s"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:195
+msgstr "\"%s\" sertifikaat"
+
+#: ../finch/gntcertmgr.c:194
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -794,57 +863,57 @@
 "SHA1-sõrmejälg:\n"
 "%s"
 
-#: ../finch/gntcertmgr.c:198
+#: ../finch/gntcertmgr.c:197
 msgid "SSL Host Certificate"
 msgstr "SSL-hosti sertifikaat"
 
-#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
+#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:371
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
+msgstr "Kas kustutada \"%s\" sertifikaat?"
+
+#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:373
 msgid "Confirm certificate delete"
 msgstr "Sertifikaadi kustutamise kinnitus"
 
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:603
+#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:613
 msgid "Certificate Manager"
 msgstr "Sertifikaadihaldur"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:670
+#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:694
 #: ../libpurple/protocols/silc/silc.c:1150
-#: ../libpurple/protocols/silc10/silc.c:918
+#: ../libpurple/protocols/silc10/silc.c:924 ../pidgin/gtkcertmgr.c:446
 msgid "Hostname"
 msgstr "Hostinimi"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1689
-#: ../pidgin/gtkdebug.c:840
+#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1678
+#: ../pidgin/gtkdebug.c:832
 msgid "Info"
 msgstr "Andmed"
 
 #. Close button
-#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:213 ../finch/gntplugin.c:406 ../finch/gntpounce.c:751
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:407
-#: ../libpurple/protocols/msnp9/msn.c:403
+#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:253 ../finch/gntnotify.c:182
+#: ../finch/gntplugin.c:220 ../finch/gntplugin.c:413 ../finch/gntpounce.c:750
+#: ../finch/gntroomlist.c:275 ../finch/gntstatus.c:216
+#: ../libpurple/protocols/msn/msn.c:403 ../libpurple/protocols/msnp9/msn.c:400
 #: ../libpurple/protocols/silc/util.c:388
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2474
-#: ../pidgin/gtkrequest.c:323
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2373
+#: ../pidgin/gtkrequest.c:275
 msgid "Close"
 msgstr "Sulge"
 
-#: ../finch/gntconn.c:125
+#: ../finch/gntconn.c:126
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:128
+#: ../finch/gntconn.c:129
 #, c-format
 msgid "%s disconnected."
 msgstr "%s katkestas ühenduse"
 
-#: ../finch/gntconn.c:129
+#: ../finch/gntconn.c:130
 #, c-format
 msgid ""
 "%s\n"
@@ -857,49 +926,57 @@
 "Finch ei proovi kontot automaatselt ühendada enne, kui sa pole viga "
 "kõrvaldanud ja kontot uuesti kasutusele võtnud."
 
-#: ../finch/gntconn.c:138
+#: ../finch/gntconn.c:139
 msgid "Re-enable Account"
 msgstr "Konto taaslubamine"
 
-#: ../finch/gntconv.c:137
+#: ../finch/gntconn.c:156
+msgid ""
+"The account has disconnected and you are no longer in this chat. You will be "
+"automatically rejoined in the chat when the account reconnects."
+msgstr ""
+"Konto ühendus on katkenud ja sa pole enam selle vestluse osaline. Konto "
+"taasühendamisel ühendatakse sina ka automaatselt selle vestlusega."
+
+#: ../finch/gntconv.c:159
 msgid "No such command."
 msgstr "Sellist käsku pole."
 
-#: ../finch/gntconv.c:141 ../pidgin/gtkconv.c:531
+#: ../finch/gntconv.c:163 ../pidgin/gtkconv.c:492
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "Süntaksi viga:  Sa sisestasid selle käsu jaoks vale arvu argumente."
-
-#: ../finch/gntconv.c:146 ../pidgin/gtkconv.c:537
+msgstr "Süntaksi viga:  Sa sisestasid selle käsule vale arvu argumente."
+
+#: ../finch/gntconv.c:168 ../pidgin/gtkconv.c:498
 msgid "Your command failed for an unknown reason."
 msgstr "Tõrge sinu käsu täitmisel, tõrke põhjus on teadmata."
 
-#: ../finch/gntconv.c:151 ../pidgin/gtkconv.c:544
+#: ../finch/gntconv.c:173 ../pidgin/gtkconv.c:505
 msgid "That command only works in chats, not IMs."
 msgstr "See käsk toimib ainult vestlustes, välksõnumites aga mitte."
 
-#: ../finch/gntconv.c:154 ../pidgin/gtkconv.c:547
+#: ../finch/gntconv.c:176 ../pidgin/gtkconv.c:508
 msgid "That command only works in IMs, not chats."
 msgstr "See käsk toimib ainult välksõnumites, vestlustes aga mitte."
 
-#: ../finch/gntconv.c:158 ../pidgin/gtkconv.c:552
+#: ../finch/gntconv.c:180 ../pidgin/gtkconv.c:513
 msgid "That command doesn't work on this protocol."
 msgstr "See käsk ei toimi selle protokolliga."
 
-#: ../finch/gntconv.c:166
+#: ../finch/gntconv.c:188
 msgid "Message was not sent, because you are not signed on."
 msgstr "Sõnumit ei saadetud kuna sa pole sisse logitud."
 
-#: ../finch/gntconv.c:245
+#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s"
 
-#: ../finch/gntconv.c:268
+#: ../finch/gntconv.c:291
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:273 ../finch/gntconv.c:795
+#: ../finch/gntconv.c:296 ../finch/gntconv.c:880 ../pidgin/gtkconv.c:3479
 #, c-format
 msgid ""
 "\n"
@@ -908,69 +985,73 @@
 "\n"
 "%s tipib..."
 
-#: ../finch/gntconv.c:292
+#: ../finch/gntconv.c:315
 msgid "You have left this chat."
 msgstr "Sa lahkusid sellest vestlusest."
 
-#: ../finch/gntconv.c:408 ../pidgin/gtkconv.c:1416
+#: ../finch/gntconv.c:433 ../pidgin/gtkconv.c:1384
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Logimine käivitatud. Alatest käesolevast hetkest logitakse selle vestluse "
 "kõik sõnumid."
 
-#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1424
+#: ../finch/gntconv.c:437 ../pidgin/gtkconv.c:1392
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Logimine lõpetatud. Alatest käesolevast hetkest selle vestluse sõnumeid enam "
 "ei logita."
 
-#: ../finch/gntconv.c:463
+#: ../finch/gntconv.c:523
 msgid "Send To"
 msgstr "Kellele saata"
 
-#: ../finch/gntconv.c:507
+#: ../finch/gntconv.c:568
 msgid "Conversation"
 msgstr "Vestlus"
 
-#: ../finch/gntconv.c:513
+#: ../finch/gntconv.c:574
 msgid "Clear Scrollback"
 msgstr "Puhasta tagasikerimine"
 
-#: ../finch/gntconv.c:517 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:578 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Ajatempleid näidatakse"
 
-#: ../finch/gntconv.c:533
+#: ../finch/gntconv.c:596
 msgid "Add Buddy Pounce..."
 msgstr "Lisa sõbramärguanne..."
 
-#: ../finch/gntconv.c:548
+#: ../finch/gntconv.c:611
+msgid "View Log..."
+msgstr "Vaata logi..."
+
+#: ../finch/gntconv.c:615
 msgid "Enable Logging"
 msgstr "Luba logimine"
 
-#: ../finch/gntconv.c:554
+#: ../finch/gntconv.c:621
 msgid "Enable Sounds"
 msgstr "Luba helid"
 
-#: ../finch/gntconv.c:760
+#: ../finch/gntconv.c:833
 msgid "<AUTO-REPLY> "
 msgstr "<AUTOMAATVASTUS> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:883
+#: ../finch/gntconv.c:968
 msgid "List of users:\n"
 msgstr "Kasutajate nimekiri:\n"
 
-#: ../finch/gntconv.c:1045 ../pidgin/gtkconv.c:371
+#: ../finch/gntconv.c:1130 ../pidgin/gtkconv.c:337
 msgid "Supported debug options are:  version"
 msgstr "Toetatud silumisvalikud on:  version"
 
-#: ../finch/gntconv.c:1081 ../pidgin/gtkconv.c:423
+#: ../finch/gntconv.c:1166 ../pidgin/gtkconv.c:389
 msgid "No such command (in this context)."
 msgstr "Sellist käsku pole (selles kontekstis)."
 
-#: ../finch/gntconv.c:1084 ../pidgin/gtkconv.c:426
+#: ../finch/gntconv.c:1169 ../pidgin/gtkconv.c:392
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -978,7 +1059,7 @@
 "Kasuta \"/help &lt;käsk&gt;\" selle käsu abiteabe saamiseks.\n"
 "Sellest kontekstis on saadaval järgnevad käsud:\n"
 
-#: ../finch/gntconv.c:1142 ../pidgin/gtkconv.c:7755
+#: ../finch/gntconv.c:1242 ../pidgin/gtkconv.c:7778
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -986,58 +1067,58 @@
 "say &lt;message&gt;:  Sõnumi saatmine nagu tehtaks seda ilma käsku "
 "kasutamata."
 
-#: ../finch/gntconv.c:1145 ../pidgin/gtkconv.c:7758
+#: ../finch/gntconv.c:1245 ../pidgin/gtkconv.c:7781
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;action&gt;:  IRC-stiilis tegevus sõbrale või vestlusele."
 
-#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7761
+#: ../finch/gntconv.c:1248 ../pidgin/gtkconv.c:7784
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;võti&gt;:  Silumisteabe saatmine käesolevasse vestlusesse."
 
-#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7764
+#: ../finch/gntconv.c:1251 ../pidgin/gtkconv.c:7787
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Vestluse tagasikerimise puhastamine."
 
-#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7770
+#: ../finch/gntconv.c:1254 ../pidgin/gtkconv.c:7793
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;käsk&gt;:  Abiteave käsu kohta."
 
-#: ../finch/gntconv.c:1157
+#: ../finch/gntconv.c:1257
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Vestluses osalevate kasutajate nimekirja näitamine."
 
-#: ../finch/gntconv.c:1162
+#: ../finch/gntconv.c:1262
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Pluginate akna näitamine."
 
-#: ../finch/gntconv.c:1165
+#: ../finch/gntconv.c:1265
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Sõbranimekirja näitamine."
 
-#: ../finch/gntconv.c:1168
+#: ../finch/gntconv.c:1268
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Kontode akna näitamine."
 
-#: ../finch/gntconv.c:1171
+#: ../finch/gntconv.c:1271
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Silumisakna näitamine."
 
-#: ../finch/gntconv.c:1174
+#: ../finch/gntconv.c:1274
 msgid "prefs: Show the preference window."
 msgstr "prefs: Eelistuste akna näitamine."
 
-#: ../finch/gntconv.c:1177
+#: ../finch/gntconv.c:1277
 msgid "statuses: Show the savedstatuses window."
-msgstr ""
-
-#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2663
-#: ../pidgin/gtkdebug.c:220 ../pidgin/gtkft.c:543
+msgstr "statuses: Salvestatud olekute akna näitamine."
+
+#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:948 ../pidgin/gtkconv.c:2656
+#: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
 msgid "Unable to open file."
 msgstr "Faili pole võimalik avada."
 
-#: ../finch/gntdebug.c:271 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:700
+#: ../finch/gntdebug.c:271 ../finch/gntui.c:98 ../pidgin/gtkdebug.c:689
 msgid "Debug Window"
 msgstr "Silumisaken"
 
@@ -1045,7 +1126,7 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:759
+#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:751
 msgid "Clear"
 msgstr "Puhasta"
 
@@ -1053,124 +1134,185 @@
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:768
+#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:760
 msgid "Pause"
-msgstr "Paus"
-
-#: ../finch/gntft.c:118 ../pidgin/gtkft.c:229
+msgstr "Pausi"
+
+#: ../finch/gntft.c:120 ../pidgin/gtkft.c:229
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "Failiülekanded - %d%% faili %d-st"
 
 #. Create the window.
-#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
-#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
+#: ../finch/gntft.c:125 ../finch/gntft.c:212 ../finch/gntui.c:99
+#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Failiülekanded"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "Edenemine"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "Failinimi"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "Suurus"
 
-#: ../finch/gntft.c:201
+#: ../finch/gntft.c:217
 msgid "Speed"
 msgstr "Kiirus"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "Jäänud"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:362
+#: ../finch/gntft.c:217 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
+#: ../libpurple/protocols/bonjour/bonjour.c:380
 #: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1584
 #: ../libpurple/protocols/gg/gg.c:1592
-#: ../libpurple/protocols/jabber/buddy.c:778
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1538
-#: ../libpurple/protocols/msn/msn.c:621 ../libpurple/protocols/msn/msn.c:631
-#: ../libpurple/protocols/msn/msn.c:636 ../libpurple/protocols/msn/msn.c:639
-#: ../libpurple/protocols/msnp9/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2852
-#: ../libpurple/protocols/oscar/oscar.c:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2710
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/sametime/sametime.c:3305
-#: ../libpurple/protocols/sametime/sametime.c:4196
-#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkblist.c:3338
-#: ../pidgin/gtkblist.c:3352 ../pidgin/gtkblist.c:3354
-#: ../pidgin/gtksavedstatuses.c:1005 ../pidgin/gtksavedstatuses.c:1150
+#: ../libpurple/protocols/jabber/buddy.c:780
+#: ../libpurple/protocols/jabber/buddy.c:784
+#: ../libpurple/protocols/jabber/buddy.c:943
+#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/msn/msn.c:617 ../libpurple/protocols/msn/msn.c:627
+#: ../libpurple/protocols/msn/msn.c:632 ../libpurple/protocols/msn/msn.c:635
+#: ../libpurple/protocols/msnp9/msn.c:540
+#: ../libpurple/protocols/novell/novell.c:2853
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2761
+#: ../libpurple/protocols/oscar/oscar.c:3813
+#: ../libpurple/protocols/sametime/sametime.c:3313
+#: ../libpurple/protocols/sametime/sametime.c:4204
+#: ../libpurple/protocols/yahoo/yahoo.c:3285 ../pidgin/gtkblist.c:3296
+#: ../pidgin/gtkblist.c:3310 ../pidgin/gtkblist.c:3312
+#: ../pidgin/gtksavedstatuses.c:990 ../pidgin/gtksavedstatuses.c:1134
 msgid "Status"
 msgstr "Olek"
 
-#: ../finch/gntft.c:211
+#: ../finch/gntft.c:227
 msgid "Close this window when all transfers finish"
 msgstr "See aken suletakse ülekannete lõppemisel"
 
-#: ../finch/gntft.c:218
+#: ../finch/gntft.c:234
 msgid "Clear finished transfers"
 msgstr "Lõpetatud ülekanded puhastatakse"
 
-#: ../finch/gntft.c:232
+#: ../finch/gntft.c:248 ../finch/gntroomlist.c:272
 msgid "Stop"
 msgstr "Seiska"
 
-#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
+#: ../finch/gntft.c:321 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:934
 msgid "Waiting for transfer to begin"
 msgstr "Oodatakse ülekande algust"
 
-#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
+#: ../finch/gntft.c:388 ../pidgin/gtkft.c:163 ../pidgin/gtkft.c:1015
 msgid "Canceled"
 msgstr "Tühistatud"
 
-#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:390 ../pidgin/gtkft.c:1017
 msgid "Failed"
 msgstr "Nurjunud"
 
-#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
+#: ../finch/gntft.c:434 ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:431
+#: ../finch/gntft.c:445
 #, c-format
 msgid "The file was saved as %s."
 msgstr "Fail salvestati nimega %s."
 
-#: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
-#: ../pidgin/gtkft.c:1116
+#: ../finch/gntft.c:446 ../finch/gntft.c:447 ../pidgin/gtkft.c:160
+#: ../pidgin/gtkft.c:1077
 msgid "Finished"
 msgstr "Lõpetatud"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:404
-#: ../libpurple/protocols/msnp9/session.c:357
+#: ../finch/gntft.c:452 ../libpurple/protocols/msn/session.c:404
+#: ../libpurple/protocols/msnp9/session.c:356
 msgid "Transferring"
 msgstr "Ülekandmine"
 
+#: ../finch/gntlog.c:183
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr ""
+
+#: ../finch/gntlog.c:186
+#, c-format
+msgid "Conversation with %s on %s"
+msgstr ""
+
+#: ../finch/gntlog.c:231 ../pidgin/gtklog.c:503
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../finch/gntlog.c:271 ../pidgin/gtklog.c:550
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+
+#: ../finch/gntlog.c:275 ../pidgin/gtklog.c:554
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+
+#: ../finch/gntlog.c:278 ../pidgin/gtklog.c:557
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+"Vestluseid logitakse ainult juhul, kui eelistus \"Kõiki vestlusi logitakse\" "
+"on märgitud."
+
+#: ../finch/gntlog.c:284 ../pidgin/gtklog.c:566
+msgid "No logs were found"
+msgstr "Logisid ei leitud"
+
+#: ../finch/gntlog.c:330 ../pidgin/gtklog.c:646
+msgid "Total log size:"
+msgstr "Logide kogusuurus:"
+
+#. Search box *********
+#: ../finch/gntlog.c:338
+msgid "Scroll/Search: "
+msgstr ""
+
+#: ../finch/gntlog.c:382 ../pidgin/gtklog.c:716
+#, c-format
+msgid "Conversations in %s"
+msgstr "Vestlused %s peal"
+
+#: ../finch/gntlog.c:390 ../finch/gntlog.c:447 ../pidgin/gtklog.c:724
+#: ../pidgin/gtklog.c:799
+#, c-format
+msgid "Conversations with %s"
+msgstr "Vestlused - %s"
+
+#: ../finch/gntlog.c:472 ../pidgin/gtklog.c:824
+msgid "System Log"
+msgstr "Süsteemne logi"
+
 #: ../finch/gntnotify.c:165
 msgid "Emails"
-msgstr "E-postid"
+msgstr "E-sõnumid"
 
 #: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "Sulle on e-sõnum!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:519
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:524
 msgid "Sender"
 msgstr "Saatja"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:526
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:531
 msgid "Subject"
 msgstr "Teema"
 
@@ -1181,17 +1323,17 @@
 msgstr[0] "%s (%s) sai %d uue sõnumi."
 msgstr[1] "%s (%s) sai %d uut sõnumit."
 
-#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:342
+#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:346
 msgid "New Mail"
 msgstr "Uus e-sõnum"
 
-#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:949
+#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:959
 #, c-format
 msgid "Info for %s"
 msgstr "Andmed: %s"
 
 #: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:950
+#: ../pidgin/gtknotify.c:960
 msgid "Buddy Information"
 msgstr "Sõbra andmed"
 
@@ -1199,11 +1341,11 @@
 msgid "Continue"
 msgstr "Jätka"
 
-#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1650
+#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1639
 msgid "IM"
 msgstr "Välksõnum"
 
-#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3515
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3523
 msgid "Invite"
 msgstr "Kutsu"
 
@@ -1211,19 +1353,19 @@
 msgid "(none)"
 msgstr "(puudub)"
 
-#: ../finch/gntplugin.c:77 ../finch/gntplugin.c:86
+#: ../finch/gntplugin.c:84 ../finch/gntplugin.c:93
 msgid "ERROR"
 msgstr "VIGA"
 
-#: ../finch/gntplugin.c:77
+#: ../finch/gntplugin.c:84
 msgid "loading plugin failed"
 msgstr "tõrge plugina laadimisel"
 
-#: ../finch/gntplugin.c:86
+#: ../finch/gntplugin.c:93
 msgid "unloading plugin failed"
 msgstr "tõrge plugina mälust välja laadimisel"
 
-#: ../finch/gntplugin.c:132
+#: ../finch/gntplugin.c:139
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1240,40 +1382,40 @@
 "Veebisait: %s\n"
 "Failinimi: %s\n"
 
-#: ../finch/gntplugin.c:190
+#: ../finch/gntplugin.c:197
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Enne plugina seadistamist peab see olema laaditud."
 
-#: ../finch/gntplugin.c:238
+#: ../finch/gntplugin.c:245
 msgid "No configuration options for this plugin."
 msgstr "Sellel pluginal pole sedistamisvalikuid."
 
-#: ../finch/gntplugin.c:259
+#: ../finch/gntplugin.c:266
 msgid "Error loading plugin"
 msgstr "Viga plugina laadimisel"
 
-#: ../finch/gntplugin.c:260
+#: ../finch/gntplugin.c:267
 msgid "The selected file is not a valid plugin."
 msgstr "Valitud fail pole korrektne plugin."
 
-#: ../finch/gntplugin.c:261
+#: ../finch/gntplugin.c:268
 msgid ""
 "Please open the debug window and try again to see the exact error message."
-msgstr ""
-
-#: ../finch/gntplugin.c:324
+msgstr "Palun ava silumisaken ja proovi sealt leida täpne veateade."
+
+#: ../finch/gntplugin.c:331
 msgid "Select plugin to install"
 msgstr "Plugina valimine paigaldamiseks"
 
-#: ../finch/gntplugin.c:350
+#: ../finch/gntplugin.c:357
 msgid "You can (un)load plugins from the following list."
 msgstr "Selle nimekirja abil saab pluginaid aktiveerida ja deaktiveerida"
 
-#: ../finch/gntplugin.c:401
+#: ../finch/gntplugin.c:408
 msgid "Install Plugin..."
 msgstr "Paigalda plugin..."
 
-#: ../finch/gntplugin.c:411
+#: ../finch/gntplugin.c:418
 msgid "Configure Plugin"
 msgstr "Seadista pluginat"
 
@@ -1282,186 +1424,186 @@
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:467 ../finch/gntplugin.c:474 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:717 ../pidgin/gtkprefs.c:2169
+#: ../finch/gntplugin.c:524 ../finch/gntplugin.c:531 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:103 ../pidgin/gtkdocklet.c:718 ../pidgin/gtkprefs.c:2070
 msgid "Preferences"
 msgstr "Eelistused"
 
-#: ../finch/gntpounce.c:194 ../pidgin/gtkpounce.c:256
+#: ../finch/gntpounce.c:193 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Palun sisesta sõber, kelle kohta märguanne seatakse."
 
-#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
+#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "Uus sõbramärguanne"
 
-#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
+#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "Sõbramärguande redigeerimine"
 
-#: ../finch/gntpounce.c:344
+#: ../finch/gntpounce.c:343
 msgid "Pounce Who"
 msgstr "Kellest märku antakse"
 
 #. Account:
-#: ../finch/gntpounce.c:347 ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:346 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Konto:"
 
-#: ../finch/gntpounce.c:369
+#: ../finch/gntpounce.c:368
 msgid "Buddy name:"
 msgstr "Sõbra nimi:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:387 ../pidgin/gtkpounce.c:600
+#: ../finch/gntpounce.c:386 ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr "Märguanne, kui sõber..."
 
-#: ../finch/gntpounce.c:389
+#: ../finch/gntpounce.c:388
 msgid "Signs on"
 msgstr "Logib sisse"
 
+#: ../finch/gntpounce.c:389
+msgid "Signs off"
+msgstr "Logib välja"
+
 #: ../finch/gntpounce.c:390
-msgid "Signs off"
-msgstr "Logib välja"
+msgid "Goes away"
+msgstr "Eemaldub"
 
 #: ../finch/gntpounce.c:391
-msgid "Goes away"
-msgstr "Eemaldub"
+msgid "Returns from away"
+msgstr "Pöördub eemalolekust tagasi"
 
 #: ../finch/gntpounce.c:392
-msgid "Returns from away"
-msgstr "Pöördub eemalolekust tagasi"
+msgid "Becomes idle"
+msgstr "Jääb jõude"
 
 #: ../finch/gntpounce.c:393
-msgid "Becomes idle"
-msgstr "Jääb jõude"
+msgid "Is no longer idle"
+msgstr "Naaseb jõudeolekust"
 
 #: ../finch/gntpounce.c:394
-msgid "Is no longer idle"
-msgstr "Naaseb jõudeolekust"
-
-#: ../finch/gntpounce.c:395
 msgid "Starts typing"
 msgstr "Alustab tippimist"
 
-#: ../finch/gntpounce.c:396
+#: ../finch/gntpounce.c:395
 msgid "Pauses while typing"
 msgstr "Teeb tippimisel pausi"
 
+#: ../finch/gntpounce.c:396
+msgid "Stops typing"
+msgstr "Lõpetab tippimise"
+
 #: ../finch/gntpounce.c:397
-msgid "Stops typing"
-msgstr "Lõpetab tippimise"
-
-#: ../finch/gntpounce.c:398
 msgid "Sends a message"
 msgstr "Saadab sõnumi"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:427 ../pidgin/gtkpounce.c:661
+#: ../finch/gntpounce.c:426 ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "Tegevus"
 
+#: ../finch/gntpounce.c:428
+msgid "Open an IM window"
+msgstr "Avatakse välksõnumi aken"
+
 #: ../finch/gntpounce.c:429
-msgid "Open an IM window"
-msgstr "Avatakse välksõnumi aken"
-
-#: ../finch/gntpounce.c:430
 msgid "Pop up a notification"
 msgstr "Kuvatakse teavituse hüpikakent"
 
-#: ../finch/gntpounce.c:431
+#: ../finch/gntpounce.c:430
 msgid "Send a message"
 msgstr "Saadetakse sõnum"
 
+#: ../finch/gntpounce.c:431
+msgid "Execute a command"
+msgstr "Käivitatakse käsk"
+
 #: ../finch/gntpounce.c:432
-msgid "Execute a command"
-msgstr "Käivitatakse käsk"
-
-#: ../finch/gntpounce.c:433
 msgid "Play a sound"
 msgstr "Mängitakse heli"
 
-#: ../finch/gntpounce.c:461
-msgid "Pounce only when my status is not available"
-msgstr "Märguanne ainult juhul, kui ma pole saadaval"
-
-#: ../finch/gntpounce.c:463 ../pidgin/gtkpounce.c:1301
+#: ../finch/gntpounce.c:460
+msgid "Pounce only when my status is not Available"
+msgstr "Märguanne ainult juhul, kui minu olekuks on \"pole saadaval\""
+
+#: ../finch/gntpounce.c:462 ../pidgin/gtkpounce.c:1294
 msgid "Recurring"
 msgstr "Korduv"
 
-#: ../finch/gntpounce.c:631
+#: ../finch/gntpounce.c:630
 msgid "Cannot create pounce"
 msgstr "Märguannet pole võimalik luua"
 
-#: ../finch/gntpounce.c:632
+#: ../finch/gntpounce.c:631
 msgid "You do not have any accounts."
 msgstr "Sul pole ühtegi kontot."
 
-#: ../finch/gntpounce.c:633
+#: ../finch/gntpounce.c:632
 msgid "You must create an account first before you can create a pounce."
 msgstr "Enne märguande loomist pead Sa omale konto looma."
 
-#: ../finch/gntpounce.c:675 ../pidgin/gtkpounce.c:1116
+#: ../finch/gntpounce.c:674 ../pidgin/gtkpounce.c:1108
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Kas sa soovid kustutada %2$s märguande %1$s kohta?"
 
-#: ../finch/gntpounce.c:709 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1352
+#: ../finch/gntpounce.c:708 ../finch/gntui.c:96 ../pidgin/gtkpounce.c:1337
 msgid "Buddy Pounces"
 msgstr "Sõbramärguanded"
 
-#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1436
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s alustas sulle sõnumi sisestamist (%s)"
 
-#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1482
+#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1438
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s jättis sulle sõnumi sisestamise pooleli (%s)"
 
-#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1484
+#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1440
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s logis sisse (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1486
+#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1442
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s pole enam jõude (%s)"
 
-#: ../finch/gntpounce.c:831 ../pidgin/gtkpounce.c:1488
+#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1444
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s naases eemalolekust (%s)"
 
-#: ../finch/gntpounce.c:833 ../pidgin/gtkpounce.c:1490
+#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1446
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s lõpetas sulle sõnumi sisestamise (%s)"
 
-#: ../finch/gntpounce.c:835 ../pidgin/gtkpounce.c:1492
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1448
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s logis välja (%s)"
 
-#: ../finch/gntpounce.c:837 ../pidgin/gtkpounce.c:1494
+#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1450
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s jäi jõude (%s)"
 
-#: ../finch/gntpounce.c:839 ../pidgin/gtkpounce.c:1496
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s eemaldus. (%s)"
 
-#: ../finch/gntpounce.c:841 ../pidgin/gtkpounce.c:1498
+#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s saatis sulle sõnumi. (%s)"
 
-#: ../finch/gntpounce.c:842 ../pidgin/gtkpounce.c:1499
+#: ../finch/gntpounce.c:845 ../pidgin/gtkpounce.c:1455
 msgid "Unknown pounce event. Please report this!"
 msgstr "Tundmatu teavitussündmus. Palun anna sellest teada!"
 
@@ -1469,12 +1611,12 @@
 msgid "Based on keyboard use"
 msgstr "Tulenevalt klaviatuuri kasutamisest"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:2031
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1951
 msgid "From last sent message"
 msgstr "Viimatisaadetud sõnumist"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:900 ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:2030 ../pidgin/gtkprefs.c:2044
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:848 ../pidgin/gtkprefs.c:856
+#: ../pidgin/gtkprefs.c:1950 ../pidgin/gtkprefs.c:1964
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Mitte iial"
@@ -1491,15 +1633,15 @@
 msgid "Notify buddies when you are typing"
 msgstr "Sõpru teavitatakse, kui sa oled sõnumit kirjutamas"
 
-#: ../finch/gntprefs.c:198
+#: ../finch/gntprefs.c:198 ../finch/plugins/gnthistory.c:153
 msgid "Log format"
 msgstr "Logi vorming"
 
-#: ../finch/gntprefs.c:199
+#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:143
 msgid "Log IMs"
 msgstr "Välksõnumeid logitakse"
 
-#: ../finch/gntprefs.c:200
+#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:144
 msgid "Log chats"
 msgstr "Vestlusi logitakse"
 
@@ -1524,177 +1666,195 @@
 msgstr "Uueks olekuks saab"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:995 ../pidgin/gtkprefs.c:2135
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:942 ../pidgin/gtkprefs.c:2037
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Vestlused"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1563 ../pidgin/gtkprefs.c:2146
+#: ../finch/gntprefs.c:260 ../finch/plugins/gnthistory.c:151
+#: ../pidgin/gtkprefs.c:1507 ../pidgin/gtkprefs.c:2048
 msgid "Logging"
 msgstr "Logimine"
 
-#: ../finch/gntrequest.c:585
+#: ../finch/gntrequest.c:621
 msgid "Not implemented yet."
 msgstr "Pole veel teostatud."
 
-#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1699
-#: ../pidgin/gtkrequest.c:1745
+#: ../finch/gntrequest.c:726 ../pidgin/gtkrequest.c:1552
+#: ../pidgin/gtkrequest.c:1598
 msgid "Save File..."
 msgstr "Faili salvestamine..."
 
-#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1700
-#: ../pidgin/gtkrequest.c:1746
+#: ../finch/gntrequest.c:726 ../pidgin/gtkrequest.c:1553
+#: ../pidgin/gtkrequest.c:1599
 msgid "Open File..."
 msgstr "Faili avamine..."
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:62
+#: ../finch/gntrequest.c:743
+msgid "Choose Location..."
+msgstr "Asukoha valimine..."
+
+#: ../finch/gntroomlist.c:208
+msgid "Hit 'Enter' to find more rooms of this category."
+msgstr ""
+
+#: ../finch/gntroomlist.c:273
+msgid "Get"
+msgstr ""
+
+#. Create the window.
+#: ../finch/gntroomlist.c:285 ../finch/gntui.c:101 ../pidgin/gtkroomlist.c:530
+msgid "Room List"
+msgstr "Tubade nimekiri"
+
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Sõber logib sisse"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:63
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Sõber logib välja"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "Sõnum võetakse vastu"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "Sõnumi vastuvõtmine alustab vestlust"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "Saadetakse sõnumit"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Isik siseneb jututuppa"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "Isik väljub jututoast"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "Sa kõneled jututoas"
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Teisted kõnelevad jututoas"
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:73
+#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:73
 msgid "Someone says your screen name in chat"
 msgstr "Keegi ütleb vestluses sinu nime"
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:306
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:306
 msgid "GStreamer Failure"
 msgstr "GStreamer'i tõrge"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:307
+#: ../finch/gntsound.c:363 ../pidgin/gtksound.c:307
 msgid "GStreamer failed to initialize."
 msgstr "Tõrge GStreamer'i lähtestamisel."
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1687
-#: ../pidgin/gtkprefs.c:1776 ../pidgin/gtkprefs.c:1972
+#: ../finch/gntsound.c:717 ../finch/gntsound.c:803 ../pidgin/gtkprefs.c:1631
+#: ../pidgin/gtkprefs.c:1720 ../pidgin/gtkprefs.c:1893
 msgid "(default)"
 msgstr "(vaikimisi)"
 
-#: ../finch/gntsound.c:729
+#: ../finch/gntsound.c:730
 msgid "Select Sound File ..."
 msgstr "Helifaili valimine..."
 
-#: ../finch/gntsound.c:904
+#: ../finch/gntsound.c:905
 msgid "Sound Preferences"
 msgstr "Helide eelistused"
 
-#: ../finch/gntsound.c:915
+#: ../finch/gntsound.c:916
 msgid "Profiles"
 msgstr "Profiilid"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1817
+#: ../finch/gntsound.c:955 ../pidgin/gtkprefs.c:1758
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: ../finch/gntsound.c:957
+#: ../finch/gntsound.c:958
 msgid "Console Beep"
 msgstr "Konsoolipiiks"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1821
+#: ../finch/gntsound.c:959 ../pidgin/gtkprefs.c:1762
 msgid "Command"
 msgstr "Käsk"
 
-#: ../finch/gntsound.c:959
+#: ../finch/gntsound.c:960
 msgid "No Sound"
 msgstr "Helid puuduvad"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1812
+#: ../finch/gntsound.c:962 ../pidgin/gtkprefs.c:1753
 msgid "Sound Method"
 msgstr "Helitegemise meetod"
 
-#: ../finch/gntsound.c:966
+#: ../finch/gntsound.c:967
 msgid "Method: "
 msgstr "Meetod: "
 
-#: ../finch/gntsound.c:973
+#: ../finch/gntsound.c:974
 #, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
 "Helitegemise käsk:\n"
-"(%s failinime jaoks)"
+"(failinime jaoks kasuta %s)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1856
+#: ../finch/gntsound.c:982 ../pidgin/gtkprefs.c:1784
 msgid "Sound Options"
 msgstr "Helide valikud"
 
-#: ../finch/gntsound.c:982
+#: ../finch/gntsound.c:983
 msgid "Sounds when conversation has focus"
 msgstr "Heli fookusesse sattumise korral"
 
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:910
-#: ../pidgin/gtkprefs.c:1863 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:846 ../pidgin/gtkprefs.c:858
+#: ../pidgin/gtkprefs.c:1791 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Alati"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1861
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1789
 msgid "Only when available"
 msgstr "Kui ma olen saadaval"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1862
+#: ../finch/gntsound.c:993 ../pidgin/gtkprefs.c:1790
 msgid "Only when not available"
 msgstr "Kui mind pole saadaval"
 
-#: ../finch/gntsound.c:999
+#: ../finch/gntsound.c:1000
 msgid "Volume(0-100):"
 msgstr "Valjus(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1898
+#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1819
 msgid "Sound Events"
 msgstr "Helisündmused"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1957
+#: ../finch/gntsound.c:1021 ../pidgin/gtkprefs.c:1878
 msgid "Event"
 msgstr "Sündmus"
 
-#: ../finch/gntsound.c:1020
+#: ../finch/gntsound.c:1021
 msgid "File"
 msgstr "Fail"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1976
+#: ../finch/gntsound.c:1040 ../pidgin/gtkprefs.c:1897
 msgid "Test"
 msgstr "Proovi"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1980
+#: ../finch/gntsound.c:1043 ../pidgin/gtkprefs.c:1901
 msgid "Reset"
 msgstr "Algväärtusta"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1984
+#: ../finch/gntsound.c:1046 ../pidgin/gtkprefs.c:1905
 msgid "Choose..."
 msgstr "Vali..."
 
@@ -1713,8 +1873,9 @@
 
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
-#: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/msn/msn.c:725
+#: ../libpurple/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/msn/msn.c:733
+#: ../libpurple/protocols/myspace/myspace.c:171
 #: ../libpurple/protocols/novell/novell.c:1493
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
@@ -1733,44 +1894,44 @@
 #. not independent
 #. Attributes - each status can have a message.
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:274
-#: ../libpurple/protocols/bonjour/bonjour.c:281
-#: ../libpurple/protocols/bonjour/bonjour.c:364
+#: ../libpurple/protocols/bonjour/bonjour.c:292
+#: ../libpurple/protocols/bonjour/bonjour.c:299
+#: ../libpurple/protocols/bonjour/bonjour.c:382
 #: ../libpurple/protocols/gg/gg.c:1079 ../libpurple/protocols/gg/gg.c:1587
 #: ../libpurple/protocols/gg/gg.c:1605 ../libpurple/protocols/gg/gg.c:1615
 #: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/gg/gg.c:1630
-#: ../libpurple/protocols/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:238
-#: ../libpurple/protocols/jabber/jabber.c:1570
-#: ../libpurple/protocols/jabber/jabber.c:1584
-#: ../libpurple/protocols/jabber/jabber.c:1598
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1626
-#: ../libpurple/protocols/jabber/jabber.c:1642
-#: ../libpurple/protocols/msn/msn.c:677 ../libpurple/protocols/msn/msn.c:683
-#: ../libpurple/protocols/msn/msn.c:689 ../libpurple/protocols/msn/msn.c:695
-#: ../libpurple/protocols/msn/msn.c:700 ../libpurple/protocols/msn/msn.c:705
+#: ../libpurple/protocols/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:245
+#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1615
+#: ../libpurple/protocols/jabber/jabber.c:1629
+#: ../libpurple/protocols/jabber/jabber.c:1643
+#: ../libpurple/protocols/jabber/jabber.c:1657
+#: ../libpurple/protocols/jabber/jabber.c:1673
+#: ../libpurple/protocols/msn/msn.c:685 ../libpurple/protocols/msn/msn.c:691
+#: ../libpurple/protocols/msn/msn.c:697 ../libpurple/protocols/msn/msn.c:703
+#: ../libpurple/protocols/msn/msn.c:708 ../libpurple/protocols/msn/msn.c:713
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2855
-#: ../libpurple/protocols/novell/novell.c:2958
-#: ../libpurple/protocols/novell/novell.c:2964
-#: ../libpurple/protocols/novell/novell.c:2970
-#: ../libpurple/protocols/oscar/oscar.c:5604
-#: ../libpurple/protocols/oscar/oscar.c:5822
-#: ../libpurple/protocols/oscar/oscar.c:5836
-#: ../libpurple/protocols/oscar/oscar.c:5852
-#: ../libpurple/protocols/oscar/oscar.c:5859
-#: ../libpurple/protocols/oscar/oscar.c:5866
-#: ../libpurple/protocols/sametime/sametime.c:3328
-#: ../libpurple/protocols/sametime/sametime.c:3334
-#: ../libpurple/protocols/sametime/sametime.c:3340
-#: ../libpurple/protocols/sametime/sametime.c:3419
+#: ../libpurple/protocols/novell/novell.c:2856
+#: ../libpurple/protocols/novell/novell.c:2959
+#: ../libpurple/protocols/novell/novell.c:2965
+#: ../libpurple/protocols/novell/novell.c:2971
+#: ../libpurple/protocols/oscar/oscar.c:5657
+#: ../libpurple/protocols/oscar/oscar.c:5875
+#: ../libpurple/protocols/oscar/oscar.c:5889
+#: ../libpurple/protocols/oscar/oscar.c:5905
+#: ../libpurple/protocols/oscar/oscar.c:5912
+#: ../libpurple/protocols/oscar/oscar.c:5919
+#: ../libpurple/protocols/sametime/sametime.c:3336
+#: ../libpurple/protocols/sametime/sametime.c:3342
+#: ../libpurple/protocols/sametime/sametime.c:3348
+#: ../libpurple/protocols/sametime/sametime.c:3427
 #: ../libpurple/protocols/silc/buddy.c:1554
 #: ../libpurple/protocols/silc10/buddy.c:1554
 #: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/yahoo.c:3762
-#: ../libpurple/protocols/yahoo/yahoo.c:3768
-#: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1016
+#: ../libpurple/protocols/yahoo/yahoo.c:3788
+#: ../libpurple/protocols/yahoo/yahoo.c:3794
+#: ../libpurple/protocols/zephyr/zephyr.c:2349
+#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1001
 msgid "Message"
 msgstr "Sõnum"
 
@@ -1809,7 +1970,7 @@
 
 #: ../finch/gntstatus.c:528
 msgid "Edit Status"
-msgstr ""
+msgstr "Oleku redigeerimine"
 
 #: ../finch/gntstatus.c:570
 msgid "Use different status for following accounts"
@@ -1820,15 +1981,15 @@
 msgid "Save & Use"
 msgstr "Salvesta ja kasuta"
 
-#: ../finch/gntui.c:85
+#: ../finch/gntui.c:97
 msgid "Certificates"
 msgstr "Sertifikaadid"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2137
+#: ../finch/gntui.c:102 ../pidgin/gtkprefs.c:2039
 msgid "Sounds"
 msgstr "Helid"
 
-#: ../finch/gntui.c:91
+#: ../finch/gntui.c:104
 msgid "Statuses"
 msgstr "Olekud"
 
@@ -1926,16 +2087,16 @@
 msgid "Toaster plugin"
 msgstr "Röstriplugin"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:125
+#: ../finch/plugins/gnthistory.c:114 ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Vestlused kasutajaga %s, %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:153
+#: ../finch/plugins/gnthistory.c:172 ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "Ajaloo plugina kasutamiseks peab logimine olema lubatud"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:154
+#: ../finch/plugins/gnthistory.c:173 ../pidgin/plugins/history.c:154
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1945,17 +2106,17 @@
 "Logimist on võimalik lubada menüüst Vahendid -> Eelistused -> Logimine.\n"
 "\n"
 "Kui lubada välksõnumite ja/või vestluste logimine, siis on vastavat liiki "
-"jutuajamis(t)e jaoks võimalik aktiveerida ka ajalooplugin."
-
-#: ../finch/plugins/gnthistory.c:179
+"jutuajamis(t)ele võimalik aktiveerida ka ajalooplugin."
+
+#: ../finch/plugins/gnthistory.c:217
 msgid "GntHistory"
 msgstr "GntAjalugu"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:197
+#: ../finch/plugins/gnthistory.c:219 ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Uutes viimase vestluse logi näitamine."
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:198
+#: ../finch/plugins/gnthistory.c:220 ../pidgin/plugins/history.c:198
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1963,6 +2124,48 @@
 "Vestluse avamisel lisab see plugin avatava vestluse aknasse viimase vestluse "
 "logi."
 
+#: ../finch/plugins/grouping.c:42 ../libpurple/protocols/oscar/oscar.c:738
+msgid "Online"
+msgstr "Ühendatud"
+
+#: ../finch/plugins/grouping.c:44 ../finch/plugins/grouping.c:145
+#: ../libpurple/protocols/gg/gg.c:1010
+#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/novell/novell.c:2846
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:5707
+#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
+#: ../libpurple/protocols/qq/qq.c:293
+#: ../libpurple/protocols/yahoo/yahoo.c:3136 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3296 ../pidgin/gtkblist.c:3678
+#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1085
+msgid "Offline"
+msgstr "Ühendamata"
+
+#: ../finch/plugins/grouping.c:117 ../pidgin/gtkblist.c:3335
+msgid "Online Buddies"
+msgstr "Ühendatud sõpru"
+
+#: ../finch/plugins/grouping.c:117
+msgid "Offline Buddies"
+msgstr "Ühendamata sõpru"
+
+#: ../finch/plugins/grouping.c:127
+msgid "Online/Offline"
+msgstr "Ühendatud/Ühendamata"
+
+#: ../finch/plugins/grouping.c:168
+msgid "Meebo"
+msgstr ""
+
+#: ../finch/plugins/grouping.c:217
+msgid "No Grouping"
+msgstr ""
+
+#: ../finch/plugins/grouping.c:257 ../finch/plugins/grouping.c:258
+msgid "Provides alternate buddylist grouping options."
+msgstr "Plugin tagab alternatiivsed valikud sõbranimekirja grupeerimisel."
+
 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr ""
@@ -1980,88 +2183,88 @@
 msgid "Lastlog plugin."
 msgstr "Viimase logi plugin."
 
-#: ../libpurple/account.c:875
+#: ../libpurple/account.c:886
 msgid "accounts"
 msgstr "kontod"
 
-#: ../libpurple/account.c:1050 ../libpurple/protocols/jabber/auth.c:199
+#: ../libpurple/account.c:1061 ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
 msgstr "Sisselogimiseks on vaja parooli"
 
-#: ../libpurple/account.c:1084
+#: ../libpurple/account.c:1095
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Sisesta parool %s jaoks (%s)"
 
-#: ../libpurple/account.c:1091
+#: ../libpurple/account.c:1102
 msgid "Enter Password"
 msgstr "Sisesta parool"
 
-#: ../libpurple/account.c:1096
+#: ../libpurple/account.c:1107
 msgid "Save password"
 msgstr "Salvesta parool"
 
-#: ../libpurple/account.c:1131 ../libpurple/connection.c:105
-#: ../libpurple/connection.c:178
+#: ../libpurple/account.c:1142 ../libpurple/connection.c:118
+#: ../libpurple/connection.c:191
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "%s jaoks pole protokollipluginat"
 
-#: ../libpurple/account.c:1133 ../libpurple/connection.c:108
+#: ../libpurple/account.c:1144 ../libpurple/connection.c:121
 msgid "Connection Error"
 msgstr "Ühenduse viga"
 
-#: ../libpurple/account.c:1330 ../libpurple/protocols/gg/gg.c:708
-#: ../libpurple/protocols/jabber/jabber.c:1698
+#: ../libpurple/account.c:1355 ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/jabber/jabber.c:1729
 msgid "New passwords do not match."
 msgstr "Uued paroolid ei klapi omavahel."
 
-#: ../libpurple/account.c:1339
+#: ../libpurple/account.c:1364
 msgid "Fill out all fields completely."
 msgstr "Täida kõik väljad."
 
-#: ../libpurple/account.c:1362
+#: ../libpurple/account.c:1387
 msgid "Original password"
 msgstr "Algne parool"
 
-#: ../libpurple/account.c:1369
+#: ../libpurple/account.c:1394
 msgid "New password"
 msgstr "Uus parool"
 
-#: ../libpurple/account.c:1376
+#: ../libpurple/account.c:1401
 msgid "New password (again)"
 msgstr "Uus parool (veel kord)"
 
-#: ../libpurple/account.c:1382
+#: ../libpurple/account.c:1407
 #, c-format
 msgid "Change password for %s"
 msgstr "%s parooli muutmine"
 
-#: ../libpurple/account.c:1390
+#: ../libpurple/account.c:1415
 msgid "Please enter your current password and your new password."
 msgstr "Palun sisesta oma praegune parool ja uus parool."
 
-#: ../libpurple/account.c:1421
+#: ../libpurple/account.c:1446
 #, c-format
 msgid "Change user information for %s"
 msgstr "Kasutaja %s andmete muutmine"
 
-#: ../libpurple/account.c:1424 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1449 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Määra kasutajateave"
 
-#: ../libpurple/account.c:1895 ../libpurple/protocols/gg/gg.c:1019
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2030
-#: ../libpurple/protocols/jabber/buddy.c:2047
-#: ../libpurple/protocols/novell/novell.c:2848
-#: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:160
+#: ../libpurple/account.c:1920 ../libpurple/protocols/gg/gg.c:1019
+#: ../libpurple/protocols/jabber/buddy.c:784
+#: ../libpurple/protocols/jabber/buddy.c:2034
+#: ../libpurple/protocols/jabber/buddy.c:2051
+#: ../libpurple/protocols/novell/novell.c:2849
+#: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:166
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
-#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3272 ../pidgin/gtkblist.c:6030
+#: ../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:6187
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2079,7 +2282,7 @@
 #: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
+msgstr "Subjekt \"%s\" esitas ühekordseks kasutamiseks järgneva sertifikaadi:"
 
 #: ../libpurple/certificate.c:563
 #, c-format
@@ -2093,88 +2296,79 @@
 #. TODO: Find what the handle ought to be
 #: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
-msgstr ""
+msgstr "Ühekordseks kasutamiseks mõeldud sertifikaadi verifitseerimine"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:886
+#: ../libpurple/certificate.c:894
 msgid "Certificate Authorities"
 msgstr "Sertifitseerimiskeskused"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1054
+#: ../libpurple/certificate.c:1062
 msgid "SSL Peers Cache"
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:1185
+#: ../libpurple/certificate.c:1193
 #, c-format
 msgid "Accept certificate for %s?"
-msgstr ""
+msgstr "Kas nõustuda subjekti \"%s\" sertifikaadiga?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1191
+#: ../libpurple/certificate.c:1199
 msgid "SSL Certificate Verification"
 msgstr "SSL-sertifikaadi verifitseerimine"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1201
+#: ../libpurple/certificate.c:1208
 msgid "Accept"
 msgstr "Nõustu"
 
-#: ../libpurple/certificate.c:1202 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/certificate.c:1209 ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:90
-#: ../libpurple/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/group_opt.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "Lükka tagasi"
 
-#: ../libpurple/certificate.c:1203
+#: ../libpurple/certificate.c:1210
 msgid "_View Certificate..."
 msgstr "_Vaata sertifikaati..."
 
 #. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1303
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1328
+#: ../libpurple/certificate.c:1311
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
 "automatically checked."
 msgstr ""
-
-#: ../libpurple/certificate.c:1346
+"Subjekti \"%s\" poolt esitatud sertifikaat on ise allkirjastatud. Selle "
+"usaldatavust pole võimalik automaatselt kontrollida."
+
+#: ../libpurple/certificate.c:1329
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
-msgstr ""
+msgstr "Subjekti \"%s\" jaoks esitatud sertifikaadi on vigane."
 
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1354 ../libpurple/certificate.c:1423
+#: ../libpurple/certificate.c:1337 ../libpurple/certificate.c:1407
 msgid "SSL Certificate Error"
 msgstr "SSL-sertifikaadi viga"
 
-#: ../libpurple/certificate.c:1355
+#: ../libpurple/certificate.c:1338
 msgid "Invalid certificate chain"
 msgstr "Vigane sertifikaadiahel"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1375
+#: ../libpurple/certificate.c:1359
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
@@ -2183,12 +2377,12 @@
 "sertifikaati valideerida."
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1398
+#: ../libpurple/certificate.c:1382
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr ""
 
-#: ../libpurple/certificate.c:1415
+#: ../libpurple/certificate.c:1399
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
@@ -2196,12 +2390,23 @@
 "signature."
 msgstr ""
 
-#: ../libpurple/certificate.c:1424
+#: ../libpurple/certificate.c:1408
 msgid "Invalid certificate authority signature"
 msgstr "Vigane sertifitseerimiskeskuse allkiri"
 
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1434
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+
 #. Make messages
-#: ../libpurple/certificate.c:1888
+#: ../libpurple/certificate.c:1896
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2219,34 +2424,35 @@
 "Aegumise kuupäev: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1897
+#: ../libpurple/certificate.c:1905
 msgid "Certificate Information"
 msgstr "Sertifikaadi andmed"
 
-#: ../libpurple/connection.c:107
+#: ../libpurple/connection.c:120
 msgid "Registration Error"
 msgstr "Viga registreerimisel"
 
-#: ../libpurple/connection.c:180
+#: ../libpurple/connection.c:193
 msgid "Unregistration Error"
 msgstr "Viga registreeringu tühistamisel"
 
-#: ../libpurple/connection.c:350
+#: ../libpurple/connection.c:347
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s logis sisse"
 
-#: ../libpurple/connection.c:380
+#: ../libpurple/connection.c:377
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s logis välja"
 
-#: ../libpurple/connection.c:525 ../libpurple/plugin.c:277
-#: ../libpurple/protocols/jabber/buddy.c:2350
+#: ../libpurple/connection.c:530 ../libpurple/plugin.c:277
+#: ../libpurple/protocols/jabber/buddy.c:2354
 #: ../libpurple/protocols/msn/servconn.c:141
 #: ../libpurple/protocols/msn/session.c:377
 #: ../libpurple/protocols/msnp9/servconn.c:139
-#: ../libpurple/protocols/msnp9/session.c:330
+#: ../libpurple/protocols/msnp9/session.c:329
+#: ../libpurple/protocols/oscar/family_chatnav.c:63
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
@@ -2263,45 +2469,45 @@
 msgid "The message is too large."
 msgstr "Sõnum on liiga suur."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
-#: ../libpurple/protocols/bonjour/jabber.c:298
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:272
+#: ../libpurple/protocols/bonjour/jabber.c:315
 msgid "Unable to send message."
 msgstr "Sõnumit pole võimalik saata."
 
-#: ../libpurple/conversation.c:1211
+#: ../libpurple/conversation.c:1215
 msgid "Send Message"
 msgstr "Sõnumi saatmine"
 
-#: ../libpurple/conversation.c:1214
+#: ../libpurple/conversation.c:1218
 msgid "_Send Message"
 msgstr "_Saada sõnum"
 
-#: ../libpurple/conversation.c:1620
+#: ../libpurple/conversation.c:1624
 #, c-format
 msgid "%s entered the room."
 msgstr "%s sisenes tuppa."
 
-#: ../libpurple/conversation.c:1623
+#: ../libpurple/conversation.c:1627
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] sisenes tuppa."
 
-#: ../libpurple/conversation.c:1733
+#: ../libpurple/conversation.c:1737
 #, c-format
 msgid "You are now known as %s"
 msgstr "Sa oled nüüd nimega %s"
 
-#: ../libpurple/conversation.c:1753
+#: ../libpurple/conversation.c:1757
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nüüd nimega %s"
 
-#: ../libpurple/conversation.c:1828
+#: ../libpurple/conversation.c:1832
 #, c-format
 msgid "%s left the room."
 msgstr "%s väljus toast."
 
-#: ../libpurple/conversation.c:1831
+#: ../libpurple/conversation.c:1835
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s väljus toast (%s)."
@@ -2329,15 +2535,15 @@
 msgid "No name"
 msgstr "Nimetu"
 
-#: ../libpurple/dnsquery.c:511
+#: ../libpurple/dnsquery.c:532
 msgid "Unable to create new resolver process\n"
 msgstr "Uut lahendajaprotsessi pole võimalik luua\n"
 
-#: ../libpurple/dnsquery.c:516
+#: ../libpurple/dnsquery.c:537
 msgid "Unable to send request to resolver process\n"
 msgstr "Lahendajaprotsessile pole võimalik päringut saata\n"
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:698
+#: ../libpurple/dnsquery.c:570 ../libpurple/dnsquery.c:719
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2346,13 +2552,13 @@
 "Viga %s lahendamisel:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:712
-#: ../libpurple/dnsquery.c:830
+#: ../libpurple/dnsquery.c:573 ../libpurple/dnsquery.c:733
+#: ../libpurple/dnsquery.c:851
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Viga %s lahendamisel: %d"
 
-#: ../libpurple/dnsquery.c:574
+#: ../libpurple/dnsquery.c:595
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -2361,20 +2567,20 @@
 "Viga lahendajaprotsessilt lugemisel:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:578
+#: ../libpurple/dnsquery.c:599
 msgid "EOF while reading from resolver process"
 msgstr "Faililõputunnus lahendajaprotsessilt lugemisel"
 
-#: ../libpurple/dnsquery.c:762
+#: ../libpurple/dnsquery.c:783
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Viga lõime loomisel: %s"
 
-#: ../libpurple/dnsquery.c:763
+#: ../libpurple/dnsquery.c:784
 msgid "Unknown reason"
 msgstr "Tundmatu põhjus"
 
-#: ../libpurple/ft.c:209
+#: ../libpurple/ft.c:210
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2383,7 +2589,7 @@
 "Viga faili %s lugemisel: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:213
+#: ../libpurple/ft.c:214
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2392,7 +2598,7 @@
 "Viga faili %s kirjutamisel: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:217
+#: ../libpurple/ft.c:218
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2401,39 +2607,39 @@
 "Viga failile %s ligipääsul: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:253
+#: ../libpurple/ft.c:254
 msgid "Directory is not writable."
 msgstr "Kataloog pole kirjutatav."
 
-#: ../libpurple/ft.c:268
+#: ../libpurple/ft.c:269
 msgid "Cannot send a file of 0 bytes."
 msgstr "Nullsuurusega faili pole võimalik saata."
 
-#: ../libpurple/ft.c:278
+#: ../libpurple/ft.c:279
 msgid "Cannot send a directory."
 msgstr "Kataloogi pole võimalik saata."
 
-#: ../libpurple/ft.c:287
+#: ../libpurple/ft.c:288
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s pole tavaline fail. Ettevaatuse tõttu ei kirjutata seda üle.\n"
 
-#: ../libpurple/ft.c:347
+#: ../libpurple/ft.c:348
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s soovib saata sulle faili %s (%s)"
 
-#: ../libpurple/ft.c:354
+#: ../libpurple/ft.c:355
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s soovib saata sulle faili"
 
-#: ../libpurple/ft.c:397
+#: ../libpurple/ft.c:398
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Kas nõustud failiülekandega kasutajalt %s?"
 
-#: ../libpurple/ft.c:401
+#: ../libpurple/ft.c:402
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2444,60 +2650,60 @@
 "Kaughost: %s\n"
 "Kaugport: %d"
 
-#: ../libpurple/ft.c:436
+#: ../libpurple/ft.c:437
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s pakub faili %s saatmist"
 
-#: ../libpurple/ft.c:488
+#: ../libpurple/ft.c:490
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ei ole lubatud failinimi.\n"
 
-#: ../libpurple/ft.c:509
+#: ../libpurple/ft.c:511
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Pakun faili %s saatmist kasutajale %s"
 
-#: ../libpurple/ft.c:521
+#: ../libpurple/ft.c:523
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Faili %s ülekandmise alustamine kasutajalt %s"
 
-#: ../libpurple/ft.c:682
+#: ../libpurple/ft.c:700
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Fail %s täielikult üle kantud"
 
-#: ../libpurple/ft.c:685
+#: ../libpurple/ft.c:703
 msgid "File transfer complete"
 msgstr "Fail on täielikult üle kantud"
 
-#: ../libpurple/ft.c:1103
+#: ../libpurple/ft.c:1138
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Sa katkestasid faili %s ülekandmise"
 
-#: ../libpurple/ft.c:1108
+#: ../libpurple/ft.c:1143
 msgid "File transfer cancelled"
 msgstr "Faili ülekandmine katkestatud"
 
-#: ../libpurple/ft.c:1166
+#: ../libpurple/ft.c:1201
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s katkestas faili %s ülekandmise"
 
-#: ../libpurple/ft.c:1171
+#: ../libpurple/ft.c:1206
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s katkestas failiülekande"
 
-#: ../libpurple/ft.c:1228
+#: ../libpurple/ft.c:1263
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Tõrge faili ülekandmisel kasutajale %s."
 
-#: ../libpurple/ft.c:1230
+#: ../libpurple/ft.c:1265
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Tõrge faili ülekandmisel kasutajalt %s."
@@ -2674,52 +2880,52 @@
 
 #: ../libpurple/log.c:183
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
-msgstr ""
-
-#: ../libpurple/log.c:598
+msgstr "<b><font color=\"red\">Logijal pole lugemisfunktsiooni</font></b>"
+
+#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:612
+#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "Lihttekst"
 
-#: ../libpurple/log.c:626
+#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "Lihtne vana vorming"
 
-#: ../libpurple/log.c:839
+#: ../libpurple/log.c:838
 msgid "Logging of this conversation failed."
 msgstr "Selle vestluse logimisel tekkis tõrge."
 
-#: ../libpurple/log.c:1282
+#: ../libpurple/log.c:1281
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1366
+#: ../libpurple/log.c:1365
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
 
-#: ../libpurple/log.c:1368
+#: ../libpurple/log.c:1367
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
 
-#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
+#: ../libpurple/log.c:1425 ../libpurple/log.c:1558
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 
-#: ../libpurple/log.c:1438 ../libpurple/log.c:1568
+#: ../libpurple/log.c:1437 ../libpurple/log.c:1567
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Faili pole võimalik lugeda: %s</b></font>"
 
-#: ../libpurple/log.c:1500
+#: ../libpurple/log.c:1499
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMAATVASTUS>: %s\n"
@@ -2727,7 +2933,7 @@
 #: ../libpurple/plugin.c:360
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
-msgstr ""
+msgstr "Sul on kasutusel %s kuid selle plugina jaoks on vajalik %s."
 
 #: ../libpurple/plugin.c:375
 msgid "This plugin has not defined an ID."
@@ -2741,7 +2947,7 @@
 #: ../libpurple/plugin.c:460
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr ""
+msgstr "ABI versioonid ei klapi: %d.%d.x (vaja on %d.%d.x)"
 
 #: ../libpurple/plugin.c:477
 msgid "Plugin does not implement all required functions"
@@ -2792,51 +2998,50 @@
 msgid "Autoaccept complete"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:160
+#: ../libpurple/plugins/autoaccept.c:171
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:162
+#: ../libpurple/plugins/autoaccept.c:173
 msgid "Set Autoaccept Setting"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:164
+#: ../libpurple/plugins/autoaccept.c:175
 msgid "_Save"
 msgstr "_Salvesta"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/autoaccept.c:176 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1451
-#: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2292
-#: ../libpurple/protocols/oscar/oscar.c:5936
-#: ../libpurple/protocols/oscar/oscar.c:5991
-#: ../libpurple/protocols/oscar/oscar.c:6217
-#: ../libpurple/protocols/oscar/oscar.c:6287 ../libpurple/request.h:1828
-#: ../libpurple/request.h:1841 ../libpurple/request.h:1854
-#: ../libpurple/request.h:1867 ../pidgin/gtkblist.c:546
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:2294
+#: ../libpurple/protocols/oscar/oscar.c:2343
+#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:6044
+#: ../libpurple/protocols/oscar/oscar.c:6270
+#: ../libpurple/protocols/oscar/oscar.c:6340 ../libpurple/request.h:1458
+#: ../libpurple/request.h:1468 ../pidgin/gtkblist.c:552
 msgid "_Cancel"
 msgstr "_Loobu"
 
-#: ../libpurple/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:179
 msgid "Ask"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:169
+#: ../libpurple/plugins/autoaccept.c:180
 msgid "Auto Accept"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:170
+#: ../libpurple/plugins/autoaccept.c:181
 msgid "Auto Reject"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:185
+#: ../libpurple/plugins/autoaccept.c:196
 msgid "Autoaccept File Transfers..."
 msgstr ""
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:215
+#: ../libpurple/plugins/autoaccept.c:226
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2844,11 +3049,11 @@
 "Rada, kuhu failid salvestatakse\n"
 "(Palun sisesta täisrada)"
 
-#: ../libpurple/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:231
 msgid "Automatically reject from users not in buddy list"
 msgstr "Sõbranimekirja kandmata kasutajate failidest keeldutakse automaatselt"
 
-#: ../libpurple/plugins/autoaccept.c:224
+#: ../libpurple/plugins/autoaccept.c:235
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2856,10 +3061,10 @@
 "Automaatselt nõustutud faili täielikust ülekandmisest teavitatakse\n"
 "hüpikakna abil (seda juhul, kui saatjaga pole vestlust käimas)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1808
-#: ../libpurple/protocols/msn/msn.c:1838
-#: ../libpurple/protocols/msnp9/msn.c:1661
-#: ../libpurple/protocols/msnp9/msn.c:1691
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1846
+#: ../libpurple/protocols/msnp9/msn.c:1672
+#: ../libpurple/protocols/msnp9/msn.c:1702
 msgid "Notes"
 msgstr "Märkused"
 
@@ -3242,6 +3447,14 @@
 msgid "Loads .NET plugins with Mono."
 msgstr ".NET pluginate laadimine Mono abil."
 
+#: ../libpurple/plugins/newline.c:57
+msgid "Add new line in IMs"
+msgstr ""
+
+#: ../libpurple/plugins/newline.c:61
+msgid "Add new line in Chats"
+msgstr ""
+
 #. *< magic
 #. *< major version
 #. *< minor version
@@ -3251,18 +3464,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/newline.c:68
+#: ../libpurple/plugins/newline.c:104
 msgid "New Line"
 msgstr "Reavahetus"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/newline.c:70
+#: ../libpurple/plugins/newline.c:106
 msgid "Prepends a newline to displayed message."
 msgstr "Reavahetuse lisamine kuvatava sõnumi ette."
 
 #. *< summary
-#: ../libpurple/plugins/newline.c:71
+#: ../libpurple/plugins/newline.c:107
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the screen name in the conversation window."
@@ -3272,17 +3485,19 @@
 
 #: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
-msgstr ""
+msgstr "Võrguvabade sõnumite emuleerimine"
 
 #: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
-msgstr "Ühendamata kasutajate jaoks sõnumite salvestamine sõbramärguannetena."
+msgstr "Ühendamata kasutajatele sõnumite salvestamine sõbramärguannetena."
 
 #: ../libpurple/plugins/offlinemsg.c:95
 msgid ""
 "The rest of the messages will be saved as pounce. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
+"Ülejäänud sõnumid salvestatakse sõbramärguannetena. Salvestatud märguandeid "
+"on võimalik muuta või kustutada `Sõbramärguannete' dialoogi abil."
 
 #: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
@@ -3290,52 +3505,56 @@
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
 "a pounce and automatically send them when \"%s\" logs back in?"
 msgstr ""
+"\"%s\" pole hetkel võrku ühendatud. Kas sa soovid saatmata sõnumid "
+"salvestada ja saata need automaatselt siis, kui \"%s\" uuesti võrku ühendub?"
 
 #: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
-msgstr ""
+msgstr "Võrguvaba sõnum"
 
 #: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
+"Seda märguannet on võimalik muuta või kustutada `Sõbramärguannete' dialoogi "
+"abil"
 
 #: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msn/msn.c:661
 #: ../libpurple/protocols/msnp9/dialog.c:133
-#: ../libpurple/protocols/msnp9/msn.c:550
-#: ../libpurple/protocols/msnp9/msn.c:564
-#: ../libpurple/protocols/novell/novell.c:1928
+#: ../libpurple/protocols/msnp9/msn.c:547
+#: ../libpurple/protocols/msnp9/msn.c:563
+#: ../libpurple/protocols/novell/novell.c:1929
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:308
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:318
+#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:270
 msgid "Yes"
 msgstr "Jah"
 
 #: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msn/msn.c:661
 #: ../libpurple/protocols/msnp9/dialog.c:134
-#: ../libpurple/protocols/msnp9/msn.c:550
-#: ../libpurple/protocols/msnp9/msn.c:564
-#: ../libpurple/protocols/novell/novell.c:1929
+#: ../libpurple/protocols/msnp9/msn.c:547
+#: ../libpurple/protocols/msnp9/msn.c:563
+#: ../libpurple/protocols/novell/novell.c:1930
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:319
+#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:271
 msgid "No"
 msgstr "Ei"
 
 #: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
-msgstr ""
+msgstr "Võrguvabade sõnumite salvestamine märguannetena"
 
 #: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
-msgstr ""
+msgstr "Küsimusi ei esitata, alati salvestatakse märguannetena."
 
 #. *< type
 #. *< ui_requirement
@@ -3426,7 +3645,7 @@
 msgstr "Test veendumaks, kas enamus asju töötavad korrektselt."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:911
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:910
 #: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
 msgstr "X.509 sertifikaadid"
@@ -3437,7 +3656,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:995
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:994
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3445,8 +3664,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:998
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1000
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:997
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:999
 msgid "Provides SSL support through GNUTLS."
 msgstr "SSL toe tagamine GNUTLS-i abil."
 
@@ -3564,43 +3783,50 @@
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
-
-#: ../libpurple/protocols/bonjour/bonjour.c:107
+"ActiveTCL'i paigaldust pole võimalik tuvastada. Kui sa soovid TCL-pluginaid "
+"kasutada, siis pead sa paigaldama ActiveTCL'i aadressilt http://www."
+"activestate.com\n"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:101
 msgid ""
 "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
 "developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
 "LocalMessaging for more information."
 msgstr ""
-
-#: ../libpurple/protocols/bonjour/bonjour.c:126
+"Apple Bonjour For Windows tööriistakomplekti ei leitud. Täiendavat teavet "
+"saad korduma kippuvate küsimuste (FAQ) alt aadressil: http://developer."
+"pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging."
+
+#: ../libpurple/protocols/bonjour/bonjour.c:120
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Sissetulevaid välksõnumiühendusi pole võimalik kuulata\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:153
+#: ../libpurple/protocols/bonjour/bonjour.c:147
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
+"Kohaliku mDNS-serveriga pole võimalik ühendust saada.  Kas see üldse töötab?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:369
-#: ../libpurple/protocols/bonjour/bonjour.c:674
+#: ../libpurple/protocols/bonjour/bonjour.c:392
+#: ../libpurple/protocols/bonjour/bonjour.c:698
 #: ../libpurple/protocols/gg/gg.c:633
-#: ../libpurple/protocols/jabber/jabber.c:969
+#: ../libpurple/protocols/jabber/jabber.c:996
 msgid "First name"
 msgstr "Eesnimi"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:371
-#: ../libpurple/protocols/bonjour/bonjour.c:677
+#: ../libpurple/protocols/bonjour/bonjour.c:394
+#: ../libpurple/protocols/bonjour/bonjour.c:701
 #: ../libpurple/protocols/gg/gg.c:628
-#: ../libpurple/protocols/jabber/jabber.c:974
+#: ../libpurple/protocols/jabber/jabber.c:1000
 msgid "Last name"
 msgstr "Perekonnanimi"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:375
+#: ../libpurple/protocols/bonjour/bonjour.c:398
 #: ../libpurple/protocols/jabber/buddy.c:295
-#: ../libpurple/protocols/jabber/buddy.c:1325
-#: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2219
+#: ../libpurple/protocols/jabber/buddy.c:1329
+#: ../libpurple/protocols/jabber/buddy.c:1339
+#: ../libpurple/protocols/jabber/buddy.c:2223
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:561
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -3609,13 +3835,13 @@
 msgid "E-Mail"
 msgstr "E-post"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:378
-#: ../libpurple/protocols/bonjour/bonjour.c:683
+#: ../libpurple/protocols/bonjour/bonjour.c:401
+#: ../libpurple/protocols/bonjour/bonjour.c:707
 msgid "AIM Account"
 msgstr "AIM-i konto"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:381
-#: ../libpurple/protocols/bonjour/bonjour.c:686
+#: ../libpurple/protocols/bonjour/bonjour.c:404
+#: ../libpurple/protocols/bonjour/bonjour.c:710
 msgid "XMPP Account"
 msgstr "XMPP konto"
 
@@ -3629,22 +3855,22 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:485
-#: ../libpurple/protocols/bonjour/bonjour.c:487
+#: ../libpurple/protocols/bonjour/bonjour.c:508
+#: ../libpurple/protocols/bonjour/bonjour.c:510
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour protokolli plugin"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:628
+#: ../libpurple/protocols/bonjour/bonjour.c:651
 msgid "Purple Person"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:680
+#: ../libpurple/protocols/bonjour/bonjour.c:704
 #: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:959
+#: ../libpurple/protocols/jabber/jabber.c:988
 #: ../libpurple/protocols/silc/silc.c:913
 #: ../libpurple/protocols/silc/silc.c:1154
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/silc.c:928
 msgid "E-mail"
 msgstr "E-post"
 
@@ -3652,33 +3878,40 @@
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:381
+#: ../libpurple/protocols/bonjour/jabber.c:407
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s sulges vestluse."
 
-#: ../libpurple/protocols/bonjour/jabber.c:439
-#: ../libpurple/protocols/bonjour/jabber.c:672
-#: ../libpurple/protocols/bonjour/jabber.c:690
+#: ../libpurple/protocols/bonjour/jabber.c:457
+#: ../libpurple/protocols/bonjour/jabber.c:522
+#: ../libpurple/protocols/bonjour/jabber.c:567
+#: ../libpurple/protocols/bonjour/jabber.c:744
+#: ../libpurple/protocols/bonjour/jabber.c:762
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
-
-#: ../libpurple/protocols/bonjour/jabber.c:589
+"Sõnumit pole võimalik saata ja seetõttu pole võimalik ka vestlust algatada."
+
+#: ../libpurple/protocols/bonjour/jabber.c:661
 msgid "Cannot open socket"
 msgstr "Soklit pole võimalik avada"
 
-#: ../libpurple/protocols/bonjour/jabber.c:599
+#: ../libpurple/protocols/bonjour/jabber.c:671
 msgid "Error setting socket options"
 msgstr "Viga soklivalikute seadmisel"
 
-#: ../libpurple/protocols/bonjour/jabber.c:625
+#: ../libpurple/protocols/bonjour/jabber.c:697
 msgid "Could not bind socket to port"
 msgstr "Soklit pole võimalik porti kuulama panna"
 
-#: ../libpurple/protocols/bonjour/jabber.c:635
+#: ../libpurple/protocols/bonjour/jabber.c:707
 msgid "Could not listen on socket"
 msgstr "Soklit pole võimalik kuulata"
 
+#: ../libpurple/protocols/bonjour/mdns_win32.c:110
+msgid "Error communicating with local mDNSResponder."
+msgstr "Viga kohaliku mDNSResponder'iga suhtlemisel."
+
 #: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1845
 msgid "Invalid proxy settings"
 msgstr "Vigased proksi sätted"
@@ -3687,7 +3920,7 @@
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
-msgstr ""
+msgstr "Sinu määratud proksil on vigane hostimini või port."
 
 #: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
 #: ../libpurple/protocols/gg/gg.c:180
@@ -3754,9 +3987,9 @@
 msgstr "Registreerimine edukalt läbi viidud!"
 
 #: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:776
-#: ../libpurple/protocols/jabber/jabber.c:940
-#: ../libpurple/protocols/jabber/jabber.c:943
-#: ../libpurple/protocols/jabber/jabber.c:1731
+#: ../libpurple/protocols/jabber/jabber.c:971
+#: ../libpurple/protocols/jabber/jabber.c:974
+#: ../libpurple/protocols/jabber/jabber.c:1762
 msgid "Password"
 msgstr "Parool"
 
@@ -3782,9 +4015,9 @@
 
 #: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
 #: ../libpurple/protocols/gg/gg.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:984
-#: ../libpurple/protocols/oscar/oscar.c:3799
-#: ../libpurple/protocols/oscar/oscar.c:3812
+#: ../libpurple/protocols/jabber/jabber.c:1008
+#: ../libpurple/protocols/oscar/oscar.c:3822
+#: ../libpurple/protocols/oscar/oscar.c:3835
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Linn"
@@ -3793,10 +4026,10 @@
 msgid "Year of birth"
 msgstr "Sünniaasta"
 
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1737
-#: ../libpurple/protocols/msnp9/msn.c:1590
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1745
+#: ../libpurple/protocols/msnp9/msn.c:1601
+#: ../libpurple/protocols/myspace/user.c:129
+#: ../libpurple/protocols/oscar/oscar.c:3765
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:227 ../libpurple/protocols/qq/qq.c:230
 #: ../libpurple/protocols/qq/qq.c:233 ../libpurple/protocols/qq/qq.c:237
@@ -3809,14 +4042,14 @@
 msgstr "Mees või naine"
 
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/oscar/oscar.c:3765
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Male"
 msgstr "Mees"
 
 #: ../libpurple/protocols/gg/gg.c:654
-#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/oscar/oscar.c:3765
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
@@ -3875,64 +4108,50 @@
 msgid "Add to chat..."
 msgstr "Lisa vestlusesse..."
 
-#: ../libpurple/protocols/gg/gg.c:1010
-#: ../libpurple/protocols/jabber/buddy.c:2034
-#: ../libpurple/protocols/novell/novell.c:2845
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5654
-#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
-#: ../libpurple/protocols/qq/qq.c:293
-#: ../libpurple/protocols/yahoo/yahoo.c:3110 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3338 ../pidgin/gtkblist.c:3676
-#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1061
-msgid "Offline"
-msgstr "Ühendamata"
-
 #: ../libpurple/protocols/gg/gg.c:1013
-#: ../libpurple/protocols/jabber/buddy.c:2036
+#: ../libpurple/protocols/jabber/buddy.c:2040
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/msnp9/state.c:29
 #: ../libpurple/protocols/msnp9/state.c:30
 #: ../libpurple/protocols/msnp9/state.c:37
 #: ../libpurple/protocols/msnp9/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2833
+#: ../libpurple/protocols/novell/novell.c:2834
 #: ../libpurple/protocols/qq/qq.c:281
-#: ../libpurple/protocols/yahoo/yahoo.c:3112 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/yahoo/yahoo.c:3138 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1081
 msgid "Available"
 msgstr "Saadaval"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:537
-#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2040
-#: ../libpurple/protocols/novell/novell.c:2836
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4557
-#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:544
+#: ../libpurple/protocols/irc/msgs.c:312
+#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/novell/novell.c:2837
+#: ../libpurple/protocols/oscar/oscar.c:732
+#: ../libpurple/protocols/oscar/oscar.c:5735
 #: ../libpurple/protocols/qq/qq.c:181 ../libpurple/protocols/qq/qq.c:285
 #: ../libpurple/protocols/silc/buddy.c:1479
 #: ../libpurple/protocols/silc10/buddy.c:1479
-#: ../libpurple/protocols/yahoo/yahoo.c:3664
-#: ../libpurple/protocols/yahoo/yahoo.c:3738 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:2040
-#: ../pidgin/gtkstatusbox.c:1058
+#: ../libpurple/protocols/yahoo/yahoo.c:3690
+#: ../libpurple/protocols/yahoo/yahoo.c:3764 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:1960
+#: ../pidgin/gtkstatusbox.c:1082
 msgid "Away"
 msgstr "Eemal"
 
 #: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1119
-#: ../libpurple/protocols/oscar/oscar.c:2709
-#: ../libpurple/protocols/oscar/oscar.c:3709
+#: ../libpurple/protocols/oscar/oscar.c:2760
+#: ../libpurple/protocols/oscar/oscar.c:3732
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
-#: ../libpurple/protocols/jabber/buddy.c:2213
-#: ../libpurple/protocols/jabber/buddy.c:2399
-#: ../libpurple/protocols/oscar/oscar.c:3720
+#: ../libpurple/protocols/jabber/buddy.c:2217
+#: ../libpurple/protocols/jabber/buddy.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:3743
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
@@ -3943,7 +4162,7 @@
 msgstr "Sünniaasta"
 
 #: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
-#: ../libpurple/protocols/oscar/oscar.c:3921
+#: ../libpurple/protocols/oscar/oscar.c:3944
 msgid "Unable to display the search results."
 msgstr "Otsingutulemusi pole võimalik kuvada."
 
@@ -3987,23 +4206,10 @@
 msgid "Connection failed."
 msgstr "Tõrge ühendumisel."
 
-#: ../libpurple/protocols/gg/gg.c:1629 ../libpurple/protocols/msn/msn.c:664
-#: ../libpurple/protocols/msnp9/msn.c:563
-msgid "Blocked"
-msgstr "Blokitud"
-
 #: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr "Vestlusese lisamine"
 
-#: ../libpurple/protocols/gg/gg.c:1661
-msgid "Unblock"
-msgstr "Võta blokeering maha"
-
-#: ../libpurple/protocols/gg/gg.c:1665
-msgid "Block"
-msgstr "Bloki"
-
 #: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "Vestluse _nimi:"
@@ -4074,36 +4280,39 @@
 
 #: ../libpurple/protocols/irc/cmds.c:43
 #: ../libpurple/protocols/silc/silc.c:1780
-#: ../libpurple/protocols/silc10/silc.c:1569
+#: ../libpurple/protocols/silc10/silc.c:1572
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Tundmatu käsk: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:503
+#: ../libpurple/protocols/irc/cmds.c:511
 #: ../libpurple/protocols/jabber/chat.c:591
 #: ../libpurple/protocols/silc/silc.c:1488
-#: ../libpurple/protocols/silc10/silc.c:1277
+#: ../libpurple/protocols/silc10/silc.c:1280
 #, c-format
 msgid "current topic is: %s"
 msgstr "hetketeema on: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:507
+#: ../libpurple/protocols/irc/cmds.c:515
 #: ../libpurple/protocols/jabber/chat.c:595
 #: ../libpurple/protocols/silc/silc.c:1492
-#: ../libpurple/protocols/silc10/silc.c:1281
+#: ../libpurple/protocols/silc10/silc.c:1284
 msgid "No topic is set"
 msgstr "Teemat pole seatud"
 
-#: ../libpurple/protocols/irc/dcc_send.c:296
-#: ../libpurple/protocols/irc/dcc_send.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:287
+#: ../libpurple/protocols/irc/dcc_send.c:298
+#: ../libpurple/protocols/irc/dcc_send.c:339
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:318
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:327
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:336
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1109
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1513
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1564
 msgid "File Transfer Failed"
 msgstr "Tõrge faili ülekandmisel"
 
-#: ../libpurple/protocols/irc/dcc_send.c:297
-#: ../libpurple/protocols/irc/dcc_send.c:338
+#: ../libpurple/protocols/irc/dcc_send.c:299
+#: ../libpurple/protocols/irc/dcc_send.c:340
 msgid "Could not open a listening port."
 msgstr "Kuulatavat porti pole võimalik avada."
 
@@ -4125,83 +4334,83 @@
 msgstr "%s päevasõnum"
 
 #: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
-#: ../libpurple/protocols/irc/irc.c:625 ../libpurple/protocols/irc/irc.c:654
-#: ../libpurple/protocols/myspace/myspace.c:2378
+#: ../libpurple/protocols/irc/irc.c:633 ../libpurple/protocols/irc/irc.c:662
+#: ../libpurple/protocols/myspace/myspace.c:2530
 msgid "Server has disconnected"
 msgstr "Server katkestas ühenduse"
 
-#: ../libpurple/protocols/irc/irc.c:253
+#: ../libpurple/protocols/irc/irc.c:260
 msgid "View MOTD"
 msgstr "Vaata päevasõnumit"
 
-#: ../libpurple/protocols/irc/irc.c:265 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:272 ../libpurple/protocols/silc/chat.c:33
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "Ka_nal:"
 
-#: ../libpurple/protocols/irc/irc.c:271
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:527
+#: ../libpurple/protocols/irc/irc.c:278
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:496
 msgid "_Password:"
 msgstr "_Parool:"
 
-#: ../libpurple/protocols/irc/irc.c:304
+#: ../libpurple/protocols/irc/irc.c:311
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nimed ei tohi sisaldada tühje kohti"
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:325
-#: ../libpurple/protocols/jabber/jabber.c:1311
+#: ../libpurple/protocols/irc/irc.c:332
+#: ../libpurple/protocols/jabber/jabber.c:1336
 #: ../libpurple/protocols/msn/session.c:402
-#: ../libpurple/protocols/msnp9/session.c:355
-#: ../libpurple/protocols/myspace/myspace.c:302
-#: ../libpurple/protocols/novell/novell.c:2198
-#: ../libpurple/protocols/oscar/oscar.c:1290
+#: ../libpurple/protocols/msnp9/session.c:354
+#: ../libpurple/protocols/myspace/myspace.c:295
+#: ../libpurple/protocols/novell/novell.c:2199
+#: ../libpurple/protocols/oscar/oscar.c:1331
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3768
-#: ../libpurple/protocols/simple/simple.c:1893
-#: ../libpurple/protocols/yahoo/yahoo.c:2948
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
+#: ../libpurple/protocols/sametime/sametime.c:3776
+#: ../libpurple/protocols/simple/simple.c:1915
+#: ../libpurple/protocols/yahoo/yahoo.c:2966
+#: ../libpurple/protocols/zephyr/zephyr.c:1585 ../pidgin/gtkstatusbox.c:681
 msgid "Connecting"
 msgstr "Ühendumine"
 
-#: ../libpurple/protocols/irc/irc.c:335
-#: ../libpurple/protocols/jabber/jabber.c:637
-#: ../libpurple/protocols/jabber/jabber.c:1126
+#: ../libpurple/protocols/irc/irc.c:342
+#: ../libpurple/protocols/jabber/jabber.c:664
+#: ../libpurple/protocols/jabber/jabber.c:1145
 msgid "SSL support unavailable"
 msgstr "SSL-i tugi pole saadaval"
 
-#: ../libpurple/protocols/irc/irc.c:348
-#: ../libpurple/protocols/myspace/myspace.c:320
+#: ../libpurple/protocols/irc/irc.c:355
+#: ../libpurple/protocols/myspace/myspace.c:313
 #: ../libpurple/protocols/simple/simple.c:469
-#: ../libpurple/protocols/simple/simple.c:1803
+#: ../libpurple/protocols/simple/simple.c:1825
 msgid "Couldn't create socket"
 msgstr "Soklit pole võimalik luua"
 
-#: ../libpurple/protocols/irc/irc.c:430
-#: ../libpurple/protocols/oscar/oscar.c:1286
+#: ../libpurple/protocols/irc/irc.c:437
+#: ../libpurple/protocols/oscar/oscar.c:1327
 msgid "Couldn't connect to host"
 msgstr "Hostiga pole võimalik ühenduda"
 
-#: ../libpurple/protocols/irc/irc.c:620 ../libpurple/protocols/irc/irc.c:649
-#: ../libpurple/protocols/myspace/myspace.c:2372
+#: ../libpurple/protocols/irc/irc.c:628 ../libpurple/protocols/irc/irc.c:657
+#: ../libpurple/protocols/myspace/myspace.c:2524
 msgid "Read error"
 msgstr "Viga lugemisel"
 
-#: ../libpurple/protocols/irc/irc.c:790
+#: ../libpurple/protocols/irc/irc.c:798
 #: ../libpurple/protocols/silc/chat.c:1398
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1497
+#: ../libpurple/protocols/yahoo/yahoochat.c:1508
 msgid "Users"
 msgstr "Kasutajad"
 
-#: ../libpurple/protocols/irc/irc.c:793
-#: ../libpurple/protocols/sametime/sametime.c:3416
+#: ../libpurple/protocols/irc/irc.c:801
+#: ../libpurple/protocols/sametime/sametime.c:3424
 #: ../libpurple/protocols/silc/chat.c:1401
 #: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1506
+#: ../libpurple/protocols/yahoo/yahoochat.c:1517
 msgid "Topic"
 msgstr "Teema"
 
@@ -4213,50 +4422,50 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:931
+#: ../libpurple/protocols/irc/irc.c:939
 msgid "IRC Protocol Plugin"
 msgstr "IRC protokolli plugin"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:932
+#: ../libpurple/protocols/irc/irc.c:940
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRC protokolli plugin, mis Imeb Vähem"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:957 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2335
-#: ../libpurple/protocols/msnp9/msn.c:2186
-#: ../libpurple/protocols/oscar/oscar.c:6721
+#: ../libpurple/protocols/irc/irc.c:965 ../libpurple/protocols/irc/msgs.c:325
+#: ../libpurple/protocols/msn/msn.c:2343
+#: ../libpurple/protocols/msnp9/msn.c:2197
+#: ../libpurple/protocols/oscar/oscar.c:6747
 #: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5773
+#: ../libpurple/protocols/sametime/sametime.c:5781
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1343
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:2083
+#: ../libpurple/protocols/simple/simple.c:2099
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Server"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:960 ../libpurple/protocols/msn/msn.c:2340
-#: ../libpurple/protocols/msnp9/msn.c:2191
-#: ../libpurple/protocols/oscar/oscar.c:6724
+#: ../libpurple/protocols/irc/irc.c:968 ../libpurple/protocols/msn/msn.c:2348
+#: ../libpurple/protocols/msnp9/msn.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:6750
 #: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5778
+#: ../libpurple/protocols/sametime/sametime.c:5786
 #: ../libpurple/protocols/silc/silc.c:2061
-#: ../libpurple/protocols/silc10/silc.c:1864
+#: ../libpurple/protocols/silc10/silc.c:1867
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:963
+#: ../libpurple/protocols/irc/irc.c:971
 msgid "Encodings"
 msgstr "Kooditabelid"
 
-#: ../libpurple/protocols/irc/irc.c:966 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:931
-#: ../libpurple/protocols/jabber/jabber.c:934
+#: ../libpurple/protocols/irc/irc.c:974 ../libpurple/protocols/irc/msgs.c:318
+#: ../libpurple/protocols/jabber/jabber.c:964
+#: ../libpurple/protocols/jabber/jabber.c:966
 #: ../libpurple/protocols/silc/buddy.c:1542
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -4268,13 +4477,13 @@
 #: ../libpurple/protocols/silc10/ops.c:1194
 #: ../libpurple/protocols/silc10/ops.c:1340
 #: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:916
+#: ../libpurple/protocols/silc10/silc.c:922
 msgid "Username"
 msgstr "Kasutajanimi"
 
-#: ../libpurple/protocols/irc/irc.c:969 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:977 ../libpurple/protocols/irc/msgs.c:319
 #: ../libpurple/protocols/silc/silc.c:1152
-#: ../libpurple/protocols/silc10/silc.c:920
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Real name"
 msgstr "Tegelik nimi"
 
@@ -4282,158 +4491,158 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:977
+#: ../libpurple/protocols/irc/irc.c:985
 msgid "Use SSL"
 msgstr "Kasutatakse SSL-i"
 
-#: ../libpurple/protocols/irc/msgs.c:187
+#: ../libpurple/protocols/irc/msgs.c:189
 msgid "Bad mode"
 msgstr "Vigane režiim"
 
-#: ../libpurple/protocols/irc/msgs.c:198
+#: ../libpurple/protocols/irc/msgs.c:200
 #, c-format
 msgid "You are banned from %s."
 msgstr "Sa oled kanalilt %s tõrjutud."
 
-#: ../libpurple/protocols/irc/msgs.c:199
+#: ../libpurple/protocols/irc/msgs.c:201
 msgid "Banned"
 msgstr "Tõrjutud"
 
-#: ../libpurple/protocols/irc/msgs.c:216
+#: ../libpurple/protocols/irc/msgs.c:218
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Kasutajat %s pole võimalik tõrjuda: tõrjenimekiri on täis"
 
-#: ../libpurple/protocols/irc/msgs.c:301
+#: ../libpurple/protocols/irc/msgs.c:303
 msgid " <i>(ircop)</i>"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:302
+#: ../libpurple/protocols/irc/msgs.c:304
 msgid " <i>(identified)</i>"
 msgstr " <i>(tuvastatud)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/irc/msgs.c:305
+#: ../libpurple/protocols/oscar/oscar.c:3733
 #: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Hüüdnimi"
 
-#: ../libpurple/protocols/irc/msgs.c:329
+#: ../libpurple/protocols/irc/msgs.c:331
 #: ../libpurple/protocols/silc/ops.c:1268
 #: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Hetkel jututubades"
 
-#: ../libpurple/protocols/irc/msgs.c:334
+#: ../libpurple/protocols/irc/msgs.c:336
 msgid "Idle for"
 msgstr "Jõudeaeg"
 
-#: ../libpurple/protocols/irc/msgs.c:337
+#: ../libpurple/protocols/irc/msgs.c:339
 msgid "Online since"
 msgstr "Ühendatud alates"
 
-#: ../libpurple/protocols/irc/msgs.c:341
+#: ../libpurple/protocols/irc/msgs.c:343
 msgid "<b>Defining adjective:</b>"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:341
+#: ../libpurple/protocols/irc/msgs.c:343
 msgid "Glorious"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:420
+#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s määras uueks teemaks: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:422
+#: ../libpurple/protocols/irc/msgs.c:424
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s puhastas teema."
 
-#: ../libpurple/protocols/irc/msgs.c:430
+#: ../libpurple/protocols/irc/msgs.c:432
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Kanali %s teema on: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:448
+#: ../libpurple/protocols/irc/msgs.c:450
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Tundmatu sõnum '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:449
+#: ../libpurple/protocols/irc/msgs.c:451
 msgid "Unknown message"
 msgstr "Tundmatu sõnum"
 
-#: ../libpurple/protocols/irc/msgs.c:449
+#: ../libpurple/protocols/irc/msgs.c:451
 msgid "The IRC server received a message it did not understand."
 msgstr "IRC server võttis vastu arusaamatu teate."
 
-#: ../libpurple/protocols/irc/msgs.c:470
+#: ../libpurple/protocols/irc/msgs.c:472
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Kanali %s kasutajad: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:575
+#: ../libpurple/protocols/irc/msgs.c:577
 msgid "Time Response"
 msgstr "Ajavastus"
 
-#: ../libpurple/protocols/irc/msgs.c:576
+#: ../libpurple/protocols/irc/msgs.c:578
 msgid "The IRC server's local time is:"
 msgstr "IRC serveri kohalik aeg on:"
 
-#: ../libpurple/protocols/irc/msgs.c:587
+#: ../libpurple/protocols/irc/msgs.c:589
 msgid "No such channel"
 msgstr "Sellist kanalit pole"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:598
+#: ../libpurple/protocols/irc/msgs.c:600
 msgid "no such channel"
 msgstr "sellist kanalit pole"
 
-#: ../libpurple/protocols/irc/msgs.c:601
+#: ../libpurple/protocols/irc/msgs.c:603
 msgid "User is not logged in"
 msgstr "Kasutaja pole sisse logitud"
 
-#: ../libpurple/protocols/irc/msgs.c:606
+#: ../libpurple/protocols/irc/msgs.c:608
 msgid "No such nick or channel"
 msgstr "Sellist kanalit või hüüdnime pole"
 
-#: ../libpurple/protocols/irc/msgs.c:626
+#: ../libpurple/protocols/irc/msgs.c:628
 msgid "Could not send"
 msgstr "Ei saa saata"
 
-#: ../libpurple/protocols/irc/msgs.c:682
+#: ../libpurple/protocols/irc/msgs.c:684
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Ühinemine %s'ga on vaja kutset."
 
-#: ../libpurple/protocols/irc/msgs.c:683
+#: ../libpurple/protocols/irc/msgs.c:685
 msgid "Invitation only"
 msgstr "Ainult kutsetega"
 
-#: ../libpurple/protocols/irc/msgs.c:798
+#: ../libpurple/protocols/irc/msgs.c:801
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Sind löödi kasutaja %s poolt välja (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:803 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:806 ../libpurple/protocols/silc/ops.c:699
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Välja löödud kasutaja %s poolt (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:826
+#: ../libpurple/protocols/irc/msgs.c:829
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mood (%s %s) %s poolt"
 
-#: ../libpurple/protocols/irc/msgs.c:911 ../libpurple/protocols/irc/msgs.c:912
+#: ../libpurple/protocols/irc/msgs.c:914 ../libpurple/protocols/irc/msgs.c:915
 msgid "Invalid nickname"
 msgstr "Vigane hüüdnimi"
 
-#: ../libpurple/protocols/irc/msgs.c:913
+#: ../libpurple/protocols/irc/msgs.c:916
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4441,7 +4650,7 @@
 "Sinu valitud hüüdnimi lükati serveri poolt tagasi.  Arvatavasti sisaldab "
 "nimi lubamatuid märke."
 
-#: ../libpurple/protocols/irc/msgs.c:918
+#: ../libpurple/protocols/irc/msgs.c:921
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4449,44 +4658,44 @@
 "Sinu valitud hüüdnimi lükati serveri poolt tagasi, arvatavasti sisaldab nimi "
 "lubamatuid märke."
 
-#: ../libpurple/protocols/irc/msgs.c:957
+#: ../libpurple/protocols/irc/msgs.c:960
 msgid "Cannot change nick"
 msgstr "Hüüdmine pole võimalik muuta"
 
-#: ../libpurple/protocols/irc/msgs.c:957
+#: ../libpurple/protocols/irc/msgs.c:960
 msgid "Could not change nick"
 msgstr "Hüüdmine pole võimalik muuta"
 
-#: ../libpurple/protocols/irc/msgs.c:978
+#: ../libpurple/protocols/irc/msgs.c:981
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:1020
+#: ../libpurple/protocols/irc/msgs.c:1023
 msgid "Error: invalid PONG from server"
 msgstr "Viga: vigane PONG serverilt"
 
-#: ../libpurple/protocols/irc/msgs.c:1022
+#: ../libpurple/protocols/irc/msgs.c:1025
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING-i vastus -- Mahajäämus %lu sekundit"
 
-#: ../libpurple/protocols/irc/msgs.c:1113
+#: ../libpurple/protocols/irc/msgs.c:1116
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:1114
+#: ../libpurple/protocols/irc/msgs.c:1117
 #: ../libpurple/protocols/silc/ops.c:1093
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Kanaliga pole võimalik ühineda"
 
-#: ../libpurple/protocols/irc/msgs.c:1148
+#: ../libpurple/protocols/irc/msgs.c:1151
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Kasutajanimi või kanal pole ajutiselt saadaval."
 
-#: ../libpurple/protocols/irc/msgs.c:1160
+#: ../libpurple/protocols/irc/msgs.c:1163
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
@@ -4537,6 +4746,9 @@
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
+"join &lt;tuba1&gt;[,tuba2][,...] [võti1[,võti2][,...]]:  Ühte või enamasse "
+"tuppa sisenemine, vajadusel on valikuliselt võimalik määrata ka igale toale "
+"kanalivõti."
 
 #: ../libpurple/protocols/irc/parse.c:130
 msgid ""
@@ -4551,6 +4763,8 @@
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
+"list: Võrgus olevate jututubade nimekirja kuvamine. <i>Hoiatus: mõned "
+"serverid võivad selle peale ühenduse katkestada.</i>"
 
 #: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
@@ -4577,7 +4791,7 @@
 msgstr "names [kanal]:  Kanalil olevate kasutajate nimekiri."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2321
+#: ../libpurple/protocols/jabber/jabber.c:2348
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;uus hüüdnimi&gt;:  Sinu hüüdnime muutmine."
 
@@ -4586,115 +4800,121 @@
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:139
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr "notice &lt;sihtkoht&lt;:  Märkuse saatmine kasutajale või kanalile."
+
+#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:141
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:141
-msgid "operserv: Send a command to operserv"
-msgstr ""
-
 #: ../libpurple/protocols/irc/parse.c:142
+msgid "operserv: Send a command to operserv"
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
-
-#: ../libpurple/protocols/irc/parse.c:143
+"part [tuba] [sõnum]:  Käesolevalt või määratud kanalilt lahkumine. Võimalik "
+"on ka määrata lahkumise sõnumit."
+
+#: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:145
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 "quit [sõnum]:  Serveriga ühenduse katkestamine. Võimalik on ka katkestamise "
 "kohta sõnum jätta."
 
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:147
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Töötlemata käsu saatmine serverile."
 
-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:148
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: IRC-serveri kohaliku aja näitamine."
 
-#: ../libpurple/protocols/irc/parse.c:149
-msgid "topic [new topic]:  View or change the channel topic."
-msgstr "topic [uus teema]:  Kanali teema vaatamine või muutmine."
-
 #: ../libpurple/protocols/irc/parse.c:150
-msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr ""
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr "topic [uus teema]:  Kanali teema vaatamine või muutmine."
 
 #: ../libpurple/protocols/irc/parse.c:151
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:152
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [hüüdnimi]: CTCP VERSION päringu saatmine kasutajale"
 
-#: ../libpurple/protocols/irc/parse.c:152
+#: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:153
+#: ../libpurple/protocols/irc/parse.c:154
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:154
+#: ../libpurple/protocols/irc/parse.c:155
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [server] &lt;hüüdnimi&gt;: Kasutaja kohta teabe hankimine."
 
-#: ../libpurple/protocols/irc/parse.c:155
+#: ../libpurple/protocols/irc/parse.c:156
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr "whowas &lt;hüüdnimi&gt;: Väljalogitud kasutaja kohta teabe hankimine."
 
-#: ../libpurple/protocols/irc/parse.c:520
+#: ../libpurple/protocols/irc/parse.c:521
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:521
+#: ../libpurple/protocols/irc/parse.c:522
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:521
+#: ../libpurple/protocols/irc/parse.c:522
 msgid "CTCP PING reply"
 msgstr "CTCP PING vastus"
 
-#: ../libpurple/protocols/irc/parse.c:633
-#: ../libpurple/protocols/irc/parse.c:640 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:634
+#: ../libpurple/protocols/irc/parse.c:641 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Ühendus katkestatud."
 
 #: ../libpurple/protocols/jabber/adhoccommands.c:143
-#: ../libpurple/protocols/jabber/jabber.c:698
-#: ../libpurple/protocols/jabber/jabber.c:728
-#: ../libpurple/protocols/jabber/jabber.c:1901
+#: ../libpurple/protocols/jabber/jabber.c:725
+#: ../libpurple/protocols/jabber/jabber.c:755
+#: ../libpurple/protocols/jabber/jabber.c:1932
 msgid "Unknown Error"
 msgstr "Tundmatu viga"
 
@@ -4716,7 +4936,7 @@
 msgstr "Server vajab avatekstiautentimist üle krüptimata andmevoo"
 
 #: ../libpurple/protocols/jabber/auth.c:323
-#: ../libpurple/protocols/jabber/auth.c:518
+#: ../libpurple/protocols/jabber/auth.c:526
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4727,30 +4947,29 @@
 
 #: ../libpurple/protocols/jabber/auth.c:325
 #: ../libpurple/protocols/jabber/auth.c:326
-#: ../libpurple/protocols/jabber/auth.c:520
-#: ../libpurple/protocols/jabber/auth.c:521
-#: ../libpurple/protocols/jabber/auth.c:614
-#: ../libpurple/protocols/jabber/auth.c:615
+#: ../libpurple/protocols/jabber/auth.c:528
+#: ../libpurple/protocols/jabber/auth.c:529
+#: ../libpurple/protocols/jabber/auth.c:720
+#: ../libpurple/protocols/jabber/auth.c:721
 msgid "Plaintext Authentication"
 msgstr "Avatekstiline autentimine"
 
-#: ../libpurple/protocols/jabber/auth.c:340
-#: ../libpurple/protocols/jabber/auth.c:534
-#: ../libpurple/protocols/jabber/auth.c:627
-msgid "Server does not use any supported authentication method"
-msgstr "Server ei kasuta ühtegi toetatud autentimismeetodit"
-
-#: ../libpurple/protocols/jabber/auth.c:472
-#: ../libpurple/protocols/jabber/auth.c:576
-#: ../libpurple/protocols/jabber/auth.c:795
-#: ../libpurple/protocols/jabber/auth.c:944
-#: ../libpurple/protocols/jabber/auth.c:971
-#: ../libpurple/protocols/jabber/auth.c:993
+#: ../libpurple/protocols/jabber/auth.c:480
+#: ../libpurple/protocols/jabber/auth.c:653
+#: ../libpurple/protocols/jabber/auth.c:901
+#: ../libpurple/protocols/jabber/auth.c:1050
+#: ../libpurple/protocols/jabber/auth.c:1077
+#: ../libpurple/protocols/jabber/auth.c:1101
 #: ../libpurple/protocols/jabber/jabber.c:127
 msgid "Invalid response from server."
 msgstr "Server tagastas vigase vastuse."
 
-#: ../libpurple/protocols/jabber/auth.c:616
+#: ../libpurple/protocols/jabber/auth.c:542
+#: ../libpurple/protocols/jabber/auth.c:733
+msgid "Server does not use any supported authentication method"
+msgstr "Server ei kasuta ühtegi toetatud autentimismeetodit"
+
+#: ../libpurple/protocols/jabber/auth.c:722
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4758,115 +4977,115 @@
 "See server nõuab avatekstilist autentimist üle krüptimata ühenduse.  Kas "
 "seda peaks lubama ja autentimist jätkama?"
 
-#: ../libpurple/protocols/jabber/auth.c:818
-#: ../libpurple/protocols/jabber/auth.c:843
+#: ../libpurple/protocols/jabber/auth.c:924
+#: ../libpurple/protocols/jabber/auth.c:949
 msgid "Invalid challenge from server"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth.c:917
+#: ../libpurple/protocols/jabber/auth.c:1023
 msgid "SASL error"
 msgstr "SASL-i viga"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:1219
-#: ../libpurple/protocols/sametime/sametime.c:4174
+#: ../libpurple/protocols/jabber/buddy.c:1223
+#: ../libpurple/protocols/sametime/sametime.c:4182
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Täisnimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:1231
+#: ../libpurple/protocols/jabber/buddy.c:1235
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Perekonnanimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:1234
+#: ../libpurple/protocols/jabber/buddy.c:1238
 msgid "Given Name"
-msgstr ""
+msgstr "Eesnimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:1004
+#: ../libpurple/protocols/jabber/jabber.c:1024
 msgid "URL"
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:1282
+#: ../libpurple/protocols/jabber/buddy.c:1286
 msgid "Street Address"
 msgstr "Tänavaaadress"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:1279
+#: ../libpurple/protocols/jabber/buddy.c:1283
 msgid "Extended Address"
 msgstr "Laiendatud aadress"
 
 #: ../libpurple/protocols/jabber/buddy.c:290
-#: ../libpurple/protocols/jabber/buddy.c:1285
+#: ../libpurple/protocols/jabber/buddy.c:1289
 msgid "Locality"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:291
-#: ../libpurple/protocols/jabber/buddy.c:1288
+#: ../libpurple/protocols/jabber/buddy.c:1292
 msgid "Region"
 msgstr "Piirkond"
 
 #: ../libpurple/protocols/jabber/buddy.c:292
-#: ../libpurple/protocols/jabber/buddy.c:1291
+#: ../libpurple/protocols/jabber/buddy.c:1295
 msgid "Postal Code"
 msgstr "Postiindeks"
 
 #: ../libpurple/protocols/jabber/buddy.c:293
-#: ../libpurple/protocols/jabber/buddy.c:1295
+#: ../libpurple/protocols/jabber/buddy.c:1299
 #: ../libpurple/protocols/silc/silc.c:1158
-#: ../libpurple/protocols/silc10/silc.c:926
+#: ../libpurple/protocols/silc10/silc.c:932
 msgid "Country"
 msgstr "Riik"
 
 #: ../libpurple/protocols/jabber/buddy.c:294
-#: ../libpurple/protocols/jabber/buddy.c:1306
-#: ../libpurple/protocols/jabber/buddy.c:1313
+#: ../libpurple/protocols/jabber/buddy.c:1310
+#: ../libpurple/protocols/jabber/buddy.c:1317
 msgid "Telephone"
 msgstr "Telefon"
 
 #: ../libpurple/protocols/jabber/buddy.c:296
-#: ../libpurple/protocols/jabber/buddy.c:1350
+#: ../libpurple/protocols/jabber/buddy.c:1354
 msgid "Organization Name"
 msgstr "Organisatsiooni nimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:297
-#: ../libpurple/protocols/jabber/buddy.c:1353
+#: ../libpurple/protocols/jabber/buddy.c:1357
 msgid "Organization Unit"
 msgstr "Organisatsiooni üksus"
 
 #: ../libpurple/protocols/jabber/buddy.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1362
+#: ../libpurple/protocols/jabber/buddy.c:1366
 msgid "Role"
 msgstr "Roll"
 
 #: ../libpurple/protocols/jabber/buddy.c:300
-#: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1806
-#: ../libpurple/protocols/msnp9/msn.c:1659
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/jabber/buddy.c:1254
+#: ../libpurple/protocols/msn/msn.c:1814
+#: ../libpurple/protocols/msnp9/msn.c:1670
+#: ../libpurple/protocols/oscar/oscar.c:3782
 msgid "Birthday"
 msgstr "Sünnipäev"
 
 #: ../libpurple/protocols/jabber/buddy.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/buddy.c:1369
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3350
-#: ../pidgin/gtkprefs.c:740
+#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3308
+#: ../pidgin/gtkprefs.c:688
 msgid "Description"
 msgstr "Kirjeldus"
 
-#: ../libpurple/protocols/jabber/buddy.c:722
-#: ../libpurple/protocols/jabber/buddy.c:723
+#: ../libpurple/protocols/jabber/buddy.c:724
+#: ../libpurple/protocols/jabber/buddy.c:725
 msgid "Edit XMPP vCard"
 msgstr "XMPP vKaardi redigeerimine"
 
-#: ../libpurple/protocols/jabber/buddy.c:724
+#: ../libpurple/protocols/jabber/buddy.c:726
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4874,224 +5093,224 @@
 "Ükski allpool olev väli pole kohustuslik. Sisesta ainult seda teavet, mis "
 "tundub sulle sobilik."
 
-#: ../libpurple/protocols/jabber/buddy.c:795
-#: ../libpurple/protocols/jabber/buddy.c:960
+#: ../libpurple/protocols/jabber/buddy.c:797
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Client"
 msgstr "Klient"
 
-#: ../libpurple/protocols/jabber/buddy.c:799
-#: ../libpurple/protocols/jabber/buddy.c:964
+#: ../libpurple/protocols/jabber/buddy.c:801
+#: ../libpurple/protocols/jabber/buddy.c:966
 msgid "Operating System"
 msgstr "Operatsioonisüsteem"
 
-#: ../libpurple/protocols/jabber/buddy.c:815
-#: ../libpurple/protocols/jabber/buddy.c:975
-msgid "Last Activity"
-msgstr "Viimati aktiivne"
-
 #: ../libpurple/protocols/jabber/buddy.c:817
 #: ../libpurple/protocols/jabber/buddy.c:977
-msgid "Service Discovery Info"
-msgstr "Teenuse avastamise andmed"
+msgid "Last Activity"
+msgstr "Viimati aktiivne"
 
 #: ../libpurple/protocols/jabber/buddy.c:819
 #: ../libpurple/protocols/jabber/buddy.c:979
-msgid "Service Discovery Items"
-msgstr "Teenuse avastamise kirjed"
+msgid "Service Discovery Info"
+msgstr "Teenuse avastamise andmed"
 
 #: ../libpurple/protocols/jabber/buddy.c:821
 #: ../libpurple/protocols/jabber/buddy.c:981
-msgid "Extended Stanza Addressing"
-msgstr ""
+msgid "Service Discovery Items"
+msgstr "Teenuse avastamise kirjed"
 
 #: ../libpurple/protocols/jabber/buddy.c:823
 #: ../libpurple/protocols/jabber/buddy.c:983
-msgid "Multi-User Chat"
-msgstr "Mitmekasutaja vestlus"
+msgid "Extended Stanza Addressing"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:825
 #: ../libpurple/protocols/jabber/buddy.c:985
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
+msgid "Multi-User Chat"
+msgstr "Mitmekasutaja vestlus"
 
 #: ../libpurple/protocols/jabber/buddy.c:827
 #: ../libpurple/protocols/jabber/buddy.c:987
-msgid "In-Band Bytestreams"
+msgid "Multi-User Chat Extended Presence Information"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:829
 #: ../libpurple/protocols/jabber/buddy.c:989
-msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc käsud"
+msgid "In-Band Bytestreams"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:831
 #: ../libpurple/protocols/jabber/buddy.c:991
-msgid "PubSub Service"
-msgstr ""
+msgid "Ad-Hoc Commands"
+msgstr "Ad-Hoc käsud"
 
 #: ../libpurple/protocols/jabber/buddy.c:833
 #: ../libpurple/protocols/jabber/buddy.c:993
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 baidivood"
+msgid "PubSub Service"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:835
 #: ../libpurple/protocols/jabber/buddy.c:995
-msgid "Out of Band Data"
-msgstr ""
+msgid "SOCKS5 Bytestreams"
+msgstr "SOCKS5 baidivood"
 
 #: ../libpurple/protocols/jabber/buddy.c:837
 #: ../libpurple/protocols/jabber/buddy.c:997
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
+msgid "Out of Band Data"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:839
 #: ../libpurple/protocols/jabber/buddy.c:999
-msgid "In-Band Registration"
-msgstr ""
+msgid "XHTML-IM"
+msgstr "XHTML-IM"
 
 #: ../libpurple/protocols/jabber/buddy.c:841
 #: ../libpurple/protocols/jabber/buddy.c:1001
-msgid "User Location"
-msgstr "Kasutaja asukoht"
+msgid "In-Band Registration"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:843
 #: ../libpurple/protocols/jabber/buddy.c:1003
-msgid "User Avatar"
-msgstr "Kasutaja avatar"
+msgid "User Location"
+msgstr "Kasutaja asukoht"
 
 #: ../libpurple/protocols/jabber/buddy.c:845
 #: ../libpurple/protocols/jabber/buddy.c:1005
-msgid "Chat State Notifications"
-msgstr "Vestluste olekust teavitaja"
+msgid "User Avatar"
+msgstr "Kasutaja avatar"
 
 #: ../libpurple/protocols/jabber/buddy.c:847
 #: ../libpurple/protocols/jabber/buddy.c:1007
-msgid "Software Version"
-msgstr "Tarkvara versioon"
+msgid "Chat State Notifications"
+msgstr "Vestluste olekust teavitaja"
 
 #: ../libpurple/protocols/jabber/buddy.c:849
 #: ../libpurple/protocols/jabber/buddy.c:1009
-msgid "Stream Initiation"
-msgstr ""
+msgid "Software Version"
+msgstr "Tarkvara versioon"
 
 #: ../libpurple/protocols/jabber/buddy.c:851
 #: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3277
-msgid "File Transfer"
-msgstr "Failiülekanne"
+msgid "Stream Initiation"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:853
 #: ../libpurple/protocols/jabber/buddy.c:1013
-msgid "User Mood"
-msgstr "Kasutaja meeleolu"
+#: ../libpurple/protocols/sametime/sametime.c:3285
+msgid "File Transfer"
+msgstr "Failiülekanne"
 
 #: ../libpurple/protocols/jabber/buddy.c:855
 #: ../libpurple/protocols/jabber/buddy.c:1015
-msgid "User Activity"
-msgstr "Kasutaja aktiivsus"
+msgid "User Mood"
+msgstr "Kasutaja meeleolu"
 
 #: ../libpurple/protocols/jabber/buddy.c:857
 #: ../libpurple/protocols/jabber/buddy.c:1017
-msgid "Entity Capabilities"
-msgstr ""
+msgid "User Activity"
+msgstr "Kasutaja aktiivsus"
 
 #: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/jabber/buddy.c:1019
-msgid "Encrypted Session Negotiations"
+msgid "Entity Capabilities"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:861
 #: ../libpurple/protocols/jabber/buddy.c:1021
-msgid "User Tune"
-msgstr ""
+msgid "Encrypted Session Negotiations"
+msgstr "Krüptitud seansi läbirääkimised"
 
 #: ../libpurple/protocols/jabber/buddy.c:863
 #: ../libpurple/protocols/jabber/buddy.c:1023
-msgid "Roster Item Exchange"
+msgid "User Tune"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:865
 #: ../libpurple/protocols/jabber/buddy.c:1025
-msgid "Reachability Address"
+msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:867
 #: ../libpurple/protocols/jabber/buddy.c:1027
-msgid "User Profile"
-msgstr "Kasutajaprofiil"
+msgid "Reachability Address"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:869
 #: ../libpurple/protocols/jabber/buddy.c:1029
-msgid "Jingle"
-msgstr ""
+msgid "User Profile"
+msgstr "Kasutajaprofiil"
 
 #: ../libpurple/protocols/jabber/buddy.c:871
 #: ../libpurple/protocols/jabber/buddy.c:1031
-msgid "Jingle Audio"
+msgid "Jingle"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:873
 #: ../libpurple/protocols/jabber/buddy.c:1033
-msgid "User Nickname"
-msgstr "Kasutaja hüüdnimi"
+msgid "Jingle Audio"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:875
 #: ../libpurple/protocols/jabber/buddy.c:1035
-msgid "Jingle ICE UDP"
-msgstr ""
+msgid "User Nickname"
+msgstr "Kasutaja hüüdnimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:877
 #: ../libpurple/protocols/jabber/buddy.c:1037
-msgid "Jingle ICE TCP"
+msgid "Jingle ICE UDP"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:879
 #: ../libpurple/protocols/jabber/buddy.c:1039
-msgid "Jingle Raw UDP"
+msgid "Jingle ICE TCP"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:881
 #: ../libpurple/protocols/jabber/buddy.c:1041
-msgid "Jingle Video"
+msgid "Jingle Raw UDP"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:883
 #: ../libpurple/protocols/jabber/buddy.c:1043
-msgid "Jingle DTMF"
+msgid "Jingle Video"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:885
 #: ../libpurple/protocols/jabber/buddy.c:1045
-msgid "Message Receipts"
-msgstr "Sõnumi vastuvõtjad"
+msgid "Jingle DTMF"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:887
 #: ../libpurple/protocols/jabber/buddy.c:1047
-msgid "Public Key Publishing"
-msgstr "Avaliku võtme avalikustamine"
+msgid "Message Receipts"
+msgstr "Sõnumi vastuvõtjad"
 
 #: ../libpurple/protocols/jabber/buddy.c:889
 #: ../libpurple/protocols/jabber/buddy.c:1049
-msgid "User Chatting"
-msgstr ""
+msgid "Public Key Publishing"
+msgstr "Avaliku võtme avalikustamine"
 
 #: ../libpurple/protocols/jabber/buddy.c:891
 #: ../libpurple/protocols/jabber/buddy.c:1051
-msgid "User Browsing"
+msgid "User Chatting"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:893
 #: ../libpurple/protocols/jabber/buddy.c:1053
-msgid "User Gaming"
+msgid "User Browsing"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:895
 #: ../libpurple/protocols/jabber/buddy.c:1055
-msgid "User Viewing"
+msgid "User Gaming"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:897
 #: ../libpurple/protocols/jabber/buddy.c:1057
+msgid "User Viewing"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1059
 #: ../libpurple/protocols/silc/ops.c:1600
 #: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1612
@@ -5099,228 +5318,228 @@
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/jabber/buddy.c:899
-#: ../libpurple/protocols/jabber/buddy.c:1059
-msgid "Stanza Encryption"
-msgstr ""
-
 #: ../libpurple/protocols/jabber/buddy.c:901
 #: ../libpurple/protocols/jabber/buddy.c:1061
-msgid "Entity Time"
+msgid "Stanza Encryption"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:903
 #: ../libpurple/protocols/jabber/buddy.c:1063
-msgid "Delayed Delivery"
+msgid "Entity Time"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:905
 #: ../libpurple/protocols/jabber/buddy.c:1065
-msgid "Collaborative Data Objects"
+msgid "Delayed Delivery"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:907
 #: ../libpurple/protocols/jabber/buddy.c:1067
-msgid "File Repository and Sharing"
+msgid "Collaborative Data Objects"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:909
 #: ../libpurple/protocols/jabber/buddy.c:1069
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN-teenuse avastamine Jingle jaoks"
+msgid "File Repository and Sharing"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:911
 #: ../libpurple/protocols/jabber/buddy.c:1071
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
+msgid "STUN Service Discovery for Jingle"
+msgstr "STUN-teenuse avastamine Jingle jaoks"
 
 #: ../libpurple/protocols/jabber/buddy.c:913
 #: ../libpurple/protocols/jabber/buddy.c:1073
+msgid "Simplified Encrypted Session Negotiation"
+msgstr "Lihtsustatud krüptitud seansi läbirääkimised"
+
+#: ../libpurple/protocols/jabber/buddy.c:915
+#: ../libpurple/protocols/jabber/buddy.c:1075
 msgid "Hop Check"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:921
-#: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2916
+#: ../libpurple/protocols/jabber/buddy.c:923
+#: ../libpurple/protocols/jabber/buddy.c:1083
+#: ../libpurple/protocols/oscar/oscar.c:2967
 msgid "Capabilities"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:933
+msgstr "Võimalused"
+
+#: ../libpurple/protocols/jabber/buddy.c:935
 #: ../libpurple/protocols/jabber/libxmpp.c:209
-#: ../libpurple/protocols/jabber/si.c:859
+#: ../libpurple/protocols/jabber/si.c:1094
 msgid "Resource"
 msgstr "Vahend"
 
-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1569
-#: ../libpurple/protocols/jabber/jabber.c:1583
-#: ../libpurple/protocols/jabber/jabber.c:1597
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1625
+#: ../libpurple/protocols/jabber/buddy.c:937
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1614
+#: ../libpurple/protocols/jabber/jabber.c:1628
+#: ../libpurple/protocols/jabber/jabber.c:1642
+#: ../libpurple/protocols/jabber/jabber.c:1656
 msgid "Priority"
 msgstr "Tähtsus"
 
-#: ../libpurple/protocols/jabber/buddy.c:1237
+#: ../libpurple/protocols/jabber/buddy.c:1241
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Keskmine nimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:979
-#: ../libpurple/protocols/oscar/oscar.c:3798
-#: ../libpurple/protocols/oscar/oscar.c:3811
+#: ../libpurple/protocols/jabber/buddy.c:1274
+#: ../libpurple/protocols/jabber/jabber.c:1004
+#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/oscar/oscar.c:3834
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Aadress"
 
-#: ../libpurple/protocols/jabber/buddy.c:1276
+#: ../libpurple/protocols/jabber/buddy.c:1280
 msgid "P.O. Box"
 msgstr "Postkast"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1945
+#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Un-hide From"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1949
+#: ../libpurple/protocols/jabber/buddy.c:1953
 msgid "Temporarily Hide From"
 msgstr ""
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1957
+#: ../libpurple/protocols/jabber/buddy.c:1961
 msgid "Cancel Presence Notification"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1964
+#: ../libpurple/protocols/jabber/buddy.c:1968
 msgid "(Re-)Request authorization"
 msgstr "Küsi (uuesti) autoriseerimist"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1973
+#: ../libpurple/protocols/jabber/buddy.c:1977
 msgid "Unsubscribe"
 msgstr "Lõpeta tellimus"
 
-#: ../libpurple/protocols/jabber/buddy.c:1988
-msgid "Log In"
-msgstr "Logi sisse"
-
 #: ../libpurple/protocols/jabber/buddy.c:1992
+msgid "Log In"
+msgstr "Logi sisse"
+
+#: ../libpurple/protocols/jabber/buddy.c:1996
 msgid "Log Out"
 msgstr "Logi välja"
 
-#: ../libpurple/protocols/jabber/buddy.c:2038
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/buddy.c:2042
+#: ../libpurple/protocols/jabber/jabber.c:1613
 msgid "Chatty"
 msgstr "Lobisev"
 
-#: ../libpurple/protocols/jabber/buddy.c:2042
+#: ../libpurple/protocols/jabber/buddy.c:2046
 msgid "Extended Away"
 msgstr "Kaua eemal"
 
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5858
-#: ../libpurple/protocols/sametime/sametime.c:3339
+#: ../libpurple/protocols/jabber/buddy.c:2048
+#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:726
+#: ../libpurple/protocols/oscar/oscar.c:5911
+#: ../libpurple/protocols/sametime/sametime.c:3347
 msgid "Do Not Disturb"
 msgstr "Mitte segada"
 
-#: ../libpurple/protocols/jabber/buddy.c:2211
+#: ../libpurple/protocols/jabber/buddy.c:2215
 msgid "JID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2215
-#: ../libpurple/protocols/jabber/buddy.c:2404
-#: ../libpurple/protocols/oscar/oscar.c:3721
+#: ../libpurple/protocols/jabber/buddy.c:2219
+#: ../libpurple/protocols/jabber/buddy.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:3744
 msgid "Last Name"
 msgstr "Perekonnanimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:2247
+#: ../libpurple/protocols/jabber/buddy.c:2251
 msgid "The following are the results of your search"
 msgstr "Järgneb sinu otsingu tulemus"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2332
+#: ../libpurple/protocols/jabber/buddy.c:2336
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2352
+#: ../libpurple/protocols/jabber/buddy.c:2356
 msgid "Directory Query Failed"
-msgstr "Tõrge kataloogipäringus"
-
-#: ../libpurple/protocols/jabber/buddy.c:2353
+msgstr "Kataloogipäringu tõrge"
+
+#: ../libpurple/protocols/jabber/buddy.c:2357
 msgid "Could not query the directory server."
 msgstr "Kataloogiserverisse pole võimalik päringuid teha."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2387
+#: ../libpurple/protocols/jabber/buddy.c:2391
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Serveri juhised: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2394
+#: ../libpurple/protocols/jabber/buddy.c:2398
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2414
+#: ../libpurple/protocols/jabber/buddy.c:2418
 #: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:3724
-#: ../libpurple/protocols/oscar/oscar.c:3733
+#: ../libpurple/protocols/oscar/oscar.c:3747
+#: ../libpurple/protocols/oscar/oscar.c:3756
 msgid "E-Mail Address"
 msgstr "E-posti aadress"
 
-#: ../libpurple/protocols/jabber/buddy.c:2423
-#: ../libpurple/protocols/jabber/buddy.c:2424
+#: ../libpurple/protocols/jabber/buddy.c:2427
+#: ../libpurple/protocols/jabber/buddy.c:2428
 msgid "Search for XMPP users"
 msgstr "XMPP kasutajate otsimine"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2425
+#: ../libpurple/protocols/jabber/buddy.c:2429
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5657
+#: ../libpurple/protocols/qq/sys_msg.c:177
+#: ../libpurple/protocols/qq/sys_msg.c:253
+#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/sametime/sametime.c:5665
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Otsing"
 
-#: ../libpurple/protocols/jabber/buddy.c:2440
+#: ../libpurple/protocols/jabber/buddy.c:2444
 msgid "Invalid Directory"
 msgstr "Vigane kataloog"
 
-#: ../libpurple/protocols/jabber/buddy.c:2457
+#: ../libpurple/protocols/jabber/buddy.c:2461
 msgid "Enter a User Directory"
 msgstr "Kasutajate kataloogi sisestamine"
 
-#: ../libpurple/protocols/jabber/buddy.c:2458
+#: ../libpurple/protocols/jabber/buddy.c:2462
 msgid "Select a user directory to search"
 msgstr "Vali kasutajate kataloog, millest otsida"
 
-#: ../libpurple/protocols/jabber/buddy.c:2461
+#: ../libpurple/protocols/jabber/buddy.c:2465
 msgid "Search Directory"
 msgstr "Kataloogist otsimine"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5342
-#: ../libpurple/protocols/yahoo/yahoochat.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:5391
+#: ../libpurple/protocols/yahoo/yahoochat.c:1057
 msgid "_Room:"
 msgstr "_Tuba:"
 
@@ -5412,7 +5631,7 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:151
 msgid "You require encryption, but it is not available on this server."
-msgstr ""
+msgstr "Sa nõuad krüptimist aga selles serveris pole see toetatud."
 
 #: ../libpurple/protocols/jabber/jabber.c:269
 #: ../libpurple/protocols/jabber/jabber.c:324
@@ -5420,15 +5639,19 @@
 msgid "Write error"
 msgstr "Kirjutamise viga"
 
-#: ../libpurple/protocols/jabber/jabber.c:424
-#: ../libpurple/protocols/jabber/jabber.c:463
+#: ../libpurple/protocols/jabber/jabber.c:401
+msgid "Ping timeout"
+msgstr "Pingimine ületas ajapiirangu"
+
+#: ../libpurple/protocols/jabber/jabber.c:448
+#: ../libpurple/protocols/jabber/jabber.c:488
 msgid "Read Error"
 msgstr "Lugemise viga"
 
-#: ../libpurple/protocols/jabber/jabber.c:500
+#: ../libpurple/protocols/jabber/jabber.c:525
 #: ../libpurple/protocols/oscar/flap_connection.c:398
-#: ../libpurple/protocols/yahoo/yahoo.c:2562
-#: ../libpurple/protocols/yahoo/yahoo.c:2594
+#: ../libpurple/protocols/yahoo/yahoo.c:2576
+#: ../libpurple/protocols/yahoo/yahoo.c:2608
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5437,194 +5660,194 @@
 "Selle serveriga pole võimalik ühendust luua:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:550
+#: ../libpurple/protocols/jabber/jabber.c:575
 msgid "Unable to create socket"
 msgstr "Soklit pole võimalik luua"
 
-#: ../libpurple/protocols/jabber/jabber.c:598
-#: ../libpurple/protocols/jabber/jabber.c:1092
+#: ../libpurple/protocols/jabber/jabber.c:625
+#: ../libpurple/protocols/jabber/jabber.c:1110
 msgid "Invalid XMPP ID"
 msgstr "Vigane XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:605
+#: ../libpurple/protocols/jabber/jabber.c:632
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Vigane XMPP ID. Domeen peab olema määratud."
 
-#: ../libpurple/protocols/jabber/jabber.c:683
+#: ../libpurple/protocols/jabber/jabber.c:710
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Kasutaja %s@%s registreerimine õnnestus"
 
-#: ../libpurple/protocols/jabber/jabber.c:689
+#: ../libpurple/protocols/jabber/jabber.c:716
 #, c-format
 msgid "Registration to %s successful"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:691
-#: ../libpurple/protocols/jabber/jabber.c:692
+#: ../libpurple/protocols/jabber/jabber.c:718
+#: ../libpurple/protocols/jabber/jabber.c:719
 msgid "Registration Successful"
 msgstr "Registreerimine õnnestus"
 
-#: ../libpurple/protocols/jabber/jabber.c:700
-#: ../libpurple/protocols/jabber/jabber.c:701
+#: ../libpurple/protocols/jabber/jabber.c:727
+#: ../libpurple/protocols/jabber/jabber.c:728
 msgid "Registration Failed"
 msgstr "Tõrge registreerimisel"
 
-#: ../libpurple/protocols/jabber/jabber.c:719
+#: ../libpurple/protocols/jabber/jabber.c:746
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:721
-#: ../libpurple/protocols/jabber/jabber.c:722
+#: ../libpurple/protocols/jabber/jabber.c:748
+#: ../libpurple/protocols/jabber/jabber.c:749
 msgid "Unregistration Successful"
 msgstr "Registreerimine edukalt tühistatud"
 
-#: ../libpurple/protocols/jabber/jabber.c:730
-#: ../libpurple/protocols/jabber/jabber.c:731
+#: ../libpurple/protocols/jabber/jabber.c:757
+#: ../libpurple/protocols/jabber/jabber.c:758
 msgid "Unregistration Failed"
 msgstr "Tõrge registreeringu tühistamisel"
 
-#: ../libpurple/protocols/jabber/jabber.c:891
-#: ../libpurple/protocols/jabber/jabber.c:892
+#: ../libpurple/protocols/jabber/jabber.c:924
+#: ../libpurple/protocols/jabber/jabber.c:925
 msgid "Already Registered"
 msgstr "Juba registreeritud"
 
-#: ../libpurple/protocols/jabber/jabber.c:989
-#: ../libpurple/protocols/oscar/oscar.c:3800
-#: ../libpurple/protocols/oscar/oscar.c:3813
+#: ../libpurple/protocols/jabber/jabber.c:1012
+#: ../libpurple/protocols/oscar/oscar.c:3823
+#: ../libpurple/protocols/oscar/oscar.c:3836
 msgid "State"
 msgstr "Olek"
 
-#: ../libpurple/protocols/jabber/jabber.c:994
+#: ../libpurple/protocols/jabber/jabber.c:1016
 msgid "Postal code"
 msgstr "Postiindeks"
 
-#: ../libpurple/protocols/jabber/jabber.c:999
+#: ../libpurple/protocols/jabber/jabber.c:1020
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:915
 #: ../libpurple/protocols/silc/util.c:563
 #: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/silc.c:689
 #: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/jabber.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1028
 msgid "Date"
 msgstr "Kuupäev"
 
-#: ../libpurple/protocols/jabber/jabber.c:1014
+#: ../libpurple/protocols/jabber/jabber.c:1032
 msgid "Unregister"
 msgstr "Tühista registreering"
 
-#: ../libpurple/protocols/jabber/jabber.c:1021
+#: ../libpurple/protocols/jabber/jabber.c:1039
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr "Konto registreeringu muutmiseks täida palun allpool olevad lahtrid."
 
-#: ../libpurple/protocols/jabber/jabber.c:1024
+#: ../libpurple/protocols/jabber/jabber.c:1042
 msgid "Please fill out the information below to register your new account."
 msgstr "Uue konto registreerimiseks täida palun allpool olevad lahtrid."
 
-#: ../libpurple/protocols/jabber/jabber.c:1032
-#: ../libpurple/protocols/jabber/jabber.c:1033
+#: ../libpurple/protocols/jabber/jabber.c:1050
+#: ../libpurple/protocols/jabber/jabber.c:1051
 msgid "Register New XMPP Account"
 msgstr "Uue XMPP konto registreerimine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1034
-#: ../libpurple/protocols/jabber/jabber.c:1043
+#: ../libpurple/protocols/jabber/jabber.c:1052
+#: ../libpurple/protocols/jabber/jabber.c:1061
 msgid "Register"
 msgstr "Registreeri"
 
-#: ../libpurple/protocols/jabber/jabber.c:1039
+#: ../libpurple/protocols/jabber/jabber.c:1057
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1040
+#: ../libpurple/protocols/jabber/jabber.c:1058
 #, c-format
 msgid "Register New Account at %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1043
+#: ../libpurple/protocols/jabber/jabber.c:1061
 msgid "Change Registration"
 msgstr "Registreeringu muutmine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1151
-#: ../libpurple/protocols/jabber/jabber.c:1152
+#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1171
 msgid "Error unregistering account"
 msgstr "Viga konto registreeringu tühistamisel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1157
-#: ../libpurple/protocols/jabber/jabber.c:1158
+#: ../libpurple/protocols/jabber/jabber.c:1176
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "Account successfully unregistered"
 msgstr "Konto registreering edukalt tühistatud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1315
+#: ../libpurple/protocols/jabber/jabber.c:1340
 msgid "Initializing Stream"
 msgstr "Andmevoo lähtestamine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/jabber/jabber.c:1345
 msgid "Initializing SSL/TLS"
 msgstr "SSL/TLS-i lähtestamine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1324
+#: ../libpurple/protocols/jabber/jabber.c:1349
 #: ../libpurple/protocols/msn/session.c:408
-#: ../libpurple/protocols/msnp9/session.c:361
+#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Authenticating"
 msgstr "Autentimine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1333
+#: ../libpurple/protocols/jabber/jabber.c:1358
 msgid "Re-initializing Stream"
 msgstr "Andmevaa taaslähtestamine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1427
-#: ../libpurple/protocols/jabber/jabber.c:1879
-#: ../libpurple/protocols/jabber/jabber.c:1922
-#: ../libpurple/protocols/jabber/jabber.c:1960
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5652
+#: ../libpurple/protocols/jabber/jabber.c:1452
+#: ../libpurple/protocols/jabber/jabber.c:1910
+#: ../libpurple/protocols/jabber/jabber.c:1953
+#: ../libpurple/protocols/jabber/jabber.c:1991
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:5705
 msgid "Not Authorized"
 msgstr "Autoriseerimata"
 
-#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Both"
 msgstr "Mõlemad"
 
-#: ../libpurple/protocols/jabber/jabber.c:1477
+#: ../libpurple/protocols/jabber/jabber.c:1502
 msgid "From (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "From"
 msgstr "Saatja"
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1507
 msgid "To"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1509
 msgid "None (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1511
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Puudub"
 
-#: ../libpurple/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Subscription"
 msgstr "Tellimus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1571
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/jabber/jabber.c:1599
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1627
+#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:1527
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1616
+#: ../libpurple/protocols/jabber/jabber.c:1630
+#: ../libpurple/protocols/jabber/jabber.c:1644
+#: ../libpurple/protocols/jabber/jabber.c:1658
 #: ../libpurple/protocols/jabber/usermood.c:184
 #: ../libpurple/protocols/silc/buddy.c:1560
 #: ../libpurple/protocols/silc/ops.c:1212
@@ -5633,437 +5856,441 @@
 msgid "Mood"
 msgstr "Meeleolu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1507
-#: ../libpurple/protocols/msn/msn.c:647
-msgid "Current media"
-msgstr "Praegune meedia"
-
-#: ../libpurple/protocols/jabber/jabber.c:1572
-#: ../libpurple/protocols/jabber/jabber.c:1586
-#: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1628
+#: ../libpurple/protocols/jabber/jabber.c:1536
+#: ../libpurple/protocols/msn/msn.c:642
+msgid "Now Listening"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1617
+#: ../libpurple/protocols/jabber/jabber.c:1631
+#: ../libpurple/protocols/jabber/jabber.c:1645
+#: ../libpurple/protocols/jabber/jabber.c:1659
 msgid "Mood Text"
 msgstr "Tujutekst"
 
-#: ../libpurple/protocols/jabber/jabber.c:1574
-#: ../libpurple/protocols/jabber/jabber.c:1588
-#: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1616
-#: ../libpurple/protocols/jabber/jabber.c:1630
+#: ../libpurple/protocols/jabber/jabber.c:1605
+#: ../libpurple/protocols/jabber/jabber.c:1619
+#: ../libpurple/protocols/jabber/jabber.c:1633
+#: ../libpurple/protocols/jabber/jabber.c:1647
+#: ../libpurple/protocols/jabber/jabber.c:1661
 msgid "Allow Buzz"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1648
+#: ../libpurple/protocols/jabber/jabber.c:1679
 msgid "Tune Artist"
 msgstr "Loo esitaja"
 
-#: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/jabber/jabber.c:1680
 msgid "Tune Title"
 msgstr "Loo pealkiri"
 
-#: ../libpurple/protocols/jabber/jabber.c:1650
+#: ../libpurple/protocols/jabber/jabber.c:1681
 msgid "Tune Album"
 msgstr "Loo album"
 
-#: ../libpurple/protocols/jabber/jabber.c:1651
+#: ../libpurple/protocols/jabber/jabber.c:1682
 msgid "Tune Genre"
 msgstr "Loo žanr"
 
-#: ../libpurple/protocols/jabber/jabber.c:1652
+#: ../libpurple/protocols/jabber/jabber.c:1683
 msgid "Tune Comment"
 msgstr "Loo kommentaar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1653
+#: ../libpurple/protocols/jabber/jabber.c:1684
 msgid "Tune Track"
 msgstr "Loo rada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1654
+#: ../libpurple/protocols/jabber/jabber.c:1685
 msgid "Tune Time"
 msgstr "Loo kestus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/jabber/jabber.c:1686
 msgid "Tune Year"
 msgstr "Loo aasta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1656
+#: ../libpurple/protocols/jabber/jabber.c:1687
 msgid "Tune URL"
 msgstr "Loo URL"
 
-#: ../libpurple/protocols/jabber/jabber.c:1672
+#: ../libpurple/protocols/jabber/jabber.c:1703
 msgid "Password Changed"
 msgstr "Parool muudetud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1673
+#: ../libpurple/protocols/jabber/jabber.c:1704
 msgid "Your password has been changed."
 msgstr "Sinu parool on muudetud."
 
-#: ../libpurple/protocols/jabber/jabber.c:1679
-#: ../libpurple/protocols/jabber/jabber.c:1680
+#: ../libpurple/protocols/jabber/jabber.c:1710
+#: ../libpurple/protocols/jabber/jabber.c:1711
 msgid "Error changing password"
 msgstr "Viga parooli muutmisel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1737
+#: ../libpurple/protocols/jabber/jabber.c:1768
 msgid "Password (again)"
 msgstr "Parool (uuesti)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1743
-#: ../libpurple/protocols/jabber/jabber.c:1744
+#: ../libpurple/protocols/jabber/jabber.c:1774
+#: ../libpurple/protocols/jabber/jabber.c:1775
 msgid "Change XMPP Password"
 msgstr "XMPP parooli muutmine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1744
+#: ../libpurple/protocols/jabber/jabber.c:1775
 msgid "Please enter your new password"
 msgstr "Palun sisesta uus parool"
 
-#: ../libpurple/protocols/jabber/jabber.c:1758
-#: ../libpurple/protocols/oscar/oscar.c:6438
+#: ../libpurple/protocols/jabber/jabber.c:1789
+#: ../libpurple/protocols/oscar/oscar.c:6491
 #: ../libpurple/protocols/silc/silc.c:1236
-#: ../libpurple/protocols/silc10/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:1010
 msgid "Set User Info..."
 msgstr "Määra kasutajateave..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1763
-#: ../libpurple/protocols/oscar/oscar.c:6449
+#: ../libpurple/protocols/jabber/jabber.c:1794
+#: ../libpurple/protocols/oscar/oscar.c:6502
 #: ../libpurple/protocols/silc/silc.c:1232
-#: ../libpurple/protocols/silc10/silc.c:1003
+#: ../libpurple/protocols/silc10/silc.c:1006
 msgid "Change Password..."
 msgstr "Parooli muutmine..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1768
+#: ../libpurple/protocols/jabber/jabber.c:1799
 msgid "Search for Users..."
 msgstr "Kasutajate otsimine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1890
 msgid "Bad Request"
 msgstr "Vigane päring"
 
-#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1892
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1863
+#: ../libpurple/protocols/jabber/jabber.c:1894
 msgid "Feature Not Implemented"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:1896
 msgid "Forbidden"
 msgstr "Keelatud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1867
+#: ../libpurple/protocols/jabber/jabber.c:1898
 msgid "Gone"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1869
-#: ../libpurple/protocols/jabber/jabber.c:1950
+#: ../libpurple/protocols/jabber/jabber.c:1900
+#: ../libpurple/protocols/jabber/jabber.c:1981
 msgid "Internal Server Error"
 msgstr "Serveri sisemine viga"
 
-#: ../libpurple/protocols/jabber/jabber.c:1871
+#: ../libpurple/protocols/jabber/jabber.c:1902
 msgid "Item Not Found"
 msgstr "Kirjet ei leitud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1873
+#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Malformed XMPP ID"
 msgstr "Vigaselt vormindatud XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1875
+#: ../libpurple/protocols/jabber/jabber.c:1906
 msgid "Not Acceptable"
 msgstr "Pole aktsepteeritav"
 
-#: ../libpurple/protocols/jabber/jabber.c:1877
+#: ../libpurple/protocols/jabber/jabber.c:1908
 msgid "Not Allowed"
 msgstr "Pole lubatud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1881
+#: ../libpurple/protocols/jabber/jabber.c:1912
 msgid "Payment Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1883
+#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Recipient Unavailable"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/jabber.c:1918
 msgid "Registration Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1889
+#: ../libpurple/protocols/jabber/jabber.c:1920
 msgid "Remote Server Not Found"
 msgstr "Kaugserverit ei leitud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1891
+#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Remote Server Timeout"
 msgstr "Kaugserver ületas ajapiirangu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1893
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Server Overloaded"
 msgstr "Server on ülekoormatud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1895
+#: ../libpurple/protocols/jabber/jabber.c:1926
 msgid "Service Unavailable"
 msgstr "Teenus pole saadaval"
 
-#: ../libpurple/protocols/jabber/jabber.c:1897
+#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Subscription Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1899
+#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Unexpected Request"
 msgstr "Ootamatu päring"
 
-#: ../libpurple/protocols/jabber/jabber.c:1907
+#: ../libpurple/protocols/jabber/jabber.c:1938
 msgid "Authorization Aborted"
 msgstr "Volituste andmine katkestati"
 
-#: ../libpurple/protocols/jabber/jabber.c:1909
+#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Incorrect encoding in authorization"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
-msgid "Invalid authzid"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1913
-msgid "Invalid Authorization Mechanism"
-msgstr "Vigane volituste andmise mehhanism"
-
-#: ../libpurple/protocols/jabber/jabber.c:1916
-msgid "Authorization mechanism too weak"
-msgstr "Volituste andmise mehhanism on liiga nõrk"
-
-#: ../libpurple/protocols/jabber/jabber.c:1924
-msgid "Temporary Authentication Failure"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1927
-msgid "Authentication Failure"
-msgstr "Tõrge autentimisel"
-
-#: ../libpurple/protocols/jabber/jabber.c:1935
-msgid "Bad Format"
-msgstr "Vigane vorming"
-
-#: ../libpurple/protocols/jabber/jabber.c:1937
-msgid "Bad Namespace Prefix"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1940
-msgid "Resource Conflict"
-msgstr "Vahendi vastuolu"
-
 #: ../libpurple/protocols/jabber/jabber.c:1942
-#: ../libpurple/protocols/silc/silc.c:350
-#: ../libpurple/protocols/silc10/ops.c:1720
-msgid "Connection Timeout"
+msgid "Invalid authzid"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/jabber.c:1944
+msgid "Invalid Authorization Mechanism"
+msgstr "Vigane volituste andmise mehhanism"
+
+#: ../libpurple/protocols/jabber/jabber.c:1947
+msgid "Authorization mechanism too weak"
+msgstr "Volituste andmise mehhanism on liiga nõrk"
+
+#: ../libpurple/protocols/jabber/jabber.c:1955
+msgid "Temporary Authentication Failure"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1958
+msgid "Authentication Failure"
+msgstr "Tõrge autentimisel"
+
+#: ../libpurple/protocols/jabber/jabber.c:1966
+msgid "Bad Format"
+msgstr "Vigane vorming"
+
+#: ../libpurple/protocols/jabber/jabber.c:1968
+msgid "Bad Namespace Prefix"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1971
+msgid "Resource Conflict"
+msgstr "Vahendi vastuolu"
+
+#: ../libpurple/protocols/jabber/jabber.c:1973
+#: ../libpurple/protocols/silc/silc.c:350
+#: ../libpurple/protocols/silc10/ops.c:1725
+msgid "Connection Timeout"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1975
 msgid "Host Gone"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1946
+#: ../libpurple/protocols/jabber/jabber.c:1977
 msgid "Host Unknown"
 msgstr "Tundmatu host"
 
-#: ../libpurple/protocols/jabber/jabber.c:1948
+#: ../libpurple/protocols/jabber/jabber.c:1979
 msgid "Improper Addressing"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1952
+msgstr "Väär adresseering"
+
+#: ../libpurple/protocols/jabber/jabber.c:1983
 msgid "Invalid ID"
 msgstr "Vigane ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1954
+#: ../libpurple/protocols/jabber/jabber.c:1985
 msgid "Invalid Namespace"
 msgstr "Vigane nimeruum"
 
-#: ../libpurple/protocols/jabber/jabber.c:1956
+#: ../libpurple/protocols/jabber/jabber.c:1987
 msgid "Invalid XML"
 msgstr "Vigane XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1958
+#: ../libpurple/protocols/jabber/jabber.c:1989
 msgid "Non-matching Hosts"
 msgstr "Mittevastavad hostid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1962
+#: ../libpurple/protocols/jabber/jabber.c:1993
 msgid "Policy Violation"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1964
+#: ../libpurple/protocols/jabber/jabber.c:1995
 msgid "Remote Connection Failed"
 msgstr "Tõrge kaugühenduse loomisel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1966
+#: ../libpurple/protocols/jabber/jabber.c:1997
 msgid "Resource Constraint"
 msgstr "Vahendi piirang"
 
-#: ../libpurple/protocols/jabber/jabber.c:1968
+#: ../libpurple/protocols/jabber/jabber.c:1999
 msgid "Restricted XML"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1970
+#: ../libpurple/protocols/jabber/jabber.c:2001
 msgid "See Other Host"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1972
+#: ../libpurple/protocols/jabber/jabber.c:2003
 msgid "System Shutdown"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1974
+#: ../libpurple/protocols/jabber/jabber.c:2005
 msgid "Undefined Condition"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1976
+#: ../libpurple/protocols/jabber/jabber.c:2007
 msgid "Unsupported Encoding"
 msgstr "Toetamata kooditabel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1978
+#: ../libpurple/protocols/jabber/jabber.c:2009
 msgid "Unsupported Stanza Type"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1980
+#: ../libpurple/protocols/jabber/jabber.c:2011
 msgid "Unsupported Version"
 msgstr "Toetamata versioon"
 
-#: ../libpurple/protocols/jabber/jabber.c:1982
+#: ../libpurple/protocols/jabber/jabber.c:2013
 msgid "XML Not Well Formed"
 msgstr "XML pole korrektselt vormindatud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1984
+#: ../libpurple/protocols/jabber/jabber.c:2015
 msgid "Stream Error"
 msgstr "Voo viga"
 
-#: ../libpurple/protocols/jabber/jabber.c:2069
+#: ../libpurple/protocols/jabber/jabber.c:2100
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Kasutajat %s pole võimalik tõrjuda"
 
-#: ../libpurple/protocols/jabber/jabber.c:2089
+#: ../libpurple/protocols/jabber/jabber.c:2120
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2094
+#: ../libpurple/protocols/jabber/jabber.c:2125
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2113
+#: ../libpurple/protocols/jabber/jabber.c:2144
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Tundmatu roll: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2118
+#: ../libpurple/protocols/jabber/jabber.c:2149
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Kasutajale pole võimalik rolli \"%s\" määrata: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2171
+#: ../libpurple/protocols/jabber/jabber.c:2202
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Kasutajat pole võimalik välja lüüa: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2202
+#: ../libpurple/protocols/jabber/jabber.c:2233
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "Kasutajat %s pole võimalik pingida"
 
-#: ../libpurple/protocols/jabber/jabber.c:2220
-#: ../libpurple/protocols/jabber/jabber.c:2231
+#: ../libpurple/protocols/jabber/jabber.c:2251
+#: ../libpurple/protocols/jabber/jabber.c:2262
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2226
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
-
 #: ../libpurple/protocols/jabber/jabber.c:2257
 #, c-format
+msgid "Unable to buzz, because user %s might be offline."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2288
+#, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2279
-#: ../libpurple/protocols/yahoo/yahoo.c:4130
+#. Yahoo only supports one attention command: the 'buzz'.
+#. This is index number YAHOO_BUZZ.
+#: ../libpurple/protocols/jabber/jabber.c:2308
+#: ../libpurple/protocols/yahoo/yahoo.c:4138
 msgid "Buzz"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2280
+#: ../libpurple/protocols/jabber/jabber.c:2309
 #: ../libpurple/protocols/jabber/message.c:308
-#: ../libpurple/protocols/yahoo/yahoo.c:4131
+#: ../libpurple/protocols/yahoo/yahoo.c:4139
 #, c-format
 msgid "%s has buzzed you!"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2281
-#: ../libpurple/protocols/yahoo/yahoo.c:4132
+#: ../libpurple/protocols/jabber/jabber.c:2309
+#: ../libpurple/protocols/yahoo/yahoo.c:4139
 #, c-format
 msgid "Buzzing %s..."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2313
+#: ../libpurple/protocols/jabber/jabber.c:2340
 msgid "config:  Configure a chat room."
 msgstr "config:  Jututoa seadistamine."
 
-#: ../libpurple/protocols/jabber/jabber.c:2317
+#: ../libpurple/protocols/jabber/jabber.c:2344
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Jututoa seadistamine."
 
-#: ../libpurple/protocols/jabber/jabber.c:2326
+#: ../libpurple/protocols/jabber/jabber.c:2353
 msgid "part [room]:  Leave the room."
 msgstr "part [tuba]:  Toast lahkumine."
 
-#: ../libpurple/protocols/jabber/jabber.c:2331
+#: ../libpurple/protocols/jabber/jabber.c:2358
 msgid "register:  Register with a chat room."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2337
+msgstr "register:  Jututuppa registreerumine."
+
+#: ../libpurple/protocols/jabber/jabber.c:2364
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [uus teema]:  Teema vaatamine või muutmine."
 
-#: ../libpurple/protocols/jabber/jabber.c:2343
+#: ../libpurple/protocols/jabber/jabber.c:2370
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;kasutaja&gt; [tuba]:  Kasutaja tõrjumine jututoast."
 
-#: ../libpurple/protocols/jabber/jabber.c:2349
+#: ../libpurple/protocols/jabber/jabber.c:2376
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2355
+#: ../libpurple/protocols/jabber/jabber.c:2382
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2361
+"role &lt;kasutaja&gt; &lt;moderator|participant|visitor|none&gt;: Kasutaja "
+"rolli määramine selle ruumi jaoks."
+
+#: ../libpurple/protocols/jabber/jabber.c:2388
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;kasutaja&gt; [sõnum]:  Kasutaja kutsumine jututuppa."
 
-#: ../libpurple/protocols/jabber/jabber.c:2367
+#: ../libpurple/protocols/jabber/jabber.c:2394
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;tuba&gt; [server]:  Serveris asuva jututoaga ühinemine."
 
-#: ../libpurple/protocols/jabber/jabber.c:2373
+#: ../libpurple/protocols/jabber/jabber.c:2400
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;kasutaja&gt; [tuba]:  Kasutaja toast väljalöömine."
 
-#: ../libpurple/protocols/jabber/jabber.c:2378
+#: ../libpurple/protocols/jabber/jabber.c:2405
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;kasutaja&gt; &lt;sõnum&gt;:  Erasõnumi saatmine teisele kasutajale."
 
-#: ../libpurple/protocols/jabber/jabber.c:2384
+#: ../libpurple/protocols/jabber/jabber.c:2411
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2389
-#: ../libpurple/protocols/yahoo/yahoo.c:4156
+msgstr "ping &lt;jid&gt;:\tKasutaja, komponendi või serveri pingimine."
+
+#: ../libpurple/protocols/jabber/jabber.c:2416
+#: ../libpurple/protocols/yahoo/yahoo.c:4162
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
@@ -6083,13 +6310,13 @@
 msgstr "XMPP protokolli plugin"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:509
+#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:478
 msgid "Domain"
 msgstr "Domeen"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Require SSL/TLS"
-msgstr ""
+msgstr "SSL/TLS on vajalik"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:217
 msgid "Force old (port 5223) SSL"
@@ -6097,11 +6324,11 @@
 
 #: ../libpurple/protocols/jabber/libxmpp.c:222
 msgid "Allow plaintext auth over unencrypted streams"
-msgstr "Avatekstiline autentimise on krüptimata andmevoo lubatud"
+msgstr "Avatekstiline autentimise on üle krüptimata andmevoo lubatud"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:227
-#: ../libpurple/protocols/myspace/myspace.c:3305
-#: ../libpurple/protocols/simple/simple.c:2089
+#: ../libpurple/protocols/myspace/myspace.c:3466
+#: ../libpurple/protocols/simple/simple.c:2105
 msgid "Connect port"
 msgstr "Ühendumisport"
 
@@ -6109,12 +6336,16 @@
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:231
-#: ../libpurple/protocols/myspace/myspace.c:3302
+#: ../libpurple/protocols/myspace/myspace.c:3463
 #: ../libpurple/protocols/silc/silc.c:2057
-#: ../libpurple/protocols/silc10/silc.c:1860 ../pidgin/gtkaccount.c:840
+#: ../libpurple/protocols/silc10/silc.c:1863 ../pidgin/gtkaccount.c:809
 msgid "Connect server"
 msgstr "Ühendumisserver"
 
+#: ../libpurple/protocols/jabber/libxmpp.c:236
+msgid "File transfer proxies"
+msgstr "Failiülekande proksid"
+
 #: ../libpurple/protocols/jabber/message.c:106
 #, c-format
 msgid "%s has left the conversation."
@@ -6153,16 +6384,16 @@
 msgid "XML Parse error"
 msgstr "XML'i parsimise viga"
 
-#: ../libpurple/protocols/jabber/presence.c:435
+#: ../libpurple/protocols/jabber/presence.c:441
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:516
-#: ../libpurple/protocols/jabber/presence.c:517
+#: ../libpurple/protocols/jabber/presence.c:522
+#: ../libpurple/protocols/jabber/presence.c:523
 msgid "Create New Room"
 msgstr "Uue ruumi loomine"
 
-#: ../libpurple/protocols/jabber/presence.c:518
+#: ../libpurple/protocols/jabber/presence.c:524
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6170,58 +6401,60 @@
 "Sa lood uut tuba. Kas sa soovid sellele seadistusi määrata või nõustud "
 "vaikimisi seadistustega?"
 
-#: ../libpurple/protocols/jabber/presence.c:524
+#: ../libpurple/protocols/jabber/presence.c:530
 msgid "_Configure Room"
 msgstr "_Seadista tuba"
 
-#: ../libpurple/protocols/jabber/presence.c:525
+#: ../libpurple/protocols/jabber/presence.c:531
 msgid "_Accept Defaults"
 msgstr "_Nõustu vaikeväärtustega"
 
-#: ../libpurple/protocols/jabber/presence.c:567
+#: ../libpurple/protocols/jabber/presence.c:573
 #, c-format
 msgid "Error in chat %s"
 msgstr "Viga vestluses %s"
 
-#: ../libpurple/protocols/jabber/presence.c:571
+#: ../libpurple/protocols/jabber/presence.c:577
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Viga vestlusega %s ühinemisel"
 
-#: ../libpurple/protocols/jabber/si.c:775
+#: ../libpurple/protocols/jabber/si.c:1009
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
-
-#: ../libpurple/protocols/jabber/si.c:776
-#: ../libpurple/protocols/jabber/si.c:777
-#: ../libpurple/protocols/jabber/si.c:845
+"Kasutajale %s pole võimalik faili saata kuna kasutaja ei toeta "
+"failiülekandeid"
+
+#: ../libpurple/protocols/jabber/si.c:1010
+#: ../libpurple/protocols/jabber/si.c:1011
+#: ../libpurple/protocols/jabber/si.c:1080
 msgid "File Send Failed"
 msgstr "Tõrge faili saatmisel"
 
-#: ../libpurple/protocols/jabber/si.c:838
+#: ../libpurple/protocols/jabber/si.c:1073
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "Kasutajale %s pole võimalik faili saata, JID on vigane."
 
-#: ../libpurple/protocols/jabber/si.c:840
+#: ../libpurple/protocols/jabber/si.c:1075
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "Kasutajale %s pole võimalik faili saata, kasutaja pole võrku ühendatud"
 
-#: ../libpurple/protocols/jabber/si.c:842
+#: ../libpurple/protocols/jabber/si.c:1077
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:857
-#, c-format
-msgid "Please select which resource of %s you would like to send a file to"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/si.c:873
+#: ../libpurple/protocols/jabber/si.c:1092
+#, c-format
+msgid "Please select the resource of %s to which you would like to send a file"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/si.c:1108
 msgid "Select a Resource"
-msgstr ""
+msgstr "Vahendi valimine"
 
 #: ../libpurple/protocols/jabber/usermood.c:197
 #: ../libpurple/protocols/jabber/usermood.c:198
@@ -6254,6 +6487,8 @@
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
+"See teave on nähtav kõigile sinu kontaktide nimekirjas olijatele, sestap "
+"määra teemakohased andmed."
 
 #: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
@@ -6352,7 +6587,7 @@
 
 #: ../libpurple/protocols/msn/error.c:75
 #: ../libpurple/protocols/msnp9/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:756
+#: ../libpurple/protocols/zephyr/zephyr.c:760
 msgid "User is offline"
 msgstr "Kasutaja pole ühendatud"
 
@@ -6418,7 +6653,7 @@
 
 #: ../libpurple/protocols/msn/error.c:124
 #: ../libpurple/protocols/msnp9/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:120
+#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Not logged in"
 msgstr "Pole sisse logitud"
 
@@ -6538,9 +6773,9 @@
 
 #: ../libpurple/protocols/msn/error.c:222
 #: ../libpurple/protocols/msnp9/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1377
+#: ../libpurple/protocols/oscar/oscar.c:1418
 #: ../libpurple/protocols/silc/silc.c:338
-#: ../libpurple/protocols/silc10/ops.c:1709
+#: ../libpurple/protocols/silc10/ops.c:1713
 #: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1393
 msgid "Authentication failed"
 msgstr "Tõrge autentimisel"
@@ -6582,446 +6817,465 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN-i viga: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:130 ../libpurple/protocols/msnp9/msn.c:130
+#: ../libpurple/protocols/msn/msn.c:128 ../libpurple/protocols/msnp9/msn.c:129
 msgid "Nudge"
 msgstr "Müks"
 
-#: ../libpurple/protocols/msn/msn.c:131 ../libpurple/protocols/msnp9/msn.c:131
+#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "%s has nudged you!"
 msgstr "%s müksas sind!"
 
-#: ../libpurple/protocols/msn/msn.c:132 ../libpurple/protocols/msnp9/msn.c:132
+#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "Nudging %s..."
 msgstr "Kasutaja %s müksamine..."
 
-#: ../libpurple/protocols/msn/msn.c:174 ../libpurple/protocols/msnp9/msn.c:174
+#: ../libpurple/protocols/msn/msn.c:170 ../libpurple/protocols/msnp9/msn.c:171
 msgid "Your new MSN friendly name is too long."
 msgstr "Sinu MSN-i sõbralik nimi on liiga pikk."
 
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msnp9/msn.c:282
+#: ../libpurple/protocols/msn/msn.c:282 ../libpurple/protocols/msnp9/msn.c:279
 msgid "Set your friendly name."
 msgstr "Sõbraliku nime määramine."
 
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msnp9/msn.c:283
+#: ../libpurple/protocols/msn/msn.c:283 ../libpurple/protocols/msnp9/msn.c:280
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Selle nimega näevad sind MSN-is olevad sõbrad."
 
-#: ../libpurple/protocols/msn/msn.c:305 ../libpurple/protocols/msnp9/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:301 ../libpurple/protocols/msnp9/msn.c:298
 msgid "Set your home phone number."
 msgstr "Oma kodutelefoni numbri määramine."
 
-#: ../libpurple/protocols/msn/msn.c:322 ../libpurple/protocols/msnp9/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:318 ../libpurple/protocols/msnp9/msn.c:315
 msgid "Set your work phone number."
 msgstr "Oma töötelefoni numbri määramine."
 
-#: ../libpurple/protocols/msn/msn.c:339 ../libpurple/protocols/msnp9/msn.c:335
+#: ../libpurple/protocols/msn/msn.c:335 ../libpurple/protocols/msnp9/msn.c:332
 msgid "Set your mobile phone number."
 msgstr "Oma mobiiltelefoni numbri määramine."
 
-#: ../libpurple/protocols/msn/msn.c:354 ../libpurple/protocols/msnp9/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:350 ../libpurple/protocols/msnp9/msn.c:347
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:355 ../libpurple/protocols/msnp9/msn.c:351
+#: ../libpurple/protocols/msn/msn.c:351 ../libpurple/protocols/msnp9/msn.c:348
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:361 ../libpurple/protocols/msnp9/msn.c:357
+#: ../libpurple/protocols/msn/msn.c:357 ../libpurple/protocols/msnp9/msn.c:354
 msgid "Allow"
 msgstr "Luba"
 
-#: ../libpurple/protocols/msn/msn.c:362 ../libpurple/protocols/msnp9/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:358 ../libpurple/protocols/msnp9/msn.c:355
 msgid "Disallow"
 msgstr "Ära luba"
 
-#: ../libpurple/protocols/msn/msn.c:378 ../libpurple/protocols/msnp9/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:374 ../libpurple/protocols/msnp9/msn.c:371
 msgid "This Hotmail account may not be active."
 msgstr "See Hotmaili konto võib mitte aktiivne olla."
 
-#: ../libpurple/protocols/msn/msn.c:404 ../libpurple/protocols/msnp9/msn.c:400
+#: ../libpurple/protocols/msn/msn.c:400 ../libpurple/protocols/msnp9/msn.c:397
 msgid "Send a mobile message."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:406 ../libpurple/protocols/msnp9/msn.c:402
+#: ../libpurple/protocols/msn/msn.c:402 ../libpurple/protocols/msnp9/msn.c:399
 msgid "Page"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:688 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/msnp9/msn.c:583
+#: ../libpurple/protocols/msn/msn.c:665 ../libpurple/protocols/msnp9/msn.c:567
+msgid "Home Phone Number"
+msgstr "Kodutelefoni number"
+
+#: ../libpurple/protocols/msn/msn.c:669 ../libpurple/protocols/msnp9/msn.c:571
+msgid "Work Phone Number"
+msgstr "Töötelefoni number"
+
+#: ../libpurple/protocols/msn/msn.c:673 ../libpurple/protocols/msnp9/msn.c:575
+msgid "Mobile Phone Number"
+msgstr "Mobiiltelefoni number"
+
+#: ../libpurple/protocols/msn/msn.c:696 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/msnp9/msn.c:594
 #: ../libpurple/protocols/msnp9/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3088
-#: ../libpurple/protocols/yahoo/yahoo.c:3772
+#: ../libpurple/protocols/yahoo/yahoo.c:3114
+#: ../libpurple/protocols/yahoo/yahoo.c:3798
 msgid "Be Right Back"
 msgstr "Tulen kohe tagasi"
 
-#: ../libpurple/protocols/msn/msn.c:694 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/msnp9/msn.c:587
+#: ../libpurple/protocols/msn/msn.c:702 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msnp9/msn.c:598
 #: ../libpurple/protocols/msnp9/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2839
-#: ../libpurple/protocols/novell/novell.c:2969
+#: ../libpurple/protocols/novell/novell.c:2840
+#: ../libpurple/protocols/novell/novell.c:2970
 #: ../libpurple/protocols/silc/buddy.c:1483
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1483
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3090
-#: ../libpurple/protocols/yahoo/yahoo.c:3775
+#: ../libpurple/protocols/yahoo/yahoo.c:3116
+#: ../libpurple/protocols/yahoo/yahoo.c:3801
 msgid "Busy"
 msgstr "Hõivatud"
 
-#: ../libpurple/protocols/msn/msn.c:699 ../libpurple/protocols/msnp9/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3098
-#: ../libpurple/protocols/yahoo/yahoo.c:3787
+#: ../libpurple/protocols/msn/msn.c:707 ../libpurple/protocols/msnp9/msn.c:602
+#: ../libpurple/protocols/yahoo/yahoo.c:3124
+#: ../libpurple/protocols/yahoo/yahoo.c:3813
 msgid "On the Phone"
 msgstr "Räägin telefoniga"
 
-#: ../libpurple/protocols/msn/msn.c:704 ../libpurple/protocols/msnp9/msn.c:595
-#: ../libpurple/protocols/yahoo/yahoo.c:3102
-#: ../libpurple/protocols/yahoo/yahoo.c:3793
+#: ../libpurple/protocols/msn/msn.c:712 ../libpurple/protocols/msnp9/msn.c:606
+#: ../libpurple/protocols/yahoo/yahoo.c:3128
+#: ../libpurple/protocols/yahoo/yahoo.c:3819
 msgid "Out to Lunch"
 msgstr "Lõunal"
 
-#: ../libpurple/protocols/msn/msn.c:723
+#. primitive
+#. ID
+#. name - use default
+#. savable
+#. should be user_settable some day
+#. independent
+#: ../libpurple/protocols/msn/msn.c:731
+#: ../libpurple/protocols/myspace/myspace.c:170
 msgid "Artist"
 msgstr "Esitaja"
 
-#: ../libpurple/protocols/msn/msn.c:724
+#: ../libpurple/protocols/msn/msn.c:732
 msgid "Album"
 msgstr "Album"
 
-#: ../libpurple/protocols/msn/msn.c:742 ../libpurple/protocols/msnp9/msn.c:623
+#: ../libpurple/protocols/msn/msn.c:750 ../libpurple/protocols/msnp9/msn.c:634
 msgid "Set Friendly Name..."
 msgstr "Määra sõbralik nimi..."
 
-#: ../libpurple/protocols/msn/msn.c:747 ../libpurple/protocols/msnp9/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:755 ../libpurple/protocols/msnp9/msn.c:639
 msgid "Set Home Phone Number..."
 msgstr "Määra kodutelefoni number..."
 
-#: ../libpurple/protocols/msn/msn.c:751 ../libpurple/protocols/msnp9/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:759 ../libpurple/protocols/msnp9/msn.c:643
 msgid "Set Work Phone Number..."
 msgstr "Määra töötelefoni number..."
 
-#: ../libpurple/protocols/msn/msn.c:755 ../libpurple/protocols/msnp9/msn.c:636
+#: ../libpurple/protocols/msn/msn.c:763 ../libpurple/protocols/msnp9/msn.c:647
 msgid "Set Mobile Phone Number..."
 msgstr "Määra mobiiltelefoni number..."
 
-#: ../libpurple/protocols/msn/msn.c:761 ../libpurple/protocols/msnp9/msn.c:642
+#: ../libpurple/protocols/msn/msn.c:769 ../libpurple/protocols/msnp9/msn.c:653
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Mobiilseadmete lubamine/keelamine"
 
-#: ../libpurple/protocols/msn/msn.c:766 ../libpurple/protocols/msnp9/msn.c:647
+#: ../libpurple/protocols/msn/msn.c:774 ../libpurple/protocols/msnp9/msn.c:658
 msgid "Allow/Disallow Mobile Pages..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:777 ../libpurple/protocols/msnp9/msn.c:658
+#: ../libpurple/protocols/msn/msn.c:785 ../libpurple/protocols/msnp9/msn.c:669
 msgid "Open Hotmail Inbox"
 msgstr "Ava Hotmaili postkast"
 
-#: ../libpurple/protocols/msn/msn.c:801 ../libpurple/protocols/msnp9/msn.c:682
+#: ../libpurple/protocols/msn/msn.c:809 ../libpurple/protocols/msnp9/msn.c:693
 msgid "Send to Mobile"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:811 ../libpurple/protocols/msnp9/msn.c:692
-#: ../libpurple/protocols/novell/novell.c:3425
+#: ../libpurple/protocols/msn/msn.c:819 ../libpurple/protocols/msnp9/msn.c:703
+#: ../libpurple/protocols/novell/novell.c:3426
 msgid "Initiate _Chat"
 msgstr "Algata _jututuba"
 
-#: ../libpurple/protocols/msn/msn.c:849 ../libpurple/protocols/msnp9/msn.c:731
+#: ../libpurple/protocols/msn/msn.c:857 ../libpurple/protocols/msnp9/msn.c:742
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
-msgstr "MSN-i jaoks on vaja SSL-i tuge. Palun paigalda toetatud SSL-teek."
-
-#: ../libpurple/protocols/msn/msn.c:879 ../libpurple/protocols/msnp9/msn.c:761
+msgstr "MSN-ile on vaja SSL-i tuge. Palun paigalda toetatud SSL-teek."
+
+#: ../libpurple/protocols/msn/msn.c:887 ../libpurple/protocols/msnp9/msn.c:772
 msgid "Failed to connect to server."
 msgstr "Tõrge serveriga ühendumisel."
 
-#: ../libpurple/protocols/msn/msn.c:1663 ../libpurple/protocols/msn/msn.c:2006
-#: ../libpurple/protocols/msnp9/msn.c:1516
-#: ../libpurple/protocols/msnp9/msn.c:1859
+#: ../libpurple/protocols/msn/msn.c:1671 ../libpurple/protocols/msn/msn.c:2014
+#: ../libpurple/protocols/msnp9/msn.c:1527
+#: ../libpurple/protocols/msnp9/msn.c:1870
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Viga profiili vastuvõtmisel"
 
-#: ../libpurple/protocols/msn/msn.c:1729
-#: ../libpurple/protocols/msnp9/msn.c:1582 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:360
+#: ../libpurple/protocols/msn/msn.c:1737
+#: ../libpurple/protocols/msnp9/msn.c:1593 ../pidgin/plugins/convcolors.c:371
+#: ../pidgin/plugins/pidginrc.c:372
 msgid "General"
 msgstr "Üldine"
 
-#: ../libpurple/protocols/msn/msn.c:1736
-#: ../libpurple/protocols/msnp9/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3765
+#: ../libpurple/protocols/msn/msn.c:1744
+#: ../libpurple/protocols/msnp9/msn.c:1600
+#: ../libpurple/protocols/myspace/user.c:125
+#: ../libpurple/protocols/oscar/oscar.c:3788
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:222
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Vanus"
 
-#: ../libpurple/protocols/msn/msn.c:1738
-#: ../libpurple/protocols/msnp9/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1746
+#: ../libpurple/protocols/msnp9/msn.c:1602
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Amet"
 
-#: ../libpurple/protocols/msn/msn.c:1739
-#: ../libpurple/protocols/msnp9/msn.c:1592
-#: ../libpurple/protocols/myspace/user.c:123
+#: ../libpurple/protocols/msn/msn.c:1747
+#: ../libpurple/protocols/msnp9/msn.c:1603
+#: ../libpurple/protocols/myspace/user.c:133
 #: ../libpurple/protocols/novell/novell.c:1487
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
-#: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1215
+#: ../libpurple/protocols/zephyr/zephyr.c:802
+#: ../libpurple/protocols/zephyr/zephyr.c:1175
 msgid "Location"
 msgstr "Asukoht"
 
-#: ../libpurple/protocols/msn/msn.c:1744 ../libpurple/protocols/msn/msn.c:1936
-#: ../libpurple/protocols/msn/msn.c:1942 ../libpurple/protocols/msn/msn.c:1949
-#: ../libpurple/protocols/msnp9/msn.c:1597
-#: ../libpurple/protocols/msnp9/msn.c:1789
-#: ../libpurple/protocols/msnp9/msn.c:1795
-#: ../libpurple/protocols/msnp9/msn.c:1802
+#: ../libpurple/protocols/msn/msn.c:1752 ../libpurple/protocols/msn/msn.c:1944
+#: ../libpurple/protocols/msn/msn.c:1950 ../libpurple/protocols/msn/msn.c:1957
+#: ../libpurple/protocols/msnp9/msn.c:1608
+#: ../libpurple/protocols/msnp9/msn.c:1800
+#: ../libpurple/protocols/msnp9/msn.c:1806
+#: ../libpurple/protocols/msnp9/msn.c:1813
 msgid "Hobbies and Interests"
 msgstr "Hobid ja huvid"
 
-#: ../libpurple/protocols/msn/msn.c:1750 ../libpurple/protocols/msn/msn.c:1870
-#: ../libpurple/protocols/msn/msn.c:1876 ../libpurple/protocols/msn/msn.c:1883
-#: ../libpurple/protocols/msn/msn.c:1891 ../libpurple/protocols/msn/msn.c:1898
-#: ../libpurple/protocols/msnp9/msn.c:1603
-#: ../libpurple/protocols/msnp9/msn.c:1723
-#: ../libpurple/protocols/msnp9/msn.c:1729
-#: ../libpurple/protocols/msnp9/msn.c:1736
-#: ../libpurple/protocols/msnp9/msn.c:1744
-#: ../libpurple/protocols/msnp9/msn.c:1751
+#: ../libpurple/protocols/msn/msn.c:1758 ../libpurple/protocols/msn/msn.c:1878
+#: ../libpurple/protocols/msn/msn.c:1884 ../libpurple/protocols/msn/msn.c:1891
+#: ../libpurple/protocols/msn/msn.c:1899 ../libpurple/protocols/msn/msn.c:1906
+#: ../libpurple/protocols/msnp9/msn.c:1614
+#: ../libpurple/protocols/msnp9/msn.c:1734
+#: ../libpurple/protocols/msnp9/msn.c:1740
+#: ../libpurple/protocols/msnp9/msn.c:1747
+#: ../libpurple/protocols/msnp9/msn.c:1755
+#: ../libpurple/protocols/msnp9/msn.c:1762
 msgid "A Little About Me"
 msgstr "Väheke minust"
 
-#: ../libpurple/protocols/msn/msn.c:1767
-#: ../libpurple/protocols/msnp9/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msnp9/msn.c:1631
 msgid "Social"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1769
-#: ../libpurple/protocols/msnp9/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1777
+#: ../libpurple/protocols/msnp9/msn.c:1633
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Perekonnaseis"
 
-#: ../libpurple/protocols/msn/msn.c:1770
-#: ../libpurple/protocols/msnp9/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1778
+#: ../libpurple/protocols/msnp9/msn.c:1634
 msgid "Interests"
 msgstr "Huvid"
 
-#: ../libpurple/protocols/msn/msn.c:1771
-#: ../libpurple/protocols/msnp9/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msnp9/msn.c:1635
 msgid "Pets"
 msgstr "Lemmikloomad"
 
-#: ../libpurple/protocols/msn/msn.c:1772
-#: ../libpurple/protocols/msnp9/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1780
+#: ../libpurple/protocols/msnp9/msn.c:1636
 msgid "Hometown"
 msgstr "Kodulinn"
 
-#: ../libpurple/protocols/msn/msn.c:1773
-#: ../libpurple/protocols/msnp9/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1781
+#: ../libpurple/protocols/msnp9/msn.c:1637
 msgid "Places Lived"
 msgstr "Endised elukohad"
 
-#: ../libpurple/protocols/msn/msn.c:1774
-#: ../libpurple/protocols/msnp9/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1782
+#: ../libpurple/protocols/msnp9/msn.c:1638
 msgid "Fashion"
 msgstr "Mood"
 
-#: ../libpurple/protocols/msn/msn.c:1775
-#: ../libpurple/protocols/msnp9/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1783
+#: ../libpurple/protocols/msnp9/msn.c:1639
 msgid "Humor"
 msgstr "Huumor"
 
-#: ../libpurple/protocols/msn/msn.c:1776
-#: ../libpurple/protocols/msnp9/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/msnp9/msn.c:1640
 msgid "Music"
 msgstr "Muusika"
 
-#: ../libpurple/protocols/msn/msn.c:1777 ../libpurple/protocols/msn/msn.c:1958
-#: ../libpurple/protocols/msn/msn.c:1964
-#: ../libpurple/protocols/msnp9/msn.c:1630
-#: ../libpurple/protocols/msnp9/msn.c:1811
-#: ../libpurple/protocols/msnp9/msn.c:1817
+#: ../libpurple/protocols/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:1138
 msgid "Favorite Quote"
 msgstr "Lemmiktsitaat"
 
-#: ../libpurple/protocols/msn/msn.c:1794
-#: ../libpurple/protocols/msnp9/msn.c:1647
+#: ../libpurple/protocols/msn/msn.c:1802
+#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Contact Info"
 msgstr "Kontaktandmed"
 
-#: ../libpurple/protocols/msn/msn.c:1795
-#: ../libpurple/protocols/msnp9/msn.c:1648
+#: ../libpurple/protocols/msn/msn.c:1803
+#: ../libpurple/protocols/msnp9/msn.c:1659
 msgid "Personal"
 msgstr "Isiklik"
 
-#: ../libpurple/protocols/msn/msn.c:1798
-#: ../libpurple/protocols/msnp9/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1806
+#: ../libpurple/protocols/msnp9/msn.c:1662
 msgid "Significant Other"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1799
-#: ../libpurple/protocols/msnp9/msn.c:1652
+#: ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msnp9/msn.c:1663
 msgid "Home Phone"
 msgstr "Kodutelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1800
-#: ../libpurple/protocols/msnp9/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msnp9/msn.c:1664
 msgid "Home Phone 2"
 msgstr "Kodutelefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1801
-#: ../libpurple/protocols/msnp9/msn.c:1654
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/msn/msn.c:1809
+#: ../libpurple/protocols/msnp9/msn.c:1665
+#: ../libpurple/protocols/oscar/oscar.c:3826
 msgid "Home Address"
 msgstr "Koduaadress"
 
-#: ../libpurple/protocols/msn/msn.c:1802
-#: ../libpurple/protocols/msnp9/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1810
+#: ../libpurple/protocols/msnp9/msn.c:1666
 msgid "Personal Mobile"
 msgstr "Isiklik mobiiltelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1803
-#: ../libpurple/protocols/msnp9/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1811
+#: ../libpurple/protocols/msnp9/msn.c:1667
 msgid "Home Fax"
 msgstr "Kodufaks"
 
-#: ../libpurple/protocols/msn/msn.c:1804
-#: ../libpurple/protocols/msnp9/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1812
+#: ../libpurple/protocols/msnp9/msn.c:1668
 msgid "Personal E-Mail"
 msgstr "Isiklik e-post"
 
-#: ../libpurple/protocols/msn/msn.c:1805
-#: ../libpurple/protocols/msnp9/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1813
+#: ../libpurple/protocols/msnp9/msn.c:1669
 msgid "Personal IM"
 msgstr "Isiklikud välksõnumid"
 
-#: ../libpurple/protocols/msn/msn.c:1807
-#: ../libpurple/protocols/msnp9/msn.c:1660
+#: ../libpurple/protocols/msn/msn.c:1815
+#: ../libpurple/protocols/msnp9/msn.c:1671
 msgid "Anniversary"
 msgstr "Tähtpäev"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1823
-#: ../libpurple/protocols/msnp9/msn.c:1676
+#: ../libpurple/protocols/msn/msn.c:1831
+#: ../libpurple/protocols/msnp9/msn.c:1687
 msgid "Work"
 msgstr "Tööl"
 
-#: ../libpurple/protocols/msn/msn.c:1825
-#: ../libpurple/protocols/msnp9/msn.c:1678
+#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msnp9/msn.c:1689
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Töö nimetus"
 
-#: ../libpurple/protocols/msn/msn.c:1826
-#: ../libpurple/protocols/msnp9/msn.c:1679
-#: ../libpurple/protocols/oscar/oscar.c:3824
+#: ../libpurple/protocols/msn/msn.c:1834
+#: ../libpurple/protocols/msnp9/msn.c:1690
+#: ../libpurple/protocols/oscar/oscar.c:3847
 msgid "Company"
 msgstr "Firma"
 
-#: ../libpurple/protocols/msn/msn.c:1827
-#: ../libpurple/protocols/msnp9/msn.c:1680
+#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msnp9/msn.c:1691
 #: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "Osakond"
 
-#: ../libpurple/protocols/msn/msn.c:1828
-#: ../libpurple/protocols/msnp9/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1836
+#: ../libpurple/protocols/msnp9/msn.c:1692
 msgid "Profession"
 msgstr "Ametikoht"
 
-#: ../libpurple/protocols/msn/msn.c:1829
-#: ../libpurple/protocols/msnp9/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1837
+#: ../libpurple/protocols/msnp9/msn.c:1693
 msgid "Work Phone"
 msgstr "Töötelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1830
-#: ../libpurple/protocols/msnp9/msn.c:1683
+#: ../libpurple/protocols/msn/msn.c:1838
+#: ../libpurple/protocols/msnp9/msn.c:1694
 msgid "Work Phone 2"
 msgstr "Töötelefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1831
-#: ../libpurple/protocols/msnp9/msn.c:1684
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/msn/msn.c:1839
+#: ../libpurple/protocols/msnp9/msn.c:1695
+#: ../libpurple/protocols/oscar/oscar.c:3839
 msgid "Work Address"
 msgstr "Tööaadress"
 
-#: ../libpurple/protocols/msn/msn.c:1832
-#: ../libpurple/protocols/msnp9/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1840
+#: ../libpurple/protocols/msnp9/msn.c:1696
 msgid "Work Mobile"
 msgstr "Töö-mobiiltelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1833
-#: ../libpurple/protocols/msnp9/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/msnp9/msn.c:1697
 msgid "Work Pager"
 msgstr "Tööpeiler"
 
-#: ../libpurple/protocols/msn/msn.c:1834
-#: ../libpurple/protocols/msnp9/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1842
+#: ../libpurple/protocols/msnp9/msn.c:1698
 msgid "Work Fax"
 msgstr "Tööfaks"
 
-#: ../libpurple/protocols/msn/msn.c:1835
-#: ../libpurple/protocols/msnp9/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1843
+#: ../libpurple/protocols/msnp9/msn.c:1699
 msgid "Work E-Mail"
 msgstr "Töö e-post"
 
-#: ../libpurple/protocols/msn/msn.c:1836
-#: ../libpurple/protocols/msnp9/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1844
+#: ../libpurple/protocols/msnp9/msn.c:1700
 msgid "Work IM"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1837
-#: ../libpurple/protocols/msnp9/msn.c:1690
+#: ../libpurple/protocols/msn/msn.c:1845
+#: ../libpurple/protocols/msnp9/msn.c:1701
 msgid "Start Date"
 msgstr "Alguskuupäev"
 
-#: ../libpurple/protocols/msn/msn.c:1907 ../libpurple/protocols/msn/msn.c:1913
-#: ../libpurple/protocols/msn/msn.c:1920 ../libpurple/protocols/msn/msn.c:1927
-#: ../libpurple/protocols/msnp9/msn.c:1760
-#: ../libpurple/protocols/msnp9/msn.c:1766
-#: ../libpurple/protocols/msnp9/msn.c:1773
-#: ../libpurple/protocols/msnp9/msn.c:1780
+#: ../libpurple/protocols/msn/msn.c:1915 ../libpurple/protocols/msn/msn.c:1921
+#: ../libpurple/protocols/msn/msn.c:1928 ../libpurple/protocols/msn/msn.c:1935
+#: ../libpurple/protocols/msnp9/msn.c:1771
+#: ../libpurple/protocols/msnp9/msn.c:1777
+#: ../libpurple/protocols/msnp9/msn.c:1784
+#: ../libpurple/protocols/msnp9/msn.c:1791
 msgid "Favorite Things"
 msgstr "Lemmikasjad"
 
-#: ../libpurple/protocols/msn/msn.c:1972
-#: ../libpurple/protocols/msnp9/msn.c:1825
+#: ../libpurple/protocols/msn/msn.c:1980
+#: ../libpurple/protocols/msnp9/msn.c:1836
 msgid "Last Updated"
 msgstr "Viimati uuendatud"
 
-#: ../libpurple/protocols/msn/msn.c:1983
-#: ../libpurple/protocols/msnp9/msn.c:1836
+#: ../libpurple/protocols/msn/msn.c:1991
+#: ../libpurple/protocols/msnp9/msn.c:1847
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Koduleht"
 
-#: ../libpurple/protocols/msn/msn.c:2007
-#: ../libpurple/protocols/msnp9/msn.c:1860
+#: ../libpurple/protocols/msn/msn.c:2015
+#: ../libpurple/protocols/msnp9/msn.c:1871
 msgid "The user has not created a public profile."
 msgstr "Kasutaja pole loonud avalikku profiili."
 
-#: ../libpurple/protocols/msn/msn.c:2008
-#: ../libpurple/protocols/msnp9/msn.c:1861
+#: ../libpurple/protocols/msn/msn.c:2016
+#: ../libpurple/protocols/msnp9/msn.c:1872
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2012
-#: ../libpurple/protocols/msnp9/msn.c:1865
+#: ../libpurple/protocols/msn/msn.c:2020
+#: ../libpurple/protocols/msnp9/msn.c:1876
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -7029,8 +7283,8 @@
 "Kasutajaprofiili kohta pole võimalik mingeid andmeid leida. Kõige "
 "tõenäolisemalt pole seda kasutajat olemas."
 
-#: ../libpurple/protocols/msn/msn.c:2020
-#: ../libpurple/protocols/msnp9/msn.c:1873
+#: ../libpurple/protocols/msn/msn.c:2028
+#: ../libpurple/protocols/msnp9/msn.c:1884
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Profiili URL"
@@ -7045,27 +7299,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2307 ../libpurple/protocols/msn/msn.c:2309
+#: ../libpurple/protocols/msn/msn.c:2315 ../libpurple/protocols/msn/msn.c:2317
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr "Windows Live Messenger'i protokolli plugin"
 
-#: ../libpurple/protocols/msn/msn.c:2344
-#: ../libpurple/protocols/msnp9/msn.c:2195
+#: ../libpurple/protocols/msn/msn.c:2352
+#: ../libpurple/protocols/msnp9/msn.c:2206
 msgid "Use HTTP Method"
 msgstr "Kasutatakse HTTP meetodit"
 
-#: ../libpurple/protocols/msn/msn.c:2349
-#: ../libpurple/protocols/msnp9/msn.c:2200
+#: ../libpurple/protocols/msn/msn.c:2357
+#: ../libpurple/protocols/msnp9/msn.c:2211
 msgid "HTTP Method Server"
 msgstr "HTTP-meetodi server"
 
-#: ../libpurple/protocols/msn/msn.c:2354
-#: ../libpurple/protocols/msnp9/msn.c:2205
+#: ../libpurple/protocols/msn/msn.c:2362
+#: ../libpurple/protocols/msnp9/msn.c:2216
 msgid "Show custom smileys"
 msgstr "Kasutatakse kohandatud tujunägusid"
 
-#: ../libpurple/protocols/msn/msn.c:2362
-#: ../libpurple/protocols/msnp9/msn.c:2213
+#: ../libpurple/protocols/msn/msn.c:2370
+#: ../libpurple/protocols/msnp9/msn.c:2224
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: kasutaja müksamine tema tähelepanu võitmiseks"
 
@@ -7096,8 +7350,8 @@
 #: ../libpurple/protocols/msn/notification.c:931
 #: ../libpurple/protocols/msn/session.c:387
 #: ../libpurple/protocols/msnp9/notification.c:184
-#: ../libpurple/protocols/msnp9/notification.c:532
-#: ../libpurple/protocols/msnp9/session.c:340
+#: ../libpurple/protocols/msnp9/notification.c:534
+#: ../libpurple/protocols/msnp9/session.c:339
 msgid "Unknown error."
 msgstr "Tundmatu viga."
 
@@ -7118,57 +7372,57 @@
 msgstr "Tundmatu viga (%d)"
 
 #: ../libpurple/protocols/msn/notification.c:837
-#: ../libpurple/protocols/sametime/sametime.c:4471
+#: ../libpurple/protocols/sametime/sametime.c:4479
 msgid "Unable to add user"
 msgstr "Kasutajat pole võimalik lisada"
 
 #: ../libpurple/protocols/msn/notification.c:897
-#: ../libpurple/protocols/msnp9/notification.c:498
+#: ../libpurple/protocols/msnp9/notification.c:500
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr ""
 
 #: ../libpurple/protocols/msn/notification.c:901
-#: ../libpurple/protocols/msnp9/notification.c:502
+#: ../libpurple/protocols/msnp9/notification.c:504
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr ""
 
 #: ../libpurple/protocols/msn/notification.c:905
-#: ../libpurple/protocols/msnp9/notification.c:506
+#: ../libpurple/protocols/msnp9/notification.c:508
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr ""
 
 #: ../libpurple/protocols/msn/notification.c:913
-#: ../libpurple/protocols/msnp9/notification.c:514
+#: ../libpurple/protocols/msnp9/notification.c:516
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr ""
 
 #: ../libpurple/protocols/msn/notification.c:922
-#: ../libpurple/protocols/msnp9/notification.c:523
+#: ../libpurple/protocols/msnp9/notification.c:525
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr ""
 
 #: ../libpurple/protocols/msn/notification.c:927
-#: ../libpurple/protocols/msnp9/notification.c:528
+#: ../libpurple/protocols/msnp9/notification.c:530
 msgid "Service Temporarily Unavailable."
 msgstr "Teenus pole ajutiselt kättesaadav."
 
-#: ../libpurple/protocols/msn/notification.c:1263
-#: ../libpurple/protocols/msnp9/notification.c:851
+#: ../libpurple/protocols/msn/notification.c:1276
+#: ../libpurple/protocols/msnp9/notification.c:898
 msgid "Unable to rename group"
 msgstr "Gruppi pole võimalik ümber nimetada"
 
-#: ../libpurple/protocols/msn/notification.c:1318
-#: ../libpurple/protocols/msnp9/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:1331
+#: ../libpurple/protocols/msnp9/notification.c:953
 msgid "Unable to delete group"
-msgstr "Gruppi pole võimalik ümber kustutada"
-
-#: ../libpurple/protocols/msn/notification.c:1931
-#: ../libpurple/protocols/msnp9/notification.c:1325
+msgstr "Gruppi pole võimalik kustutada"
+
+#: ../libpurple/protocols/msn/notification.c:1945
+#: ../libpurple/protocols/msnp9/notification.c:1372
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7203,8 +7457,9 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:272
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:307
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:338
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1564
+#: ../libpurple/protocols/yahoo/yahoochat.c:1425
+#: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Unable to connect"
 msgstr "Ühendumine pole võimalik"
 
@@ -7229,41 +7484,41 @@
 "%s"
 
 #: ../libpurple/protocols/msn/session.c:349
-#: ../libpurple/protocols/msnp9/session.c:302
+#: ../libpurple/protocols/msnp9/session.c:301
 msgid "Our protocol is not supported by the server."
 msgstr "Meie protokoll pole serveri poolt toetatud."
 
 #: ../libpurple/protocols/msn/session.c:354
-#: ../libpurple/protocols/msnp9/session.c:307
+#: ../libpurple/protocols/msnp9/session.c:306
 msgid "Error parsing HTTP."
 msgstr "Viga HTTP parsimisel."
 
 #: ../libpurple/protocols/msn/session.c:358
-#: ../libpurple/protocols/msnp9/session.c:311
+#: ../libpurple/protocols/msnp9/session.c:310
 #: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:207
+#: ../libpurple/protocols/yahoo/yahoo.c:155
 msgid "You have signed on from another location."
 msgstr "Sa oled teisest kohast sisse loginud."
 
 #: ../libpurple/protocols/msn/session.c:364
-#: ../libpurple/protocols/msnp9/session.c:317
+#: ../libpurple/protocols/msnp9/session.c:316
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN serverid pole ajutiselt kättesaadavad. Palun oota ja proovi uuesti."
 
 #: ../libpurple/protocols/msn/session.c:370
-#: ../libpurple/protocols/msnp9/session.c:323
+#: ../libpurple/protocols/msnp9/session.c:322
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN serverid jäetakse ajutiselt seisma"
 
 #: ../libpurple/protocols/msn/session.c:375
-#: ../libpurple/protocols/msnp9/session.c:328
+#: ../libpurple/protocols/msnp9/session.c:327
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Pole võimalik autentida: %s"
 
 #: ../libpurple/protocols/msn/session.c:381
-#: ../libpurple/protocols/msnp9/session.c:334
+#: ../libpurple/protocols/msnp9/session.c:333
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
@@ -7272,28 +7527,28 @@
 
 #: ../libpurple/protocols/msn/session.c:403
 #: ../libpurple/protocols/msn/session.c:405
-#: ../libpurple/protocols/msnp9/session.c:356
-#: ../libpurple/protocols/msnp9/session.c:358
+#: ../libpurple/protocols/msnp9/session.c:355
+#: ../libpurple/protocols/msnp9/session.c:357
 msgid "Handshaking"
 msgstr "Käepigistus"
 
 #: ../libpurple/protocols/msn/session.c:406
-#: ../libpurple/protocols/msnp9/session.c:359
+#: ../libpurple/protocols/msnp9/session.c:358
 msgid "Starting authentication"
 msgstr "Autentimise alustamine"
 
 #: ../libpurple/protocols/msn/session.c:407
-#: ../libpurple/protocols/msnp9/session.c:360
+#: ../libpurple/protocols/msnp9/session.c:359
 msgid "Getting cookie"
 msgstr "Küpsise võtmine"
 
 #: ../libpurple/protocols/msn/session.c:409
-#: ../libpurple/protocols/msnp9/session.c:362
+#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Sending cookie"
 msgstr "Küpsise saatmine"
 
 #: ../libpurple/protocols/msn/session.c:410
-#: ../libpurple/protocols/msnp9/session.c:363
+#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Retrieving buddy list"
 msgstr "Sõbraloendi vastuvõtmine"
 
@@ -7312,57 +7567,57 @@
 msgid "Out To Lunch"
 msgstr "Lõunal"
 
-#: ../libpurple/protocols/msn/switchboard.c:398
-#: ../libpurple/protocols/msnp9/switchboard.c:400
-msgid "Message may have not been sent because a timeout occurred:"
-msgstr ""
-
 #: ../libpurple/protocols/msn/switchboard.c:406
 #: ../libpurple/protocols/msnp9/switchboard.c:408
-msgid "Message could not be sent, not allowed while invisible:"
-msgstr "Nähtamatu olles pole võimalik sõnumit saata:"
-
-#: ../libpurple/protocols/msn/switchboard.c:410
-#: ../libpurple/protocols/msnp9/switchboard.c:412
-msgid "Message could not be sent because the user is offline:"
-msgstr "Võrku ühendumata kasutajale pole võimalik sõnumit saata:"
+msgid "Message may have not been sent because a timeout occurred:"
+msgstr "Võib-olla jäi sõnum ajapiirangu ületamise tõttu saatmata:"
 
 #: ../libpurple/protocols/msn/switchboard.c:414
 #: ../libpurple/protocols/msnp9/switchboard.c:416
-msgid "Message could not be sent because a connection error occurred:"
-msgstr "Ühenduse vea tõttu pole võimalik sõnumit saata:"
+msgid "Message could not be sent, not allowed while invisible:"
+msgstr "Nähtamatu olles pole võimalik sõnumit saata:"
 
 #: ../libpurple/protocols/msn/switchboard.c:418
 #: ../libpurple/protocols/msnp9/switchboard.c:420
-msgid "Message could not be sent because we are sending too quickly:"
-msgstr "Sõnumit pole võimalik saata kuna me saadame liiga kiiresti:"
+msgid "Message could not be sent because the user is offline:"
+msgstr "Võrku ühendumata kasutajale pole võimalik sõnumit saata:"
 
 #: ../libpurple/protocols/msn/switchboard.c:422
 #: ../libpurple/protocols/msnp9/switchboard.c:424
+msgid "Message could not be sent because a connection error occurred:"
+msgstr "Ühenduse vea tõttu pole võimalik sõnumit saata:"
+
+#: ../libpurple/protocols/msn/switchboard.c:426
+#: ../libpurple/protocols/msnp9/switchboard.c:428
+msgid "Message could not be sent because we are sending too quickly:"
+msgstr "Sõnumit pole võimalik saata kuna me saadame liiga kiiresti:"
+
+#: ../libpurple/protocols/msn/switchboard.c:430
+#: ../libpurple/protocols/msnp9/switchboard.c:432
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
 
-#: ../libpurple/protocols/msn/switchboard.c:429
-#: ../libpurple/protocols/msnp9/switchboard.c:431
-msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
-msgstr ""
-
 #: ../libpurple/protocols/msn/switchboard.c:437
 #: ../libpurple/protocols/msnp9/switchboard.c:439
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
+msgstr ""
+
+#: ../libpurple/protocols/msn/switchboard.c:445
+#: ../libpurple/protocols/msnp9/switchboard.c:447
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Sõnumit pole võimlik saata kuna leidis aset tundmatu viga:"
 
 #: ../libpurple/protocols/msn/userlist.c:243
-#: ../libpurple/protocols/msnp9/userlist.c:252
+#: ../libpurple/protocols/msnp9/userlist.c:262
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s lisas sinu oma sõbranimekirja."
 
 #: ../libpurple/protocols/msn/userlist.c:312
-#: ../libpurple/protocols/msnp9/userlist.c:321
+#: ../libpurple/protocols/msnp9/userlist.c:331
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s eemaldas sinu oma sõbranimekirjast."
@@ -7371,17 +7626,17 @@
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
 #: ../libpurple/protocols/msn/userlist.c:693
-#: ../libpurple/protocols/msnp9/userlist.c:643
+#: ../libpurple/protocols/msnp9/userlist.c:653
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "\"%s\" pole võimalik lisada."
 
 #: ../libpurple/protocols/msn/userlist.c:696
-#: ../libpurple/protocols/msnp9/userlist.c:645
+#: ../libpurple/protocols/msnp9/userlist.c:655
 msgid "The screen name specified is invalid."
 msgstr "Määratud ekraaninimi on vigane."
 
-#: ../libpurple/protocols/msnp9/msn.c:549
+#: ../libpurple/protocols/msnp9/msn.c:546
 msgid "Has you"
 msgstr "Sina tema loendis"
 
@@ -7395,8 +7650,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msnp9/msn.c:2159
-#: ../libpurple/protocols/msnp9/msn.c:2161
+#: ../libpurple/protocols/msnp9/msn.c:2170
+#: ../libpurple/protocols/msnp9/msn.c:2172
 msgid "MSN Protocol Plugin"
 msgstr "MSN protokolli plugin"
 
@@ -7416,147 +7671,146 @@
 "Uuenda oma libpurple teeki nii, et see toetakse RC4u šifrit (>= 2.0.1). "
 "MySpaceIM jäetakse laadimata."
 
-#: ../libpurple/protocols/myspace/myspace.c:286
-#, c-format
-msgid ""
-"Sorry, passwords over %d characters in length (yours is %d) are not "
-"supported by MySpace."
-msgstr ""
-"Vabandust, üle %d märgi pikad paroolid pole MySpace poolt toetatud (sinu "
-"parool on %d märki pikk)."
-
-#. Notify an error message also, because this is important!
-#: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1820
-msgid "MySpaceIM Error"
-msgstr "MySpaceIM viga"
-
-#: ../libpurple/protocols/myspace/myspace.c:352
+#: ../libpurple/protocols/myspace/myspace.c:345
 msgid "Reading challenge"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:360
+#: ../libpurple/protocols/myspace/myspace.c:353
 msgid "Unexpected challenge length from server"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:364
+#: ../libpurple/protocols/myspace/myspace.c:357
 msgid "Logging in"
 msgstr "Sisselogimine"
 
-#: ../libpurple/protocols/myspace/myspace.c:1296
+#: ../libpurple/protocols/myspace/myspace.c:1322
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr ""
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1339
+#: ../libpurple/protocols/myspace/myspace.c:1365
 msgid "New mail messages"
 msgstr "Uued e-posti sõnumid"
 
-#: ../libpurple/protocols/myspace/myspace.c:1340
+#: ../libpurple/protocols/myspace/myspace.c:1366
 msgid "New blog comments"
 msgstr "Uued blogikommentaarid"
 
-#: ../libpurple/protocols/myspace/myspace.c:1341
+#: ../libpurple/protocols/myspace/myspace.c:1367
 msgid "New profile comments"
 msgstr "Uued profiilikommentaarid"
 
-#: ../libpurple/protocols/myspace/myspace.c:1342
+#: ../libpurple/protocols/myspace/myspace.c:1368
 msgid "New friend requests!"
 msgstr "Uued sõbrakutsed!"
 
-#: ../libpurple/protocols/myspace/myspace.c:1343
+#: ../libpurple/protocols/myspace/myspace.c:1369
 msgid "New picture comments"
 msgstr "Uued pildikommentaarid"
 
-#: ../libpurple/protocols/myspace/myspace.c:1371
+#: ../libpurple/protocols/myspace/myspace.c:1399
 msgid "MySpace"
 msgstr "MySpace"
 
+#: ../libpurple/protocols/myspace/myspace.c:1585
+msgid "MySpaceIM - No Username Set"
+msgstr "MySpaceIM - Kasutajanimi on määramata"
+
+#: ../libpurple/protocols/myspace/myspace.c:1586
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1587
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+"Kas sa soovid praegu ühe määrata? (Märkus: SEDA POLE VÕIMALIK HILJEM MUUTA!)"
+
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1554
+#: ../libpurple/protocols/myspace/myspace.c:1611
 #: ../libpurple/protocols/sametime/sametime.c:1546
 msgid "Connected"
 msgstr "Ühendatud"
 
-#: ../libpurple/protocols/myspace/myspace.c:1565
-#: ../libpurple/protocols/myspace/myspace.c:1568
-msgid "No username set"
-msgstr "Kasutajanimi on määramata"
-
-#: ../libpurple/protocols/myspace/myspace.c:1566
-msgid ""
-"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-"username and choose a username and try to login again."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1794
+#: ../libpurple/protocols/myspace/myspace.c:1846
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protkolli viga, veakood %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1990
-#: ../libpurple/protocols/myspace/myspace.c:2024
+#: ../libpurple/protocols/myspace/myspace.c:1868
+#, c-format
+msgid ""
+"%s Your password is %d characters, greater than the expected maximum length "
+"of %d for MySpaceIM. Please shorten your password at http://profileedit."
+"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
+"again."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1891
+msgid "MySpaceIM Error"
+msgstr "MySpaceIM viga"
+
+#: ../libpurple/protocols/myspace/myspace.c:2069
+#: ../libpurple/protocols/myspace/myspace.c:2103
 msgid "Failed to add buddy"
 msgstr "Tõrge sõbra lisamisel"
 
-#: ../libpurple/protocols/myspace/myspace.c:1990
+#: ../libpurple/protocols/myspace/myspace.c:2069
 msgid "'addbuddy' command failed."
 msgstr "Tõrge 'addbuddy' käsu täitmisel."
 
-#: ../libpurple/protocols/myspace/myspace.c:2024
-#: ../libpurple/protocols/myspace/myspace.c:2261
+#: ../libpurple/protocols/myspace/myspace.c:2103
+#: ../libpurple/protocols/myspace/myspace.c:2348
 msgid "persist command failed"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2129
+#: ../libpurple/protocols/myspace/myspace.c:2208
 #, c-format
 msgid "No such user: %s"
 msgstr "Sellist kasutajat pole: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2130
+#: ../libpurple/protocols/myspace/myspace.c:2210
 msgid "User lookup"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2242
-#: ../libpurple/protocols/myspace/myspace.c:2261
-#: ../libpurple/protocols/myspace/myspace.c:2283
+#: ../libpurple/protocols/myspace/myspace.c:2329
+#: ../libpurple/protocols/myspace/myspace.c:2348
+#: ../libpurple/protocols/myspace/myspace.c:2370
 msgid "Failed to remove buddy"
 msgstr "Tõrge sõbra eemaldamisel"
 
-#: ../libpurple/protocols/myspace/myspace.c:2242
+#: ../libpurple/protocols/myspace/myspace.c:2329
 msgid "'delbuddy' command failed"
 msgstr "Tõrge 'delbuddy' käsu täitmisel."
 
-#: ../libpurple/protocols/myspace/myspace.c:2283
+#: ../libpurple/protocols/myspace/myspace.c:2370
 msgid "blocklist command failed"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2331
+#: ../libpurple/protocols/myspace/myspace.c:2484
 msgid "Invalid input condition"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2351
-#: ../libpurple/protocols/myspace/myspace.c:2388
-msgid "Read buffer full"
-msgstr "Lugemispuhver on täis"
-
-#: ../libpurple/protocols/myspace/myspace.c:2430
+#: ../libpurple/protocols/myspace/myspace.c:2539
+msgid "Read buffer full (2)"
+msgstr "Lugemispuhver on täis (2)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2582
 msgid "Unparseable message"
 msgstr "Analüüsimatu sõnum"
 
-#: ../libpurple/protocols/myspace/myspace.c:2499
+#: ../libpurple/protocols/myspace/myspace.c:2653
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Hostiga pole võimalik ühenduda: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2670
+#: ../libpurple/protocols/myspace/myspace.c:2831
 msgid "IM Friends"
 msgstr "IM-sõbrad"
 
-#: ../libpurple/protocols/myspace/myspace.c:2769
+#: ../libpurple/protocols/myspace/myspace.c:2931
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
@@ -7565,119 +7819,154 @@
 "Serverist lisati või uuendati %d sõpra (kaasa arvatud sõbrad, kes on juba "
 "serveripoolses nimekirjas)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2770
+#: ../libpurple/protocols/myspace/myspace.c:2932
 msgid "Add contacts from server"
 msgstr "Serverist kontaktide lisamine"
 
-#: ../libpurple/protocols/myspace/myspace.c:2822
-#: ../libpurple/protocols/myspace/myspace.c:2887
+#: ../libpurple/protocols/myspace/myspace.c:2984
+#: ../libpurple/protocols/myspace/myspace.c:3048
 msgid "Add friends from MySpace.com"
 msgstr "Sõprade lisamine MySpace.com'ist"
 
-#: ../libpurple/protocols/myspace/myspace.c:2823
+#: ../libpurple/protocols/myspace/myspace.c:2985
 msgid "Importing friends failed"
 msgstr "Tõrge sõprade importimisel"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2879
+#: ../libpurple/protocols/myspace/myspace.c:3041
 msgid "Find people..."
 msgstr "Otsi inimesi..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2882
+#: ../libpurple/protocols/myspace/myspace.c:3044
 msgid "Change IM name..."
 msgstr "Minu IM-nime..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3184
+#: ../libpurple/protocols/myspace/myspace.c:3345
 msgid "myim URL handler"
 msgstr "myim URL-ikäsitleja"
 
-#: ../libpurple/protocols/myspace/myspace.c:3185
+#: ../libpurple/protocols/myspace/myspace.c:3346
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3186
+#: ../libpurple/protocols/myspace/myspace.c:3347
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3309
+#: ../libpurple/protocols/myspace/myspace.c:3470
 msgid "Show display name in status text"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3312
+#: ../libpurple/protocols/myspace/myspace.c:3473
 msgid "Show headline in status text"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3317
+#: ../libpurple/protocols/myspace/myspace.c:3478
 msgid "Send emoticons"
 msgstr "Tujunägude saatmine"
 
-#: ../libpurple/protocols/myspace/myspace.c:3322
+#: ../libpurple/protocols/myspace/myspace.c:3483
 msgid "Screen resolution (dots per inch)"
 msgstr "Ekraani eraldusvõime (punkti tollile)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3325
+#: ../libpurple/protocols/myspace/myspace.c:3486
 msgid "Base font size (points)"
 msgstr "Aluskirjatüübi suurus (punktides)"
 
-#: ../libpurple/protocols/myspace/user.c:95
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
-msgid "User"
-msgstr "Kasutaja"
-
 #: ../libpurple/protocols/myspace/user.c:105
-#: ../libpurple/protocols/oscar/oscar.c:2974
+#: ../libpurple/protocols/zephyr/zephyr.c:790
+#: ../libpurple/protocols/zephyr/zephyr.c:1164
+msgid "User"
+msgstr "Kasutaja"
+
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3025
 msgid "Profile"
 msgstr "Profiil"
 
-#: ../libpurple/protocols/myspace/user.c:128
+#: ../libpurple/protocols/myspace/user.c:138
 msgid "Headline"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:133
+#: ../libpurple/protocols/myspace/user.c:153
 msgid "Song"
 msgstr "Laul"
 
-#: ../libpurple/protocols/myspace/user.c:141
+#: ../libpurple/protocols/myspace/user.c:162
 msgid "Total Friends"
 msgstr "Sõpru kokku"
 
-#: ../libpurple/protocols/myspace/user.c:159
+#: ../libpurple/protocols/myspace/user.c:180
 msgid "Client Version"
 msgstr "Kliendi versioon"
 
+#. Protocol won't log in now without a username set.. Disconnect
+#: ../libpurple/protocols/myspace/user.c:570
+msgid "No username set"
+msgstr "Kasutajanimi on määramata"
+
+#: ../libpurple/protocols/myspace/user.c:577
+#: ../libpurple/protocols/myspace/user.c:671
+msgid "MySpaceIM - Please Set a Username"
+msgstr "MySpaceIM - Palun määra kasutajanimi"
+
+#: ../libpurple/protocols/myspace/user.c:578
+msgid "Please enter a username to check its availability:"
+msgstr ""
+"Palun sisesta kasutajanimi, et kontrollida selle kasutamise võimalikkust:"
+
+#: ../libpurple/protocols/myspace/user.c:658
+msgid "MySpaceIM - Username Available"
+msgstr "MySpaceIM - Kasutajanimi on saadaval"
+
+#: ../libpurple/protocols/myspace/user.c:659
+msgid "This username is available. Would you like to set it?"
+msgstr "Kasutajanimi on vaba. Kas sa soovid seda pruukida?"
+
+#: ../libpurple/protocols/myspace/user.c:660
+msgid "ONCE SET, THIS CANNOT BE CHANGED!"
+msgstr "KUI SEE ON JUBA MÄÄRATUD, POLE SEDA ENAM VÕIMALIK MUUTA!"
+
+#: ../libpurple/protocols/myspace/user.c:672
+msgid "This username is unavailable."
+msgstr "See kasutajanimi pole saadaval."
+
+#: ../libpurple/protocols/myspace/user.c:673
+msgid "Please try another username:"
+msgstr "Palun proovi mõnda muud kasutajanime:"
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
 #. * projectile or weapon."  This term often has an electrical
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
-#: ../libpurple/protocols/myspace/zap.c:51
-#: ../libpurple/protocols/myspace/zap.c:214
+#: ../libpurple/protocols/myspace/zap.c:48
+#: ../libpurple/protocols/myspace/zap.c:221
 msgid "Zap"
 msgstr "Osuta tähelepanu"
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:48
 #, c-format
 msgid "%s has zapped you!"
 msgstr "%s osutas sulle tähelepanu!"
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:49
 #, c-format
 msgid "Zapping %s..."
 msgstr "Kasutajale %s tähelepanu osutamine..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
-#: ../libpurple/protocols/myspace/zap.c:54
+#: ../libpurple/protocols/myspace/zap.c:52
 msgid "Whack"
 msgstr "Anna kõrvakiil"
 
-#: ../libpurple/protocols/myspace/zap.c:54
+#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "%s has whacked you!"
 msgstr "%s andis sulle kõrvakiilu!"
 
-#: ../libpurple/protocols/myspace/zap.c:54
+#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "Whacking %s..."
 msgstr "Kasutajale %s kõrvakiilu andmine..."
@@ -7685,7 +7974,7 @@
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#: ../libpurple/protocols/myspace/zap.c:59
+#: ../libpurple/protocols/myspace/zap.c:58
 msgid "Torch"
 msgstr "Pane põlema"
 
@@ -7704,57 +7993,57 @@
 msgid "Smooch"
 msgstr "Anna musi"
 
-#: ../libpurple/protocols/myspace/zap.c:62
+#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "%s has smooched you!"
 msgstr "%s andis sulle musi!"
 
-#: ../libpurple/protocols/myspace/zap.c:62
+#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "Smooching %s..."
 msgstr "Kasutajale %s musi andmine..."
 
 #. A hug is a display of affection; wrapping your arms around someone
-#: ../libpurple/protocols/myspace/zap.c:65
+#: ../libpurple/protocols/myspace/zap.c:66
 msgid "Hug"
 msgstr "Kallista"
 
-#: ../libpurple/protocols/myspace/zap.c:65
+#: ../libpurple/protocols/myspace/zap.c:66
 #, c-format
 msgid "%s has hugged you!"
 msgstr "%s kallistas sind!"
 
-#: ../libpurple/protocols/myspace/zap.c:65
+#: ../libpurple/protocols/myspace/zap.c:67
 #, c-format
 msgid "Hugging %s..."
 msgstr "Kasutaja %s kallistamine..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#: ../libpurple/protocols/myspace/zap.c:68
+#: ../libpurple/protocols/myspace/zap.c:70
 msgid "Slap"
 msgstr "Anna laksu"
 
-#: ../libpurple/protocols/myspace/zap.c:68
+#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "%s has slapped you!"
 msgstr "%s andis sulle laksu!"
 
-#: ../libpurple/protocols/myspace/zap.c:68
+#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "Slapping %s..."
 msgstr "Kasutajale %s laksu andmine..."
 
 #. Goose means "to pinch someone on their butt"
-#: ../libpurple/protocols/myspace/zap.c:71
+#: ../libpurple/protocols/myspace/zap.c:74
 msgid "Goose"
 msgstr "Torgi"
 
-#: ../libpurple/protocols/myspace/zap.c:71
+#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "%s has goosed you!"
 msgstr "%s torkis sind!"
 
-#: ../libpurple/protocols/myspace/zap.c:71
+#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "Goosing %s..."
 msgstr "Kasutaja %s torkimine..."
@@ -7762,16 +8051,16 @@
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
-#: ../libpurple/protocols/myspace/zap.c:76
+#: ../libpurple/protocols/myspace/zap.c:80
 msgid "High-five"
 msgstr "Viska viis"
 
-#: ../libpurple/protocols/myspace/zap.c:76
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "%s has high-fived you!"
 msgstr "%s lõi sinuga plaksu!"
 
-#: ../libpurple/protocols/myspace/zap.c:76
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "High-fiving %s..."
 msgstr "Kasutajale %s plaksu löömine..."
@@ -7779,16 +8068,16 @@
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
-#: ../libpurple/protocols/myspace/zap.c:81
+#: ../libpurple/protocols/myspace/zap.c:86
 msgid "Punk"
 msgstr "Tünga"
 
-#: ../libpurple/protocols/myspace/zap.c:81
+#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "%s has punk'd you!"
 msgstr "%s tüngas sind!"
 
-#: ../libpurple/protocols/myspace/zap.c:81
+#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "Punking %s..."
 msgstr "Kasutaja %s tüngamine..."
@@ -7800,16 +8089,16 @@
 #. * gesture, so it does not carry a harsh negative
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
-#: ../libpurple/protocols/myspace/zap.c:90
+#: ../libpurple/protocols/myspace/zap.c:96
 msgid "Raspberry"
 msgstr "Purista suud"
 
-#: ../libpurple/protocols/myspace/zap.c:90
+#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "%s has raspberried you!"
 msgstr "%s puristas sinu poole suud!"
 
-#: ../libpurple/protocols/myspace/zap.c:90
+#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "Raspberrying %s..."
 msgstr "Kasutaja %s poole puristamine..."
@@ -8054,7 +8343,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/novell/novell.c:1511
-#: ../libpurple/protocols/sametime/sametime.c:4168
+#: ../libpurple/protocols/sametime/sametime.c:4176
 msgid "User ID"
 msgstr "Kasutaja ID"
 
@@ -8088,7 +8377,7 @@
 #: ../libpurple/protocols/novell/novell.c:1881
 #, c-format
 msgid "%s has been invited to this conversation."
-msgstr ""
+msgstr "%s kutsus sind selles vestluses osalema."
 
 #: ../libpurple/protocols/novell/novell.c:1909
 msgid "Invitation to Conversation"
@@ -8109,27 +8398,27 @@
 msgid "Would you like to join the conversation?"
 msgstr "Kas sa soovid vestlusega ühineda?"
 
-#: ../libpurple/protocols/novell/novell.c:2027
+#: ../libpurple/protocols/novell/novell.c:2028
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Sind logiti välja kuna sa logisid sisse teisest tööjaamast."
 
-#: ../libpurple/protocols/novell/novell.c:2084
+#: ../libpurple/protocols/novell/novell.c:2085
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:2184
+#: ../libpurple/protocols/novell/novell.c:2185
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:2213
+#: ../libpurple/protocols/novell/novell.c:2214
 msgid "Error. SSL support is not installed."
 msgstr "Viga. SSL-i tugi pole paigaldatud."
 
-#: ../libpurple/protocols/novell/novell.c:2521
+#: ../libpurple/protocols/novell/novell.c:2522
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "See konverents on suletud. Rohkem sõnumeid pole võimalik saata."
 
@@ -8143,22 +8432,30 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3535
-#: ../libpurple/protocols/novell/novell.c:3537
+#: ../libpurple/protocols/novell/novell.c:3536
+#: ../libpurple/protocols/novell/novell.c:3538
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger protokolli plugin"
 
-#: ../libpurple/protocols/novell/novell.c:3562
+#: ../libpurple/protocols/novell/novell.c:3563
 msgid "Server address"
 msgstr "Serveri aadress"
 
-#: ../libpurple/protocols/novell/novell.c:3566
+#: ../libpurple/protocols/novell/novell.c:3567
 msgid "Server port"
 msgstr "Serveri port"
 
+#: ../libpurple/protocols/oscar/family_chatnav.c:62
+msgid "Could not join chat room"
+msgstr "Jututoaga pole võimalik ühineda"
+
+#: ../libpurple/protocols/oscar/family_chatnav.c:63
+msgid "Invalid chat room name"
+msgstr "Vigane jututoa nimi"
+
 #: ../libpurple/protocols/oscar/flap_connection.c:391
-#: ../libpurple/protocols/yahoo/yahoo.c:2473
-#: ../libpurple/protocols/yahoo/yahoo.c:2641
+#: ../libpurple/protocols/yahoo/yahoo.c:2487
+#: ../libpurple/protocols/yahoo/yahoo.c:2655
 #: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:584
 #: ../libpurple/proxy.c:1129 ../libpurple/proxy.c:1238
 #: ../libpurple/proxy.c:1338 ../libpurple/proxy.c:1466
@@ -8166,8 +8463,8 @@
 msgstr "Server sulges ühenduse."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:393
-#: ../libpurple/protocols/yahoo/yahoo.c:2466
-#: ../libpurple/protocols/yahoo/yahoo.c:2634 ../libpurple/proxy.c:596
+#: ../libpurple/protocols/yahoo/yahoo.c:2480
+#: ../libpurple/protocols/yahoo/yahoo.c:2648 ../libpurple/proxy.c:596
 #: ../libpurple/proxy.c:1141 ../libpurple/proxy.c:1250
 #: ../libpurple/proxy.c:1350 ../libpurple/proxy.c:1478
 #, c-format
@@ -8216,8 +8513,8 @@
 msgstr "ICQ protokolli plugin"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
-#: ../libpurple/protocols/zephyr/zephyr.c:2997
+#: ../libpurple/protocols/yahoo/yahoo.c:4427
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Encoding"
 msgstr "Kooditabel"
 
@@ -8258,111 +8555,115 @@
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:116
+#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid error"
 msgstr "Ebakorrektne viga"
 
-#: ../libpurple/protocols/oscar/oscar.c:117
-msgid "Invalid SNAC"
-msgstr "Vigane SNAC"
-
 #: ../libpurple/protocols/oscar/oscar.c:118
-msgid "Rate to host"
-msgstr ""
+msgid "Invalid SNAC"
+msgstr "Vigane SNAC"
 
 #: ../libpurple/protocols/oscar/oscar.c:119
+msgid "Rate to host"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Rate to client"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:121
-msgid "Service unavailable"
-msgstr "Teenus pole saadaval"
-
 #: ../libpurple/protocols/oscar/oscar.c:122
-msgid "Service not defined"
-msgstr "Teenust pole kirjeldatud"
+msgid "Service unavailable"
+msgstr "Teenus pole saadaval"
 
 #: ../libpurple/protocols/oscar/oscar.c:123
-msgid "Obsolete SNAC"
-msgstr ""
+msgid "Service not defined"
+msgstr "Teenust pole kirjeldatud"
 
 #: ../libpurple/protocols/oscar/oscar.c:124
+msgid "Obsolete SNAC"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by host"
 msgstr "Pole hosti poolt toetatud"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
+#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Not supported by client"
 msgstr "Pole kliendi poolt toetatud"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
+#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Refused by client"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:127
-msgid "Reply too big"
-msgstr ""
-
 #: ../libpurple/protocols/oscar/oscar.c:128
-msgid "Responses lost"
+msgid "Reply too big"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:129
-msgid "Request denied"
+msgid "Responses lost"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:130
-msgid "Busted SNAC payload"
+msgid "Request denied"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:131
-msgid "Insufficient rights"
-msgstr "Pole piisavalt õiguseid"
+msgid "Busted SNAC payload"
+msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:132
-msgid "In local permit/deny"
-msgstr ""
+msgid "Insufficient rights"
+msgstr "Pole piisavalt õiguseid"
 
 #: ../libpurple/protocols/oscar/oscar.c:133
-msgid "Too evil (sender)"
+msgid "In local permit/deny"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:134
-msgid "Too evil (receiver)"
+msgid "Too evil (sender)"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:135
-msgid "User temporarily unavailable"
-msgstr "Kasutaja pole ajutiselt saadaval"
+msgid "Too evil (receiver)"
+msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:136
-msgid "No match"
-msgstr ""
+msgid "User temporarily unavailable"
+msgstr "Kasutaja pole ajutiselt saadaval"
 
 #: ../libpurple/protocols/oscar/oscar.c:137
-msgid "List overflow"
+msgid "No match"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:138
-msgid "Request ambiguous"
+msgid "List overflow"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:139
-msgid "Queue full"
+msgid "Request ambiguous"
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:140
+msgid "Queue full"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:141
 msgid "Not while on AOL"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:348
+#: ../libpurple/protocols/oscar/oscar.c:347
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
 "encoding he is using, you can specify it in the advanced account options for "
 "your AIM/ICQ account.)"
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:457
+"(Selle sõnumi vastuvõtmisel tekkis viga.  Ilmselt kasutab sõber, kellega sa "
+"vestled, sellist kooditabelit, mida sinu programm ei oska oodata. Kui sa "
+"tead, mis kooditabelit su sõber kasutab, siis saad sa seda määrata oma AIM/"
+"ICQ konto laiendatud valikute alt.)"
+
+#: ../libpurple/protocols/oscar/oscar.c:456
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -8373,147 +8674,135 @@
 "klienti.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2392
-#: ../pidgin/gtkutils.c:2422
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2444
+#: ../pidgin/gtkutils.c:2474
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "Sõbraikoon"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:641
 msgid "Voice"
 msgstr "Hääl"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:644
 msgid "AIM Direct IM"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:648
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/util.c:559
-#: ../libpurple/protocols/silc10/silc.c:679
-#: ../libpurple/protocols/silc10/util.c:549
-msgid "Chat"
-msgstr "Vestlus"
-
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6060
+#: ../libpurple/protocols/oscar/oscar.c:650
+#: ../libpurple/protocols/oscar/oscar.c:6113
 msgid "Get File"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Games"
 msgstr "Mängud"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "Add-Ins"
 msgstr "Lisad"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Send Buddy List"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "ICQ Direct Connect"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:670
+msgstr "ICQ otseühendus"
+
+#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "AP User"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "ICQ RTF"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "ICQ Server Relay"
 msgstr "ICQ serveri relee"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:681
 msgid "Old ICQ UTF8"
 msgstr "Vana ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:684
 msgid "Trillian Encryption"
 msgstr "Trillian krüptimine"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:687
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:691
+#: ../libpurple/protocols/oscar/oscar.c:690
 msgid "Hiptop"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:694
+#: ../libpurple/protocols/oscar/oscar.c:693
 msgid "Security Enabled"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:697
+#: ../libpurple/protocols/oscar/oscar.c:696
 msgid "Video Chat"
 msgstr "Videovestlus"
 
-#: ../libpurple/protocols/oscar/oscar.c:701
+#: ../libpurple/protocols/oscar/oscar.c:700
 msgid "iChat AV"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:704
+#: ../libpurple/protocols/oscar/oscar.c:703
 msgid "Live Video"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:706
 msgid "Camera"
 msgstr "Kaamera"
 
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5830
+#: ../libpurple/protocols/oscar/oscar.c:724
+#: ../libpurple/protocols/oscar/oscar.c:5883
 msgid "Free For Chat"
 msgstr "Vestluseks vaba"
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5865
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5918
 msgid "Not Available"
 msgstr "Pole saadaval"
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5851
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5904
 msgid "Occupied"
 msgstr "Hõivatud"
 
-#: ../libpurple/protocols/oscar/oscar.c:735
+#: ../libpurple/protocols/oscar/oscar.c:734
 msgid "Web Aware"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:184
+#: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:184
 #: ../libpurple/protocols/qq/qq.c:289
-#: ../libpurple/protocols/yahoo/yahoo.c:3106 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1060
+#: ../libpurple/protocols/yahoo/yahoo.c:3132 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1084
 msgid "Invisible"
 msgstr "Nähtamatu"
 
-#: ../libpurple/protocols/oscar/oscar.c:739
-msgid "Online"
-msgstr "Ühendatud"
-
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3717
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1156
+#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:3740
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1100
 msgid "IP Address"
 msgstr "IP-aadress"
 
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2901
+#: ../libpurple/protocols/oscar/oscar.c:844
+#: ../libpurple/protocols/oscar/oscar.c:2952
 msgid "Warning Level"
 msgstr "Hoiatuste tase"
 
-#: ../libpurple/protocols/oscar/oscar.c:855
+#: ../libpurple/protocols/oscar/oscar.c:854
 msgid "Buddy Comment"
 msgstr "Sõbra kommentaar"
 
-#: ../libpurple/protocols/oscar/oscar.c:995
+#: ../libpurple/protocols/oscar/oscar.c:994
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -8522,7 +8811,7 @@
 "Autentimisserveriga pole võimalik ühendust saada:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1003
+#: ../libpurple/protocols/oscar/oscar.c:1002
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -8531,20 +8820,20 @@
 "BOS-serveriga pole võimalik ühendust saada:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1043
+#: ../libpurple/protocols/oscar/oscar.c:1042
 msgid "Screen name sent"
 msgstr "Ekraaninimi saadetud"
 
-#: ../libpurple/protocols/oscar/oscar.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:1047
 msgid "Connection established, cookie sent"
 msgstr "Ühendus saavutatud, küpsis saadetud"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
+#: ../libpurple/protocols/oscar/oscar.c:1076
 msgid "Finalizing connection"
 msgstr "Ühendumise lõpuleviimine"
 
-#: ../libpurple/protocols/oscar/oscar.c:1262
+#: ../libpurple/protocols/oscar/oscar.c:1302
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8553,139 +8842,131 @@
 msgstr ""
 
 #. Unregistered screen name
-#: ../libpurple/protocols/oscar/oscar.c:1347
-#: ../libpurple/protocols/yahoo/yahoo.c:2108
+#: ../libpurple/protocols/oscar/oscar.c:1388
+#: ../libpurple/protocols/yahoo/yahoo.c:2109
 msgid "Invalid screen name."
 msgstr "Vigane ekraaninimi."
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1394
 #: ../libpurple/protocols/qq/login_logout.c:485
 #: ../libpurple/protocols/simple/simple.c:1112
-#: ../libpurple/protocols/yahoo/yahoo.c:2130
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
 msgid "Incorrect password."
 msgstr "Vale parool."
 
 #. Suspended account
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1398
 msgid "Your account is currently suspended."
 msgstr ""
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1361
+#: ../libpurple/protocols/oscar/oscar.c:1402
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL'i välksõnumiserver pole ajutiselt saadaval."
 
 #. screen name connecting too frequently
 #. IP address connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1365
-#: ../libpurple/protocols/oscar/oscar.c:1374
+#: ../libpurple/protocols/oscar/oscar.c:1406
+#: ../libpurple/protocols/oscar/oscar.c:1415
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
 #. client too old
-#: ../libpurple/protocols/oscar/oscar.c:1369
+#: ../libpurple/protocols/oscar/oscar.c:1410
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Sinu poolt kasutatava kliendi versioon on liiga vana. Palun hangi uuem "
 "versioon aadressilt %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1407
+#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Could Not Connect"
 msgstr "Pole võimalik ühenduda"
 
-#: ../libpurple/protocols/oscar/oscar.c:1411
+#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Received authorization"
 msgstr "Autoriseerimine vastu võetud"
 
-#: ../libpurple/protocols/oscar/oscar.c:1434
+#: ../libpurple/protocols/oscar/oscar.c:1475
 msgid "The SecurID key entered is invalid."
 msgstr "Sisestatud SecurID võti on vigane."
 
-#: ../libpurple/protocols/oscar/oscar.c:1447
+#: ../libpurple/protocols/oscar/oscar.c:1488
 msgid "Enter SecurID"
 msgstr "SecurID sisestamine"
 
-#: ../libpurple/protocols/oscar/oscar.c:1448
+#: ../libpurple/protocols/oscar/oscar.c:1489
 msgid "Enter the 6 digit number from the digital display."
-msgstr ""
+msgstr "Sisesta digitaalkuval olev kuuekohaline number."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#. *
-#. * @since 2.3.0
 #.
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#. *
-#. * @deprecated Please use purple_request_ok_cancel_with_hint instead.
-#.
-#: ../libpurple/protocols/oscar/oscar.c:1450
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2291
-#: ../libpurple/protocols/oscar/oscar.c:5935
-#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1828
-#: ../libpurple/request.h:1841
+#: ../libpurple/protocols/oscar/oscar.c:1491
+#: ../libpurple/protocols/oscar/oscar.c:2293
+#: ../libpurple/protocols/oscar/oscar.c:2342
+#: ../libpurple/protocols/oscar/oscar.c:5988
+#: ../libpurple/protocols/oscar/oscar.c:6269 ../libpurple/request.h:1458
 msgid "_OK"
 msgstr "_Olgu"
 
-#: ../libpurple/protocols/oscar/oscar.c:1489
-#: ../libpurple/protocols/oscar/oscar.c:1532
+#: ../libpurple/protocols/oscar/oscar.c:1530
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1492
-#: ../libpurple/protocols/oscar/oscar.c:1535
+#: ../libpurple/protocols/oscar/oscar.c:1533
+#: ../libpurple/protocols/oscar/oscar.c:1577
 msgid "Unable to get a valid AIM login hash."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1620
+#: ../libpurple/protocols/oscar/oscar.c:1574
+#: ../libpurple/protocols/oscar/oscar.c:1673
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1623
+#: ../libpurple/protocols/oscar/oscar.c:1676
 msgid "Unable to get a valid login hash."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1653
+#: ../libpurple/protocols/oscar/oscar.c:1706
 msgid "Password sent"
 msgstr "Parool saadetud"
 
-#: ../libpurple/protocols/oscar/oscar.c:1709
+#: ../libpurple/protocols/oscar/oscar.c:1762
 msgid "Unable to initialize connection"
 msgstr "Ühendust pole võimalik lähtestada"
 
-#: ../libpurple/protocols/oscar/oscar.c:2200
+#: ../libpurple/protocols/oscar/oscar.c:2251
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2240
+#: ../libpurple/protocols/oscar/oscar.c:2291
 msgid "Authorization Request Message:"
 msgstr "Volituste küsimise sõnum:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
+#: ../libpurple/protocols/oscar/oscar.c:2292
 msgid "Please authorize me!"
 msgstr "Palun autoriseeri mind!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:2290
-#: ../libpurple/protocols/oscar/oscar.c:2417
-#: ../libpurple/protocols/oscar/oscar.c:5311
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
+#: ../libpurple/protocols/oscar/oscar.c:2333
+#: ../libpurple/protocols/oscar/oscar.c:2341
+#: ../libpurple/protocols/oscar/oscar.c:2468
+#: ../libpurple/protocols/oscar/oscar.c:5360
+#: ../libpurple/protocols/yahoo/yahoo.c:991
 msgid "No reason given."
 msgstr "Põhjendust pole määratud."
 
-#: ../libpurple/protocols/oscar/oscar.c:2289
+#: ../libpurple/protocols/oscar/oscar.c:2340
 msgid "Authorization Denied Message:"
 msgstr "Volituste andmisest keeldumise sõnum:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:2468
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8693,17 +8974,17 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2418
+#: ../libpurple/protocols/oscar/oscar.c:2469
 msgid "ICQ authorization denied."
 msgstr ""
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2425
+#: ../libpurple/protocols/oscar/oscar.c:2476
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2433
+#: ../libpurple/protocols/oscar/oscar.c:2484
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8712,7 +8993,7 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2441
+#: ../libpurple/protocols/oscar/oscar.c:2492
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8721,7 +9002,7 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2449
+#: ../libpurple/protocols/oscar/oscar.c:2500
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8730,38 +9011,38 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2470
+#: ../libpurple/protocols/oscar/oscar.c:2521
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2527
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:318
+#: ../libpurple/protocols/oscar/oscar.c:2532 ../pidgin/gtkroomlist.c:320
 msgid "_Add"
 msgstr "_Lisa"
 
-#: ../libpurple/protocols/oscar/oscar.c:2482
+#: ../libpurple/protocols/oscar/oscar.c:2533
 msgid "_Decline"
 msgstr "Lükka _tagasi"
 
-#: ../libpurple/protocols/oscar/oscar.c:2606
+#: ../libpurple/protocols/oscar/oscar.c:2657
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2615
+#: ../libpurple/protocols/oscar/oscar.c:2666
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2624
+#: ../libpurple/protocols/oscar/oscar.c:2675
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8770,21 +9051,21 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2633
+#: ../libpurple/protocols/oscar/oscar.c:2684
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2642
+#: ../libpurple/protocols/oscar/oscar.c:2693
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2651
+#: ../libpurple/protocols/oscar/oscar.c:2702
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -8792,146 +9073,148 @@
 msgstr[1] ""
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2806
+#: ../libpurple/protocols/oscar/oscar.c:2857
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Sõnumit pole võimalik saata: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2806
-#: ../libpurple/protocols/oscar/oscar.c:2811
-#: ../libpurple/protocols/oscar/oscar.c:2875
+#: ../libpurple/protocols/oscar/oscar.c:2857
+#: ../libpurple/protocols/oscar/oscar.c:2862
+#: ../libpurple/protocols/oscar/oscar.c:2926
 msgid "Unknown reason."
 msgstr "Tundmatu põhjus."
 
-#: ../libpurple/protocols/oscar/oscar.c:2809
-#: ../libpurple/protocols/sametime/sametime.c:2451
+#: ../libpurple/protocols/oscar/oscar.c:2860
+#: ../libpurple/protocols/sametime/sametime.c:2459
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Kasutajale %s pole võimalik sõnumit saata:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2875
+#: ../libpurple/protocols/oscar/oscar.c:2926
 #, c-format
 msgid "User information not available: %s"
 msgstr "Kasutajateave pole saadaval: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2957
 msgid "Online Since"
 msgstr "Võrgus alates"
 
-#: ../libpurple/protocols/oscar/oscar.c:2911
+#: ../libpurple/protocols/oscar/oscar.c:2962
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2946
+#: ../libpurple/protocols/oscar/oscar.c:2997
 msgid "Available Message"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3054
+#: ../libpurple/protocols/oscar/oscar.c:3101
 msgid "Your AIM connection may be lost."
 msgstr "Sinu AIM-ühendus võib olla katkenud."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3242
+#: ../libpurple/protocols/oscar/oscar.c:3289
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3406
+#: ../libpurple/protocols/oscar/oscar.c:3453
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3489
+#: ../libpurple/protocols/oscar/oscar.c:3538
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Ühendus jututoaga %s on katkestatud."
 
-#: ../libpurple/protocols/oscar/oscar.c:3739
+#: ../libpurple/protocols/oscar/oscar.c:3762
 #: ../libpurple/protocols/silc/util.c:591
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobiiltelefon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../libpurple/protocols/oscar/oscar.c:3792
 msgid "Personal Web Page"
 msgstr "Isiklik veebileht"
 
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/oscar/oscar.c:3816
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Täiendavad andmed"
 
-#: ../libpurple/protocols/oscar/oscar.c:3801
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/oscar/oscar.c:3824
+#: ../libpurple/protocols/oscar/oscar.c:3837
 msgid "Zip Code"
 msgstr "Indeks"
 
-#: ../libpurple/protocols/oscar/oscar.c:3825
+#: ../libpurple/protocols/oscar/oscar.c:3848
 msgid "Division"
 msgstr "Üksus"
 
-#: ../libpurple/protocols/oscar/oscar.c:3826
+#: ../libpurple/protocols/oscar/oscar.c:3849
 msgid "Position"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3828
+msgstr "Ametikoht"
+
+#: ../libpurple/protocols/oscar/oscar.c:3851
 msgid "Web Page"
 msgstr "Veebileht"
 
-#: ../libpurple/protocols/oscar/oscar.c:3831
+#: ../libpurple/protocols/oscar/oscar.c:3854
 msgid "Work Information"
 msgstr "Töökoha andmed"
 
-#: ../libpurple/protocols/oscar/oscar.c:3887
+#: ../libpurple/protocols/oscar/oscar.c:3910
 msgid "Pop-Up Message"
 msgstr "Hüpiksõnum"
 
-#: ../libpurple/protocols/oscar/oscar.c:3927
+#: ../libpurple/protocols/oscar/oscar.c:3950
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3932
+#: ../libpurple/protocols/oscar/oscar.c:3955
 msgid "Screen name"
 msgstr "Ekraaninimi"
 
-#: ../libpurple/protocols/oscar/oscar.c:3958
+#: ../libpurple/protocols/oscar/oscar.c:3981
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3979
+#: ../libpurple/protocols/oscar/oscar.c:4002
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3981
+#: ../libpurple/protocols/oscar/oscar.c:4004
 msgid "Account Confirmation Requested"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4012
+#: ../libpurple/protocols/oscar/oscar.c:4035
 msgid "Error Changing Account Info"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4015
+#: ../libpurple/protocols/oscar/oscar.c:4038
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4018
+"Viga 0x%04x: Ekraaninime pole võimalik vormindada kuna küsitud ekraaninimi "
+"erineb algupärasest nimest."
+
+#: ../libpurple/protocols/oscar/oscar.c:4041
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "Viga 0x%04x: Ekraaninime pole võimalik vormindada kuna see on vigane."
 
-#: ../libpurple/protocols/oscar/oscar.c:4021
+#: ../libpurple/protocols/oscar/oscar.c:4044
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8939,58 +9222,64 @@
 msgstr ""
 "Viga 0x%04x: Ekraaninime pole võimalik vormindada kuna see on liiga pikk."
 
-#: ../libpurple/protocols/oscar/oscar.c:4024
+#: ../libpurple/protocols/oscar/oscar.c:4047
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4027
+"Viga 0x%04x: E-postiaadressi pole võimalik muuta kuna selle ekraaninime alt "
+"on tehtud päring, mis on hetkel veel lahendamata."
+
+#: ../libpurple/protocols/oscar/oscar.c:4050
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4030
+"Viga 0x%04x: E-posti aadressi pole võimalik muuta kuna määratud aadressiga "
+"on seotud liiga palju ekraaninimesid."
+
+#: ../libpurple/protocols/oscar/oscar.c:4053
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4033
+"Viga 0x%04x: E-posti aadressi pole võimalik muuta kuna määratud aadress on "
+"vigane."
+
+#: ../libpurple/protocols/oscar/oscar.c:4056
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Viga 0x%04x: Tundmatu viga."
 
-#: ../libpurple/protocols/oscar/oscar.c:4043
+#: ../libpurple/protocols/oscar/oscar.c:4066
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Kasutaja %s e-posti aadress on %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4045
+#: ../libpurple/protocols/oscar/oscar.c:4068
 msgid "Account Info"
 msgstr "Konto andmed"
 
-#: ../libpurple/protocols/oscar/oscar.c:4228
+#: ../libpurple/protocols/oscar/oscar.c:4251
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4499
+#: ../libpurple/protocols/oscar/oscar.c:4520
 msgid "Unable to set AIM profile."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4500
+#: ../libpurple/protocols/oscar/oscar.c:4521
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4514
+#: ../libpurple/protocols/oscar/oscar.c:4535
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -9001,11 +9290,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4519
+#: ../libpurple/protocols/oscar/oscar.c:4540
 msgid "Profile too long."
 msgstr "Profiil on liiga pikk."
 
-#: ../libpurple/protocols/oscar/oscar.c:4564
+#: ../libpurple/protocols/oscar/oscar.c:4584
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9016,11 +9305,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4569
+#: ../libpurple/protocols/oscar/oscar.c:4589
 msgid "Away message too long."
 msgstr "Eemaloleku teade on liiga pikk."
 
-#: ../libpurple/protocols/oscar/oscar.c:4642
+#: ../libpurple/protocols/oscar/oscar.c:4662
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9028,70 +9317,72 @@
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4644
-#: ../libpurple/protocols/oscar/oscar.c:5097
-#: ../libpurple/protocols/oscar/oscar.c:5112
+#: ../libpurple/protocols/oscar/oscar.c:4664
+#: ../libpurple/protocols/oscar/oscar.c:5129
+#: ../libpurple/protocols/oscar/oscar.c:5144
 msgid "Unable To Add"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4763
+#: ../libpurple/protocols/oscar/oscar.c:4783
 msgid "Unable To Retrieve Buddy List"
 msgstr "Sõbranimekirja pole võimalik vastu võtta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4764
+#: ../libpurple/protocols/oscar/oscar.c:4784
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few minutes."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4947
-#: ../libpurple/protocols/oscar/oscar.c:4949
-#: ../libpurple/protocols/oscar/oscar.c:5177
-#: ../libpurple/protocols/oscar/oscar.c:5178
-#: ../libpurple/protocols/oscar/oscar.c:5183
+#: ../libpurple/protocols/oscar/oscar.c:4979
+#: ../libpurple/protocols/oscar/oscar.c:4981
+#: ../libpurple/protocols/oscar/oscar.c:5211
+#: ../libpurple/protocols/oscar/oscar.c:5212
+#: ../libpurple/protocols/oscar/oscar.c:5217
 msgid "Orphans"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:5127
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5095
-#: ../libpurple/protocols/oscar/oscar.c:5110
+"Sõpra %s pole võimalik lisada kuna su sõbranimekirjas on juba liiga palju "
+"sõpru. Palun eemalda sealt mõni ja siis proovi uuesti."
+
+#: ../libpurple/protocols/oscar/oscar.c:5127
+#: ../libpurple/protocols/oscar/oscar.c:5142
 msgid "(no name)"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5109
+msgstr "(nimi puudub)"
+
+#: ../libpurple/protocols/oscar/oscar.c:5141
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5226
+msgstr "Sõpra %s pole teadmata põhjusel võimalik lisada."
+
+#: ../libpurple/protocols/oscar/oscar.c:5275
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5234
+#: ../libpurple/protocols/oscar/oscar.c:5283
 msgid "Authorization Given"
 msgstr ""
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5307
+#: ../libpurple/protocols/oscar/oscar.c:5356
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5308
+#: ../libpurple/protocols/oscar/oscar.c:5357
 msgid "Authorization Granted"
 msgstr ""
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5311
+#: ../libpurple/protocols/oscar/oscar.c:5360
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9099,192 +9390,184 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5312
+#: ../libpurple/protocols/oscar/oscar.c:5361
 msgid "Authorization Denied"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5348
+#: ../libpurple/protocols/oscar/oscar.c:5397
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5388
-msgid "Invalid chat name specified."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5457
+#: ../libpurple/protocols/oscar/oscar.c:5510
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5619
-#: ../libpurple/protocols/oscar/oscar.c:5624
+"Sinu välksõnumit ei saadetud kuna Sul pole võimalik AIM-vestlustes "
+"välksõnumeid saata."
+
+#: ../libpurple/protocols/oscar/oscar.c:5672
+#: ../libpurple/protocols/oscar/oscar.c:5677
 msgid "Away Message"
 msgstr "Eemaloleku sõnum"
 
-#: ../libpurple/protocols/oscar/oscar.c:5624
+#: ../libpurple/protocols/oscar/oscar.c:5677
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(vastuvõtmine)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5824
+#: ../libpurple/protocols/oscar/oscar.c:5877
 msgid "iTunes Music Store Link"
 msgstr "iTunes muusikapoe viit"
 
-#: ../libpurple/protocols/oscar/oscar.c:5932
+#: ../libpurple/protocols/oscar/oscar.c:5985
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Sõbrakommentaar %s kohta"
 
-#: ../libpurple/protocols/oscar/oscar.c:5933
+#: ../libpurple/protocols/oscar/oscar.c:5986
 msgid "Buddy Comment:"
 msgstr "Sõbrakommentaar:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5980
+#: ../libpurple/protocols/oscar/oscar.c:6033
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5984
+#: ../libpurple/protocols/oscar/oscar.c:6037
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5990
+#: ../libpurple/protocols/oscar/oscar.c:6043
 #: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "Ü_hendu"
 
-#: ../libpurple/protocols/oscar/oscar.c:6025
+#: ../libpurple/protocols/oscar/oscar.c:6078
 msgid "Get AIM Info"
 msgstr "Hangi AIM-andmed"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
+#: ../libpurple/protocols/oscar/oscar.c:6084
 msgid "Edit Buddy Comment"
 msgstr "Redigeeri sõbrakommentaari"
 
-#: ../libpurple/protocols/oscar/oscar.c:6039
+#: ../libpurple/protocols/oscar/oscar.c:6092
 msgid "Get Status Msg"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6052
+#: ../libpurple/protocols/oscar/oscar.c:6105
 msgid "Direct IM"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6074
+#: ../libpurple/protocols/oscar/oscar.c:6127
 msgid "Re-request Authorization"
 msgstr "Volituste uuestiküsimine"
 
-#: ../libpurple/protocols/oscar/oscar.c:6133
+#: ../libpurple/protocols/oscar/oscar.c:6186
 msgid "Require authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6136
+#: ../libpurple/protocols/oscar/oscar.c:6189
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
+#: ../libpurple/protocols/oscar/oscar.c:6194
 msgid "ICQ Privacy Options"
 msgstr "ICQ privaatsusvalikud"
 
-#: ../libpurple/protocols/oscar/oscar.c:6160
+#: ../libpurple/protocols/oscar/oscar.c:6213
 msgid "The new formatting is invalid."
 msgstr "Uus vormindus on vigane."
 
-#: ../libpurple/protocols/oscar/oscar.c:6161
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
+#: ../libpurple/protocols/oscar/oscar.c:6267
 msgid "Change Address To:"
 msgstr "Aadressi muutmine:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6260
+#: ../libpurple/protocols/oscar/oscar.c:6313
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>sa ootad autoriseerimist</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6263
+#: ../libpurple/protocols/oscar/oscar.c:6316
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Sa ootad järgnevate sõprade autoriseerimist"
 
-#: ../libpurple/protocols/oscar/oscar.c:6264
+#: ../libpurple/protocols/oscar/oscar.c:6317
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6281
+#: ../libpurple/protocols/oscar/oscar.c:6334
 msgid "Find Buddy by E-Mail"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6282
+#: ../libpurple/protocols/oscar/oscar.c:6335
 msgid "Search for a buddy by e-mail address"
 msgstr "Sõbra otsimine e-posti aadressi järgi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6283
+#: ../libpurple/protocols/oscar/oscar.c:6336
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Sisesta otsitava sõbra e-posti aadress."
 
-#: ../libpurple/protocols/oscar/oscar.c:6286
+#: ../libpurple/protocols/oscar/oscar.c:6339
 msgid "_Search"
 msgstr "_Otsi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6444
+#: ../libpurple/protocols/oscar/oscar.c:6497
 msgid "Set User Info (URL)..."
 msgstr "Kasutajate andmete määramine (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6455
+#: ../libpurple/protocols/oscar/oscar.c:6508
 msgid "Change Password (URL)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6459
+#: ../libpurple/protocols/oscar/oscar.c:6512
 msgid "Configure IM Forwarding (URL)"
 msgstr ""
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6469
+#: ../libpurple/protocols/oscar/oscar.c:6522
 msgid "Set Privacy Options..."
 msgstr "Määra privaatsusvalikud..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6476
+#: ../libpurple/protocols/oscar/oscar.c:6529
 msgid "Confirm Account"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6480
+#: ../libpurple/protocols/oscar/oscar.c:6533
 msgid "Display Currently Registered E-Mail Address"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6484
+#: ../libpurple/protocols/oscar/oscar.c:6537
 msgid "Change Currently Registered E-Mail Address..."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6491
+#: ../libpurple/protocols/oscar/oscar.c:6544
 msgid "Show Buddies Awaiting Authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6497
+#: ../libpurple/protocols/oscar/oscar.c:6550
 msgid "Search for Buddy by E-Mail Address..."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6502
+#: ../libpurple/protocols/oscar/oscar.c:6555
 msgid "Search for Buddy by Information"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6570
-msgid "Use recent buddies group"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:6573
-msgid "Show how long you have been idle"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:6728
-msgid ""
-"Always use ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-msgstr ""
-"Failiülekanneteks kasutatakse alati ICQ proksi serverit\n"
-"(aeglasem, kuid ei näita sinu IP-aaddressi välja)"
+#: ../libpurple/protocols/oscar/oscar.c:6754
+msgid ""
+"Always use AIM/ICQ proxy server for\n"
+"file transfers and direct IM (slower,\n"
+"but does not reveal your IP address)"
+msgstr ""
+"Failiülekanneteks kasutatakse alati\n"
+"AIM/ICQ proksi serverit (aeglasem, kuid\n"
+"ei näita sinu IP-aaddressi välja)"
 
 #: ../libpurple/protocols/oscar/peer.c:699
 #, c-format
@@ -9490,7 +9773,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:136
+#: ../libpurple/protocols/qq/group_opt.c:112
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Sa lükkasid kasutaja %d päringu tagasi"
@@ -9505,7 +9788,7 @@
 
 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:141
+#: ../libpurple/protocols/qq/group_opt.c:117
 msgid "Sorry, you are not my type..."
 msgstr ""
 
@@ -9544,7 +9827,7 @@
 #. hint
 #: ../libpurple/protocols/qq/buddy_opt.c:408
 #: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_opt.c:143
+#: ../libpurple/protocols/qq/group_opt.c:119
 msgid "Send"
 msgstr ""
 
@@ -9571,7 +9854,7 @@
 
 #: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
-msgstr ""
+msgstr "Looja"
 
 #: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
@@ -9600,7 +9883,7 @@
 
 #: ../libpurple/protocols/qq/group_im.c:127
 #: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:193
+#: ../libpurple/protocols/qq/sys_msg.c:196
 #, c-format
 msgid "Reason: %s"
 msgstr "Põhjus: %s"
@@ -9612,16 +9895,16 @@
 #: ../libpurple/protocols/qq/group_im.c:292
 #: ../libpurple/protocols/qq/group_join.c:233
 #: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:235
-#: ../libpurple/protocols/qq/group_opt.c:305
-#: ../libpurple/protocols/qq/group_opt.c:391
+#: ../libpurple/protocols/qq/group_opt.c:211
+#: ../libpurple/protocols/qq/group_opt.c:281
+#: ../libpurple/protocols/qq/group_opt.c:367
 msgid "QQ Qun Operation"
 msgstr ""
 
 #: ../libpurple/protocols/qq/group_im.c:141
-#: ../libpurple/protocols/qq/group_opt.c:128
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:248
+#: ../libpurple/protocols/qq/group_opt.c:104
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "Nõustu"
 
@@ -9709,32 +9992,32 @@
 msgstr ""
 
 #. we want to see window
-#: ../libpurple/protocols/qq/group_opt.c:124
+#: ../libpurple/protocols/qq/group_opt.c:99
 #: ../libpurple/protocols/qq/sys_msg.c:87
 msgid "Do you want to approve the request?"
 msgstr "Kas sa nõustud selle päringuga?"
 
-#: ../libpurple/protocols/qq/group_opt.c:137
+#: ../libpurple/protocols/qq/group_opt.c:113
 msgid "Enter your reason:"
 msgstr "Sisesta oam põhjus:"
 
-#: ../libpurple/protocols/qq/group_opt.c:235
+#: ../libpurple/protocols/qq/group_opt.c:211
 msgid "You have successfully modified Qun member"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:305
+#: ../libpurple/protocols/qq/group_opt.c:281
 msgid "You have successfully modified Qun information"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:392
+#: ../libpurple/protocols/qq/group_opt.c:368
 msgid "You have successfully created a Qun"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:394
+#: ../libpurple/protocols/qq/group_opt.c:370
 msgid "Would you like to set up the Qun details now?"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/group_opt.c:374
 msgid "Setup"
 msgstr ""
 
@@ -9754,14 +10037,19 @@
 msgid "Error requesting login token"
 msgstr "Viga sisselogimistõendi küsimisel"
 
-#: ../libpurple/protocols/qq/login_logout.c:489
-msgid "Unable to login, check debug log"
-msgstr "Sisse pole võimalik logida, kontrolli silumislogi"
+#: ../libpurple/protocols/qq/login_logout.c:490
+msgid "Unable to login. Check debug log."
+msgstr "Sisse pole võimalik logida, kontrolli silumislogi."
+
+#: ../libpurple/protocols/qq/login_logout.c:493
+msgid "Unable to login"
+msgstr "Sisse pole võimalik logida"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../libpurple/protocols/qq/qq.c:140 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:158
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:238
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1194
 #: ../libpurple/protocols/yahoo/ycht.c:550
 msgid "Unable to connect."
 msgstr "Ühendumine pole võimalik."
@@ -9900,48 +10188,48 @@
 msgid "Login failed, no reply"
 msgstr "Tõrge sisselogimisel, vastust ei saadud"
 
-#: ../libpurple/protocols/qq/sys_msg.c:110
+#: ../libpurple/protocols/qq/sys_msg.c:111
 msgid "Do you want to add this buddy?"
 msgstr "Kas sa soovid seda sõpra lisada?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:166
+#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "Sind lisati %s poolt"
 
-#: ../libpurple/protocols/qq/sys_msg.c:169
-#: ../libpurple/protocols/qq/sys_msg.c:263
+#: ../libpurple/protocols/qq/sys_msg.c:171
+#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "Kas sa soovid teda lisada?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:179
 #, c-format
 msgid "%s has added you [%s] to his or her buddy list"
 msgstr "%s lisas sinu [%s] oma sõbranimekirja"
 
-#: ../libpurple/protocols/qq/sys_msg.c:192
+#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "User %s rejected your request"
 msgstr "Kasutaja %s lükkas su päringu tagasi"
 
-#: ../libpurple/protocols/qq/sys_msg.c:212
+#: ../libpurple/protocols/qq/sys_msg.c:215
 #, c-format
 msgid "User %s approved your request"
 msgstr "Kasutaja %s nõustus sinu päringuga"
 
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:238
+#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wants to add you [%s] as a friend"
 msgstr "%s soovib määrata sind [%s] oma sõbraks"
 
-#: ../libpurple/protocols/qq/sys_msg.c:239
+#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "Sõnum: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:261
+#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s pole sinu sõbranimekirjas"
@@ -10019,65 +10307,65 @@
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1734
+#: ../libpurple/protocols/sametime/sametime.c:1736
 msgid "Connection reset"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1746
+#: ../libpurple/protocols/sametime/sametime.c:1748
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Viga soklist lugemisel: %s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1771
-#: ../libpurple/protocols/sametime/sametime.c:3772
+#: ../libpurple/protocols/sametime/sametime.c:1773
+#: ../libpurple/protocols/sametime/sametime.c:3780
 msgid "Unable to connect to host"
 msgstr "Hostiga pole võimalik ühenduda"
 
-#: ../libpurple/protocols/sametime/sametime.c:1812
+#: ../libpurple/protocols/sametime/sametime.c:1814
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1986
+#: ../libpurple/protocols/sametime/sametime.c:1988
 msgid "Conference Closed"
 msgstr "Konverents suletud"
 
-#: ../libpurple/protocols/sametime/sametime.c:2445
+#: ../libpurple/protocols/sametime/sametime.c:2453
 msgid "Unable to send message: "
 msgstr "Sõnumit pole võimalik saata: "
 
-#: ../libpurple/protocols/sametime/sametime.c:3001
+#: ../libpurple/protocols/sametime/sametime.c:3009
 msgid "Place Closed"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3271
+#: ../libpurple/protocols/sametime/sametime.c:3279
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: ../libpurple/protocols/sametime/sametime.c:3272
+#: ../libpurple/protocols/sametime/sametime.c:3280
 msgid "Speakers"
 msgstr "Kõlarid"
 
-#: ../libpurple/protocols/sametime/sametime.c:3273
+#: ../libpurple/protocols/sametime/sametime.c:3281
 msgid "Video Camera"
 msgstr "Videokaamera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3311
-#: ../libpurple/protocols/sametime/sametime.c:4191
+#: ../libpurple/protocols/sametime/sametime.c:3319
+#: ../libpurple/protocols/sametime/sametime.c:4199
 msgid "Supports"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3316
-#: ../libpurple/protocols/sametime/sametime.c:4165
+#: ../libpurple/protocols/sametime/sametime.c:3324
+#: ../libpurple/protocols/sametime/sametime.c:4173
 msgid "External User"
 msgstr "Väline kasutaja"
 
-#: ../libpurple/protocols/sametime/sametime.c:3422
+#: ../libpurple/protocols/sametime/sametime.c:3430
 msgid "Create conference with user"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3423
+#: ../libpurple/protocols/sametime/sametime.c:3431
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -10085,27 +10373,27 @@
 msgstr ""
 "Palun sisesta uue konverentsi teema ja kasutajale %s saadetava kutse sõnum"
 
-#: ../libpurple/protocols/sametime/sametime.c:3427
+#: ../libpurple/protocols/sametime/sametime.c:3435
 msgid "New Conference"
 msgstr "Uus konverents"
 
-#: ../libpurple/protocols/sametime/sametime.c:3429
+#: ../libpurple/protocols/sametime/sametime.c:3437
 msgid "Create"
 msgstr "Algata"
 
-#: ../libpurple/protocols/sametime/sametime.c:3494
+#: ../libpurple/protocols/sametime/sametime.c:3502
 msgid "Available Conferences"
 msgstr "Saadaolevad konverentsid"
 
-#: ../libpurple/protocols/sametime/sametime.c:3500
+#: ../libpurple/protocols/sametime/sametime.c:3508
 msgid "Create New Conference..."
 msgstr "Uue konverentsi loomine..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3507
+#: ../libpurple/protocols/sametime/sametime.c:3515
 msgid "Invite user to a conference"
 msgstr "Kasutaja kutsumine konverentsile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3508
+#: ../libpurple/protocols/sametime/sametime.c:3516
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10113,27 +10401,27 @@
 "this user to."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3513
+#: ../libpurple/protocols/sametime/sametime.c:3521
 msgid "Invite to Conference"
 msgstr "Konverentsile kutsumine"
 
-#: ../libpurple/protocols/sametime/sametime.c:3604
+#: ../libpurple/protocols/sametime/sametime.c:3612
 msgid "Invite to Conference..."
 msgstr "Konverentsile kutsumine..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3609
+#: ../libpurple/protocols/sametime/sametime.c:3617
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3628 ../pidgin/gtkconv.c:4437
+#: ../libpurple/protocols/sametime/sametime.c:3636 ../pidgin/gtkconv.c:4431
 msgid "Topic:"
 msgstr "Teema:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3656
+#: ../libpurple/protocols/sametime/sametime.c:3664
 msgid "No Sametime Community Server specified"
 msgstr "Sametime kogukonna serverit pole määratud"
 
-#: ../libpurple/protocols/sametime/sametime.c:3681
+#: ../libpurple/protocols/sametime/sametime.c:3689
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10142,64 +10430,64 @@
 "Meanwhile kontole %s pole hostinime ega IP-aadressi määratud. Palun määra "
 "see ja jätka sisselogimist."
 
-#: ../libpurple/protocols/sametime/sametime.c:3686
+#: ../libpurple/protocols/sametime/sametime.c:3694
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile ühenduse sätted"
 
-#: ../libpurple/protocols/sametime/sametime.c:3687
+#: ../libpurple/protocols/sametime/sametime.c:3695
 msgid "No Sametime Community Server Specified"
 msgstr "Sametime kogukonna serverit pole määratud"
 
-#: ../libpurple/protocols/sametime/sametime.c:3689
+#: ../libpurple/protocols/sametime/sametime.c:3697
 msgid "Connect"
 msgstr "Ühendu"
 
-#: ../libpurple/protocols/sametime/sametime.c:4181
+#: ../libpurple/protocols/sametime/sametime.c:4189
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Tundmatu (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4183
+#: ../libpurple/protocols/sametime/sametime.c:4191
 msgid "Last Known Client"
 msgstr "Viimane teadaolev klient"
 
-#: ../libpurple/protocols/sametime/sametime.c:4347
-#: ../libpurple/protocols/sametime/sametime.c:5552
+#: ../libpurple/protocols/sametime/sametime.c:4355
+#: ../libpurple/protocols/sametime/sametime.c:5560
 msgid "User Name"
 msgstr "Kasutajanimi"
 
-#: ../libpurple/protocols/sametime/sametime.c:4350
-#: ../libpurple/protocols/sametime/sametime.c:5555
+#: ../libpurple/protocols/sametime/sametime.c:4358
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4374
+#: ../libpurple/protocols/sametime/sametime.c:4382
 msgid "An ambiguous user ID was entered"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4375
+#: ../libpurple/protocols/sametime/sametime.c:4383
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4380
+#: ../libpurple/protocols/sametime/sametime.c:4388
 msgid "Select User"
 msgstr "Vali kasutaja"
 
-#: ../libpurple/protocols/sametime/sametime.c:4464
+#: ../libpurple/protocols/sametime/sametime.c:4472
 msgid "Unable to add user: user not found"
 msgstr "Kasutajat pole võimalik lisada: kasutajat ei leitud"
 
-#: ../libpurple/protocols/sametime/sametime.c:4466
+#: ../libpurple/protocols/sametime/sametime.c:4474
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5057
+#: ../libpurple/protocols/sametime/sametime.c:5065
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10208,63 +10496,63 @@
 "Viga faili %s lugemisel: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5192
+#: ../libpurple/protocols/sametime/sametime.c:5200
 msgid "Remotely Stored Buddy List"
 msgstr "Serverisse salvestatud sõbranimekiri"
 
-#: ../libpurple/protocols/sametime/sametime.c:5197
+#: ../libpurple/protocols/sametime/sametime.c:5205
 msgid "Buddy List Storage Mode"
 msgstr "Sõbranimekirja salvestamise režiim"
 
-#: ../libpurple/protocols/sametime/sametime.c:5200
+#: ../libpurple/protocols/sametime/sametime.c:5208
 msgid "Local Buddy List Only"
 msgstr "Ainult kohalik sõbranimekiri"
 
-#: ../libpurple/protocols/sametime/sametime.c:5202
+#: ../libpurple/protocols/sametime/sametime.c:5210
 msgid "Merge List from Server"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5204
+#: ../libpurple/protocols/sametime/sametime.c:5212
 msgid "Merge and Save List to Server"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5206
+#: ../libpurple/protocols/sametime/sametime.c:5214
 msgid "Synchronize List with Server"
 msgstr "Nimekirja sünkroniseerimine serveriga"
 
-#: ../libpurple/protocols/sametime/sametime.c:5261
+#: ../libpurple/protocols/sametime/sametime.c:5269
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5301
+#: ../libpurple/protocols/sametime/sametime.c:5309
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5355
+#: ../libpurple/protocols/sametime/sametime.c:5363
 msgid "Unable to add group: group exists"
 msgstr "Gruppi pole võimalik lisada: grupp on juba olemas"
 
-#: ../libpurple/protocols/sametime/sametime.c:5356
+#: ../libpurple/protocols/sametime/sametime.c:5364
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Grupp '%s' on sinu sõbraloendis juba olemas."
 
-#: ../libpurple/protocols/sametime/sametime.c:5359
-#: ../libpurple/protocols/sametime/sametime.c:5489
+#: ../libpurple/protocols/sametime/sametime.c:5367
+#: ../libpurple/protocols/sametime/sametime.c:5497
 msgid "Unable to add group"
 msgstr "Gruppi pole võimalik lisada"
 
-#: ../libpurple/protocols/sametime/sametime.c:5418
+#: ../libpurple/protocols/sametime/sametime.c:5426
 msgid "Possible Matches"
 msgstr "Võimalikud vastavused"
 
-#: ../libpurple/protocols/sametime/sametime.c:5434
+#: ../libpurple/protocols/sametime/sametime.c:5442
 msgid "Notes Address Book group results"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5435
+#: ../libpurple/protocols/sametime/sametime.c:5443
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10272,37 +10560,37 @@
 "to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5440
+#: ../libpurple/protocols/sametime/sametime.c:5448
 msgid "Select Notes Address Book"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5483
+#: ../libpurple/protocols/sametime/sametime.c:5491
 msgid "Unable to add group: group not found"
 msgstr "Gruppi pole võimalik lisada: gruppi ei leitud"
 
-#: ../libpurple/protocols/sametime/sametime.c:5485
+#: ../libpurple/protocols/sametime/sametime.c:5493
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5526
+#: ../libpurple/protocols/sametime/sametime.c:5534
 msgid "Notes Address Book Group"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5527
+#: ../libpurple/protocols/sametime/sametime.c:5535
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5576
+#: ../libpurple/protocols/sametime/sametime.c:5584
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Otsingutulemused '%s' jaoks"
 
-#: ../libpurple/protocols/sametime/sametime.c:5577
+#: ../libpurple/protocols/sametime/sametime.c:5585
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10310,59 +10598,59 @@
 "buttons below."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5584 ../pidgin/gtknotify.c:763
+#: ../libpurple/protocols/sametime/sametime.c:5592 ../pidgin/gtknotify.c:770
 msgid "Search Results"
 msgstr "Otsingutulemused"
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
+#: ../libpurple/protocols/sametime/sametime.c:5617
 msgid "No matches"
 msgstr "Vastavusi pole"
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5618
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5614
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "No Matches"
 msgstr "Vastavusi pole"
 
-#: ../libpurple/protocols/sametime/sametime.c:5651
+#: ../libpurple/protocols/sametime/sametime.c:5659
 msgid "Search for a user"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5652
+#: ../libpurple/protocols/sametime/sametime.c:5660
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5655
+#: ../libpurple/protocols/sametime/sametime.c:5663
 msgid "User Search"
 msgstr "Kasutajaotsing"
 
-#: ../libpurple/protocols/sametime/sametime.c:5668
+#: ../libpurple/protocols/sametime/sametime.c:5676
 msgid "Import Sametime List..."
 msgstr "Impordi Sametime nimekiri..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5672
+#: ../libpurple/protocols/sametime/sametime.c:5680
 msgid "Export Sametime List..."
 msgstr "Ekspordi Sametime nimekiri..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5676
+#: ../libpurple/protocols/sametime/sametime.c:5684
 msgid "Add Notes Address Book Group..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5680
+#: ../libpurple/protocols/sametime/sametime.c:5688
 msgid "User Search..."
 msgstr "Kasutajaotsing..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5786
+#: ../libpurple/protocols/sametime/sametime.c:5794
 msgid "Force login (ignore server redirects)"
 msgstr "Jõuga sisselogimine (serveri ümbersuunamisi eiratakse)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5796
+#: ../libpurple/protocols/sametime/sametime.c:5804
 msgid "Hide client identity"
 msgstr "Kliendi identiteet on peidetud"
 
@@ -10577,6 +10865,8 @@
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
 msgstr ""
+"Sõbra lisamiseks pead sa importima tema avaliku võtme. Avaliku võtme "
+"importimiseks vajuta nuppu \"Impordi\"."
 
 #: ../libpurple/protocols/silc/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1088
@@ -10637,7 +10927,7 @@
 #: ../libpurple/protocols/silc/silc.c:886
 #: ../libpurple/protocols/silc/util.c:522
 #: ../libpurple/protocols/silc10/buddy.c:1496
-#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc10/silc.c:660
 #: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Õnnelik"
@@ -10646,7 +10936,7 @@
 #: ../libpurple/protocols/silc/silc.c:888
 #: ../libpurple/protocols/silc/util.c:524
 #: ../libpurple/protocols/silc10/buddy.c:1498
-#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc10/silc.c:662
 #: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Kurb"
@@ -10655,7 +10945,7 @@
 #: ../libpurple/protocols/silc/silc.c:890
 #: ../libpurple/protocols/silc/util.c:526
 #: ../libpurple/protocols/silc10/buddy.c:1500
-#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc10/silc.c:664
 #: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Vihane"
@@ -10664,7 +10954,7 @@
 #: ../libpurple/protocols/silc/silc.c:892
 #: ../libpurple/protocols/silc/util.c:528
 #: ../libpurple/protocols/silc10/buddy.c:1502
-#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/silc.c:666
 #: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Armukade"
@@ -10673,7 +10963,7 @@
 #: ../libpurple/protocols/silc/silc.c:894
 #: ../libpurple/protocols/silc/util.c:530
 #: ../libpurple/protocols/silc10/buddy.c:1504
-#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/silc.c:668
 #: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Häbenev"
@@ -10682,7 +10972,7 @@
 #: ../libpurple/protocols/silc/silc.c:896
 #: ../libpurple/protocols/silc/util.c:532
 #: ../libpurple/protocols/silc10/buddy.c:1506
-#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/silc.c:670
 #: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr ""
@@ -10698,7 +10988,7 @@
 #: ../libpurple/protocols/silc/silc.c:900
 #: ../libpurple/protocols/silc/util.c:536
 #: ../libpurple/protocols/silc10/buddy.c:1510
-#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/silc.c:674
 #: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Unine"
@@ -10707,7 +10997,7 @@
 #: ../libpurple/protocols/silc/silc.c:902
 #: ../libpurple/protocols/silc/util.c:538
 #: ../libpurple/protocols/silc10/buddy.c:1512
-#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/silc.c:676
 #: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Tüdinud"
@@ -10716,7 +11006,7 @@
 #: ../libpurple/protocols/silc/silc.c:904
 #: ../libpurple/protocols/silc/util.c:540
 #: ../libpurple/protocols/silc10/buddy.c:1514
-#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc10/silc.c:678
 #: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Põnevil"
@@ -10725,7 +11015,7 @@
 #: ../libpurple/protocols/silc/silc.c:906
 #: ../libpurple/protocols/silc/util.c:542
 #: ../libpurple/protocols/silc10/buddy.c:1516
-#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/silc.c:680
 #: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Rahutu"
@@ -10762,8 +11052,8 @@
 #: ../libpurple/protocols/silc/ops.c:1239
 #: ../libpurple/protocols/silc10/buddy.c:1580
 #: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:722
-#: ../libpurple/protocols/silc10/silc.c:724
+#: ../libpurple/protocols/silc10/silc.c:728
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "Timezone"
 msgstr "Ajavöönd"
 
@@ -10904,7 +11194,7 @@
 #: ../libpurple/protocols/silc/chat.c:432
 #: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
-msgstr ""
+msgstr "Kanali avalike võtmete nimekiri"
 
 #: ../libpurple/protocols/silc/chat.c:437
 #: ../libpurple/protocols/silc10/chat.c:413
@@ -10945,8 +11235,8 @@
 #: ../libpurple/protocols/silc/ops.c:1817
 #: ../libpurple/protocols/silc/silc.c:1163
 #: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1901
-#: ../libpurple/protocols/silc10/silc.c:931
+#: ../libpurple/protocols/silc10/ops.c:1907
+#: ../libpurple/protocols/silc10/silc.c:937
 msgid "Passphrase"
 msgstr "Parool"
 
@@ -11053,21 +11343,21 @@
 #: ../libpurple/protocols/silc/chat.c:1245
 #: ../libpurple/protocols/silc/silc.c:1360
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1140
+#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Call Command"
 msgstr ""
 
 #: ../libpurple/protocols/silc/chat.c:1245
 #: ../libpurple/protocols/silc/silc.c:1361
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1140
+#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Cannot call command"
 msgstr ""
 
 #: ../libpurple/protocols/silc/chat.c:1246
 #: ../libpurple/protocols/silc/silc.c:1362
 #: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1141
+#: ../libpurple/protocols/silc10/silc.c:1144
 msgid "Unknown command"
 msgstr "Tundmatu käsk"
 
@@ -11227,7 +11517,7 @@
 #: ../libpurple/protocols/silc/ops.c:1018
 #: ../libpurple/protocols/silc/silc.c:1156
 #: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:924
+#: ../libpurple/protocols/silc10/silc.c:930
 msgid "Organization"
 msgstr "Organisatsioon"
 
@@ -11293,7 +11583,7 @@
 #: ../libpurple/protocols/silc/ops.c:1373
 #: ../libpurple/protocols/silc/silc.c:1220
 #: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:991
+#: ../libpurple/protocols/silc10/silc.c:994
 msgid "Detach From Server"
 msgstr ""
 
@@ -11305,7 +11595,7 @@
 #: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
-msgstr ""
+msgstr "Teemat pole võimalik seada"
 
 #: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
@@ -11421,24 +11711,24 @@
 #: ../libpurple/protocols/silc/ops.c:1728
 #: ../libpurple/protocols/silc/ops.c:1779
 #: ../libpurple/protocols/silc/silc.c:385
-#: ../libpurple/protocols/silc10/ops.c:1811
-#: ../libpurple/protocols/silc10/ops.c:1858
-#: ../libpurple/protocols/silc10/silc.c:190
+#: ../libpurple/protocols/silc10/ops.c:1817
+#: ../libpurple/protocols/silc10/ops.c:1864
+#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Resuming session"
 msgstr ""
 
 #: ../libpurple/protocols/silc/ops.c:1730
-#: ../libpurple/protocols/silc10/ops.c:1813
+#: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr ""
 
 #: ../libpurple/protocols/silc/ops.c:1781
-#: ../libpurple/protocols/silc10/ops.c:1860
+#: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr "Serveri avaliku võtme verifitseerimine"
 
 #: ../libpurple/protocols/silc/ops.c:1818
-#: ../libpurple/protocols/silc10/ops.c:1902
+#: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr ""
 
@@ -11478,83 +11768,85 @@
 msgstr "Toetamata avaliku võtme liik"
 
 #: ../libpurple/protocols/silc/silc.c:319
-#: ../libpurple/protocols/silc10/ops.c:1749
+#: ../libpurple/protocols/silc10/ops.c:1755
 msgid "Disconnected by server"
 msgstr "Ühendus katkestatud serveri poolt"
 
 #: ../libpurple/protocols/silc/silc.c:327
-#: ../libpurple/protocols/silc10/ops.c:1700
+#: ../libpurple/protocols/silc10/ops.c:1701
 msgid "Error during connecting to SILC Server"
 msgstr "Viga SILC-serveriga ühendumisel"
 
 #: ../libpurple/protocols/silc/silc.c:333
-#: ../libpurple/protocols/silc10/ops.c:1705
+#: ../libpurple/protocols/silc10/ops.c:1707
 msgid "Key Exchange failed"
 msgstr "Tõrge võtmevahetusel"
 
 #: ../libpurple/protocols/silc/silc.c:343
-#: ../libpurple/protocols/silc10/ops.c:1714
+#: ../libpurple/protocols/silc10/ops.c:1718
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:373
 #: ../libpurple/protocols/silc/silc.c:420
-#: ../libpurple/protocols/silc10/silc.c:161
+#: ../libpurple/protocols/silc10/silc.c:163
 msgid "Connection failed"
 msgstr "Tõrge ühendumisel"
 
 #: ../libpurple/protocols/silc/silc.c:388
-#: ../libpurple/protocols/silc10/silc.c:193
+#: ../libpurple/protocols/silc10/silc.c:196
 msgid "Performing key exchange"
 msgstr "Võtmevahetuse läbiviimine"
 
 #. Progress
 #: ../libpurple/protocols/silc/silc.c:445
-#: ../libpurple/protocols/silc10/silc.c:325
+#: ../libpurple/protocols/silc10/silc.c:329
 msgid "Connecting to SILC Server"
 msgstr "Ühendumine SILC-serverisse"
 
 #: ../libpurple/protocols/silc/silc.c:455
+#: ../libpurple/protocols/silc10/silc.c:340
 msgid "Could not load SILC key pair"
 msgstr "SILC-võtmepaari pole võimalik laadida"
 
 #: ../libpurple/protocols/silc/silc.c:469
-#: ../libpurple/protocols/silc10/silc.c:355
+#: ../libpurple/protocols/silc10/silc.c:361
 msgid "Unable to create connection"
 msgstr "Ühendust pole võimalik luua"
 
 #: ../libpurple/protocols/silc/silc.c:499
-#: ../libpurple/protocols/silc10/silc.c:267
+#: ../libpurple/protocols/silc10/silc.c:271
 msgid "Out of memory"
 msgstr "Vaba pole piisavalt mälu"
 
 #: ../libpurple/protocols/silc/silc.c:550
-#: ../libpurple/protocols/silc10/silc.c:313
+#: ../libpurple/protocols/silc10/silc.c:317
 msgid "Cannot initialize SILC protocol"
 msgstr "SILC-protokolli pole võimalik lähtestada"
 
 #: ../libpurple/protocols/silc/silc.c:559
+#: ../libpurple/protocols/silc10/silc.c:324
 msgid "Error loading SILC key pair"
 msgstr "Viga SILC-võtmepaari laadimisel"
 
 #: ../libpurple/protocols/silc/silc.c:882
-#: ../libpurple/protocols/silc10/silc.c:650
+#: ../libpurple/protocols/silc10/silc.c:656
 msgid "Your Current Mood"
 msgstr "Sinu hetkemeeleolu"
 
 #: ../libpurple/protocols/silc/silc.c:884
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1741
+#: ../libpurple/protocols/silc10/silc.c:658 ../pidgin/gtkprefs.c:1685
 msgid "Normal"
 msgstr "Tavaline"
 
 #: ../libpurple/protocols/silc/silc.c:898
-#: ../libpurple/protocols/silc10/silc.c:666
+#: ../libpurple/protocols/silc10/silc.c:672
 msgid "In love"
 msgstr "Armunud"
 
 #: ../libpurple/protocols/silc/silc.c:909
-#: ../libpurple/protocols/silc10/silc.c:677
+#: ../libpurple/protocols/silc10/silc.c:683
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11564,45 +11856,45 @@
 
 #: ../libpurple/protocols/silc/silc.c:917
 #: ../libpurple/protocols/silc/util.c:567
-#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/silc.c:691
 #: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
 #: ../libpurple/protocols/silc/silc.c:919
 #: ../libpurple/protocols/silc/util.c:569
-#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/silc.c:693
 #: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
 #: ../libpurple/protocols/silc/silc.c:921
-#: ../libpurple/protocols/silc10/silc.c:689
+#: ../libpurple/protocols/silc10/silc.c:695
 msgid "Video conferencing"
 msgstr "Videokonverentsid"
 
 #: ../libpurple/protocols/silc/silc.c:926
-#: ../libpurple/protocols/silc10/silc.c:694
+#: ../libpurple/protocols/silc10/silc.c:700
 msgid "Your Current Status"
 msgstr "Sinu hetkeolek"
 
 #: ../libpurple/protocols/silc/silc.c:933
-#: ../libpurple/protocols/silc10/silc.c:701
+#: ../libpurple/protocols/silc10/silc.c:707
 msgid "Online Services"
 msgstr "Võrguteenused"
 
 #: ../libpurple/protocols/silc/silc.c:936
-#: ../libpurple/protocols/silc10/silc.c:704
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what services you are using"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:942
-#: ../libpurple/protocols/silc10/silc.c:710
+#: ../libpurple/protocols/silc10/silc.c:716
 msgid "Let others see what computer you are using"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:949
-#: ../libpurple/protocols/silc10/silc.c:717
+#: ../libpurple/protocols/silc10/silc.c:723
 msgid "Your VCard File"
 msgstr "Sinu VKaarti fail"
 
@@ -11612,13 +11904,13 @@
 
 #: ../libpurple/protocols/silc/silc.c:959
 #: ../libpurple/protocols/silc/silc.c:960
-#: ../libpurple/protocols/silc10/silc.c:729
-#: ../libpurple/protocols/silc10/silc.c:730
+#: ../libpurple/protocols/silc10/silc.c:735
+#: ../libpurple/protocols/silc10/silc.c:736
 msgid "User Online Status Attributes"
 msgstr "Kasutaja ühendatud oleku rekvisiidid"
 
 #: ../libpurple/protocols/silc/silc.c:961
-#: ../libpurple/protocols/silc10/silc.c:731
+#: ../libpurple/protocols/silc10/silc.c:737
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -11628,21 +11920,21 @@
 #: ../libpurple/protocols/silc/silc.c:1002
 #: ../libpurple/protocols/silc/silc.c:1008
 #: ../libpurple/protocols/silc/silc.c:1629
-#: ../libpurple/protocols/silc10/silc.c:772
 #: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1418
+#: ../libpurple/protocols/silc10/silc.c:784
+#: ../libpurple/protocols/silc10/silc.c:1421
 msgid "Message of the Day"
 msgstr "Päevasõnum"
 
 #: ../libpurple/protocols/silc/silc.c:1002
-#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
 msgid "No Message of the Day available"
 msgstr "Päevasõnum pole saadaval"
 
 #: ../libpurple/protocols/silc/silc.c:1003
 #: ../libpurple/protocols/silc/silc.c:1624
-#: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1413
+#: ../libpurple/protocols/silc10/silc.c:779
+#: ../libpurple/protocols/silc10/silc.c:1416
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Sellele ühendusele pole seonduvat päevasõnumit"
 
@@ -11650,255 +11942,257 @@
 #: ../libpurple/protocols/silc/silc.c:1100
 #: ../libpurple/protocols/silc/silc.c:1171
 #: ../libpurple/protocols/silc/silc.c:1172
-#: ../libpurple/protocols/silc10/silc.c:824
-#: ../libpurple/protocols/silc10/silc.c:868
-#: ../libpurple/protocols/silc10/silc.c:939
-#: ../libpurple/protocols/silc10/silc.c:940
+#: ../libpurple/protocols/silc10/silc.c:830
+#: ../libpurple/protocols/silc10/silc.c:874
+#: ../libpurple/protocols/silc10/silc.c:945
+#: ../libpurple/protocols/silc10/silc.c:946
 msgid "Create New SILC Key Pair"
 msgstr "Uue SILC võtmepaari loomine"
 
 #: ../libpurple/protocols/silc/silc.c:1054
-#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc10/silc.c:830
 msgid "Passphrases do not match"
 msgstr "Paroolid ei klapi omavahel"
 
 #: ../libpurple/protocols/silc/silc.c:1100
-#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc10/silc.c:874
 msgid "Key Pair Generation failed"
 msgstr "Tõrge võtmepaari genereerimisel"
 
 #: ../libpurple/protocols/silc/silc.c:1139
-#: ../libpurple/protocols/silc10/silc.c:907
+#: ../libpurple/protocols/silc10/silc.c:913
 msgid "Key length"
 msgstr "Võtme pikkus"
 
 #: ../libpurple/protocols/silc/silc.c:1141
-#: ../libpurple/protocols/silc10/silc.c:909
+#: ../libpurple/protocols/silc10/silc.c:915
 msgid "Public key file"
 msgstr "Avaliku võtme fail"
 
 #: ../libpurple/protocols/silc/silc.c:1143
-#: ../libpurple/protocols/silc10/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:917
 msgid "Private key file"
 msgstr "Salajase võtme fail"
 
 #: ../libpurple/protocols/silc/silc.c:1166
-#: ../libpurple/protocols/silc10/silc.c:934
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Passphrase (retype)"
 msgstr "Parool (uuesti)"
 
 #: ../libpurple/protocols/silc/silc.c:1173
-#: ../libpurple/protocols/silc10/silc.c:941
+#: ../libpurple/protocols/silc10/silc.c:947
 msgid "Generate Key Pair"
 msgstr "Võtmepaari loomine"
 
 #: ../libpurple/protocols/silc/silc.c:1216
-#: ../libpurple/protocols/silc10/silc.c:987
+#: ../libpurple/protocols/silc10/silc.c:990
 msgid "Online Status"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1224
-#: ../libpurple/protocols/silc10/silc.c:995
+#: ../libpurple/protocols/silc10/silc.c:998
 msgid "View Message of the Day"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1228
-#: ../libpurple/protocols/silc10/silc.c:999
+#: ../libpurple/protocols/silc10/silc.c:1002
 msgid "Create SILC Key Pair..."
 msgstr "SILC võtmepaari loomine..."
 
 #: ../libpurple/protocols/silc/silc.c:1320
-#: ../libpurple/protocols/silc10/silc.c:1098
+#: ../libpurple/protocols/silc10/silc.c:1101
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Kasutaja <I>%s</i> pole võrgus"
 
 #: ../libpurple/protocols/silc/silc.c:1500
-#: ../libpurple/protocols/silc10/silc.c:1289
+#: ../libpurple/protocols/silc10/silc.c:1292
 msgid "Topic too long"
 msgstr "Teema on liiga pikk"
 
 #: ../libpurple/protocols/silc/silc.c:1581
-#: ../libpurple/protocols/silc10/silc.c:1370
+#: ../libpurple/protocols/silc10/silc.c:1373
 msgid "You must specify a nick"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1683
-#: ../libpurple/protocols/silc10/silc.c:1472
+#: ../libpurple/protocols/silc10/silc.c:1475
 #, c-format
 msgid "channel %s not found"
 msgstr "kanalit %s ei leitud"
 
 #: ../libpurple/protocols/silc/silc.c:1688
-#: ../libpurple/protocols/silc10/silc.c:1477
+#: ../libpurple/protocols/silc10/silc.c:1480
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1479
+#: ../libpurple/protocols/silc10/silc.c:1482
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1703
-#: ../libpurple/protocols/silc10/silc.c:1492
+#: ../libpurple/protocols/silc10/silc.c:1495
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1733
-#: ../libpurple/protocols/silc10/silc.c:1522
+#: ../libpurple/protocols/silc10/silc.c:1525
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Tundmatu käsk: %s, (võibolla kliendi viga)"
 
 #: ../libpurple/protocols/silc/silc.c:1796
-#: ../libpurple/protocols/silc10/silc.c:1585
+#: ../libpurple/protocols/silc10/silc.c:1588
 msgid "part [channel]:  Leave the chat"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1800
-#: ../libpurple/protocols/silc10/silc.c:1589
+#: ../libpurple/protocols/silc10/silc.c:1592
 msgid "leave [channel]:  Leave the chat"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1804
-#: ../libpurple/protocols/silc10/silc.c:1593
+#: ../libpurple/protocols/silc10/silc.c:1596
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;new topic&gt;]:  Teema vaatamine või muutmine"
 
 #: ../libpurple/protocols/silc/silc.c:1809
-#: ../libpurple/protocols/silc10/silc.c:1598
+#: ../libpurple/protocols/silc10/silc.c:1601
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1813
-#: ../libpurple/protocols/silc10/silc.c:1602
+#: ../libpurple/protocols/silc10/silc.c:1605
 msgid "list:  List channels on this network"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1817
-#: ../libpurple/protocols/silc10/silc.c:1606
+#: ../libpurple/protocols/silc10/silc.c:1609
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1821
-#: ../libpurple/protocols/silc10/silc.c:1610
-#: ../libpurple/protocols/zephyr/zephyr.c:2685
+#: ../libpurple/protocols/silc10/silc.c:1613
+#: ../libpurple/protocols/zephyr/zephyr.c:2697
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;hüüdnimi&gt; &lt;sõnum&gt;:  Erasõnumi saatmine kasutajale"
 
 #: ../libpurple/protocols/silc/silc.c:1825
-#: ../libpurple/protocols/silc10/silc.c:1614
+#: ../libpurple/protocols/silc10/silc.c:1617
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;hüüdnimi&gt; [&lt;sõnum&gt;]:  Erasõnumi saatmine kasutajale"
 
 #: ../libpurple/protocols/silc/silc.c:1829
-#: ../libpurple/protocols/silc10/silc.c:1618
+#: ../libpurple/protocols/silc10/silc.c:1621
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Serveri päevasõnumi vaatamine"
 
 #: ../libpurple/protocols/silc/silc.c:1833
-#: ../libpurple/protocols/silc10/silc.c:1622
+#: ../libpurple/protocols/silc10/silc.c:1625
 msgid "detach:  Detach this session"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1837
-#: ../libpurple/protocols/silc10/silc.c:1626
+#: ../libpurple/protocols/silc10/silc.c:1629
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
+"quit [sõnum]:  Serveriga ühenduse katkestamine, võimalik on jätta ka "
+"sellekohane sõnum"
 
 #: ../libpurple/protocols/silc/silc.c:1841
-#: ../libpurple/protocols/silc10/silc.c:1630
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1847
-#: ../libpurple/protocols/silc10/silc.c:1636
+#: ../libpurple/protocols/silc10/silc.c:1639
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1851
-#: ../libpurple/protocols/silc10/silc.c:1640
+#: ../libpurple/protocols/silc10/silc.c:1643
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1855
-#: ../libpurple/protocols/silc10/silc.c:1644
+#: ../libpurple/protocols/silc10/silc.c:1647
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;hüüdnimi&gt;:  Selle hüüdnimega kasutaja andmete vaatamine"
 
 #: ../libpurple/protocols/silc/silc.c:1859
-#: ../libpurple/protocols/silc10/silc.c:1648
+#: ../libpurple/protocols/silc10/silc.c:1651
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1863
-#: ../libpurple/protocols/silc10/silc.c:1652
+#: ../libpurple/protocols/silc10/silc.c:1655
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1867
-#: ../libpurple/protocols/silc10/silc.c:1656
+#: ../libpurple/protocols/silc10/silc.c:1659
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1871
-#: ../libpurple/protocols/silc10/silc.c:1660
+#: ../libpurple/protocols/silc10/silc.c:1663
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1875
-#: ../libpurple/protocols/silc10/silc.c:1664
+#: ../libpurple/protocols/silc10/silc.c:1667
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1879
-#: ../libpurple/protocols/silc10/silc.c:1668
+#: ../libpurple/protocols/silc10/silc.c:1671
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;kanal&gt; &lt;hüüdnimi&gt; [kommentaar]:  Kasutaja kanalilt "
 "väljalöömine"
 
 #: ../libpurple/protocols/silc/silc.c:1883
-#: ../libpurple/protocols/silc10/silc.c:1672
+#: ../libpurple/protocols/silc10/silc.c:1675
 msgid "info [server]:  View server administrative details"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1887
-#: ../libpurple/protocols/silc10/silc.c:1676
+#: ../libpurple/protocols/silc10/silc.c:1679
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;kanal&gt; +|-&lt;hüüdnimi&gt;]:  Kliendi tõrjumine kanalilt"
 
 #: ../libpurple/protocols/silc/silc.c:1891
-#: ../libpurple/protocols/silc10/silc.c:1680
+#: ../libpurple/protocols/silc10/silc.c:1683
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1895
-#: ../libpurple/protocols/silc10/silc.c:1684
+#: ../libpurple/protocols/silc10/silc.c:1687
 msgid "stats:  View server and network statistics"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1899
-#: ../libpurple/protocols/silc10/silc.c:1688
+#: ../libpurple/protocols/silc10/silc.c:1691
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Ühendatud serverile PING-i saatmine"
 
 #: ../libpurple/protocols/silc/silc.c:1904
-#: ../libpurple/protocols/silc10/silc.c:1693
+#: ../libpurple/protocols/silc10/silc.c:1696
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1908
-#: ../libpurple/protocols/silc10/silc.c:1697
+#: ../libpurple/protocols/silc10/silc.c:1700
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -11914,38 +12208,38 @@
 #. *< version
 #. *  summary
 #: ../libpurple/protocols/silc/silc.c:2019
-#: ../libpurple/protocols/silc10/silc.c:1822
+#: ../libpurple/protocols/silc10/silc.c:1825
 msgid "SILC Protocol Plugin"
 msgstr "SILC protokolli plugin"
 
 #. *  description
 #: ../libpurple/protocols/silc/silc.c:2021
-#: ../libpurple/protocols/silc10/silc.c:1824
+#: ../libpurple/protocols/silc10/silc.c:1827
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) protokoll"
 
 #: ../libpurple/protocols/silc/silc.c:2053
-#: ../libpurple/protocols/silc10/silc.c:1856 ../pidgin/gtkprefs.c:2138
+#: ../libpurple/protocols/silc10/silc.c:1859 ../pidgin/gtkprefs.c:2040
 msgid "Network"
 msgstr "Võrk"
 
 #: ../libpurple/protocols/silc/silc.c:2064
-#: ../libpurple/protocols/silc10/silc.c:1867
+#: ../libpurple/protocols/silc10/silc.c:1870
 msgid "Public Key file"
 msgstr "Avaliku võtme fail"
 
 #: ../libpurple/protocols/silc/silc.c:2068
-#: ../libpurple/protocols/silc10/silc.c:1871
+#: ../libpurple/protocols/silc10/silc.c:1874
 msgid "Private Key file"
 msgstr "Salajase võtme fail"
 
 #: ../libpurple/protocols/silc/silc.c:2078
-#: ../libpurple/protocols/silc10/silc.c:1881
+#: ../libpurple/protocols/silc10/silc.c:1884
 msgid "Cipher"
 msgstr "Šiffer"
 
 #: ../libpurple/protocols/silc/silc.c:2088
-#: ../libpurple/protocols/silc10/silc.c:1891
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "HMAC"
 msgstr "HMAC"
 
@@ -11954,27 +12248,27 @@
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:2095
-#: ../libpurple/protocols/silc10/silc.c:1894
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Public key authentication"
 msgstr "Avaliku võtmega autentimine"
 
 #: ../libpurple/protocols/silc/silc.c:2098
-#: ../libpurple/protocols/silc10/silc.c:1897
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block IMs without Key Exchange"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:2101
-#: ../libpurple/protocols/silc10/silc.c:1900
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Block messages to whiteboard"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:2104
-#: ../libpurple/protocols/silc10/silc.c:1903
+#: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Automatically open whiteboard"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:2107
-#: ../libpurple/protocols/silc10/silc.c:1906
+#: ../libpurple/protocols/silc10/silc.c:1909
 msgid "Digitally sign and verify all messages"
 msgstr "Kõikide sõnumite digitaalne signeerimine ja verifitseerimine"
 
@@ -12101,76 +12395,72 @@
 #: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
-msgstr ""
+msgstr "%s kirjutas sõnumi tahvlile. Soovid sa selle tahvli avada?"
 
 #: ../libpurple/protocols/silc/wb.c:292 ../libpurple/protocols/silc10/wb.c:291
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
-msgstr ""
+msgstr "%s kirjutas sõnumi kanali %s tahvlile. Soovid sa selle tahvli avada?"
 
 #: ../libpurple/protocols/silc/wb.c:306 ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
-msgstr ""
+msgstr "Tahvel"
 
 #: ../libpurple/protocols/silc10/ops.c:1559
 msgid "No server statistics available"
 msgstr "Serveri statistika pole saadaval"
 
-#: ../libpurple/protocols/silc10/ops.c:1931
+#: ../libpurple/protocols/silc10/ops.c:1937
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Tõrge: Versioonid ei klapi, uuenda oma klienti"
 
-#: ../libpurple/protocols/silc10/ops.c:1934
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "Tõrge: Teine pool ei toeta või ei usalda sinu avalikku võtit"
-
-#: ../libpurple/protocols/silc10/ops.c:1937
-msgid "Failure: Remote does not support proposed KE group"
-msgstr ""
-
 #: ../libpurple/protocols/silc10/ops.c:1940
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "Tõrge: Teine pool ei toeta või ei usalda sinu avalikku võtit"
+
+#: ../libpurple/protocols/silc10/ops.c:1943
+msgid "Failure: Remote does not support proposed KE group"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/ops.c:1946
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Tõrge: Teine pool ei toeta pakutud šifrit"
 
-#: ../libpurple/protocols/silc10/ops.c:1943
+#: ../libpurple/protocols/silc10/ops.c:1949
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Tõrge: Teine pool ei toeta pakutud PKCS'i"
 
-#: ../libpurple/protocols/silc10/ops.c:1946
+#: ../libpurple/protocols/silc10/ops.c:1952
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Tõrge: Teine pool ei toeta pakutud räsifunktsiooni"
 
-#: ../libpurple/protocols/silc10/ops.c:1949
+#: ../libpurple/protocols/silc10/ops.c:1955
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Tõrge: Teine pool ei toeta pakutud HMAC'i"
 
-#: ../libpurple/protocols/silc10/ops.c:1951
+#: ../libpurple/protocols/silc10/ops.c:1957
 msgid "Failure: Incorrect signature"
 msgstr "Tõrge: Vigane signatuur"
 
-#: ../libpurple/protocols/silc10/ops.c:1953
+#: ../libpurple/protocols/silc10/ops.c:1959
 msgid "Failure: Invalid cookie"
 msgstr "Tõrge: Vigane küpsis"
 
-#: ../libpurple/protocols/silc10/ops.c:1964
+#: ../libpurple/protocols/silc10/ops.c:1970
 msgid "Failure: Authentication failed"
 msgstr "Tõrge: Autentimine nurjus"
 
-#: ../libpurple/protocols/silc10/silc.c:182
+#: ../libpurple/protocols/silc10/silc.c:185
 msgid "Cannot initialize SILC Client connection"
 msgstr "SILC-kliendi ühendust pole võimalik lähtestada"
 
-#: ../libpurple/protocols/silc10/silc.c:290
+#: ../libpurple/protocols/silc10/silc.c:294
 msgid "John Noname"
 msgstr "Nimetu Nipitiri"
 
-#: ../libpurple/protocols/silc10/silc.c:320
-msgid "Cannot find/access ~/.silc directory"
-msgstr "Kataloogi ~/.silc pole võimalik leida või sellele ligi pääseda"
-
-#: ../libpurple/protocols/silc10/silc.c:334
+#: ../libpurple/protocols/silc10/silc.c:338
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "SILC-võtmepaari pole võimalik laadida: %s"
@@ -12180,7 +12470,7 @@
 msgstr "Pole võimalik kirjutada"
 
 #: ../libpurple/protocols/simple/simple.c:443
-#: ../libpurple/protocols/simple/simple.c:1691
+#: ../libpurple/protocols/simple/simple.c:1713
 msgid "Could not connect"
 msgstr "Pole võimalik ühenduda"
 
@@ -12188,22 +12478,22 @@
 msgid "Unknown server response."
 msgstr "Tundmatu vastus serverilt."
 
-#: ../libpurple/protocols/simple/simple.c:1727
-#: ../libpurple/protocols/simple/simple.c:1773
-#: ../libpurple/protocols/simple/simple.c:1788
-#: ../libpurple/protocols/simple/simple.c:1843
+#: ../libpurple/protocols/simple/simple.c:1749
+#: ../libpurple/protocols/simple/simple.c:1795
+#: ../libpurple/protocols/simple/simple.c:1810
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Could not create listen socket"
 msgstr "Kuulavat soklit pole võimalik luua"
 
-#: ../libpurple/protocols/simple/simple.c:1752
+#: ../libpurple/protocols/simple/simple.c:1774
 msgid "Couldn't resolve host"
 msgstr "Hosti pole võimalik lahendada"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1875
 msgid "Could not resolve hostname"
 msgstr "Hostinime pole võimalik lahendada"
 
-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:1893
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP-kasutajanimed ei tohi sisaldada sõnavahe- ja @-märke"
 
@@ -12215,36 +12505,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:2057
+#: ../libpurple/protocols/simple/simple.c:2073
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE protokolli plugin"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:2058
+#: ../libpurple/protocols/simple/simple.c:2074
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE protokolli plugin"
 
-#: ../libpurple/protocols/simple/simple.c:2086
+#: ../libpurple/protocols/simple/simple.c:2102
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Olek avalikustatakse (märkus: igaüks võib sind näha)"
 
-#: ../libpurple/protocols/simple/simple.c:2092
+#: ../libpurple/protocols/simple/simple.c:2108
 msgid "Use UDP"
 msgstr "Kasutatakse UDP protokolli"
 
-#: ../libpurple/protocols/simple/simple.c:2094
+#: ../libpurple/protocols/simple/simple.c:2110
 msgid "Use proxy"
 msgstr "Kasutatakse proksit"
 
-#: ../libpurple/protocols/simple/simple.c:2096
+#: ../libpurple/protocols/simple/simple.c:2112
 msgid "Proxy"
 msgstr "Proksi"
 
-#: ../libpurple/protocols/simple/simple.c:2098
+#: ../libpurple/protocols/simple/simple.c:2114
 msgid "Auth User"
 msgstr "Autentimiskasutaja"
 
-#: ../libpurple/protocols/simple/simple.c:2100
+#: ../libpurple/protocols/simple/simple.c:2116
 msgid "Auth Domain"
 msgstr "Autentimisdomeen"
 
@@ -12338,11 +12628,11 @@
 
 #: ../libpurple/protocols/toc/toc.c:536
 msgid "No keywords."
-msgstr ""
+msgstr "Võtmesõnu ei ole."
 
 #: ../libpurple/protocols/toc/toc.c:539
 msgid "User has no directory information."
-msgstr ""
+msgstr "Kasutajal pole kataloogiandmeid."
 
 #: ../libpurple/protocols/toc/toc.c:543
 msgid "Country not supported."
@@ -12359,7 +12649,7 @@
 
 #: ../libpurple/protocols/toc/toc.c:552
 msgid "The service is temporarily unavailable."
-msgstr ""
+msgstr "See teenus pole ajutiselt saadaval."
 
 #: ../libpurple/protocols/toc/toc.c:555
 msgid "Your warning level is currently too high to log in."
@@ -12379,7 +12669,7 @@
 #: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr ""
+msgstr "Tekkis tundmatu viga %d.  Andmed: %s"
 
 #: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
@@ -12387,7 +12677,7 @@
 
 #: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
-msgstr ""
+msgstr "Ühendus sulgeti"
 
 #: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
@@ -12401,8 +12691,8 @@
 msgid "Password Change Successful"
 msgstr "Paroolimuutmine õnnestus"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6241
-#: ../pidgin/gtkblist.c:6599
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6398
+#: ../pidgin/gtkblist.c:6735
 msgid "_Group:"
 msgstr "_Grupp:"
 
@@ -12462,41 +12752,41 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC protokolli plugin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:784
+#: ../libpurple/protocols/yahoo/yahoo.c:745
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:840
+#: ../libpurple/protocols/yahoo/yahoo.c:803
 msgid "Your Yahoo! message did not get sent."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:962
+#: ../libpurple/protocols/yahoo/yahoo.c:916
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! süsteemne sõnum %s jaoks:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
+#: ../libpurple/protocols/yahoo/yahoo.c:990
 msgid "Authorization denied message:"
 msgstr "Volituste andmisest keeldumise sõnum:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1049
+#: ../libpurple/protocols/yahoo/yahoo.c:1008
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#: ../libpurple/protocols/yahoo/yahoo.c:1011
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1054
+#: ../libpurple/protocols/yahoo/yahoo.c:1013
 msgid "Add buddy rejected"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1996
+#: ../libpurple/protocols/yahoo/yahoo.c:1997
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12504,170 +12794,170 @@
 "Check %s for updates."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1999
+#: ../libpurple/protocols/yahoo/yahoo.c:2000
 msgid "Failed Yahoo! Authentication"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2065
+#: ../libpurple/protocols/yahoo/yahoo.c:2066
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2068
+#: ../libpurple/protocols/yahoo/yahoo.c:2069
 msgid "Ignore buddy?"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2133
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2136
+#: ../libpurple/protocols/yahoo/yahoo.c:2137
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Tundmatu veanumber %d. Yahoo! veebisaiti sisselogimine võib selle parandada."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
+#: ../libpurple/protocols/yahoo/yahoo.c:2190
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2192
+#: ../libpurple/protocols/yahoo/yahoo.c:2193
 msgid "Could not add buddy to server list"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2311
+#: ../libpurple/protocols/yahoo/yahoo.c:2315
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2657
+#: ../libpurple/protocols/yahoo/yahoo.c:2671
 msgid "Received unexpected HTTP response from server."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2682
-#: ../libpurple/protocols/yahoo/yahoo.c:2870
-#: ../libpurple/protocols/yahoo/yahoo.c:2974
-#: ../libpurple/protocols/yahoo/yahoo.c:2985
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+#: ../libpurple/protocols/yahoo/yahoo.c:2700
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:2993
+#: ../libpurple/protocols/yahoo/yahoo.c:3004
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1595
 #: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "Ühendumisprobleem"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2708
+#: ../libpurple/protocols/yahoo/yahoo.c:2726
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2733
+#: ../libpurple/protocols/yahoo/yahoo.c:2751
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3092
-#: ../libpurple/protocols/yahoo/yahoo.c:3778
+#: ../libpurple/protocols/yahoo/yahoo.c:3118
+#: ../libpurple/protocols/yahoo/yahoo.c:3804
 msgid "Not at Home"
 msgstr "Pole kodus"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3094
-#: ../libpurple/protocols/yahoo/yahoo.c:3781
+#: ../libpurple/protocols/yahoo/yahoo.c:3120
+#: ../libpurple/protocols/yahoo/yahoo.c:3807
 msgid "Not at Desk"
 msgstr "Pole töölaua taga"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
-#: ../libpurple/protocols/yahoo/yahoo.c:3784
+#: ../libpurple/protocols/yahoo/yahoo.c:3122
+#: ../libpurple/protocols/yahoo/yahoo.c:3810
 msgid "Not in Office"
 msgstr "Pole kontoris"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3100
-#: ../libpurple/protocols/yahoo/yahoo.c:3790
+#: ../libpurple/protocols/yahoo/yahoo.c:3126
+#: ../libpurple/protocols/yahoo/yahoo.c:3816
 msgid "On Vacation"
 msgstr "Puhkusel"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3104
-#: ../libpurple/protocols/yahoo/yahoo.c:3796
+#: ../libpurple/protocols/yahoo/yahoo.c:3130
+#: ../libpurple/protocols/yahoo/yahoo.c:3822
 msgid "Stepped Out"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3197
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
+#: ../libpurple/protocols/yahoo/yahoo.c:3223
+#: ../libpurple/protocols/yahoo/yahoo.c:3253
 msgid "Not on server list"
 msgstr "Pole serveri loendis"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3244
-#: ../libpurple/protocols/yahoo/yahoo.c:3302
+#: ../libpurple/protocols/yahoo/yahoo.c:3270
+#: ../libpurple/protocols/yahoo/yahoo.c:3328
 msgid "Appear Online"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3247
-#: ../libpurple/protocols/yahoo/yahoo.c:3323
+#: ../libpurple/protocols/yahoo/yahoo.c:3273
+#: ../libpurple/protocols/yahoo/yahoo.c:3349
 msgid "Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3265
+#: ../libpurple/protocols/yahoo/yahoo.c:3291
 msgid "Presence"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3308
+#: ../libpurple/protocols/yahoo/yahoo.c:3334
 msgid "Appear Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3317
+#: ../libpurple/protocols/yahoo/yahoo.c:3343
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3365
+#: ../libpurple/protocols/yahoo/yahoo.c:3391
 msgid "Join in Chat"
 msgstr "Ühine vestlusega"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3371
+#: ../libpurple/protocols/yahoo/yahoo.c:3397
 msgid "Initiate Conference"
 msgstr "Algata konverents"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3399
+#: ../libpurple/protocols/yahoo/yahoo.c:3425
 msgid "Presence Settings"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3405
+#: ../libpurple/protocols/yahoo/yahoo.c:3431
 msgid "Start Doodling"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
+#: ../libpurple/protocols/yahoo/yahoo.c:3532
 msgid "Activate which ID?"
 msgstr "Milline ID aktiveerida?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3517
-msgid "Join who in chat?"
-msgstr "Kellega ühineda jututoas?"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3529
+#: ../libpurple/protocols/yahoo/yahoo.c:3543
+msgid "Join whom in chat?"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3555
 msgid "Activate ID..."
 msgstr "Aktiveeri ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3533
+#: ../libpurple/protocols/yahoo/yahoo.c:3559
 msgid "Join User in Chat..."
 msgstr "Ühine kasutajaga vestluses..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3538
+#: ../libpurple/protocols/yahoo/yahoo.c:3564
 msgid "Open Inbox"
 msgstr "Ava sisendkast"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4147
+#: ../libpurple/protocols/yahoo/yahoo.c:4153
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;tuba&gt;:  Yahoo võrgus oleva jututoaga ühinemine"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4152
+#: ../libpurple/protocols/yahoo/yahoo.c:4158
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Yahoo võrgu jututubade nimekirja kuvamine"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4160
+#: ../libpurple/protocols/yahoo/yahoo.c:4166
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Kasutajaga Doodle seansi algatamine"
 
@@ -12681,56 +12971,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4369
-#: ../libpurple/protocols/yahoo/yahoo.c:4371
+#: ../libpurple/protocols/yahoo/yahoo.c:4375
+#: ../libpurple/protocols/yahoo/yahoo.c:4377
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo protokolli plugin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4394
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "Yahoo Japan"
 msgstr "Jaapani Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4397
+#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "Pager server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4400
-msgid "Japan Pager server"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4403
-msgid "Pager port"
-msgstr ""
-
 #: ../libpurple/protocols/yahoo/yahoo.c:4406
+msgid "Japan Pager server"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4409
+msgid "Pager port"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 msgid "File transfer server"
 msgstr "Failiülekande server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4409
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Japan file transfer server"
 msgstr "Jaapani failiülekandeserver"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4412
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "File transfer port"
 msgstr "Failiülekande port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4421
 msgid "Chat room locale"
 msgstr "Jututoa lokaat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4424
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konverentside ja jututubade kutseid eiratakse"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4426
+#: ../libpurple/protocols/yahoo/yahoo.c:4432
 msgid "Chat room list URL"
 msgstr "Jututubade nimekirja URL"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4429
+#: ../libpurple/protocols/yahoo/yahoo.c:4435
 msgid "Yahoo Chat server"
 msgstr "Yahoo jututoaserver"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4432
+#: ../libpurple/protocols/yahoo/yahoo.c:4438
 msgid "Yahoo Chat port"
 msgstr "Yahoo jututoaport"
 
@@ -12741,12 +13031,19 @@
 msgid "Sent Doodle request."
 msgstr "Doodle päringu saatmine."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:319
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:328
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:337
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1110
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1514
 msgid "Unable to establish file descriptor."
 msgstr ""
 
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1409
+#, c-format
+msgid "%s is trying to send you a group of %d files.\n"
+msgstr "%s proovib sulle saata %d-failist koosnevat gruppi.\n"
+
 #: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "Viga kirjutamisel"
@@ -12764,12 +13061,16 @@
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr ""
+"Vabandust, täiskasvanutele mõeldud materjali sisaldavad profiilid pole "
+"hetkel toetatud."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
+"Kui sa soovid seda profiili vaadata, siis pead sa oma veebisirvija abil "
+"külastama seda aadressi:"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
@@ -12816,6 +13117,7 @@
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr ""
+"Vabandust, see profiil paistab olevat hetkel toetamata keeles või vormingus."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
 msgid ""
@@ -12834,37 +13136,37 @@
 msgid "The user's profile is empty."
 msgstr "Kasutajaprofiil on tühi."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:217
+#: ../libpurple/protocols/yahoo/yahoochat.c:222
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 "%s lükkas sinu konverentsikutse tuppa \"%s\" tagasi, esitades järgneva "
 "põhjenduse: \"%s\"."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:219
+#: ../libpurple/protocols/yahoo/yahoochat.c:224
 msgid "Invitation Rejected"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:438
+#: ../libpurple/protocols/yahoo/yahoochat.c:443
 msgid "Failed to join chat"
 msgstr ""
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:441
+#: ../libpurple/protocols/yahoo/yahoochat.c:446
 msgid "Unknown room"
 msgstr "Tundmatu tuba"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:444
+#: ../libpurple/protocols/yahoo/yahoochat.c:449
 msgid "Maybe the room is full"
 msgstr "Võibolla on tuba täis"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:447
+#: ../libpurple/protocols/yahoo/yahoochat.c:452
 msgid "Not available"
 msgstr "Pole saadaval"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:451
+#: ../libpurple/protocols/yahoo/yahoochat.c:456
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -12872,38 +13174,38 @@
 "Tundmatu viga. Võib-olla pead sa välja logima ja enne jututoaga "
 "taasliitumist 5 minutit ootama"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:534
+#: ../libpurple/protocols/yahoo/yahoochat.c:539
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Sa vestled nüüd jututoas %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:719
+#: ../libpurple/protocols/yahoo/yahoochat.c:728
 msgid "Failed to join buddy in chat"
 msgstr "Tõrge sõbraga jututoas ühinemisel"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:720
+#: ../libpurple/protocols/yahoo/yahoochat.c:729
 msgid "Maybe they're not in a chat?"
 msgstr "Võibolla pole nad jututoas?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+#: ../libpurple/protocols/yahoo/yahoochat.c:1425
+#: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Fetching the room list failed."
 msgstr "Tõrge jututubade nimekirja hankimisel."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1500
+#: ../libpurple/protocols/yahoo/yahoochat.c:1511
 msgid "Voices"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1503
-msgid "Webcams"
-msgstr ""
-
 #: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+msgid "Webcams"
+msgstr "Veebikaamerad"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1595
 msgid "Unable to fetch room list."
 msgstr "Tubade nimekirja pole võimalik hankida."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1577
+#: ../libpurple/protocols/yahoo/yahoochat.c:1588
 msgid "User Rooms"
 msgstr ""
 
@@ -12920,7 +13222,7 @@
 "Ühendus serveriga katkes\n"
 "%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:354
+#: ../libpurple/protocols/zephyr/zephyr.c:358
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -12928,100 +13230,100 @@
 "(Sõnumi teisendamisel tekkis viga.\t Kontrolli kontoredaktorist "
 "'Kooditabeli' valikut.)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:752
+#: ../libpurple/protocols/zephyr/zephyr.c:756
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1210
+#: ../libpurple/protocols/zephyr/zephyr.c:795
+#: ../libpurple/protocols/zephyr/zephyr.c:1170
 msgid "Hidden or not logged-in"
 msgstr "Peidetud või pole sisse logitud"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1212
+#: ../libpurple/protocols/zephyr/zephyr.c:801
+#: ../libpurple/protocols/zephyr/zephyr.c:1172
 #, c-format
 msgid "<br>At %s since %s"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1546
-#: ../libpurple/protocols/zephyr/zephyr.c:1547
+#: ../libpurple/protocols/zephyr/zephyr.c:1510
+#: ../libpurple/protocols/zephyr/zephyr.c:1511
 msgid "Anyone"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2354
-msgid "_Class:"
-msgstr "_Klass:"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2360
-msgid "_Instance:"
-msgstr ""
+msgstr "Igaüks"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2366
+msgid "_Class:"
+msgstr "_Klass:"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2372
+msgid "_Instance:"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2378
 msgid "_Recipient:"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2377
+#: ../libpurple/protocols/zephyr/zephyr.c:2389
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2690
+#: ../libpurple/protocols/zephyr/zephyr.c:2702
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2695
+#: ../libpurple/protocols/zephyr/zephyr.c:2707
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2700
+#: ../libpurple/protocols/zephyr/zephyr.c:2712
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2705
+#: ../libpurple/protocols/zephyr/zephyr.c:2717
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2710
+#: ../libpurple/protocols/zephyr/zephyr.c:2722
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2716
+#: ../libpurple/protocols/zephyr/zephyr.c:2728
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2721
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2727
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2733
+#: ../libpurple/protocols/zephyr/zephyr.c:2745
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2739
+#: ../libpurple/protocols/zephyr/zephyr.c:2751
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2744
+#: ../libpurple/protocols/zephyr/zephyr.c:2756
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2850
+#: ../libpurple/protocols/zephyr/zephyr.c:2832
 msgid "Resubscribe"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2853
+#: ../libpurple/protocols/zephyr/zephyr.c:2835
 msgid "Retrieve subscriptions from server"
 msgstr ""
 
@@ -13035,40 +13337,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2946
-#: ../libpurple/protocols/zephyr/zephyr.c:2948
+#: ../libpurple/protocols/zephyr/zephyr.c:2928
+#: ../libpurple/protocols/zephyr/zephyr.c:2930
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr protokolli plugin"
 
+#: ../libpurple/protocols/zephyr/zephyr.c:2955
+msgid "Use tzc"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2958
+msgid "tzc command"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2961
+msgid "Export to .anyone"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2964
+msgid "Export to .zephyr.subs"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2967
+msgid "Import from .anyone"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2970
+msgid "Import from .zephyr.subs"
+msgstr ""
+
 #: ../libpurple/protocols/zephyr/zephyr.c:2973
-msgid "Use tzc"
+msgid "Realm"
 msgstr ""
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2976
-msgid "tzc command"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
-msgid "Export to .anyone"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
-msgid "Export to .zephyr.subs"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2985
-msgid "Import from .anyone"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2988
-msgid "Import from .zephyr.subs"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2991
-msgid "Realm"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr ""
 
@@ -13109,33 +13411,19 @@
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
-#. *
-#. * @since 2.3.0
 #.
-#. *
-#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
-#. *
-#. * @deprecated Please use purple_request_yes_no_with_hint instead.
-#.
-#: ../libpurple/request.h:1802 ../libpurple/request.h:1815
+#: ../libpurple/request.h:1448
 msgid "_Yes"
 msgstr "_Jah"
 
-#: ../libpurple/request.h:1802 ../libpurple/request.h:1815
+#: ../libpurple/request.h:1448
 msgid "_No"
 msgstr "_Ei"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
-#. *
-#. * @since 2.3.0
 #.
-#. *
-#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
-#. *
-#. * @deprecated Please use purple_request_accept_cancel_with_hint instead.
-#.
-#: ../libpurple/request.h:1854 ../libpurple/request.h:1867
+#: ../libpurple/request.h:1468
 msgid "_Accept"
 msgstr "_Nõustu"
 
@@ -13146,26 +13434,26 @@
 msgid "I'm not here right now"
 msgstr "Ma pole hetkel siin"
 
-#: ../libpurple/savedstatuses.c:535
+#: ../libpurple/savedstatuses.c:537
 msgid "saved statuses"
-msgstr ""
-
-#: ../libpurple/server.c:234
+msgstr "salvestatud olekud"
+
+#: ../libpurple/server.c:265
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s on nüüd nimega %s.\n"
 
-#: ../libpurple/server.c:302
+#: ../libpurple/server.c:333
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
 
-#: ../libpurple/server.c:347
+#: ../libpurple/server.c:378
 #, c-format
 msgid "%s has requested your attention!"
 msgstr ""
 
-#: ../libpurple/server.c:793
+#: ../libpurple/server.c:875
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13174,12 +13462,12 @@
 "%s kutsub kasutajat %s jututuppa %s:\n"
 "%s"
 
-#: ../libpurple/server.c:798
+#: ../libpurple/server.c:880
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s kutsub kasutajat %s jututuppa %s\n"
 
-#: ../libpurple/server.c:802
+#: ../libpurple/server.c:884
 msgid "Accept chat invitation?"
 msgstr "Kas nõustume jututoa kutsega?"
 
@@ -13204,7 +13492,7 @@
 msgstr ""
 
 #: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
-#: ../pidgin/gtkstatusbox.c:1059
+#: ../pidgin/gtkstatusbox.c:1083
 msgid "Do not disturb"
 msgstr "Mitte segada"
 
@@ -13214,7 +13502,7 @@
 
 #: ../libpurple/status.c:160
 msgid "Mobile"
-msgstr "Liikuv"
+msgstr "Mobiilne"
 
 #: ../libpurple/status.c:161
 msgid "Listening to music"
@@ -13222,50 +13510,35 @@
 
 #: ../libpurple/status.c:610
 #, c-format
-msgid "%s changed status from %s to %s"
-msgstr "%s muutus olekut %s -> %s"
-
-#: ../libpurple/status.c:613
-#, c-format
 msgid "%s (%s) changed status from %s to %s"
 msgstr "%s (%s) muutus olekut %s -> %s"
 
-#: ../libpurple/status.c:624
-#, c-format
-msgid "%s is now %s"
-msgstr "%s on nüüd %s"
-
-#: ../libpurple/status.c:626
+#: ../libpurple/status.c:621
 #, c-format
 msgid "%s (%s) is now %s"
 msgstr "%s (%s) on nüüd %s"
 
-#: ../libpurple/status.c:632
-#, c-format
-msgid "%s is no longer %s"
-msgstr "%s pole enam %s"
-
-#: ../libpurple/status.c:634
+#: ../libpurple/status.c:627
 #, c-format
 msgid "%s (%s) is no longer %s"
 msgstr "%s (%s) pole enam %s"
 
-#: ../libpurple/status.c:1247
+#: ../libpurple/status.c:1242
 #, c-format
 msgid "%s became idle"
 msgstr "%s jäi jõude"
 
-#: ../libpurple/status.c:1264
+#: ../libpurple/status.c:1262
 #, c-format
 msgid "%s became unidle"
 msgstr "%s naases jõudeolekust"
 
-#: ../libpurple/status.c:1327
+#: ../libpurple/status.c:1328
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s jäi jõude"
 
-#: ../libpurple/status.c:1329
+#: ../libpurple/status.c:1330
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s naases jõudeolekust"
@@ -13275,100 +13548,134 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2783
+#: ../libpurple/util.c:2804
 #, c-format
 msgid "Error Reading %s"
 msgstr "Viga %s lugemisel"
 
-#: ../libpurple/util.c:2784
+#: ../libpurple/util.c:2805
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr ""
 
-#: ../libpurple/util.c:3281
+#: ../libpurple/util.c:3304
 msgid "Calculating..."
 msgstr "Arvutamine..."
 
-#: ../libpurple/util.c:3284
+#: ../libpurple/util.c:3307
 msgid "Unknown."
 msgstr "Tundmatu."
 
-#: ../libpurple/util.c:3310
+#: ../libpurple/util.c:3333
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekundit"
 
-#: ../libpurple/util.c:3322
+#: ../libpurple/util.c:3345
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d päev"
 msgstr[1] "%d päeva"
 
-#: ../libpurple/util.c:3330
+#: ../libpurple/util.c:3353
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d tund"
 msgstr[1] "%s, %d tundi"
 
-#: ../libpurple/util.c:3336
+#: ../libpurple/util.c:3359
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tund"
 msgstr[1] "%d tundi"
 
-#: ../libpurple/util.c:3344
+#: ../libpurple/util.c:3367
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minut"
 msgstr[1] "%s, %d minutit"
 
-#: ../libpurple/util.c:3350
+#: ../libpurple/util.c:3373
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minutit"
 
-#: ../libpurple/util.c:3610
+#: ../libpurple/util.c:3633
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr ""
 
-#: ../libpurple/util.c:3647 ../libpurple/util.c:3943
+#: ../libpurple/util.c:3670 ../libpurple/util.c:3966
 #, c-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: ../libpurple/util.c:3770
+#: ../libpurple/util.c:3793
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
 
-#: ../libpurple/util.c:3805
+#: ../libpurple/util.c:3828
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr ""
 
-#: ../libpurple/util.c:3836
+#: ../libpurple/util.c:3859
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr ""
 
-#: ../libpurple/util.c:3861
+#: ../libpurple/util.c:3884
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Hostiga %s pole võimalik ühenduda: %s"
 
+#: ../libpurple/util.c:4686
+#, c-format
+msgid " - %s"
+msgstr " - %s"
+
+#: ../libpurple/util.c:4692
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#. 10053
+#: ../libpurple/win32/libc_interface.c:322
+#, c-format
+msgid "Connection interrupted by other software on your computer."
+msgstr ""
+
+#. 10054
+#: ../libpurple/win32/libc_interface.c:324
+#, c-format
+msgid "Remote host closed connection."
+msgstr "Kaughost sulges ühenduse."
+
+#. 10060
+#: ../libpurple/win32/libc_interface.c:326
+#, c-format
+msgid "Connection timed out."
+msgstr "Ühendumine ületas ajapiirangu."
+
+#. 10061
+#: ../libpurple/win32/libc_interface.c:328
+#, c-format
+msgid "Connection refused."
+msgstr "Ühendus lükati tagasi."
+
 #: ../pidgin.desktop.in.h:1
 msgid "Internet Messenger"
 msgstr "Interneti sõnumivahetus"
@@ -13390,71 +13697,71 @@
 msgstr "Salve suund"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:410
+#: ../pidgin/gtkaccount.c:379
 msgid "Login Options"
 msgstr "Sisselogimise valikud"
 
-#: ../pidgin/gtkaccount.c:431
+#: ../pidgin/gtkaccount.c:400
 msgid "Pro_tocol:"
 msgstr "Pro_tokoll:"
 
-#: ../pidgin/gtkaccount.c:442
+#: ../pidgin/gtkaccount.c:411
 msgid "Screen _name:"
 msgstr "_Ekraaninimi:"
 
-#: ../pidgin/gtkaccount.c:532
+#: ../pidgin/gtkaccount.c:501
 msgid "_Local alias:"
 msgstr "_Kohalik alias:"
 
-#: ../pidgin/gtkaccount.c:536
+#: ../pidgin/gtkaccount.c:505
 msgid "Remember pass_word"
 msgstr "_Parooli peetakse meeles"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:594
+#: ../pidgin/gtkaccount.c:563
 msgid "User Options"
 msgstr "Kasutaja valikud"
 
-#: ../pidgin/gtkaccount.c:607
+#: ../pidgin/gtkaccount.c:576
 msgid "New _mail notifications"
 msgstr "Teavitused e-posti _uute sõnumite kohta"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:612
+#: ../pidgin/gtkaccount.c:581
 msgid "Use this buddy _icon for this account:"
 msgstr "Selle konto jaoks kasutatakse seda sõbra_ikooni:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:734
+#: ../pidgin/gtkaccount.c:703
 #, c-format
 msgid "%s Options"
 msgstr "%s - valikud"
 
-#: ../pidgin/gtkaccount.c:939
+#: ../pidgin/gtkaccount.c:908
 msgid "Use GNOME Proxy Settings"
 msgstr "Kasutatakse GNOME proksi sätteid"
 
-#: ../pidgin/gtkaccount.c:940
+#: ../pidgin/gtkaccount.c:909
 msgid "Use Global Proxy Settings"
 msgstr "Kasutatakse üldisi proksi sätteid"
 
-#: ../pidgin/gtkaccount.c:946
+#: ../pidgin/gtkaccount.c:915
 msgid "No Proxy"
 msgstr "Proksi puudub"
 
-#: ../pidgin/gtkaccount.c:952
+#: ../pidgin/gtkaccount.c:921
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:958
+#: ../pidgin/gtkaccount.c:927
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:964
+#: ../pidgin/gtkaccount.c:933
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:970 ../pidgin/gtkprefs.c:1283
+#: ../pidgin/gtkaccount.c:939 ../pidgin/gtkprefs.c:1230
 msgid "Use Environmental Settings"
 msgstr "Kasutatakse keskkonnast tulenevaid sätteid"
 
@@ -13463,72 +13770,73 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:1009
+#: ../pidgin/gtkaccount.c:978
 msgid "If you look real closely"
 msgstr "Kui sa päris lähedalt vaatad, siis"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1012
+#: ../pidgin/gtkaccount.c:981
 msgid "you can see the butterflies mating"
 msgstr "võid sa näha paarituvaid liblikaid"
 
-#: ../pidgin/gtkaccount.c:1033
+#: ../pidgin/gtkaccount.c:1002
 msgid "Proxy Options"
 msgstr "Proksi valikud"
 
-#: ../pidgin/gtkaccount.c:1047 ../pidgin/gtkprefs.c:1277
+#: ../pidgin/gtkaccount.c:1016 ../pidgin/gtkprefs.c:1224
 msgid "Proxy _type:"
 msgstr "_Proksi liik:"
 
-#: ../pidgin/gtkaccount.c:1056 ../pidgin/gtkprefs.c:1298
+#: ../pidgin/gtkaccount.c:1025 ../pidgin/gtkprefs.c:1245
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1060 ../pidgin/gtkprefs.c:1316
+#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1263
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../pidgin/gtkaccount.c:1068
+#: ../pidgin/gtkaccount.c:1037
 msgid "_Username:"
 msgstr "_Kasutajanimi:"
 
-#: ../pidgin/gtkaccount.c:1075 ../pidgin/gtkprefs.c:1353
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1300
 msgid "Pa_ssword:"
 msgstr "_Parool:"
 
-#: ../pidgin/gtkaccount.c:1199
+#: ../pidgin/gtkaccount.c:1169
 msgid "Unable to save new account"
 msgstr "Uut kontot pole võimalik salvestada"
 
-#: ../pidgin/gtkaccount.c:1200
+#: ../pidgin/gtkaccount.c:1170
 msgid "An account already exists with the specified criteria."
 msgstr "Selliste parameetritega konto on juba olemas."
 
-#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkaccount.c:1447
 msgid "Add Account"
 msgstr "Konto lisamine"
 
-#: ../pidgin/gtkaccount.c:1497
+#: ../pidgin/gtkaccount.c:1464
 msgid "_Basic"
 msgstr "_Põhiline"
 
-#: ../pidgin/gtkaccount.c:1504
+#: ../pidgin/gtkaccount.c:1471
 msgid "Create this new account on the server"
-msgstr ""
-
-#: ../pidgin/gtkaccount.c:1520
+msgstr "See on uus konto ja tuleb serverisse luua"
+
+#: ../pidgin/gtkaccount.c:1485
 msgid "_Advanced"
 msgstr "Laien_datud"
 
-#: ../pidgin/gtkaccount.c:1978 ../pidgin/gtkplugin.c:595
+#: ../pidgin/gtkaccount.c:1906 ../pidgin/gtkplugin.c:639
+#: ../pidgin/plugins/convcolors.c:327
 msgid "Enabled"
 msgstr "Lubatud"
 
-#: ../pidgin/gtkaccount.c:2006
+#: ../pidgin/gtkaccount.c:1934
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../pidgin/gtkaccount.c:2207
+#: ../pidgin/gtkaccount.c:2135
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -13542,7 +13850,7 @@
 "<b>Accounts->Add/Edit</b> in the Buddy List window"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:543
+#: ../pidgin/gtkblist.c:549
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -13550,124 +13858,128 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtkblist.c:544
+#: ../pidgin/gtkblist.c:550
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
 "list and use a single conversation window. You can separate them again by "
 "choosing 'Expand' from the contact's context menu"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:546
+#: ../pidgin/gtkblist.c:552
 msgid "_Merge"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:961
+#: ../pidgin/gtkblist.c:953 ../pidgin/gtkblist.c:6682
+msgid "Room _List"
+msgstr "Tubade _nimekiri"
+
+#: ../pidgin/gtkblist.c:973
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Palun sisesta teave vestluse kohta, millega soovid ühineda.\n"
 
-#: ../pidgin/gtkblist.c:972 ../pidgin/gtkblist.c:6560
-#: ../pidgin/gtkpounce.c:554 ../pidgin/gtkroomlist.c:709
+#: ../pidgin/gtkblist.c:985 ../pidgin/gtkblist.c:6717
+#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:547
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../pidgin/gtkblist.c:1261 ../pidgin/gtkprivacy.c:605
-#: ../pidgin/gtkprivacy.c:619
+#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkprivacy.c:549
+#: ../pidgin/gtkprivacy.c:563
 msgid "_Block"
 msgstr "_Bloki"
 
-#: ../pidgin/gtkblist.c:1261
+#: ../pidgin/gtkblist.c:1263
 msgid "Un_block"
 msgstr "Eemalda _blokeering"
 
-#: ../pidgin/gtkblist.c:1304
+#: ../pidgin/gtkblist.c:1306
 msgid "Move to"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:1344
+msgstr "Tõsta uude kohta"
+
+#: ../pidgin/gtkblist.c:1346
 msgid "Get _Info"
 msgstr "Hangi a_ndmed"
 
-#: ../pidgin/gtkblist.c:1347 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1349 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "Vä_lksõnum"
 
-#: ../pidgin/gtkblist.c:1353
+#: ../pidgin/gtkblist.c:1355
 msgid "_Send File..."
 msgstr "Saada _fail..."
 
-#: ../pidgin/gtkblist.c:1360
+#: ../pidgin/gtkblist.c:1362
 msgid "Add Buddy _Pounce..."
 msgstr "Lisa _sõbramärguanne..."
 
-#: ../pidgin/gtkblist.c:1365 ../pidgin/gtkblist.c:1369
-#: ../pidgin/gtkblist.c:1484 ../pidgin/gtkblist.c:1507
+#: ../pidgin/gtkblist.c:1367 ../pidgin/gtkblist.c:1371
+#: ../pidgin/gtkblist.c:1486 ../pidgin/gtkblist.c:1509
 msgid "View _Log"
 msgstr "Vaata _logi"
 
-#: ../pidgin/gtkblist.c:1375
+#: ../pidgin/gtkblist.c:1377
 msgid "Hide when offline"
 msgstr "Peida, kui pole võrku ühendatud"
 
-#: ../pidgin/gtkblist.c:1375
+#: ../pidgin/gtkblist.c:1377
 msgid "Show when offline"
 msgstr "Näita, kui pole võrku ühendatud"
 
-#: ../pidgin/gtkblist.c:1389 ../pidgin/gtkblist.c:1398
-#: ../pidgin/gtkblist.c:1492 ../pidgin/gtkblist.c:1513
+#: ../pidgin/gtkblist.c:1391 ../pidgin/gtkblist.c:1400
+#: ../pidgin/gtkblist.c:1494 ../pidgin/gtkblist.c:1515
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1392 ../pidgin/gtkblist.c:1400
-#: ../pidgin/gtkblist.c:1494 ../pidgin/gtkblist.c:1515
+#: ../pidgin/gtkblist.c:1394 ../pidgin/gtkblist.c:1402
+#: ../pidgin/gtkblist.c:1496 ../pidgin/gtkblist.c:1517
 msgid "_Remove"
 msgstr "_Eemalda"
 
-#: ../pidgin/gtkblist.c:1450
+#: ../pidgin/gtkblist.c:1452
 msgid "Add _Buddy..."
 msgstr "Lisa _sõber..."
 
-#: ../pidgin/gtkblist.c:1453
+#: ../pidgin/gtkblist.c:1455
 msgid "Add C_hat..."
 msgstr "Lisa _vestlus..."
 
-#: ../pidgin/gtkblist.c:1456
+#: ../pidgin/gtkblist.c:1458
 msgid "_Delete Group"
 msgstr "_Kustuta grupp"
 
-#: ../pidgin/gtkblist.c:1458
+#: ../pidgin/gtkblist.c:1460
 msgid "_Rename"
 msgstr "Muuda _nime"
 
 #. join button
-#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkroomlist.c:316
-#: ../pidgin/gtkroomlist.c:773 ../pidgin/pidginstock.c:88
+#: ../pidgin/gtkblist.c:1480 ../pidgin/gtkroomlist.c:318
+#: ../pidgin/gtkroomlist.c:594 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "Ü_hine"
 
-#: ../pidgin/gtkblist.c:1480
+#: ../pidgin/gtkblist.c:1482
 msgid "Auto-Join"
 msgstr "Automaatühinemine"
 
-#: ../pidgin/gtkblist.c:1482
+#: ../pidgin/gtkblist.c:1484
 msgid "Persistent"
 msgstr "Püsiv"
 
-#: ../pidgin/gtkblist.c:1520 ../pidgin/gtkblist.c:1543
+#: ../pidgin/gtkblist.c:1522 ../pidgin/gtkblist.c:1545
 msgid "_Collapse"
 msgstr "Ahen_da"
 
-#: ../pidgin/gtkblist.c:1548
+#: ../pidgin/gtkblist.c:1550
 msgid "_Expand"
 msgstr "Laien_da"
 
-#: ../pidgin/gtkblist.c:1799 ../pidgin/gtkblist.c:1811
-#: ../pidgin/gtkblist.c:5225 ../pidgin/gtkblist.c:5238
+#: ../pidgin/gtkblist.c:1801 ../pidgin/gtkblist.c:1813
+#: ../pidgin/gtkblist.c:5363 ../pidgin/gtkblist.c:5376
 msgid "/Tools/Mute Sounds"
 msgstr "/Vahendid/Vaigista helid"
 
-#: ../pidgin/gtkblist.c:2271 ../pidgin/gtkconv.c:4922
+#: ../pidgin/gtkblist.c:2273 ../pidgin/gtkconv.c:4818
 #: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -13675,287 +13987,306 @@
 "Sa pole hetkel ühegi sellise konto alt sisse logitud, millele seda sõpra "
 "lisada saaks."
 
+#. I don't believe this can happen currently, I think
+#. * everything that calls this function checks for one of the
+#. * above node types first.
+#: ../pidgin/gtkblist.c:2618
+msgid "Unknown node type"
+msgstr ""
+
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3103
+#: ../pidgin/gtkblist.c:3053
 msgid "/_Buddies"
 msgstr "/_Sõbrad"
 
-#: ../pidgin/gtkblist.c:3104
+#: ../pidgin/gtkblist.c:3054
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Sõbrad/Uus _välksõnum..."
 
-#: ../pidgin/gtkblist.c:3105
+#: ../pidgin/gtkblist.c:3055
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Sõbrad/Ühine _jututoaga..."
 
-#: ../pidgin/gtkblist.c:3106
+#: ../pidgin/gtkblist.c:3056
 msgid "/Buddies/Get User _Info..."
 msgstr "/Sõbrad/Hangi kasutaja _andmed"
 
-#: ../pidgin/gtkblist.c:3107
+#: ../pidgin/gtkblist.c:3057
 msgid "/Buddies/View User _Log..."
 msgstr "/Sõbrad/Vaata kasutaja _logi..."
 
-#: ../pidgin/gtkblist.c:3109
+#: ../pidgin/gtkblist.c:3059
 msgid "/Buddies/Sh_ow"
 msgstr "/Sõbrad/_Näita"
 
-#: ../pidgin/gtkblist.c:3110
+#: ../pidgin/gtkblist.c:3060
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Sõbrad/Näita/Ü_hendamata sõpru"
 
-#: ../pidgin/gtkblist.c:3111
+#: ../pidgin/gtkblist.c:3061
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Sõbrad/Näita/_Tühje gruppe"
 
-#: ../pidgin/gtkblist.c:3112
+#: ../pidgin/gtkblist.c:3062
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Sõbrad/Näita/_Sõbra üksikasju"
 
-#: ../pidgin/gtkblist.c:3113
+#: ../pidgin/gtkblist.c:3063
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Sõbrad/Näita/_Jõudeoleku aegu"
 
-#: ../pidgin/gtkblist.c:3114
+#: ../pidgin/gtkblist.c:3064
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Sõbrad/Näita/_Protokollide ikoone"
 
-#: ../pidgin/gtkblist.c:3115
+#: ../pidgin/gtkblist.c:3065
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Sõbrad/Sõp_rade sortimine"
 
-#: ../pidgin/gtkblist.c:3117
+#: ../pidgin/gtkblist.c:3067
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Sõbrad/Lisa _sõber..."
 
-#: ../pidgin/gtkblist.c:3118
+#: ../pidgin/gtkblist.c:3068
 msgid "/Buddies/Add C_hat..."
 msgstr "/Sõbrad/Lisa ju_tutuba..."
 
-#: ../pidgin/gtkblist.c:3119
+#: ../pidgin/gtkblist.c:3069
 msgid "/Buddies/Add _Group..."
 msgstr "/Sõbrad/Lisa _grupp..."
 
-#: ../pidgin/gtkblist.c:3121
+#: ../pidgin/gtkblist.c:3071
 msgid "/Buddies/_Quit"
 msgstr "/Sõbrad/_Lõpeta"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3124
+#: ../pidgin/gtkblist.c:3074
 msgid "/_Accounts"
 msgstr "/_Kontod"
 
-#: ../pidgin/gtkblist.c:3125 ../pidgin/gtkblist.c:7262
+#: ../pidgin/gtkblist.c:3075 ../pidgin/gtkblist.c:7402
 msgid "/Accounts/Manage"
 msgstr "/Kontod/Halda"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3128
+#: ../pidgin/gtkblist.c:3078
 msgid "/_Tools"
 msgstr "/_Vahendid"
 
-#: ../pidgin/gtkblist.c:3129
+#: ../pidgin/gtkblist.c:3079
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Vahendid/Sõbra_märguanded"
 
-#: ../pidgin/gtkblist.c:3130
+#: ../pidgin/gtkblist.c:3080
 msgid "/Tools/_Certificates"
 msgstr "/Vahendid/_Sertifikaadid"
 
-#: ../pidgin/gtkblist.c:3131
+#: ../pidgin/gtkblist.c:3081
 msgid "/Tools/Plu_gins"
 msgstr "/Vahendid/Plu_ginad"
 
-#: ../pidgin/gtkblist.c:3132
+#: ../pidgin/gtkblist.c:3082
 msgid "/Tools/Pr_eferences"
 msgstr "/Vahendid/_Eelistused"
 
-#: ../pidgin/gtkblist.c:3133
+#: ../pidgin/gtkblist.c:3083
 msgid "/Tools/Pr_ivacy"
 msgstr "/Vahendid/_Privaatsus"
 
-#: ../pidgin/gtkblist.c:3135
+#: ../pidgin/gtkblist.c:3085
 msgid "/Tools/_File Transfers"
 msgstr "/Vahendid/_Failiülekanded"
 
-#: ../pidgin/gtkblist.c:3136
+#: ../pidgin/gtkblist.c:3086
 msgid "/Tools/R_oom List"
 msgstr "/Vahendid/_Tubade nimekiri"
 
-#: ../pidgin/gtkblist.c:3137
+#: ../pidgin/gtkblist.c:3087
 msgid "/Tools/System _Log"
 msgstr "/Vahendid/Süsteemne _logi"
 
-#: ../pidgin/gtkblist.c:3139
+#: ../pidgin/gtkblist.c:3089
 msgid "/Tools/Mute _Sounds"
 msgstr "/Vahendid/_Vaigista helid"
 
 #. Help
-#: ../pidgin/gtkblist.c:3141
+#: ../pidgin/gtkblist.c:3091
 msgid "/_Help"
 msgstr "/A_bi"
 
-#: ../pidgin/gtkblist.c:3142
+#: ../pidgin/gtkblist.c:3092
 msgid "/Help/Online _Help"
 msgstr "/Abi/_Online abi"
 
-#: ../pidgin/gtkblist.c:3143
+#: ../pidgin/gtkblist.c:3093
 msgid "/Help/_Debug Window"
 msgstr "/Abi/_Silumisaken"
 
-#: ../pidgin/gtkblist.c:3145 ../pidgin/gtkblist.c:3147
+#: ../pidgin/gtkblist.c:3095 ../pidgin/gtkblist.c:3097
 msgid "/Help/_About"
 msgstr "/Abi/Programmist _lähemalt"
 
-#: ../pidgin/gtkblist.c:3176
-#, c-format
-msgid ""
-"\n"
-"<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>Konto:</b> %s"
-
-#: ../pidgin/gtkblist.c:3254
+#: ../pidgin/gtkblist.c:3127
+#, c-format
+msgid "<b>Account:</b> %s"
+msgstr "<b>Konto:</b> %s"
+
+#: ../pidgin/gtkblist.c:3135
+#, c-format
+msgid ""
+"\n"
+"<b>Topic:</b> %s"
+msgstr ""
+"\n"
+"<b>Teema:</b> %s"
+
+#: ../pidgin/gtkblist.c:3135
+msgid "(no topic set)"
+msgstr "(teemat pole seatud)"
+
+#: ../pidgin/gtkblist.c:3212
 msgid "Buddy Alias"
 msgstr "Sõbra alias"
 
-#: ../pidgin/gtkblist.c:3283
+#: ../pidgin/gtkblist.c:3241
 msgid "Logged In"
 msgstr "Sisse logitud"
 
-#: ../pidgin/gtkblist.c:3329
+#: ../pidgin/gtkblist.c:3287
 msgid "Last Seen"
 msgstr "Viimati nähtud"
 
-#: ../pidgin/gtkblist.c:3350
+#: ../pidgin/gtkblist.c:3308
 msgid "Spooky"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:3352
+msgstr "Kummituslik"
+
+#: ../pidgin/gtkblist.c:3310
 msgid "Awesome"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:3354
+msgstr "Imeline"
+
+#: ../pidgin/gtkblist.c:3312
 msgid "Rockin'"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:3693
+msgstr "Rokkiv"
+
+#: ../pidgin/gtkblist.c:3328
+msgid "Total Buddies"
+msgstr "Sõpru kokku"
+
+#: ../pidgin/gtkblist.c:3695
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Jõude %dp %dt %02dm"
 
-#: ../pidgin/gtkblist.c:3695
+#: ../pidgin/gtkblist.c:3697
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Jõude %dt %02dm"
 
-#: ../pidgin/gtkblist.c:3697
+#: ../pidgin/gtkblist.c:3699
 #, c-format
 msgid "Idle %dm"
 msgstr "Jõude %dm"
 
-#: ../pidgin/gtkblist.c:3851
+#: ../pidgin/gtkblist.c:3853
 msgid "/Buddies/New Instant Message..."
 msgstr "/Sõbrad/Uus välksõnum..."
 
-#: ../pidgin/gtkblist.c:3852 ../pidgin/gtkblist.c:3885
+#: ../pidgin/gtkblist.c:3854 ../pidgin/gtkblist.c:3887
 msgid "/Buddies/Join a Chat..."
 msgstr "/Sõbrad/Ühine vestlusega..."
 
-#: ../pidgin/gtkblist.c:3853
+#: ../pidgin/gtkblist.c:3855
 msgid "/Buddies/Get User Info..."
 msgstr "/Sõbrad/Hangi kasutaja andmed..."
 
-#: ../pidgin/gtkblist.c:3854
+#: ../pidgin/gtkblist.c:3856
 msgid "/Buddies/Add Buddy..."
 msgstr "/Sõbrad/Lisa sõber..."
 
-#: ../pidgin/gtkblist.c:3855 ../pidgin/gtkblist.c:3888
+#: ../pidgin/gtkblist.c:3857 ../pidgin/gtkblist.c:3890
 msgid "/Buddies/Add Chat..."
 msgstr "/Sõbrad/Lisa vestlus..."
 
-#: ../pidgin/gtkblist.c:3856
+#: ../pidgin/gtkblist.c:3858
 msgid "/Buddies/Add Group..."
 msgstr "/Sõbrad/Lisa grupp..."
 
-#: ../pidgin/gtkblist.c:3891
+#: ../pidgin/gtkblist.c:3893
 msgid "/Tools/Privacy"
 msgstr "/Vahendid/Privaatsus"
 
-#: ../pidgin/gtkblist.c:3894
+#: ../pidgin/gtkblist.c:3896
 msgid "/Tools/Room List"
 msgstr "/Vahendid/Tubade nimekiri"
 
-#: ../pidgin/gtkblist.c:4026 ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkblist.c:4028 ../pidgin/gtkdocklet.c:155
 #: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d lugemata sõnum %s-lt\n"
-msgstr[1] "%d lugemata sõnumit %s-lt\n"
-
-#: ../pidgin/gtkblist.c:4189
+msgstr[0] "%d lugemata sõnum, saatja: %s\n"
+msgstr[1] "%d lugemata sõnumit, saatja: %s\n"
+
+#: ../pidgin/gtkblist.c:4191
 msgid "Manually"
 msgstr "Käsitsi"
 
-#: ../pidgin/gtkblist.c:4192
+#: ../pidgin/gtkblist.c:4194
 msgid "By status"
 msgstr "Oleku järgi"
 
-#: ../pidgin/gtkblist.c:4193
+#: ../pidgin/gtkblist.c:4195
 msgid "By log size"
 msgstr "Logi suuruse järgi"
 
-#: ../pidgin/gtkblist.c:4483
+#: ../pidgin/gtkblist.c:4532
 #, c-format
 msgid "%s disconnected"
 msgstr "%s katkestas ühenduse"
 
-#: ../pidgin/gtkblist.c:4485
+#: ../pidgin/gtkblist.c:4534
 #, c-format
 msgid "%s disabled"
 msgstr "%s on keelatud"
 
-#: ../pidgin/gtkblist.c:4489
+#: ../pidgin/gtkblist.c:4538
 msgid "Reconnect"
 msgstr "Ühendu uuesti"
 
-#: ../pidgin/gtkblist.c:4489 ../pidgin/gtkblist.c:4577
+#: ../pidgin/gtkblist.c:4538 ../pidgin/gtkblist.c:4657
 msgid "Re-enable"
 msgstr "Luba uuesti"
 
-#: ../pidgin/gtkblist.c:4493 ../pidgin/gtkblist.c:4580
-#: ../pidgin/gtkconv.c:1679
-msgid "Ignore"
-msgstr "Eira"
-
-#: ../pidgin/gtkblist.c:4604
-#, c-format
-msgid "%d account was disabled because you signed on from another location."
+#: ../pidgin/gtkblist.c:4655
+msgid "Welcome back!"
+msgstr "Tere tulemast tagasi!"
+
+#: ../pidgin/gtkblist.c:4691
+#, c-format
+msgid "%d account was disabled because you signed on from another location:"
 msgid_plural ""
-"%d accounts were disabled because you signed on from another location."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../pidgin/gtkblist.c:4831
+"%d accounts were disabled because you signed on from another location:"
+msgstr[0] "%d konto on keelatud kuna sa logisid teisest kohast sisse:"
+msgstr[1] "%d kontot on keelatud kuna sa logisid teisest kohast sisse:"
+
+#: ../pidgin/gtkblist.c:4970
 msgid "<b>Username:</b>"
 msgstr "<b>Kasutajanimi:</b>"
 
-#: ../pidgin/gtkblist.c:4838
+#: ../pidgin/gtkblist.c:4977
 msgid "<b>Password:</b>"
 msgstr "<b>Parool</b>"
 
-#: ../pidgin/gtkblist.c:4849
+#: ../pidgin/gtkblist.c:4988
 msgid "_Login"
 msgstr "_Logi sisse"
 
-#: ../pidgin/gtkblist.c:4934
+#: ../pidgin/gtkblist.c:5072
 msgid "/Accounts"
 msgstr "/Kontod"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4948
+#: ../pidgin/gtkblist.c:5086
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -13968,27 +14299,27 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:5219
+#: ../pidgin/gtkblist.c:5357
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Sõbrad/Näita/Ühendamata sõpru"
 
-#: ../pidgin/gtkblist.c:5222
+#: ../pidgin/gtkblist.c:5360
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Sõbrad/Näita/Tühje gruppe"
 
-#: ../pidgin/gtkblist.c:5228
+#: ../pidgin/gtkblist.c:5366
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Sõbrad/Näita/Sõbra üksikasju"
 
-#: ../pidgin/gtkblist.c:5231
+#: ../pidgin/gtkblist.c:5369
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Sõbrad/Näita/Jõudeaegu"
 
-#: ../pidgin/gtkblist.c:5234
+#: ../pidgin/gtkblist.c:5372
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Sõbrad/Näita/Protokollide ikoone"
 
-#: ../pidgin/gtkblist.c:6166
+#: ../pidgin/gtkblist.c:6323
 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. "
@@ -13999,30 +14330,32 @@
 "kuvatakse hüüdnime ekraaninime asemel.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:6189
+#: ../pidgin/gtkblist.c:6346
 msgid "A_ccount:"
 msgstr "_Konto:"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:6201
+#: ../pidgin/gtkblist.c:6358
 msgid "_Screen name:"
 msgstr "_Ekraaninimi:"
 
-#: ../pidgin/gtkblist.c:6223 ../pidgin/gtkblist.c:6581
+#: ../pidgin/gtkblist.c:6380 ../pidgin/gtkblist.c:6730
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:6491
+#: ../pidgin/gtkblist.c:6647
 msgid "This protocol does not support chat rooms."
 msgstr "See protokoll ei toeta jututubasid"
 
-#: ../pidgin/gtkblist.c:6507
+#: ../pidgin/gtkblist.c:6663
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
-
-#: ../pidgin/gtkblist.c:6550
+"Sa pole hetkel ühegi protokolli kaudu sisse logitud ja seega pole sul "
+"võimalik vestelda."
+
+#: ../pidgin/gtkblist.c:6707
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -14030,74 +14363,74 @@
 "Palun sisesta alias ja vestluse kohta käivad andmed lisatakse sinu "
 "sõbraloenisse.\n"
 
-#: ../pidgin/gtkblist.c:6609
-msgid "Autojoin when account becomes online."
-msgstr ""
-
-#: ../pidgin/gtkblist.c:6610
-msgid "Hide chat when the window is closed."
-msgstr ""
-
-#: ../pidgin/gtkblist.c:6636
+#: ../pidgin/gtkblist.c:6737
+msgid "Auto_join when account becomes online."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6738
+msgid "_Hide chat when the window is closed."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6764
 msgid "Please enter the name of the group to be added."
 msgstr "Palun sisesta lisatava grupi nimi."
 
-#: ../pidgin/gtkblist.c:7282
+#: ../pidgin/gtkblist.c:7422
 msgid "<PurpleMain>/Accounts/"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:7306
+msgstr "<PurpleMain>/Kontod/"
+
+#: ../pidgin/gtkblist.c:7446
 msgid "_Edit Account"
 msgstr "_Redigeeri kontot"
 
-#: ../pidgin/gtkblist.c:7319 ../pidgin/gtkconv.c:3146
+#: ../pidgin/gtkblist.c:7459 ../pidgin/gtkconv.c:3137
 msgid "No actions available"
 msgstr "Toiminguid pole"
 
-#: ../pidgin/gtkblist.c:7327
+#: ../pidgin/gtkblist.c:7467
 msgid "_Disable"
 msgstr "_Keela"
 
-#: ../pidgin/gtkblist.c:7339
+#: ../pidgin/gtkblist.c:7479
 msgid "Enable Account"
 msgstr "Luba konto"
 
-#: ../pidgin/gtkblist.c:7345
+#: ../pidgin/gtkblist.c:7485
 msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:7394
+msgstr "<PurpleMain>/Kontod/Luba konto"
+
+#: ../pidgin/gtkblist.c:7534
 msgid "/Tools"
 msgstr "/Vahendid"
 
-#: ../pidgin/gtkblist.c:7464
+#: ../pidgin/gtkblist.c:7604
 msgid "/Buddies/Sort Buddies"
 msgstr "/Sõbrad/Sordi sõbrad"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:531
+#: ../pidgin/gtkcertmgr.c:541
 msgid "SSL Servers"
 msgstr "SSL-Serverid"
 
-#: ../pidgin/gtkconv.c:524
+#: ../pidgin/gtkconv.c:485
 msgid "Unknown command."
 msgstr "Tundmatu käsk."
 
-#: ../pidgin/gtkconv.c:796 ../pidgin/gtkconv.c:822
+#: ../pidgin/gtkconv.c:755 ../pidgin/gtkconv.c:781
 msgid "That buddy is not on the same protocol as this chat."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:816
+#: ../pidgin/gtkconv.c:775
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:869
+#: ../pidgin/gtkconv.c:828
 msgid "Invite Buddy Into Chat Room"
 msgstr "Sõbra kutsumine jututuppa"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:899
+#: ../pidgin/gtkconv.c:858
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14105,179 +14438,183 @@
 "Palun sisesta selle kasutaja nimi, keda sa soovid jututuppa kutsuda. Kui "
 "sisestad ka sõnumi, siis saadetakse see sõbrale koos kutsumisteatega."
 
-#: ../pidgin/gtkconv.c:920
+#: ../pidgin/gtkconv.c:879
 msgid "_Buddy:"
 msgstr "_Sõber:"
 
-#: ../pidgin/gtkconv.c:931 ../pidgin/gtksavedstatuses.c:1200
-#: ../pidgin/gtksavedstatuses.c:1536
+#: ../pidgin/gtkconv.c:890 ../pidgin/gtksavedstatuses.c:1166
+#: ../pidgin/gtksavedstatuses.c:1484
 msgid "_Message:"
 msgstr "Sõ_num:"
 
-#: ../pidgin/gtkconv.c:995
+#: ../pidgin/gtkconv.c:954
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Vestlused kasutajaga %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1033
+#: ../pidgin/gtkconv.c:992
 msgid "Save Conversation"
 msgstr "Vestluse salvestamine"
 
-#: ../pidgin/gtkconv.c:1179 ../pidgin/gtkdebug.c:168 ../pidgin/gtkdebug.c:748
+#: ../pidgin/gtkconv.c:1138 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:740
 msgid "Find"
 msgstr "Otsing"
 
-#: ../pidgin/gtkconv.c:1205 ../pidgin/gtkdebug.c:196
+#: ../pidgin/gtkconv.c:1164 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "O_tsida stringi:"
 
-#: ../pidgin/gtkconv.c:1676
+#: ../pidgin/gtkconv.c:1665
 msgid "Un-Ignore"
 msgstr "Ära eira"
 
-#: ../pidgin/gtkconv.c:1699
+#: ../pidgin/gtkconv.c:1668
+msgid "Ignore"
+msgstr "Eira"
+
+#: ../pidgin/gtkconv.c:1688
 msgid "Get Away Message"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:1722
+#: ../pidgin/gtkconv.c:1711
 msgid "Last said"
 msgstr "Viimati ütles"
 
-#: ../pidgin/gtkconv.c:2671
+#: ../pidgin/gtkconv.c:2664
 msgid "Unable to save icon file to disk."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2722
+#: ../pidgin/gtkconv.c:2715
 msgid "Save Icon"
 msgstr "Ikooni salvestamine"
 
-#: ../pidgin/gtkconv.c:2774
+#: ../pidgin/gtkconv.c:2767
 msgid "Animate"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2779
+#: ../pidgin/gtkconv.c:2772
 msgid "Hide Icon"
 msgstr "Peida ikoon"
 
-#: ../pidgin/gtkconv.c:2782
+#: ../pidgin/gtkconv.c:2775
 msgid "Save Icon As..."
 msgstr "Salvesta ikoon kui..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2779
 msgid "Set Custom Icon..."
 msgstr "Määra kohandatud ikoon..."
 
-#: ../pidgin/gtkconv.c:2799
+#: ../pidgin/gtkconv.c:2792
 msgid "Remove Custom Icon"
 msgstr "Eemalda kohandatud ikoon"
 
-#: ../pidgin/gtkconv.c:2931
+#: ../pidgin/gtkconv.c:2922
 msgid "Show All"
 msgstr ""
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2950
+#: ../pidgin/gtkconv.c:2941
 msgid "/_Conversation"
 msgstr "/_Vestlus"
 
-#: ../pidgin/gtkconv.c:2952
+#: ../pidgin/gtkconv.c:2943
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Vestlus/Uus _välksõnum..."
 
-#: ../pidgin/gtkconv.c:2957
+#: ../pidgin/gtkconv.c:2948
 msgid "/Conversation/_Find..."
 msgstr "/Vestlus/_Otsi..."
 
-#: ../pidgin/gtkconv.c:2959
+#: ../pidgin/gtkconv.c:2950
 msgid "/Conversation/View _Log"
 msgstr "/Vestlus/Vaata _logi"
 
+#: ../pidgin/gtkconv.c:2951
+msgid "/Conversation/_Save As..."
+msgstr "/Vestlus/Salvesta _kui..."
+
+#: ../pidgin/gtkconv.c:2953
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/Vestlus/_Puhasta tagasikerimine"
+
+#: ../pidgin/gtkconv.c:2957
+msgid "/Conversation/Se_nd File..."
+msgstr "/Vestlus/Saada _fail..."
+
+#: ../pidgin/gtkconv.c:2958
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/Vestlus/Lisa sõbra_märguanne..."
+
 #: ../pidgin/gtkconv.c:2960
-msgid "/Conversation/_Save As..."
-msgstr "/Vestlus/Salvesta _kui..."
-
-#: ../pidgin/gtkconv.c:2962
-msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Vestlus/_Puhasta tagasikerimine"
-
-#: ../pidgin/gtkconv.c:2966
-msgid "/Conversation/Se_nd File..."
-msgstr "/Vestlus/Saada _fail..."
-
-#: ../pidgin/gtkconv.c:2967
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Vestlus/Lisa sõbra_märguanne..."
-
-#: ../pidgin/gtkconv.c:2969
 msgid "/Conversation/_Get Info"
 msgstr "/Vestlus/_Hangi teavet"
 
-#: ../pidgin/gtkconv.c:2971
+#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/In_vite..."
 msgstr "/Vestlus/_Kutsu..."
 
-#: ../pidgin/gtkconv.c:2973
+#: ../pidgin/gtkconv.c:2964
 msgid "/Conversation/M_ore"
 msgstr "/Vestlus/_Veel"
 
-#: ../pidgin/gtkconv.c:2977
+#: ../pidgin/gtkconv.c:2968
 msgid "/Conversation/Al_ias..."
 msgstr "/Vestlus/Al_ias..."
 
-#: ../pidgin/gtkconv.c:2979
+#: ../pidgin/gtkconv.c:2970
 msgid "/Conversation/_Block..."
 msgstr "/Vestlus/_Bloki..."
 
-#: ../pidgin/gtkconv.c:2981
+#: ../pidgin/gtkconv.c:2972
 msgid "/Conversation/_Unblock..."
 msgstr "/Vestlus/_Eemalda blokeering..."
 
-#: ../pidgin/gtkconv.c:2983
+#: ../pidgin/gtkconv.c:2974
 msgid "/Conversation/_Add..."
 msgstr "/Vestlus/_Lisa..."
 
-#: ../pidgin/gtkconv.c:2985
+#: ../pidgin/gtkconv.c:2976
 msgid "/Conversation/_Remove..."
 msgstr "/Vestlus/_Eemalda"
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:2981
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Vestlus/Lisa _viit..."
 
-#: ../pidgin/gtkconv.c:2992
+#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Vestlus/Lisa _pilt..."
 
-#: ../pidgin/gtkconv.c:2998
+#: ../pidgin/gtkconv.c:2989
 msgid "/Conversation/_Close"
 msgstr "/Vestlus/_Sulge"
 
 #. Options
-#: ../pidgin/gtkconv.c:3002
+#: ../pidgin/gtkconv.c:2993
 msgid "/_Options"
 msgstr "/V_alikud"
 
-#: ../pidgin/gtkconv.c:3003
+#: ../pidgin/gtkconv.c:2994
 msgid "/Options/Enable _Logging"
 msgstr "/Valikud/Luba _logimine"
 
-#: ../pidgin/gtkconv.c:3004
+#: ../pidgin/gtkconv.c:2995
 msgid "/Options/Enable _Sounds"
 msgstr "/Valikud/Luba _helid"
 
-#: ../pidgin/gtkconv.c:3006
+#: ../pidgin/gtkconv.c:2997
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Valikud/Näita _vormindamise tööriistu"
 
-#: ../pidgin/gtkconv.c:3007
+#: ../pidgin/gtkconv.c:2998
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Valikud/Näita _ajatempleid"
 
-#: ../pidgin/gtkconv.c:3134
+#: ../pidgin/gtkconv.c:3125
 msgid "/Conversation/More"
 msgstr "/Vestlus/Veel"
 
-#: ../pidgin/gtkconv.c:3190
+#: ../pidgin/gtkconv.c:3181
 msgid "/Options"
 msgstr "/Valikud"
 
@@ -14286,236 +14623,241 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3225 ../pidgin/gtkconv.c:3257
+#: ../pidgin/gtkconv.c:3216 ../pidgin/gtkconv.c:3248
 msgid "/Conversation"
 msgstr "/Vestlus"
 
-#: ../pidgin/gtkconv.c:3265
+#: ../pidgin/gtkconv.c:3256
 msgid "/Conversation/View Log"
 msgstr "/Vestlus/Vaata logi"
 
-#: ../pidgin/gtkconv.c:3271
+#: ../pidgin/gtkconv.c:3262
 msgid "/Conversation/Send File..."
 msgstr "/Vestlus/Saada fail..."
 
-#: ../pidgin/gtkconv.c:3275
+#: ../pidgin/gtkconv.c:3266
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Vestlus/Lisa sõbramärguanne..."
 
-#: ../pidgin/gtkconv.c:3281
+#: ../pidgin/gtkconv.c:3272
 msgid "/Conversation/Get Info"
 msgstr "/Vestlus/Hangi andmed"
 
-#: ../pidgin/gtkconv.c:3285
+#: ../pidgin/gtkconv.c:3276
 msgid "/Conversation/Invite..."
 msgstr "/Vestlus/Kutsu..."
 
-#: ../pidgin/gtkconv.c:3291
+#: ../pidgin/gtkconv.c:3282
 msgid "/Conversation/Alias..."
 msgstr "/Vestlus/Alias..."
 
-#: ../pidgin/gtkconv.c:3295
+#: ../pidgin/gtkconv.c:3286
 msgid "/Conversation/Block..."
 msgstr "/Vestlus/Bloki..."
 
-#: ../pidgin/gtkconv.c:3299
+#: ../pidgin/gtkconv.c:3290
 msgid "/Conversation/Unblock..."
 msgstr "/Vestlus/Eemalda blokeering..."
 
-#: ../pidgin/gtkconv.c:3303
+#: ../pidgin/gtkconv.c:3294
 msgid "/Conversation/Add..."
 msgstr "/Vestlus/Lisa..."
 
-#: ../pidgin/gtkconv.c:3307
+#: ../pidgin/gtkconv.c:3298
 msgid "/Conversation/Remove..."
 msgstr "/Vestlus/Eemalda..."
 
-#: ../pidgin/gtkconv.c:3313
+#: ../pidgin/gtkconv.c:3304
 msgid "/Conversation/Insert Link..."
 msgstr "/Vestlus/Lisa viit..."
 
+#: ../pidgin/gtkconv.c:3308
+msgid "/Conversation/Insert Image..."
+msgstr "/Vestlus/Lisa pilt..."
+
+#: ../pidgin/gtkconv.c:3314
+msgid "/Options/Enable Logging"
+msgstr "/Valikud/Luba logimine"
+
 #: ../pidgin/gtkconv.c:3317
-msgid "/Conversation/Insert Image..."
-msgstr "/Vestlus/Lisa pilt..."
-
-#: ../pidgin/gtkconv.c:3323
-msgid "/Options/Enable Logging"
-msgstr "/Valikud/Luba logimine"
-
-#: ../pidgin/gtkconv.c:3326
 msgid "/Options/Enable Sounds"
 msgstr "/Valikud/Luba helid"
 
-#: ../pidgin/gtkconv.c:3339
+#: ../pidgin/gtkconv.c:3330
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Valikud/Näita vormindamise tööriistu"
 
-#: ../pidgin/gtkconv.c:3342
+#: ../pidgin/gtkconv.c:3333
 msgid "/Options/Show Timestamps"
 msgstr "/Valikud/Näita ajatempleid"
 
-#: ../pidgin/gtkconv.c:3419 ../pidgin/gtkconv.c:3461
+#: ../pidgin/gtkconv.c:3411
 msgid "User is typing..."
 msgstr "Kasutaja tipib..."
 
-#: ../pidgin/gtkconv.c:3464
-msgid "User has typed something and stopped"
-msgstr "Kasutaja tippis midagi ja siis jättis selle pooleli"
+#: ../pidgin/gtkconv.c:3481
+#, c-format
+msgid ""
+"\n"
+"%s has stopped typing"
+msgstr ""
+"\n"
+"%s lõpetas sisestamise"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3648 ../pidgin/gtkconv.c:8248
+#: ../pidgin/gtkconv.c:3647 ../pidgin/gtkconv.c:8318
 msgid "S_end To"
 msgstr "K_ellele saata"
 
-#: ../pidgin/gtkconv.c:4360
+#: ../pidgin/gtkconv.c:4359
 msgid "_Send"
 msgstr "_Saada"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4473
+#: ../pidgin/gtkconv.c:4497
 msgid "0 people in room"
 msgstr "0 isikut toas"
 
-#: ../pidgin/gtkconv.c:5846 ../pidgin/gtkconv.c:5967
+#: ../pidgin/gtkconv.c:5796 ../pidgin/gtkconv.c:5917
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "toas on %d isik"
 msgstr[1] "toas on %d isikut"
 
-#: ../pidgin/gtkconv.c:6574 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6544 ../pidgin/gtkstatusbox.c:679
 msgid "Typing"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6578
+#: ../pidgin/gtkconv.c:6548
 msgid "Stopped Typing"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6581
+#: ../pidgin/gtkconv.c:6551
 msgid "Nick Said"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6584 ../pidgin/gtkdocklet.c:685
+#: ../pidgin/gtkconv.c:6554 ../pidgin/gtkdocklet.c:686
 msgid "Unread Messages"
 msgstr "Lugemata sõnumid"
 
-#: ../pidgin/gtkconv.c:6590
+#: ../pidgin/gtkconv.c:6560
 msgid "New Event"
 msgstr "Uus sündmus"
 
-#: ../pidgin/gtkconv.c:7767
+#: ../pidgin/gtkconv.c:7790
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Vestluse kogu tagasikerimispuhvri puhastamine."
 
-#: ../pidgin/gtkconv.c:7930
+#: ../pidgin/gtkconv.c:7994
 msgid "Confirm close"
 msgstr "Sulgemiskinnitus"
 
-#: ../pidgin/gtkconv.c:7962
+#: ../pidgin/gtkconv.c:8026
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Sul on lugemata sõnumeid. Oled kindel, et soovid akent sulgeda?"
 
-#: ../pidgin/gtkconv.c:8581
+#: ../pidgin/gtkconv.c:8659
 msgid "Close other tabs"
 msgstr "Sulge teised kaardid"
 
-#: ../pidgin/gtkconv.c:8587
+#: ../pidgin/gtkconv.c:8665
 msgid "Close all tabs"
 msgstr "Sulge kõik kaardid"
 
-#: ../pidgin/gtkconv.c:8595
+#: ../pidgin/gtkconv.c:8673
 msgid "Detach this tab"
 msgstr "Haagi see kaart lahti"
 
-#: ../pidgin/gtkconv.c:8601
+#: ../pidgin/gtkconv.c:8679
 msgid "Close this tab"
 msgstr "Sulge see kaart"
 
-#: ../pidgin/gtkconv.c:9106
+#: ../pidgin/gtkconv.c:9193
 msgid "Close conversation"
 msgstr "Vestluse sulgemine"
 
-#: ../pidgin/gtkconv.c:9708
+#: ../pidgin/gtkconv.c:9797
 msgid "Last created window"
 msgstr "Viimati loodud aknasse"
 
-#: ../pidgin/gtkconv.c:9710
+#: ../pidgin/gtkconv.c:9799
 msgid "Separate IM and Chat windows"
 msgstr "Välksõnumid ja jututoad eraldi akendesse"
 
-#: ../pidgin/gtkconv.c:9712 ../pidgin/gtkprefs.c:1510
+#: ../pidgin/gtkconv.c:9801 ../pidgin/gtkprefs.c:1466
 msgid "New window"
 msgstr "Uude aknasse"
 
-#: ../pidgin/gtkconv.c:9714
+#: ../pidgin/gtkconv.c:9803
 msgid "By group"
 msgstr "Grupi kaupa"
 
-#: ../pidgin/gtkconv.c:9716
+#: ../pidgin/gtkconv.c:9805
 msgid "By account"
 msgstr "Konto kaupa"
 
-#: ../pidgin/gtkdebug.c:235
+#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr "Silumislogi salvestamine"
 
-#: ../pidgin/gtkdebug.c:583
+#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:586
+#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
 msgstr "Vastavuste esiletõstmine"
 
-#: ../pidgin/gtkdebug.c:653
+#: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
 msgstr "Ainult _ikoon"
 
-#: ../pidgin/gtkdebug.c:654
+#: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
 msgstr "Ainult _tekst"
 
-#: ../pidgin/gtkdebug.c:655
+#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
 msgstr "Ikoon ja tekst _korraga"
 
-#: ../pidgin/gtkdebug.c:780
+#: ../pidgin/gtkdebug.c:772
 msgid "Filter"
 msgstr "Filter"
 
-#: ../pidgin/gtkdebug.c:799
+#: ../pidgin/gtkdebug.c:791
 msgid "Right click for more options."
 msgstr "Täiendavate valikuta jaoks klõpsa parema nupuga."
 
-#: ../pidgin/gtkdebug.c:829
+#: ../pidgin/gtkdebug.c:821
 msgid "Level "
 msgstr "Tase "
 
-#: ../pidgin/gtkdebug.c:830 ../pidgin/gtkdebug.c:836
+#: ../pidgin/gtkdebug.c:822 ../pidgin/gtkdebug.c:828
 msgid "Select the debug filter level."
 msgstr "Vali silumisfiltri tase."
 
-#: ../pidgin/gtkdebug.c:838
+#: ../pidgin/gtkdebug.c:830
 msgid "All"
 msgstr "Kõik"
 
-#: ../pidgin/gtkdebug.c:839
+#: ../pidgin/gtkdebug.c:831
 msgid "Misc"
 msgstr "Muu"
 
-#: ../pidgin/gtkdebug.c:841
+#: ../pidgin/gtkdebug.c:833
 msgid "Warning"
-msgstr "Hoiatus"
-
-#: ../pidgin/gtkdebug.c:842
+msgstr "Hoiatused"
+
+#: ../pidgin/gtkdebug.c:834
 msgid "Error "
-msgstr "Viga"
-
-#: ../pidgin/gtkdebug.c:843
+msgstr "Vead"
+
+#: ../pidgin/gtkdebug.c:835
 msgid "Fatal Error"
-msgstr "Saatuslik viga"
-
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
+msgstr "Saatuslikud vead"
+
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:118
 msgid "lead developer"
 msgstr "juhtiv arendaja"
 
@@ -14528,6 +14870,7 @@
 #: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
 #: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:90
 #: ../pidgin/gtkdialogs.c:92 ../pidgin/gtkdialogs.c:93
+#: ../pidgin/gtkdialogs.c:94
 msgid "developer"
 msgstr "arendaja"
 
@@ -14539,335 +14882,343 @@
 msgid "support/QA"
 msgstr "kasutajatugi/kvaliteedikontroll"
 
-#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:113
 msgid "developer & webmaster"
 msgstr "arendaja ja veebimeister"
 
-#: ../pidgin/gtkdialogs.c:99
+#: ../pidgin/gtkdialogs.c:100
 msgid "Senior Contributor/QA"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:108
+#: ../pidgin/gtkdialogs.c:109
 msgid "win32 port"
 msgstr "win32 port"
 
-#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
 msgid "maintainer"
 msgstr "hooldaja"
 
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:112
 msgid "libfaim maintainer"
 msgstr "libfaimi hooldaja"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:115
 msgid "hacker and designated driver [lazy bum]"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:116
 msgid "XMPP developer"
 msgstr "XMPP arendaja"
 
-#: ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:117
 msgid "original author"
 msgstr "algse versiooni autor"
 
-#: ../pidgin/gtkdialogs.c:133
+#: ../pidgin/gtkdialogs.c:134
 msgid "Afrikaans"
 msgstr "Aafrika"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:229
 msgid "Arabic"
 msgstr "Araabia"
 
-#: ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:136
 msgid "Belarusian Latin"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:227
+msgstr "Valgevene ladina"
+
+#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:138
+#: ../pidgin/gtkdialogs.c:230
 msgid "Bulgarian"
 msgstr "Bulgaaria"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:139 ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
 msgid "Bengali"
 msgstr "Bengaali"
 
-#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:143
 msgid "Bosnian"
 msgstr "Bosnian"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Catalan"
 msgstr "Kataloonia"
 
-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
 msgid "Valencian-Catalan"
 msgstr "Valentsia kataloonia"
 
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:233
 msgid "Czech"
 msgstr "Tšehhi"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
 msgid "Danish"
 msgstr "Taani"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:234
 msgid "German"
 msgstr "Saksa"
 
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154
 msgid "Dzongkha"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
+msgstr "Dzongkha"
+
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156
 msgid "Greek"
 msgstr "Kreeka"
 
-#: ../pidgin/gtkdialogs.c:156
-msgid "Australian English"
-msgstr "Austraalia inglise"
-
 #: ../pidgin/gtkdialogs.c:157
+msgid "Australian English"
+msgstr "Austraalia inglise"
+
+#: ../pidgin/gtkdialogs.c:158
 msgid "Canadian English"
 msgstr "Kanada inglise"
 
-#: ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:159
 msgid "British English"
 msgstr "Briti inglise"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:160
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "Spanish"
 msgstr "Hispaania"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:162
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:164
 msgid "Euskera(Basque)"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
-#: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:167
 msgid "Persian"
 msgstr "Pärsia"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:240
 msgid "Finnish"
 msgstr "Soome"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:244
 msgid "French"
 msgstr "Prantsuse"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:245
 msgid "Galician"
 msgstr "Galiitsia"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:173
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:173
 msgid "Gujarati Language Team"
 msgstr "Gujarati keelemeeskond"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:246
 msgid "Hebrew"
 msgstr "Heebrea"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:175
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:247
 msgid "Hungarian"
 msgstr "Ungari"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
 msgid "Indonesian"
 msgstr "Indoneesia"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:248
 msgid "Italian"
 msgstr "Itaalia"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:250 ../pidgin/gtkdialogs.c:251
 msgid "Japanese"
 msgstr "Jaapani"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:252
 msgid "Georgian"
 msgstr "Gruusia"
 
-#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:180
 msgid "Ubuntu Georgian Translators"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:180
+msgstr "Ubuntu Gruusia tõlkijad"
+
+#: ../pidgin/gtkdialogs.c:181
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181
 msgid "Kannada Translation team"
 msgstr "Kannada tõlkemeeskond"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:254
 msgid "Korean"
 msgstr "Korea"
 
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:185
 msgid "Kurdish"
 msgstr "Kurdi"
 
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:186
 msgid "Lao"
 msgstr "Lao"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:256
 msgid "Lithuanian"
 msgstr "Leedu"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:257
 msgid "Macedonian"
 msgstr "Makedoonia"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:259
 msgid "Bokmål Norwegian"
 msgstr "Norra (bokmål)"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192
 msgid "Nepali"
 msgstr "Nepaali"
 
-#: ../pidgin/gtkdialogs.c:192
-msgid "Dutch, Flemish"
-msgstr "Hollandi, Flaami"
-
 #: ../pidgin/gtkdialogs.c:193
+msgid "Dutch, Flemish"
+msgstr "Hollandi, Flaami"
+
+#: ../pidgin/gtkdialogs.c:194
 msgid "Norwegian Nynorsk"
 msgstr "Norra (nynorsk)"
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:195
+msgid "Punjabi"
+msgstr "Pandžabi"
+
+#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:260
 msgid "Polish"
 msgstr "Poola"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:199
 msgid "Portuguese"
 msgstr "Portugali"
 
-#: ../pidgin/gtkdialogs.c:198
-msgid "Portuguese-Brazil"
-msgstr "Portugali-Brasiilia"
-
-#: ../pidgin/gtkdialogs.c:199
-msgid "Pashto"
-msgstr ""
-
 #: ../pidgin/gtkdialogs.c:200
+msgid "Portuguese-Brazil"
+msgstr "Portugali-Brasiilia"
+
+#: ../pidgin/gtkdialogs.c:201
+msgid "Pashto"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:202
 msgid "Romanian"
 msgstr "Rumeenia"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:262
 msgid "Russian"
 msgstr "Vene"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:263 ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:265
 msgid "Slovak"
 msgstr "Slovaki"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:266
 msgid "Slovenian"
 msgstr "Sloveenia"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:207
 msgid "Albanian"
 msgstr "Albaania"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:267 ../pidgin/gtkdialogs.c:268
 msgid "Serbian"
 msgstr "Serbia"
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
-#: ../pidgin/gtkdialogs.c:267
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:270
 msgid "Swedish"
 msgstr "Rootsi"
 
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:211
 msgid "Tamil"
 msgstr "Tamili"
 
-#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:212
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:213
 msgid "Thai"
 msgstr "Tai"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:271
 msgid "Turkish"
 msgstr "Türgi"
 
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:215
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../pidgin/gtkdialogs.c:216
 msgid "Vietnamese"
 msgstr "Vietnami"
 
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:216
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh ja Gnome-Vi meeskond"
 
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:272
 msgid "Simplified Chinese"
 msgstr "Hiina lihtsustatud"
 
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
-msgid "Hong Kong Chinese"
-msgstr "Hong Kongi hiina"
-
 #: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:270
+#: ../pidgin/gtkdialogs.c:220
+msgid "Hong Kong Chinese"
+msgstr "Hong Kongi hiina"
+
+#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:273
 msgid "Traditional Chinese"
 msgstr "Hiina traditsiooniline"
 
-#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:228
 msgid "Amharic"
 msgstr "Amhari"
 
-#: ../pidgin/gtkdialogs.c:368
+#: ../pidgin/gtkdialogs.c:358
 #, c-format
 msgid "About %s"
 msgstr "%s - lähem teave"
 
-#: ../pidgin/gtkdialogs.c:411
+#: ../pidgin/gtkdialogs.c:394
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -14892,104 +15243,100 @@
 "autoritele. Autorite täielik nimekiri asub failis 'COPYRIGHT'. Programmil "
 "pole mitte mingisugust garantiid.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:429
+#: ../pidgin/gtkdialogs.c:412
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin serveris irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:434
+#: ../pidgin/gtkdialogs.c:417
 msgid "Current Developers"
 msgstr "Praegused arendajad"
 
-#: ../pidgin/gtkdialogs.c:449
+#: ../pidgin/gtkdialogs.c:432
 msgid "Crazy Patch Writers"
 msgstr "Hullunud parandustekirjutajad"
 
-#: ../pidgin/gtkdialogs.c:464
+#: ../pidgin/gtkdialogs.c:447
 msgid "Retired Developers"
 msgstr "Endised arendajad"
 
-#: ../pidgin/gtkdialogs.c:479
+#: ../pidgin/gtkdialogs.c:462
 msgid "Retired Crazy Patch Writers"
 msgstr "Endised hullunud parandustekirjutajad"
 
-#: ../pidgin/gtkdialogs.c:494
+#: ../pidgin/gtkdialogs.c:477
 msgid "Artists"
 msgstr "Kunstnikud"
 
-#: ../pidgin/gtkdialogs.c:509
+#: ../pidgin/gtkdialogs.c:492
 msgid "Current Translators"
 msgstr "Praegused tõlkijad"
 
-#: ../pidgin/gtkdialogs.c:529
+#: ../pidgin/gtkdialogs.c:512
 msgid "Past Translators"
 msgstr "Eelmised tõlkijad"
 
-#: ../pidgin/gtkdialogs.c:547
+#: ../pidgin/gtkdialogs.c:530
 msgid "Debugging Information"
 msgstr "Silumisandmed"
 
-#: ../pidgin/gtkdialogs.c:764 ../pidgin/gtkdialogs.c:907
-#: ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkdialogs.c:746 ../pidgin/gtkdialogs.c:885
+#: ../pidgin/gtkdialogs.c:966
 msgid "_Name"
 msgstr "_Nimi"
 
-#: ../pidgin/gtkdialogs.c:769
-msgid "Buddy"
-msgstr "Sõber"
-
-#: ../pidgin/gtkdialogs.c:773 ../pidgin/gtkdialogs.c:912
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:751 ../pidgin/gtkdialogs.c:890
+#: ../pidgin/gtkdialogs.c:971
 msgid "_Account"
 msgstr "_Konto"
 
-#: ../pidgin/gtkdialogs.c:920
+#: ../pidgin/gtkdialogs.c:898
 msgid "Get User Info"
 msgstr "Kasutaja andmete hankimine"
 
-#: ../pidgin/gtkdialogs.c:922
+#: ../pidgin/gtkdialogs.c:900
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr ""
 "Palun sisesta isiku ekraaninimi või alias, kelle andmeid sa soovid vaadata."
 
-#: ../pidgin/gtkdialogs.c:1012
+#: ../pidgin/gtkdialogs.c:990
 msgid "View User Log"
 msgstr "Kasutaja logi vaatamine"
 
-#: ../pidgin/gtkdialogs.c:1014
+#: ../pidgin/gtkdialogs.c:992
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr ""
 "Palun sisesta isiku ekraaninimi või alias, kelle logi sa soovid vaadata."
 
-#: ../pidgin/gtkdialogs.c:1034
+#: ../pidgin/gtkdialogs.c:1012
 msgid "Alias Contact"
-msgstr ""
+msgstr "Aliase kontakt"
+
+#: ../pidgin/gtkdialogs.c:1013
+msgid "Enter an alias for this contact."
+msgstr "Sisesta sellele kontaktile alias."
 
 #: ../pidgin/gtkdialogs.c:1035
-msgid "Enter an alias for this contact."
-msgstr "Sisesta sellele kontaktile alias."
-
-#: ../pidgin/gtkdialogs.c:1057
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Sisesta kasutajale %s alias."
 
-#: ../pidgin/gtkdialogs.c:1059
+#: ../pidgin/gtkdialogs.c:1037
 msgid "Alias Buddy"
 msgstr "Sõbrale aliase määramine"
 
-#: ../pidgin/gtkdialogs.c:1080
+#: ../pidgin/gtkdialogs.c:1058
 msgid "Alias Chat"
 msgstr "Vestluse alias"
 
-#: ../pidgin/gtkdialogs.c:1081
+#: ../pidgin/gtkdialogs.c:1059
 msgid "Enter an alias for this chat."
 msgstr "Aliase lisamine vestlusele."
 
-#: ../pidgin/gtkdialogs.c:1120
+#: ../pidgin/gtkdialogs.c:1098
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15000,30 +15347,31 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtkdialogs.c:1128
+#: ../pidgin/gtkdialogs.c:1106
 msgid "Remove Contact"
 msgstr "Kontakti eemaldamine"
 
-#: ../pidgin/gtkdialogs.c:1131
+#: ../pidgin/gtkdialogs.c:1109
 msgid "_Remove Contact"
 msgstr "_Eemalda kontakt"
 
-#: ../pidgin/gtkdialogs.c:1162
+#: ../pidgin/gtkdialogs.c:1140
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr ""
-
-#: ../pidgin/gtkdialogs.c:1169
+"Paistab, et sa proovid ühendada gruppi %s grupiga %s. Kas soovid jätkata?"
+
+#: ../pidgin/gtkdialogs.c:1147
 msgid "Merge Groups"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:1172
+msgstr "Gruppide ühendamine"
+
+#: ../pidgin/gtkdialogs.c:1150
 msgid "_Merge Groups"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:1222
+msgstr "Ühenda _grupid"
+
+#: ../pidgin/gtkdialogs.c:1200
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15032,15 +15380,15 @@
 "Sa oled eemaldamas gruppi %s ja kõiki selle liikmeid oma sõbranimekirjast. "
 "Kas sa soovid seda teha?"
 
-#: ../pidgin/gtkdialogs.c:1225
+#: ../pidgin/gtkdialogs.c:1203
 msgid "Remove Group"
 msgstr "Grupi eemaldamine"
 
-#: ../pidgin/gtkdialogs.c:1228
+#: ../pidgin/gtkdialogs.c:1206
 msgid "_Remove Group"
 msgstr "_Eemalda grupp"
 
-#: ../pidgin/gtkdialogs.c:1261
+#: ../pidgin/gtkdialogs.c:1239
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
@@ -15048,15 +15396,15 @@
 "Sa oled eemaldamas kasutajat %s oma sõbranimekirjast. Kas sa soovid seda "
 "teha?"
 
-#: ../pidgin/gtkdialogs.c:1264
+#: ../pidgin/gtkdialogs.c:1242
 msgid "Remove Buddy"
 msgstr "Sõbra eemaldamine"
 
-#: ../pidgin/gtkdialogs.c:1267
+#: ../pidgin/gtkdialogs.c:1245
 msgid "_Remove Buddy"
 msgstr "_Eemalda sõber"
 
-#: ../pidgin/gtkdialogs.c:1288
+#: ../pidgin/gtkdialogs.c:1266
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -15065,11 +15413,11 @@
 "Sa oled eemaldamas jututuba %s oma sõbranimekirjast.  Kas sa soovid seda "
 "teha?"
 
-#: ../pidgin/gtkdialogs.c:1291
+#: ../pidgin/gtkdialogs.c:1269
 msgid "Remove Chat"
 msgstr "Vestluse eemaldamine"
 
-#: ../pidgin/gtkdialogs.c:1294
+#: ../pidgin/gtkdialogs.c:1272
 msgid "_Remove Chat"
 msgstr "_Eemalda vestlus"
 
@@ -15081,23 +15429,23 @@
 msgid "Change Status"
 msgstr "Muuda olekut"
 
-#: ../pidgin/gtkdocklet.c:680
+#: ../pidgin/gtkdocklet.c:681
 msgid "Show Buddy List"
 msgstr "Sõbraloendi näitamine"
 
-#: ../pidgin/gtkdocklet.c:706
+#: ../pidgin/gtkdocklet.c:707
 msgid "New Message..."
 msgstr "Uus sõnum..."
 
-#: ../pidgin/gtkdocklet.c:721
+#: ../pidgin/gtkdocklet.c:722
 msgid "Mute Sounds"
 msgstr "Vaigista helid"
 
-#: ../pidgin/gtkdocklet.c:728
+#: ../pidgin/gtkdocklet.c:729
 msgid "Blink on New Message"
 msgstr "Vilkumine uue sõnumi korral"
 
-#: ../pidgin/gtkdocklet.c:738
+#: ../pidgin/gtkdocklet.c:739
 msgid "Quit"
 msgstr "Lõpeta"
 
@@ -15164,80 +15512,117 @@
 msgid "Time Remaining:"
 msgstr "Aega jäänud:"
 
-#: ../pidgin/gtkft.c:784
+#: ../pidgin/gtkft.c:781
 msgid "Close this window when all transfers _finish"
 msgstr "See aken sule_takse ülekannete lõppemisel"
 
-#: ../pidgin/gtkft.c:794
+#: ../pidgin/gtkft.c:791
 msgid "C_lear finished transfers"
 msgstr "_Lõpetatud ülekanded puhastatakse"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:803
+#: ../pidgin/gtkft.c:800
 msgid "File transfer _details"
 msgstr "Failiülekande ü_ksikasjad"
 
 #. Pause button
-#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
+#: ../pidgin/gtkft.c:818 ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "Pa_us"
 
 #. Resume button
-#: ../pidgin/gtkft.c:843
+#: ../pidgin/gtkft.c:823
 msgid "_Resume"
 msgstr "_Jätka"
 
-#: ../pidgin/gtkimhtml.c:815
+#: ../pidgin/gtkimhtml.c:816
 msgid "Paste as Plain _Text"
 msgstr "Aseta _lihttekstina"
 
-#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1199
+#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1197
 msgid "_Reset formatting"
 msgstr "_Puhasta vormindus"
 
-#: ../pidgin/gtkimhtml.c:1359
+#: ../pidgin/gtkimhtml.c:1391
 msgid "Hyperlink color"
 msgstr "Hüperviida värv"
 
-#: ../pidgin/gtkimhtml.c:1360
+#: ../pidgin/gtkimhtml.c:1392
 msgid "Color to draw hyperlinks."
 msgstr "Hüperviitade joonistamise värv."
 
-#: ../pidgin/gtkimhtml.c:1363
+#: ../pidgin/gtkimhtml.c:1395
 msgid "Hyperlink prelight color"
 msgstr "Hüperviida värv fookuses"
 
-#: ../pidgin/gtkimhtml.c:1364
+#: ../pidgin/gtkimhtml.c:1396
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Hüperviitade joonistamise värv hiirekursori fookuse korral."
 
-#: ../pidgin/gtkimhtml.c:1581
+#: ../pidgin/gtkimhtml.c:1399 ../pidgin/plugins/pidginrc.c:52
+msgid "Sent Message Name Color"
+msgstr "Nime värvus saadetud sõnumites"
+
+#: ../pidgin/gtkimhtml.c:1400
+msgid "Color to draw the name of a message you sent."
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1403 ../pidgin/plugins/pidginrc.c:53
+msgid "Received Message Name Color"
+msgstr "Nime värvus vastuvõetud sõnumites"
+
+#: ../pidgin/gtkimhtml.c:1404
+msgid "Color to draw the name of a message you received."
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1407
+msgid "\"Attention\" Name Color"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1408
+msgid "Color to draw the name of a message you received containing your name."
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1411 ../pidgin/plugins/pidginrc.c:55
+msgid "Action Message Name Color"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1412
+msgid "Color to draw the name of an action message."
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1632
 msgid "_Copy E-Mail Address"
 msgstr "_Kopeeri e-posti aadress"
 
-#: ../pidgin/gtkimhtml.c:1593
+#: ../pidgin/gtkimhtml.c:1644
 msgid "_Open Link in Browser"
 msgstr "_Ava viit veebisirvijas"
 
-#: ../pidgin/gtkimhtml.c:1603
+#: ../pidgin/gtkimhtml.c:1654
 msgid "_Copy Link Location"
 msgstr "_Kopeeri viida asukoht"
 
-#: ../pidgin/gtkimhtml.c:3353
+#: ../pidgin/gtkimhtml.c:3421
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
-
-#: ../pidgin/gtkimhtml.c:3356
+"<span size='larger' weight='bold'>Tundmatu failitüüp</span>\n"
+"\n"
+"Vaikimisi on selleks PNG."
+
+#: ../pidgin/gtkimhtml.c:3424
 msgid ""
 "Unrecognized file type\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
-
-#: ../pidgin/gtkimhtml.c:3385
+"Tundmatu failitüüp\n"
+"Vaikimisi on selleks PNG."
+
+#: ../pidgin/gtkimhtml.c:3453
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15248,7 +15633,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3388
+#: ../pidgin/gtkimhtml.c:3456
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15259,15 +15644,15 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3466 ../pidgin/gtkimhtml.c:3478
+#: ../pidgin/gtkimhtml.c:3537 ../pidgin/gtkimhtml.c:3549
 msgid "Save Image"
 msgstr "Pildi salvestamine"
 
-#: ../pidgin/gtkimhtml.c:3506
+#: ../pidgin/gtkimhtml.c:3577
 msgid "_Save Image..."
 msgstr "_Salvesta pilt..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:163
+#: ../pidgin/gtkimhtmltoolbar.c:164
 msgid "Select Font"
 msgstr "Kirjatüübi valimine"
 
@@ -15275,174 +15660,181 @@
 msgid "Select Text Color"
 msgstr "Teksti värvuse valimine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:323
+#: ../pidgin/gtkimhtmltoolbar.c:324
 msgid "Select Background Color"
 msgstr "Taustavärvuse valimine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:412
+#: ../pidgin/gtkimhtmltoolbar.c:413
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: ../pidgin/gtkimhtmltoolbar.c:421
 msgid "_Description"
 msgstr "_Kirjeldus"
 
-#: ../pidgin/gtkimhtmltoolbar.c:423
+#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr ""
 "Palun sisesta lisatava viida URL ja kirjeldus. Kirjeldus ei ole kohustuslik."
 
-#: ../pidgin/gtkimhtmltoolbar.c:427
+#: ../pidgin/gtkimhtmltoolbar.c:428
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Palun sisesta URL, mida soovid lisada."
 
-#: ../pidgin/gtkimhtmltoolbar.c:432 ../pidgin/gtkimhtmltoolbar.c:1106
+#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Insert Link"
 msgstr "Viida lisamine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:436 ../pidgin/gtkimhtmltoolbar.c:1267
+#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtkimhtmltoolbar.c:1265
 msgid "_Insert"
 msgstr "L_isa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:516
+#: ../pidgin/gtkimhtmltoolbar.c:518
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Tõrge pildi salvestamisel: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:542 ../pidgin/gtkimhtmltoolbar.c:552
+#: ../pidgin/gtkimhtmltoolbar.c:544 ../pidgin/gtkimhtmltoolbar.c:554
 msgid "Insert Image"
 msgstr "Pildi lisamine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:765
+#: ../pidgin/gtkimhtmltoolbar.c:712
+msgid "Smile!"
+msgstr "Tujunäod"
+
+#: ../pidgin/gtkimhtmltoolbar.c:764
 msgid "This theme has no available smileys."
 msgstr "Selles teemas pole tujunägusid"
 
-#. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:782
-msgid "Smile!"
-msgstr "Tujunäod"
-
-#: ../pidgin/gtkimhtmltoolbar.c:850 ../pidgin/gtkimhtmltoolbar.c:1224
+#: ../pidgin/gtkimhtmltoolbar.c:848 ../pidgin/gtkimhtmltoolbar.c:1222
 msgid "_Font"
 msgstr "Kir_jatüüp"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1058
+#: ../pidgin/gtkimhtmltoolbar.c:1056
 msgid "Group Items"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1058
+#: ../pidgin/gtkimhtmltoolbar.c:1056
 msgid "Ungroup Items"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:342
 msgid "Bold"
 msgstr "Rasvane"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1091 ../pidgin/plugins/convcolors.c:351
 msgid "Italic"
 msgstr "Kursiiv"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:360
 msgid "Underline"
 msgstr "Allajoonitud"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1095
+#: ../pidgin/gtkimhtmltoolbar.c:1093
 msgid "Strikethrough"
 msgstr "Läbijoonitud"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
+#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Increase Font Size"
 msgstr "Kirjatüübi suuruse suurendamine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
+#: ../pidgin/gtkimhtmltoolbar.c:1096
 msgid "Decrease Font Size"
 msgstr "Kirjatüübi suuruse vähendamine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
+#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Font Face"
 msgstr "Kirjatüüp"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1101
+#: ../pidgin/gtkimhtmltoolbar.c:1099
 msgid "Background Color"
 msgstr "Taustavärvus"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1102
+#: ../pidgin/gtkimhtmltoolbar.c:1100
 msgid "Foreground Color"
 msgstr "Teksti värvus"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
+#: ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Reset Formatting"
 msgstr "Vorminduse algväärtustamine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1107
+#: ../pidgin/gtkimhtmltoolbar.c:1105
 msgid "Insert IM Image"
 msgstr "Välksõnumipildi lisamine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1108
+#: ../pidgin/gtkimhtmltoolbar.c:1106
 msgid "Insert Smiley"
 msgstr "Tujunäo lisamine"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1182
+msgid "<b>_Bold</b>"
+msgstr "<b>_Rasvane</b>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1183
+msgid "<i>_Italic</i>"
+msgstr "<i>_Kursiiv</i>"
+
 #: ../pidgin/gtkimhtmltoolbar.c:1184
-msgid "<b>_Bold</b>"
-msgstr "<b>_Rasvane</b>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1185
-msgid "<i>_Italic</i>"
-msgstr "<i>_Kursiiv</i>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "<u>_Underline</u>"
 msgstr "<u>_Allajoonitud</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>Läbijoonitud</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1188
+#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>S_uurem</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1190
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "_Normal"
 msgstr "_Tavaline"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1192
+#: ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>_Väiksem</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1196
+#: ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "_Font face"
 msgstr "Ki_rjatüüp"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1197
+#: ../pidgin/gtkimhtmltoolbar.c:1195
 msgid "Foreground _color"
 msgstr "_Teksti värvus"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1198
+#: ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "Bac_kground color"
 msgstr "Tau_stavärvus"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1275
+#: ../pidgin/gtkimhtmltoolbar.c:1273
 msgid "_Image"
 msgstr "_Pilt"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1281
+#: ../pidgin/gtkimhtmltoolbar.c:1279
 msgid "_Link"
 msgstr "_Viit"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1287
+#: ../pidgin/gtkimhtmltoolbar.c:1285
 msgid "_Horizontal rule"
 msgstr "_Rõhtjoon"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1309
+#: ../pidgin/gtkimhtmltoolbar.c:1307
 msgid "_Smile!"
 msgstr "_Tujunägu!"
 
+#: ../pidgin/gtklog.c:245
+msgid "Log Deletion Failed"
+msgstr "Tõrge logi kustutamisel"
+
+#: ../pidgin/gtklog.c:246
+msgid "Check permissions and try again."
+msgstr "Kontrolli õiguseid ja proovi uuesti."
+
 #: ../pidgin/gtklog.c:293
 #, c-format
 msgid ""
@@ -15464,6 +15856,14 @@
 "s?"
 msgstr ""
 
+#: ../pidgin/gtklog.c:324
+msgid "Delete Log?"
+msgstr "Kas kustutada logi?"
+
+#: ../pidgin/gtklog.c:335
+msgid "Delete Log..."
+msgstr "Kustuta logi..."
+
 #: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
@@ -15474,62 +15874,17 @@
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Vestlused kasutajaga %s, %s</span>"
 
-#: ../pidgin/gtklog.c:503
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: ../pidgin/gtklog.c:550
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-
-#: ../pidgin/gtklog.c:554
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-
-#: ../pidgin/gtklog.c:557
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-"Vestluseid logitakse ainult juhul, kui eelistus \"Kõiki vestlusi logitakse\" "
-"on märgitud."
-
-#: ../pidgin/gtklog.c:561
-msgid "No logs were found"
-msgstr "Logisid ei leitud"
-
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:576
+#: ../pidgin/gtklog.c:581
 msgid "_Browse logs folder"
 msgstr "_Sirvi logide kausta"
 
-#: ../pidgin/gtklog.c:640
-msgid "Total log size:"
-msgstr "Logide kogusuurus:"
-
-#: ../pidgin/gtklog.c:714
-#, c-format
-msgid "Conversations in %s"
-msgstr "Vestlused %s peal"
-
-#: ../pidgin/gtklog.c:722 ../pidgin/gtklog.c:793
-#, c-format
-msgid "Conversations with %s"
-msgstr "Vestlused - %s"
-
-#: ../pidgin/gtklog.c:823
-msgid "System Log"
-msgstr "Süsteemne logi"
-
 #: ../pidgin/gtkmain.c:398
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Lähema teabe saamiseks kasuta `%s -h'.\n"
 
-#: ../pidgin/gtkmain.c:400
+#: ../pidgin/gtkmain.c:401
 #, c-format
 msgid ""
 "%s %s\n"
@@ -15562,7 +15917,38 @@
 "  -v, --version          käesoleva versiooni kuvamine ja programmi töö\n"
 "                         lõpetamine\n"
 
-#: ../pidgin/gtkmain.c:528
+#: ../pidgin/gtkmain.c:413
+#, c-format
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, separated by commas)\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s %s\n"
+"Kasutamine: %s [VÕTI]...\n"
+"\n"
+"  -c, --config=KATALOOG  KATALOOGi kasutamine seadistusfailide jaoks\n"
+"  -d, --debug            silumisteadete väljastamine standardväljundisse\n"
+"  -h, --help             selle abiteabe kuvamine ja programmi töö "
+"lõpetamine\n"
+"  -m, --multiple         ühe instantsi käivitamise reegli eiramine\n"
+"  -n, --nologin          automaatse sisselogimise keelamine\n"
+"  -l, --login[=NIMI]     automaatne sisselogimine (valikuline parameeter "
+"NIMI\n"
+"                         määrab komadega eraldatud loendi abil kasutatavad\n"
+"                         kontod)\n"
+"  -v, --version          käesoleva versiooni kuvamine ja programmi töö\n"
+"                         lõpetamine\n"
+
+#: ../pidgin/gtkmain.c:540
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -15586,75 +15972,75 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:718 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:731 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:350
+#: ../pidgin/gtknotify.c:354
 msgid "Open All Messages"
 msgstr "Ava kõik sõnumid"
 
-#: ../pidgin/gtknotify.c:403
+#: ../pidgin/gtknotify.c:408
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Sulle on e-sõnum!</span>"
 
-#: ../pidgin/gtknotify.c:546
+#: ../pidgin/gtknotify.c:551
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s sai %d uue sõnumi."
 msgstr[1] "%s sai %d uut sõnumit."
 
-#: ../pidgin/gtknotify.c:570
+#: ../pidgin/gtknotify.c:575
 #, c-format
 msgid "<b>%d new e-mail.</b>"
 msgid_plural "<b>%d new e-mails.</b>"
 msgstr[0] "<b>%d uus e-sõnum.</b>"
 msgstr[1] "<b>%d uut e-sõnumit.</b>"
 
-#: ../pidgin/gtknotify.c:998
+#: ../pidgin/gtknotify.c:1008
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Sirvija käsk \"%s\" on vigane."
 
-#: ../pidgin/gtknotify.c:1000 ../pidgin/gtknotify.c:1012
-#: ../pidgin/gtknotify.c:1025 ../pidgin/gtknotify.c:1153
+#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1022
+#: ../pidgin/gtknotify.c:1035 ../pidgin/gtknotify.c:1172
 msgid "Unable to open URL"
 msgstr "URL-i pole võimalik avada"
 
-#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1023
+#: ../pidgin/gtknotify.c:1020 ../pidgin/gtknotify.c:1033
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Viga \"%s\" käivitamisel: %s"
 
-#: ../pidgin/gtknotify.c:1154
+#: ../pidgin/gtknotify.c:1173
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:265
+#: ../pidgin/gtkplugin.c:266
 msgid "The following plugins will be unloaded."
 msgstr "Järgnevad pluginad laaditakse mälust välja."
 
-#: ../pidgin/gtkplugin.c:284
+#: ../pidgin/gtkplugin.c:285
 msgid "Multiple plugins will be unloaded."
 msgstr "Mitu pluginat laaditakse mälust välja."
 
-#: ../pidgin/gtkplugin.c:288
+#: ../pidgin/gtkplugin.c:289
 msgid "Unload Plugins"
 msgstr "Pluginate väljalaadimine"
 
-#: ../pidgin/gtkplugin.c:308
+#: ../pidgin/gtkplugin.c:309
 msgid "Could not unload plugin"
 msgstr "Pluginat pole võimalik välja laadida"
 
-#: ../pidgin/gtkplugin.c:309
+#: ../pidgin/gtkplugin.c:310
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:417
+#: ../pidgin/gtkplugin.c:418
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -15665,7 +16051,7 @@
 "<span weight=\"bold\">Veebisait:</span>\t\t%s\n"
 "<span weight=\"bold\">Failinimi:</span>\t\t%s"
 
-#: ../pidgin/gtkplugin.c:427
+#: ../pidgin/gtkplugin.c:428
 #, c-format
 msgid ""
 "%s\n"
@@ -15676,11 +16062,11 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Viga: %s\n"
 "Uuenduse jaoks kontrollu plugina veebisaiti.</span>"
 
-#: ../pidgin/gtkplugin.c:562
+#: ../pidgin/gtkplugin.c:606
 msgid "Configure Pl_ugin"
 msgstr "Seadista pl_uginat"
 
-#: ../pidgin/gtkplugin.c:625
+#: ../pidgin/gtkplugin.c:673
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Plugina üksikasjad</b>"
 
@@ -15689,112 +16075,107 @@
 msgstr "Faili valimine"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:547
+#: ../pidgin/gtkpounce.c:539
 msgid "Pounce on Whom"
 msgstr "Kellest märku antakse"
 
-#: ../pidgin/gtkpounce.c:574
+#: ../pidgin/gtkpounce.c:566
 msgid "_Buddy name:"
 msgstr "Sõbra _nimi:"
 
-#: ../pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:600
 msgid "Si_gns on"
 msgstr "Lo_gib sisse"
 
-#: ../pidgin/gtkpounce.c:610
+#: ../pidgin/gtkpounce.c:602
 msgid "Signs o_ff"
 msgstr "Logib _välja"
 
+#: ../pidgin/gtkpounce.c:604
+msgid "Goes a_way"
+msgstr "_Eemaldub"
+
+#: ../pidgin/gtkpounce.c:606
+msgid "Ret_urns from away"
+msgstr "Pöörd_ub eemalolekust tagasi"
+
+#: ../pidgin/gtkpounce.c:608
+msgid "Becomes _idle"
+msgstr "Jääb _jõude"
+
+#: ../pidgin/gtkpounce.c:610
+msgid "Is no longer i_dle"
+msgstr "Naaseb jõude_olekust"
+
 #: ../pidgin/gtkpounce.c:612
-msgid "Goes a_way"
-msgstr "_Eemaldub"
+msgid "Starts _typing"
+msgstr "Alustab ti_ppimist"
 
 #: ../pidgin/gtkpounce.c:614
-msgid "Ret_urns from away"
-msgstr "Pöörd_ub eemalolekust tagasi"
+msgid "P_auses while typing"
+msgstr "Peab t_ippimisel pausi"
 
 #: ../pidgin/gtkpounce.c:616
-msgid "Becomes _idle"
-msgstr "Jääb _jõude"
+msgid "Stops t_yping"
+msgstr "Lõpetab _tippimise"
 
 #: ../pidgin/gtkpounce.c:618
-msgid "Is no longer i_dle"
-msgstr "Naaseb jõude_olekust"
-
-#: ../pidgin/gtkpounce.c:620
-msgid "Starts _typing"
-msgstr "Alustab ti_ppimist"
-
-#: ../pidgin/gtkpounce.c:622
-msgid "P_auses while typing"
-msgstr "Peab t_ippimisel pausi"
-
-#: ../pidgin/gtkpounce.c:624
-msgid "Stops t_yping"
-msgstr "Lõpetab _tippimise"
-
-#: ../pidgin/gtkpounce.c:626
 msgid "Sends a _message"
 msgstr "Saada_b sõnumi"
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:661
 msgid "Ope_n an IM window"
 msgstr "_Avatakse välksõnumi aken"
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:663
 msgid "_Pop up a notification"
 msgstr "Kuvatakse teavituse _hüpikakent"
 
-#: ../pidgin/gtkpounce.c:673
+#: ../pidgin/gtkpounce.c:665
 msgid "Send a _message"
 msgstr "Saa_detakse sõnum"
 
-#: ../pidgin/gtkpounce.c:675
+#: ../pidgin/gtkpounce.c:667
 msgid "E_xecute a command"
 msgstr "_Käivitatakse käsk"
 
+#: ../pidgin/gtkpounce.c:669
+msgid "P_lay a sound"
+msgstr "Mängitakse _heli"
+
+#: ../pidgin/gtkpounce.c:675
+msgid "Brows_e..."
+msgstr "_Sirvi..."
+
 #: ../pidgin/gtkpounce.c:677
-msgid "P_lay a sound"
-msgstr "Mängitakse _heli"
-
-#: ../pidgin/gtkpounce.c:683
-msgid "Brows_e..."
-msgstr "_Sirvi..."
-
-#: ../pidgin/gtkpounce.c:685
 msgid "Br_owse..."
 msgstr "_Sirvi..."
 
-#: ../pidgin/gtkpounce.c:686
+#: ../pidgin/gtkpounce.c:678
 msgid "Pre_view"
 msgstr "_Eelvaade"
 
-#: ../pidgin/gtkpounce.c:818
+#: ../pidgin/gtkpounce.c:810
 msgid "P_ounce only when my status is not Available"
 msgstr "_Märguanne ainult juhul, kui minu olekuks on \"pole saadaval\""
 
-#: ../pidgin/gtkpounce.c:823
+#: ../pidgin/gtkpounce.c:815
 msgid "_Recurring"
 msgstr "_Korduv"
 
-#: ../pidgin/gtkpounce.c:1266
+#: ../pidgin/gtkpounce.c:1259
 msgid "Pounce Target"
 msgstr "Kelle kohta"
 
-#: ../pidgin/gtkprefs.c:386
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-msgid "Default"
-msgstr "Vaikimisi"
-
-#: ../pidgin/gtkprefs.c:517
+#: ../pidgin/gtkprefs.c:458
 msgid "Smiley theme failed to unpack."
 msgstr "Tõrge tujunägude teema lahtipakkimisel"
 
-#: ../pidgin/gtkprefs.c:644
+#: ../pidgin/gtkprefs.c:593
 msgid "Install Theme"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:698
+#: ../pidgin/gtkprefs.c:646
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -15802,136 +16183,136 @@
 "Vali allolevast loendist tujunägude teema, mida sa soovid kasutada. Uusi "
 "teemasid saab paigaldada lohistades neid teemade nimekirja."
 
-#: ../pidgin/gtkprefs.c:733
+#: ../pidgin/gtkprefs.c:681
 msgid "Icon"
 msgstr "Ikoon"
 
-#: ../pidgin/gtkprefs.c:895
+#: ../pidgin/gtkprefs.c:843
 msgid "System Tray Icon"
 msgstr "Süsteemisalve ikoon"
 
-#: ../pidgin/gtkprefs.c:896
+#: ../pidgin/gtkprefs.c:844
 msgid "_Show system tray icon:"
 msgstr "Süsteemisalve _ikooni näidatakse:"
 
-#: ../pidgin/gtkprefs.c:899
+#: ../pidgin/gtkprefs.c:847
 msgid "On unread messages"
 msgstr "Lugemata sõnumite korral"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:853
 msgid "Conversation Window Hiding"
 msgstr "Vestlusakna peitmine"
 
-#: ../pidgin/gtkprefs.c:906
+#: ../pidgin/gtkprefs.c:854
 msgid "_Hide new IM conversations:"
 msgstr "Välksõnumivestlused _peidetakse:"
 
-#: ../pidgin/gtkprefs.c:909 ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:857 ../pidgin/gtkprefs.c:1965
 msgid "When away"
 msgstr "Kui olen eemal"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:917
+#: ../pidgin/gtkprefs.c:865
 msgid "Tabs"
 msgstr "Kaardid"
 
-#: ../pidgin/gtkprefs.c:919
+#: ../pidgin/gtkprefs.c:867
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "_Välksõnumeid ja vestlusi näidatakse kaartidega aknas"
 
-#: ../pidgin/gtkprefs.c:933
+#: ../pidgin/gtkprefs.c:881
 msgid "Show close b_utton on tabs"
 msgstr "Sakkidel näidatakse sul_gemisnuppu"
 
-#: ../pidgin/gtkprefs.c:936
+#: ../pidgin/gtkprefs.c:884
 msgid "_Placement:"
 msgstr "_Asetus:"
 
-#: ../pidgin/gtkprefs.c:938
+#: ../pidgin/gtkprefs.c:886
 msgid "Top"
 msgstr "Üleval"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:887
 msgid "Bottom"
 msgstr "All"
 
-#: ../pidgin/gtkprefs.c:940
+#: ../pidgin/gtkprefs.c:888
 msgid "Left"
 msgstr "Vasakul"
 
-#: ../pidgin/gtkprefs.c:941
+#: ../pidgin/gtkprefs.c:889
 msgid "Right"
 msgstr "Paremal"
 
-#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:891
 msgid "Left Vertical"
 msgstr "Vertikaalselt vasakul"
 
-#: ../pidgin/gtkprefs.c:944
+#: ../pidgin/gtkprefs.c:892
 msgid "Right Vertical"
 msgstr "Vertikaalselt paremal"
 
-#: ../pidgin/gtkprefs.c:951
+#: ../pidgin/gtkprefs.c:899
 msgid "N_ew conversations:"
 msgstr "_Uued vestlused:"
 
-#: ../pidgin/gtkprefs.c:997
+#: ../pidgin/gtkprefs.c:944
 msgid "Show _formatting on incoming messages"
 msgstr "Sissetulevatel sõnumitel _näidatakse vormindust"
 
-#: ../pidgin/gtkprefs.c:999
+#: ../pidgin/gtkprefs.c:946
 msgid "Close IMs immediately when the tab is closed"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1002
+#: ../pidgin/gtkprefs.c:949
 msgid "Show _detailed information"
-msgstr "_Näita üksikasjalisi andmeid"
-
-#: ../pidgin/gtkprefs.c:1004
+msgstr "_Näidatakse üksikasjalisi andmeid"
+
+#: ../pidgin/gtkprefs.c:951
 msgid "Enable buddy ic_on animation"
 msgstr "Sõbrai_koonidel on animatsioon lubatud"
 
-#: ../pidgin/gtkprefs.c:1011
+#: ../pidgin/gtkprefs.c:958
 msgid "_Notify buddies that you are typing to them"
 msgstr "Sõpru _teavitatakse, kui sa oled neile sõnumit kirjutamas"
 
-#: ../pidgin/gtkprefs.c:1014
+#: ../pidgin/gtkprefs.c:961
 msgid "Highlight _misspelled words"
 msgstr "Õigekirjaprobleemidega sõnad tõstetakse _esile"
 
-#: ../pidgin/gtkprefs.c:1018
+#: ../pidgin/gtkprefs.c:965
 msgid "Use smooth-scrolling"
 msgstr "Kasutatakse pehmet kerimist"
 
-#: ../pidgin/gtkprefs.c:1021
+#: ../pidgin/gtkprefs.c:968
 msgid "F_lash window when IMs are received"
 msgstr "Välksõnumite vastuvõtmisel vilgutatakse _aknaid"
 
-#: ../pidgin/gtkprefs.c:1023
+#: ../pidgin/gtkprefs.c:970
 msgid "Minimi_ze new conversation windows"
 msgstr "Uute vestluste aknad _minimeeritakse"
 
-#: ../pidgin/gtkprefs.c:1027
+#: ../pidgin/gtkprefs.c:974
 msgid "Font"
 msgstr "Kirjatüüp"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:976
 msgid "Use document font from _theme"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1031
+#: ../pidgin/gtkprefs.c:978
 msgid "Use font from _theme"
 msgstr "Kasutatakse _teemast võetud kirjatüüpi"
 
-#: ../pidgin/gtkprefs.c:1033
+#: ../pidgin/gtkprefs.c:984
 msgid "Conversation _font:"
 msgstr "Vestluse kir_jatüüp:"
 
-#: ../pidgin/gtkprefs.c:1047
+#: ../pidgin/gtkprefs.c:991
 msgid "Default Formatting"
 msgstr "Vaikimisi vormindus"
 
-#: ../pidgin/gtkprefs.c:1066
+#: ../pidgin/gtkprefs.c:1010
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -15939,59 +16320,63 @@
 "Nii paistab sinu väljuv sõnum juhul, kui sa kasutad vormindamist toetavat "
 "protokolli."
 
-#: ../pidgin/gtkprefs.c:1126
+#: ../pidgin/gtkprefs.c:1070
 msgid "Cannot start proxy configuration program."
 msgstr "Proksi seadistusprogrammi pole võimalik käivitada."
 
-#: ../pidgin/gtkprefs.c:1138
+#: ../pidgin/gtkprefs.c:1082
 msgid "Cannot start browser configuration program."
 msgstr "Veebisirvija seadistusprogrammi pole võimalik käivitada."
 
-#: ../pidgin/gtkprefs.c:1158
+#: ../pidgin/gtkprefs.c:1102
 msgid "ST_UN server:"
 msgstr "ST_UN server:"
 
-#: ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkprefs.c:1114
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Näide: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1174
+#: ../pidgin/gtkprefs.c:1118
 msgid "_Autodetect IP address"
 msgstr "IP-aadress tuvastatakse _automaatselt"
 
-#: ../pidgin/gtkprefs.c:1183
+#: ../pidgin/gtkprefs.c:1127
 msgid "Public _IP:"
 msgstr "Avalik _IP:"
 
-#: ../pidgin/gtkprefs.c:1214
+#: ../pidgin/gtkprefs.c:1158
 msgid "Ports"
 msgstr "Pordid"
 
-#: ../pidgin/gtkprefs.c:1217
+#: ../pidgin/gtkprefs.c:1161
+msgid "_Enable automatic router port forwarding"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1164
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Kuulatavate portide vahemik määratakse käsitsi"
 
-#: ../pidgin/gtkprefs.c:1220
+#: ../pidgin/gtkprefs.c:1167
 msgid "_Start port:"
 msgstr "Al_gusport:"
 
-#: ../pidgin/gtkprefs.c:1227
+#: ../pidgin/gtkprefs.c:1174
 msgid "_End port:"
 msgstr "_Lõpuport:"
 
-#: ../pidgin/gtkprefs.c:1235
+#: ../pidgin/gtkprefs.c:1182
 msgid "Proxy Server &amp; Browser"
 msgstr "Proksi server ja veebisirvija"
 
-#: ../pidgin/gtkprefs.c:1243
+#: ../pidgin/gtkprefs.c:1190
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr "<b>Proksi seadistamisprogrammi ei leitud.</b>"
 
-#: ../pidgin/gtkprefs.c:1251
+#: ../pidgin/gtkprefs.c:1198
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr "<b>Veebisirvija seadistamisprogrammi ei leitud.</b>"
 
-#: ../pidgin/gtkprefs.c:1256
+#: ../pidgin/gtkprefs.c:1203
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
@@ -15999,95 +16384,99 @@
 "Proksi server ja veebisirvija on määratud\n"
 "GNOME eelistustes"
 
-#: ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkprefs.c:1210
 msgid "Configure _Proxy"
 msgstr "Seadista _proksit"
 
-#: ../pidgin/gtkprefs.c:1268
+#: ../pidgin/gtkprefs.c:1215
 msgid "Configure _Browser"
 msgstr "Seadista _veebisirvijat"
 
-#: ../pidgin/gtkprefs.c:1274
+#: ../pidgin/gtkprefs.c:1221
 msgid "Proxy Server"
 msgstr "Proksi server"
 
-#: ../pidgin/gtkprefs.c:1279
+#: ../pidgin/gtkprefs.c:1226
 msgid "No proxy"
 msgstr "Proksi puudub"
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1282
 msgid "_User:"
 msgstr "Kasuta_ja:"
 
-#: ../pidgin/gtkprefs.c:1423
+#: ../pidgin/gtkprefs.c:1370
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1424
+#: ../pidgin/gtkprefs.c:1371
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1425
+#: ../pidgin/gtkprefs.c:1372
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1426
+#: ../pidgin/gtkprefs.c:1373
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1427
+#: ../pidgin/gtkprefs.c:1374
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1428
+#: ../pidgin/gtkprefs.c:1375
+msgid "Desktop Default"
+msgstr "Töölaua vaikeväärtus"
+
+#: ../pidgin/gtkprefs.c:1376
 msgid "GNOME Default"
 msgstr "GNOME vaikimisi"
 
-#: ../pidgin/gtkprefs.c:1429
+#: ../pidgin/gtkprefs.c:1377
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1378
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1431
+#: ../pidgin/gtkprefs.c:1379
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1432
+#: ../pidgin/gtkprefs.c:1380
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1441
+#: ../pidgin/gtkprefs.c:1389
 msgid "Manual"
 msgstr "Käsitsi"
 
-#: ../pidgin/gtkprefs.c:1494
+#: ../pidgin/gtkprefs.c:1450
 msgid "Browser Selection"
 msgstr "Veebisirvija valimine"
 
-#: ../pidgin/gtkprefs.c:1498
+#: ../pidgin/gtkprefs.c:1454
 msgid "_Browser:"
 msgstr "Si_rvija:"
 
-#: ../pidgin/gtkprefs.c:1506
+#: ../pidgin/gtkprefs.c:1462
 msgid "_Open link in:"
 msgstr "_Viidad avatakse:"
 
-#: ../pidgin/gtkprefs.c:1508
+#: ../pidgin/gtkprefs.c:1464
 msgid "Browser default"
 msgstr "Veebisirvija vaikimisi sätted"
 
-#: ../pidgin/gtkprefs.c:1509
+#: ../pidgin/gtkprefs.c:1465
 msgid "Existing window"
 msgstr "Olemasolevasse aknasse"
 
-#: ../pidgin/gtkprefs.c:1511
+#: ../pidgin/gtkprefs.c:1467
 msgid "New tab"
 msgstr "Uuele kaardile"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1484
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16096,63 +16485,63 @@
 "_Käsitsi:\n"
 "(%s URL-i jaoks)"
 
-#: ../pidgin/gtkprefs.c:1566
+#: ../pidgin/gtkprefs.c:1510
 msgid "Log _format:"
 msgstr "Logi_vorming:"
 
-#: ../pidgin/gtkprefs.c:1571
+#: ../pidgin/gtkprefs.c:1515
 msgid "Log all _instant messages"
 msgstr "Kõiki välksõnumeid _logitakse"
 
-#: ../pidgin/gtkprefs.c:1573
+#: ../pidgin/gtkprefs.c:1517
 msgid "Log all c_hats"
 msgstr "Kõiki _vestlusi logitakse"
 
-#: ../pidgin/gtkprefs.c:1575
+#: ../pidgin/gtkprefs.c:1519
 msgid "Log all _status changes to system log"
 msgstr "Kõiki _olekumuutusi logitakse süsteemsesse logisse"
 
-#: ../pidgin/gtkprefs.c:1725
+#: ../pidgin/gtkprefs.c:1669
 msgid "Sound Selection"
 msgstr "Heli valimine"
 
-#: ../pidgin/gtkprefs.c:1735
+#: ../pidgin/gtkprefs.c:1679
 msgid "Quietest"
 msgstr "Vaikseim"
 
-#: ../pidgin/gtkprefs.c:1737
+#: ../pidgin/gtkprefs.c:1681
 msgid "Quieter"
 msgstr "Vaiksem"
 
-#: ../pidgin/gtkprefs.c:1739
+#: ../pidgin/gtkprefs.c:1683
 msgid "Quiet"
 msgstr "Vaikne"
 
-#: ../pidgin/gtkprefs.c:1743
+#: ../pidgin/gtkprefs.c:1687
 msgid "Loud"
 msgstr "Valju"
 
-#: ../pidgin/gtkprefs.c:1745
+#: ../pidgin/gtkprefs.c:1689
 msgid "Louder"
 msgstr "Valjem"
 
-#: ../pidgin/gtkprefs.c:1747
+#: ../pidgin/gtkprefs.c:1691
 msgid "Loudest"
 msgstr "Kõige valjem"
 
-#: ../pidgin/gtkprefs.c:1813
+#: ../pidgin/gtkprefs.c:1754
 msgid "_Method:"
 msgstr "_Meetod"
 
-#: ../pidgin/gtkprefs.c:1815
+#: ../pidgin/gtkprefs.c:1756
 msgid "Console beep"
 msgstr "Konsoolipiiks"
 
-#: ../pidgin/gtkprefs.c:1822
+#: ../pidgin/gtkprefs.c:1763
 msgid "No sounds"
 msgstr "Helid puuduvad"
 
-#: ../pidgin/gtkprefs.c:1830
+#: ../pidgin/gtkprefs.c:1776
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16161,316 +16550,315 @@
 "Helitegemise _käsk:\n"
 "(%s failinime jaoks)"
 
-#: ../pidgin/gtkprefs.c:1857
+#: ../pidgin/gtkprefs.c:1785
 msgid "Sounds when conversation has _focus"
 msgstr "_Heli fokuseeritud vestluse korral"
 
-#: ../pidgin/gtkprefs.c:1859
+#: ../pidgin/gtkprefs.c:1787
 msgid "Enable sounds:"
 msgstr "Helid lubatakse:"
 
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1804
 msgid "Volume:"
 msgstr "Valjus:"
 
-#: ../pidgin/gtkprefs.c:1950
+#: ../pidgin/gtkprefs.c:1871
 msgid "Play"
 msgstr "Mängida"
 
-#: ../pidgin/gtkprefs.c:2028
+#: ../pidgin/gtkprefs.c:1948
 msgid "_Report idle time:"
 msgstr "_Jõudeoleku ajast teatatakse:"
 
-#: ../pidgin/gtkprefs.c:2033
+#: ../pidgin/gtkprefs.c:1953
 msgid "Based on keyboard or mouse use"
 msgstr "Tulenevalt klaviatuuri ja hiire kasutamisest"
 
-#: ../pidgin/gtkprefs.c:2042
+#: ../pidgin/gtkprefs.c:1962
 msgid "_Auto-reply:"
 msgstr "_Automaatne vastamine:"
 
-#: ../pidgin/gtkprefs.c:2046
+#: ../pidgin/gtkprefs.c:1966
 msgid "When both away and idle"
 msgstr "Kui olen eemal ja jõude"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:2052
+#: ../pidgin/gtkprefs.c:1972
 msgid "Auto-away"
 msgstr "Automaatne eemaldumine"
 
-#: ../pidgin/gtkprefs.c:2054
+#: ../pidgin/gtkprefs.c:1974
 msgid "Change status when _idle"
 msgstr "Jõudeoleku puhul määratakse uus _olek"
 
-#: ../pidgin/gtkprefs.c:2058
+#: ../pidgin/gtkprefs.c:1978
 msgid "_Minutes before becoming idle:"
 msgstr "Mitme _minuti möödudes jõudeolek määratakse:"
 
-#: ../pidgin/gtkprefs.c:2066
+#: ../pidgin/gtkprefs.c:1985
 msgid "Change _status to:"
 msgstr "Uueks o_lekuks saab:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:2087
+#: ../pidgin/gtkprefs.c:1998
 msgid "Status at Startup"
 msgstr "Olek käivitamisel"
 
-#: ../pidgin/gtkprefs.c:2089
+#: ../pidgin/gtkprefs.c:2000
 msgid "Use status from last _exit at startup"
 msgstr "Kä_ivitamisel kasutatakse viimast olekut"
 
-#: ../pidgin/gtkprefs.c:2095
+#: ../pidgin/gtkprefs.c:2007
 msgid "Status to a_pply at startup:"
 msgstr "Käivitamisel _rakendatav olek:"
 
-#: ../pidgin/gtkprefs.c:2134
+#: ../pidgin/gtkprefs.c:2036
 msgid "Interface"
 msgstr "Liides"
 
-#: ../pidgin/gtkprefs.c:2136
+#: ../pidgin/gtkprefs.c:2038
 msgid "Smiley Themes"
 msgstr "Tujunägude teemad"
 
-#: ../pidgin/gtkprefs.c:2143
+#: ../pidgin/gtkprefs.c:2045
 msgid "Browser"
 msgstr "Veebisirvija"
 
-#: ../pidgin/gtkprefs.c:2147
+#: ../pidgin/gtkprefs.c:2049
 msgid "Status / Idle"
 msgstr "Olek / jõude"
 
-#: ../pidgin/gtkprivacy.c:80
+#: ../pidgin/gtkprivacy.c:81
 msgid "Allow all users to contact me"
 msgstr "Lubada kõigil kasutajail minuga ühendust võtta"
 
-#: ../pidgin/gtkprivacy.c:81
+#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users on my buddy list"
 msgstr "Lubada ainult minu sõbraloendis olevaid kasutajaid"
 
-#: ../pidgin/gtkprivacy.c:82
+#: ../pidgin/gtkprivacy.c:83
 msgid "Allow only the users below"
 msgstr "Lubada ainult allpool kuvatud kasutajaid"
 
-#: ../pidgin/gtkprivacy.c:83
+#: ../pidgin/gtkprivacy.c:84
 msgid "Block all users"
 msgstr "Blokkida kõik kasutajad"
 
-#: ../pidgin/gtkprivacy.c:84
+#: ../pidgin/gtkprivacy.c:85
 msgid "Block only the users below"
 msgstr "Blokkida ainult allpool kuvatud kasutajad"
 
-#: ../pidgin/gtkprivacy.c:372
+#: ../pidgin/gtkprivacy.c:352
 msgid "Privacy"
 msgstr "Privaatsus"
 
-#: ../pidgin/gtkprivacy.c:384
+#: ../pidgin/gtkprivacy.c:362
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Privaatsussätted rakenduvad koheselt."
 
-#. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:396
+#: ../pidgin/gtkprivacy.c:371
 msgid "Set privacy for:"
 msgstr "Privaatsus kontole:"
 
-#: ../pidgin/gtkprivacy.c:559 ../pidgin/gtkprivacy.c:576
+#. Remove All button
+#: ../pidgin/gtkprivacy.c:417
+msgid "Remove Al_l"
+msgstr "Eemalda _kõik"
+
+#: ../pidgin/gtkprivacy.c:503 ../pidgin/gtkprivacy.c:520
 msgid "Permit User"
 msgstr "Kasutaja lubamine"
 
-#: ../pidgin/gtkprivacy.c:560
+#: ../pidgin/gtkprivacy.c:504
 msgid "Type a user you permit to contact you."
 msgstr "Sisesta kasutaja, kellel sa lubad endaga ühendust võtta"
 
-#: ../pidgin/gtkprivacy.c:561
+#: ../pidgin/gtkprivacy.c:505
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "Palun sisesta kasutaja nimi, kellele sa annad loa endaga ühendust võtta."
 
-#: ../pidgin/gtkprivacy.c:564 ../pidgin/gtkprivacy.c:580
+#: ../pidgin/gtkprivacy.c:508 ../pidgin/gtkprivacy.c:524
 msgid "_Permit"
 msgstr "L_uba"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:514
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Kas %s tohib sinuga ühendust võtta?"
 
-#: ../pidgin/gtkprivacy.c:572
+#: ../pidgin/gtkprivacy.c:516
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Kas sa lubad, et %s saab sinuga ühendust võtta?"
 
-#: ../pidgin/gtkprivacy.c:601 ../pidgin/gtkprivacy.c:615
+#: ../pidgin/gtkprivacy.c:545 ../pidgin/gtkprivacy.c:559
 msgid "Block User"
 msgstr "Kasutaja blokkimine"
 
-#: ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkprivacy.c:546
 msgid "Type a user to block."
 msgstr "Sisesta kasutaja, keda blokkida."
 
-#: ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:547
 msgid "Please enter the name of the user you wish to block."
 msgstr "Palun sisesta selle kasutaja tunnus, keda sa soovid blokkida."
 
-#: ../pidgin/gtkprivacy.c:611
+#: ../pidgin/gtkprivacy.c:555
 #, c-format
 msgid "Block %s?"
-msgstr "Blokkida %s?"
-
-#: ../pidgin/gtkprivacy.c:613
+msgstr "Kas blokkida %s?"
+
+#: ../pidgin/gtkprivacy.c:557
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Oled sa kindel, et soovid %s blokkida?"
 
-#: ../pidgin/gtkrequest.c:322
+#: ../pidgin/gtkrequest.c:274
 msgid "Apply"
 msgstr "Rakenda"
 
-#: ../pidgin/gtkrequest.c:1651
+#: ../pidgin/gtkrequest.c:1503
 msgid "That file already exists"
 msgstr "See fail on juba olemas"
 
-#: ../pidgin/gtkrequest.c:1652
+#: ../pidgin/gtkrequest.c:1504
 msgid "Would you like to overwrite it?"
 msgstr "Kas sa soovid seda üle kirjutada?"
 
-#: ../pidgin/gtkrequest.c:1655
+#: ../pidgin/gtkrequest.c:1507
 msgid "Overwrite"
 msgstr "Kirjuta üle"
 
-#: ../pidgin/gtkrequest.c:1656
+#: ../pidgin/gtkrequest.c:1508
 msgid "Choose New Name"
 msgstr "Uue nime valimine"
 
-#: ../pidgin/gtkrequest.c:1797 ../pidgin/gtkrequest.c:1811
+#: ../pidgin/gtkrequest.c:1649 ../pidgin/gtkrequest.c:1663
 msgid "Select Folder..."
 msgstr "Kataloogi valimine..."
 
-#. Create the window.
-#: ../pidgin/gtkroomlist.c:518 ../pidgin/gtkroomlist.c:688
-msgid "Room List"
-msgstr "Tubade nimekiri"
-
 #. list button
-#: ../pidgin/gtkroomlist.c:756
+#: ../pidgin/gtkroomlist.c:577
 msgid "_Get List"
 msgstr "_Hangi nimekiri"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:764
+#: ../pidgin/gtkroomlist.c:585
 msgid "_Add Chat"
 msgstr "_Lisa vestlus"
 
 #: ../pidgin/gtksavedstatuses.c:337
 msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr ""
+msgstr "Kas sa soovid kustutada valitud salvestatud olekud?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1273
+#: ../pidgin/gtksavedstatuses.c:616 ../pidgin/gtksavedstatuses.c:1229
 msgid "_Use"
 msgstr "_Kasuta"
 
-#: ../pidgin/gtksavedstatuses.c:780
+#: ../pidgin/gtksavedstatuses.c:765
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Tiitel on juba kasutusel. Sa pead valima unikaalse tiitli."
 
-#: ../pidgin/gtksavedstatuses.c:976
+#: ../pidgin/gtksavedstatuses.c:961
 msgid "Different"
 msgstr "Teistsugune"
 
-#: ../pidgin/gtksavedstatuses.c:1165
+#: ../pidgin/gtksavedstatuses.c:1153
 msgid "_Title:"
 msgstr "_Pealkiri:"
 
-#: ../pidgin/gtksavedstatuses.c:1184 ../pidgin/gtksavedstatuses.c:1505
+#: ../pidgin/gtksavedstatuses.c:1161 ../pidgin/gtksavedstatuses.c:1453
 msgid "_Status:"
 msgstr "_Olek:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1217
+#: ../pidgin/gtksavedstatuses.c:1177
 msgid "Use a _different status for some accounts"
 msgstr "_Teistsuguse oleku kasutamine mõne konto jaoks"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1281
+#: ../pidgin/gtksavedstatuses.c:1236
 msgid "Sa_ve & Use"
 msgstr "Sal_vesta ja kasuta"
 
-#: ../pidgin/gtksavedstatuses.c:1488
+#: ../pidgin/gtksavedstatuses.c:1437
 #, c-format
 msgid "Status for %s"
 msgstr ""
 
-#: ../pidgin/gtkstatusbox.c:664
+#: ../pidgin/gtkstatusbox.c:683
 msgid "Waiting for network connection"
 msgstr "Võrguühenduse järel ootamine"
 
-#: ../pidgin/gtkstatusbox.c:1072
+#: ../pidgin/gtkstatusbox.c:1096
 msgid "New status..."
 msgstr "Uus olek..."
 
-#: ../pidgin/gtkstatusbox.c:1073
+#: ../pidgin/gtkstatusbox.c:1097
 msgid "Saved statuses..."
 msgstr "Salvestatud olekud..."
 
-#: ../pidgin/gtkutils.c:634
+#: ../pidgin/gtkutils.c:683
 msgid "Google Talk"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1424
+#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1473
 #, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr ""
-
-#: ../pidgin/gtkutils.c:1404 ../pidgin/gtkutils.c:1426
+msgstr "%s laadimisel tekkis järgnev viga: %s"
+
+#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1475
 msgid "Failed to load image"
 msgstr "Tõrge pildi laadimisel"
 
-#: ../pidgin/gtkutils.c:1500
+#: ../pidgin/gtkutils.c:1549
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Kausta %s pole võimalik saata."
 
-#: ../pidgin/gtkutils.c:1501
+#: ../pidgin/gtkutils.c:1550
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1535 ../pidgin/gtkutils.c:1547
-#: ../pidgin/gtkutils.c:1554
+#: ../pidgin/gtkutils.c:1584 ../pidgin/gtkutils.c:1596
+#: ../pidgin/gtkutils.c:1603
 msgid "You have dragged an image"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1536
+#: ../pidgin/gtkutils.c:1585
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1542 ../pidgin/gtkutils.c:1562
+#: ../pidgin/gtkutils.c:1591 ../pidgin/gtkutils.c:1611
 msgid "Set as buddy icon"
 msgstr "Määra sõbraikooniks"
 
-#: ../pidgin/gtkutils.c:1543 ../pidgin/gtkutils.c:1563
+#: ../pidgin/gtkutils.c:1592 ../pidgin/gtkutils.c:1612
 msgid "Send image file"
 msgstr "Saada pildifail"
 
-#: ../pidgin/gtkutils.c:1544 ../pidgin/gtkutils.c:1563
+#: ../pidgin/gtkutils.c:1593 ../pidgin/gtkutils.c:1612
 msgid "Insert in message"
 msgstr "Lisa sõnumisse"
 
-#: ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1597
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Kas sa soovid seda pilti määrata selle kasutaja sõbraikooniks?"
 
-#: ../pidgin/gtkutils.c:1555
+#: ../pidgin/gtkutils.c:1604
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1556
+#: ../pidgin/gtkutils.c:1605
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -16481,17 +16869,17 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1615
+#: ../pidgin/gtkutils.c:1664
 msgid "Cannot send launcher"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1615
+#: ../pidgin/gtkutils.c:1664
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2350
+#: ../pidgin/gtkutils.c:2402
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16502,25 +16890,25 @@
 "<b>Faili suurus:</b> %s\n"
 "<b>Pildi suurus:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2646
+#: ../pidgin/gtkutils.c:2704
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2648
+#: ../pidgin/gtkutils.c:2706
 msgid "Icon Error"
 msgstr "Ikooni viga"
 
-#: ../pidgin/gtkutils.c:2649
+#: ../pidgin/gtkutils.c:2707
 msgid "Could not set icon"
 msgstr "Ikooni pole võimalik määrata"
 
-#: ../pidgin/gtkutils.c:2749
+#: ../pidgin/gtkutils.c:2807
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Tõrge faili '%s' avamisel: %s"
 
-#: ../pidgin/gtkutils.c:2798
+#: ../pidgin/gtkutils.c:2856
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -16559,6 +16947,10 @@
 msgid "_Open Mail"
 msgstr "_Ava sõnum"
 
+#: ../pidgin/pidgintooltip.c:100
+msgid "Pidgin Tooltip"
+msgstr "Pidgini vihje"
+
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Pidgin'i tujunäod"
@@ -16575,37 +16967,33 @@
 msgid "none"
 msgstr "puudub"
 
-#: ../pidgin/plugins/cap/cap.c:451
-msgid "Display Statistics"
-msgstr ""
-
-#: ../pidgin/plugins/cap/cap.c:464 ../pidgin/plugins/cap/cap.c:467
+#: ../pidgin/plugins/cap/cap.c:444 ../pidgin/plugins/cap/cap.c:447
 msgid "Response Probability:"
-msgstr ""
-
-#: ../pidgin/plugins/cap/cap.c:813
+msgstr "Vastamise tõenäosus:"
+
+#: ../pidgin/plugins/cap/cap.c:772
 msgid "Statistics Configuration"
 msgstr "Statistika sätted"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:816
+#: ../pidgin/plugins/cap/cap.c:775
 msgid "Maximum response timeout:"
 msgstr "Vastuse suurim ajapiirang:"
 
-#: ../pidgin/plugins/cap/cap.c:819 ../pidgin/plugins/cap/cap.c:826
-#: ../pidgin/plugins/cap/cap.c:833 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:778 ../pidgin/plugins/cap/cap.c:785
+#: ../pidgin/plugins/cap/cap.c:792 ../pidgin/plugins/timestamp.c:148
 msgid "minutes"
 msgstr "minutit"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:823
+#: ../pidgin/plugins/cap/cap.c:782
 msgid "Maximum last-seen difference:"
-msgstr ""
+msgstr "Suurim viimati-nähtud erinevus:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:830
+#: ../pidgin/plugins/cap/cap.c:789
 msgid "Threshold:"
-msgstr ""
+msgstr "Lävi:"
 
 #. *< type
 #. *< ui_requirement
@@ -16613,18 +17001,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:897
 msgid "Contact Availability Prediction"
-msgstr ""
+msgstr "Kontakti saadavaloleku ennustamine"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:940
+#: ../pidgin/plugins/cap/cap.c:899
 msgid "Contact Availability Prediction plugin."
-msgstr ""
+msgstr "Kontakti saadavaloleku ennustamise plugin."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:941
+#: ../pidgin/plugins/cap/cap.c:900
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -16702,40 +17090,40 @@
 msgid "Customize colors in the conversation window"
 msgstr "Vestlusakende sõnumite värvuste kohandamine"
 
-#: ../pidgin/plugins/convcolors.c:82
+#: ../pidgin/plugins/convcolors.c:87
 msgid "Error Messages"
 msgstr "Veateated"
 
-#: ../pidgin/plugins/convcolors.c:83
+#: ../pidgin/plugins/convcolors.c:88
 msgid "Highlighted Messages"
 msgstr "Esiletõstetud sõnumid"
 
-#: ../pidgin/plugins/convcolors.c:84
+#: ../pidgin/plugins/convcolors.c:89
 msgid "System Messages"
 msgstr "Süsteemsed sõnumid"
 
-#: ../pidgin/plugins/convcolors.c:85
+#: ../pidgin/plugins/convcolors.c:90
 msgid "Sent Messages"
 msgstr "Saadetud sõnumid"
 
-#: ../pidgin/plugins/convcolors.c:86
+#: ../pidgin/plugins/convcolors.c:91
 msgid "Received Messages"
 msgstr "Vastuvõetud sõnumid"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245
+#: ../pidgin/plugins/convcolors.c:223 ../pidgin/plugins/pidginrc.c:257
 #, c-format
 msgid "Select Color for %s"
 msgstr "Värvuse valimine %s jaoks"
 
-#: ../pidgin/plugins/convcolors.c:310
+#: ../pidgin/plugins/convcolors.c:372
 msgid "Ignore incoming format"
 msgstr "Sissetulevat vormingut eiratakse"
 
-#: ../pidgin/plugins/convcolors.c:311
+#: ../pidgin/plugins/convcolors.c:373
 msgid "Apply in Chats"
 msgstr "Rakendatakse jututubadele"
 
-#: ../pidgin/plugins/convcolors.c:312
+#: ../pidgin/plugins/convcolors.c:374
 msgid "Apply in IMs"
 msgstr "Rakendatakse välksõnumitele"
 
@@ -16791,7 +17179,7 @@
 #. Configuration frame
 #: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
-msgstr ""
+msgstr "Hiirežestide sätted"
 
 #: ../pidgin/plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
@@ -16814,14 +17202,14 @@
 #. *< id
 #: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
-msgstr ""
+msgstr "Hiirežestid"
 
 #. *< name
 #. *< version
 #. *  summary
 #: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
-msgstr ""
+msgstr "Hiirežestide toe tagamine"
 
 #. *  description
 #: ../pidgin/plugins/gestures/gestures.c:300
@@ -17018,6 +17406,8 @@
 #: ../pidgin/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
+"Väikese kastikese lisamine sõbranimekirja näitamaks, kas sulle on uusi e-"
+"sõnumeid."
 
 #: ../pidgin/plugins/markerline.c:23
 msgid "Markerline"
@@ -17104,7 +17494,7 @@
 
 #: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
-msgstr "_Ainult juhul, kui keegi ütleb Sinu ekraaninime"
+msgstr "Ainult ju_hul, kui keegi ütleb Sinu ekraaninime"
 
 #: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
@@ -17137,7 +17527,7 @@
 #. Raise window method button
 #: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
-msgstr "_Vestlusaken tõstetakse esile"
+msgstr "Vestlusaken tõstetakse _esile"
 
 #. ---------- "Notification Removals" ----------
 #: ../pidgin/plugins/notify.c:775
@@ -17157,7 +17547,7 @@
 #. Remove on type button
 #: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
-msgstr "Eemaldatakse vestlusaknasse _tippimisel"
+msgstr "Eemaldatakse vestlusaknasse ti_ppimisel"
 
 #. Remove on message send button
 #: ../pidgin/plugins/notify.c:803
@@ -17213,52 +17603,56 @@
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:41
+#: ../pidgin/plugins/pidginrc.c:49
 msgid "Cursor Color"
 msgstr "Kursori värvus"
 
-#: ../pidgin/plugins/pidginrc.c:42
+#: ../pidgin/plugins/pidginrc.c:50
 msgid "Secondary Cursor Color"
 msgstr "Teise kursori värvus"
 
-#: ../pidgin/plugins/pidginrc.c:43
+#: ../pidgin/plugins/pidginrc.c:51
 msgid "Hyperlink Color"
 msgstr "Hüperviida värvus"
 
 #: ../pidgin/plugins/pidginrc.c:54
+msgid "Highlighted Message Name Color"
+msgstr "Nime värvus esiletõstetud sõnumites"
+
+#: ../pidgin/plugins/pidginrc.c:66
 msgid "GtkTreeView Horizontal Separation"
-msgstr ""
-
-#: ../pidgin/plugins/pidginrc.c:69
+msgstr "GTK puuvaate rõhteraldaja"
+
+#: ../pidgin/plugins/pidginrc.c:81
 msgid "Conversation Entry"
 msgstr "Vestluse kirje"
 
-#: ../pidgin/plugins/pidginrc.c:70
+#: ../pidgin/plugins/pidginrc.c:82
 msgid "Request Dialog"
 msgstr "Päringudialoog"
 
-#: ../pidgin/plugins/pidginrc.c:71
+#: ../pidgin/plugins/pidginrc.c:83
 msgid "Notify Dialog"
 msgstr "Teavitusdialoog"
 
-#: ../pidgin/plugins/pidginrc.c:247
+#: ../pidgin/plugins/pidginrc.c:259
 msgid "Select Color"
 msgstr "Värvuse valimine"
 
-#: ../pidgin/plugins/pidginrc.c:294
+#: ../pidgin/plugins/pidginrc.c:306
 msgid "Select Interface Font"
 msgstr "Liidese kirjatüübi valimine"
 
-#: ../pidgin/plugins/pidginrc.c:297
+#: ../pidgin/plugins/pidginrc.c:309
 #, c-format
 msgid "Select Font for %s"
 msgstr "Kirjatüübi valimine %s jaoks"
 
-#: ../pidgin/plugins/pidginrc.c:365
+#: ../pidgin/plugins/pidginrc.c:377
 msgid "GTK+ Interface Font"
 msgstr "GTK+ liidese kirjatüüp"
 
-#: ../pidgin/plugins/pidginrc.c:385
+#: ../pidgin/plugins/pidginrc.c:397
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
@@ -17282,36 +17676,36 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:422
+#: ../pidgin/plugins/pidginrc.c:434
 msgid "Interface colors"
 msgstr "Liidese värvid"
 
-#: ../pidgin/plugins/pidginrc.c:446
+#: ../pidgin/plugins/pidginrc.c:458
 msgid "Widget Sizes"
 msgstr "Vidinate suurused"
 
-#: ../pidgin/plugins/pidginrc.c:467
+#: ../pidgin/plugins/pidginrc.c:479
 msgid "Fonts"
 msgstr "Kirjatüübid"
 
-#: ../pidgin/plugins/pidginrc.c:491
+#: ../pidgin/plugins/pidginrc.c:503
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc failitööriistad"
 
-#: ../pidgin/plugins/pidginrc.c:496
+#: ../pidgin/plugins/pidginrc.c:508
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Kirjuta sätted %s%sgtkrc-2.0 faili"
 
-#: ../pidgin/plugins/pidginrc.c:505
+#: ../pidgin/plugins/pidginrc.c:517
 msgid "Re-read gtkrc files"
 msgstr "Laadi gtkrc failid uuesti"
 
-#: ../pidgin/plugins/pidginrc.c:543
+#: ../pidgin/plugins/pidginrc.c:555
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgini GTK+ teemajuhtija"
 
-#: ../pidgin/plugins/pidginrc.c:545 ../pidgin/plugins/pidginrc.c:546
+#: ../pidgin/plugins/pidginrc.c:557 ../pidgin/plugins/pidginrc.c:558
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Üldkasutatavatele gtkrc sätetele ligipääsu tagamine."
 
@@ -17381,60 +17775,60 @@
 msgid "The specified word already exists in the correction list."
 msgstr "Määratud sõna on juba paranduste nimekirjas olemas."
 
-#: ../pidgin/plugins/spellchk.c:2177
+#: ../pidgin/plugins/spellchk.c:2176
 msgid "Text Replacements"
 msgstr "Tekstiasendused"
 
-#: ../pidgin/plugins/spellchk.c:2200
+#: ../pidgin/plugins/spellchk.c:2199
 msgid "You type"
 msgstr "Sina tipid"
 
-#: ../pidgin/plugins/spellchk.c:2214
+#: ../pidgin/plugins/spellchk.c:2213
 msgid "You send"
 msgstr "Tekst saaadetakse kui"
 
-#: ../pidgin/plugins/spellchk.c:2228
+#: ../pidgin/plugins/spellchk.c:2227
 msgid "Whole words only"
 msgstr "Ainult terved sõnad"
 
-#: ../pidgin/plugins/spellchk.c:2240
+#: ../pidgin/plugins/spellchk.c:2239
 msgid "Case sensitive"
 msgstr "Tõstutundlik"
 
-#: ../pidgin/plugins/spellchk.c:2266
+#: ../pidgin/plugins/spellchk.c:2265
 msgid "Add a new text replacement"
 msgstr "Uue asenduse lisamine"
 
-#: ../pidgin/plugins/spellchk.c:2282
+#: ../pidgin/plugins/spellchk.c:2281
 msgid "You _type:"
 msgstr "Sina _tipid:"
 
-#: ../pidgin/plugins/spellchk.c:2299
+#: ../pidgin/plugins/spellchk.c:2285
 msgid "You _send:"
 msgstr "Tekst saadetakse _kui:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2311
+#: ../pidgin/plugins/spellchk.c:2288
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr "Arvestatakse suur- ja _väiketähtedega"
 
-#: ../pidgin/plugins/spellchk.c:2313
+#: ../pidgin/plugins/spellchk.c:2290
 msgid "Only replace _whole words"
 msgstr "Asendatakse ainult te_rved sõnad"
 
-#: ../pidgin/plugins/spellchk.c:2338
+#: ../pidgin/plugins/spellchk.c:2315
 msgid "General Text Replacement Options"
 msgstr "Üldised tekstiasenduse valikud"
 
-#: ../pidgin/plugins/spellchk.c:2339
+#: ../pidgin/plugins/spellchk.c:2316
 msgid "Enable replacement of last word on send"
 msgstr "Viimase saadetud sõna asenduse lubamine"
 
-#: ../pidgin/plugins/spellchk.c:2372
+#: ../pidgin/plugins/spellchk.c:2349
 msgid "Text replacement"
 msgstr "Tekstiasendaja"
 
-#: ../pidgin/plugins/spellchk.c:2374 ../pidgin/plugins/spellchk.c:2375
+#: ../pidgin/plugins/spellchk.c:2351 ../pidgin/plugins/spellchk.c:2352
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Asendab väljaminevates sõnumites teksti vastavalt kasutaja poolt määratud "
@@ -17458,7 +17852,7 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Horisontalselt keriv versioon sõbranimekirjast."
 
-#: ../pidgin/plugins/timestamp.c:137
+#: ../pidgin/plugins/timestamp.c:135
 msgid "Display Timestamps Every"
 msgstr "Ajatemplite kuvatamise sagedus"
 
@@ -17468,19 +17862,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:202
+#: ../pidgin/plugins/timestamp.c:200
 msgid "Timestamp"
 msgstr "Ajatempel"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:205
+#: ../pidgin/plugins/timestamp.c:203
 msgid "Display iChat-style timestamps"
 msgstr "iChat'ilaadsete ajatemplite kuvamine"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:207
+#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "iChat'ilaadsete ajatemplite kuvamine iga N minuti järel."
 
@@ -17660,7 +18054,7 @@
 
 #: ../pidgin/plugins/xmppconsole.c:670
 msgid "<font color='#777777'>Logged out.</font>"
-msgstr ""
+msgstr "<font color='#777777'>Välja logitud.</font>"
 
 #. *< type
 #. *< ui_requirement
@@ -17705,17 +18099,20 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "See plugin sobib XMPP serverite ja klientide silumiseks"
 
-#~ msgid "Couldn't open file"
-#~ msgstr "Faili pole võimalik avada"
-
-#~ msgid "Error initializing session"
-#~ msgstr "Viga seansi lähtestamisel"
-
-#~ msgid "Unable to make SSL connection to server."
-#~ msgstr "Serverisse pole võimalik SSL-ühendust luua."
-
-#~ msgid "<span color=\"red\">%s disconnected: %s</span>"
-#~ msgstr "<span color=\"red\">%s väljus võrgust: %s</span>"
+#~ msgid "Pounce only when my status is not available"
+#~ msgstr "Märguanne ainult juhul, kui ma pole saadaval"
+
+#~ msgid "Cannot find/access ~/.silc directory"
+#~ msgstr "Kataloogi ~/.silc pole võimalik leida või sellele ligi pääseda"
+
+#~ msgid "Current media"
+#~ msgstr "Praegune meedia"
+
+#~ msgid "User has typed something and stopped"
+#~ msgstr "Kasutaja tippis midagi ja siis jättis selle pooleli"
+
+#~ msgid "%s changed status from %s to %s"
+#~ msgstr "%s muutus olekut %s -> %s"
 
 #~ msgid ""
 #~ "%s\n"
@@ -17731,10 +18128,6 @@
 #~ msgid "There were errors unloading the plugin."
 #~ msgstr "Plugina mälust väljalaadimisel tekkisid vead."
 
-#, fuzzy
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "Serveriga pole võimalik ühenduda."
-
 #~ msgid "Unable to connect to OIM server"
 #~ msgstr "OIM-serveriga pole võimalik ühenduda"
 
@@ -17801,9 +18194,6 @@
 #~ msgid "Modify My Information"
 #~ msgstr "Minu andmete muutmine"
 
-#~ msgid "Connection refused"
-#~ msgstr "Ühendus lükati tagasi"
-
 #~ msgid "_Bold"
 #~ msgstr "_Rasvane"
 
@@ -17860,26 +18250,9 @@
 #~ msgid "Group not removed"
 #~ msgstr "Gruppi ei eemaldatud"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Olek:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Message:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Sõnum:</b> %s"
-
 #~ msgid "Jabber Account"
 #~ msgstr "Jabberi konto"
 
-#~ msgid "<b>%s:</b> %s"
-#~ msgstr "<b>%s:</b> %s"
-
 #~ msgid "<b>%s:</b> %s<br>"
 #~ msgstr "<b>%s:</b> %s<br>"
 
@@ -17910,13 +18283,6 @@
 #~ msgid "Invalid Username"
 #~ msgstr "Vigane kasutajanimi"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-
 #~ msgid "<b>Alias:</b> %s<br>"
 #~ msgstr "<b>Alias:</b> %s<br>"
 
@@ -17950,25 +18316,6 @@
 #~ msgid "User info is not updated"
 #~ msgstr "Kasutaja andmeid ei uuendatud"
 
-#~ msgid "Send packet"
-#~ msgstr "Paketi saatmine"
-
-#~ msgid "Packets lost, send again?"
-#~ msgstr "Pakett läks kaotsi, kas saata uuesti?"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Supports:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Toetab:</b> %s"
-
-#~ msgid "<b>IP Address:</b> %s<br>"
-#~ msgstr "<b>IP-aadress:</b> %s<br>"
-
-#~ msgid "Send unknown \"_slash\" commands as messages"
-#~ msgstr "Tun_dmatuid \"kaldkriipsuga\" käske saadetakse sõnumitena"
-
 #~ msgid "_Sounds while away"
 #~ msgstr "Helid ka _eemal olles"
 
@@ -17989,9 +18336,3 @@
 
 #~ msgid "When my nick is said"
 #~ msgstr "Kui mu hüüdnime öeldakse"
-
-#~ msgid ""
-#~ "Unable to read message from server: %s.  Command is %hd, length is %hd."
-#~ msgstr ""
-#~ "Serverilt tulnud sõnumit pole võimalik lugeda: %s.  Käsk on %hd, pikkus "
-#~ "on %hd."