changeset 19924:b8b2abeb71a7

fixes #2757 committer: Luke Schierer <lschiere@pidgin.im>
author Ivar Smolin <okul@linux.ee>
date Tue, 11 Sep 2007 23:21:07 +0000
parents a70a090877cd
children a25604fbfa92
files po/ChangeLog po/et.po
diffstat 2 files changed, 2340 insertions(+), 1909 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Tue Sep 11 23:17:56 2007 +0000
+++ b/po/ChangeLog	Tue Sep 11 23:21:07 2007 +0000
@@ -3,6 +3,7 @@
 version 2.2.0
 	* Belarusian Latin translation added (Ihar Hrachyshka)
 	* Czech translation updated (Miloslav Trmac)
+	* Estonian translation updated (Ivar Smolin)
 	* German translation updated (Bjoern Voigt)
 	* Hungarian translation updated (Gabor Kelemen)
 	* Italian translation updated (Claudio Satriano)
--- a/po/et.po	Tue Sep 11 23:17:56 2007 +0000
+++ b/po/et.po	Tue Sep 11 23:21:07 2007 +0000
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim 2.1.1\n"
+"Project-Id-Version: gaim 2.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-14 03:22-0400\n"
-"PO-Revision-Date: 2007-08-15 10:40+0300\n"
+"POT-Creation-Date: 2007-09-05 03:21-0400\n"
+"PO-Revision-Date: 2007-09-06 07:53+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@
 #. 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
+#: ../finch/finch.c:415
 msgid "Finch"
 msgstr "Finch"
 
@@ -60,13 +60,15 @@
 "http://developer.pidgin.im"
 msgstr ""
 
-#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:478 ../finch/gntblist.c:299
+#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:483 ../finch/gntblist.c:299
 #: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185
-#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:308
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:309
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
 #: ../libpurple/protocols/jabber/buddy.c:1464
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/jabber/jabber.c:1218
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
 #: ../libpurple/protocols/silc/ops.c:1456
@@ -82,73 +84,73 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "Konto ekraaninimi ei tohi tühi olla."
 
-#: ../finch/gntaccount.c:431
+#: ../finch/gntaccount.c:436
 msgid "New mail notifications"
 msgstr "Uutest sõnumitest antakse teada"
 
-#: ../finch/gntaccount.c:441
+#: ../finch/gntaccount.c:446
 msgid "Remember password"
 msgstr "Parooli peetakse meeles"
 
-#: ../finch/gntaccount.c:479
+#: ../finch/gntaccount.c:484
 msgid "There's no protocol plugins installed."
 msgstr "Protokollide pluginaid pole paigaldatud."
 
-#: ../finch/gntaccount.c:480
+#: ../finch/gntaccount.c:485
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Ilmselt unustasid sa käsu 'make install'.)"
 
-#: ../finch/gntaccount.c:490 ../pidgin/gtkaccount.c:1478
-#: ../pidgin/gtkblist.c:4023
+#: ../finch/gntaccount.c:495 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4037
 msgid "Modify Account"
 msgstr "Muuda kontot"
 
-#: ../finch/gntaccount.c:490
+#: ../finch/gntaccount.c:495
 msgid "New Account"
 msgstr "Uus konto"
 
-#: ../finch/gntaccount.c:515 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:520 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../finch/gntaccount.c:523
+#: ../finch/gntaccount.c:528
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Ekraaninimi:"
 
-#: ../finch/gntaccount.c:536
+#: ../finch/gntaccount.c:541
 msgid "Password:"
 msgstr "Parool:"
 
-#: ../finch/gntaccount.c:546
+#: ../finch/gntaccount.c:551
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:569 ../finch/gntaccount.c:632
-#: ../finch/gntaccount.c:878 ../finch/gntblist.c:343 ../finch/gntblist.c:420
+#: ../finch/gntaccount.c:574 ../finch/gntaccount.c:637
+#: ../finch/gntaccount.c:883 ../finch/gntblist.c:343 ../finch/gntblist.c:420
 #: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2209 ../finch/gntplugin.c:378
-#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:656 ../finch/gntprefs.c:264
-#: ../finch/gntsound.c:1045 ../finch/gntstatus.c:144 ../finch/gntstatus.c:481
-#: ../finch/gntstatus.c:606 ../libpurple/account.c:984
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2221 ../finch/gntplugin.c:378
+#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:666 ../finch/gntprefs.c:264
+#: ../finch/gntsound.c:1057 ../finch/gntstatus.c:144 ../finch/gntstatus.c:484
+#: ../finch/gntstatus.c:609 ../libpurple/account.c:984
 #: ../libpurple/account.c:1234 ../libpurple/account.c:1269
-#: ../libpurple/conversation.c:1173 ../libpurple/plugins/buddynote.c:51
+#: ../libpurple/conversation.c:1219 ../libpurple/plugins/buddynote.c:51
 #: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:661
 #: ../libpurple/protocols/gg/gg.c:798 ../libpurple/protocols/gg/gg.c:879
 #: ../libpurple/protocols/jabber/buddy.c:588
 #: ../libpurple/protocols/jabber/buddy.c:1826
 #: ../libpurple/protocols/jabber/buddy.c:1862
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/jabber/jabber.c:873
+#: ../libpurple/protocols/jabber/jabber.c:1375
 #: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
-#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
-#: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6042
+#: ../libpurple/protocols/msn/msn.c:296 ../libpurple/protocols/msn/msn.c:313
+#: ../libpurple/protocols/msn/msn.c:330 ../libpurple/protocols/msn/msn.c:347
+#: ../libpurple/protocols/msn/msn.c:368
+#: ../libpurple/protocols/oscar/oscar.c:6095
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -161,12 +163,12 @@
 #: ../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:3389
-#: ../libpurple/protocols/sametime/sametime.c:3475
-#: ../libpurple/protocols/sametime/sametime.c:3646
-#: ../libpurple/protocols/sametime/sametime.c:5398
-#: ../libpurple/protocols/sametime/sametime.c:5488
-#: ../libpurple/protocols/sametime/sametime.c:5613
+#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3474
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
 #: ../libpurple/protocols/silc/buddy.c:455
 #: ../libpurple/protocols/silc/buddy.c:1076
 #: ../libpurple/protocols/silc/buddy.c:1191
@@ -183,110 +185,110 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1006
-#: ../libpurple/protocols/yahoo/yahoo.c:3337
-#: ../libpurple/protocols/yahoo/yahoo.c:3348 ../pidgin/gtkaccount.c:1917
-#: ../pidgin/gtkaccount.c:2511 ../pidgin/gtkblist.c:5925
-#: ../pidgin/gtkdialogs.c:747 ../pidgin/gtkdialogs.c:885
-#: ../pidgin/gtkdialogs.c:977 ../pidgin/gtkdialogs.c:997
-#: ../pidgin/gtkdialogs.c:1021 ../pidgin/gtkdialogs.c:1043
-#: ../pidgin/gtkdialogs.c:1091 ../pidgin/gtkdialogs.c:1132
-#: ../pidgin/gtkdialogs.c:1188 ../pidgin/gtkdialogs.c:1227
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkimhtmltoolbar.c:425
-#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1115
+#: ../libpurple/protocols/yahoo/yahoo.c:1034
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3511 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5971
+#: ../pidgin/gtkdialogs.c:754 ../pidgin/gtkdialogs.c:893
+#: ../pidgin/gtkdialogs.c:985 ../pidgin/gtkdialogs.c:1005
+#: ../pidgin/gtkdialogs.c:1029 ../pidgin/gtkdialogs.c:1051
+#: ../pidgin/gtkdialogs.c:1099 ../pidgin/gtkdialogs.c:1140
+#: ../pidgin/gtkdialogs.c:1196 ../pidgin/gtkdialogs.c:1235
+#: ../pidgin/gtkdialogs.c:1262 ../pidgin/gtkimhtmltoolbar.c:434
+#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1100
 #: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
 #: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
 #: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1572
+#: ../pidgin/gtkstatusbox.c:1573
 msgid "Cancel"
 msgstr "Loobu"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:573 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
-#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1042 ../finch/gntstatus.c:484
-#: ../finch/gntstatus.c:594 ../libpurple/account.c:1268
+#: ../finch/gntaccount.c:578 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
+#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1054 ../finch/gntstatus.c:487
+#: ../finch/gntstatus.c:597 ../libpurple/account.c:1268
 #: ../libpurple/plugins/buddynote.c:50
 #: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Salvesta"
 
-#: ../finch/gntaccount.c:626 ../pidgin/gtkaccount.c:1909
-#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1566
+#: ../finch/gntaccount.c:631 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1567
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Kas sa soovid kustutada kontot %s?"
 
-#: ../finch/gntaccount.c:629
+#: ../finch/gntaccount.c:634
 msgid "Delete Account"
 msgstr "Konto kustutamine"
 
 #. Delete button
-#: ../finch/gntaccount.c:631 ../finch/gntaccount.c:701
-#: ../finch/gntpounce.c:655 ../finch/gntpounce.c:718 ../finch/gntstatus.c:143
-#: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1916 ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1571
+#: ../finch/gntaccount.c:636 ../finch/gntaccount.c:706
+#: ../finch/gntpounce.c:665 ../finch/gntpounce.c:728 ../finch/gntstatus.c:143
+#: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1099 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1572
 msgid "Delete"
 msgstr "Kustuta"
 
-#: ../finch/gntaccount.c:663 ../finch/gntblist.c:2115 ../finch/gntui.c:81
-#: ../pidgin/gtkaccount.c:2334 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:668 ../finch/gntblist.c:2118 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Kontod"
 
-#: ../finch/gntaccount.c:669
+#: ../finch/gntaccount.c:674
 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:692 ../finch/gntaccount.c:877 ../finch/gntblist.c:342
+#: ../finch/gntaccount.c:697 ../finch/gntaccount.c:882 ../finch/gntblist.c:342
 #: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntnotify.c:379
-#: ../finch/gntpounce.c:702 ../finch/gntstatus.c:198
+#: ../finch/gntpounce.c:712 ../finch/gntstatus.c:198
 #: ../libpurple/protocols/gg/gg.c:878 ../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:5487
+#: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2510
-#: ../pidgin/gtkblist.c:5924 ../pidgin/gtkconv.c:1654
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:5970 ../pidgin/gtkconv.c:1639
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Lisa"
 
 #. Modify button
-#: ../finch/gntaccount.c:697 ../finch/gntpounce.c:710
+#: ../finch/gntaccount.c:702 ../finch/gntpounce.c:720
 msgid "Modify"
 msgstr "Muuda"
 
-#: ../finch/gntaccount.c:800 ../pidgin/gtkaccount.c:2457
+#: ../finch/gntaccount.c:805 ../pidgin/gtkaccount.c:2441
 #, 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:873 ../pidgin/gtkaccount.c:2509
+#: ../finch/gntaccount.c:878 ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "Kas lisada sõber sinu nimekirja?"
 
-#: ../finch/gntaccount.c:933 ../pidgin/gtkaccount.c:2567
+#: ../finch/gntaccount.c:938 ../pidgin/gtkaccount.c:2551
 #, 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:958 ../finch/gntaccount.c:961
-#: ../finch/gntaccount.c:988 ../pidgin/gtkaccount.c:2590
-#: ../pidgin/gtkaccount.c:2596
+#: ../finch/gntaccount.c:963 ../finch/gntaccount.c:966
+#: ../finch/gntaccount.c:993 ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "Autoriseerida sõber?"
 
-#: ../finch/gntaccount.c:965 ../finch/gntaccount.c:992
-#: ../pidgin/gtkaccount.c:2591 ../pidgin/gtkaccount.c:2597
+#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:997
+#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Autoriseeri"
 
-#: ../finch/gntaccount.c:966 ../finch/gntaccount.c:993
-#: ../pidgin/gtkaccount.c:2592 ../pidgin/gtkaccount.c:2598
+#: ../finch/gntaccount.c:971 ../finch/gntaccount.c:998
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "Keela"
 
@@ -310,19 +312,19 @@
 msgid "Error adding buddy"
 msgstr "Viga sõbra lisamisel"
 
-#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2858
-#: ../pidgin/gtkaccount.c:1990 ../pidgin/gtksavedstatuses.c:979
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2898
+#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Ekraaninimi"
 
 #: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
-#: ../libpurple/protocols/msn/msn.c:1364
+#: ../libpurple/protocols/msn/msn.c:1401
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../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:996
-#: ../pidgin/gtkdialogs.c:1020 ../pidgin/gtkdialogs.c:1042
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1004
+#: ../pidgin/gtkdialogs.c:1028 ../pidgin/gtkdialogs.c:1050
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
@@ -331,11 +333,11 @@
 msgid "Group"
 msgstr "Grupp"
 
-#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1301
-#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:572
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1304
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:575
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2986 ../pidgin/gtknotify.c:483
-#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../pidgin/gtkblist.c:3005 ../pidgin/gtknotify.c:488
+#: ../pidgin/gtkpounce.c:1267 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Konto"
 
@@ -348,7 +350,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3182 ../pidgin/gtkblist.c:5431
+#: ../libpurple/protocols/yahoo/yahoo.c:3345 ../pidgin/gtkblist.c:5477
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Sõbra lisamine"
@@ -362,9 +364,9 @@
 msgstr "Jututoad"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:813
-#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/msn/msn.c:1645
+#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:804
+#: ../libpurple/protocols/msn/msn.c:1590 ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1682
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -376,7 +378,7 @@
 msgid "Auto-join"
 msgstr "Automaatühendumine"
 
-#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5810
+#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5856
 msgid "Add Chat"
 msgstr "Vestluse lisamine"
 
@@ -397,8 +399,8 @@
 msgstr "Selle nimega grupp on juba olemas."
 
 #: ../finch/gntblist.c:453 ../finch/gntblist.c:855
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5485 ../pidgin/gtkblist.c:5921
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5967
 msgid "Add Group"
 msgstr "Grupi lisamine"
 
@@ -416,7 +418,7 @@
 
 #: ../finch/gntblist.c:802 ../finch/gntstatus.c:204
 msgid "Edit"
-msgstr ""
+msgstr "Redigeeri"
 
 #: ../finch/gntblist.c:827
 msgid "Edit Settings"
@@ -430,7 +432,7 @@
 msgid "Retrieving..."
 msgstr "Vastuvõtmine..."
 
-#: ../finch/gntblist.c:903 ../finch/gntconv.c:407
+#: ../finch/gntblist.c:903 ../finch/gntconv.c:484
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
@@ -441,10 +443,10 @@
 msgstr "Sõbramärguande lisamine"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:914 ../finch/gntconv.c:419
+#: ../finch/gntblist.c:914 ../finch/gntconv.c:496
 #: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1602
+#: ../pidgin/gtkconv.c:1587
 msgid "Send File"
 msgstr "Saada fail"
 
@@ -463,7 +465,7 @@
 
 #: ../finch/gntblist.c:1001
 msgid "Set Alias"
-msgstr ""
+msgstr "Määra alias"
 
 #: ../finch/gntblist.c:1002
 msgid "Enter empty string to reset the name."
@@ -471,11 +473,12 @@
 
 #: ../finch/gntblist.c:1078
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr ""
+msgstr "Selle kontakti eemaldamisel kaovad ära ka kõik selle kontakti sõbrad"
 
 #: ../finch/gntblist.c:1086
 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:1091
 #, c-format
@@ -487,15 +490,15 @@
 msgid "Confirm Remove"
 msgstr "Eemaldamiskinnitus"
 
-#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:224
-#: ../pidgin/gtkconv.c:1651 ../pidgin/gtkrequest.c:275
+#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:226
+#: ../pidgin/gtkconv.c:1636 ../pidgin/gtkrequest.c:275
 #: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "Eemalda"
 
 #. Buddy List
-#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2294 ../finch/gntprefs.c:257
-#: ../finch/gntui.c:82 ../pidgin/gtkblist.c:4267
+#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2306 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2685 ../pidgin/gtkblist.c:4281
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Sõbranimekiri"
@@ -509,15 +512,15 @@
 msgstr ""
 
 #. General
-#: ../finch/gntblist.c:1296 ../libpurple/protocols/gg/gg.c:632
+#: ../finch/gntblist.c:1297 ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
 #: ../libpurple/protocols/gg/gg.c:2202
 #: ../libpurple/protocols/jabber/buddy.c:274
 #: ../libpurple/protocols/jabber/buddy.c:856
 #: ../libpurple/protocols/jabber/buddy.c:1627
 #: ../libpurple/protocols/jabber/buddy.c:1809
-#: ../libpurple/protocols/jabber/jabber.c:823
-#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:814
+#: ../libpurple/protocols/msn/msn.c:1409 ../libpurple/protocols/msn/msn.c:1593
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -527,29 +530,29 @@
 #: ../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:3010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3029
 msgid "Nickname"
 msgstr "Hüüdnimi"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1316 ../finch/gntprefs.c:260
-#: ../libpurple/protocols/bonjour/bonjour.c:333
+#: ../finch/gntblist.c:1319 ../finch/gntprefs.c:260
+#: ../libpurple/protocols/bonjour/bonjour.c:340
 #: ../libpurple/protocols/jabber/buddy.c:647
 #: ../libpurple/protocols/jabber/buddy.c:687
-#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msn/msn.c:553 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:2936
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3038
-#: ../pidgin/gtkblist.c:3443 ../pidgin/gtkprefs.c:1920
+#: ../libpurple/protocols/oscar/oscar.c:2922
+#: ../libpurple/protocols/yahoo/yahoo.c:3099
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3057
+#: ../pidgin/gtkblist.c:3457 ../pidgin/gtkprefs.c:1922
 msgid "Idle"
 msgstr "Jõude"
 
-#: ../finch/gntblist.c:1330
+#: ../finch/gntblist.c:1333
 msgid "On Mobile"
 msgstr ""
 
-#: ../finch/gntblist.c:1411
+#: ../finch/gntblist.c:1414
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -558,12 +561,12 @@
 "Ühendunuid: %d\n"
 "Kokku: %d"
 
-#: ../finch/gntblist.c:1420
+#: ../finch/gntblist.c:1423
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Konto: %s (%s)"
 
-#: ../finch/gntblist.c:1432
+#: ../finch/gntblist.c:1435
 #, c-format
 msgid ""
 "\n"
@@ -572,50 +575,50 @@
 "\n"
 "Viimati nähtud: %s tagasi"
 
-#: ../finch/gntblist.c:1698 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1070
+#: ../finch/gntblist.c:1701 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "New..."
 msgstr "Uus..."
 
-#: ../finch/gntblist.c:1705 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1071
+#: ../finch/gntblist.c:1708 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "Saved..."
 msgstr "Salvestatud..."
 
-#: ../finch/gntblist.c:2083 ../finch/gntplugin.c:254 ../finch/gntui.c:86
+#: ../finch/gntblist.c:2086 ../finch/gntplugin.c:254 ../finch/gntui.c:88
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Pluginad"
 
-#: ../finch/gntblist.c:2190 ../pidgin/gtkdialogs.c:728
-#: ../pidgin/gtkdialogs.c:866 ../pidgin/gtkdialogs.c:947
+#: ../finch/gntblist.c:2202 ../pidgin/gtkdialogs.c:735
+#: ../pidgin/gtkdialogs.c:874 ../pidgin/gtkdialogs.c:955
 msgid "_Name"
 msgstr "_Nimi"
 
-#: ../finch/gntblist.c:2195 ../pidgin/gtkdialogs.c:733
-#: ../pidgin/gtkdialogs.c:871 ../pidgin/gtkdialogs.c:952
+#: ../finch/gntblist.c:2207 ../pidgin/gtkdialogs.c:740
+#: ../pidgin/gtkdialogs.c:879 ../pidgin/gtkdialogs.c:960
 msgid "_Account"
 msgstr "_Konto"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:741
+#: ../finch/gntblist.c:2215 ../pidgin/gtkdialogs.c:748
 msgid "New Instant Message"
 msgstr "Uus välksõnum"
 
-#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:743
+#: ../finch/gntblist.c:2217 ../pidgin/gtkdialogs.c:750
 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:2208 ../finch/gntnotify.c:79 ../libpurple/account.c:983
+#: ../finch/gntblist.c:2220 ../finch/gntnotify.c:79 ../libpurple/account.c:983
 #: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
 #: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
+#: ../libpurple/protocols/jabber/jabber.c:1374
 #: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
-#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6041
+#: ../libpurple/protocols/msn/msn.c:295 ../libpurple/protocols/msn/msn.c:312
+#: ../libpurple/protocols/msn/msn.c:329 ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/oscar/oscar.c:6094
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -632,40 +635,40 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1005
-#: ../libpurple/protocols/yahoo/yahoo.c:3336
-#: ../libpurple/protocols/yahoo/yahoo.c:3347 ../pidgin/gtkblist.c:4022
-#: ../pidgin/gtkdialogs.c:746 ../pidgin/gtkdialogs.c:884
-#: ../pidgin/gtkdialogs.c:976 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:1033
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
+#: ../libpurple/protocols/yahoo/yahoo.c:3510 ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkdialogs.c:753 ../pidgin/gtkdialogs.c:892
+#: ../pidgin/gtkdialogs.c:984 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "Olgu"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2228 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:791
+#: ../finch/gntblist.c:2240 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:789
 msgid "Options"
 msgstr "Valikud"
 
-#: ../finch/gntblist.c:2234
+#: ../finch/gntblist.c:2246
 msgid "Send IM..."
 msgstr "Saada välksõnum..."
 
-#: ../finch/gntblist.c:2238
+#: ../finch/gntblist.c:2250
 msgid "Show empty groups"
 msgstr "Tühje gruppe näidatakse"
 
-#: ../finch/gntblist.c:2244
+#: ../finch/gntblist.c:2256
 msgid "Show offline buddies"
 msgstr "Ühendamata sõpru näidatakse"
 
-#: ../finch/gntblist.c:2250
+#: ../finch/gntblist.c:2262
 msgid "Sort by status"
 msgstr "Sortimine oleku järgi"
 
-#: ../finch/gntblist.c:2254
+#: ../finch/gntblist.c:2266
 msgid "Sort alphabetically"
 msgstr "Sortimine tähestiku järgi"
 
-#: ../finch/gntblist.c:2258
+#: ../finch/gntblist.c:2270
 msgid "Sort by log size"
 msgstr "Sortimine logi suuruse järgi"
 
@@ -692,41 +695,45 @@
 "Finch ei proovi kontot automaatselt ühendada enne, kui sa pole viga "
 "kõrvaldanud ja kontot uuesti kasutusele võtnud."
 
-#: ../finch/gntconv.c:117
+#: ../finch/gntconv.c:119
 msgid "No such command."
 msgstr "Sellist käsku pole."
 
-#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:495
+#: ../finch/gntconv.c:123 ../pidgin/gtkconv.c:469
 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:126 ../pidgin/gtkconv.c:501
+#: ../finch/gntconv.c:128 ../pidgin/gtkconv.c:475
 msgid "Your command failed for an unknown reason."
-msgstr ""
-
-#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:508
+msgstr "Tõrge sinu käsu täitmisel, tõrke põhjus on teadmata."
+
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:482
 msgid "That command only works in chats, not IMs."
 msgstr "See käsk toimib ainult vestlustes, välksõnumites aga mitte."
 
-#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:511
+#: ../finch/gntconv.c:136 ../pidgin/gtkconv.c:485
 msgid "That command only works in IMs, not chats."
 msgstr "See käsk toimib ainult välksõnumites, vestlustes aga mitte."
 
-#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:516
+#: ../finch/gntconv.c:140 ../pidgin/gtkconv.c:490
 msgid "That command doesn't work on this protocol."
 msgstr "See käsk ei toimi selle protokolliga."
 
-#: ../finch/gntconv.c:224
+#: ../finch/gntconv.c:148
+msgid "Message was not sent, because you are not signed on."
+msgstr "Sõnumit ei saadetud kuna sa pole sisse logitud."
+
+#: ../finch/gntconv.c:231
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s"
 
-#: ../finch/gntconv.c:247
+#: ../finch/gntconv.c:254
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
+#: ../finch/gntconv.c:259 ../finch/gntconv.c:747
 #, c-format
 msgid ""
 "\n"
@@ -735,48 +742,69 @@
 "\n"
 "%s tipib..."
 
-#: ../finch/gntconv.c:271
+#: ../finch/gntconv.c:278
 msgid "You have left this chat."
 msgstr "Sa lahkusid sellest vestlusest."
 
-#: ../finch/gntconv.c:342
+#: ../finch/gntconv.c:367 ../pidgin/gtkconv.c:1346
+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:373 ../pidgin/gtkconv.c:1354
+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:419
 msgid "Send To"
-msgstr ""
-
-#: ../finch/gntconv.c:386
+msgstr "Kellele saata"
+
+#: ../finch/gntconv.c:463
 msgid "Conversation"
 msgstr "Vestlus"
 
-#: ../finch/gntconv.c:392
+#: ../finch/gntconv.c:469
 msgid "Clear Scrollback"
 msgstr "Puhasta tagasikerimine"
 
-#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
+#: ../finch/gntconv.c:473 ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Ajatempleid näidatakse"
 
-#: ../finch/gntconv.c:412
+#: ../finch/gntconv.c:489
 msgid "Add Buddy Pounce..."
 msgstr "Lisa sõbramärguanne..."
 
-#: ../finch/gntconv.c:613
+#: ../finch/gntconv.c:504
+msgid "Enable Logging"
+msgstr "Luba logimine"
+
+#: ../finch/gntconv.c:510
+msgid "Enable Sounds"
+msgstr "Luba helid"
+
+#: ../finch/gntconv.c:713
 msgid "<AUTO-REPLY> "
 msgstr "<AUTOMAATVASTUS> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:835
 msgid "List of users:\n"
 msgstr "Kasutajate nimekiri:\n"
 
-#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:338
+#: ../finch/gntconv.c:997 ../pidgin/gtkconv.c:311
 msgid "Supported debug options are:  version"
 msgstr "Toetatud silumisvalikud on:  version"
 
-#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:387
+#: ../finch/gntconv.c:1033 ../pidgin/gtkconv.c:361
 msgid "No such command (in this context)."
 msgstr "Sellist käsku pole (selles kontekstis)."
 
-#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:390
+#: ../finch/gntconv.c:1036 ../pidgin/gtkconv.c:364
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -784,7 +812,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:976 ../pidgin/gtkconv.c:7346
+#: ../finch/gntconv.c:1094 ../pidgin/gtkconv.c:7527
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -792,53 +820,53 @@
 "say &lt;message&gt;:  Sõnumi saatmine nagu tehtaks seda ilma käsku "
 "kasutamata."
 
-#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7349
+#: ../finch/gntconv.c:1097 ../pidgin/gtkconv.c:7530
 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:982 ../pidgin/gtkconv.c:7352
+#: ../finch/gntconv.c:1100 ../pidgin/gtkconv.c:7533
 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:985 ../pidgin/gtkconv.c:7355
+#: ../finch/gntconv.c:1103 ../pidgin/gtkconv.c:7536
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Vestluse tagasikerimise puhastamine."
 
-#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7361
+#: ../finch/gntconv.c:1106 ../pidgin/gtkconv.c:7542
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;käsk&gt;:  Abiteave käsu kohta."
 
-#: ../finch/gntconv.c:991
+#: ../finch/gntconv.c:1109
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Vestluses osalevate kasutajate nimekirja näitamine."
 
-#: ../finch/gntconv.c:996
+#: ../finch/gntconv.c:1114
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Pluginate akna näitamine."
 
-#: ../finch/gntconv.c:999
+#: ../finch/gntconv.c:1117
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Sõbranimekirja näitamine."
 
-#: ../finch/gntconv.c:1002
+#: ../finch/gntconv.c:1120
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Kontode akna näitamine."
 
-#: ../finch/gntconv.c:1005
+#: ../finch/gntconv.c:1123
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Silumisakna näitamine."
 
-#: ../finch/gntconv.c:1008
+#: ../finch/gntconv.c:1126
 msgid "prefs: Show the preference window."
 msgstr "prefs: Eelistuste akna näitamine."
 
-#: ../finch/gntconv.c:1011
+#: ../finch/gntconv.c:1129
 msgid "statuses: Show the savedstatuses window."
 msgstr ""
 
-#: ../finch/gntdebug.c:234 ../finch/gntui.c:84 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Silumisaken"
 
@@ -864,99 +892,104 @@
 msgstr "Failiülekanded - %d%% faili %d-st"
 
 #. Create the window.
-#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:85
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:87
 #: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Failiülekanded"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "Edenemine"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Failinimi"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Suurus"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 msgid "Speed"
 msgstr "Kiirus"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Jäänud"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:198 ../finch/gntstatus.c:543 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:337
+#: ../finch/gntft.c:200 ../finch/gntstatus.c:546 ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:344
 #: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
 #: ../libpurple/protocols/gg/gg.c:1579
 #: ../libpurple/protocols/jabber/buddy.c:638
 #: ../libpurple/protocols/jabber/buddy.c:642
 #: ../libpurple/protocols/jabber/buddy.c:677
-#: ../libpurple/protocols/jabber/jabber.c:1212
-#: ../libpurple/protocols/msn/msn.c:515
+#: ../libpurple/protocols/jabber/jabber.c:1203
+#: ../libpurple/protocols/msn/msn.c:552
 #: ../libpurple/protocols/novell/novell.c:2835
 #: ../libpurple/protocols/oscar/oscar.c:820
 #: ../libpurple/protocols/oscar/oscar.c:825
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2670
-#: ../libpurple/protocols/oscar/oscar.c:3748
-#: ../libpurple/protocols/sametime/sametime.c:3264
-#: ../libpurple/protocols/sametime/sametime.c:4151
-#: ../libpurple/protocols/yahoo/yahoo.c:3087 ../pidgin/gtkblist.c:3082
-#: ../pidgin/gtkblist.c:3095 ../pidgin/gtkblist.c:3097
+#: ../libpurple/protocols/oscar/oscar.c:2710
+#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3250 ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3115 ../pidgin/gtkblist.c:3117
 #: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "Olek"
 
-#: ../finch/gntft.c:208
+#: ../finch/gntft.c:210
 msgid "Close this window when all transfers finish"
 msgstr "See aken suletakse ülekannete lõppemisel"
 
-#: ../finch/gntft.c:215
+#: ../finch/gntft.c:217
 msgid "Clear finished transfers"
 msgstr "Lõpetatud ülekanded puhastatakse"
 
-#: ../finch/gntft.c:229
+#: ../finch/gntft.c:231
 msgid "Stop"
 msgstr "Seiska"
 
 #. Close button
-#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
-#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:727 ../finch/gntstatus.c:215
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2484
+#: ../finch/gntft.c:236 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
+#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:737 ../finch/gntstatus.c:215
+#: ../libpurple/protocols/msn/msn.c:412 ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
 #: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Sulge"
 
-#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
+#: ../finch/gntft.c:304 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "Oodatakse ülekande algust"
 
-#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "Tühistatud"
 
-#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
+#: ../finch/gntft.c:373 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Nurjunud"
 
-#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133
+#: ../finch/gntft.c:419 ../pidgin/gtkft.c:133
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162
+#: ../finch/gntft.c:430
+#, c-format
+msgid "The file was saved as %s."
+msgstr "Fail salvestati nimega %s."
+
+#: ../finch/gntft.c:431 ../finch/gntft.c:432 ../pidgin/gtkft.c:162
 #: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Lõpetatud"
 
-#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:436 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Ülekandmine"
 
@@ -968,11 +1001,11 @@
 msgid "You have mail!"
 msgstr "Sulle on e-sõnum!"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:495
 msgid "Sender"
 msgstr "Saatja"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:497
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:502
 msgid "Subject"
 msgstr "Teema"
 
@@ -983,17 +1016,17 @@
 msgstr[0] "%s (%s) sai %d uue sõnumi."
 msgstr[1] "%s (%s) sai %d uut sõnumit."
 
-#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:336
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:340
 msgid "New Mail"
 msgstr "Uus e-sõnum"
 
-#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:918
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:908
 #, c-format
 msgid "Info for %s"
 msgstr "Andmed: %s"
 
 #: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:919
+#: ../pidgin/gtknotify.c:909
 msgid "Buddy Information"
 msgstr "Sõbra andmed"
 
@@ -1001,11 +1034,11 @@
 msgid "Continue"
 msgstr "Jätka"
 
-#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1630 ../pidgin/gtkdebug.c:834
+#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1615 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Andmed"
 
-#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1591
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1576
 msgid "IM"
 msgstr "Välksõnum"
 
@@ -1013,7 +1046,7 @@
 msgid "Join"
 msgstr "Ühine"
 
-#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3474
+#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Kutsu"
 
@@ -1072,7 +1105,7 @@
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
 #: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
-#: ../finch/gntui.c:88 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2062
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2064
 msgid "Preferences"
 msgstr "Eelistused"
 
@@ -1080,7 +1113,6 @@
 msgid "Please enter a buddy to pounce."
 msgstr "Palun sisesta sõber, kelle kohta märguanne seatakse."
 
-#. Create the window.
 #: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "Uus sõbramärguanne"
@@ -1094,7 +1126,7 @@
 msgstr "Kellest märku antakse"
 
 #. Account:
-#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:452
+#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:455
 msgid "Account:"
 msgstr "Konto:"
 
@@ -1103,7 +1135,7 @@
 msgstr "Sõbra nimi:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:586
+#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:584
 msgid "Pounce When Buddy..."
 msgstr "Märguanne, kui sõber..."
 
@@ -1137,7 +1169,7 @@
 
 #: ../finch/gntpounce.c:382
 msgid "Pauses while typing"
-msgstr "Peab tippimisel pausi"
+msgstr "Teeb tippimisel pausi"
 
 #: ../finch/gntpounce.c:383
 msgid "Stops typing"
@@ -1148,7 +1180,7 @@
 msgstr "Saadab sõnumi"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:647
+#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:645
 msgid "Action"
 msgstr "Tegevus"
 
@@ -1176,70 +1208,82 @@
 msgid "Pounce only when my status is not available"
 msgstr "Märguanne ainult juhul, kui ma pole saadaval"
 
-#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1295
+#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1280
 msgid "Recurring"
 msgstr "Korduv"
 
-#: ../finch/gntpounce.c:651 ../pidgin/gtkpounce.c:1110
+#: ../finch/gntpounce.c:617
+msgid "Cannot create pounce"
+msgstr "Märguannet pole võimalik luua"
+
+#: ../finch/gntpounce.c:618
+msgid "You do not have any accounts."
+msgstr "Sul pole ühtegi kontot."
+
+#: ../finch/gntpounce.c:619
+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:661 ../pidgin/gtkpounce.c:1095
 #, 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:685 ../finch/gntui.c:83 ../pidgin/gtkpounce.c:1339
+#: ../finch/gntpounce.c:695 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1324
 msgid "Buddy Pounces"
 msgstr "Sõbramärguanded"
 
-#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1451
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s alustas sulle sõnumi sisestamist (%s)"
 
-#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1453
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s jättis sulle sõnumi sisestamise pooleli (%s)"
 
-#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1455
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s logis sisse (%s)"
 
-#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1457
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s pole enam jõude (%s)"
 
-#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s naases eemalolekust (%s)"
 
-#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1476
+#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s lõpetas sulle sõnumi sisestamise (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1478
+#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s logis välja (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1465
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s jäi jõude (%s)"
 
-#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1482
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s eemaldus. (%s)"
 
-#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1484
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s saatis sulle sõnumi. (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1485
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
 msgid "Unknown pounce event. Please report this!"
 msgstr "Tundmatu teavitussündmus. Palun anna sellest teada!"
 
@@ -1247,12 +1291,12 @@
 msgid "Based on keyboard use"
 msgstr "Tulenevalt klaviatuuri kasutamisest"
 
-#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1925
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1927
 msgid "From last sent message"
 msgstr "Viimatisaadetud sõnumist"
 
 #: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
-#: ../pidgin/gtkprefs.c:1924 ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkprefs.c:1926 ../pidgin/gtkprefs.c:1940
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Mitte iial"
@@ -1263,7 +1307,7 @@
 
 #: ../finch/gntprefs.c:184
 msgid "Show Offline Buddies"
-msgstr "Näita ühendamata sõpru"
+msgstr "Ühendamata sõpru näidatakse"
 
 #: ../finch/gntprefs.c:191
 msgid "Notify buddies when you are typing"
@@ -1302,12 +1346,12 @@
 msgstr "Uueks olekuks saab"
 
 #. Conversations
-#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2028
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2030
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Vestlused"
 
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1464 ../pidgin/gtkprefs.c:2039
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1466 ../pidgin/gtkprefs.c:2041
 msgid "Logging"
 msgstr "Logimine"
 
@@ -1315,106 +1359,106 @@
 msgid "Not implemented yet."
 msgstr "Pole veel teostatud."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1552
-#: ../pidgin/gtkrequest.c:1598
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1555
+#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Faili salvestamine..."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1553
-#: ../pidgin/gtkrequest.c:1599
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Faili avamine..."
 
-#: ../finch/gntsound.c:94 ../pidgin/gtksound.c:63
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "Sõber logib sisse"
 
-#: ../finch/gntsound.c:95 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "Sõber logib välja"
 
-#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
 msgid "Message received"
 msgstr "Sõnum võetakse vastu"
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "Sõnumi vastuvõtmine alustab vestlust"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
 msgid "Message sent"
 msgstr "Saadetakse sõnumit"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Isik siseneb jututuppa"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Isik väljub jututoast"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
 msgid "You talk in chat"
 msgstr "Sa kõneled jututoas"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Teisted kõnelevad jututoas"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:74
+#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:74
 msgid "Someone says your screen name in chat"
 msgstr "Keegi ütleb vestluses sinu nime"
 
-#: ../finch/gntsound.c:357 ../pidgin/gtksound.c:310
+#: ../finch/gntsound.c:360 ../pidgin/gtksound.c:310
 msgid "GStreamer Failure"
 msgstr "GStreamer'i tõrge"
 
-#: ../finch/gntsound.c:358 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
 msgid "GStreamer failed to initialize."
 msgstr "Tõrge GStreamer'i lähtestamisel."
 
-#: ../finch/gntsound.c:706 ../finch/gntsound.c:791 ../pidgin/gtkprefs.c:1584
-#: ../pidgin/gtkprefs.c:1673 ../pidgin/gtkprefs.c:1867
+#: ../finch/gntsound.c:715 ../finch/gntsound.c:801 ../pidgin/gtkprefs.c:1586
+#: ../pidgin/gtkprefs.c:1675 ../pidgin/gtkprefs.c:1869
 msgid "(default)"
 msgstr "(vaikimisi)"
 
-#: ../finch/gntsound.c:719
+#: ../finch/gntsound.c:728
 msgid "Select Sound File ..."
 msgstr "Helifaili valimine..."
 
-#: ../finch/gntsound.c:893
+#: ../finch/gntsound.c:903
 msgid "Sound Preferences"
 msgstr "Helide eelistused"
 
-#: ../finch/gntsound.c:904
+#: ../finch/gntsound.c:914
 msgid "Profiles"
 msgstr "Profiilid"
 
-#: ../finch/gntsound.c:943 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:953 ../pidgin/gtkprefs.c:1714
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: ../finch/gntsound.c:946
+#: ../finch/gntsound.c:956
 msgid "Console Beep"
 msgstr "Konsoolipiiks"
 
-#: ../finch/gntsound.c:947 ../pidgin/gtkprefs.c:1716
+#: ../finch/gntsound.c:957 ../pidgin/gtkprefs.c:1718
 msgid "Command"
 msgstr "Käsk"
 
-#: ../finch/gntsound.c:948
+#: ../finch/gntsound.c:958
 msgid "No Sound"
 msgstr "Helid puuduvad"
 
-#: ../finch/gntsound.c:950 ../pidgin/gtkprefs.c:1707
+#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1709
 msgid "Sound Method"
 msgstr "Helitegemise meetod"
 
-#: ../finch/gntsound.c:955
+#: ../finch/gntsound.c:965
 msgid "Method: "
 msgstr "Meetod: "
 
-#: ../finch/gntsound.c:962
+#: ../finch/gntsound.c:972
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1424,55 +1468,55 @@
 "(%s failinime jaoks)"
 
 #. Sound options
-#: ../finch/gntsound.c:970 ../pidgin/gtkprefs.c:1751
+#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1753
 msgid "Sound Options"
 msgstr "Helide valikud"
 
-#: ../finch/gntsound.c:971
+#: ../finch/gntsound.c:981
 msgid "Sounds when conversation has focus"
 msgstr "Heli fookusesse sattumise korral"
 
-#: ../finch/gntsound.c:979 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:1758 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:989 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:1760 ../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:980 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:1758
 msgid "Only when available"
 msgstr "Kui ma olen saadaval"
 
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1757
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1759
 msgid "Only when not available"
 msgstr "Kui mind pole saadaval"
 
-#: ../finch/gntsound.c:988
+#: ../finch/gntsound.c:998
 msgid "Volume(0-100):"
 msgstr "Valjus(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1005 ../pidgin/gtkprefs.c:1793
+#: ../finch/gntsound.c:1017 ../pidgin/gtkprefs.c:1795
 msgid "Sound Events"
 msgstr "Helisündmused"
 
-#: ../finch/gntsound.c:1007 ../pidgin/gtkprefs.c:1852
+#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1854
 msgid "Event"
 msgstr "Sündmus"
 
-#: ../finch/gntsound.c:1007
+#: ../finch/gntsound.c:1019
 msgid "File"
 msgstr "Fail"
 
-#: ../finch/gntsound.c:1026 ../pidgin/gtkprefs.c:1871
+#: ../finch/gntsound.c:1038 ../pidgin/gtkprefs.c:1873
 msgid "Test"
 msgstr "Proovi"
 
-#: ../finch/gntsound.c:1029 ../pidgin/gtkprefs.c:1875
+#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:1877
 msgid "Reset"
 msgstr "Algväärtusta"
 
-#: ../finch/gntsound.c:1032 ../pidgin/gtkprefs.c:1879
+#: ../finch/gntsound.c:1044 ../pidgin/gtkprefs.c:1881
 msgid "Choose..."
 msgstr "Vali..."
 
@@ -1489,7 +1533,7 @@
 msgid "Saved Statuses"
 msgstr "Salvestatud olekud"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:535
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:538
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:973
 #: ../libpurple/protocols/novell/novell.c:1484
@@ -1501,48 +1545,57 @@
 msgid "Type"
 msgstr "Liik"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:560 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:249
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:563 ../finch/gntstatus.c:575
 #: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:339
+#: ../libpurple/protocols/bonjour/bonjour.c:263
+#: ../libpurple/protocols/bonjour/bonjour.c:346
 #: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
 #: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
 #: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
 #: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1244
-#: ../libpurple/protocols/jabber/jabber.c:1254
-#: ../libpurple/protocols/jabber/jabber.c:1264
-#: ../libpurple/protocols/jabber/jabber.c:1274
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/jabber/jabber.c:1296
+#: ../libpurple/protocols/jabber/jabber.c:1235
+#: ../libpurple/protocols/jabber/jabber.c:1245
+#: ../libpurple/protocols/jabber/jabber.c:1255
+#: ../libpurple/protocols/jabber/jabber.c:1265
+#: ../libpurple/protocols/jabber/jabber.c:1275
+#: ../libpurple/protocols/jabber/jabber.c:1287
+#: ../libpurple/protocols/myspace/myspace.c:148
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5502
-#: ../libpurple/protocols/oscar/oscar.c:5720
-#: ../libpurple/protocols/oscar/oscar.c:5734
-#: ../libpurple/protocols/oscar/oscar.c:5750
-#: ../libpurple/protocols/oscar/oscar.c:5757
-#: ../libpurple/protocols/oscar/oscar.c:5764
-#: ../libpurple/protocols/sametime/sametime.c:3287
-#: ../libpurple/protocols/sametime/sametime.c:3293
-#: ../libpurple/protocols/sametime/sametime.c:3299
-#: ../libpurple/protocols/sametime/sametime.c:3378
+#: ../libpurple/protocols/oscar/oscar.c:5555
+#: ../libpurple/protocols/oscar/oscar.c:5773
+#: ../libpurple/protocols/oscar/oscar.c:5787
+#: ../libpurple/protocols/oscar/oscar.c:5803
+#: ../libpurple/protocols/oscar/oscar.c:5810
+#: ../libpurple/protocols/oscar/oscar.c:5817
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3590
-#: ../libpurple/protocols/yahoo/yahoo.c:3596
+#: ../libpurple/protocols/yahoo/yahoo.c:3753
+#: ../libpurple/protocols/yahoo/yahoo.c:3759
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "Sõnum"
 
 #. Use
-#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:589
+#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:592
 msgid "Use"
-msgstr ""
+msgstr "Kasuta"
 
 #: ../finch/gntstatus.c:300
 msgid "Invalid title"
@@ -1552,56 +1605,77 @@
 msgid "Please enter a non-empty title for the status."
 msgstr "Palun määra olekule pealkiri, mis poleks tühi string."
 
-#: ../finch/gntstatus.c:308
+#: ../finch/gntstatus.c:309
 msgid "Duplicate title"
 msgstr "Topeltpealkiri"
 
-#: ../finch/gntstatus.c:309
+#: ../finch/gntstatus.c:310
 msgid "Please enter a different title for the status."
 msgstr "Palun sisesta olekule teistsugune pealkiri."
 
-#: ../finch/gntstatus.c:449
+#: ../finch/gntstatus.c:451
 msgid "Substatus"
 msgstr "Alamolek"
 
-#: ../finch/gntstatus.c:460 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:463 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Olek:"
 
-#: ../finch/gntstatus.c:475
+#: ../finch/gntstatus.c:478
 msgid "Message:"
 msgstr "Sõnum:"
 
-#: ../finch/gntstatus.c:524
+#: ../finch/gntstatus.c:527
 msgid "Edit Status"
 msgstr ""
 
-#: ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:569
 msgid "Use different status for following accounts"
 msgstr "Järgnevate kontode jaoks kasutatakse teistsugust olekut"
 
 #. Save & Use
-#: ../finch/gntstatus.c:600
+#: ../finch/gntstatus.c:603
 msgid "Save & Use"
-msgstr "Sal_vesta ja kasuta"
-
-#: ../finch/gntui.c:87 ../pidgin/gtkprefs.c:2030
+msgstr "Salvesta ja kasuta"
+
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr "Sertifikaadid"
+
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2032
 msgid "Sounds"
 msgstr "Helid"
 
-#: ../finch/gntui.c:89
+#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "Olekud"
 
-#: ../finch/plugins/gntclipboard.c:149
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+msgid "Error loading the plugin."
+msgstr "Viga plugina mälust laadimisel."
+
+#: ../finch/plugins/gntclipboard.c:116
+msgid "Couldn't find X display"
+msgstr "X-kuva pole võimalik leida"
+
+#: ../finch/plugins/gntclipboard.c:122
+msgid "Couldn't find window"
+msgstr "Akend pole võimalik leida"
+
+#: ../finch/plugins/gntclipboard.c:129
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr "Seda pluginat pole võimalik laadida kuna pluginal pole X11 tuge."
+
+#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
-msgstr ""
-
-#: ../finch/plugins/gntclipboard.c:151
+msgstr "GntLõikelaud"
+
+#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Lõikelaua plugin"
 
-#: ../finch/plugins/gntclipboard.c:152
+#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -1677,7 +1751,7 @@
 
 #: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
 msgid "History Plugin Requires Logging"
-msgstr ""
+msgstr "Ajaloo plugina kasutamiseks peab logimine olema lubatud"
 
 #: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
 msgid ""
@@ -1686,10 +1760,14 @@
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
+"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
 msgid "GntHistory"
-msgstr ""
+msgstr "GntAjalugu"
 
 #: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
@@ -1713,11 +1791,11 @@
 
 #: ../finch/plugins/lastlog.c:121
 msgid "GntLastlog"
-msgstr ""
+msgstr "GntViimaneLogi"
 
 #: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
 msgid "Lastlog plugin."
-msgstr ""
+msgstr "Viimase logi plugin."
 
 #: ../libpurple/account.c:790
 msgid "accounts"
@@ -1747,12 +1825,12 @@
 msgstr "%s jaoks pole protokollipluginat"
 
 #: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4019
+#: ../pidgin/gtkblist.c:4033
 msgid "Connection Error"
 msgstr "Ühenduse viga"
 
 #: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1334
+#: ../libpurple/protocols/jabber/jabber.c:1325
 msgid "New passwords do not match."
 msgstr "Uued paroolid ei klapi omavahel."
 
@@ -1790,7 +1868,7 @@
 msgid "Set User Info"
 msgstr "Määra kasutajateave"
 
-#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/account.c:1735 ../libpurple/protocols/gg/gg.c:1012
 #: ../libpurple/protocols/jabber/buddy.c:642
 #: ../libpurple/protocols/jabber/buddy.c:1462
 #: ../libpurple/protocols/jabber/buddy.c:1479
@@ -1799,9 +1877,10 @@
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
-#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5321 ../pidgin/plugins/gevolution/gevolution.c:96
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1301
+#: ../libpurple/blist.c:1530 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3232 ../pidgin/gtkblist.c:5367
+#: ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "Sõbrad"
@@ -1831,58 +1910,58 @@
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
-#: ../libpurple/conversation.c:170
+#: ../libpurple/conversation.c:171
 msgid "Unable to send message: The message is too large."
 msgstr "Sõnumit pole võimalik saata: Sõnum on liiga suur."
 
-#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
+#: ../libpurple/conversation.c:174 ../libpurple/conversation.c:187
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Kasutajale %s pole võimalik sõnumit saata."
 
-#: ../libpurple/conversation.c:174
+#: ../libpurple/conversation.c:175
 msgid "The message is too large."
 msgstr "Sõnum on liiga suur."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
+#: ../libpurple/conversation.c:184 ../libpurple/protocols/bonjour/jabber.c:255
 #: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "Sõnumit pole võimalik saata."
 
-#: ../libpurple/conversation.c:1169
+#: ../libpurple/conversation.c:1215
 msgid "Send Message"
 msgstr "Sõnumi saatmine"
 
-#: ../libpurple/conversation.c:1172
+#: ../libpurple/conversation.c:1218
 msgid "_Send Message"
 msgstr "_Saada sõnum"
 
-#: ../libpurple/conversation.c:1578
+#: ../libpurple/conversation.c:1624
 #, c-format
 msgid "%s entered the room."
 msgstr "%s sisenes tuppa."
 
-#: ../libpurple/conversation.c:1581
+#: ../libpurple/conversation.c:1627
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] sisenes tuppa."
 
-#: ../libpurple/conversation.c:1691
+#: ../libpurple/conversation.c:1737
 #, c-format
 msgid "You are now known as %s"
 msgstr "Sa oled nüüd nimega %s"
 
-#: ../libpurple/conversation.c:1711
+#: ../libpurple/conversation.c:1757
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nüüd nimega %s"
 
-#: ../libpurple/conversation.c:1786
+#: ../libpurple/conversation.c:1832
 #, c-format
 msgid "%s left the room."
 msgstr "%s väljus toast."
 
-#: ../libpurple/conversation.c:1789
+#: ../libpurple/conversation.c:1835
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s väljus toast (%s)."
@@ -1890,7 +1969,7 @@
 #: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
-msgstr ""
+msgstr "Tõrge ühenduse hankimisel: %s"
 
 #: ../libpurple/dbus-server.c:596
 #, c-format
@@ -1900,7 +1979,7 @@
 #: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
-msgstr ""
+msgstr "Tõrge serveri nime hankimisel: %s"
 
 #: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
@@ -2085,7 +2164,7 @@
 
 #: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
-msgstr ""
+msgstr "Käsu käivitamine terminalis"
 
 #: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
@@ -2312,7 +2391,7 @@
 
 #: ../libpurple/plugin.c:380
 msgid "This plugin has not defined an ID."
-msgstr ""
+msgstr "See plugin pole ID-d defineerinud."
 
 #: ../libpurple/plugin.c:448
 #, c-format
@@ -2326,7 +2405,7 @@
 
 #: ../libpurple/plugin.c:482
 msgid "Plugin does not implement all required functions"
-msgstr ""
+msgstr "Pluginal pole kõik vajalikud funktsioonid realiseeritud"
 
 #: ../libpurple/plugin.c:547
 #, c-format
@@ -2334,6 +2413,7 @@
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
+"Vajalikku pluginat %s ei leitud. Palun paigalda see plugin ja proovi uuesti."
 
 #: ../libpurple/plugin.c:552
 msgid "Unable to load the plugin"
@@ -2342,7 +2422,7 @@
 #: ../libpurple/plugin.c:574
 #, c-format
 msgid "The required plugin %s was unable to load."
-msgstr ""
+msgstr "Vajalikku pluginat %s pole võimalik laadida."
 
 #: ../libpurple/plugin.c:578
 msgid "Unable to load your plugin."
@@ -2394,10 +2474,10 @@
 #: ../libpurple/protocols/oscar/oscar.c:1451
 #: ../libpurple/protocols/oscar/oscar.c:2243
 #: ../libpurple/protocols/oscar/oscar.c:2292
-#: ../libpurple/protocols/oscar/oscar.c:5834
-#: ../libpurple/protocols/oscar/oscar.c:5889
-#: ../libpurple/protocols/oscar/oscar.c:6115
-#: ../libpurple/protocols/oscar/oscar.c:6185 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:5887
+#: ../libpurple/protocols/oscar/oscar.c:5942
+#: ../libpurple/protocols/oscar/oscar.c:6168
+#: ../libpurple/protocols/oscar/oscar.c:6238 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "_Loobu"
@@ -2439,8 +2519,8 @@
 "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:1629
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1666
+#: ../libpurple/protocols/msn/msn.c:1696
 msgid "Notes"
 msgstr "Märkused"
 
@@ -2857,24 +2937,24 @@
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%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 ""
 
-#: ../libpurple/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:157
-msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr ""
-
 #: ../libpurple/plugins/offlinemsg.c:161
+msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
+msgstr ""
+
+#: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:559 ../libpurple/protocols/msn/msn.c:569
 #: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
@@ -2884,9 +2964,9 @@
 msgid "Yes"
 msgstr "Jah"
 
-#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:559 ../libpurple/protocols/msn/msn.c:569
 #: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
@@ -2896,11 +2976,11 @@
 msgid "No"
 msgstr "Ei"
 
-#: ../libpurple/plugins/offlinemsg.c:189
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:193
+#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
@@ -3010,13 +3090,19 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "SSL tugiteekide kasutamise tagamine (mähkurina)."
 
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../libpurple/plugins/ssl/ssl-nss.c:633
+msgid "X.509 Certificates"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3024,8 +3110,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
 msgid "Provides SSL support through GNUTLS."
 msgstr "SSL toe tagamine GNUTLS-i abil."
 
@@ -3035,7 +3121,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:423
+#: ../libpurple/plugins/ssl/ssl-nss.c:718
 msgid "NSS"
 msgstr "NSS"
 
@@ -3043,8 +3129,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:426
-#: ../libpurple/plugins/ssl/ssl-nss.c:428
+#: ../libpurple/plugins/ssl/ssl-nss.c:721
+#: ../libpurple/plugins/ssl/ssl-nss.c:723
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "SSL toe tagamine Mozilla NSS_i abil."
 
@@ -3137,21 +3223,21 @@
 msgstr ""
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/bonjour/bonjour.c:614
+#: ../libpurple/protocols/bonjour/bonjour.c:351
+#: ../libpurple/protocols/bonjour/bonjour.c:656
 #: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:828
+#: ../libpurple/protocols/jabber/jabber.c:819
 msgid "First name"
 msgstr "Eesnimi"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/bonjour/bonjour.c:617
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:659
 #: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:833
+#: ../libpurple/protocols/jabber/jabber.c:824
 msgid "Last name"
 msgstr "Perekonnanimi"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:350
+#: ../libpurple/protocols/bonjour/bonjour.c:357
 #: ../libpurple/protocols/jabber/buddy.c:283
 #: ../libpurple/protocols/jabber/buddy.c:940
 #: ../libpurple/protocols/jabber/buddy.c:948
@@ -3164,13 +3250,13 @@
 msgid "E-Mail"
 msgstr "E-post"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:623
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/bonjour/bonjour.c:665
 msgid "AIM Account"
 msgstr "AIM-i konto"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:356
-#: ../libpurple/protocols/bonjour/bonjour.c:626
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/bonjour/bonjour.c:668
 msgid "XMPP Account"
 msgstr "XMPP konto"
 
@@ -3184,27 +3270,25 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:460
-#: ../libpurple/protocols/bonjour/bonjour.c:462
+#: ../libpurple/protocols/bonjour/bonjour.c:467
+#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour protokolli plugin"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:505
-#: ../libpurple/protocols/bonjour/bonjour.c:512
-#: ../libpurple/protocols/bonjour/bonjour.c:561
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 msgid "Purple Person"
 msgstr ""
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:610
+#: ../libpurple/protocols/bonjour/bonjour.c:652
 #: ../libpurple/protocols/silc/silc.c:1007
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Hostinimi"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:620
+#: ../libpurple/protocols/bonjour/bonjour.c:662
 #: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/jabber/jabber.c:809
 #: ../libpurple/protocols/silc/silc.c:770
 #: ../libpurple/protocols/silc/silc.c:1011
 #: ../libpurple/protocols/silc10/silc.c:681
@@ -3214,32 +3298,32 @@
 
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
-msgstr ""
-
-#: ../libpurple/protocols/bonjour/jabber.c:383
+msgstr "Bonjour"
+
+#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s sulges vestluse."
 
-#: ../libpurple/protocols/bonjour/jabber.c:435
-#: ../libpurple/protocols/bonjour/jabber.c:658
-#: ../libpurple/protocols/bonjour/jabber.c:676
+#: ../libpurple/protocols/bonjour/jabber.c:437
+#: ../libpurple/protocols/bonjour/jabber.c:660
+#: ../libpurple/protocols/bonjour/jabber.c:678
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:581
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Cannot open socket"
 msgstr "Soklit pole võimalik avada"
 
-#: ../libpurple/protocols/bonjour/jabber.c:589
+#: ../libpurple/protocols/bonjour/jabber.c:591
 msgid "Error setting socket options"
 msgstr "Viga soklivalikute seadmisel"
 
-#: ../libpurple/protocols/bonjour/jabber.c:613
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not bind socket to port"
 msgstr "Soklit pole võimalik porti kuulama panna"
 
-#: ../libpurple/protocols/bonjour/jabber.c:621
+#: ../libpurple/protocols/bonjour/jabber.c:623
 msgid "Could not listen on socket"
 msgstr "Soklit pole võimalik kuulata"
 
@@ -3316,8 +3400,8 @@
 msgstr "Registreerimine edukalt läbi viidud!"
 
 #: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:798
+#: ../libpurple/protocols/jabber/jabber.c:1360
 msgid "Password"
 msgstr "Parool"
 
@@ -3343,9 +3427,9 @@
 
 #: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
 #: ../libpurple/protocols/gg/gg.c:1121
-#: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3757
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/jabber/jabber.c:834
+#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3812
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Linn"
@@ -3354,8 +3438,8 @@
 msgid "Year of birth"
 msgstr "Sünniaasta"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
 #: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
@@ -3368,14 +3452,14 @@
 msgstr "Mees või naine"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Mees"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
@@ -3438,12 +3522,12 @@
 #: ../libpurple/protocols/jabber/buddy.c:1466
 #: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5552
+#: ../libpurple/protocols/oscar/oscar.c:5605
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:2938 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3082 ../pidgin/gtkblist.c:3419
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3101 ../pidgin/gtkblist.c:3433
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1060
 msgid "Offline"
 msgstr "Ühendamata"
 
@@ -3453,41 +3537,41 @@
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:2940 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
+#: ../libpurple/protocols/yahoo/yahoo.c:3103 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1056
 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:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
 #: ../libpurple/protocols/jabber/buddy.c:1472
 #: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:4504
-#: ../libpurple/protocols/oscar/oscar.c:5580
+#: ../libpurple/protocols/oscar/oscar.c:4557
+#: ../libpurple/protocols/oscar/oscar.c:5633
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
 #: ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
-#: ../libpurple/protocols/yahoo/yahoo.c:3566 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1934
-#: ../pidgin/gtkstatusbox.c:1056
+#: ../libpurple/protocols/yahoo/yahoo.c:3655
+#: ../libpurple/protocols/yahoo/yahoo.c:3729 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1936
+#: ../pidgin/gtkstatusbox.c:1057
 msgid "Away"
 msgstr "Eemal"
 
 #: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2669
-#: ../libpurple/protocols/oscar/oscar.c:3667
+#: ../libpurple/protocols/oscar/oscar.c:2709
+#: ../libpurple/protocols/oscar/oscar.c:3709
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
 #: ../libpurple/protocols/jabber/buddy.c:1623
 #: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:3678
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
@@ -3498,7 +3582,7 @@
 msgstr "Sünniaasta"
 
 #: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
-#: ../libpurple/protocols/oscar/oscar.c:3879
+#: ../libpurple/protocols/oscar/oscar.c:3921
 msgid "Unable to display the search results."
 msgstr "Otsingutulemusi pole võimalik kuvada."
 
@@ -3542,7 +3626,7 @@
 msgid "Connection failed."
 msgstr "Tõrge ühendumisel."
 
-#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:568
 msgid "Blocked"
 msgstr "Blokitud"
 
@@ -3679,7 +3763,8 @@
 msgstr "%s päevasõnum"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
+#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2339
 msgid "Server has disconnected"
 msgstr "Server katkestas ühenduse"
 
@@ -3690,10 +3775,10 @@
 #: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
-msgstr "_Kanal:"
+msgstr "Ka_nal:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "_Parool:"
 
@@ -3701,65 +3786,62 @@
 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:319
-#: ../libpurple/protocols/jabber/jabber.c:1046
+#: ../libpurple/protocols/jabber/jabber.c:1037
 #: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:301
 #: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1285
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3724
+#: ../libpurple/protocols/sametime/sametime.c:3723
 #: ../libpurple/protocols/simple/simple.c:1676
-#: ../libpurple/protocols/yahoo/yahoo.c:2783
+#: ../libpurple/protocols/yahoo/yahoo.c:2941
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Ühendumine"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:603
-#: ../libpurple/protocols/jabber/jabber.c:950
+#: ../libpurple/protocols/jabber/jabber.c:594
+#: ../libpurple/protocols/jabber/jabber.c:941
 msgid "SSL support unavailable"
 msgstr "SSL-i tugi pole saadaval"
 
+#. TODO: try other ports if in auto mode, then save
+#. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/myspace/myspace.c:317
 #: ../libpurple/protocols/simple/simple.c:464
 #: ../libpurple/protocols/simple/simple.c:1591
 msgid "Couldn't create socket"
 msgstr "Soklit pole võimalik luua"
 
-#: ../libpurple/protocols/irc/irc.c:416
+#: ../libpurple/protocols/irc/irc.c:421
+#: ../libpurple/protocols/myspace/myspace.c:2452
 #: ../libpurple/protocols/oscar/oscar.c:1281
 msgid "Couldn't connect to host"
 msgstr "Hostiga pole võimalik ühenduda"
 
-#: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:499
-msgid "Connection Failed"
-msgstr "Tõrge ühendumisel"
-
-#: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:502
-msgid "SSL Handshake Failed"
-msgstr "Tõrge SSL käepigistusel"
-
-#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
+#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2335
 msgid "Read error"
 msgstr "Viga lugemisel"
 
-#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/irc/irc.c:773
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1401
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Kasutajad"
 
-#: ../libpurple/protocols/irc/irc.c:778
-#: ../libpurple/protocols/sametime/sametime.c:3375
+#: ../libpurple/protocols/irc/irc.c:776
+#: ../libpurple/protocols/sametime/sametime.c:3374
 #: ../libpurple/protocols/silc/chat.c:1415
 #: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1410
+#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "Teema"
 
@@ -3771,21 +3853,21 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr "IRC protokolli plugin"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:917
+#: ../libpurple/protocols/irc/irc.c:915
 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:942 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6619
+#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2196
+#: ../libpurple/protocols/oscar/oscar.c:6672
 #: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5728
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
@@ -3796,22 +3878,22 @@
 msgstr "Server"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6622
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2201
+#: ../libpurple/protocols/oscar/oscar.c:6675
 #: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5733
+#: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
 #: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:948
+#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "Kooditabelid"
 
-#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:794
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -3827,7 +3909,7 @@
 msgid "Username"
 msgstr "Kasutajanimi"
 
-#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
@@ -3837,7 +3919,7 @@
 #. 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:962
+#: ../libpurple/protocols/irc/irc.c:960
 msgid "Use SSL"
 msgstr "Kasutatakse SSL-i"
 
@@ -3865,10 +3947,10 @@
 
 #: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
-msgstr ""
+msgstr " <i>(tuvastatud)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3668
+#: ../libpurple/protocols/oscar/oscar.c:3710
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -3927,11 +4009,11 @@
 #: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
-msgstr ""
+msgstr "Kanali %s kasutajad: %s"
 
 #: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
-msgstr ""
+msgstr "Ajavastus"
 
 #: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
@@ -3970,14 +4052,14 @@
 #: ../libpurple/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have been kicked by %s: (%s)"
-msgstr "Sind löödi %s poolt välja (%s)"
+msgstr "Sind löödi kasutaja %s poolt välja (%s)"
 
 #. Remove user from channel
 #: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
-msgstr "Välja löödyd %s poolt (%s)"
+msgstr "Välja löödud kasutaja %s poolt (%s)"
 
 #: ../libpurple/protocols/irc/msgs.c:823
 #, c-format
@@ -4079,7 +4161,7 @@
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
-msgstr ""
+msgstr "invite &lt;hüüdnimi&gt; [kanal]:  Kellegi kutsumine kanalile."
 
 #: ../libpurple/protocols/irc/parse.c:128
 msgid ""
@@ -4098,6 +4180,8 @@
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr ""
+"kick &lt;hüüdnimi&gt; [sõnum]:  Kellegi kanalilt eemaldamine. Eemaldamiseks "
+"pead sa olema kanali operaator."
 
 #: ../libpurple/protocols/irc/parse.c:131
 msgid ""
@@ -4127,12 +4211,12 @@
 
 #: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
-msgstr ""
+msgstr "names [kanal]:  Kanalil olevate kasutajate nimekiri."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1830
+#: ../libpurple/protocols/jabber/jabber.c:1821
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr ""
+msgstr "nick &lt;uus hüüdnimi&gt;:  Sinu hüüdnime muutmine."
 
 #: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
@@ -4175,6 +4259,8 @@
 #: ../libpurple/protocols/irc/parse.c:145
 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
 msgid "quote [...]:  Send a raw command to the server."
@@ -4188,11 +4274,11 @@
 
 #: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
-msgstr ""
+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 ""
+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."
@@ -4200,7 +4286,7 @@
 
 #: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr ""
+msgstr "version [hüüdnimi]: CTCP VERSION päringu saatmine kasutajale"
 
 #: ../libpurple/protocols/irc/parse.c:152
 msgid ""
@@ -4216,11 +4302,11 @@
 
 #: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr ""
+msgstr "whois [server] &lt;hüüdnimi&gt;: Kasutaja kohta teabe hankimine."
 
 #: ../libpurple/protocols/irc/parse.c:155
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr ""
+msgstr "whowas &lt;hüüdnimi&gt;: Väljalogitud kasutaja kohta teabe hankimine."
 
 #: ../libpurple/protocols/irc/parse.c:465
 #, c-format
@@ -4240,7 +4326,7 @@
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
-msgstr "Lahti ühendatud."
+msgstr "Ühendus katkestatud."
 
 #: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
@@ -4291,6 +4377,8 @@
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr ""
+"See server nõuab avatekstilist autentimist üle krüptimata ühenduse.  Kas "
+"seda peaks lubama ja autentimist jätkama?"
 
 #: ../libpurple/protocols/jabber/auth.c:769
 #: ../libpurple/protocols/jabber/auth.c:792
@@ -4303,7 +4391,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:271
 #: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/sametime/sametime.c:4129
+#: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
@@ -4322,7 +4410,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:863
+#: ../libpurple/protocols/jabber/jabber.c:854
 msgid "URL"
 msgstr "URL"
 
@@ -4381,14 +4469,14 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:288
 #: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/msn/msn.c:1664
+#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Birthday"
 msgstr "Sünnipäev"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
 #: ../libpurple/protocols/jabber/buddy.c:979
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3093
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3113
 #: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Kirjeldus"
@@ -4423,11 +4511,11 @@
 msgstr "Vahend"
 
 #: ../libpurple/protocols/jabber/buddy.c:671
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1283
+#: ../libpurple/protocols/jabber/jabber.c:1234
+#: ../libpurple/protocols/jabber/jabber.c:1244
+#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1264
+#: ../libpurple/protocols/jabber/jabber.c:1274
 msgid "Priority"
 msgstr "Tähtsus"
 
@@ -4438,9 +4526,9 @@
 msgstr "Keskmine nimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3756
-#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../libpurple/protocols/jabber/jabber.c:829
+#: ../libpurple/protocols/oscar/oscar.c:3798
+#: ../libpurple/protocols/oscar/oscar.c:3811
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -4484,7 +4572,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:1470
-#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/jabber.c:1243
 msgid "Chatty"
 msgstr "Lobisev"
 
@@ -4493,10 +4581,10 @@
 msgstr "Kaua eemal"
 
 #: ../libpurple/protocols/jabber/buddy.c:1476
-#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/jabber/jabber.c:1273
 #: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5756
-#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/oscar/oscar.c:5809
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Mitte segada"
 
@@ -4506,13 +4594,13 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1625
 #: ../libpurple/protocols/jabber/buddy.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:3679
+#: ../libpurple/protocols/oscar/oscar.c:3721
 msgid "Last Name"
 msgstr "Perekonnanimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:1657
 msgid "The following are the results of your search"
-msgstr ""
+msgstr "Järgneb sinu otsingu tulemus"
 
 #. current comment from Jabber User Directory users.jabber.org
 #: ../libpurple/protocols/jabber/buddy.c:1732
@@ -4542,8 +4630,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1814
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3682
-#: ../libpurple/protocols/oscar/oscar.c:3691
+#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/oscar/oscar.c:3733
 msgid "E-Mail Address"
 msgstr "E-posti aadress"
 
@@ -4559,7 +4647,7 @@
 #: ../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:5612
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
@@ -4582,8 +4670,8 @@
 msgstr "Kataloogist otsimine"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5242
-#: ../libpurple/protocols/yahoo/yahoochat.c:962
+#: ../libpurple/protocols/oscar/oscar.c:5295
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Tuba:"
 
@@ -4667,7 +4755,7 @@
 
 #: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
-msgstr "Vali jututoaserver, kuhu päring esitada"
+msgstr "Vali konverentsiserver, kuhu päring esitada"
 
 #: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
@@ -4690,8 +4778,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:467
 #: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2402
-#: ../libpurple/protocols/yahoo/yahoo.c:2434
+#: ../libpurple/protocols/yahoo/yahoo.c:2560
+#: ../libpurple/protocols/yahoo/yahoo.c:2592
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -4700,55 +4788,55 @@
 "Selle serveriga pole võimalik ühendust luua:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:523
+#: ../libpurple/protocols/jabber/jabber.c:514
 msgid "Unable to create socket"
 msgstr "Soklit pole võimalik luua"
 
-#: ../libpurple/protocols/jabber/jabber.c:568
-#: ../libpurple/protocols/jabber/jabber.c:918
+#: ../libpurple/protocols/jabber/jabber.c:559
+#: ../libpurple/protocols/jabber/jabber.c:909
 msgid "Invalid XMPP ID"
 msgstr "Vigane XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:573
+#: ../libpurple/protocols/jabber/jabber.c:564
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Vigane XMPP ID. Domeen peab olema määratud."
 
-#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:635
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Kasutaja %s@%s registreerimine õnnestus"
 
+#: ../libpurple/protocols/jabber/jabber.c:637
+#: ../libpurple/protocols/jabber/jabber.c:638
+msgid "Registration Successful"
+msgstr "Registreerimine õnnestus"
+
+#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:1515
+msgid "Unknown Error"
+msgstr "Tundmatu viga"
+
 #: ../libpurple/protocols/jabber/jabber.c:646
 #: ../libpurple/protocols/jabber/jabber.c:647
-msgid "Registration Successful"
-msgstr "Registreerimine õnnestus"
-
-#: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1524
-msgid "Unknown Error"
-msgstr "Tundmatu viga"
-
-#: ../libpurple/protocols/jabber/jabber.c:655
-#: ../libpurple/protocols/jabber/jabber.c:656
 msgid "Registration Failed"
 msgstr "Tõrge registreerimisel"
 
-#: ../libpurple/protocols/jabber/jabber.c:771
-#: ../libpurple/protocols/jabber/jabber.c:772
+#: ../libpurple/protocols/jabber/jabber.c:762
+#: ../libpurple/protocols/jabber/jabber.c:763
 msgid "Already Registered"
 msgstr "Juba registreeritud"
 
-#: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3758
-#: ../libpurple/protocols/oscar/oscar.c:3771
+#: ../libpurple/protocols/jabber/jabber.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3800
+#: ../libpurple/protocols/oscar/oscar.c:3813
 msgid "State"
 msgstr "Olek"
 
-#: ../libpurple/protocols/jabber/jabber.c:853
+#: ../libpurple/protocols/jabber/jabber.c:844
 msgid "Postal code"
 msgstr "Postiindeks"
 
-#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/jabber/jabber.c:849
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:772
 #: ../libpurple/protocols/silc/util.c:557
@@ -4758,400 +4846,399 @@
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:859
 msgid "Date"
 msgstr "Kuupäev"
 
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:867
 msgid "Please fill out the information below to register your new account."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:879
-#: ../libpurple/protocols/jabber/jabber.c:880
+msgstr "Uue konto registreerimiseks täida palun allpool olevad lahtrid."
+
+#: ../libpurple/protocols/jabber/jabber.c:870
+#: ../libpurple/protocols/jabber/jabber.c:871
 msgid "Register New XMPP Account"
 msgstr "Uue XMPP konto registreerimine"
 
-#. Register button
-#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1523
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Register"
 msgstr "Registreeri"
 
-#: ../libpurple/protocols/jabber/jabber.c:1050
+#: ../libpurple/protocols/jabber/jabber.c:1041
 msgid "Initializing Stream"
 msgstr "Andmevoo lähtestamine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1055
+#: ../libpurple/protocols/jabber/jabber.c:1046
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Autentimine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1064
+#: ../libpurple/protocols/jabber/jabber.c:1055
 msgid "Re-initializing Stream"
 msgstr "Andmevaa taaslähtestamine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1117
+#: ../libpurple/protocols/jabber/jabber.c:1493
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1570
 #: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:5550
+#: ../libpurple/protocols/oscar/oscar.c:5603
 msgid "Not Authorized"
 msgstr "Autoriseerimata"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1159
 msgid "Both"
 msgstr "Mõlemad"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1161
 msgid "From (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1163
 msgid "From"
 msgstr "Saatja"
 
-#: ../libpurple/protocols/jabber/jabber.c:1175
+#: ../libpurple/protocols/jabber/jabber.c:1166
 msgid "To"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "None (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1170
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Puudub"
 
-#: ../libpurple/protocols/jabber/jabber.c:1182
+#: ../libpurple/protocols/jabber/jabber.c:1173
 msgid "Subscription"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1312
+#: ../libpurple/protocols/jabber/jabber.c:1303
 msgid "Password Changed"
 msgstr "Parool muudetud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1313
+#: ../libpurple/protocols/jabber/jabber.c:1304
 msgid "Your password has been changed."
 msgstr "Sinu parool on muudetud."
 
-#: ../libpurple/protocols/jabber/jabber.c:1317
-#: ../libpurple/protocols/jabber/jabber.c:1318
+#: ../libpurple/protocols/jabber/jabber.c:1308
+#: ../libpurple/protocols/jabber/jabber.c:1309
 msgid "Error changing password"
 msgstr "Viga parooli muutmisel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1375
+#: ../libpurple/protocols/jabber/jabber.c:1366
 msgid "Password (again)"
 msgstr "Parool (uuesti)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1372
+#: ../libpurple/protocols/jabber/jabber.c:1373
 msgid "Change XMPP Password"
 msgstr "XMPP parooli muutmine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1373
 msgid "Please enter your new password"
 msgstr "Palun sisesta uus parool"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6336
+#: ../libpurple/protocols/jabber/jabber.c:1385
+#: ../libpurple/protocols/oscar/oscar.c:6389
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Määra kasutajateave..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/oscar/oscar.c:6400
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Parooli muutmine..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1395
 msgid "Search for Users..."
 msgstr "Kasutajate otsimine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1473
 msgid "Bad Request"
 msgstr "Vigane päring"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1477
 msgid "Feature Not Implemented"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1479
 msgid "Forbidden"
 msgstr "Keelatud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1481
 msgid "Gone"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1560
 msgid "Internal Server Error"
 msgstr "Serveri sisemine viga"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1485
 msgid "Item Not Found"
 msgstr "Kirjet ei leitud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1487
 msgid "Malformed XMPP ID"
 msgstr "Vigaselt vormindatud XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1489
 msgid "Not Acceptable"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1491
 msgid "Not Allowed"
 msgstr "Pole lubatud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1495
 msgid "Payment Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1497
 msgid "Recipient Unavailable"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1501
 msgid "Registration Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1503
 msgid "Remote Server Not Found"
 msgstr "Kaugserverit ei leitud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1505
 msgid "Remote Server Timeout"
 msgstr "Kaugserver ületas ajapiirangu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1507
 msgid "Server Overloaded"
 msgstr "Server on ülekoormatud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1509
 msgid "Service Unavailable"
 msgstr "Teenus pole saadaval"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1511
 msgid "Subscription Required"
 msgstr ""
 
+#: ../libpurple/protocols/jabber/jabber.c:1513
+msgid "Unexpected Request"
+msgstr "Ootamatu päring"
+
+#: ../libpurple/protocols/jabber/jabber.c:1520
+msgid "Authorization Aborted"
+msgstr "Volituste andmine katkestati"
+
 #: ../libpurple/protocols/jabber/jabber.c:1522
-msgid "Unexpected Request"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1529
-msgid "Authorization Aborted"
-msgstr ""
+msgid "Incorrect encoding in authorization"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1525
+msgid "Invalid authzid"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1528
+msgid "Invalid Authorization Mechanism"
+msgstr "Vigane volituste andmise mehhanism"
 
 #: ../libpurple/protocols/jabber/jabber.c:1531
-msgid "Incorrect encoding in authorization"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1534
-msgid "Invalid authzid"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1537
-msgid "Invalid Authorization Mechanism"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
-msgstr ""
+msgstr "Volituste andmise mehhanism on liiga nõrk"
+
+#: ../libpurple/protocols/jabber/jabber.c:1536
+msgid "Temporary Authentication Failure"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1539
+msgid "Authentication Failure"
+msgstr "Tõrge autentimisel"
 
 #: ../libpurple/protocols/jabber/jabber.c:1545
-msgid "Temporary Authentication Failure"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1548
-msgid "Authentication Failure"
-msgstr "Tõrge autentimisel"
-
-#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "Vigane vorming"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1547
 msgid "Bad Namespace Prefix"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1550
 msgid "Resource Conflict"
 msgstr "Vahendi vastuolu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1552
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Host Gone"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Host Unknown"
 msgstr "Tundmatu host"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1558
 msgid "Improper Addressing"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Invalid ID"
 msgstr "Vigane ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1564
 msgid "Invalid Namespace"
 msgstr "Vigane nimeruum"
 
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1566
 msgid "Invalid XML"
 msgstr "Vigane XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1568
 msgid "Non-matching Hosts"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1581
+msgstr "Mittevastavad hostid"
+
+#: ../libpurple/protocols/jabber/jabber.c:1572
 msgid "Policy Violation"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1574
 msgid "Remote Connection Failed"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1585
+msgstr "Tõrge kaugühenduse loomisel"
+
+#: ../libpurple/protocols/jabber/jabber.c:1576
 msgid "Resource Constraint"
 msgstr "Vahendi piirang"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1578
 msgid "Restricted XML"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1580
 msgid "See Other Host"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "System Shutdown"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1584
 msgid "Undefined Condition"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1586
 msgid "Unsupported Encoding"
 msgstr "Toetamata kooditabel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1588
 msgid "Unsupported Stanza Type"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1590
 msgid "Unsupported Version"
 msgstr "Toetamata versioon"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1592
 msgid "XML Not Well Formed"
 msgstr "XML pole korrektselt vormindatud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1594
 msgid "Stream Error"
 msgstr "Voo viga"
 
-#: ../libpurple/protocols/jabber/jabber.c:1686
+#: ../libpurple/protocols/jabber/jabber.c:1677
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Kasutajat %s pole võimalik tõrjuda"
 
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:1697
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1711
+#: ../libpurple/protocols/jabber/jabber.c:1702
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Tundmatu roll: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1726
 #, 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:1788
+#: ../libpurple/protocols/jabber/jabber.c:1779
 #, c-format
 msgid "Unable to kick user %s"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1822
+msgstr "Kasutajat pole võimalik välja lüüa: %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "config:  Configure a chat room."
-msgstr ""
+msgstr "config:  Jututoa seadistamine."
+
+#: ../libpurple/protocols/jabber/jabber.c:1817
+msgid "configure:  Configure a chat room."
+msgstr "configure:  Jututoa seadistamine."
 
 #: ../libpurple/protocols/jabber/jabber.c:1826
-msgid "configure:  Configure a chat room."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "part [room]:  Leave the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:1831
 msgid "register:  Register with a chat room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1846
+#: ../libpurple/protocols/jabber/jabber.c:1837
 msgid "topic [new topic]:  View or change the topic."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1852
+#: ../libpurple/protocols/jabber/jabber.c:1843
 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:1858
+#: ../libpurple/protocols/jabber/jabber.c:1849
 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:1864
+#: ../libpurple/protocols/jabber/jabber.c:1855
 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:1870
+#: ../libpurple/protocols/jabber/jabber.c:1861
 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:1876
+#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1882
+msgstr "join: &lt;tuba&gt; [server]:  Serveris asuva jututoaga ühinemine."
+
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1887
+msgstr "kick &lt;kasutaja&gt; [tuba]:  Kasutaja toast väljalöömine."
+
+#: ../libpurple/protocols/jabber/jabber.c:1878
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -5173,7 +5260,7 @@
 msgstr "XMPP protokolli plugin"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
+#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:506
 msgid "Domain"
 msgstr "Domeen"
 
@@ -5186,12 +5273,16 @@
 msgstr "Avatekstiline autentimise on krüptimata andmevoo lubatud"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:216
+#: ../libpurple/protocols/myspace/myspace.c:3265
 #: ../libpurple/protocols/simple/simple.c:1861
 msgid "Connect port"
 msgstr "Ühendumisport"
 
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/myspace/myspace.c:3262
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
@@ -5249,24 +5340,26 @@
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
+"Sa lood uut tuba. Kas sa soovid sellele seadistusi määrata või nõustud "
+"vaikimisi seadistustega?"
 
 #: ../libpurple/protocols/jabber/presence.c:374
 msgid "_Configure Room"
-msgstr ""
+msgstr "_Seadista tuba"
 
 #: ../libpurple/protocols/jabber/presence.c:375
 msgid "_Accept Defaults"
-msgstr ""
+msgstr "_Nõustu vaikeväärtustega"
 
 #: ../libpurple/protocols/jabber/presence.c:417
 #, c-format
 msgid "Error in chat %s"
-msgstr ""
+msgstr "Viga vestluses %s"
 
 #: ../libpurple/protocols/jabber/presence.c:421
 #, c-format
 msgid "Error joining chat %s"
-msgstr ""
+msgstr "Viga vestlusega %s ühinemisel"
 
 #: ../libpurple/protocols/jabber/si.c:769
 #, c-format
@@ -5277,7 +5370,7 @@
 #: ../libpurple/protocols/jabber/si.c:771
 #: ../libpurple/protocols/jabber/si.c:839
 msgid "File Send Failed"
-msgstr ""
+msgstr "Tõrge faili saatmisel"
 
 #: ../libpurple/protocols/jabber/si.c:832
 #, c-format
@@ -5448,7 +5541,7 @@
 
 #: ../libpurple/protocols/msn/error.c:147
 msgid "Wrong CHL value sent to server"
-msgstr ""
+msgstr "Serverile saadeti vale CHL-väärtus"
 
 #: ../libpurple/protocols/msn/error.c:152
 msgid "Server busy"
@@ -5554,168 +5647,180 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN-i viga: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:121
+#: ../libpurple/protocols/msn/msn.c:131
+msgid "nudge"
+msgstr "müks"
+
+#: ../libpurple/protocols/msn/msn.c:132
+msgid "nudged"
+msgstr "müksatud"
+
+#: ../libpurple/protocols/msn/msn.c:133
+msgid "Nudging"
+msgstr "Müksamine"
+
+#: ../libpurple/protocols/msn/msn.c:157
 msgid "You have just sent a Nudge!"
 msgstr "Sa müksasid teda!"
 
-#: ../libpurple/protocols/msn/msn.c:146
+#: ../libpurple/protocols/msn/msn.c:183
 msgid "Your new MSN friendly name is too long."
 msgstr "Sinu MSN-i sõbralik nimi on liiga pikk."
 
-#: ../libpurple/protocols/msn/msn.c:254
+#: ../libpurple/protocols/msn/msn.c:291
 msgid "Set your friendly name."
 msgstr "Sõbraliku nime määramine."
 
-#: ../libpurple/protocols/msn/msn.c:255
+#: ../libpurple/protocols/msn/msn.c:292
 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:273
+#: ../libpurple/protocols/msn/msn.c:310
 msgid "Set your home phone number."
 msgstr "Oma kodutelefoni numbri määramine."
 
-#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:327
 msgid "Set your work phone number."
 msgstr "Oma töötelefoni numbri määramine."
 
-#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:344
 msgid "Set your mobile phone number."
 msgstr "Oma mobiiltelefoni numbri määramine."
 
-#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:359
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:323
+#: ../libpurple/protocols/msn/msn.c:360
 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:329
+#: ../libpurple/protocols/msn/msn.c:366
 msgid "Allow"
 msgstr "Luba"
 
-#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:367
 msgid "Disallow"
 msgstr "Ära luba"
 
-#: ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/msn/msn.c:383
 msgid "This Hotmail account may not be active."
 msgstr "See Hotmaili konto võib mitte aktiivne olla."
 
-#: ../libpurple/protocols/msn/msn.c:372
+#: ../libpurple/protocols/msn/msn.c:409
 msgid "Send a mobile message."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:411
 msgid "Page"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:521
+#: ../libpurple/protocols/msn/msn.c:558
 msgid "Has you"
 msgstr "Sina tema loendis"
 
-#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2916
-#: ../libpurple/protocols/yahoo/yahoo.c:3600
+#: ../libpurple/protocols/msn/msn.c:588 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3079
+#: ../libpurple/protocols/yahoo/yahoo.c:3763
 msgid "Be Right Back"
 msgstr "Tulen kohe tagasi"
 
-#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msn/msn.c:592 ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2918
-#: ../libpurple/protocols/yahoo/yahoo.c:3603
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
 msgid "Busy"
 msgstr "Hõivatud"
 
-#: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2926
-#: ../libpurple/protocols/yahoo/yahoo.c:3615
+#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "On the Phone"
 msgstr "Räägin telefoniga"
 
-#: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2930
-#: ../libpurple/protocols/yahoo/yahoo.c:3621
+#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Out to Lunch"
 msgstr "Lõunal"
 
-#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Friendly Name..."
 msgstr "Määra sõbralik nimi..."
 
-#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/msn/msn.c:633
 msgid "Set Home Phone Number..."
 msgstr "Määra kodutelefoni number..."
 
-#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/msn/msn.c:637
 msgid "Set Work Phone Number..."
 msgstr "Määra töötelefoni number..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:641
 msgid "Set Mobile Phone Number..."
 msgstr "Määra mobiiltelefoni number..."
 
-#: ../libpurple/protocols/msn/msn.c:610
+#: ../libpurple/protocols/msn/msn.c:647
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Mobiilseadmete lubamine/keelamine"
 
-#: ../libpurple/protocols/msn/msn.c:615
+#: ../libpurple/protocols/msn/msn.c:652
 msgid "Allow/Disallow Mobile Pages..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:626
+#: ../libpurple/protocols/msn/msn.c:663
 msgid "Open Hotmail Inbox"
 msgstr "Ava Hotmaili postkast"
 
-#: ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:687
 msgid "Send to Mobile"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/msn/msn.c:697
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Algata _jututuba"
 
-#: ../libpurple/protocols/msn/msn.c:698
+#: ../libpurple/protocols/msn/msn.c:735
 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:723
+#: ../libpurple/protocols/msn/msn.c:760
 msgid "Failed to connect to server."
 msgstr "Tõrge serveriga ühendumisel."
 
-#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msn/msn.c:1516 ../libpurple/protocols/msn/msn.c:1864
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Viga profiili vastuvõtmisel"
 
-#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1587 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Üldine"
 
-#: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/oscar/oscar.c:3765
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Vanus"
 
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1596
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Amet"
 
-#: ../libpurple/protocols/msn/msn.c:1560
+#: ../libpurple/protocols/msn/msn.c:1597
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5723,195 +5828,195 @@
 msgid "Location"
 msgstr "Asukoht"
 
-#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msn/msn.c:1800 ../libpurple/protocols/msn/msn.c:1807
 msgid "Hobbies and Interests"
 msgstr "Hobid ja huvid"
 
-#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
-#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1608 ../libpurple/protocols/msn/msn.c:1728
+#: ../libpurple/protocols/msn/msn.c:1734 ../libpurple/protocols/msn/msn.c:1741
+#: ../libpurple/protocols/msn/msn.c:1749 ../libpurple/protocols/msn/msn.c:1756
 msgid "A Little About Me"
 msgstr "Väheke minust"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Social"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1627
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Perekonnaseis"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Interests"
 msgstr "Huvid"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Pets"
 msgstr "Lemmikloomad"
 
-#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Hometown"
 msgstr "Kodulinn"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1631
 msgid "Places Lived"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1595
+msgstr "Endised elukohad"
+
+#: ../libpurple/protocols/msn/msn.c:1632
 msgid "Fashion"
 msgstr "Mood"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1633
 msgid "Humor"
 msgstr "Huumor"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1634
 msgid "Music"
 msgstr "Muusika"
 
-#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1635 ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1822
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Lemmiktsitaat"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1652
 msgid "Contact Info"
 msgstr "Kontaktandmed"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Personal"
 msgstr "Isiklik"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Significant Other"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Home Phone"
 msgstr "Kodutelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1658
 msgid "Home Phone 2"
 msgstr "Kodutelefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Home Address"
 msgstr "Koduaadress"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1660
 msgid "Personal Mobile"
 msgstr "Isiklik mobiiltelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1661
 msgid "Home Fax"
 msgstr "Kodufaks"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1662
 msgid "Personal E-Mail"
 msgstr "Isiklik e-post"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1663
 msgid "Personal IM"
 msgstr "Isiklikud välksõnumid"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1665
 msgid "Anniversary"
 msgstr "Tähtpäev"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1644
+#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work"
 msgstr "Tööl"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1683
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Töö nimetus"
 
-#: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/oscar/oscar.c:3824
 msgid "Company"
 msgstr "Firma"
 
-#: ../libpurple/protocols/msn/msn.c:1648
+#: ../libpurple/protocols/msn/msn.c:1685
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Osakond"
 
-#: ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Profession"
 msgstr "Ametikoht"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Work Phone"
 msgstr "Töötelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work Phone 2"
 msgstr "Töötelefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3774
+#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Work Address"
 msgstr "Tööaadress"
 
-#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1690
 msgid "Work Mobile"
 msgstr "Töö-mobiiltelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1691
 msgid "Work Pager"
 msgstr "Tööpeiler"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1692
 msgid "Work Fax"
 msgstr "Tööfaks"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1693
 msgid "Work E-Mail"
 msgstr "Töö e-post"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1694
 msgid "Work IM"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1695
 msgid "Start Date"
 msgstr "Alguskuupäev"
 
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
-#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
+#: ../libpurple/protocols/msn/msn.c:1765 ../libpurple/protocols/msn/msn.c:1771
+#: ../libpurple/protocols/msn/msn.c:1778 ../libpurple/protocols/msn/msn.c:1785
 msgid "Favorite Things"
 msgstr "Lemmikasjad"
 
-#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msn/msn.c:1830
 msgid "Last Updated"
 msgstr "Viimati uuendatud"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1841
 #: ../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:1828
+#: ../libpurple/protocols/msn/msn.c:1865
 msgid "The user has not created a public profile."
 msgstr "Kasutaja pole loonud avalikku profiili."
 
-#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msn/msn.c:1866
 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:1833
+#: ../libpurple/protocols/msn/msn.c:1870
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -5919,7 +6024,7 @@
 "Kasutajaprofiili kohta pole võimalik mingeid andmeid leida. Kõige "
 "tõenäolisemalt pole seda kasutajat olemas."
 
-#: ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/msn/msn.c:1878
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Profiili URL"
@@ -5934,19 +6039,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
+#: ../libpurple/protocols/msn/msn.c:2169 ../libpurple/protocols/msn/msn.c:2171
 msgid "MSN Protocol Plugin"
 msgstr "MSN protokolli plugin"
 
-#: ../libpurple/protocols/msn/msn.c:2163
+#: ../libpurple/protocols/msn/msn.c:2205
 msgid "Use HTTP Method"
 msgstr "Kasutatakse HTTP meetodit"
 
-#: ../libpurple/protocols/msn/msn.c:2168
+#: ../libpurple/protocols/msn/msn.c:2210
 msgid "Show custom smileys"
 msgstr "Kasutatakse kohandatud tujunägusid"
 
-#: ../libpurple/protocols/msn/msn.c:2176
+#: ../libpurple/protocols/msn/msn.c:2218
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: kasutaja müksamine tema tähelepanu võitmiseks"
 
@@ -5965,8 +6070,8 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Unable to connect"
 msgstr "Ühendumine pole võimalik"
 
@@ -6162,7 +6267,7 @@
 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/switchboard.c:963
+#: ../libpurple/protocols/msn/switchboard.c:969
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s müksas sind!"
@@ -6186,6 +6291,211 @@
 msgid "The screen name specified is invalid."
 msgstr "Määratud ekraaninimi on vigane."
 
+#: ../libpurple/protocols/myspace/myspace.c:111
+msgid "Missing Cipher"
+msgstr "Šiffer on puudu"
+
+#: ../libpurple/protocols/myspace/myspace.c:112
+msgid "The RC4 cipher could not be found"
+msgstr "RC4 šifrit pole võimalik leida"
+
+#: ../libpurple/protocols/myspace/myspace.c:113
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"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 ""
+
+#. Notify an error message also, because this is important!
+#: ../libpurple/protocols/myspace/myspace.c:292
+#: ../libpurple/protocols/myspace/myspace.c:1789
+msgid "MySpaceIM Error"
+msgstr "MySpaceIM viga"
+
+#: ../libpurple/protocols/myspace/myspace.c:348
+msgid "Reading challenge"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:354
+msgid "Unexpected challenge length from server"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:358
+msgid "Logging in"
+msgstr "Sisselogimine"
+
+#: ../libpurple/protocols/myspace/myspace.c:1276
+#, 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:1319
+msgid "New mail messages"
+msgstr "Uued e-posti sõnumid"
+
+#: ../libpurple/protocols/myspace/myspace.c:1320
+msgid "New blog comments"
+msgstr "Uued blogikommentaarid"
+
+#: ../libpurple/protocols/myspace/myspace.c:1321
+msgid "New profile comments"
+msgstr "Uued profiilikommentaarid"
+
+#: ../libpurple/protocols/myspace/myspace.c:1322
+msgid "New friend requests!"
+msgstr "Uued sõbrakutsed!"
+
+#: ../libpurple/protocols/myspace/myspace.c:1323
+msgid "New picture comments"
+msgstr "Uued pildikommentaarid"
+
+#: ../libpurple/protocols/myspace/myspace.c:1353
+msgid "MySpace"
+msgstr "MySpace"
+
+#. 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:1537
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "Ühendatud"
+
+#: ../libpurple/protocols/myspace/myspace.c:1770
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "Protkolli viga, veakood %d: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:1955
+#: ../libpurple/protocols/myspace/myspace.c:1989
+msgid "Failed to add buddy"
+msgstr "Tõrge sõbra lisamisel"
+
+#: ../libpurple/protocols/myspace/myspace.c:1955
+msgid "'addbuddy' command failed."
+msgstr "Tõrge 'addbuddy' käsu täitmisel."
+
+#: ../libpurple/protocols/myspace/myspace.c:1989
+#: ../libpurple/protocols/myspace/myspace.c:2230
+msgid "persist command failed"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2098
+#, c-format
+msgid "No such user: %s"
+msgstr "Sellist kasutajat pole: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:2099
+msgid "User lookup"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2211
+#: ../libpurple/protocols/myspace/myspace.c:2230
+#: ../libpurple/protocols/myspace/myspace.c:2252
+msgid "Failed to remove buddy"
+msgstr "Tõrge sõbra eemaldamisel"
+
+#: ../libpurple/protocols/myspace/myspace.c:2211
+msgid "'delbuddy' command failed"
+msgstr "Tõrge 'delbuddy' käsu täitmisel."
+
+#: ../libpurple/protocols/myspace/myspace.c:2252
+msgid "blocklist command failed"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2298
+msgid "Invalid input condition"
+msgstr ""
+
+#. TODO: g_realloc like msn, yahoo, irc, jabber?
+#: ../libpurple/protocols/myspace/myspace.c:2316
+#: ../libpurple/protocols/myspace/myspace.c:2347
+msgid "Read buffer full"
+msgstr "Lugemispuhver on täis"
+
+#: ../libpurple/protocols/myspace/myspace.c:2385
+msgid "Unparseable message"
+msgstr "Analüüsimatu sõnum"
+
+#: ../libpurple/protocols/myspace/myspace.c:2454
+#, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "Hostiga pole võimalik ühenduda: %s (%d)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2625
+msgid "IM Friends"
+msgstr "IM-sõbrad"
+
+#: ../libpurple/protocols/myspace/myspace.c:2724
+#, c-format
+msgid ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2725
+msgid "Add contacts from server"
+msgstr "Serverist kontaktide lisamine"
+
+#: ../libpurple/protocols/myspace/myspace.c:2777
+#: ../libpurple/protocols/myspace/myspace.c:2842
+msgid "Add friends from MySpace.com"
+msgstr "Sõprade lisamine MySpace.com'ist"
+
+#: ../libpurple/protocols/myspace/myspace.c:2778
+msgid "Importing friends failed"
+msgstr "Tõrge sõprade importimisel"
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:2834
+msgid "Find people..."
+msgstr "Otsi inimesi..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2837
+msgid "Change IM name..."
+msgstr "Minu IM-nime..."
+
+#: ../libpurple/protocols/myspace/myspace.c:3144
+msgid "myim URL handler"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3145
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3146
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3269
+msgid "Show display name in status text"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3272
+msgid "Show headline in status text"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3277
+msgid "Send emoticons"
+msgstr "Tujunägude saatmine"
+
+#: ../libpurple/protocols/myspace/myspace.c:3282
+msgid "Screen resolution (dots per inch)"
+msgstr "Ekraani eraldusvõime (punkti tollile)"
+
+#: ../libpurple/protocols/myspace/myspace.c:3285
+msgid "Base font size (points)"
+msgstr "Aluskirjatüübi suurus (punktides)"
+
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr ""
@@ -6271,6 +6581,7 @@
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
 msgstr ""
+"Sinu konto keelati liiga suure hulga valede paroolide sisestamise tõttu"
 
 #: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
@@ -6301,6 +6612,8 @@
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr ""
+"See prooviversioon ei luba rohkem kui kümnel kasutajal samaaegselt sisse "
+"logida"
 
 #: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
@@ -6320,6 +6633,8 @@
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
+"Sõnumit pole võimalik saata. Kasutaja kohta pole võimalik üksikasju hankida "
+"(%s)."
 
 #: ../libpurple/protocols/novell/novell.c:396
 #, c-format
@@ -6346,7 +6661,7 @@
 #: ../libpurple/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
-msgstr ""
+msgstr "Sõnumit pole võimalik saata. Konverentsi pole võimalik luua (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:584
 #, c-format
@@ -6354,6 +6669,8 @@
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
+"Kasutajat %s pole võimalik serveripoolses nimekirjas kausta %s tõsta. Viga "
+"kausta loomisel (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:632
 #, c-format
@@ -6361,6 +6678,8 @@
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
+"Kasutajat %s pole võimalik sinu sõbranimekirja lisada. Serveripoolses "
+"nimekirjas tekkis kausta loomisel viga (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:705
 #, c-format
@@ -6392,17 +6711,17 @@
 #: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
-msgstr ""
+msgstr "Serveripoolseid privaatsussätteid pole võimalik muuta (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
-msgstr ""
+msgstr "Konverentsi pole võimalik luua (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:1121
 #: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
-msgstr ""
+msgstr "Viga serveriga suhtlemisel. Ühendus suletakse."
 
 #: ../libpurple/protocols/novell/novell.c:1476
 msgid "Telephone Number"
@@ -6417,7 +6736,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4123
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "Kasutaja ID"
 
@@ -6459,7 +6778,7 @@
 
 #: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
-msgstr ""
+msgstr "Kutse vestlusele"
 
 #: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
@@ -6468,10 +6787,13 @@
 "\n"
 "Sent: %s"
 msgstr ""
+"Kutse saatja: %s\n"
+"\n"
+"Saadetud: %s"
 
 #: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
-msgstr ""
+msgstr "Kas sa soovid vestlusega ühineda?"
 
 #. we don't want to reconnect in this case
 #: ../libpurple/protocols/novell/novell.c:2012
@@ -6526,8 +6848,8 @@
 msgstr "Serveri port"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2313
-#: ../libpurple/protocols/yahoo/yahoo.c:2480
+#: ../libpurple/protocols/yahoo/yahoo.c:2471
+#: ../libpurple/protocols/yahoo/yahoo.c:2638
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
@@ -6535,8 +6857,8 @@
 msgstr "Server sulges ühenduse."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2307
-#: ../libpurple/protocols/yahoo/yahoo.c:2474 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/yahoo/yahoo.c:2465
+#: ../libpurple/protocols/yahoo/yahoo.c:2632 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
 #: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
 #, c-format
@@ -6585,7 +6907,7 @@
 msgstr "ICQ protokolli plugin"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4213
+#: ../libpurple/protocols/yahoo/yahoo.c:4428
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Kooditabel"
@@ -6626,7 +6948,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid SNAC"
-msgstr ""
+msgstr "Vigane SNAC"
 
 #: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Rate to host"
@@ -6678,7 +7000,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Insufficient rights"
-msgstr ""
+msgstr "Pole piisavalt õiguseid"
 
 #: ../libpurple/protocols/oscar/oscar.c:131
 msgid "In local permit/deny"
@@ -6694,7 +7016,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:134
 msgid "User temporarily unavailable"
-msgstr ""
+msgstr "Kasutaja pole ajutiselt saadaval"
 
 #: ../libpurple/protocols/oscar/oscar.c:135
 msgid "No match"
@@ -6730,10 +7052,13 @@
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
 msgstr ""
+"(Selle sõnumi vastuvõtmisel tekkis viga.  Selle võis põhjustada asjaolu, et "
+"sina oled valinud ühe kooditabeli ja %s teistsugust, või kasutab %s vigast "
+"klienti.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2376
-#: ../pidgin/gtkutils.c:2406
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Sõbraikoon"
@@ -6755,7 +7080,7 @@
 msgstr "Vestlus"
 
 #: ../libpurple/protocols/oscar/oscar.c:650
-#: ../libpurple/protocols/oscar/oscar.c:5958
+#: ../libpurple/protocols/oscar/oscar.c:6011
 msgid "Get File"
 msgstr ""
 
@@ -6765,7 +7090,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:660
 msgid "Add-Ins"
-msgstr ""
+msgstr "Lisad"
 
 #: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Send Buddy List"
@@ -6789,11 +7114,11 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:678
 msgid "ICQ Server Relay"
-msgstr ""
+msgstr "ICQ serveri relee"
 
 #: ../libpurple/protocols/oscar/oscar.c:681
 msgid "Old ICQ UTF8"
-msgstr ""
+msgstr "Vana ICQ UTF8"
 
 #: ../libpurple/protocols/oscar/oscar.c:684
 msgid "Trillian Encryption"
@@ -6828,17 +7153,17 @@
 msgstr "Kaamera"
 
 #: ../libpurple/protocols/oscar/oscar.c:724
-#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/oscar/oscar.c:5781
 msgid "Free For Chat"
 msgstr "Vestluseks vaba"
 
 #: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5763
+#: ../libpurple/protocols/oscar/oscar.c:5816
 msgid "Not Available"
 msgstr "Pole saadaval"
 
 #: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/oscar/oscar.c:5802
 msgid "Occupied"
 msgstr "Hõivatud"
 
@@ -6848,8 +7173,8 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:2934 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
+#: ../libpurple/protocols/yahoo/yahoo.c:3097 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1059
 msgid "Invisible"
 msgstr "Nähtamatu"
 
@@ -6858,13 +7183,13 @@
 msgstr "Ühendatud"
 
 #: ../libpurple/protocols/oscar/oscar.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3675
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1123
+#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1125
 msgid "IP Address"
 msgstr "IP-aadress"
 
 #: ../libpurple/protocols/oscar/oscar.c:844
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2901
 msgid "Warning Level"
 msgstr "Hoiatuste tase"
 
@@ -6912,14 +7237,14 @@
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:1343
-#: ../libpurple/protocols/yahoo/yahoo.c:1952
+#: ../libpurple/protocols/yahoo/yahoo.c:2107
 msgid "Invalid screen name."
 msgstr "Vigane ekraaninimi."
 
 #: ../libpurple/protocols/oscar/oscar.c:1350
 #: ../libpurple/protocols/qq/login_logout.c:483
 #: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:1973
+#: ../libpurple/protocols/yahoo/yahoo.c:2128
 msgid "Incorrect password."
 msgstr "Vale parool."
 
@@ -6972,8 +7297,8 @@
 #: ../libpurple/protocols/oscar/oscar.c:1450
 #: ../libpurple/protocols/oscar/oscar.c:2242
 #: ../libpurple/protocols/oscar/oscar.c:2291
-#: ../libpurple/protocols/oscar/oscar.c:5833
-#: ../libpurple/protocols/oscar/oscar.c:6114 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:5886
+#: ../libpurple/protocols/oscar/oscar.c:6167 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_Olgu"
 
@@ -7013,7 +7338,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:2240
 msgid "Authorization Request Message:"
-msgstr ""
+msgstr "Volituste küsimise sõnum:"
 
 #: ../libpurple/protocols/oscar/oscar.c:2241
 msgid "Please authorize me!"
@@ -7022,14 +7347,14 @@
 #: ../libpurple/protocols/oscar/oscar.c:2282
 #: ../libpurple/protocols/oscar/oscar.c:2290
 #: ../libpurple/protocols/oscar/oscar.c:2417
-#: ../libpurple/protocols/oscar/oscar.c:5211
-#: ../libpurple/protocols/yahoo/yahoo.c:1004
+#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:2289
 msgid "Authorization Denied Message:"
-msgstr ""
+msgstr "Volituste andmisest keeldumise sõnum:"
 
 #: ../libpurple/protocols/oscar/oscar.c:2417
 #, c-format
@@ -7093,21 +7418,21 @@
 msgid "_Decline"
 msgstr "Lükka _tagasi"
 
-#: ../libpurple/protocols/oscar/oscar.c:2566
+#: ../libpurple/protocols/oscar/oscar.c:2606
 #, 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:2575
+#: ../libpurple/protocols/oscar/oscar.c:2615
 #, 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:2584
+#: ../libpurple/protocols/oscar/oscar.c:2624
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7116,21 +7441,21 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2593
+#: ../libpurple/protocols/oscar/oscar.c:2633
 #, 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:2602
+#: ../libpurple/protocols/oscar/oscar.c:2642
 #, 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:2611
+#: ../libpurple/protocols/oscar/oscar.c:2651
 #, 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."
@@ -7138,154 +7463,154 @@
 msgstr[1] ""
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2766
+#: ../libpurple/protocols/oscar/oscar.c:2806
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Sõnumit pole võimalik saata: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2766
-#: ../libpurple/protocols/oscar/oscar.c:2771
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2806
+#: ../libpurple/protocols/oscar/oscar.c:2811
+#: ../libpurple/protocols/oscar/oscar.c:2875
 msgid "Unknown reason."
 msgstr "Tundmatu põhjus."
 
-#: ../libpurple/protocols/oscar/oscar.c:2769
+#: ../libpurple/protocols/oscar/oscar.c:2809
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Kasutajale %s pole võimalik sõnumit saata:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2875
 #, c-format
 msgid "User information not available: %s"
 msgstr "Kasutajateave pole saadaval: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2866
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Online Since"
 msgstr "Võrgus alates"
 
-#: ../libpurple/protocols/oscar/oscar.c:2871
+#: ../libpurple/protocols/oscar/oscar.c:2911
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2876
+#: ../libpurple/protocols/oscar/oscar.c:2916
 msgid "Capabilities"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2946
 msgid "Available Message"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2934
+#: ../libpurple/protocols/oscar/oscar.c:2974
 msgid "Profile"
 msgstr "Profiil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3014
+#: ../libpurple/protocols/oscar/oscar.c:3054
 msgid "Your AIM connection may be lost."
 msgstr "Sinu AIM-ühendus võib olla katkenud."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3202
+#: ../libpurple/protocols/oscar/oscar.c:3242
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3366
+#: ../libpurple/protocols/oscar/oscar.c:3406
 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:3449
+#: ../libpurple/protocols/oscar/oscar.c:3489
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3697
+msgstr "Ühendus jututoaga %s on katkestatud."
+
+#: ../libpurple/protocols/oscar/oscar.c:3739
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobiiltelefon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3727
+#: ../libpurple/protocols/oscar/oscar.c:3769
 msgid "Personal Web Page"
 msgstr "Isiklik veebileht"
 
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/oscar/oscar.c:3793
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Täiendavad andmed"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
-#: ../libpurple/protocols/oscar/oscar.c:3772
+#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Zip Code"
 msgstr "Indeks"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3825
 msgid "Division"
 msgstr "Üksus"
 
-#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3826
 msgid "Position"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3786
+#: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Web Page"
 msgstr "Veebileht"
 
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/oscar/oscar.c:3831
 msgid "Work Information"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3845
+#: ../libpurple/protocols/oscar/oscar.c:3887
 msgid "Pop-Up Message"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3885
+#: ../libpurple/protocols/oscar/oscar.c:3927
 #, 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:3890
+#: ../libpurple/protocols/oscar/oscar.c:3932
 msgid "Screen name"
 msgstr "Ekraaninimi"
 
-#: ../libpurple/protocols/oscar/oscar.c:3916
+#: ../libpurple/protocols/oscar/oscar.c:3958
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3937
+#: ../libpurple/protocols/oscar/oscar.c:3979
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3939
+#: ../libpurple/protocols/oscar/oscar.c:3981
 msgid "Account Confirmation Requested"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3970
+#: ../libpurple/protocols/oscar/oscar.c:4012
 msgid "Error Changing Account Info"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3973
+#: ../libpurple/protocols/oscar/oscar.c:4015
 #, 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:3976
+#: ../libpurple/protocols/oscar/oscar.c:4018
 #, 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:3979
+#: ../libpurple/protocols/oscar/oscar.c:4021
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7293,58 +7618,58 @@
 msgstr ""
 "Viga 0x%04x: Ekraaninime pole võimalik vormindada kuna see on liiga pikk."
 
-#: ../libpurple/protocols/oscar/oscar.c:3982
+#: ../libpurple/protocols/oscar/oscar.c:4024
 #, 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:3985
+#: ../libpurple/protocols/oscar/oscar.c:4027
 #, 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:3988
+#: ../libpurple/protocols/oscar/oscar.c:4030
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3991
+#: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Viga 0x%04x: Tundmatu viga."
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4043
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Kasutaja %s e-posti aadress on %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4003
+#: ../libpurple/protocols/oscar/oscar.c:4045
 msgid "Account Info"
 msgstr "Konto andmed"
 
-#: ../libpurple/protocols/oscar/oscar.c:4175
+#: ../libpurple/protocols/oscar/oscar.c:4228
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4446
+#: ../libpurple/protocols/oscar/oscar.c:4499
 msgid "Unable to set AIM profile."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4447
+#: ../libpurple/protocols/oscar/oscar.c:4500
 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:4461
+#: ../libpurple/protocols/oscar/oscar.c:4514
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7355,11 +7680,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4466
+#: ../libpurple/protocols/oscar/oscar.c:4519
 msgid "Profile too long."
 msgstr "Profiil on liiga pikk."
 
-#: ../libpurple/protocols/oscar/oscar.c:4511
+#: ../libpurple/protocols/oscar/oscar.c:4564
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7370,11 +7695,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4516
+#: ../libpurple/protocols/oscar/oscar.c:4569
 msgid "Away message too long."
 msgstr "Eemaloleku teade on liiga pikk."
 
-#: ../libpurple/protocols/oscar/oscar.c:4585
+#: ../libpurple/protocols/oscar/oscar.c:4638
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7382,70 +7707,70 @@
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4587
-#: ../libpurple/protocols/oscar/oscar.c:5020
-#: ../libpurple/protocols/oscar/oscar.c:5035
+#: ../libpurple/protocols/oscar/oscar.c:4640
+#: ../libpurple/protocols/oscar/oscar.c:5073
+#: ../libpurple/protocols/oscar/oscar.c:5088
 msgid "Unable To Add"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4696
+#: ../libpurple/protocols/oscar/oscar.c:4749
 msgid "Unable To Retrieve Buddy List"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4697
+msgstr "Sõbranimekirja pole võimalik vastu võtta"
+
+#: ../libpurple/protocols/oscar/oscar.c:4750
 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 hours."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4879
-#: ../libpurple/protocols/oscar/oscar.c:4881
-#: ../libpurple/protocols/oscar/oscar.c:5089
-#: ../libpurple/protocols/oscar/oscar.c:5090
-#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:4932
+#: ../libpurple/protocols/oscar/oscar.c:4934
+#: ../libpurple/protocols/oscar/oscar.c:5142
+#: ../libpurple/protocols/oscar/oscar.c:5143
+#: ../libpurple/protocols/oscar/oscar.c:5148
 msgid "Orphans"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:5071
 #, 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:5018
-#: ../libpurple/protocols/oscar/oscar.c:5033
+#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:5086
 msgid "(no name)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5032
+#: ../libpurple/protocols/oscar/oscar.c:5085
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5179
 #, 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:5134
+#: ../libpurple/protocols/oscar/oscar.c:5187
 msgid "Authorization Given"
 msgstr ""
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5207
+#: ../libpurple/protocols/oscar/oscar.c:5260
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5208
+#: ../libpurple/protocols/oscar/oscar.c:5261
 msgid "Authorization Granted"
 msgstr ""
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5211
+#: ../libpurple/protocols/oscar/oscar.c:5264
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7453,186 +7778,186 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5212
+#: ../libpurple/protocols/oscar/oscar.c:5265
 msgid "Authorization Denied"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5248
+#: ../libpurple/protocols/oscar/oscar.c:5301
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5288
+#: ../libpurple/protocols/oscar/oscar.c:5341
 msgid "Invalid chat name specified."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5357
+#: ../libpurple/protocols/oscar/oscar.c:5410
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5517
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5570
+#: ../libpurple/protocols/oscar/oscar.c:5575
 msgid "Away Message"
 msgstr "Eemaloleku sõnum"
 
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5575
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(vastuvõtmine)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5722
+#: ../libpurple/protocols/oscar/oscar.c:5775
 msgid "iTunes Music Store Link"
 msgstr "iTunes muusikapoe viit"
 
-#: ../libpurple/protocols/oscar/oscar.c:5830
+#: ../libpurple/protocols/oscar/oscar.c:5883
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Sõbrakommentaar %s kohta"
 
-#: ../libpurple/protocols/oscar/oscar.c:5831
+#: ../libpurple/protocols/oscar/oscar.c:5884
 msgid "Buddy Comment:"
 msgstr "Sõbrakommentaar:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5878
+#: ../libpurple/protocols/oscar/oscar.c:5931
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5935
 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:5888
+#: ../libpurple/protocols/oscar/oscar.c:5941
 #: ../libpurple/protocols/oscar/peer.c:1022
 msgid "C_onnect"
 msgstr "Ü_hendu"
 
-#: ../libpurple/protocols/oscar/oscar.c:5923
+#: ../libpurple/protocols/oscar/oscar.c:5976
 msgid "Get AIM Info"
 msgstr "Hangi AIM-andmed"
 
-#: ../libpurple/protocols/oscar/oscar.c:5929
+#: ../libpurple/protocols/oscar/oscar.c:5982
 msgid "Edit Buddy Comment"
 msgstr "Redigeeri sõbrakommentaari"
 
-#: ../libpurple/protocols/oscar/oscar.c:5937
+#: ../libpurple/protocols/oscar/oscar.c:5990
 msgid "Get Status Msg"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5950
+#: ../libpurple/protocols/oscar/oscar.c:6003
 msgid "Direct IM"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5972
+#: ../libpurple/protocols/oscar/oscar.c:6025
 msgid "Re-request Authorization"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:6031
+msgstr "Volituste uuestiküsimine"
+
+#: ../libpurple/protocols/oscar/oscar.c:6084
 msgid "Require authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6034
+#: ../libpurple/protocols/oscar/oscar.c:6087
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6039
+#: ../libpurple/protocols/oscar/oscar.c:6092
 msgid "ICQ Privacy Options"
 msgstr "ICQ privaatsusvalikud"
 
-#: ../libpurple/protocols/oscar/oscar.c:6058
+#: ../libpurple/protocols/oscar/oscar.c:6111
 msgid "The new formatting is invalid."
 msgstr "Uus vormindus on vigane."
 
-#: ../libpurple/protocols/oscar/oscar.c:6059
-msgid "Screen name formatting can change only capitalization and whitespace."
-msgstr ""
-
 #: ../libpurple/protocols/oscar/oscar.c:6112
+msgid "Screen name formatting can change only capitalization and whitespace."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:6165
 msgid "Change Address To:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6158
+#: ../libpurple/protocols/oscar/oscar.c:6211
 msgid "<i>you are not waiting for authorization</i>"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6161
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid "You are awaiting authorization from the following buddies"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6162
+#: ../libpurple/protocols/oscar/oscar.c:6215
 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:6179
+#: ../libpurple/protocols/oscar/oscar.c:6232
 msgid "Find Buddy by E-Mail"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6180
+#: ../libpurple/protocols/oscar/oscar.c:6233
 msgid "Search for a buddy by e-mail address"
 msgstr "Sõbra otsimine e-posti aadressi järgi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6181
+#: ../libpurple/protocols/oscar/oscar.c:6234
 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:6184
+#: ../libpurple/protocols/oscar/oscar.c:6237
 msgid "_Search"
 msgstr "_Otsi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6342
+#: ../libpurple/protocols/oscar/oscar.c:6395
 msgid "Set User Info (URL)..."
 msgstr "Kasutajate andmete määramine (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6353
+#: ../libpurple/protocols/oscar/oscar.c:6406
 msgid "Change Password (URL)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6357
+#: ../libpurple/protocols/oscar/oscar.c:6410
 msgid "Configure IM Forwarding (URL)"
 msgstr ""
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/protocols/oscar/oscar.c:6420
 msgid "Set Privacy Options..."
 msgstr "Määra privaatsusvalikud..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6374
+#: ../libpurple/protocols/oscar/oscar.c:6427
 msgid "Confirm Account"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Display Currently Registered E-Mail Address"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6382
+#: ../libpurple/protocols/oscar/oscar.c:6435
 msgid "Change Currently Registered E-Mail Address..."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6389
+#: ../libpurple/protocols/oscar/oscar.c:6442
 msgid "Show Buddies Awaiting Authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6395
+#: ../libpurple/protocols/oscar/oscar.c:6448
 msgid "Search for Buddy by E-Mail Address..."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/oscar/oscar.c:6453
 msgid "Search for Buddy by Information"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6468
+#: ../libpurple/protocols/oscar/oscar.c:6521
 msgid "Use recent buddies group"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6471
+#: ../libpurple/protocols/oscar/oscar.c:6524
 msgid "Show how long you have been idle"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6626
+#: ../libpurple/protocols/oscar/oscar.c:6679
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -8274,7 +8599,8 @@
 msgstr "Sind lisati %s poolt"
 
 #: ../libpurple/protocols/qq/sys_msg.c:169
-msgid "Would like to add him?"
+#: ../libpurple/protocols/qq/sys_msg.c:263
+msgid "Would you like to add him?"
 msgstr "Kas sa soovid teda lisada?"
 
 #: ../libpurple/protocols/qq/sys_msg.c:176
@@ -8308,10 +8634,6 @@
 msgid "%s is not in your buddy list"
 msgstr "%s pole sinu sõbranimekirjas"
 
-#: ../libpurple/protocols/qq/sys_msg.c:263
-msgid "Would you like to add him?"
-msgstr "Kas sa soovid teda lisada?"
-
 #: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Ühendus suletud (kirjutamine)"
@@ -8375,10 +8697,6 @@
 msgid "Starting Services"
 msgstr "Teenuste käivitamine"
 
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr "Ühendatud"
-
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid ""
@@ -8400,7 +8718,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3727
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "Hostiga pole võimalik ühenduda"
 
@@ -8421,64 +8739,65 @@
 msgid "Place Closed"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "Kõlarid"
 
-#: ../libpurple/protocols/sametime/sametime.c:3232
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "Videokaamera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
+#: ../libpurple/protocols/sametime/sametime.c:3235
 msgid "File Transfer"
 msgstr "Failiülekanne"
 
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4146
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4120
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "Väline kasutaja"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:3386
+"Palun sisesta uue konverentsi teema ja kasutajale %s saadetava kutse sõnum"
+
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "Uus konverents"
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "Algata"
 
-#: ../libpurple/protocols/sametime/sametime.c:3453
+#: ../libpurple/protocols/sametime/sametime.c:3452
 msgid "Available Conferences"
 msgstr "Saadaolevad konverentsid"
 
-#: ../libpurple/protocols/sametime/sametime.c:3459
+#: ../libpurple/protocols/sametime/sametime.c:3458
 msgid "Create New Conference..."
 msgstr "Uue konverentsi loomine..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3465
 msgid "Invite user to a conference"
 msgstr "Kasutaja kutsumine konverentsile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3467
+#: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -8486,27 +8805,27 @@
 "this user to."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3472
+#: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
 msgstr "Konverentsile kutsumine"
 
-#: ../libpurple/protocols/sametime/sametime.c:3563
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "Konverentsile kutsumine..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3568
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3587 ../pidgin/gtkconv.c:4307
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4335
 msgid "Topic:"
 msgstr "Teema:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3615
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "Sametime kogukonna serverit pole määratud"
 
-#: ../libpurple/protocols/sametime/sametime.c:3637
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -8515,68 +8834,68 @@
 "Meanwhile kontole %s pole hostinime ega IP-aadressi määratud. Palun määra "
 "see ja jätka sisselogimist."
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile ühenduse sätted"
 
-#: ../libpurple/protocols/sametime/sametime.c:3643
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "Sametime kogukonna serverit pole määratud"
 
-#: ../libpurple/protocols/sametime/sametime.c:3645 ../pidgin/gtkblist.c:4024
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4038
 msgid "Connect"
 msgstr "Ühendu"
 
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Tundmatu (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4138
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "Viimane teadaolev klient"
 
-#: ../libpurple/protocols/sametime/sametime.c:4302
-#: ../libpurple/protocols/sametime/sametime.c:5507
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "Kasutajanimi"
 
-#: ../libpurple/protocols/sametime/sametime.c:4305
-#: ../libpurple/protocols/sametime/sametime.c:5510
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4330
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, 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:4335
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "Vali kasutaja"
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "Kasutajat pole võimalik lisada: kasutajat ei leitud"
 
-#: ../libpurple/protocols/sametime/sametime.c:4421
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, 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:4426
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "Kasutajat pole võimalik lisada"
 
-#: ../libpurple/protocols/sametime/sametime.c:5012
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8585,63 +8904,63 @@
 "Viga faili %s lugemisel: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5147
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "Serverisse salvestatud sõbranimekiri"
 
-#: ../libpurple/protocols/sametime/sametime.c:5152
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "Sõbranimekirja salvestamise režiim"
 
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "Ainult kohalik sõbranimekiri"
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5161
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "Nimekirja sünkroniseerimine serveriga"
 
-#: ../libpurple/protocols/sametime/sametime.c:5216
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5256
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "Gruppi pole võimalik lisada: grupp on juba olemas"
 
-#: ../libpurple/protocols/sametime/sametime.c:5311
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, 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:5314
-#: ../libpurple/protocols/sametime/sametime.c:5444
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "Gruppi pole võimalik lisada"
 
-#: ../libpurple/protocols/sametime/sametime.c:5373
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "Võimalikud vastavused"
 
+#: ../libpurple/protocols/sametime/sametime.c:5388
+msgid "Notes Address Book group results"
+msgstr ""
+
 #: ../libpurple/protocols/sametime/sametime.c:5389
-msgid "Notes Address Book group results"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5390
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8649,37 +8968,37 @@
 "to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5395
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5438
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "Gruppi pole võimalik lisada: gruppi ei leitud"
 
-#: ../libpurple/protocols/sametime/sametime.c:5440
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5482
+#: ../libpurple/protocols/sametime/sametime.c:5481
 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:5531
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Otsingutulemused '%s' jaoks"
 
-#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8687,60 +9006,59 @@
 "buttons below."
 msgstr ""
 
-#. Create the window
-#: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtknotify.c:721
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:724
 msgid "Search Results"
 msgstr "Otsingutulemused"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "Vastavusi pole"
 
-#: ../libpurple/protocols/sametime/sametime.c:5565
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5569
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "Vastavusi pole"
 
+#: ../libpurple/protocols/sametime/sametime.c:5605
+msgid "Search for a user"
+msgstr ""
+
 #: ../libpurple/protocols/sametime/sametime.c:5606
-msgid "Search for a user"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5607
 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:5610
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "Kasutajaotsing"
 
-#: ../libpurple/protocols/sametime/sametime.c:5623
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "Impordi Sametime nimekiri..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5627
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "Ekspordi Sametime nimekiri..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5631
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "Kasutajaotsing..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5741
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "Jõuga sisselogimine (serveri ümbersuunamisi eiratakse)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5751
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "Kliendi identiteet on peidetud"
 
@@ -8756,7 +9074,7 @@
 #: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
-msgstr ""
+msgstr "Kasutaja %s pole võrgus"
 
 #: ../libpurple/protocols/silc/buddy.c:53
 #: ../libpurple/protocols/silc/buddy.c:110
@@ -8820,7 +9138,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:389
 #: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
-msgstr ""
+msgstr "Kaugkasutaja pole enam võrgus"
 
 #: ../libpurple/protocols/silc/buddy.c:298
 #: ../libpurple/protocols/silc10/buddy.c:295
@@ -8922,7 +9240,7 @@
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
-msgstr ""
+msgstr "Kasutaja andmeid pole võimalik hankida"
 
 #: ../libpurple/protocols/silc/buddy.c:723
 #: ../libpurple/protocols/silc10/buddy.c:735
@@ -8941,13 +9259,13 @@
 #: ../libpurple/protocols/silc/buddy.c:1059
 #: ../libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
-msgstr ""
+msgstr "Ava..."
 
 #: ../libpurple/protocols/silc/buddy.c:1070
 #: ../libpurple/protocols/silc10/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
-msgstr ""
+msgstr "Sõber %s pole võrgus"
 
 #: ../libpurple/protocols/silc/buddy.c:1073
 #: ../libpurple/protocols/silc10/buddy.c:1081
@@ -8997,14 +9315,14 @@
 #: ../libpurple/protocols/silc10/buddy.c:1482
 #: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
-msgstr ""
+msgstr "Ärata mind üles!"
 
 #: ../libpurple/protocols/silc/buddy.c:1484
 #: ../libpurple/protocols/silc/silc.c:52
 #: ../libpurple/protocols/silc10/buddy.c:1484
 #: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
-msgstr ""
+msgstr "Üliaktiivne"
 
 #: ../libpurple/protocols/silc/buddy.c:1486
 #: ../libpurple/protocols/silc10/buddy.c:1486
@@ -9036,7 +9354,7 @@
 #: ../libpurple/protocols/silc10/silc.c:658
 #: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
-msgstr ""
+msgstr "Vihane"
 
 #: ../libpurple/protocols/silc/buddy.c:1499
 #: ../libpurple/protocols/silc/silc.c:749
@@ -9045,7 +9363,7 @@
 #: ../libpurple/protocols/silc10/silc.c:660
 #: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
-msgstr ""
+msgstr "Armukade"
 
 #: ../libpurple/protocols/silc/buddy.c:1501
 #: ../libpurple/protocols/silc/silc.c:751
@@ -9054,7 +9372,7 @@
 #: ../libpurple/protocols/silc10/silc.c:662
 #: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
-msgstr ""
+msgstr "Häbenev"
 
 #: ../libpurple/protocols/silc/buddy.c:1503
 #: ../libpurple/protocols/silc/silc.c:753
@@ -9070,7 +9388,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1505
 #: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
-msgstr ""
+msgstr "Armunud"
 
 #: ../libpurple/protocols/silc/buddy.c:1507
 #: ../libpurple/protocols/silc/silc.c:757
@@ -9079,7 +9397,7 @@
 #: ../libpurple/protocols/silc10/silc.c:668
 #: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
-msgstr ""
+msgstr "Unine"
 
 #: ../libpurple/protocols/silc/buddy.c:1509
 #: ../libpurple/protocols/silc/silc.c:759
@@ -9088,7 +9406,7 @@
 #: ../libpurple/protocols/silc10/silc.c:670
 #: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
-msgstr ""
+msgstr "Tüdinud"
 
 #: ../libpurple/protocols/silc/buddy.c:1511
 #: ../libpurple/protocols/silc/silc.c:761
@@ -9097,7 +9415,7 @@
 #: ../libpurple/protocols/silc10/silc.c:672
 #: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
-msgstr ""
+msgstr "Põnevil"
 
 #: ../libpurple/protocols/silc/buddy.c:1513
 #: ../libpurple/protocols/silc/silc.c:763
@@ -9106,7 +9424,7 @@
 #: ../libpurple/protocols/silc10/silc.c:674
 #: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
-msgstr ""
+msgstr "Rahutu"
 
 #: ../libpurple/protocols/silc/buddy.c:1545
 #: ../libpurple/protocols/silc/ops.c:1207
@@ -9120,21 +9438,21 @@
 #: ../libpurple/protocols/silc10/buddy.c:1557
 #: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
-msgstr ""
+msgstr "Meeleolu"
 
 #: ../libpurple/protocols/silc/buddy.c:1562
 #: ../libpurple/protocols/silc/ops.c:1224
 #: ../libpurple/protocols/silc10/buddy.c:1562
 #: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
-msgstr ""
+msgstr "Eelistatud kontakt"
 
 #: ../libpurple/protocols/silc/buddy.c:1567
 #: ../libpurple/protocols/silc/ops.c:1229
 #: ../libpurple/protocols/silc10/buddy.c:1567
 #: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
-msgstr ""
+msgstr "Eelistatud keel"
 
 #: ../libpurple/protocols/silc/buddy.c:1572
 #: ../libpurple/protocols/silc/ops.c:1234
@@ -9712,7 +10030,7 @@
 #: ../libpurple/protocols/silc/ops.c:1512
 #: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
-msgstr ""
+msgstr "Avalikku võtit pole vastu võetud"
 
 #: ../libpurple/protocols/silc/ops.c:1524
 #: ../libpurple/protocols/silc/ops.c:1537
@@ -9934,7 +10252,7 @@
 msgstr "Sinu hetkemeeleolu"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1638
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1640
 msgid "Normal"
 msgstr "Tavaline"
 
@@ -10101,7 +10419,7 @@
 #: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
-msgstr ""
+msgstr "Kasutaja <I>%s</i> pole võrgus"
 
 #: ../libpurple/protocols/silc/silc.c:1357
 #: ../libpurple/protocols/silc10/silc.c:1286
@@ -10217,7 +10535,7 @@
 #: ../libpurple/protocols/silc/silc.c:1712
 #: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr ""
+msgstr "whowas &lt;hüüdnimi&gt;:  Selle hüüdnimega kasutaja andmete vaatamine"
 
 #: ../libpurple/protocols/silc/silc.c:1716
 #: ../libpurple/protocols/silc10/silc.c:1645
@@ -10254,6 +10572,8 @@
 #: ../libpurple/protocols/silc10/silc.c:1665
 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:1740
 #: ../libpurple/protocols/silc10/silc.c:1669
@@ -10313,7 +10633,7 @@
 msgstr "Secure Internet Live Conferencing (SILC) protokoll"
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2031
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2033
 msgid "Network"
 msgstr "Võrk"
 
@@ -10786,8 +11106,8 @@
 msgid "Password Change Successful"
 msgstr "Paroolimuutmine õnnestus"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5883
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5576
+#: ../pidgin/gtkblist.c:5929
 msgid "_Group:"
 msgstr "_Grupp:"
 
@@ -10847,41 +11167,46 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC protokolli plugin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:823
+#: ../libpurple/protocols/yahoo/yahoo.c:782
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:895
+#: ../libpurple/protocols/yahoo/yahoo.c:915
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:962
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! süsteemne sõnum %s jaoks:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1003
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
 msgid "Authorization denied message:"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1084
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1087
+msgstr "Volituste andmisest keeldumise sõnum:"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 #, 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:1090
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1841
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10889,178 +11214,190 @@
 "Check %s for updates."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1844
+#: ../libpurple/protocols/yahoo/yahoo.c:1999
 msgid "Failed Yahoo! Authentication"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1910
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
 #, 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:1913
+#: ../libpurple/protocols/yahoo/yahoo.c:2068
 msgid "Ignore buddy?"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1976
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1979
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, 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:2033
+#: ../libpurple/protocols/yahoo/yahoo.c:2188
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2036
+#: ../libpurple/protocols/yahoo/yahoo.c:2191
 msgid "Could not add buddy to server list"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2155
+#: ../libpurple/protocols/yahoo/yahoo.c:2310
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2495
+#: ../libpurple/protocols/yahoo/yahoo.c:2653
 msgid "Received unexpected HTTP response from server."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2519
-#: ../libpurple/protocols/yahoo/yahoo.c:2705
-#: ../libpurple/protocols/yahoo/yahoo.c:2808
-#: ../libpurple/protocols/yahoo/yahoo.c:2818
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoo.c:2677
+#: ../libpurple/protocols/yahoo/yahoo.c:2863
+#: ../libpurple/protocols/yahoo/yahoo.c:2966
+#: ../libpurple/protocols/yahoo/yahoo.c:2976
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Ühendumisprobleem"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2545
+#: ../libpurple/protocols/yahoo/yahoo.c:2703
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2570
+#: ../libpurple/protocols/yahoo/yahoo.c:2728
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2920
-#: ../libpurple/protocols/yahoo/yahoo.c:3606
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3769
 msgid "Not at Home"
 msgstr "Pole kodus"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2922
-#: ../libpurple/protocols/yahoo/yahoo.c:3609
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Not at Desk"
 msgstr "Pole töölaua taga"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2924
-#: ../libpurple/protocols/yahoo/yahoo.c:3612
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Not in Office"
 msgstr "Pole kontoris"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2928
-#: ../libpurple/protocols/yahoo/yahoo.c:3618
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "On Vacation"
 msgstr "Puhkusel"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2932
-#: ../libpurple/protocols/yahoo/yahoo.c:3624
+#: ../libpurple/protocols/yahoo/yahoo.c:3095
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
 msgid "Stepped Out"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3025
-#: ../libpurple/protocols/yahoo/yahoo.c:3055
+#: ../libpurple/protocols/yahoo/yahoo.c:3188
+#: ../libpurple/protocols/yahoo/yahoo.c:3218
 msgid "Not on server list"
 msgstr "Pole serveri loendis"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3072
-#: ../libpurple/protocols/yahoo/yahoo.c:3130
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3293
 msgid "Appear Online"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3075
-#: ../libpurple/protocols/yahoo/yahoo.c:3151
+#: ../libpurple/protocols/yahoo/yahoo.c:3238
+#: ../libpurple/protocols/yahoo/yahoo.c:3314
 msgid "Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Presence"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3136
+#: ../libpurple/protocols/yahoo/yahoo.c:3299
 msgid "Appear Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3145
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3356
 msgid "Join in Chat"
 msgstr "Ühine vestlusega"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3199
+#: ../libpurple/protocols/yahoo/yahoo.c:3362
 msgid "Initiate Conference"
 msgstr "Algata konverents"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
+#: ../libpurple/protocols/yahoo/yahoo.c:3390
 msgid "Presence Settings"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3396
 msgid "Start Doodling"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3334
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
 msgid "Activate which ID?"
 msgstr "Milline ID aktiveerida?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3345
-msgid "Join whom in chat?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
+msgid "Join who in chat?"
 msgstr "Kellega ühineda jututoas?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3357
+#: ../libpurple/protocols/yahoo/yahoo.c:3520
 msgid "Activate ID..."
 msgstr "Aktiveeri ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3361
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
 msgid "Join User in Chat..."
 msgstr "Ühine kasutajaga vestluses..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3366
+#: ../libpurple/protocols/yahoo/yahoo.c:3529
 msgid "Open Inbox"
 msgstr "Ava sisendkast"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3881
+#: ../libpurple/protocols/yahoo/yahoo.c:4054
 msgid "You have just sent a Buzz!"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3940
+#: ../libpurple/protocols/yahoo/yahoo.c:4132
+msgid "buzz"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4133
+msgid "buzzed"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4134
+msgid "Buzzing"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4149
 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:3945
+#: ../libpurple/protocols/yahoo/yahoo.c:4154
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Yahoo võrgu jututubade nimekirja kuvamine"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3949
+#: ../libpurple/protocols/yahoo/yahoo.c:4158
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3953
+#: ../libpurple/protocols/yahoo/yahoo.c:4162
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Kasutajaga Doodle seansi algatamine"
 
@@ -11074,88 +11411,90 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4161
-#: ../libpurple/protocols/yahoo/yahoo.c:4163
+#: ../libpurple/protocols/yahoo/yahoo.c:4376
+#: ../libpurple/protocols/yahoo/yahoo.c:4378
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo protokolli plugin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4186
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "Yahoo Japan"
 msgstr "Jaapani Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4189
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Pager server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4192
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 msgid "Japan Pager server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4195
+#: ../libpurple/protocols/yahoo/yahoo.c:4410
 msgid "Pager port"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4198
+#: ../libpurple/protocols/yahoo/yahoo.c:4413
 msgid "File transfer server"
 msgstr "Failiülekande server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4201
+#: ../libpurple/protocols/yahoo/yahoo.c:4416
 msgid "Japan file transfer server"
 msgstr "Jaapani failiülekandeserver"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4204
+#: ../libpurple/protocols/yahoo/yahoo.c:4419
 msgid "File transfer port"
 msgstr "Failiülekande port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4207
+#: ../libpurple/protocols/yahoo/yahoo.c:4422
 msgid "Chat room locale"
 msgstr "Jututoa lokaat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4210
+#: ../libpurple/protocols/yahoo/yahoo.c:4425
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konverentside ja jututubade kutseid eiratakse"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4218
+#: ../libpurple/protocols/yahoo/yahoo.c:4433
 msgid "Chat room list URL"
 msgstr "Jututubade nimekirja URL"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4221
+#: ../libpurple/protocols/yahoo/yahoo.c:4436
 msgid "Yahoo Chat server"
 msgstr "Yahoo jututoaserver"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4224
+#: ../libpurple/protocols/yahoo/yahoo.c:4439
 msgid "Yahoo Chat port"
 msgstr "Yahoo jututoaport"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:204
+#: ../libpurple/protocols/yahoo/yahoochat.c:217
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:206
+"%s lükkas sinu konverentsikutse tuppa \"%s\" tagasi, esitades järgneva "
+"põhjenduse: \"%s\"."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:219
 msgid "Invitation Rejected"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:362
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
 msgid "Failed to join chat"
 msgstr ""
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:365
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
 msgid "Unknown room"
 msgstr "Tundmatu tuba"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:368
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
 msgid "Maybe the room is full"
 msgstr "Võibolla on tuba täis"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:371
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
 msgid "Not available"
 msgstr "Pole saadaval"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:375
+#: ../libpurple/protocols/yahoo/yahoochat.c:451
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -11163,38 +11502,38 @@
 "Tundmatu viga. Võib-olla pead sa välja logima ja enne jututoaga "
 "taasliitumist 5 minutit ootama"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:453
+#: ../libpurple/protocols/yahoo/yahoochat.c:534
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Sa vestled nüüd jututoas %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
 msgid "Failed to join buddy in chat"
 msgstr "Tõrge sõbraga jututoas ühinemisel"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:629
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
 msgid "Maybe they're not in a chat?"
 msgstr "Võibolla pole nad jututoas?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Fetching the room list failed."
 msgstr "Tõrge jututubade nimekirja hankimisel."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1404
+#: ../libpurple/protocols/yahoo/yahoochat.c:1500
 msgid "Voices"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1407
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
 msgid "Webcams"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 msgid "Unable to fetch room list."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1481
+msgstr "Tubade nimekirja pole võimalik hankida."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
 msgid "User Rooms"
 msgstr ""
 
@@ -11317,6 +11656,8 @@
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr ""
+"(Sõnumi teisendamisel tekkis viga.\t Kontrolli kontoredaktorist "
+"'Kooditabeli' valikut.)"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
@@ -11536,21 +11877,35 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s on nüüd nimega %s.\n"
 
-#: ../libpurple/server.c:680
+#: ../libpurple/server.c:293
+#, c-format
+msgid "Attention! %s %s."
+msgstr "Tähelepanu! %s %s."
+
+#: ../libpurple/server.c:295 ../libpurple/server.c:333
+msgid "Attention!"
+msgstr "Tähelepanu!"
+
+#: ../libpurple/server.c:331
+#, c-format
+msgid "Attention! You have been %s."
+msgstr ""
+
+#: ../libpurple/server.c:782
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
 msgstr ""
-"%s kutsub kasutaja %s jututuppa %s:\n"
+"%s kutsub kasutajat %s jututuppa %s:\n"
 "%s"
 
-#: ../libpurple/server.c:685
+#: ../libpurple/server.c:787
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
-msgstr "%s kutsub kasutaja %s jututuppa %s\n"
-
-#: ../libpurple/server.c:689
+msgstr "%s kutsub kasutajat %s jututuppa %s\n"
+
+#: ../libpurple/server.c:791
 msgid "Accept chat invitation?"
 msgstr "Kas nõustume jututoa kutsega?"
 
@@ -11558,7 +11913,7 @@
 msgid "Unset"
 msgstr ""
 
-#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1058
 msgid "Do not disturb"
 msgstr "Mitte segada"
 
@@ -11610,96 +11965,96 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2702
+#: ../libpurple/util.c:2720
 #, c-format
 msgid "Error Reading %s"
 msgstr "Viga %s lugemisel"
 
-#: ../libpurple/util.c:2703
+#: ../libpurple/util.c:2721
 #, 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:3203
+#: ../libpurple/util.c:3221
 msgid "Calculating..."
 msgstr "Arvutamine..."
 
-#: ../libpurple/util.c:3206
+#: ../libpurple/util.c:3224
 msgid "Unknown."
 msgstr "Tundmatu."
 
-#: ../libpurple/util.c:3232
+#: ../libpurple/util.c:3250
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekundit"
 
-#: ../libpurple/util.c:3244
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d päev"
 msgstr[1] "%d päeva"
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3270
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d tund"
 msgstr[1] "%s, %d tundi"
 
-#: ../libpurple/util.c:3258
+#: ../libpurple/util.c:3276
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tund"
 msgstr[1] "%d tundi"
 
-#: ../libpurple/util.c:3266
+#: ../libpurple/util.c:3284
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minut"
 msgstr[1] "%s, %d minutit"
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3290
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minutit"
 
-#: ../libpurple/util.c:3532
+#: ../libpurple/util.c:3550
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr ""
 
-#: ../libpurple/util.c:3569 ../libpurple/util.c:3864
+#: ../libpurple/util.c:3587 ../libpurple/util.c:3882
 #, c-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: ../libpurple/util.c:3692
+#: ../libpurple/util.c:3710
 #, 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:3727
+#: ../libpurple/util.c:3745
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr ""
 
-#: ../libpurple/util.c:3758
+#: ../libpurple/util.c:3776
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr ""
 
-#: ../libpurple/util.c:3783
+#: ../libpurple/util.c:3801
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Hostiga %s pole võimalik ühenduda: %s"
@@ -11725,37 +12080,37 @@
 msgstr "Salve suund"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:409
+#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr "Sisselogimise valikud"
 
-#: ../pidgin/gtkaccount.c:430
+#: ../pidgin/gtkaccount.c:428
 msgid "Pro_tocol:"
 msgstr "Pro_tokoll:"
 
-#: ../pidgin/gtkaccount.c:441
+#: ../pidgin/gtkaccount.c:439
 msgid "Screen _name:"
 msgstr "_Ekraaninimi:"
 
-#: ../pidgin/gtkaccount.c:531
+#: ../pidgin/gtkaccount.c:529
 msgid "_Local alias:"
 msgstr "_Kohalik alias:"
 
-#: ../pidgin/gtkaccount.c:535
+#: ../pidgin/gtkaccount.c:533
 msgid "Remember pass_word"
 msgstr "_Parooli peetakse meeles"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:593
+#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr "Kasutaja valikud"
 
-#: ../pidgin/gtkaccount.c:606
+#: ../pidgin/gtkaccount.c:604
 msgid "New _mail notifications"
 msgstr "Teavitused e-posti _uute sõnumite kohta"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:611
+#: ../pidgin/gtkaccount.c:609
 msgid "Use this buddy _icon for this account:"
 msgstr "Selle konto jaoks kasutatakse seda sõbra_ikooni:"
 
@@ -11789,7 +12144,7 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1208
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1210
 msgid "Use Environmental Settings"
 msgstr "Kasutatakse keskkonnast tulenevaid sätteid"
 
@@ -11811,15 +12166,15 @@
 msgid "Proxy Options"
 msgstr "Proksi valikud"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1202
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1204
 msgid "Proxy _type:"
 msgstr "_Proksi liik:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1225
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1241
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1243
 msgid "_Port:"
 msgstr "_Port:"
 
@@ -11827,31 +12182,43 @@
 msgid "_Username:"
 msgstr "_Kasutajanimi:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1278
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1280
 msgid "Pa_ssword:"
 msgstr "_Parool:"
 
-#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkaccount.c:1195
+msgid "Unable to save new account"
+msgstr "Uut kontot pole võimalik salvestada"
+
+#: ../pidgin/gtkaccount.c:1196
+msgid "An account already exists with the specified criteria."
+msgstr "Selliste parameetritega konto on juba olemas."
+
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Konto lisamine"
 
-#: ../pidgin/gtkaccount.c:1497
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_Põhiline"
 
-#: ../pidgin/gtkaccount.c:1508
+#: ../pidgin/gtkaccount.c:1499
+msgid "Create this new account on the server"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1515
 msgid "_Advanced"
 msgstr "Laien_datud"
 
-#: ../pidgin/gtkaccount.c:1982 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Lubatud"
 
-#: ../pidgin/gtkaccount.c:2010
+#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../pidgin/gtkaccount.c:2210
+#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11865,229 +12232,241 @@
 "<b>Accounts->Add/Edit</b> in the Buddy List window"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:760
+#: ../pidgin/gtkblist.c:765
 msgid "Join a Chat"
 msgstr "Vestlusega ühinemine"
 
-#: ../pidgin/gtkblist.c:781
+#: ../pidgin/gtkblist.c:786
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
-msgstr "Palun sisesta teave jututoa kohta, millega soovid ühineda.\n"
+msgstr "Palun sisesta teave vestluse kohta, millega soovid ühineda.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:792 ../pidgin/gtkblist.c:5478
-#: ../pidgin/gtkblist.c:5844 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkblist.c:797 ../pidgin/gtkblist.c:5524
+#: ../pidgin/gtkblist.c:5890 ../pidgin/gtkpounce.c:538
 #: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkblist.c:1086 ../pidgin/gtkprivacy.c:602
 #: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Bloki"
 
-#: ../pidgin/gtkblist.c:1081
+#: ../pidgin/gtkblist.c:1086
 msgid "Un_block"
 msgstr "Eemalda _blokeering"
 
-#: ../pidgin/gtkblist.c:1132
+#: ../pidgin/gtkblist.c:1137
 msgid "Get _Info"
 msgstr "Hangi a_ndmed"
 
-#: ../pidgin/gtkblist.c:1135 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1140 ../pidgin/pidginstock.c:89
 msgid "I_M"
 msgstr "Vä_lksõnum"
 
-#: ../pidgin/gtkblist.c:1141
+#: ../pidgin/gtkblist.c:1146
 msgid "_Send File"
 msgstr "_Saada fail"
 
-#: ../pidgin/gtkblist.c:1148
+#: ../pidgin/gtkblist.c:1153
 msgid "Add Buddy _Pounce"
 msgstr "Lisa sõbra_märguanne"
 
-#: ../pidgin/gtkblist.c:1153 ../pidgin/gtkblist.c:1157
-#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
+#: ../pidgin/gtkblist.c:1158 ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1267 ../pidgin/gtkblist.c:1290
 msgid "View _Log"
 msgstr "Vaata _logi"
 
-#: ../pidgin/gtkblist.c:1170 ../pidgin/gtkblist.c:1179
-#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
+#: ../pidgin/gtkblist.c:1175 ../pidgin/gtkblist.c:1184
+#: ../pidgin/gtkblist.c:1275 ../pidgin/gtkblist.c:1296
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1173 ../pidgin/gtkblist.c:1181
-#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
+#: ../pidgin/gtkblist.c:1178 ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
 msgid "_Remove"
 msgstr "_Eemalda"
 
-#: ../pidgin/gtkblist.c:1231
+#: ../pidgin/gtkblist.c:1236
 msgid "Add a _Buddy"
 msgstr "Lisa _sõber"
 
-#: ../pidgin/gtkblist.c:1234
+#: ../pidgin/gtkblist.c:1239
 msgid "Add a C_hat"
 msgstr "Lisa _jututuba"
 
-#: ../pidgin/gtkblist.c:1237
+#: ../pidgin/gtkblist.c:1242
 msgid "_Delete Group"
 msgstr "_Kustuta grupp"
 
-#: ../pidgin/gtkblist.c:1239
+#: ../pidgin/gtkblist.c:1244
 msgid "_Rename"
 msgstr "Muuda _nime"
 
 #. join button
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:87
 msgid "_Join"
 msgstr "Ü_hine"
 
-#: ../pidgin/gtkblist.c:1260
+#: ../pidgin/gtkblist.c:1265
 msgid "Auto-Join"
 msgstr "Automaatühinemine"
 
-#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1322
+#: ../pidgin/gtkblist.c:1303 ../pidgin/gtkblist.c:1327
 msgid "_Collapse"
 msgstr "Ahen_da"
 
-#: ../pidgin/gtkblist.c:1327
+#: ../pidgin/gtkblist.c:1332
 msgid "_Expand"
 msgstr "Laien_da"
 
-#: ../pidgin/gtkblist.c:1572 ../pidgin/gtkblist.c:1584
-#: ../pidgin/gtkblist.c:4572 ../pidgin/gtkblist.c:4582
+#: ../pidgin/gtkblist.c:1583 ../pidgin/gtkblist.c:1595
+#: ../pidgin/gtkblist.c:4600 ../pidgin/gtkblist.c:4613
 msgid "/Tools/Mute Sounds"
 msgstr "/Vahendid/Vaigista helid"
 
-#: ../pidgin/gtkblist.c:2044 ../pidgin/gtkconv.c:4709
+#: ../pidgin/gtkblist.c:2055 ../pidgin/gtkconv.c:4815
 #: ../pidgin/gtkpounce.c:429
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2866
 msgid "/_Buddies"
 msgstr "/_Sõbrad"
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2867
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Sõbrad/Uus _välksõnum..."
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2868
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Sõbrad/Ühine _jututoaga..."
 
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:2869
 msgid "/Buddies/Get User _Info..."
 msgstr "/Sõbrad/Hangi kasutaja _andmed"
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/View User _Log..."
 msgstr "/Sõbrad/Vaata kasutaja _logi..."
 
-#: ../pidgin/gtkblist.c:2856
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Sõbrad/Näita _ühendamata sõpru"
-
-#: ../pidgin/gtkblist.c:2857
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Sõbrad/Näita _tühje gruppe"
-
-#: ../pidgin/gtkblist.c:2858
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Sõbrad/Näita sõbra ü_ksikasju"
-
-#: ../pidgin/gtkblist.c:2859
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Sõbrad/Näita jõ_udeoleku aegu"
-
-#: ../pidgin/gtkblist.c:2860
+#: ../pidgin/gtkblist.c:2872
+msgid "/Buddies/Show"
+msgstr "/Sõbrad/Näita"
+
+#: ../pidgin/gtkblist.c:2873
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/Sõbrad/Näita/Ü_hendamata sõpru"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/Sõbrad/Näita/_Tühje gruppe"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/Sõbrad/Näita/_Sõbra üksikasju"
+
+#: ../pidgin/gtkblist.c:2876
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/Sõbrad/Näita/_Jõudeoleku aegu"
+
+#: ../pidgin/gtkblist.c:2877
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/Sõbrad/Näita/_Protokollide ikoone"
+
+#: ../pidgin/gtkblist.c:2878
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Sõbrad/Sõp_rade sortimine"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2880
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Sõbrad/Lisa _sõber..."
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/Add C_hat..."
 msgstr "/Sõbrad/Lisa ju_tutuba..."
 
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:2882
 msgid "/Buddies/Add _Group..."
 msgstr "/Sõbrad/Lisa _grupp..."
 
-#: ../pidgin/gtkblist.c:2866
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/_Quit"
 msgstr "/Sõbrad/_Lõpeta"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2887
 msgid "/_Accounts"
 msgstr "/_Kontod"
 
-#: ../pidgin/gtkblist.c:2870 ../pidgin/gtkblist.c:6542
+#: ../pidgin/gtkblist.c:2888 ../pidgin/gtkblist.c:6589
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Kontod/Lisa või muuda"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2891
 msgid "/_Tools"
 msgstr "/_Vahendid"
 
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2892
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Vahendid/Sõbra_märguanded"
 
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:2893
+msgid "/Tools/_Certificates"
+msgstr "/Vahendid/_Sertifikaadid"
+
+#: ../pidgin/gtkblist.c:2894
 msgid "/Tools/Plu_gins"
 msgstr "/Vahendid/Plu_ginad"
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Pr_eferences"
 msgstr "/Vahendid/_Eelistused"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:2896
 msgid "/Tools/Pr_ivacy"
 msgstr "/Vahendid/_Privaatsus"
 
-#: ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/_File Transfers"
 msgstr "/Vahendid/_Failiülekanded"
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/R_oom List"
 msgstr "/Vahendid/_Tubade nimekiri"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:2900
 msgid "/Tools/System _Log"
 msgstr "/Vahendid/Süsteemne _logi"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/Mute _Sounds"
 msgstr "/Vahendid/_Vaigista helid"
 
 #. Help
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:2904
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: ../pidgin/gtkblist.c:2886
+#: ../pidgin/gtkblist.c:2905
 msgid "/Help/Online _Help"
 msgstr "/Abi/_Online abi"
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:2906
 msgid "/Help/_Debug Window"
 msgstr "/Abi/_Silumisaken"
 
-#: ../pidgin/gtkblist.c:2889 ../pidgin/gtkblist.c:2891
+#: ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:2910
 msgid "/Help/_About"
 msgstr "/Abi/Gaim'ist _lähemalt"
 
-#: ../pidgin/gtkblist.c:2920
+#: ../pidgin/gtkblist.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -12096,132 +12475,132 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3017
 msgid "Buddy Alias"
 msgstr "Sõbra alias"
 
-#: ../pidgin/gtkblist.c:3027
+#: ../pidgin/gtkblist.c:3046
 msgid "Logged In"
 msgstr "Sisse logitud"
 
-#: ../pidgin/gtkblist.c:3073
+#: ../pidgin/gtkblist.c:3092
 msgid "Last Seen"
 msgstr "Viimati nähtud"
 
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:3113
 msgid "Spooky"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3115
 msgid "Awesome"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:3117
 msgid "Rockin'"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3436
+#: ../pidgin/gtkblist.c:3450
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Jõude %dp %dt %02dm"
 
-#: ../pidgin/gtkblist.c:3438
+#: ../pidgin/gtkblist.c:3452
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Jõude %dt %02dm"
 
-#: ../pidgin/gtkblist.c:3440
+#: ../pidgin/gtkblist.c:3454
 #, c-format
 msgid "Idle %dm"
 msgstr "Jõude %dm"
 
-#: ../pidgin/gtkblist.c:3585
+#: ../pidgin/gtkblist.c:3599
 msgid "/Buddies/New Instant Message..."
 msgstr "/Sõbrad/Uus välksõnum..."
 
-#: ../pidgin/gtkblist.c:3586 ../pidgin/gtkblist.c:3619
+#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkblist.c:3633
 msgid "/Buddies/Join a Chat..."
 msgstr "/Sõbrad/Ühine vestlusega..."
 
-#: ../pidgin/gtkblist.c:3587
+#: ../pidgin/gtkblist.c:3601
 msgid "/Buddies/Get User Info..."
 msgstr "/Sõbrad/Hangi kasutaja andmed..."
 
-#: ../pidgin/gtkblist.c:3588
+#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/Add Buddy..."
 msgstr "/Sõbrad/Lisa sõber..."
 
-#: ../pidgin/gtkblist.c:3589 ../pidgin/gtkblist.c:3622
+#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Add Chat..."
 msgstr "/Sõbrad/Lisa vestlus..."
 
-#: ../pidgin/gtkblist.c:3590
+#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Add Group..."
 msgstr "/Sõbrad/Lisa grupp..."
 
-#: ../pidgin/gtkblist.c:3625
+#: ../pidgin/gtkblist.c:3639
 msgid "/Tools/Privacy"
 msgstr "/Vahendid/Privaatsus"
 
-#: ../pidgin/gtkblist.c:3628
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Room List"
 msgstr "/Vahendid/Tubade nimekiri"
 
-#: ../pidgin/gtkblist.c:3725 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3739 ../pidgin/gtkdocklet.c:153
 #, 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:3805
+#: ../pidgin/gtkblist.c:3819
 msgid "Manually"
 msgstr "Käsitsi"
 
-#: ../pidgin/gtkblist.c:3807
+#: ../pidgin/gtkblist.c:3821
 msgid "Alphabetically"
 msgstr "Tähestikuliselt"
 
-#: ../pidgin/gtkblist.c:3808
+#: ../pidgin/gtkblist.c:3822
 msgid "By status"
 msgstr "Oleku järgi"
 
-#: ../pidgin/gtkblist.c:3809
+#: ../pidgin/gtkblist.c:3823
 msgid "By log size"
 msgstr "Logi suuruse järgi"
 
-#: ../pidgin/gtkblist.c:4014 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4028 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s katkestas ühenduse"
 
-#: ../pidgin/gtkblist.c:4024
+#: ../pidgin/gtkblist.c:4038
 msgid "Re-enable Account"
 msgstr "Konto taaslubamine"
 
-#: ../pidgin/gtkblist.c:4050
+#: ../pidgin/gtkblist.c:4064
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s väljus võrgust: %s</span>"
 
-#: ../pidgin/gtkblist.c:4202
+#: ../pidgin/gtkblist.c:4216
 msgid "<b>Username:</b>"
 msgstr "<b>Kasutajanimi:</b>"
 
-#: ../pidgin/gtkblist.c:4209
+#: ../pidgin/gtkblist.c:4223
 msgid "<b>Password:</b>"
 msgstr "<b>Parool</b>"
 
-#: ../pidgin/gtkblist.c:4220
+#: ../pidgin/gtkblist.c:4234
 msgid "_Login"
 msgstr "_Logi sisse"
 
-#: ../pidgin/gtkblist.c:4303
+#: ../pidgin/gtkblist.c:4317
 msgid "/Accounts"
 msgstr "/Kontod"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4317
+#: ../pidgin/gtkblist.c:4331
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12234,23 +12613,27 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4566
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/Sõbrad/Näita ühendamata sõpru"
-
-#: ../pidgin/gtkblist.c:4569
-msgid "/Buddies/Show Empty Groups"
-msgstr "/Sõbrad/Näita tühje gruppe"
-
-#: ../pidgin/gtkblist.c:4575
-msgid "/Buddies/Show Buddy Details"
-msgstr "/Sõbrad/Näita sõbra üksikasju"
-
-#: ../pidgin/gtkblist.c:4578
-msgid "/Buddies/Show Idle Times"
-msgstr "/Sõbrad/Näita jõudeaegu"
-
-#: ../pidgin/gtkblist.c:5455
+#: ../pidgin/gtkblist.c:4594
+msgid "/Buddies/Show/Offline Buddies"
+msgstr "/Sõbrad/Näita/Ühendamata sõpru"
+
+#: ../pidgin/gtkblist.c:4597
+msgid "/Buddies/Show/Empty Groups"
+msgstr "/Sõbrad/Näita/Tühje gruppe"
+
+#: ../pidgin/gtkblist.c:4603
+msgid "/Buddies/Show/Buddy Details"
+msgstr "/Sõbrad/Näita/Sõbra üksikasju"
+
+#: ../pidgin/gtkblist.c:4606
+msgid "/Buddies/Show/Idle Times"
+msgstr "/Sõbrad/Näita/Jõudeaegu"
+
+#: ../pidgin/gtkblist.c:4609
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/Sõbrad/Näita/Protokollide ikoone"
+
+#: ../pidgin/gtkblist.c:5501
 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. "
@@ -12261,25 +12644,25 @@
 "kuvatakse hüüdnime ekraaninime asemel.\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5490
+#: ../pidgin/gtkblist.c:5536
 msgid "_Screen name:"
 msgstr "_Ekraaninimi:"
 
-#: ../pidgin/gtkblist.c:5512 ../pidgin/gtkblist.c:5865
+#: ../pidgin/gtkblist.c:5558 ../pidgin/gtkblist.c:5911
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:5777
+#: ../pidgin/gtkblist.c:5823
 msgid "This protocol does not support chat rooms."
 msgstr "See protokoll ei toeta jututubasid"
 
-#: ../pidgin/gtkblist.c:5793
+#: ../pidgin/gtkblist.c:5839
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:5834
+#: ../pidgin/gtkblist.c:5880
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -12287,39 +12670,39 @@
 "Palun sisesta alias ja vestluse kohta käivad andmed lisatakse sinu "
 "sõbraloenisse.\n"
 
-#: ../pidgin/gtkblist.c:5922
+#: ../pidgin/gtkblist.c:5968
 msgid "Please enter the name of the group to be added."
 msgstr "Palun sisesta lisatava grupi nimi."
 
-#: ../pidgin/gtkblist.c:6562
+#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6586
+#: ../pidgin/gtkblist.c:6633
 msgid "_Edit Account"
 msgstr "_Redigeeri kontot"
 
-#: ../pidgin/gtkblist.c:6599 ../pidgin/gtkconv.c:3015
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3053
 msgid "No actions available"
 msgstr "Toiminguid pole"
 
-#: ../pidgin/gtkblist.c:6607
+#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr "_Keela"
 
-#: ../pidgin/gtkblist.c:6619
+#: ../pidgin/gtkblist.c:6666
 msgid "Enable Account"
 msgstr "Luba konto"
 
-#: ../pidgin/gtkblist.c:6625
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6674
+#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/Vahendid"
 
-#: ../pidgin/gtkblist.c:6744
+#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/Sõbrad/Sordi sõbrad"
 
@@ -12331,26 +12714,30 @@
 "%s will not attempt to reconnect the account until you correct the error and "
 "re-enable the account."
 msgstr ""
-
-#: ../pidgin/gtkconv.c:488
+"%s\n"
+"\n"
+"%s ei proovi kontot automaatselt ühendada enne, kui sa pole viga kõrvaldanud "
+"ja kontot uuesti kasutusele võtnud."
+
+#: ../pidgin/gtkconv.c:462
 msgid "Unknown command."
 msgstr "Tundmatu käsk."
 
-#: ../pidgin/gtkconv.c:760 ../pidgin/gtkconv.c:786
+#: ../pidgin/gtkconv.c:734 ../pidgin/gtkconv.c:760
 msgid "That buddy is not on the same protocol as this chat."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:780
+#: ../pidgin/gtkconv.c:754
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:833
+#: ../pidgin/gtkconv.c:807
 msgid "Invite Buddy Into Chat Room"
 msgstr "Sõbra kutsumine jututuppa"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:863
+#: ../pidgin/gtkconv.c:837
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -12358,201 +12745,192 @@
 "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:884
+#: ../pidgin/gtkconv.c:858
 msgid "_Buddy:"
 msgstr "_Sõber:"
 
-#: ../pidgin/gtkconv.c:904 ../pidgin/gtksavedstatuses.c:1193
-#: ../pidgin/gtksavedstatuses.c:1525
+#: ../pidgin/gtkconv.c:878 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1527
 msgid "_Message:"
 msgstr "Sõ_num:"
 
-#: ../pidgin/gtkconv.c:961 ../pidgin/gtkconv.c:2522 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:935 ../pidgin/gtkconv.c:2576 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Faili pole võimalik avada."
 
-#: ../pidgin/gtkconv.c:967
+#: ../pidgin/gtkconv.c:941
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Vestlused kasutajaga %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1003
+#: ../pidgin/gtkconv.c:977
 msgid "Save Conversation"
 msgstr "Vestluse salvestamine"
 
-#: ../pidgin/gtkconv.c:1152 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1126 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Otsing"
 
-#: ../pidgin/gtkconv.c:1178 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1152 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "O_tsida stringi:"
 
-#: ../pidgin/gtkconv.c:1361
-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."
-
-#: ../pidgin/gtkconv.c:1369
-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."
-
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1602
 msgid "Un-Ignore"
 msgstr "Ära eira"
 
-#: ../pidgin/gtkconv.c:1620
+#: ../pidgin/gtkconv.c:1605
 msgid "Ignore"
 msgstr "Eira"
 
-#: ../pidgin/gtkconv.c:1640
+#: ../pidgin/gtkconv.c:1625
 msgid "Get Away Message"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:1663
+#: ../pidgin/gtkconv.c:1648
 msgid "Last said"
 msgstr "Viimati ütles"
 
-#: ../pidgin/gtkconv.c:2530
+#: ../pidgin/gtkconv.c:2584
 msgid "Unable to save icon file to disk."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2581
+#: ../pidgin/gtkconv.c:2635
 msgid "Save Icon"
 msgstr "Ikooni salvestamine"
 
-#: ../pidgin/gtkconv.c:2633
+#: ../pidgin/gtkconv.c:2687
 msgid "Animate"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2638
+#: ../pidgin/gtkconv.c:2692
 msgid "Hide Icon"
 msgstr "Peida ikoon"
 
-#: ../pidgin/gtkconv.c:2641
+#: ../pidgin/gtkconv.c:2695
 msgid "Save Icon As..."
 msgstr "Salvesta ikoon kui..."
 
-#: ../pidgin/gtkconv.c:2645
+#: ../pidgin/gtkconv.c:2699
 msgid "Set Custom Icon..."
 msgstr "Määra kohandatud ikoon..."
 
-#: ../pidgin/gtkconv.c:2658
+#: ../pidgin/gtkconv.c:2712
 msgid "Remove Custom Icon"
+msgstr "Eemalda kohandatud ikoon"
+
+#: ../pidgin/gtkconv.c:2839
+msgid "Show All"
 msgstr ""
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2858
 msgid "/_Conversation"
 msgstr "/_Vestlus"
 
-#: ../pidgin/gtkconv.c:2802
+#: ../pidgin/gtkconv.c:2860
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Vestlus/Uus _välksõnum..."
 
-#: ../pidgin/gtkconv.c:2807
+#: ../pidgin/gtkconv.c:2865
 msgid "/Conversation/_Find..."
 msgstr "/Vestlus/_Otsi..."
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2867
 msgid "/Conversation/View _Log"
 msgstr "/Vestlus/Vaata _logi"
 
-#: ../pidgin/gtkconv.c:2810
+#: ../pidgin/gtkconv.c:2868
 msgid "/Conversation/_Save As..."
 msgstr "/Vestlus/Salvesta _kui..."
 
-#: ../pidgin/gtkconv.c:2812
+#: ../pidgin/gtkconv.c:2870
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Vestlus/_Puhasta tagasikerimine"
 
-#: ../pidgin/gtkconv.c:2816
+#: ../pidgin/gtkconv.c:2874
 msgid "/Conversation/Se_nd File..."
 msgstr "/Vestlus/Saada _fail..."
 
-#: ../pidgin/gtkconv.c:2817
+#: ../pidgin/gtkconv.c:2875
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Vestlus/Lisa sõbra_märguanne..."
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2877
 msgid "/Conversation/_Get Info"
 msgstr "/Vestlus/_Hangi teavet"
 
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2879
 msgid "/Conversation/In_vite..."
 msgstr "/Vestlus/_Kutsu..."
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2881
 msgid "/Conversation/M_ore"
 msgstr "/Vestlus/_Veel"
 
-#: ../pidgin/gtkconv.c:2827
+#: ../pidgin/gtkconv.c:2885
 msgid "/Conversation/Al_ias..."
 msgstr "/Vestlus/Al_ias..."
 
-#: ../pidgin/gtkconv.c:2829
+#: ../pidgin/gtkconv.c:2887
 msgid "/Conversation/_Block..."
 msgstr "/Vestlus/_Bloki..."
 
-#: ../pidgin/gtkconv.c:2831
+#: ../pidgin/gtkconv.c:2889
 msgid "/Conversation/_Unblock..."
 msgstr "/Vestlus/_Eemalda blokeering..."
 
-#: ../pidgin/gtkconv.c:2833
+#: ../pidgin/gtkconv.c:2891
 msgid "/Conversation/_Add..."
 msgstr "/Vestlus/_Lisa..."
 
-#: ../pidgin/gtkconv.c:2835
+#: ../pidgin/gtkconv.c:2893
 msgid "/Conversation/_Remove..."
 msgstr "/Vestlus/_Eemalda"
 
-#: ../pidgin/gtkconv.c:2840
+#: ../pidgin/gtkconv.c:2898
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Vestlus/Lisa _viit..."
 
-#: ../pidgin/gtkconv.c:2842
+#: ../pidgin/gtkconv.c:2900
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Vestlus/Lisa _pilt..."
 
-#: ../pidgin/gtkconv.c:2848
+#: ../pidgin/gtkconv.c:2906
+msgid "/Conversation/_Hide"
+msgstr "/Vestlus/_Peida"
+
+#: ../pidgin/gtkconv.c:2908
 msgid "/Conversation/_Close"
 msgstr "/Vestlus/_Sulge"
 
 #. Options
-#: ../pidgin/gtkconv.c:2852
+#: ../pidgin/gtkconv.c:2912
 msgid "/_Options"
 msgstr "/V_alikud"
 
-#: ../pidgin/gtkconv.c:2853
+#: ../pidgin/gtkconv.c:2913
 msgid "/Options/Enable _Logging"
 msgstr "/Valikud/Luba _logimine"
 
-#: ../pidgin/gtkconv.c:2854
+#: ../pidgin/gtkconv.c:2914
 msgid "/Options/Enable _Sounds"
 msgstr "/Valikud/Luba _helid"
 
-#: ../pidgin/gtkconv.c:2855
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Valikud/Näita sõbra _ikooni"
-
-#: ../pidgin/gtkconv.c:2857
+#: ../pidgin/gtkconv.c:2916
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Valikud/Näita _vormindamise tööriistu"
 
-#: ../pidgin/gtkconv.c:2858
+#: ../pidgin/gtkconv.c:2917
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Valikud/Näita _ajatempleid"
 
-#: ../pidgin/gtkconv.c:3003
+#: ../pidgin/gtkconv.c:3041
 msgid "/Conversation/More"
 msgstr "/Vestlus/Veel"
 
-#: ../pidgin/gtkconv.c:3059
+#: ../pidgin/gtkconv.c:3097
 msgid "/Options"
 msgstr "/Valikud"
 
@@ -12561,176 +12939,172 @@
 #. 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:3094 ../pidgin/gtkconv.c:3126
+#: ../pidgin/gtkconv.c:3132 ../pidgin/gtkconv.c:3164
 msgid "/Conversation"
 msgstr "/Vestlus"
 
-#: ../pidgin/gtkconv.c:3134
+#: ../pidgin/gtkconv.c:3172
 msgid "/Conversation/View Log"
 msgstr "/Vestlus/Vaata logi"
 
-#: ../pidgin/gtkconv.c:3140
+#: ../pidgin/gtkconv.c:3178
 msgid "/Conversation/Send File..."
 msgstr "/Vestlus/Saada fail..."
 
-#: ../pidgin/gtkconv.c:3144
+#: ../pidgin/gtkconv.c:3182
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Vestlus/Lisa sõbramärguanne..."
 
-#: ../pidgin/gtkconv.c:3150
+#: ../pidgin/gtkconv.c:3188
 msgid "/Conversation/Get Info"
 msgstr "/Vestlus/Hangi andmed"
 
-#: ../pidgin/gtkconv.c:3154
+#: ../pidgin/gtkconv.c:3192
 msgid "/Conversation/Invite..."
 msgstr "/Vestlus/Kutsu..."
 
-#: ../pidgin/gtkconv.c:3160
+#: ../pidgin/gtkconv.c:3198
 msgid "/Conversation/Alias..."
 msgstr "/Vestlus/Alias..."
 
-#: ../pidgin/gtkconv.c:3164
+#: ../pidgin/gtkconv.c:3202
 msgid "/Conversation/Block..."
 msgstr "/Vestlus/Bloki..."
 
-#: ../pidgin/gtkconv.c:3168
+#: ../pidgin/gtkconv.c:3206
 msgid "/Conversation/Unblock..."
 msgstr "/Vestlus/Eemalda blokeering..."
 
-#: ../pidgin/gtkconv.c:3172
+#: ../pidgin/gtkconv.c:3210
 msgid "/Conversation/Add..."
 msgstr "/Vestlus/Lisa..."
 
-#: ../pidgin/gtkconv.c:3176
+#: ../pidgin/gtkconv.c:3214
 msgid "/Conversation/Remove..."
 msgstr "/Vestlus/Eemalda..."
 
-#: ../pidgin/gtkconv.c:3182
+#: ../pidgin/gtkconv.c:3220
 msgid "/Conversation/Insert Link..."
 msgstr "/Vestlus/Lisa viit..."
 
-#: ../pidgin/gtkconv.c:3186
+#: ../pidgin/gtkconv.c:3224
 msgid "/Conversation/Insert Image..."
 msgstr "/Vestlus/Lisa pilt..."
 
-#: ../pidgin/gtkconv.c:3192
+#: ../pidgin/gtkconv.c:3230
 msgid "/Options/Enable Logging"
 msgstr "/Valikud/Luba logimine"
 
-#: ../pidgin/gtkconv.c:3195
+#: ../pidgin/gtkconv.c:3233
 msgid "/Options/Enable Sounds"
 msgstr "/Valikud/Luba helid"
 
-#: ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3246
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Valikud/Näita vormindamise tööriistu"
 
-#: ../pidgin/gtkconv.c:3211
+#: ../pidgin/gtkconv.c:3249
 msgid "/Options/Show Timestamps"
 msgstr "/Valikud/Näita ajatempleid"
 
-#: ../pidgin/gtkconv.c:3214
-msgid "/Options/Show Buddy Icon"
-msgstr "/Valikud/Näita sõbraikooni"
-
-#: ../pidgin/gtkconv.c:3298 ../pidgin/gtkconv.c:3340
+#: ../pidgin/gtkconv.c:3326 ../pidgin/gtkconv.c:3368
 msgid "User is typing..."
 msgstr "Kasutaja tipib..."
 
-#: ../pidgin/gtkconv.c:3343
+#: ../pidgin/gtkconv.c:3371
 msgid "User has typed something and stopped"
 msgstr "Kasutaja tippis midagi ja siis jättis selle pooleli"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3526 ../pidgin/gtkconv.c:7817
+#: ../pidgin/gtkconv.c:3554 ../pidgin/gtkconv.c:7989
 msgid "_Send To"
 msgstr "Kellele _saata"
 
-#: ../pidgin/gtkconv.c:4239
+#: ../pidgin/gtkconv.c:4267
 msgid "_Send"
 msgstr "_Saada"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4343
+#: ../pidgin/gtkconv.c:4371
 msgid "0 people in room"
 msgstr "0 isikut toas"
 
-#: ../pidgin/gtkconv.c:5611 ../pidgin/gtkconv.c:5732
+#: ../pidgin/gtkconv.c:5731 ../pidgin/gtkconv.c:5852
 #, 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:6341 ../pidgin/gtkstatusbox.c:659
+#: ../pidgin/gtkconv.c:6453 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6345
+#: ../pidgin/gtkconv.c:6457
 msgid "Stopped Typing"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6348
+#: ../pidgin/gtkconv.c:6460
 msgid "Nick Said"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6351 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6463 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Lugemata sõnumid"
 
-#: ../pidgin/gtkconv.c:6354
+#: ../pidgin/gtkconv.c:6466
 msgid "New Event"
 msgstr "Uus sündmus"
 
-#: ../pidgin/gtkconv.c:7358
+#: ../pidgin/gtkconv.c:7539
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Vestluse kogu tagasikerimispuhvri puhastamine."
 
-#: ../pidgin/gtkconv.c:7522
+#: ../pidgin/gtkconv.c:7703
 msgid "Confirm close"
 msgstr "Sulgemiskinnitus"
 
-#: ../pidgin/gtkconv.c:7554
+#: ../pidgin/gtkconv.c:7735
 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:8144
+#: ../pidgin/gtkconv.c:8322
 msgid "Close other tabs"
 msgstr "Sulge teised kaardid"
 
-#: ../pidgin/gtkconv.c:8150
+#: ../pidgin/gtkconv.c:8328
 msgid "Close all tabs"
 msgstr "Sulge kõik kaardid"
 
-#: ../pidgin/gtkconv.c:8158
+#: ../pidgin/gtkconv.c:8336
 msgid "Detach this tab"
 msgstr "Haagi see kaart lahti"
 
-#: ../pidgin/gtkconv.c:8164
+#: ../pidgin/gtkconv.c:8342
 msgid "Close this tab"
 msgstr "Sulge see kaart"
 
-#: ../pidgin/gtkconv.c:8650
+#: ../pidgin/gtkconv.c:8842
 msgid "Close conversation"
 msgstr "Vestluse sulgemine"
 
-#: ../pidgin/gtkconv.c:9250
+#: ../pidgin/gtkconv.c:9441
 msgid "Last created window"
 msgstr "Viimati loodud aknasse"
 
-#: ../pidgin/gtkconv.c:9252
+#: ../pidgin/gtkconv.c:9443
 msgid "Separate IM and Chat windows"
 msgstr "Välksõnumid ja jututoad eraldi akendesse"
 
-#: ../pidgin/gtkconv.c:9254 ../pidgin/gtkprefs.c:1412
+#: ../pidgin/gtkconv.c:9445 ../pidgin/gtkprefs.c:1414
 msgid "New window"
 msgstr "Uude aknasse"
 
-#: ../pidgin/gtkconv.c:9256
+#: ../pidgin/gtkconv.c:9447
 msgid "By group"
 msgstr "Grupi kaupa"
 
-#: ../pidgin/gtkconv.c:9258
+#: ../pidgin/gtkconv.c:9449
 msgid "By account"
 msgstr "Konto kaupa"
 
@@ -12794,7 +13168,7 @@
 msgid "Fatal Error"
 msgstr "Saatuslik viga"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:113
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "juhtiv arendaja"
 
@@ -12805,8 +13179,8 @@
 #: ../pidgin/gtkdialogs.c:80 ../pidgin/gtkdialogs.c:81
 #: ../pidgin/gtkdialogs.c:82 ../pidgin/gtkdialogs.c:83
 #: ../pidgin/gtkdialogs.c:84 ../pidgin/gtkdialogs.c:85
-#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:89
-#: ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:91
 msgid "developer"
 msgstr "arendaja"
 
@@ -12816,428 +13190,435 @@
 
 #: ../pidgin/gtkdialogs.c:87
 msgid "support/QA"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:104
-msgid "win32 port"
-msgstr "win32 port"
-
-#: ../pidgin/gtkdialogs.c:105 ../pidgin/gtkdialogs.c:106
-msgid "maintainer"
-msgstr "hooldaja"
-
-#: ../pidgin/gtkdialogs.c:107
-msgid "libfaim maintainer"
-msgstr "libfaimi hooldaja"
+msgstr "kasutajatugi/kvaliteedikontroll"
+
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:112
+msgid "developer & webmaster"
+msgstr "arendaja ja veebimeister"
+
+#: ../pidgin/gtkdialogs.c:99
+msgid "Senior Contributor/QA"
+msgstr ""
 
 #: ../pidgin/gtkdialogs.c:108
-msgid "developer & webmaster"
-msgstr "arendaja ja veebimeister"
-
-#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:110
-msgid "hacker and designated driver [lazy bum]"
-msgstr ""
+msgid "win32 port"
+msgstr "win32 port"
+
+#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
+msgid "maintainer"
+msgstr "hooldaja"
 
 #: ../pidgin/gtkdialogs.c:111
+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
+msgid "hacker and designated driver [lazy bum]"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:115
 msgid "XMPP developer"
 msgstr "XMPP arendaja"
 
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
-msgstr "algupärane autor"
-
-#: ../pidgin/gtkdialogs.c:128
+msgstr "algse versiooni autor"
+
+#: ../pidgin/gtkdialogs.c:132
 msgid "Afrikaans"
 msgstr "Aafrika"
 
-#: ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:133
 msgid "Arabic"
 msgstr "Araabia"
 
-#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:131
-#: ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:222
 msgid "Bulgarian"
 msgstr "Bulgaaria"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:133
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
 msgid "Bengali"
 msgstr "Bengaali"
 
-#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:140
 msgid "Bosnian"
 msgstr "Bosnian"
 
-#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:224
 msgid "Catalan"
 msgstr "Kataloonia"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143
 msgid "Valencian-Catalan"
 msgstr "Valentsia kataloonia"
 
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:225
 msgid "Czech"
 msgstr "Tšehhi"
 
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
-msgid "Danish"
-msgstr "Taani"
-
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
-#: ../pidgin/gtkdialogs.c:222
-msgid "German"
-msgstr "Saksa"
-
 #: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
-#: ../pidgin/gtkdialogs.c:147
+msgid "Danish"
+msgstr "Taani"
+
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:226
+msgid "German"
+msgstr "Saksa"
+
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:151
 msgid "Dzongkha"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
 msgid "Greek"
 msgstr "Kreeka"
 
-#: ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:154
 msgid "Australian English"
 msgstr "Austraalia inglise"
 
-#: ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:155
 msgid "Canadian English"
 msgstr "Kanada inglise"
 
-#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:156
 msgid "British English"
 msgstr "Briti inglise"
 
-#: ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:157
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:223
-#: ../pidgin/gtkdialogs.c:224 ../pidgin/gtkdialogs.c:225
-#: ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230
 msgid "Spanish"
 msgstr "Hispaania"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:159
+msgid "Estonian"
+msgstr "Eesti"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:161
 msgid "Euskera(Basque)"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
 msgid "Persian"
 msgstr "Pärsia"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Finnish"
 msgstr "Soome"
 
-#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:229
-#: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236
 msgid "French"
 msgstr "Prantsuse"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:237
 msgid "Galician"
 msgstr "Galiitsia"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:170
 msgid "Gujarati Language Team"
 msgstr "Gujarati keelemeeskond"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:238
 msgid "Hebrew"
 msgstr "Heebrea"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:172
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:173
 msgid "Hungarian"
 msgstr "Ungari"
 
-#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:174
 msgid "Indonesian"
 msgstr "Indoneesia"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:239
 msgid "Italian"
 msgstr "Itaalia"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:235
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241 ../pidgin/gtkdialogs.c:242
 msgid "Japanese"
 msgstr "Jaapani"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:243
 msgid "Georgian"
 msgstr "Gruusia"
 
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:177
 msgid "Ubuntu Georgian Translators"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada Translation team"
 msgstr "Kannada tõlkemeeskond"
 
-#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:239
-#: ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:245
 msgid "Korean"
 msgstr "Korea"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:176
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Kurdish"
 msgstr "Kurdi"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:241
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247
 msgid "Lithuanian"
 msgstr "Leedu"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:248
 msgid "Macedonian"
 msgstr "Makedoonia"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:249
 msgid "Bokmål Norwegian"
 msgstr "Norra (bokmål)"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:187
 msgid "Nepali"
 msgstr "Nepaali"
 
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:188
 msgid "Dutch, Flemish"
 msgstr "Hollandi, Flaami"
 
-#: ../pidgin/gtkdialogs.c:184
-msgid "Norwegian"
-msgstr "Norra"
-
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:189
 msgid "Norwegian Nynorsk"
 msgstr "Norra (nynorsk)"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:250
 msgid "Polish"
 msgstr "Poola"
 
-#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:193
 msgid "Portuguese"
 msgstr "Portugali"
 
-#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:194
 msgid "Portuguese-Brazil"
 msgstr "Portugali-Brasiilia"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:195
 msgid "Pashto"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:196
 msgid "Romanian"
 msgstr "Rumeenia"
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:245
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:252
 msgid "Russian"
 msgstr "Vene"
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
-#: ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:253 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Slovak"
 msgstr "Slovaki"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:256
 msgid "Slovenian"
 msgstr "Sloveenia"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:201
 msgid "Albanian"
 msgstr "Albaania"
 
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
 msgid "Serbian"
 msgstr "Serbia"
 
-#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:258
 msgid "Swedish"
 msgstr "Rootsi"
 
-#: ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:205
 msgid "Tamil"
 msgstr "Tamili"
 
-#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:206
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:207
 msgid "Thai"
 msgstr "Tai"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:259
 msgid "Turkish"
 msgstr "Türgi"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:209
 msgid "Vietnamese"
 msgstr "Vietnami"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:209
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh ja Gnome-Vi meeskond"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:260
 msgid "Simplified Chinese"
 msgstr "Hiina lihtsustatud"
 
-#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:208
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Hong Kong Chinese"
 msgstr "Hong Kongi hiina"
 
-#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:211
-#: ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:261
 msgid "Traditional Chinese"
 msgstr "Hiina traditsiooniline"
 
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:221
 msgid "Amharic"
 msgstr "Amhari"
 
-#: ../pidgin/gtkdialogs.c:339
+#: ../pidgin/gtkdialogs.c:346
 #, c-format
 msgid "About %s"
 msgstr "%s - lähem teave"
 
-#: ../pidgin/gtkdialogs.c:377
+#: ../pidgin/gtkdialogs.c:384
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
-"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
-"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
-"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
-"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
-"contributors.  We provide no warranty for this program.<BR><BR>"
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
 msgstr ""
 "%s on graafiline ja modulaarne sõnumivahetuse klient. Programm põhineb "
 "libpurple teegil, mis on suuteline ühenduma protokollide AIM, MSN, Yahoo!, "
 "XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu ja QQ abil, võimalik on ühenduda rööbiti mitme protokolli "
-"kaudu.  Kasutajaliidese jaoks on kasutatud GTK+ teeki.<BR><BR>Te võite seda "
-"programmi edasi levitada ja/või muuta vastavalt GNU Üldise Avaliku Litsentsi "
-"(vastavalt teie valikule ka versioon 2 või uuem versioon) tingimustele. GNU "
-"Üldise Avaliku Litsenti koopia asub failis 'COPYING', mis peaks olema %s "
-"pakiga kaasas.  Programmi %s autoriõigused kuuluvad programmi autoritele. "
-"Autorite täielik nimekiri asub failis 'COPYRIGHT'. Programmil pole mitte "
-"mingisugust garantiid.<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:392
+"Zephyr, MySpaceIM, Gadu-Gadu ja QQ abil, võimalik on ühenduda rööbiti mitme "
+"protokolli kaudu.  Kasutajaliidese jaoks on kasutatud GTK+ teeki.<BR><BR>Te "
+"võite seda programmi edasi levitada ja/või muuta vastavalt GNU Üldise "
+"Avaliku Litsentsi (vastavalt teie valikule ka versioon 2 või uuem versioon) "
+"tingimustele. GNU Üldise Avaliku Litsenti koopia asub failis 'COPYING', mis "
+"peaks olema %s pakiga kaasas.  Programmi %s autoriõigused kuuluvad programmi "
+"autoritele. Autorite täielik nimekiri asub failis 'COPYRIGHT'. Programmil "
+"pole mitte mingisugust garantiid.<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:399
 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:397
+#: ../pidgin/gtkdialogs.c:404
 msgid "Current Developers"
 msgstr "Praegused arendajad"
 
-#: ../pidgin/gtkdialogs.c:412
+#: ../pidgin/gtkdialogs.c:419
 msgid "Crazy Patch Writers"
 msgstr "Hullunud parandustekirjutajad"
 
-#: ../pidgin/gtkdialogs.c:427
+#: ../pidgin/gtkdialogs.c:434
 msgid "Retired Developers"
 msgstr "Endised arendajad"
 
-#: ../pidgin/gtkdialogs.c:442
+#: ../pidgin/gtkdialogs.c:449
 msgid "Retired Crazy Patch Writers"
 msgstr "Endised hullunud parandustekirjutajad"
 
-#: ../pidgin/gtkdialogs.c:457
+#: ../pidgin/gtkdialogs.c:464
 msgid "Artists"
 msgstr "Kunstnikud"
 
-#: ../pidgin/gtkdialogs.c:472
+#: ../pidgin/gtkdialogs.c:479
 msgid "Current Translators"
 msgstr "Praegused tõlkijad"
 
-#: ../pidgin/gtkdialogs.c:492
+#: ../pidgin/gtkdialogs.c:499
 msgid "Past Translators"
 msgstr "Eelmised tõlkijad"
 
-#: ../pidgin/gtkdialogs.c:510
+#: ../pidgin/gtkdialogs.c:517
 msgid "Debugging Information"
 msgstr "Silumisandmed"
 
-#: ../pidgin/gtkdialogs.c:879
+#: ../pidgin/gtkdialogs.c:887
 msgid "Get User Info"
 msgstr "Kasutaja andmete hankimine"
 
-#: ../pidgin/gtkdialogs.c:881
+#: ../pidgin/gtkdialogs.c:889
 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:971
+#: ../pidgin/gtkdialogs.c:979
 msgid "View User Log"
 msgstr "Kasutaja logi vaatamine"
 
-#: ../pidgin/gtkdialogs.c:973
+#: ../pidgin/gtkdialogs.c:981
 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:993
+#: ../pidgin/gtkdialogs.c:1001
 msgid "Alias Contact"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:1002
 msgid "Enter an alias for this contact."
 msgstr "Sisesta sellele kontaktile alias."
 
-#: ../pidgin/gtkdialogs.c:1016
+#: ../pidgin/gtkdialogs.c:1024
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Sisesta kasutajale %s alias."
 
-#: ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1026
 msgid "Alias Buddy"
 msgstr "Sõbrale aliase määramine"
 
-#: ../pidgin/gtkdialogs.c:1039
+#: ../pidgin/gtkdialogs.c:1047
 msgid "Alias Chat"
 msgstr "Vestluse alias"
 
-#: ../pidgin/gtkdialogs.c:1040
+#: ../pidgin/gtkdialogs.c:1048
 msgid "Enter an alias for this chat."
 msgstr "Aliase lisamine vestlusele."
 
-#: ../pidgin/gtkdialogs.c:1079
+#: ../pidgin/gtkdialogs.c:1087
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13248,30 +13629,30 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtkdialogs.c:1087
+#: ../pidgin/gtkdialogs.c:1095
 msgid "Remove Contact"
 msgstr "Kontakti eemaldamine"
 
-#: ../pidgin/gtkdialogs.c:1090
+#: ../pidgin/gtkdialogs.c:1098
 msgid "_Remove Contact"
 msgstr "_Eemalda kontakt"
 
-#: ../pidgin/gtkdialogs.c:1121
+#: ../pidgin/gtkdialogs.c:1129
 #, 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:1128
+#: ../pidgin/gtkdialogs.c:1136
 msgid "Merge Groups"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1131
+#: ../pidgin/gtkdialogs.c:1139
 msgid "_Merge Groups"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1181
+#: ../pidgin/gtkdialogs.c:1189
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13280,15 +13661,15 @@
 "Sa oled eemaldamas gruppi %s ja kõiki selle liikmeid oma sõbranimekirjast. "
 "Kas sa soovid seda teha?"
 
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1192
 msgid "Remove Group"
 msgstr "Grupi eemaldamine"
 
-#: ../pidgin/gtkdialogs.c:1187
+#: ../pidgin/gtkdialogs.c:1195
 msgid "_Remove Group"
 msgstr "_Eemalda grupp"
 
-#: ../pidgin/gtkdialogs.c:1220
+#: ../pidgin/gtkdialogs.c:1228
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
@@ -13296,15 +13677,15 @@
 "Sa oled eemaldamas kasutajat %s oma sõbranimekirjast. Kas sa soovid seda "
 "teha?"
 
-#: ../pidgin/gtkdialogs.c:1223
+#: ../pidgin/gtkdialogs.c:1231
 msgid "Remove Buddy"
 msgstr "Sõbra eemaldamine"
 
-#: ../pidgin/gtkdialogs.c:1226
+#: ../pidgin/gtkdialogs.c:1234
 msgid "_Remove Buddy"
 msgstr "_Eemalda sõber"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1255
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -13313,11 +13694,11 @@
 "Sa oled eemaldamas jututuba %s oma sõbranimekirjast.  Kas sa soovid seda "
 "teha?"
 
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1258
 msgid "Remove Chat"
 msgstr "Vestluse eemaldamine"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1261
 msgid "_Remove Chat"
 msgstr "_Eemalda vestlus"
 
@@ -13426,7 +13807,7 @@
 msgstr "Failiülekande ü_ksikasjad"
 
 #. Pause button
-#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:94
 msgid "_Pause"
 msgstr "Pa_us"
 
@@ -13439,7 +13820,7 @@
 msgid "Paste as Plain _Text"
 msgstr "Aseta _lihttekstina"
 
-#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1138
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Reset formatting"
 msgstr "_Puhasta vormindus"
 
@@ -13515,118 +13896,182 @@
 msgid "_Save Image..."
 msgstr "_Salvesta pilt..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:153
+#: ../pidgin/gtkimhtmltoolbar.c:162
 msgid "Select Font"
 msgstr "Kirjatüübi valimine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:232
+#: ../pidgin/gtkimhtmltoolbar.c:241
 msgid "Select Text Color"
 msgstr "Teksti värvuse valimine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:311
+#: ../pidgin/gtkimhtmltoolbar.c:320
 msgid "Select Background Color"
 msgstr "Taustavärvuse valimine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:400
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:408
+#: ../pidgin/gtkimhtmltoolbar.c:417
 msgid "_Description"
 msgstr "_Kirjeldus"
 
-#: ../pidgin/gtkimhtmltoolbar.c:411
+#: ../pidgin/gtkimhtmltoolbar.c:420
 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:415
+#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Palun sisesta URL, mida soovid lisada."
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: ../pidgin/gtkimhtmltoolbar.c:429 ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Insert Link"
 msgstr "Viida lisamine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1207
+#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1258
 msgid "_Insert"
 msgstr "L_isa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:493
+#: ../pidgin/gtkimhtmltoolbar.c:513
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Tõrge pildi salvestamisel: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
+#: ../pidgin/gtkimhtmltoolbar.c:539 ../pidgin/gtkimhtmltoolbar.c:549
 msgid "Insert Image"
 msgstr "Pildi lisamine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:740
+#: ../pidgin/gtkimhtmltoolbar.c:760
 msgid "This theme has no available smileys."
 msgstr "Selles teemas pole tujunägusid"
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:757
+#: ../pidgin/gtkimhtmltoolbar.c:777
 msgid "Smile!"
 msgstr "Tujunäod"
 
-#: ../pidgin/gtkimhtmltoolbar.c:820 ../pidgin/gtkimhtmltoolbar.c:1164
+#: ../pidgin/gtkimhtmltoolbar.c:842 ../pidgin/gtkimhtmltoolbar.c:1215
 msgid "_Font"
 msgstr "Kir_jatüüp"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1124
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Group Items"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Ungroup Items"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1084 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Rasvane"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Kursiiv"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Allajoonitud"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1087
+msgid "Strikethrough"
+msgstr "Läbijoonitud"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1089
+msgid "Increase Font Size"
+msgstr "Kirjatüübi suuruse suurendamine"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+msgid "Decrease Font Size"
+msgstr "Kirjatüübi suuruse vähendamine"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1092
+msgid "Font Face"
+msgstr "Kirjatüüp"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+msgid "Background Color"
+msgstr "Taustavärvus"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+msgid "Foreground Color"
+msgstr "Teksti värvus"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1096
+msgid "Reset Formatting"
+msgstr "Vorminduse algväärtustamine"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1099
+msgid "Insert IM Image"
+msgstr "Välksõnumipildi lisamine"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "Insert Smiley"
+msgstr "Tujunäo lisamine"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1175
 msgid "<b>_Bold</b>"
 msgstr "<b>_Rasvane</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1125
+#: ../pidgin/gtkimhtmltoolbar.c:1176
 msgid "<i>_Italic</i>"
 msgstr "<i>_Kursiiv</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1126
+#: ../pidgin/gtkimhtmltoolbar.c:1177
 msgid "<u>_Underline</u>"
 msgstr "<u>_Allajoonitud</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1127
+#: ../pidgin/gtkimhtmltoolbar.c:1178
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>Läbijoonitud</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1179
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>S_uurem</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1129
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "_Normal"
 msgstr "_Tavaline"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1131
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 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:1135
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "_Font face"
 msgstr "Ki_rjatüüp"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1136
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "Foreground _color"
 msgstr "_Teksti värvus"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1137
+#: ../pidgin/gtkimhtmltoolbar.c:1189
 msgid "Bac_kground color"
 msgstr "Tau_stavärvus"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1215
+#: ../pidgin/gtkimhtmltoolbar.c:1266
 msgid "_Smiley"
 msgstr "_Tujunägu"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1221
+#: ../pidgin/gtkimhtmltoolbar.c:1272
 msgid "_Image"
 msgstr "_Pilt"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1227
+#: ../pidgin/gtkimhtmltoolbar.c:1278
 msgid "_Link"
 msgstr "_Viit"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1284
+msgid "_Horizontal rule"
+msgstr ""
+
 #: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
@@ -13772,44 +14217,44 @@
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:344
+#: ../pidgin/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "Ava kõik sõnumid"
 
-#: ../pidgin/gtknotify.c:396
+#: ../pidgin/gtknotify.c:401
 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:516
+#: ../pidgin/gtknotify.c:521
 #, 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:527
+#: ../pidgin/gtknotify.c:532
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>Sulle on %d uus e-sõnum.</b>"
 msgstr[1] "<b>Sulle on %d uut e-sõnumit.</b>"
 
-#: ../pidgin/gtknotify.c:967
+#: ../pidgin/gtknotify.c:957
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr ""
 
-#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:981
-#: ../pidgin/gtknotify.c:994 ../pidgin/gtknotify.c:1122
+#: ../pidgin/gtknotify.c:959 ../pidgin/gtknotify.c:971
+#: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:1112
 msgid "Unable to open URL"
 msgstr "URL-i pole võimalik avada"
 
-#: ../pidgin/gtknotify.c:979 ../pidgin/gtknotify.c:992
+#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:982
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Viga \"%s\" käivitamisel: %s"
 
-#: ../pidgin/gtknotify.c:1123
+#: ../pidgin/gtknotify.c:1113
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -13834,7 +14279,7 @@
 "<span weight=\"bold\">Filename:</span>\t\t%s"
 msgstr ""
 "%s%s<span weight=\"bold\">Autor:</span>\t%s\n"
-"<span weight=\"bold\">Veebikoht:</span>\t\t%s\n"
+"<span weight=\"bold\">Veebisait:</span>\t\t%s\n"
 "<span weight=\"bold\">Failinimi:</span>\t\t%s"
 
 #: ../pidgin/gtkplugin.c:409
@@ -13861,100 +14306,100 @@
 msgstr "Faili valimine"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:533
+#: ../pidgin/gtkpounce.c:531
 msgid "Pounce on Whom"
 msgstr "Kellest märku antakse"
 
-#: ../pidgin/gtkpounce.c:560
+#: ../pidgin/gtkpounce.c:558
 msgid "_Buddy name:"
 msgstr "Sõbra _nimi:"
 
+#: ../pidgin/gtkpounce.c:592
+msgid "Si_gns on"
+msgstr "Lo_gib sisse"
+
 #: ../pidgin/gtkpounce.c:594
-msgid "Si_gns on"
-msgstr "Lo_gib sisse"
+msgid "Signs o_ff"
+msgstr "Logib _välja"
 
 #: ../pidgin/gtkpounce.c:596
-msgid "Signs o_ff"
-msgstr "Logib _välja"
+msgid "Goes a_way"
+msgstr "_Eemaldub"
 
 #: ../pidgin/gtkpounce.c:598
-msgid "Goes a_way"
-msgstr "_Eemaldub"
+msgid "Ret_urns from away"
+msgstr "Pöörd_ub eemalolekust tagasi"
 
 #: ../pidgin/gtkpounce.c:600
-msgid "Ret_urns from away"
-msgstr "Pöörd_ub eemalolekust tagasi"
+msgid "Becomes _idle"
+msgstr "Jääb _jõude"
 
 #: ../pidgin/gtkpounce.c:602
-msgid "Becomes _idle"
-msgstr "Jääb _jõude"
-
-#: ../pidgin/gtkpounce.c:604
 msgid "Is no longer i_dle"
 msgstr "Naaseb jõude_olekust"
 
-#: ../pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:604
 msgid "Starts _typing"
 msgstr "Alustab ti_ppimist"
 
+#: ../pidgin/gtkpounce.c:606
+msgid "P_auses while typing"
+msgstr "Peab t_ippimisel pausi"
+
 #: ../pidgin/gtkpounce.c:608
-msgid "P_auses while typing"
-msgstr "Peab t_ippimisel pausi"
-
-#: ../pidgin/gtkpounce.c:610
 msgid "Stops t_yping"
 msgstr "Lõpetab _tippimise"
 
-#: ../pidgin/gtkpounce.c:612
+#: ../pidgin/gtkpounce.c:610
 msgid "Sends a _message"
 msgstr "Saada_b sõnumi"
 
+#: ../pidgin/gtkpounce.c:653
+msgid "Ope_n an IM window"
+msgstr "_Avatakse välksõnumi aken"
+
 #: ../pidgin/gtkpounce.c:655
-msgid "Ope_n an IM window"
-msgstr "_Avatakse välksõnumi aken"
-
-#: ../pidgin/gtkpounce.c:657
 msgid "_Pop up a notification"
 msgstr "Kuvatakse teavituse _hüpikakent"
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:657
 msgid "Send a _message"
 msgstr "Saa_detakse sõnum"
 
+#: ../pidgin/gtkpounce.c:659
+msgid "E_xecute a command"
+msgstr "_Käivitatakse käsk"
+
 #: ../pidgin/gtkpounce.c:661
-msgid "E_xecute a command"
-msgstr "_Käivitatakse käsk"
-
-#: ../pidgin/gtkpounce.c:663
 msgid "P_lay a sound"
 msgstr "Mängitakse _heli"
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:667
 msgid "Brows_e..."
 msgstr "_Sirvi..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:669
 msgid "Br_owse..."
 msgstr "_Sirvi..."
 
-#: ../pidgin/gtkpounce.c:672
+#: ../pidgin/gtkpounce.c:670
 msgid "Pre_view"
 msgstr "_Eelvaade"
 
-#: ../pidgin/gtkpounce.c:799
+#: ../pidgin/gtkpounce.c:797
 msgid "P_ounce only when my status is not Available"
 msgstr "_Märguanne ainult juhul, kui minu olekuks on \"pole saadaval\""
 
-#: ../pidgin/gtkpounce.c:804
+#: ../pidgin/gtkpounce.c:802
 msgid "_Recurring"
 msgstr "_Korduv"
 
-#: ../pidgin/gtkpounce.c:1260
+#: ../pidgin/gtkpounce.c:1245
 msgid "Pounce Target"
 msgstr "Kelle kohta"
 
 #: ../pidgin/gtkprefs.c:385
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "Vaikimisi"
 
@@ -13998,7 +14443,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "Välksõnumivestlused _peidetakse:"
 
-#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1939
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1941
 msgid "When away"
 msgstr "Kui olen eemal"
 
@@ -14095,11 +14540,11 @@
 msgid "Conversation _font:"
 msgstr "Vestluse kir_jatüüp:"
 
-#: ../pidgin/gtkprefs.c:1041
+#: ../pidgin/gtkprefs.c:1042
 msgid "Default Formatting"
 msgstr "Vaikimisi vormindus"
 
-#: ../pidgin/gtkprefs.c:1059
+#: ../pidgin/gtkprefs.c:1061
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -14107,119 +14552,119 @@
 "Nii paistab sinu väljuv sõnum juhul, kui sa kasutad vormindamist toetavat "
 "protokolli."
 
-#: ../pidgin/gtkprefs.c:1125
+#: ../pidgin/gtkprefs.c:1127
 msgid "ST_UN server:"
 msgstr "ST_UN server:"
 
-#: ../pidgin/gtkprefs.c:1137
+#: ../pidgin/gtkprefs.c:1139
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Näide: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1141
+#: ../pidgin/gtkprefs.c:1143
 msgid "_Autodetect IP address"
 msgstr "IP-aadress tuvastatakse _automaatselt"
 
-#: ../pidgin/gtkprefs.c:1150
+#: ../pidgin/gtkprefs.c:1152
 msgid "Public _IP:"
 msgstr "Avalik _IP:"
 
-#: ../pidgin/gtkprefs.c:1179
+#: ../pidgin/gtkprefs.c:1181
 msgid "Ports"
 msgstr "Pordid"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1184
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Kuulatavate portide vahemik määratakse käsitsi"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Start port:"
 msgstr "Al_gusport:"
 
-#: ../pidgin/gtkprefs.c:1192
+#: ../pidgin/gtkprefs.c:1194
 msgid "_End port:"
 msgstr "_Lõpuport:"
 
-#: ../pidgin/gtkprefs.c:1200
+#: ../pidgin/gtkprefs.c:1202
 msgid "Proxy Server"
 msgstr "Proksi server"
 
-#: ../pidgin/gtkprefs.c:1204
+#: ../pidgin/gtkprefs.c:1206
 msgid "No proxy"
 msgstr "Proksi puudub"
 
-#: ../pidgin/gtkprefs.c:1260
+#: ../pidgin/gtkprefs.c:1262
 msgid "_User:"
 msgstr "Kasuta_ja:"
 
-#: ../pidgin/gtkprefs.c:1325
+#: ../pidgin/gtkprefs.c:1327
 msgid "Seamonkey"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1326
-msgid "Opera"
-msgstr "Opera"
-
-#: ../pidgin/gtkprefs.c:1327
-msgid "Netscape"
-msgstr "Netscape"
-
 #: ../pidgin/gtkprefs.c:1328
-msgid "Mozilla"
-msgstr "Mozilla"
+msgid "Opera"
+msgstr "Opera"
 
 #: ../pidgin/gtkprefs.c:1329
-msgid "Konqueror"
-msgstr "Konqueror"
+msgid "Netscape"
+msgstr "Netscape"
 
 #: ../pidgin/gtkprefs.c:1330
-msgid "GNOME Default"
-msgstr "GNOME vaikimisi"
+msgid "Mozilla"
+msgstr "Mozilla"
 
 #: ../pidgin/gtkprefs.c:1331
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../pidgin/gtkprefs.c:1332
+msgid "GNOME Default"
+msgstr "GNOME vaikimisi"
+
+#: ../pidgin/gtkprefs.c:1333
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1334
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1335
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1336
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1343
+#: ../pidgin/gtkprefs.c:1345
 msgid "Manual"
 msgstr "Käsitsi"
 
-#: ../pidgin/gtkprefs.c:1396
+#: ../pidgin/gtkprefs.c:1398
 msgid "Browser Selection"
 msgstr "Veebisirvija valimine"
 
-#: ../pidgin/gtkprefs.c:1400
+#: ../pidgin/gtkprefs.c:1402
 msgid "_Browser:"
 msgstr "Si_rvija:"
 
-#: ../pidgin/gtkprefs.c:1408
+#: ../pidgin/gtkprefs.c:1410
 msgid "_Open link in:"
 msgstr "_Viidad avatakse:"
 
-#: ../pidgin/gtkprefs.c:1410
+#: ../pidgin/gtkprefs.c:1412
 msgid "Browser default"
 msgstr "Veebisirvija vaikimisi sätted"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1413
 msgid "Existing window"
 msgstr "Olemasolevasse aknasse"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1415
 msgid "New tab"
 msgstr "Uuele kaardile"
 
-#: ../pidgin/gtkprefs.c:1427
+#: ../pidgin/gtkprefs.c:1429
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14228,63 +14673,63 @@
 "_Käsitsi:\n"
 "(%s URL-i jaoks)"
 
-#: ../pidgin/gtkprefs.c:1467
+#: ../pidgin/gtkprefs.c:1469
 msgid "Log _format:"
 msgstr "Logi_vorming:"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _instant messages"
 msgstr "Kõiki välksõnumeid _logitakse"
 
-#: ../pidgin/gtkprefs.c:1474
-msgid "Log all c_hats"
-msgstr "Kõiki _vestlusi logitakse"
-
 #: ../pidgin/gtkprefs.c:1476
+msgid "Log all c_hats"
+msgstr "Kõiki _vestlusi logitakse"
+
+#: ../pidgin/gtkprefs.c:1478
 msgid "Log all _status changes to system log"
 msgstr "Kõiki _olekumuutusi logitakse süsteemsesse logisse"
 
-#: ../pidgin/gtkprefs.c:1622
+#: ../pidgin/gtkprefs.c:1624
 msgid "Sound Selection"
 msgstr "Heli valimine"
 
-#: ../pidgin/gtkprefs.c:1632
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quietest"
 msgstr "Vaikseim"
 
-#: ../pidgin/gtkprefs.c:1634
-msgid "Quieter"
-msgstr "Vaiksem"
-
 #: ../pidgin/gtkprefs.c:1636
+msgid "Quieter"
+msgstr "Vaiksem"
+
+#: ../pidgin/gtkprefs.c:1638
 msgid "Quiet"
 msgstr "Vaikne"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loud"
 msgstr "Valju"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1644
 msgid "Louder"
 msgstr "Valjem"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1646
 msgid "Loudest"
 msgstr "Kõige valjem"
 
-#: ../pidgin/gtkprefs.c:1708
+#: ../pidgin/gtkprefs.c:1710
 msgid "_Method:"
 msgstr "_Meetod"
 
-#: ../pidgin/gtkprefs.c:1710
+#: ../pidgin/gtkprefs.c:1712
 msgid "Console beep"
 msgstr "Konsoolipiiks"
 
-#: ../pidgin/gtkprefs.c:1717
+#: ../pidgin/gtkprefs.c:1719
 msgid "No sounds"
 msgstr "Helid puuduvad"
 
-#: ../pidgin/gtkprefs.c:1725
+#: ../pidgin/gtkprefs.c:1727
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14293,81 +14738,81 @@
 "Helitegemise _käsk:\n"
 "(%s failinime jaoks)"
 
-#: ../pidgin/gtkprefs.c:1752
+#: ../pidgin/gtkprefs.c:1754
 msgid "Sounds when conversation has _focus"
 msgstr "_Heli fokuseeritud vestluse korral"
 
-#: ../pidgin/gtkprefs.c:1754
+#: ../pidgin/gtkprefs.c:1756
 msgid "Enable sounds:"
 msgstr "Helid lubatakse:"
 
-#: ../pidgin/gtkprefs.c:1765
+#: ../pidgin/gtkprefs.c:1767
 msgid "Volume:"
 msgstr "Valjus:"
 
-#: ../pidgin/gtkprefs.c:1845
+#: ../pidgin/gtkprefs.c:1847
 msgid "Play"
 msgstr "Mängida"
 
-#: ../pidgin/gtkprefs.c:1922
+#: ../pidgin/gtkprefs.c:1924
 msgid "_Report idle time:"
 msgstr "_Jõudeoleku ajast teatatakse:"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1929
 msgid "Based on keyboard or mouse use"
 msgstr "Tulenevalt klaviatuuri ja hiire kasutamisest"
 
-#: ../pidgin/gtkprefs.c:1936
+#: ../pidgin/gtkprefs.c:1938
 msgid "_Auto-reply:"
 msgstr "_Automaatne vastamine:"
 
-#: ../pidgin/gtkprefs.c:1940
+#: ../pidgin/gtkprefs.c:1942
 msgid "When both away and idle"
 msgstr "Kui olen eemal ja jõude"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:1948
 msgid "Auto-away"
 msgstr "Automaatne eemaldumine"
 
-#: ../pidgin/gtkprefs.c:1948
+#: ../pidgin/gtkprefs.c:1950
 msgid "Change status when _idle"
 msgstr "Jõudeoleku puhul määratakse uus _olek"
 
-#: ../pidgin/gtkprefs.c:1952
+#: ../pidgin/gtkprefs.c:1954
 msgid "_Minutes before becoming idle:"
 msgstr "Mitme _minuti möödudes jõudeolek määratakse:"
 
-#: ../pidgin/gtkprefs.c:1960
+#: ../pidgin/gtkprefs.c:1962
 msgid "Change _status to:"
 msgstr "Uueks o_lekuks saab:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1983
 msgid "Status at Startup"
 msgstr "Olek käivitamisel"
 
-#: ../pidgin/gtkprefs.c:1983
+#: ../pidgin/gtkprefs.c:1985
 msgid "Use status from last _exit at startup"
 msgstr "Kä_ivitamisel kasutatakse viimast olekut"
 
-#: ../pidgin/gtkprefs.c:1989
+#: ../pidgin/gtkprefs.c:1991
 msgid "Status to a_pply at startup:"
 msgstr "Käivitamisel _rakendatav olek:"
 
-#: ../pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2029
 msgid "Interface"
 msgstr "Liides"
 
-#: ../pidgin/gtkprefs.c:2029
+#: ../pidgin/gtkprefs.c:2031
 msgid "Smiley Themes"
 msgstr "Tujunägude teemad"
 
-#: ../pidgin/gtkprefs.c:2036
+#: ../pidgin/gtkprefs.c:2038
 msgid "Browser"
 msgstr "Veebisirvija"
 
-#: ../pidgin/gtkprefs.c:2040
+#: ../pidgin/gtkprefs.c:2042
 msgid "Status / Idle"
 msgstr "Olek / jõude"
 
@@ -14457,23 +14902,23 @@
 msgid "Apply"
 msgstr "Rakenda"
 
-#: ../pidgin/gtkrequest.c:1504
+#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "See fail on juba olemas"
 
-#: ../pidgin/gtkrequest.c:1505
-msgid "Would you like to overwrite it?"
-msgstr "Kas sa soovid seda üle kirjutada?"
-
 #: ../pidgin/gtkrequest.c:1508
+msgid "Would you like to overwrite it?"
+msgstr "Kas sa soovid seda üle kirjutada?"
+
+#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr "Kirjuta üle"
 
-#: ../pidgin/gtkrequest.c:1509
+#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr "Uue nime valimine"
 
-#: ../pidgin/gtkrequest.c:1647 ../pidgin/gtkrequest.c:1661
+#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Kataloogi valimine..."
 
@@ -14513,7 +14958,7 @@
 msgid "_Title:"
 msgstr "_Pealkiri:"
 
-#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1496
 msgid "_Status:"
 msgstr "_Olek:"
 
@@ -14527,7 +14972,7 @@
 msgid "Sa_ve & Use"
 msgstr "Sal_vesta ja kasuta"
 
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtksavedstatuses.c:1479
 #, c-format
 msgid "Status for %s"
 msgstr ""
@@ -14540,61 +14985,61 @@
 msgid "Google Talk"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1388 ../pidgin/gtkutils.c:1411
+#: ../pidgin/gtkutils.c:1398 ../pidgin/gtkutils.c:1421
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1391 ../pidgin/gtkutils.c:1413
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1423
 msgid "Failed to load image"
 msgstr "Tõrge pildi laadimisel"
 
-#: ../pidgin/gtkutils.c:1487
+#: ../pidgin/gtkutils.c:1497
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Kausta %s pole võimalik saata."
 
-#: ../pidgin/gtkutils.c:1488
+#: ../pidgin/gtkutils.c:1498
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1520 ../pidgin/gtkutils.c:1532
-#: ../pidgin/gtkutils.c:1539
+#: ../pidgin/gtkutils.c:1530 ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1549
 msgid "You have dragged an image"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1521
+#: ../pidgin/gtkutils.c:1531
 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:1527 ../pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1537 ../pidgin/gtkutils.c:1557
 msgid "Set as buddy icon"
-msgstr ""
-
-#: ../pidgin/gtkutils.c:1528 ../pidgin/gtkutils.c:1548
+msgstr "Määra sõbraikooniks"
+
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Send image file"
-msgstr ""
-
-#: ../pidgin/gtkutils.c:1529 ../pidgin/gtkutils.c:1548
+msgstr "Saada pildifail"
+
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1558
 msgid "Insert in message"
-msgstr ""
-
-#: ../pidgin/gtkutils.c:1533
+msgstr "Lisa sõnumisse"
+
+#: ../pidgin/gtkutils.c:1543
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr ""
-
-#: ../pidgin/gtkutils.c:1540
+msgstr "Kas sa soovid seda pilti määrata selle kasutaja sõbraikooniks?"
+
+#: ../pidgin/gtkutils.c:1550
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1541
+#: ../pidgin/gtkutils.c:1551
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14605,17 +15050,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:1599
+#: ../pidgin/gtkutils.c:1609
 msgid "Cannot send launcher"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1599
+#: ../pidgin/gtkutils.c:1609
 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:2334
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14626,25 +15071,25 @@
 "<b>Faili suurus:</b> %s\n"
 "<b>Pildi suurus:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2630
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2632
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "Ikooni viga"
 
-#: ../pidgin/gtkutils.c:2633
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "Ikooni pole võimalik määrata"
 
-#: ../pidgin/gtkutils.c:2733
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Tõrge faili '%s' avamisel: %s"
 
-#: ../pidgin/gtkutils.c:2782
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14659,31 +15104,31 @@
 msgid "Select color"
 msgstr "Värvuse valimine"
 
-#: ../pidgin/pidginstock.c:81
+#: ../pidgin/pidginstock.c:86
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../pidgin/pidginstock.c:83
+#: ../pidgin/pidginstock.c:88
 msgid "Close _tabs"
 msgstr "_Sulge kaardid"
 
-#: ../pidgin/pidginstock.c:85
+#: ../pidgin/pidginstock.c:90
 msgid "_Get Info"
 msgstr "Hangi _teavet"
 
-#: ../pidgin/pidginstock.c:86
+#: ../pidgin/pidginstock.c:91
 msgid "_Invite"
 msgstr "_Kutsu"
 
-#: ../pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:92
 msgid "_Modify"
 msgstr "_Muuda"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:93
 msgid "_Open Mail"
 msgstr "_Ava sõnum"
 
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Pidgin'i tujunäod"
 
@@ -14851,18 +15296,6 @@
 msgid "Select Color for %s"
 msgstr "Värvuse valimine %s jaoks"
 
-#: ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "Rasvane"
-
-#: ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "Kursiiv"
-
-#: ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "Allajoonitud"
-
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Sissetulevat vormingut eiratakse"
@@ -15025,7 +15458,7 @@
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An e-mail address was not found for this buddy."
-msgstr ""
+msgstr "Selle sõbra e-posti aadressi ei leitud."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
@@ -15167,11 +15600,11 @@
 msgid "Draw Markerline in "
 msgstr "Markerjoon joonistatakse "
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "_Välksõnumiakendele"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "_Jututoaakendele"
 
@@ -15185,32 +15618,32 @@
 msgid "Music messaging session confirmed."
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428
 msgid "Music Messaging"
-msgstr ""
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+msgstr "Musikaline sõnumivahetus"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429
 msgid "There was a conflict in running the command:"
 msgstr "Käsu käivitamisel tekkis vastuolu:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537
 msgid "Error Running Editor"
 msgstr "Viga redaktori käivitamisel"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538
 msgid "The following error has occurred:"
-msgstr ""
+msgstr "Leidis aset järgmine viga:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637
 msgid "Music Messaging Configuration"
-msgstr ""
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+msgstr "Musikalise sõnumivahetuse sätted"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641
 msgid "Score Editor Path"
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642
 msgid "_Apply"
 msgstr "_Rakenda"
 
@@ -15222,86 +15655,86 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683
 msgid "Music Messaging Plugin for collaborative composition."
-msgstr ""
+msgstr "Muusikalise sõnumivahetuse plugin ühise komponeerimise tarbeks."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:672
+#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "Teavitused kehtivad"
 
-#: ../pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
 msgstr "_Ainult juhul, kui keegi ütleb Sinu ekraaninime"
 
-#: ../pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "_Fookuses olevatele akendele"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "Teavitamisviisid"
 
-#: ../pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "Aknatiitli ette _lisatakse string:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "Aknatiitlisse lisatakse uute sõnumite _arv"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "_X-i omadusele lisatakse uute sõnumite arv"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Aknahalduri \"_URGENT\" vihje"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "_Vestlusaken tõstetakse esile"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "Teavituste eemaldamine"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "Eemaldatakse vestlusakena sa_ttumisel fookusesse"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "Eemaldatakse vestlusaknale _klõpsamisel"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "Eemaldatakse vestlusaknasse _tippimisel"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "Eemaldatakse sõ_numi edukal saatmisel"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr ""
 
@@ -15311,7 +15744,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:901
+#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "Sõnumitest teavitaja"
 
@@ -15319,7 +15752,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Mitut sorti võimalusi lugemata sõnumitest teavitamiseks"
 
@@ -15685,43 +16118,43 @@
 "sõnumite ajatemplite vorminguid."
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:593
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:640
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:597
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:644
 msgid "Opacity:"
 msgstr "Läbipaistmatus:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:557
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:561
 msgid "IM Conversation Windows"
 msgstr "Välksõnumite aknad"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "_IM window transparency"
 msgstr "_Välksõnumiaknad on läbipaistvad"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:572
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:576
 msgid "_Show slider bar in IM window"
 msgstr "_Liuguri näitamine välksõnumiakendes"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:579
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:583
 msgid "Remove IM window transparency on focus"
 msgstr "Välksõnumi akna läbipaistvuse eemaldamine selle fokuseerimisel"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:582
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:630
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:586
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:634
 msgid "Always on top"
 msgstr "Alati pealmine"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:614
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:618
 msgid "Buddy List Window"
 msgstr "Sõbranimekirja aken"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:615
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "_Buddy List window transparency"
 msgstr "Sõbraaken on _läbipaistev"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:628
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:632
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Sõbranimekirja akna läbipaistvuse eemaldamine selle fokuseerimisel"
 
@@ -15731,19 +16164,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:688
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:692
 msgid "Transparency"
 msgstr "Läbipaistvus"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:691
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:695
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Muutuv läbipaistvus sõbranimekirjale ja vestlustele."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:697
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -15847,7 +16280,34 @@
 #. *  description
 #: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr ""
+msgstr "See plugin sobib XMPP serverite ja klientide silumiseks"
+
+#~ msgid "/Options/Show Buddy _Icon"
+#~ msgstr "/Valikud/Näita sõbra _ikooni"
+
+#~ msgid "/Options/Show Buddy Icon"
+#~ msgstr "/Valikud/Näita sõbraikooni"
+
+#~ msgid "Connection Failed"
+#~ msgstr "Tõrge ühendumisel"
+
+#~ msgid "SSL Handshake Failed"
+#~ msgstr "Tõrge SSL käepigistusel"
+
+#~ msgid "Song"
+#~ msgstr "Laul"
+
+#~ msgid "Total Friends"
+#~ msgstr "Sõpru kokku"
+
+#~ msgid "Client Version"
+#~ msgstr "Kliendi versioon"
+
+#~ msgid "Would like to add him?"
+#~ msgstr "Kas sa soovid teda lisada?"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norra"
 
 #~ msgid "Modify My Information"
 #~ msgstr "Minu andmete muutmine"
@@ -15877,24 +16337,15 @@
 #~ "%s katkestas ühenduse järgneva vea tõttu:\n"
 #~ "%s"
 
-#~ msgid "Larger font size"
-#~ msgstr "Suurem kirjatüübi suurus"
-
 #~ msgid "Smaller font size"
 #~ msgstr "Väiksem kirjatüübi suurus"
 
-#~ msgid "Reset formatting"
-#~ msgstr "Vorminduse algväärtustamine"
-
 #~ msgid "Insert link"
 #~ msgstr "Viida lisamine"
 
 #~ msgid "Insert image"
 #~ msgstr "Pildi lisamine"
 
-#~ msgid "Insert smiley"
-#~ msgstr "Tujunäo lisamine"
-
 #~ msgid "Gaim %s. Try `%s -h' for more information.\n"
 #~ msgstr ""
 #~ "Gaim %s. Lähema teabe saamiseks kasuta `%s -h' for more information.\n"
@@ -16023,9 +16474,6 @@
 #~ msgid "Faces"
 #~ msgstr "Näod"
 
-#~ msgid "Change My Face"
-#~ msgstr "Minu näo muutmine"
-
 #~ msgid "User info is not updated"
 #~ msgstr "Kasutaja andmeid ei uuendatud"
 
@@ -16042,24 +16490,6 @@
 #~ "\n"
 #~ "<b>Toetab:</b> %s"
 
-#~ msgid "<b>User ID:</b> %s<br>"
-#~ msgstr "<b>Kasutaja ID:</b> %s<br>"
-
-#~ msgid "<b>Full Name:</b> %s<br>"
-#~ msgstr "<b>Täisnimi:</b> %s<br>"
-
-#~ msgid "<b>Supports:</b> %s<br>"
-#~ msgstr "<b>Toetatud:</b> %s<br>"
-
-#~ msgid "<b>Status:</b> %s"
-#~ msgstr "<b>Seisund:</b> %s"
-
-#~ msgid "Invalid username."
-#~ msgstr "Vigane kasutajanimi."
-
-#~ msgid "Normal authentication failed!"
-#~ msgstr "Tõrge tavalisel autentimisel!"
-
 #~ msgid ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "