changeset 14817:47e4df95012d

[gaim-migrate @ 17584] updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Wed, 25 Oct 2006 15:53:06 +0000
parents c538d7df38d6
children 88d68d9f2fa3
files po/et.po
diffstat 1 files changed, 7874 insertions(+), 5860 deletions(-) [+]
line wrap: on
line diff
--- a/po/et.po	Wed Oct 25 12:53:41 2006 +0000
+++ b/po/et.po	Wed Oct 25 15:53:06 2006 +0000
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim 2.0\n"
+"Project-Id-Version: gaim 2.0 beta4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-09 00:00-0400\n"
-"PO-Revision-Date: 2006-04-09 16:00+0200\n"
+"POT-Creation-Date: 2006-10-23 19:40+0300\n"
+"PO-Revision-Date: 2006-10-25 13:36+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -29,758 +29,1039 @@
 msgid "Send instant messages over multiple protocols"
 msgstr "Välksõnumite saatmine mitmete protokollide kaudu"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ciphertest.c:264
-msgid "Cipher Test"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ciphertest.c:267 ../plugins/ciphertest.c:269
-msgid "Tests the ciphers that ship with gaim."
-msgstr ""
-
-#: ../plugins/contact_priority.c:61
-msgid "Buddy is idle"
-msgstr "Sõber on jõude"
-
-#: ../plugins/contact_priority.c:62
-msgid "Buddy is away"
-msgstr "Sõber on eemal"
-
-#: ../plugins/contact_priority.c:63
-msgid "Buddy is \"extended\" away"
-msgstr "Sõber on kaua eemal"
-
-#. Not used yet.
-#: ../plugins/contact_priority.c:66
-msgid "Buddy is mobile"
-msgstr ""
-
-#: ../plugins/contact_priority.c:68
-msgid "Buddy is offline"
-msgstr "Sõber pole ühendatud"
-
-#: ../plugins/contact_priority.c:90
-msgid "Point values to use when..."
-msgstr ""
-
-#: ../plugins/contact_priority.c:118
-msgid ""
-"The buddy with the <i>largest score</i> is the buddy who will have priority "
-"in the contact.\n"
-msgstr ""
-
-#: ../plugins/contact_priority.c:125
-msgid "Use last buddy when scores are equal"
-msgstr ""
-
-#: ../plugins/contact_priority.c:130
-msgid "Point values to use for account..."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/contact_priority.c:182
-msgid "Contact Priority"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../plugins/contact_priority.c:185
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr ""
-
-#. *< description
-#: ../plugins/contact_priority.c:187
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/crazychat/cc_gaim_plugin.c:146
-msgid "Crazychat"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/crazychat/cc_gaim_plugin.c:149
-msgid "Plugin to establish a Crazychat session."
-msgstr ""
-
-#. *  description
-#: ../plugins/crazychat/cc_gaim_plugin.c:151
-msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
-msgstr ""
-
-#. make the network configuration frame
-#: ../plugins/crazychat/cc_gaim_plugin.c:295
-msgid "Network Configuration"
-msgstr "Võrgusätted"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:307
-msgid "TCP port"
-msgstr "TCP port"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:317
-msgid "UDP port"
-msgstr "UDP port"
-
-#. make the feature configuration frame
-#: ../plugins/crazychat/cc_gaim_plugin.c:329
-msgid "Feature Calibration"
-msgstr ""
-
-#. add enabled / disabled
-#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2251
-#: ../src/gtkplugin.c:574
-msgid "Enabled"
-msgstr "Lubatud"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:350
-msgid "Disabled"
-msgstr "Keelatud"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/dbus-example.c:152
-msgid "DBus"
-msgstr "DBus"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/dbus-example.c:155 ../plugins/dbus-example.c:157
-msgid "DBus Plugin Example"
-msgstr "DBus plugina näide"
-
-#: ../plugins/docklet/docklet.c:154
-msgid "Right-click for more unread messages...\n"
-msgstr "Parema hiireklõpsuga näed veel lugemata sõnumeid...\n"
-
-#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3230
-#, 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"
-
-#: ../plugins/docklet/docklet.c:432
-msgid "Change Status"
-msgstr "Muuda olekut"
-
-#: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:673
-#: ../src/protocols/jabber/buddy.c:1101 ../src/protocols/msn/state.c:29
-#: ../src/protocols/msn/state.c:30 ../src/protocols/msn/state.c:37
-#: ../src/protocols/msn/state.c:38 ../src/protocols/novell/novell.c:2845
-#: ../src/protocols/yahoo/yahoo.c:2735 ../src/status.c:155
-msgid "Available"
-msgstr "Saadaval"
-
-#. Away stuff
-#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1759
-#: ../src/gtkstatusbox.c:674 ../src/protocols/irc/irc.c:520
-#: ../src/protocols/irc/msgs.c:223 ../src/protocols/jabber/buddy.c:1105
-#: ../src/protocols/novell/novell.c:2848 ../src/protocols/oscar/oscar.c:721
-#: ../src/protocols/oscar/oscar.c:4370 ../src/protocols/oscar/oscar.c:5413
-#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3189
-#: ../src/protocols/yahoo/yahoo.c:3262 ../src/status.c:158
-msgid "Away"
-msgstr "Eemal"
-
-#: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:725 ../src/protocols/yahoo/yahoo.c:2729
-#: ../src/status.c:157
-msgid "Invisible"
-msgstr "Nähtamatu"
-
-#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2960
-#: ../src/gtkstatusbox.c:676 ../src/protocols/jabber/buddy.c:1099
-#: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:787
-#: ../src/protocols/oscar/oscar.c:5385 ../src/protocols/yahoo/yahoo.c:2733
-#: ../src/status.c:154
-msgid "Offline"
-msgstr "Ühendamata"
-
-#: ../plugins/docklet/docklet.c:467 ../src/gtkstatusbox.c:681
-msgid "New..."
-msgstr "Uus..."
-
-#: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:682
-msgid "Saved..."
-msgstr "Salvestatud..."
-
-#: ../plugins/docklet/docklet.c:484
-msgid "Show Buddy List"
-msgstr "Sõbranimekirja näitamine"
-
-#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5640
-msgid "Unread Messages"
-msgstr "Lugemata sõnumid"
-
-#: ../plugins/docklet/docklet.c:510
-msgid "New Message..."
-msgstr "Uus sõnum..."
-
-#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2467
+#: ../console/gntaccount.c:119 ../console/gntblist.c:250
+#: ../console/gntblist.c:368 ../console/gntblist.c:381
+#: ../console/gntplugin.c:169 ../console/gntplugin.c:214
+#: ../console/gntstatus.c:291 ../console/gntstatus.c:299
+#: ../libgaim/protocols/jabber/buddy.c:1363
+#: ../libgaim/protocols/jabber/chat.c:677
+#: ../libgaim/protocols/jabber/chat.c:688
+#: ../libgaim/protocols/jabber/jabber.c:1197
+#: ../libgaim/protocols/qq/group_join.c:322
+#: ../libgaim/protocols/silc/ops.c:1449
+msgid "Error"
+msgstr "Viga"
+
+#: ../console/gntaccount.c:119
+msgid "Account was not added"
+msgstr "Konto jäi lisamata"
+
+#: ../console/gntaccount.c:120
+msgid "Screenname of an account must be non-empty."
+msgstr "Konto ekraaninimi ei tohi tühi olla."
+
+#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:558
+msgid "New mail notifications"
+msgstr "Uutest sõnumitest antakse teada"
+
+#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:487
+msgid "Remember password"
+msgstr "Parooli peetakse meeles"
+
+#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1400 ../gtk/gtkblist.c:3777
+msgid "Modify Account"
+msgstr "Muuda kontot"
+
+#: ../console/gntaccount.c:474
+msgid "New Account"
+msgstr "Uus konto"
+
+#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:399 ../gtk/gtkft.c:695
+msgid "Protocol:"
+msgstr "Protokoll:"
+
+#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:404 ../gtk/gtkblist.c:4920
+#: ../gtk/plugins/gevolution/new_person_dialog.c:295
+msgid "Screen name:"
+msgstr "Ekraaninimi:"
+
+#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:478
+msgid "Password:"
+msgstr "Parool:"
+
+#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:4941 ../gtk/gtkblist.c:5306
+msgid "Alias:"
+msgstr "Alias:"
+
+#. Cancel
+#: ../console/gntaccount.c:554 ../console/gntaccount.c:615
+#: ../console/gntaccount.c:834 ../console/gntblist.c:291
+#: ../console/gntblist.c:358 ../console/gntblist.c:391
+#: ../console/gntblist.c:712 ../console/gntblist.c:893
+#: ../console/gntblist.c:984 ../console/gntprefs.c:224
+#: ../console/gntstatus.c:139 ../console/gntstatus.c:471
+#: ../console/gntstatus.c:596 ../gtk/gtkaccount.c:1833
+#: ../gtk/gtkaccount.c:2303 ../gtk/gtkblist.c:5362 ../gtk/gtkdialogs.c:667
+#: ../gtk/gtkdialogs.c:804 ../gtk/gtkdialogs.c:895 ../gtk/gtkdialogs.c:914
+#: ../gtk/gtkdialogs.c:936 ../gtk/gtkdialogs.c:956 ../gtk/gtkdialogs.c:1000
+#: ../gtk/gtkdialogs.c:1038 ../gtk/gtkdialogs.c:1092 ../gtk/gtkdialogs.c:1129
+#: ../gtk/gtkdialogs.c:1154 ../gtk/gtkimhtmltoolbar.c:419
+#: ../gtk/gtkplugin.c:296 ../gtk/gtkpounce.c:1088 ../gtk/gtkprivacy.c:566
+#: ../gtk/gtkprivacy.c:579 ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615
+#: ../gtk/gtkrequest.c:270 ../gtk/gtksavedstatuses.c:296
+#: ../libgaim/account.c:964 ../libgaim/account.c:1135
+#: ../libgaim/account.c:1169 ../libgaim/conversation.c:1164
+#: ../libgaim/protocols/gg/gg.c:498 ../libgaim/protocols/gg/gg.c:656
+#: ../libgaim/protocols/gg/gg.c:792 ../libgaim/protocols/gg/gg.c:871
+#: ../libgaim/protocols/jabber/buddy.c:588
+#: ../libgaim/protocols/jabber/buddy.c:1725
+#: ../libgaim/protocols/jabber/buddy.c:1759
+#: ../libgaim/protocols/jabber/chat.c:780
+#: ../libgaim/protocols/jabber/jabber.c:854
+#: ../libgaim/protocols/jabber/jabber.c:1352
+#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:251
+#: ../libgaim/protocols/msn/msn.c:266 ../libgaim/protocols/msn/msn.c:281
+#: ../libgaim/protocols/msn/msn.c:296 ../libgaim/protocols/msn/msn.c:313
+#: ../libgaim/protocols/oscar/oscar.c:1387
+#: ../libgaim/protocols/oscar/oscar.c:2151
+#: ../libgaim/protocols/oscar/oscar.c:2190
+#: ../libgaim/protocols/oscar/oscar.c:2238
+#: ../libgaim/protocols/oscar/oscar.c:5732
+#: ../libgaim/protocols/oscar/oscar.c:5784
+#: ../libgaim/protocols/oscar/oscar.c:5936
+#: ../libgaim/protocols/oscar/oscar.c:5961
+#: ../libgaim/protocols/oscar/oscar.c:6017
+#: ../libgaim/protocols/oscar/oscar.c:6086
+#: ../libgaim/protocols/oscar/peer.c:991
+#: ../libgaim/protocols/qq/buddy_info.c:480
+#: ../libgaim/protocols/qq/buddy_opt.c:210
+#: ../libgaim/protocols/qq/buddy_opt.c:400 ../libgaim/protocols/qq/group.c:122
+#: ../libgaim/protocols/qq/group_join.c:136
+#: ../libgaim/protocols/qq/group_join.c:357
+#: ../libgaim/protocols/qq/group_opt.c:140
+#: ../libgaim/protocols/qq/group_opt.c:390 ../libgaim/protocols/qq/qq.c:459
+#: ../libgaim/protocols/qq/sendqueue.c:201
+#: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
+#: ../libgaim/protocols/qq/sys_msg.c:245
+#: ../libgaim/protocols/sametime/sametime.c:3364
+#: ../libgaim/protocols/sametime/sametime.c:3449
+#: ../libgaim/protocols/sametime/sametime.c:3619
+#: ../libgaim/protocols/sametime/sametime.c:5320
+#: ../libgaim/protocols/sametime/sametime.c:5409
+#: ../libgaim/protocols/sametime/sametime.c:5533
+#: ../libgaim/protocols/silc/buddy.c:467
+#: ../libgaim/protocols/silc/buddy.c:1078
+#: ../libgaim/protocols/silc/buddy.c:1183 ../libgaim/protocols/silc/chat.c:597
+#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1910
+#: ../libgaim/protocols/silc/silc.c:754 ../libgaim/protocols/silc/silc.c:959
+#: ../libgaim/protocols/yahoo/yahoo.c:3214
+#: ../libgaim/protocols/yahoo/yahoo.c:3223 ../libgaim/request.h:1344
+#: ../libgaim/request.h:1354
+msgid "Cancel"
+msgstr "Loobu"
+
+#. Save
+#: ../console/gntaccount.c:558 ../console/gntprefs.c:224
+#: ../console/gntstatus.c:474 ../console/gntstatus.c:584 ../gtk/gtkdebug.c:762
+#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1168
+#: ../libgaim/protocols/jabber/buddy.c:587
+msgid "Save"
+msgstr "Salvestamine"
+
+#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1827
+#: ../gtk/gtksavedstatuses.c:293
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "Kas sa soovid kustutada kontot %s?"
+
+#. Close any other opened delete window
+#: ../console/gntaccount.c:614
+msgid "Delete Account"
+msgstr "Konto kustutamine"
+
+#: ../console/gntaccount.c:615 ../console/gntaccount.c:681
+#: ../console/gntstatus.c:139 ../console/gntstatus.c:201
+#: ../gtk/gtkaccount.c:1832 ../gtk/gtkpounce.c:1087 ../gtk/gtkrequest.c:273
+#: ../gtk/gtksavedstatuses.c:295
+msgid "Delete"
+msgstr "Kustuta"
+
+#: ../console/gntaccount.c:644 ../console/gntblist.c:1780
+#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2135 ../gtk/gtkdocklet.c:493
 msgid "Accounts"
 msgstr "Kontod"
 
-#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:538
-msgid "Plugins"
-msgstr "Pluginad"
-
-#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1900
-msgid "Preferences"
-msgstr "Eelistused"
-
-#: ../plugins/docklet/docklet.c:525
-msgid "Mute Sounds"
-msgstr "Vaigista helid"
-
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../plugins/docklet/docklet.c:538
-msgid "Quit"
-msgstr "Lõpeta"
-
-#: ../plugins/docklet/docklet.c:679
-msgid "Blink tray icon for unread..."
-msgstr "Salveikoon plingib kui on lugemata..."
-
-#: ../plugins/docklet/docklet.c:682
-msgid "_Instant Messages:"
-msgstr "Välksõnum_id:"
-
-#: ../plugins/docklet/docklet.c:684 ../plugins/docklet/docklet.c:692
-#: ../plugins/win32/winprefs/winprefs.c:424 ../src/gtkprefs.c:823
-#: ../src/gtkprefs.c:1749 ../src/gtkprefs.c:1763
-msgid "Never"
-msgstr "Mitte iial"
-
-#: ../plugins/docklet/docklet.c:685
-msgid "In hidden conversations"
-msgstr "Peidetud vestlustes"
-
-#: ../plugins/docklet/docklet.c:686 ../plugins/docklet/docklet.c:694
-#: ../plugins/timestamp_format.c:39 ../plugins/timestamp_format.c:48
-#: ../plugins/win32/winprefs/winprefs.c:425 ../src/gtkprefs.c:825
-msgid "Always"
-msgstr "Alati"
-
-#: ../plugins/docklet/docklet.c:690
-msgid "C_hat Messages:"
-msgstr "Ka_nali sõnumid:"
-
-#: ../plugins/docklet/docklet.c:693
-msgid "When my nick is said"
-msgstr "Kui mu hüüdnime öeldakse"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/docklet/docklet.c:720
-msgid "System Tray Icon"
-msgstr "Süsteemisalve ikoon"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/docklet/docklet.c:723
-msgid "Displays an icon for Gaim in the system tray."
-msgstr "Kuvab Gaim'i ikooni süsteemisalves"
-
-#. *  description
-#: ../plugins/docklet/docklet.c:725
-msgid ""
-"Displays a system tray icon (in GNOME, KDE, or Windows for example) to show "
-"the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list. Also provides options to blink for "
-"unread messages."
-msgstr ""
-"Kuvab süsteemisalve ikooni (näiteks GNOME, KDE või Windows keskkonnas), "
-"mille abil näidatakse Gaim'i hetkeolekut ja samuti lubatakse selle abil "
-"kiiret ligipääsu enamkasutatavatele funktsioonidele ning lülitada "
-"sõbranimekirja ja sisselogimisakna kuvamine sisse või välja. Samuti lubab "
-"valikut, kus uute sõnumite puhul hakkab ikoon vilkuma."
-
-#: ../plugins/docklet/eggtrayicon.c:123
-msgid "Orientation"
-msgstr "Suund"
-
-#: ../plugins/docklet/eggtrayicon.c:124
-msgid "The orientation of the tray."
-msgstr "Salve suund"
-
-#: ../plugins/extplacement.c:80
-msgid "By conversation count"
-msgstr "Vestluste arvu järgi"
-
-#: ../plugins/extplacement.c:101
-msgid "Conversation Placement"
-msgstr "Vestluse asetamine"
-
-#: ../plugins/extplacement.c:106
-msgid "Number of conversations per window"
-msgstr "Vestluste arv akna kohta"
-
-#: ../plugins/extplacement.c:112
-msgid "Separate IM and Chat windows when placing by number"
-msgstr "Välksõnumi- ja jututoaakende eraldamine, kui asetatakse numbrite järgi"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/extplacement.c:135
-msgid "ExtPlacement"
-msgstr "EkstraAsetus"
-
-#. *< name
-#. *< version
-#: ../plugins/extplacement.c:137
-msgid "Extra conversation placement options."
-msgstr "Täiendavad valikud vestlusakende asetamisele."
-
-#. *< summary
-#. *  description
-#: ../plugins/extplacement.c:139
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr ""
-"Aknas olevate vestluste arvu vähendamine, võimaluse korral eraldades "
-"välksõnumi- ja jututoaaknaid"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/filectl.c:248
-msgid "Gaim File Control"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/filectl.c:251 ../plugins/filectl.c:253
-msgid "Allows you to control Gaim by entering commands in a file."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gaiminc.c:91
-msgid "Gaim Demonstration Plugin"
-msgstr "Gaim'i näidisplugin"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "Näidisplugin, mis teeb midagi - vaata kirjeldust."
-
-#. *  description
-#: ../plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-
-#: ../plugins/gaimrc.c:41
-msgid "Cursor Color"
-msgstr "Kursori värvus"
-
-#: ../plugins/gaimrc.c:42
-msgid "Secondary Cursor Color"
-msgstr "Teise kursori värvus"
-
-#: ../plugins/gaimrc.c:43
-msgid "Hyperlink Color"
-msgstr "Hüperviida värvus"
-
-#: ../plugins/gaimrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr ""
-
-#: ../plugins/gaimrc.c:57
-msgid "GtkTreeView Horizontal Separation"
-msgstr ""
-
-#: ../plugins/gaimrc.c:76
-msgid "Conversation Entry"
-msgstr "Vestluse kirje"
-
-#: ../plugins/gaimrc.c:77
-msgid "Conversation History"
-msgstr "Vestluste ajalugu"
-
-#: ../plugins/gaimrc.c:78
-msgid "Log Viewer"
-msgstr "Logivaatur"
-
-#: ../plugins/gaimrc.c:79
-msgid "Request Dialog"
-msgstr ""
-
-#: ../plugins/gaimrc.c:80
-msgid "Notify Dialog"
-msgstr "Teavitusdialoog"
-
-#: ../plugins/gaimrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr ""
-
-#: ../plugins/gaimrc.c:287
-#, c-format
-msgid "Select Color for %s"
-msgstr "Värvuse valimine %s jaoks"
-
-#: ../plugins/gaimrc.c:289
-msgid "Select Color"
-msgstr "Värvuse valimine"
-
-#: ../plugins/gaimrc.c:324
-#, c-format
-msgid "Select Font for %s"
-msgstr "Kirjatüübi valimine %s jaoks"
-
-#: ../plugins/gaimrc.c:362
-msgid "Select Interface Font"
-msgstr "Liidese kirjatüübi valimine"
-
-#: ../plugins/gaimrc.c:415
-msgid "General"
-msgstr "Üldine"
-
-#: ../plugins/gaimrc.c:420
-msgid "GTK+ Interface Font"
-msgstr "GTK+ liidese kirjatüüp"
-
-#: ../plugins/gaimrc.c:440
-msgid "GTK+ Text Shortcut Theme"
-msgstr ""
-
-#: ../plugins/gaimrc.c:475
-msgid "Interface colors"
-msgstr "Liidese värvid"
-
-#: ../plugins/gaimrc.c:499
-msgid "Widget Sizes"
-msgstr ""
-
-#: ../plugins/gaimrc.c:520
-msgid "Fonts"
-msgstr "Kirjatüübid"
-
-#: ../plugins/gaimrc.c:543
-msgid "Tools"
-msgstr "Vahendid"
-
-#: ../plugins/gaimrc.c:548
-#, c-format
-msgid "Write settings to %s%sgtkrc-2.0"
-msgstr ""
-
-#: ../plugins/gaimrc.c:556
-msgid "Re-read gtkrc files"
-msgstr ""
-
-#: ../plugins/gaimrc.c:583
-msgid "Gaim GTK+ Theme Control"
-msgstr ""
-
-#: ../plugins/gaimrc.c:585 ../plugins/gaimrc.c:586
-msgid "Provides access to commonly used gtkrc settings."
-msgstr ""
-
-#. Configuration frame
-#: ../plugins/gestures/gestures.c:235
-msgid "Mouse Gestures Configuration"
-msgstr ""
-
-#: ../plugins/gestures/gestures.c:242
-msgid "Middle mouse button"
-msgstr "Keskmine hiirenupp"
-
-#: ../plugins/gestures/gestures.c:247
-msgid "Right mouse button"
-msgstr "Parempoolne hiirenupp"
-
-#. "Visual gesture display" checkbox
-#: ../plugins/gestures/gestures.c:259
-msgid "_Visual gesture display"
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gestures/gestures.c:289
-msgid "Mouse Gestures"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/gestures/gestures.c:292
-msgid "Provides support for mouse gestures"
-msgstr ""
-
-#. *  description
-#: ../plugins/gestures/gestures.c:294
-msgid ""
-"Allows support for mouse gestures in conversation windows.\n"
-"Drag the middle mouse button to perform certain actions:\n"
-"\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
-msgstr ""
+#: ../console/gntaccount.c:650
+msgid "You can enable/disable accounts from the following list."
+msgstr ""
+
+#: ../console/gntaccount.c:673 ../console/gntaccount.c:833
+#: ../console/gntblist.c:291 ../console/gntblist.c:358
+#: ../console/gntblist.c:391 ../console/gntnotify.c:306
+#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2302 ../gtk/gtkblist.c:5361
+#: ../gtk/gtkconv.c:1632 ../gtk/gtkrequest.c:274
+#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/oscar/oscar.c:2429
+#: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
+#: ../libgaim/protocols/qq/sys_msg.c:245
+#: ../libgaim/protocols/sametime/sametime.c:5408
+#: ../libgaim/protocols/silc/chat.c:596
+msgid "Add"
+msgstr "Lisa"
+
+#: ../console/gntaccount.c:677
+msgid "Modify"
+msgstr "Muutmine"
+
+#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2251
+#, 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"
+
+#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2300
+msgid "Add buddy to your list?"
+msgstr "Kas lisada sõber sinu nimekirja?"
+
+#: ../console/gntblist.c:242
+msgid "You must provide a screename for the buddy."
+msgstr ""
+
+#: ../console/gntblist.c:244
+msgid "You must provide a group."
+msgstr ""
+
+#: ../console/gntblist.c:246
+msgid "You must select an account."
+msgstr "Sa pead konto valima."
+
+#: ../console/gntblist.c:250
+msgid "Error adding buddy"
+msgstr "Viga sõbra lisamisel"
+
+#: ../console/gntblist.c:275 ../gtk/gtkaccount.c:1896
+#: ../gtk/gtksavedstatuses.c:893 ../libgaim/protocols/oscar/oscar.c:2803
+msgid "Screen Name"
+msgstr "Ekraaninimi"
+
+#: ../console/gntblist.c:278 ../console/gntblist.c:350 ../gtk/gtkdialogs.c:913
+#: ../gtk/gtkdialogs.c:935 ../gtk/gtkdialogs.c:955 ../gtk/gtkrequest.c:277
+#: ../libgaim/protocols/silc/chat.c:587
+msgid "Alias"
+msgstr "Alias"
+
+#: ../console/gntblist.c:281 ../console/gntblist.c:353
+msgid "Group"
+msgstr "Grupp"
+
+#: ../console/gntblist.c:284 ../console/gntblist.c:341
+#: ../console/gntnotify.c:155 ../console/gntstatus.c:562
+#: ../gtk/gtknotify.c:402 ../gtk/gtkpounce.c:1255
+#: ../gtk/plugins/gevolution/gevolution.c:450 ../libgaim/plugins/idle.c:153
+#: ../libgaim/plugins/idle.c:189
+msgid "Account"
+msgstr "Konto"
+
+#: ../console/gntblist.c:290 ../console/gntblist.c:752 ../gtk/gtkblist.c:4874
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:447
+#: ../libgaim/protocols/silc/buddy.c:736
+#: ../libgaim/protocols/silc/buddy.c:1030
+#: ../libgaim/protocols/silc/buddy.c:1075
+#: ../libgaim/protocols/silc/buddy.c:1174
+#: ../libgaim/protocols/yahoo/yahoo.c:3128
+msgid "Add Buddy"
+msgstr "Sõbra lisamine"
+
+#: ../console/gntblist.c:290
+msgid "Please enter buddy information."
+msgstr "Palun sisesta sõbra andmed."
+
+#: ../console/gntblist.c:313 ../libgaim/blist.c:1195
+msgid "Chats"
+msgstr "Jututoad"
 
 #. Extract their Name and put it in
 #. Contact Info
 #. Personal
 #. Business
-#: ../plugins/gevolution/add_buddy_dialog.c:131
-#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:587
-#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:755
-#: ../src/protocols/msn/msn.c:1532 ../src/protocols/msn/msn.c:1585
-#: ../src/protocols/msn/msn.c:1606
+#: ../console/gntblist.c:347 ../gtk/gtkplugin.c:589 ../gtk/gtkroomlist.c:600
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:132
+#: ../gtk/plugins/gevolution/assoc-buddy.c:123
+#: ../libgaim/protocols/jabber/jabber.c:785
+#: ../libgaim/protocols/msn/msn.c:1533 ../libgaim/protocols/msn/msn.c:1586
+#: ../libgaim/protocols/msn/msn.c:1608 ../libgaim/protocols/qq/buddy_info.c:42
 msgid "Name"
 msgstr "Nimi"
 
-#: ../plugins/gevolution/add_buddy_dialog.c:142
-msgid "Instant Messaging"
-msgstr "Välksõnumivahendid"
-
-#. Add the label.
-#: ../plugins/gevolution/add_buddy_dialog.c:454
-msgid "Select a person from your address book below, or add a new person."
-msgstr "Vali isik aadressiraamatust või lisa uus."
-
-#. "Search"
-#: ../plugins/gevolution/add_buddy_dialog.c:467
-#: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1422 ../src/protocols/oscar/oscar.c:5987
-#: ../src/protocols/sametime/sametime.c:5531
-msgid "Search"
-msgstr "Otsing"
-
-#: ../plugins/gevolution/add_buddy_dialog.c:548
-#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4604
-#: ../src/gtkblist.c:4968
-msgid "Group:"
-msgstr "Grupp:"
-
-#. "New Person" button
-#: ../plugins/gevolution/add_buddy_dialog.c:574
-#: ../plugins/gevolution/assoc-buddy.c:464
-msgid "New Person"
-msgstr "Uus isik"
-
-#. "Select Buddy" button
-#: ../plugins/gevolution/add_buddy_dialog.c:591
-msgid "Select Buddy"
-msgstr "Vali sõber"
-
-#. Add the label.
-#: ../plugins/gevolution/assoc-buddy.c:340
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"Vali aadressiraamatus olev kirje, millega seda sõpra siduda või loo uus isik."
-
-#. Add the expander
-#: ../plugins/gevolution/assoc-buddy.c:428
-msgid "User _details"
-msgstr "_Kasutaja üksikasjad"
-
-#. "Associate Buddy" button
-#: ../plugins/gevolution/assoc-buddy.c:481
-msgid "_Associate Buddy"
-msgstr ""
-
-#: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:1122
-msgid "None"
-msgstr "Puudub"
-
-#: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
-#: ../src/blist.c:516 ../src/blist.c:1278 ../src/blist.c:1505
-#: ../src/gtkblist.c:4413 ../src/protocols/jabber/roster.c:65
-msgid "Buddies"
-msgstr "Sõbrad"
-
-#: ../plugins/gevolution/gevolution.c:262
-#: ../plugins/gevolution/gevolution.c:268
-msgid "Unable to send e-mail"
-msgstr "E-kirja pole võimalik saata"
-
-#: ../plugins/gevolution/gevolution.c:263
-msgid "The evolution executable was not found in the PATH."
-msgstr "Evolutioni programmi pole võimalik PATH radadel leida."
-
-#: ../plugins/gevolution/gevolution.c:269
-msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr "Määratud sõpra ei leitud evolutioni kontaktide hulgas."
-
-#: ../plugins/gevolution/gevolution.c:286
-msgid "Add to Address Book"
-msgstr "Lisa aadressiraamatusse"
-
-#: ../plugins/gevolution/gevolution.c:290
-msgid "Send E-Mail"
-msgstr "Saada e-kiri"
-
-#. Configuration frame
-#: ../plugins/gevolution/gevolution.c:417
-msgid "Evolution Integration Configuration"
-msgstr "Evolution'iga sidumise sätted"
-
-#. Label
-#: ../plugins/gevolution/gevolution.c:420
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr "Vali kõik kontod, mille sõbrad tuleb automaatselt lisada."
-
-#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:147
-#: ../plugins/idle.c:183 ../src/gtknotify.c:397 ../src/gtkpounce.c:1262
-msgid "Account"
-msgstr "Konto"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gevolution/gevolution.c:527
-msgid "Evolution Integration"
-msgstr "Evolution'iga sidumine"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/gevolution/gevolution.c:530
-#: ../plugins/gevolution/gevolution.c:532
-msgid "Provides integration with Evolution."
-msgstr "Plugin tagab integratsiooni Evolution'iga."
-
-#: ../plugins/gevolution/new_person_dialog.c:266
-msgid "Please enter the person's information below."
-msgstr "Palun sisesta isiku andmed."
-
-#: ../plugins/gevolution/new_person_dialog.c:270
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "Palun sisesta allolevasse vormi sõbra ekraaninimi ja konto liik."
-
-#: ../plugins/gevolution/new_person_dialog.c:290
-msgid "Account type:"
-msgstr "Konto liik:"
-
-#: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:784
-#: ../src/gtkblist.c:4566
-msgid "Screen name:"
-msgstr "Ekraaninimi:"
-
-#. Optional Information section
-#: ../plugins/gevolution/new_person_dialog.c:314
-msgid "Optional information:"
-msgstr "Täiendav teave:"
-
-#. Label
-#: ../plugins/gevolution/new_person_dialog.c:337 ../src/gtkaccount.c:424
-#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:627
-msgid "Buddy Icon"
-msgstr "Sõbraikoon"
-
-#: ../plugins/gevolution/new_person_dialog.c:349
-msgid "First name:"
-msgstr "Eesnimi:"
-
-#: ../plugins/gevolution/new_person_dialog.c:361
-msgid "Last name:"
-msgstr "Perekonnanimi:"
-
-#: ../plugins/gevolution/new_person_dialog.c:381
-msgid "E-mail:"
-msgstr "E-post:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gtk-signals-test.c:160
-msgid "GTK Signals Test"
-msgstr "GTK signaalitestid"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/gtk-signals-test.c:163 ../plugins/gtk-signals-test.c:165
-msgid "Test to see that all ui signals are working properly."
-msgstr ""
-
-#: ../plugins/history.c:120
+#: ../console/gntblist.c:356 ../console/gntblist.c:754 ../gtk/gtkblist.c:5252
+msgid "Add Chat"
+msgstr "Vestluse lisamine"
+
+#: ../console/gntblist.c:357
+msgid "You can edit more information from the context menu later."
+msgstr ""
+
+#: ../console/gntblist.c:368 ../console/gntblist.c:381
+msgid "Error adding group"
+msgstr "Viga grupi lisamisel"
+
+#: ../console/gntblist.c:369
+msgid "You must give a name for the group to add."
+msgstr "Sa pead lisatavale grupile nime määrama."
+
+#: ../console/gntblist.c:382
+msgid "A group with the name already exists."
+msgstr "Selle nimega grupp on juba olemas."
+
+#: ../console/gntblist.c:389 ../console/gntblist.c:756 ../gtk/gtkblist.c:5358
+#: ../libgaim/protocols/sametime/sametime.c:5319
+#: ../libgaim/protocols/sametime/sametime.c:5406
+msgid "Add Group"
+msgstr "Grupi lisamine"
+
+#: ../console/gntblist.c:389
+msgid "Enter the name of the group"
+msgstr "Sisesta grupi nimi"
+
+#: ../console/gntblist.c:711
+msgid "Edit Chat"
+msgstr ""
+
+#: ../console/gntblist.c:711
+msgid "Please Update the necessary fields."
+msgstr "Palun uuenda tarvilikud väljad."
+
+#: ../console/gntblist.c:712 ../console/gntstatus.c:196
+msgid "Edit"
+msgstr ""
+
+#: ../console/gntblist.c:718
+msgid "Auto-join"
+msgstr "Automaatühendumine"
+
+#: ../console/gntblist.c:726
+msgid "Edit Settings"
+msgstr "Sätete redigeerimine"
+
+#: ../console/gntblist.c:774 ../libgaim/protocols/silc/chat.c:878
+msgid "Get Info"
+msgstr "Andmete hankimine"
+
+#: ../console/gntblist.c:779
+msgid "Add Buddy Pounce"
+msgstr "Sõbramärguande lisamine"
+
+#: ../console/gntblist.c:786 ../gtk/gtkconv.c:1580
+#: ../libgaim/protocols/oscar/oscar.c:615
+msgid "Send File"
+msgstr "Saada fail"
+
+#: ../console/gntblist.c:790
+msgid "View Log"
+msgstr "Logi vaatamine"
+
+#: ../console/gntblist.c:889
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "Palun sisesta %s jaoks uus nimi"
+
+#: ../console/gntblist.c:891 ../console/gntblist.c:892
+#: ../console/gntblist.c:1061
+msgid "Rename"
+msgstr "Nime muutmine"
+
+#: ../console/gntblist.c:891
+msgid "Enter empty string to reset the name."
+msgstr ""
+
+#: ../console/gntblist.c:964
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr ""
+
+#: ../console/gntblist.c:972
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr ""
+
+#: ../console/gntblist.c:977
+#, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr "Kas sa soovid eemaldada kontot %s?"
+
+#. XXX: anything to do with the returned ui-handle?
+#: ../console/gntblist.c:980
+msgid "Confirm Remove"
+msgstr "Eemaldamiskinnitus"
+
+#: ../console/gntblist.c:983 ../console/gntblist.c:1063 ../gtk/gtkblist.c:1039
+#: ../gtk/gtkconv.c:1629 ../gtk/gtkrequest.c:275
+msgid "Remove"
+msgstr "Eemalda"
+
+#. Buddy List
+#: ../console/gntblist.c:1038 ../console/gntblist.c:1888
+#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:3894
+#: ../gtk/plugins/win32/winprefs/winprefs.c:327
+msgid "Buddy List"
+msgstr "Sõbranimekiri"
+
+#: ../console/gntblist.c:1067
+msgid "Place tagged"
+msgstr ""
+
+#: ../console/gntblist.c:1070
+msgid "Tag"
+msgstr ""
+
+#: ../console/gntblist.c:1105 ../console/gntblist.c:1209
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Konto: %s (%s)"
+
+#: ../console/gntblist.c:1130
+#, c-format
+msgid ""
+"\n"
+"Idle: %s"
+msgstr ""
+"\n"
+"Jõude: %s"
+
+#: ../console/gntblist.c:1188
+#, c-format
+msgid "Nickname: %s\n"
+msgstr "Hüüdnimi: %s\n"
+
+#: ../console/gntblist.c:1200
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"Ühendunuid: %d\n"
+"Kokku: %d"
+
+#: ../console/gntblist.c:1221
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"Viimati nähtud: %s tagasi"
+
+#: ../console/gntblist.c:1451 ../gtk/gtkdocklet.c:441
+#: ../gtk/gtkstatusbox.c:984
+msgid "New..."
+msgstr "Uus..."
+
+#: ../console/gntblist.c:1458 ../gtk/gtkdocklet.c:442
+#: ../gtk/gtkstatusbox.c:985
+msgid "Saved..."
+msgstr "Salvestatud..."
+
+#. Create the "Options" frame.
+#: ../console/gntblist.c:1850 ../gtk/gtkpounce.c:766
+msgid "Options"
+msgstr "Valikud"
+
+#: ../console/gntblist.c:1856
+msgid "Toggle offline buddies"
+msgstr ""
+
+#: ../console/gntblist.c:1860
+msgid "Sort by status"
+msgstr "Sortimine oleku järgi"
+
+#: ../console/gntblist.c:1864
+msgid "Sort alphabetically"
+msgstr "Sortimine tähestiku järgi"
+
+#: ../console/gntblist.c:1868
+msgid "Sort by log size"
+msgstr "Sortimine logi suuruse järgi"
+
+#: ../console/gntconn.c:36
+#, c-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../console/gntconn.c:39
+#, c-format
+msgid "%s disconnected."
+msgstr "%s katkestas ühenduse"
+
+#: ../console/gntconn.c:40
+#, c-format
+msgid ""
+"%s was disconnected due to the following error:\n"
+"%s"
+msgstr ""
+"%s katkestas ühenduse järgneva vea tõttu:\n"
+"%s"
+
+#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3774 ../libgaim/account.c:991
+#: ../libgaim/connection.c:106
+msgid "Connection Error"
+msgstr "Ühenduse viga"
+
+#: ../console/gntconv.c:71 ../gtk/gtkconv.c:484
+msgid "No such command."
+msgstr "Sellist käsku pole."
+
+#: ../console/gntconv.c:75 ../gtk/gtkconv.c:491
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr ""
+
+#: ../console/gntconv.c:80 ../gtk/gtkconv.c:496
+msgid "Your command failed for an unknown reason."
+msgstr ""
+
+#: ../console/gntconv.c:85 ../gtk/gtkconv.c:502
+msgid "That command only works in chats, not IMs."
+msgstr ""
+
+#: ../console/gntconv.c:88 ../gtk/gtkconv.c:505
+msgid "That command only works in IMs, not chats."
+msgstr ""
+
+#: ../console/gntconv.c:92 ../gtk/gtkconv.c:509
+msgid "That command doesn't work on this protocol."
+msgstr ""
+
+#: ../console/gntconv.c:99
+msgid "Commands are not supported yet. Message was NOT sent."
+msgstr ""
+
+#: ../console/gntconv.c:193
+#, c-format
+msgid "%s (%s -- %s)"
+msgstr "%s (%s -- %s"
+
+#: ../console/gntconv.c:214
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
+
+#: ../console/gntconv.c:344
+msgid "<AUTO-REPLY> "
+msgstr "<AUTOMAATVASTUS> "
+
+#. Print the list of users in the room
+#: ../console/gntconv.c:438
+msgid "List of users:\n"
+msgstr "Kasutajate nimekiri:\n"
+
+#: ../console/gntconv.c:562 ../gtk/gtkconv.c:378
+msgid "Supported debug options are:  version"
+msgstr "Toetatud silumisvalikud on:  version"
+
+#: ../console/gntconv.c:597 ../gtk/gtkconv.c:414
+msgid "No such command (in this context)."
+msgstr "Sellist käsku pole (selles kontekstis)."
+
+#: ../console/gntconv.c:600 ../gtk/gtkconv.c:417
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+"Kasuta \"/help &lt;käsk&gt;\" selle käsu abiteabe saamiseks.\n"
+"Sellest kontekstis on saadaval järgnevad käsud:\n"
+
+#: ../console/gntconv.c:639 ../gtk/gtkconv.c:6645
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr ""
+"say &lt;message&gt;:  Sõnumi saatmine nagu tehtaks seda ilma käsku "
+"kasutamata."
+
+#: ../console/gntconv.c:642 ../gtk/gtkconv.c:6648
+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."
+
+#: ../console/gntconv.c:645 ../gtk/gtkconv.c:6651
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr "debug &lt;võti&gt;:  Silumisteabe saatmine käesolevasse vestlusesse."
+
+#: ../console/gntconv.c:648 ../gtk/gtkconv.c:6654
+msgid "clear: Clears the conversation scrollback."
+msgstr "clear: Vestluse tagasikerimise puhastamine."
+
+#: ../console/gntconv.c:651 ../gtk/gtkconv.c:6657
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;käsk&gt;:  Abiteave käsu kohta."
+
+#: ../console/gntconv.c:656
+msgid "plugins: Show the plugins window."
+msgstr ""
+
+#: ../console/gntconv.c:659
+msgid "buddylist: Show the buddylist."
+msgstr ""
+
+#: ../console/gntconv.c:662
+msgid "accounts: Show the accounts window."
+msgstr ""
+
+#: ../console/gntconv.c:665
+msgid "debugwin: Show the debug window."
+msgstr ""
+
+#: ../console/gntconv.c:668
+msgid "prefs: Show the preference window."
+msgstr ""
+
+#: ../console/gntconv.c:671
+msgid "statuses: Show the savedstatuses window."
+msgstr ""
+
+#: ../console/gntdebug.c:203 ../console/gntui.c:72 ../gtk/gtkdebug.c:708
+msgid "Debug Window"
+msgstr "Silumisaken"
+
+#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
+#. * it's necessary to make the width of the debug window resizable ... like I said,
+#. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
+#.
+#: ../console/gntdebug.c:220 ../gtk/gtkdebug.c:767
+msgid "Clear"
+msgstr "Puhastamine"
+
+#: ../console/gntdebug.c:225 ../gtk/gtkdebug.c:776
+msgid "Pause"
+msgstr "Paus"
+
+#: ../console/gntdebug.c:230 ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784
+msgid "Timestamps"
+msgstr "Ajatemplid"
+
+#: ../console/gntgaim.c:166
+#, c-format
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr "%s. Täpsemate andmete saamiseks kasuta `%s -h'.\n"
+
+#: ../console/gntgaim.c:168
+#, c-format
+msgid ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s\n"
+"Kasutamine: %s [VÕTI]...\n"
+"\n"
+"  -c, --config=KATALOOG  KATALOOGi kasutamine seadistusfailide jaoks\n"
+"  -d, --debug            silumisteadete väljastamine standardväljundisse\n"
+"  -h, --help             selle abiteate kuvamine ja programmi töö "
+"lõpetamine\n"
+"  -n, --nologin          automaatse sisselogimise keelamine\n"
+"  -v, --version          käesoleva versiooni kuvamine ja programmi töö\n"
+"                         lõpetamine\n"
+
+#. *
+#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#.
+#: ../console/gntnotify.c:79 ../gtk/gtkblist.c:3776 ../gtk/gtkdialogs.c:666
+#: ../gtk/gtkdialogs.c:803 ../gtk/gtkdialogs.c:894 ../gtk/gtkrequest.c:269
+#: ../libgaim/account.c:963 ../libgaim/account.c:1134
+#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
+#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1351
+#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:250
+#: ../libgaim/protocols/msn/msn.c:265 ../libgaim/protocols/msn/msn.c:280
+#: ../libgaim/protocols/msn/msn.c:295 ../libgaim/protocols/oscar/oscar.c:1386
+#: ../libgaim/protocols/oscar/oscar.c:2150
+#: ../libgaim/protocols/oscar/oscar.c:2237
+#: ../libgaim/protocols/oscar/oscar.c:5731
+#: ../libgaim/protocols/oscar/oscar.c:5935
+#: ../libgaim/protocols/oscar/oscar.c:5960
+#: ../libgaim/protocols/oscar/oscar.c:6016
+#: ../libgaim/protocols/silc/buddy.c:466
+#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
+#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
+#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1909
+#: ../libgaim/protocols/silc/silc.c:753
+#: ../libgaim/protocols/yahoo/yahoo.c:3213
+#: ../libgaim/protocols/yahoo/yahoo.c:3222 ../libgaim/request.h:1344
+msgid "OK"
+msgstr "Olgu"
+
+#: ../console/gntnotify.c:146
+msgid "Emails"
+msgstr "E-postid"
+
+#: ../console/gntnotify.c:152 ../console/gntnotify.c:206
+msgid "You have mail!"
+msgstr "Sulle on e-sõnum!"
+
+#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:414
+#: ../libgaim/protocols/jabber/jabber.c:1147
+msgid "From"
+msgstr "Saatja"
+
+#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:423
+msgid "Subject"
+msgstr "Teema"
+
+#: ../console/gntnotify.c:163 ../console/gntplugin.c:193
+#: ../console/gntplugin.c:274 ../console/gntstatus.c:206
+#: ../gtk/gtkrequest.c:272 ../libgaim/protocols/msn/msn.c:357
+#: ../libgaim/protocols/silc/util.c:377
+msgid "Close"
+msgstr "Sulge"
+
+#: ../console/gntnotify.c:182
+#, fuzzy, c-format
+msgid "%s (%s) has %d new message."
+msgid_plural "%s (%s) has %d new messages."
+msgstr[0] "%s sai %d uue sõnumi."
+msgstr[1] "%s sai %d uut sõnumit."
+
+#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:332
+msgid "New Mail"
+msgstr "Uus e-sõnum"
+
+#: ../console/gntnotify.c:229 ../gtk/gtknotify.c:849
+#: ../libgaim/protocols/oscar/oscar.c:2610
+#, c-format
+msgid "Info for %s"
+msgstr "Andmed: %s"
+
+#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:850
+#: ../libgaim/protocols/toc/toc.c:476
+msgid "Buddy Information"
+msgstr "Sõbra andmed"
+
+#: ../console/gntnotify.c:303
+msgid "Continue"
+msgstr "Jätka"
+
+#: ../console/gntnotify.c:309 ../gtk/gtkconv.c:1608 ../gtk/gtkdebug.c:862
+msgid "Info"
+msgstr "Andmed"
+
+#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1569
+msgid "IM"
+msgstr "Välksõnum"
+
+#: ../console/gntnotify.c:315
+msgid "Join"
+msgstr "Ühine"
+
+#: ../console/gntnotify.c:318 ../libgaim/protocols/sametime/sametime.c:3448
+msgid "Invite"
+msgstr "Kutsu"
+
+#: ../console/gntnotify.c:321
+msgid "(none)"
+msgstr "(puudub)"
+
+#: ../console/gntplugin.c:117
+#, c-format
+msgid ""
+"Name: %s\n"
+"Version: %s\n"
+"Description: %s\n"
+"Author: %s\n"
+"Website: %s\n"
+"Filename: %s\n"
+msgstr ""
+"Nimi: %s\n"
+"Versioon: %s\n"
+"Kirjeldus: %s\n"
+"Autor: %s\n"
+"Veebisait: %s\n"
+"Failinimi: %s\n"
+
+#: ../console/gntplugin.c:170
+msgid "Plugin need to be loaded before you can configure it."
+msgstr "Enne plugina seadistamist peab see olema laaditud."
+
+#: ../console/gntplugin.c:208
+msgid "..."
+msgstr "..."
+
+#: ../console/gntplugin.c:209
+msgid "Still need to do something about this."
+msgstr ""
+
+#: ../console/gntplugin.c:215
+msgid "No configuration options for this plugin."
+msgstr "Sellel pluginal pole sedistamisvalikuid."
+
+#: ../console/gntplugin.c:231 ../console/gntui.c:73 ../gtk/gtkdocklet.c:494
+#: ../gtk/gtkplugin.c:538
+msgid "Plugins"
+msgstr "Pluginad"
+
+#: ../console/gntplugin.c:236
+msgid "You can (un)load plugins from the following list."
+msgstr ""
+
+#: ../console/gntplugin.c:279
+msgid "Configure Plugin"
+msgstr "Seadista pluginat"
+
+#: ../console/gntprefs.c:122
+#, fuzzy
+msgid "Show Idle Time"
+msgstr "/Sõbrad/Näita jõudeaegu"
+
+#: ../console/gntprefs.c:123
+#, fuzzy
+msgid "Show Offline Buddies"
+msgstr "/Sõbrad/Näita ühendamata sõpru"
+
+#: ../console/gntprefs.c:129
+msgid "Show Timestamps"
+msgstr "Näita ajatempleid"
+
+#: ../console/gntprefs.c:130
+#, fuzzy
+msgid "Notify buddies when you are typing"
+msgstr "Sõprade _teavitamine, kui sa oled neile sõnumit kirjutamas"
+
+#: ../console/gntprefs.c:136
+#, fuzzy
+msgid "Log format"
+msgstr "Logi_vorming:"
+
+#: ../console/gntprefs.c:137
+msgid "Log IMs"
+msgstr ""
+
+#: ../console/gntprefs.c:138
+#, fuzzy
+msgid "Log chats"
+msgstr "Kõiki _vestlusi logitakse"
+
+#: ../console/gntprefs.c:139
+#, fuzzy
+msgid "Log status change events"
+msgstr "Kõiki _olekumuutusi logitakse süsteemsesse logisse"
+
+#. Conversations
+#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:822 ../gtk/gtkprefs.c:1884
+#: ../gtk/plugins/win32/winprefs/winprefs.c:341
+msgid "Conversations"
+msgstr "Vestlused"
+
+#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1314 ../gtk/gtkprefs.c:1895
+msgid "Logging"
+msgstr "Logimine"
+
+#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:495
+#: ../gtk/gtkprefs.c:1920
+msgid "Preferences"
+msgstr "Eelistused"
+
+#: ../console/gntrequest.c:495
+msgid "Not implemented yet."
+msgstr "Pole veel teostatud."
+
+#: ../console/gntstatus.c:135
+#, fuzzy, c-format
+msgid "Are you sure you want to delete \"%s\""
+msgstr "Kas sa soovid kustutada kontot %s?"
+
+#: ../console/gntstatus.c:138
+msgid "Delete Status"
+msgstr ""
+
+#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:526
+msgid "Saved Statuses"
+msgstr "Salvestatud olekud"
+
+#: ../console/gntstatus.c:174 ../console/gntstatus.c:525
+#: ../gtk/gtksavedstatuses.c:433 ../libgaim/protocols/jabber/buddy.c:283
+#: ../libgaim/protocols/jabber/buddy.c:917
+#: ../libgaim/protocols/novell/novell.c:1484
+msgid "Title"
+msgstr "Tiitel"
+
+#: ../console/gntstatus.c:174 ../gtk/gtksavedstatuses.c:448
+msgid "Type"
+msgstr "Liik"
+
+#: ../console/gntstatus.c:174 ../console/gntstatus.c:550
+#: ../console/gntstatus.c:562 ../gtk/gtksavedstatuses.c:459
+#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/bonjour/bonjour.c:256
+#: ../libgaim/protocols/bonjour/bonjour.c:263
+#: ../libgaim/protocols/gg/gg.c:1592 ../libgaim/protocols/gg/gg.c:1602
+#: ../libgaim/protocols/gg/gg.c:1608 ../libgaim/protocols/gg/gg.c:1617
+#: ../libgaim/protocols/gg/gg.c:1622 ../libgaim/protocols/irc/irc.c:244
+#: ../libgaim/protocols/jabber/jabber.c:1214
+#: ../libgaim/protocols/jabber/jabber.c:1224
+#: ../libgaim/protocols/jabber/jabber.c:1234
+#: ../libgaim/protocols/jabber/jabber.c:1244
+#: ../libgaim/protocols/jabber/jabber.c:1254
+#: ../libgaim/protocols/jabber/jabber.c:1266
+#: ../libgaim/protocols/novell/novell.c:2876
+#: ../libgaim/protocols/novell/novell.c:2982
+#: ../libgaim/protocols/novell/novell.c:2988
+#: ../libgaim/protocols/novell/novell.c:2994
+#: ../libgaim/protocols/oscar/oscar.c:5395
+#: ../libgaim/protocols/oscar/oscar.c:5410
+#: ../libgaim/protocols/oscar/oscar.c:5415
+#: ../libgaim/protocols/oscar/oscar.c:5623
+#: ../libgaim/protocols/oscar/oscar.c:5635
+#: ../libgaim/protocols/oscar/oscar.c:5648
+#: ../libgaim/protocols/oscar/oscar.c:5655
+#: ../libgaim/protocols/oscar/oscar.c:5662
+#: ../libgaim/protocols/sametime/sametime.c:3262
+#: ../libgaim/protocols/sametime/sametime.c:3268
+#: ../libgaim/protocols/sametime/sametime.c:3274
+#: ../libgaim/protocols/sametime/sametime.c:3353
+#: ../libgaim/protocols/silc/buddy.c:1544
+#: ../libgaim/protocols/simple/simple.c:246
+#: ../libgaim/protocols/yahoo/yahoo.c:3456
+#: ../libgaim/protocols/yahoo/yahoo.c:3462
+#: ../libgaim/protocols/zephyr/zephyr.c:2333
+msgid "Message"
+msgstr "Sõnum"
+
+#. Use
+#: ../console/gntstatus.c:186 ../console/gntstatus.c:579
+#, fuzzy
+msgid "Use"
+msgstr "_Kasuta"
+
+#: ../console/gntstatus.c:291
+msgid "Invalid title"
+msgstr "Vigane pealkiri"
+
+#: ../console/gntstatus.c:292
+msgid "Please enter a non-empty title for the status."
+msgstr "Palun määra olekule pealkiri, mis poleks tühi string."
+
+#: ../console/gntstatus.c:299
+msgid "Duplicate title"
+msgstr "Topeltpealkiri"
+
+#: ../console/gntstatus.c:300
+msgid "Please enter a different title for the status."
+msgstr "Palun sisesta olekule teistsugune pealkiri."
+
+#: ../console/gntstatus.c:439
+msgid "Substatus"
+msgstr "Alamolek"
+
+#. Set up stuff for the account box
+#: ../console/gntstatus.c:442 ../gtk/gtkblist.c:4968 ../gtk/gtkblist.c:5286
+msgid "Account:"
+msgstr "Konto:"
+
+#: ../console/gntstatus.c:450 ../gtk/gtkft.c:698
+msgid "Status:"
+msgstr "Olek:"
+
+#: ../console/gntstatus.c:465
+msgid "Message:"
+msgstr "Sõnum:"
+
+#: ../console/gntstatus.c:514
+#, fuzzy
+msgid "Edit Status"
+msgstr "Perekonnaseis"
+
+#: ../console/gntstatus.c:533 ../console/gntstatus.c:562
+#: ../gtk/gtksavedstatuses.c:912 ../gtk/gtksavedstatuses.c:1059
+#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1575
+#: ../libgaim/protocols/gg/gg.c:1579 ../libgaim/protocols/jabber/buddy.c:623
+#: ../libgaim/protocols/jabber/buddy.c:630
+#: ../libgaim/protocols/jabber/buddy.c:658
+#: ../libgaim/protocols/jabber/jabber.c:1185
+#: ../libgaim/protocols/msn/msn.c:546
+#: ../libgaim/protocols/novell/novell.c:2875
+#: ../libgaim/protocols/novell/novell.c:2879
+#: ../libgaim/protocols/oscar/oscar.c:759
+#: ../libgaim/protocols/oscar/oscar.c:765
+#: ../libgaim/protocols/oscar/oscar.c:768
+#: ../libgaim/protocols/yahoo/yahoo.c:3032
+msgid "Status"
+msgstr "Olek"
+
+#: ../console/gntstatus.c:556
+#, fuzzy
+msgid "Use different status for following accounts"
+msgstr "_Teistsuguse oleku kasutamine mõne konto jaoks"
+
+#. Save & Use
+#: ../console/gntstatus.c:590
+msgid "Save & Use"
+msgstr "Sal_vesta ja kasuta"
+
+#: ../console/gntui.c:75
+msgid "Statuses"
+msgstr "Olekud"
+
+#: ../console/plugins/gntgf.c:209
+#, fuzzy, c-format
+msgid "%s just signed on"
+msgstr "%s logis sisse."
+
+#: ../console/plugins/gntgf.c:216
+#, fuzzy, c-format
+msgid "%s just signed off"
+msgstr "%s logis välja."
+
+#: ../console/plugins/gntgf.c:224
+#, fuzzy, c-format
+msgid "%s sent you a message"
+msgstr "%s saatis sulle sõnumi. (%s)"
+
+#: ../console/plugins/gntgf.c:243
+#, c-format
+msgid "%s said your nick in %s"
+msgstr ""
+
+#: ../console/plugins/gntgf.c:245
+#, fuzzy, c-format
+msgid "%s sent a message in %s"
+msgstr "%s saatis sulle sõnumi. (%s)"
+
+#: ../console/plugins/gntgf.c:283
+msgid "Buddy signs on/off"
+msgstr "Sõber logib sisse või välja"
+
+#: ../console/plugins/gntgf.c:284
+msgid "You receive an IM"
+msgstr ""
+
+#: ../console/plugins/gntgf.c:285
+#, fuzzy
+msgid "Someone speaks in a chat"
+msgstr "Keegi ütleb vestluses sinu nime"
+
+#: ../console/plugins/gntgf.c:286
+#, fuzzy
+msgid "Someone says your name in a chat"
+msgstr "Keegi ütleb vestluses sinu nime"
+
+#: ../console/plugins/gntgf.c:314
+msgid "Notify with a toaster when"
+msgstr ""
+
+#: ../console/plugins/gntgf.c:329
+msgid "Beep too!"
+msgstr ""
+
+#: ../console/plugins/gntgf.c:335
+msgid "Set URGENT for the terminal window."
+msgstr ""
+
+#: ../console/plugins/gntgf.c:355
+msgid "GntGf"
+msgstr ""
+
+#: ../console/plugins/gntgf.c:357 ../console/plugins/gntgf.c:358
+msgid "Toaster plugin for GntGaim."
+msgstr ""
+
+#: ../console/plugins/gnthistory.c:119 ../gtk/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Vestlused: %s, %s:</b><br>"
 
-#: ../plugins/history.c:147
+#: ../console/plugins/gnthistory.c:140 ../gtk/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr ""
 
-#: ../plugins/history.c:148
+#: ../console/plugins/gnthistory.c:141 ../gtk/plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -788,15 +1069,16 @@
 "the same conversation type(s)."
 msgstr ""
 
-#: ../plugins/history.c:188
-msgid "History"
+#: ../console/plugins/gnthistory.c:181
+#, fuzzy
+msgid "GntHistory"
 msgstr "Ajalugu"
 
-#: ../plugins/history.c:190
+#: ../console/plugins/gnthistory.c:183 ../gtk/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Uutes vestlustes näidatakse viimase vestluse logi."
 
-#: ../plugins/history.c:191
+#: ../console/plugins/gnthistory.c:184 ../gtk/plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -804,1673 +1086,384 @@
 "Vestluse avamisel lisab see plugin viimase vestluse logi avatava vestluse "
 "aknasse."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/iconaway.c:82
-msgid "Iconify on Away"
-msgstr "Ikoonimine eemaldumisel"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/iconaway.c:85 ../plugins/iconaway.c:87
-msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "Sõbranimekirja ja vestlusakende ikooniks taandamine Sinu eemaldumisel."
-
-#: ../plugins/idle.c:152 ../plugins/idle.c:210
-msgid "Minutes"
-msgstr "Minuteid"
-
-#: ../plugins/idle.c:159 ../plugins/idle.c:192 ../plugins/idle.c:217
-#: ../plugins/idle.c:306
-msgid "I'dle Mak'er"
-msgstr "Jõudeaja määraja"
-
-#: ../plugins/idle.c:160 ../plugins/idle.c:249
-msgid "Set Account Idle Time"
-msgstr "Määra konto jõudeaeg"
-
-#: ../plugins/idle.c:163 ../plugins/idle.c:221
-msgid "_Set"
-msgstr "_Määra"
-
-#: ../plugins/idle.c:164 ../plugins/idle.c:197 ../plugins/idle.c:222
-msgid "_Cancel"
-msgstr "_Loobu"
-
-#: ../plugins/idle.c:177
-msgid "None of your accounts are idle."
-msgstr "Ükski sinu konto pole jõude."
-
-#: ../plugins/idle.c:193 ../plugins/idle.c:253
-msgid "Unset Account Idle Time"
-msgstr "Nulli konto jõudeaeg"
-
-#: ../plugins/idle.c:196
-msgid "_Unset"
-msgstr ""
-
-#: ../plugins/idle.c:218 ../plugins/idle.c:257
-msgid "Set Idle Time for All Accounts"
-msgstr "Määra jõudeaeg kõigile kontodele"
-
-#: ../plugins/idle.c:262
-msgid "Unset Idle Time for All Idled Accounts"
-msgstr "Nullia kõikide jõudeolevate kontode jõudeaeg"
-
-#: ../plugins/idle.c:308 ../plugins/idle.c:309
-msgid "Allows you to hand-configure how long you've been idle"
-msgstr "Lubab sul käsitsi määrata, kui kaua sa oled jõude olnud"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ipc-test-client.c:87
-msgid "IPC Test Client"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/ipc-test-client.c:90
-msgid "Test plugin IPC support, as a client."
-msgstr ""
-
-#. *  description
-#: ../plugins/ipc-test-client.c:92
-msgid ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
-"calls the commands registered."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ipc-test-server.c:74
-msgid "IPC Test Server"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/ipc-test-server.c:77
-msgid "Test plugin IPC support, as a server."
-msgstr ""
-
-#. *  description
-#: ../plugins/ipc-test-server.c:79
-msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr ""
-
-#: ../plugins/log_reader.c:1405
-msgid "User is offline."
-msgstr "Kasutaja pole ühendatud."
-
-#: ../plugins/log_reader.c:1411
-msgid "Auto-response sent:"
-msgstr "Saadetud automaatvastus:"
-
-#: ../plugins/log_reader.c:1421 ../plugins/log_reader.c:1424
-#: ../plugins/statenotify.c:80
-#, c-format
-msgid "%s has signed off."
-msgstr "%s logis välja."
-
-#: ../plugins/log_reader.c:1438
-msgid "One or more messages may have been undeliverable."
-msgstr ""
-
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: ../plugins/log_reader.c:1448 ../src/protocols/napster/napster.c:363
-msgid "You were disconnected from the server."
-msgstr "Sa oled serverist lahti ühendatud."
-
-#: ../plugins/log_reader.c:1456
-msgid ""
-"You are currently disconnected. Messages will not be received unless you are "
-"logged in."
-msgstr ""
-
-#: ../plugins/log_reader.c:1471
-msgid "Message could not be sent because the maximum length was exceeded."
-msgstr ""
-"Sõnumit pole võimalik saata kuna see on suurimast lubatud pikkusest pikem"
-
-#: ../plugins/log_reader.c:1476
-msgid "Message could not be sent."
-msgstr "Sõnumit pole võimalik saata."
-
-#: ../plugins/log_reader.c:1835 ../plugins/log_reader.c:1928
-msgid "Adium"
-msgstr "Adium"
-
-#: ../plugins/log_reader.c:1844 ../plugins/log_reader.c:1932
-msgid "Fire"
-msgstr "Tuli"
-
-#: ../plugins/log_reader.c:1853 ../plugins/log_reader.c:1936
-msgid "Messenger Plus!"
-msgstr "Messenger Plus!"
-
-#: ../plugins/log_reader.c:1862 ../plugins/log_reader.c:1940
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
-
-#: ../plugins/log_reader.c:1871 ../plugins/log_reader.c:1944
-msgid "Trillian"
-msgstr "Trillian"
-
-#. Add general preferences.
-#: ../plugins/log_reader.c:1910
-msgid "General Log Reading Configuration"
-msgstr "Üldise logilugemise sätted"
-
-#: ../plugins/log_reader.c:1914
-msgid "Fast size calculations"
-msgstr ""
-
-#: ../plugins/log_reader.c:1918
-msgid "Use name heuristics"
-msgstr ""
-
-#. Add Log Directory preferences.
-#: ../plugins/log_reader.c:1924
-msgid "Log Directory"
-msgstr "Logikataloog"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/log_reader.c:1967
-msgid "Log Reader"
-msgstr "Logilugeja"
-
-#. *< name
-#. *< version
-#. * summary
-#: ../plugins/log_reader.c:1971
-msgid "Includes other IM clients' logs in the log viewer."
-msgstr ""
-
-#. * description
-#: ../plugins/log_reader.c:1975
-msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
-"Trillian."
-msgstr ""
-
-#: ../plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr "E-post kontrollija"
-
-#: ../plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr "Uute kohalike e-kirjade kontrollimine."
-
-#: ../plugins/mailchk.c:163
-msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr ""
-
-#: ../plugins/mono/loader/mono.c:213
-msgid "Mono Plugin Loader"
-msgstr "Mono pluginate laadija"
-
-#: ../plugins/mono/loader/mono.c:215 ../plugins/mono/loader/mono.c:216
-msgid "Loads .NET plugins with Mono."
-msgstr ".NET pluginate laadimine Mono abil."
-
-#: ../plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr ""
-
-#: ../plugins/musicmessaging/musicmessaging.c:45
-msgid "Music messaging session confirmed."
-msgstr ""
-
-#: ../plugins/musicmessaging/musicmessaging.c:414
-msgid "Music Messaging"
-msgstr ""
-
-#: ../plugins/musicmessaging/musicmessaging.c:415
-msgid "There was a conflict in running the command:"
-msgstr "Käsu käivitamisel tekkis vastuolu:"
-
-#: ../plugins/musicmessaging/musicmessaging.c:523
-msgid "Error Running Editor"
-msgstr "Viga redaktori käivitamisel"
-
-#: ../plugins/musicmessaging/musicmessaging.c:524
-msgid "The following error has occured:"
-msgstr ""
-
-#. Configuration frame
-#: ../plugins/musicmessaging/musicmessaging.c:623
-msgid "Music Messaging Configuration"
-msgstr ""
-
-#: ../plugins/musicmessaging/musicmessaging.c:627
-msgid "Score Editor Path"
-msgstr ""
-
-#: ../plugins/musicmessaging/musicmessaging.c:628
-msgid "_Apply"
-msgstr "_Rakenda"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../plugins/musicmessaging/musicmessaging.c:663
-msgid "Music Messaging Plugin for collaborative composition."
-msgstr ""
-
-#. *  summary
-#: ../plugins/musicmessaging/musicmessaging.c:665
-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" ----------
-#: ../plugins/notify.c:638
-msgid "Notify For"
-msgstr "Teavitused kehtivad"
-
-#: ../plugins/notify.c:642
-msgid "_IM windows"
-msgstr "_Välksõnumiakendele"
-
-#: ../plugins/notify.c:649
-msgid "C_hat windows"
-msgstr "_Jututoaakendele"
-
-#: ../plugins/notify.c:657
-msgid "\t_Only when someone says your screen name"
-msgstr "\t_Ainult juhul kui keegi ütleb Sinu ekraaninime"
-
-#: ../plugins/notify.c:667
-msgid "_Focused windows"
-msgstr "_Fookuses olevatele akendele"
-
-#. ---------- "Notification Methods" ----------
-#: ../plugins/notify.c:675
-msgid "Notification Methods"
-msgstr "Teavitamisviisid"
-
-#: ../plugins/notify.c:682
-msgid "Prepend _string into window title:"
-msgstr "Aknatiitli ette _lisatakse string:"
-
-#. Count method button
-#: ../plugins/notify.c:701
-msgid "Insert c_ount of new messages into window title"
-msgstr "Aknatiitlisse lisatakse uute sõnumite _arv"
-
-#. Urgent method button
-#: ../plugins/notify.c:710
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "Aknahalduri \"_URGENT\" vihje"
-
-#. Raise window method button
-#: ../plugins/notify.c:719
-msgid "R_aise conversation window"
-msgstr ""
-
-#. ---------- "Notification Removals" ----------
-#: ../plugins/notify.c:727
-msgid "Notification Removal"
-msgstr "Teavituste eemaldamine"
-
-#. Remove on focus button
-#: ../plugins/notify.c:732
-msgid "Remove when conversation window _gains focus"
-msgstr "Eemaldamine, kui vestlusaken sa_tub fookusesse"
-
-#. Remove on click button
-#: ../plugins/notify.c:739
-msgid "Remove when conversation window _receives click"
-msgstr "Eemaldamine, kui vestlusaknale _klikitakse"
-
-#. Remove on type button
-#: ../plugins/notify.c:747
-msgid "Remove when _typing in conversation window"
-msgstr "Eemaldamine, kui vestlusaknas _tipitakse"
-
-#. Remove on message send button
-#: ../plugins/notify.c:755
-msgid "Remove when a _message gets sent"
-msgstr "Eemaldamine, kui sõ_num saab saadetud"
-
-#. Remove on conversation switch button
-#: ../plugins/notify.c:764
-msgid "Remove on switch to conversation ta_b"
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/notify.c:853
-msgid "Message Notification"
-msgstr "Sõnumitest teavitaja"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/notify.c:856 ../plugins/notify.c:858
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "Mitut sorti võimalusi lugemata sõnumitest teavitamiseks"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/perl/perl.c:583
-msgid "Perl Plugin Loader"
-msgstr "Perl'i pluginate laadija"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../plugins/perl/perl.c:585 ../plugins/perl/perl.c:586
-msgid "Provides support for loading perl plugins."
-msgstr "Perl'is kirjutatud pluginate tugi"
-
-#: ../plugins/psychic.c:22
-msgid "Psychic Mode"
-msgstr ""
-
-#: ../plugins/psychic.c:23
-msgid "Psychic mode for incoming conversation"
-msgstr ""
-
-#: ../plugins/psychic.c:24
-msgid ""
-"Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr ""
-
-#: ../plugins/psychic.c:60
-msgid "You feel a disturbance in the force..."
-msgstr ""
-
-#: ../plugins/psychic.c:79
-msgid "Only enable for users on the buddy list"
-msgstr "Lubada ainult minu sõbralistis olevaid kasutajaid"
-
-#: ../plugins/psychic.c:84
-msgid "Disable when away"
-msgstr "Keelata kui olen eemal"
-
-#: ../plugins/psychic.c:88
-msgid "Display notification message in conversations"
-msgstr "Teavitussõnumite kuvamine vestlustes"
-
-#: ../plugins/raw.c:175
-msgid "Raw"
-msgstr ""
-
-#: ../plugins/raw.c:177
-msgid "Lets you send raw input to text-based protocols."
-msgstr ""
-
-#: ../plugins/raw.c:178
-msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-
-#: ../plugins/relnot.c:63
-#, c-format
-msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr "Sa kasutad Gaim'i versiooni %s.  Hetkel on uusim versioon %s.<hr>"
-
-#: ../plugins/relnot.c:69
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>Muudatuste logi:</b>\n"
-"%s<br><br>"
-
-#: ../plugins/relnot.c:74
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-msgstr ""
-"Sa saad uue %s versiooni aadressilt:<br><a href=\"http://gaim.sourceforge."
-"net/\">http://gaim.sourceforge.net</a>."
-
-#: ../plugins/relnot.c:78 ../plugins/relnot.c:79
-msgid "New Version Available"
-msgstr "Uus versioon on saadaval"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/relnot.c:137
-msgid "Release Notification"
-msgstr "Väljalasetest teavitaja"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/relnot.c:140
-msgid "Checks periodically for new releases."
-msgstr "Kontrollib korrapäraselt uusi väljalaskeid."
-
-#. *  description
-#: ../plugins/relnot.c:142
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/signals-test.c:684
-msgid "Signals Test"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/signals-test.c:687 ../plugins/signals-test.c:689
-msgid "Test to see that all signals are working properly."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/simple.c:34
-msgid "Simple Plugin"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/simple.c:37 ../plugins/simple.c:39
-msgid "Tests to see that most things are working."
-msgstr ""
-
-#: ../plugins/spellchk.c:1918
-msgid "Duplicate Correction"
-msgstr ""
-
-#: ../plugins/spellchk.c:1919
-msgid "The specified word already exists in the correction list."
-msgstr ""
-
-#: ../plugins/spellchk.c:2128
-msgid "Text Replacements"
-msgstr "Tekstiasendused"
-
-#: ../plugins/spellchk.c:2151
-msgid "You type"
-msgstr "Sina tipid"
-
-#: ../plugins/spellchk.c:2165
-msgid "You send"
-msgstr "Tekst saaadetakse kui"
-
-#: ../plugins/spellchk.c:2179
-msgid "Whole words only"
-msgstr ""
-
-#: ../plugins/spellchk.c:2191
-msgid "Case sensitive"
-msgstr ""
-
-#: ../plugins/spellchk.c:2217
-msgid "Add a new text replacement"
-msgstr "Uue asenduse lisamine"
-
-#: ../plugins/spellchk.c:2233
-msgid "You _type:"
-msgstr "Sina _tipid:"
-
-#: ../plugins/spellchk.c:2250
-msgid "You _send:"
-msgstr "Tekst saadetakse _kui:"
-
-#. Created here so it can be passed to whole_words_button_toggled.
-#: ../plugins/spellchk.c:2262
-msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr ""
-
-#: ../plugins/spellchk.c:2264
-msgid "Only replace _whole words"
-msgstr ""
-
-#: ../plugins/spellchk.c:2289
-msgid "General Text Replacement Options"
-msgstr "Üldised tekstiasenduse valikud"
-
-#: ../plugins/spellchk.c:2290
-msgid "Enable replacement of last word on send"
-msgstr ""
-
-#: ../plugins/spellchk.c:2315
-msgid "Text replacement"
-msgstr "Tekstiasendaja"
-
-#: ../plugins/spellchk.c:2317 ../plugins/spellchk.c:2318
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr ""
-"Asendab väljaminevates sõnumites teksti vastavalt kasutaja poolt määratud "
-"reeglitele"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl-gnutls.c:251
-msgid "GNUTLS"
-msgstr "GNUTLS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ssl/ssl-gnutls.c:254 ../plugins/ssl/ssl-gnutls.c:256
-msgid "Provides SSL support through GNUTLS."
-msgstr "SSL toe tagamine GNUTLS-i abil."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl-nss.c:412
-msgid "NSS"
-msgstr "NSS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ssl/ssl-nss.c:415 ../plugins/ssl/ssl-nss.c:417
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "SSL toe tagamine Mozilla NSS_i abil."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl.c:94
-msgid "SSL"
-msgstr "SSL"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ssl/ssl.c:97 ../plugins/ssl/ssl.c:99
-msgid "Provides a wrapper around SSL support libraries."
-msgstr ""
-
-#: ../plugins/statenotify.c:50
-#, c-format
-msgid "%s is no longer away."
-msgstr "%s pole enam eemal."
-
-#: ../plugins/statenotify.c:52
-#, c-format
-msgid "%s has gone away."
-msgstr "%s läks eemale."
-
-#: ../plugins/statenotify.c:62
-#, c-format
-msgid "%s has become idle."
-msgstr "%s on jõude."
-
-#: ../plugins/statenotify.c:64
-#, c-format
-msgid "%s is no longer idle."
-msgstr "%s pole enam jõude."
-
-#: ../plugins/statenotify.c:73
-#, c-format
-msgid "%s has signed on."
-msgstr "%s logis sisse."
-
-#: ../plugins/statenotify.c:91
-msgid "Notify When"
-msgstr "Millal teavitatakse"
-
-#: ../plugins/statenotify.c:94
-msgid "Buddy Goes _Away"
-msgstr "Kui sõber läheb _eemale"
-
-#: ../plugins/statenotify.c:97
-msgid "Buddy Goes _Idle"
-msgstr "Kui sõber on _tegevuseta"
-
-#: ../plugins/statenotify.c:100
-msgid "Buddy _Signs On/Off"
-msgstr "Sõber logib s_isse või välja"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/statenotify.c:142
-msgid "Buddy State Notification"
-msgstr "Sõprade oleku teavitaja"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/statenotify.c:145 ../plugins/statenotify.c:148
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
-msgstr ""
-"Vestlusakendes teavitatakse sind sõprade eemaldumisest või tegevuseta "
-"olekust."
-
-#: ../plugins/tcl/tcl.c:369
-msgid "Tcl Plugin Loader"
-msgstr ""
-
-#: ../plugins/tcl/tcl.c:371 ../plugins/tcl/tcl.c:372
-msgid "Provides support for loading Tcl plugins"
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ticker/ticker.c:77 ../plugins/ticker/ticker.c:355
-msgid "Buddy Ticker"
-msgstr "Sõbratiksuja"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ticker/ticker.c:358 ../plugins/ticker/ticker.c:360
-msgid "A horizontal scrolling version of the buddy list."
-msgstr "Horisontalselt keriv versioon sõbranimekirjast."
-
-#: ../plugins/timestamp.c:186
-msgid "iChat Timestamp"
-msgstr "iChat ajatempel"
-
-#: ../plugins/timestamp.c:193
-msgid "Delay"
-msgstr "Viivitus"
-
-#: ../plugins/timestamp.c:200
-msgid "minutes."
-msgstr "minutit."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/timestamp.c:254
-msgid "Timestamp"
-msgstr "Ajatempel"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/timestamp.c:257 ../plugins/timestamp.c:259
-msgid "Adds iChat-style timestamps to conversations every N minutes."
-msgstr "iChat-stiilis ajatemplite lisamine vestlusele iga N minuti järel."
-
-#: ../plugins/timestamp_format.c:22
-msgid "Timestamp Format Options"
-msgstr ""
-
-#: ../plugins/timestamp_format.c:27
-msgid "_Force (traditional Gaim) 24-hour time format"
-msgstr ""
-
-#: ../plugins/timestamp_format.c:30
-msgid "Show dates in..."
-msgstr ""
-
-#: ../plugins/timestamp_format.c:35
-msgid "Co_nversations:"
-msgstr "_Vestlused:"
-
-#: ../plugins/timestamp_format.c:37 ../plugins/timestamp_format.c:46
-msgid "For delayed messages"
-msgstr ""
-
-#: ../plugins/timestamp_format.c:38 ../plugins/timestamp_format.c:47
-msgid "For delayed messages and in chats"
-msgstr ""
-
-#: ../plugins/timestamp_format.c:44
-msgid "_Message Logs:"
-msgstr "Sõnu_milogid:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/timestamp_format.c:150
-msgid "Message Timestamp Formats"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/timestamp_format.c:153
-msgid "Customizes the message timestamp formats."
-msgstr ""
-
-#. *  description
-#: ../plugins/timestamp_format.c:155
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr ""
-
-#: ../plugins/win32/transparency/win2ktrans.c:183
-#: ../plugins/win32/transparency/win2ktrans.c:569
-#: ../plugins/win32/transparency/win2ktrans.c:616
-msgid "Opacity:"
-msgstr "Läbipaistmatus:"
-
-#. IM Convo trans options
-#: ../plugins/win32/transparency/win2ktrans.c:533
-msgid "IM Conversation Windows"
-msgstr "Välksõnumite aknad"
-
-#: ../plugins/win32/transparency/win2ktrans.c:534
-msgid "_IM window transparency"
-msgstr "_Välksõnumiaknad on läbipaistvad"
-
-#: ../plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
-msgstr "_Liuguri näitamine välksõnumiakendes"
-
-#: ../plugins/win32/transparency/win2ktrans.c:555
-msgid "Remove IM window transparency on focus"
-msgstr "Välksõnumi akna läbipaistvuse eemaldamine selle fokuseerimisel"
-
-#: ../plugins/win32/transparency/win2ktrans.c:558
-#: ../plugins/win32/transparency/win2ktrans.c:606
-msgid "Always on top"
-msgstr "Alati pealmine"
-
-#. Buddy List trans options
-#: ../plugins/win32/transparency/win2ktrans.c:590
-msgid "Buddy List Window"
-msgstr "Sõbranimekirja aken"
-
-#: ../plugins/win32/transparency/win2ktrans.c:591
-msgid "_Buddy List window transparency"
-msgstr "Sõbraaken on _läbipaistev"
-
-#: ../plugins/win32/transparency/win2ktrans.c:604
-msgid "Remove Buddy List window transparency on focus"
-msgstr "Sõbranimekirja akna läbipaistvuse eemaldamine selle fokuseerimisel"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/win32/transparency/win2ktrans.c:658
-msgid "Transparency"
-msgstr "Läbipaistvus"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/win32/transparency/win2ktrans.c:661
-msgid "Variable Transparency for the buddy list and conversations."
-msgstr ""
-
-#. *  description
-#: ../plugins/win32/transparency/win2ktrans.c:663
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
-"\n"
-"* Note: This plugin requires Win2000 or greater."
-msgstr ""
-
-#: ../plugins/win32/winprefs/winprefs.c:397
-msgid "GTK+ Runtime Version"
-msgstr "GTK+ Runtime versioon"
-
-#. Autostart
-#: ../plugins/win32/winprefs/winprefs.c:405
-msgid "Startup"
-msgstr "Käivitamine"
-
-#: ../plugins/win32/winprefs/winprefs.c:406
-msgid "_Start Gaim on Windows startup"
-msgstr "_Gaim'i käivitamine Windows'i käivitamisel"
-
-#. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3657
-msgid "Buddy List"
-msgstr "Sõbranimekiri"
-
-#: ../plugins/win32/winprefs/winprefs.c:418
-msgid "_Dockable Buddy List"
-msgstr "_Dokitav sõbranimekiri"
-
-#. Blist On Top
-#: ../plugins/win32/winprefs/winprefs.c:422
-msgid "_Keep Buddy List window on top:"
-msgstr "Sõbranimekirja _hoitakse pealmisena:"
-
-#. XXX: Did this ever work?
-#: ../plugins/win32/winprefs/winprefs.c:427
-msgid "Only when docked"
-msgstr "Ainult dokitud olekus"
-
-#. Conversations
-#: ../plugins/win32/winprefs/winprefs.c:431 ../src/gtkprefs.c:819
-#: ../src/gtkprefs.c:1864
-msgid "Conversations"
-msgstr "Vestlused"
-
-#: ../plugins/win32/winprefs/winprefs.c:432
-msgid "_Flash window when messages are received"
-msgstr "_Akna vilgutamine sõnumite vastuvõtmisel"
-
-#: ../plugins/win32/winprefs/winprefs.c:456
-msgid "WinGaim Options"
-msgstr "WinGaim'i valikud"
-
-#: ../plugins/win32/winprefs/winprefs.c:458
-msgid "Options specific to Windows Gaim."
-msgstr "Windows'i Gaim'ile omased valikud."
-
-#: ../plugins/win32/winprefs/winprefs.c:459
-msgid ""
-"Provides options specific to Windows Gaim, such as buddy list docking and "
-"conversation flashing."
-msgstr ""
-
-#: ../src/account.c:773
-msgid "accounts"
-msgstr "kontod"
-
-#: ../src/account.c:923
-msgid "Password is required to sign on."
-msgstr "Sisselogimiseks on vaja parooli"
-
-#: ../src/account.c:948
-#, c-format
-msgid "Enter password for %s (%s)"
-msgstr "Sisesta parool %s jaoks (%s)"
-
-#: ../src/account.c:955
-msgid "Enter Password"
-msgstr "Sisesta parool"
-
-#: ../src/account.c:960
-msgid "Save password"
-msgstr "Salvesta parool"
-
-#. *
-#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
-#.
-#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3541
-#: ../src/gtkdialogs.c:592 ../src/gtkdialogs.c:729 ../src/gtkdialogs.c:793
-#: ../src/gtkrequest.c:269 ../src/protocols/gg/gg.c:497
-#: ../src/protocols/gg/gg.c:638 ../src/protocols/gg/gg.c:774
-#: ../src/protocols/jabber/jabber.c:1319 ../src/protocols/jabber/xdata.c:337
-#: ../src/protocols/msn/msn.c:250 ../src/protocols/msn/msn.c:265
-#: ../src/protocols/msn/msn.c:280 ../src/protocols/msn/msn.c:295
-#: ../src/protocols/oscar/oscar.c:1415 ../src/protocols/oscar/oscar.c:2159
-#: ../src/protocols/oscar/oscar.c:2252 ../src/protocols/oscar/oscar.c:5663
-#: ../src/protocols/oscar/oscar.c:5837 ../src/protocols/oscar/oscar.c:5862
-#: ../src/protocols/oscar/oscar.c:5918 ../src/protocols/silc/buddy.c:466
-#: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:423
-#: ../src/protocols/silc/chat.c:461 ../src/protocols/silc/chat.c:724
-#: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
-#: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3063
-#: ../src/protocols/yahoo/yahoo.c:3072 ../src/request.h:1344
-msgid "OK"
-msgstr "Olgu"
-
-#: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
-#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:5009
-#: ../src/gtkdialogs.c:593 ../src/gtkdialogs.c:730 ../src/gtkdialogs.c:794
-#: ../src/gtkdialogs.c:813 ../src/gtkdialogs.c:835 ../src/gtkdialogs.c:855
-#: ../src/gtkdialogs.c:899 ../src/gtkdialogs.c:954 ../src/gtkdialogs.c:991
-#: ../src/gtkdialogs.c:1016 ../src/gtkimhtmltoolbar.c:419
-#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1095 ../src/gtkprivacy.c:568
-#: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
-#: ../src/gtkrequest.c:270 ../src/gtksavedstatuses.c:296
-#: ../src/protocols/gg/gg.c:498 ../src/protocols/gg/gg.c:639
-#: ../src/protocols/gg/gg.c:775 ../src/protocols/gg/gg.c:854
-#: ../src/protocols/jabber/buddy.c:573 ../src/protocols/jabber/buddy.c:1423
-#: ../src/protocols/jabber/buddy.c:1457 ../src/protocols/jabber/chat.c:780
-#: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1320
-#: ../src/protocols/jabber/xdata.c:338 ../src/protocols/msn/msn.c:251
-#: ../src/protocols/msn/msn.c:266 ../src/protocols/msn/msn.c:281
-#: ../src/protocols/msn/msn.c:296 ../src/protocols/msn/msn.c:313
-#: ../src/protocols/oscar/oscar.c:1416 ../src/protocols/oscar/oscar.c:2160
-#: ../src/protocols/oscar/oscar.c:2201 ../src/protocols/oscar/oscar.c:2253
-#: ../src/protocols/oscar/oscar.c:5664 ../src/protocols/oscar/oscar.c:5716
-#: ../src/protocols/oscar/oscar.c:5838 ../src/protocols/oscar/oscar.c:5863
-#: ../src/protocols/oscar/oscar.c:5919 ../src/protocols/oscar/oscar.c:5988
-#: ../src/protocols/sametime/sametime.c:3375
-#: ../src/protocols/sametime/sametime.c:3460
-#: ../src/protocols/sametime/sametime.c:3630
-#: ../src/protocols/sametime/sametime.c:5319
-#: ../src/protocols/sametime/sametime.c:5408
-#: ../src/protocols/sametime/sametime.c:5532 ../src/protocols/silc/buddy.c:467
-#: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
-#: ../src/protocols/silc/chat.c:596 ../src/protocols/silc/chat.c:725
-#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:754
-#: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3064
-#: ../src/protocols/yahoo/yahoo.c:3073 ../src/request.h:1344
-#: ../src/request.h:1354
-msgid "Cancel"
-msgstr "Loobu"
-
-#: ../src/account.c:994 ../src/connection.c:96
-#, c-format
-msgid "Missing protocol plugin for %s"
-msgstr ""
-
-#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3533
-#: ../src/gtkblist.c:3539
-msgid "Connection Error"
-msgstr ""
-
-#: ../src/account.c:1076 ../src/protocols/gg/gg.c:679
-#: ../src/protocols/jabber/jabber.c:1272
-msgid "New passwords do not match."
-msgstr "Uued paroolid ei klapi omavahel."
-
-#: ../src/account.c:1085
-msgid "Fill out all fields completely."
-msgstr ""
-
-#: ../src/account.c:1108
-msgid "Original password"
-msgstr "Algne parool"
-
-#: ../src/account.c:1115
-msgid "New password"
-msgstr "Uus parool"
-
-#: ../src/account.c:1122
-msgid "New password (again)"
-msgstr "Uus parool (veel kord)"
-
-#: ../src/account.c:1128
-#, c-format
-msgid "Change password for %s"
-msgstr ""
-
-#: ../src/account.c:1136
-msgid "Please enter your current password and your new password."
-msgstr "Palun sisesta oma praegune parool ja uus parool."
-
-#: ../src/account.c:1169
-#, c-format
-msgid "Change user information for %s"
-msgstr ""
-
-#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:276
-#: ../src/protocols/jabber/buddy.c:572
-msgid "Save"
-msgstr "Salvestamine"
-
-#: ../src/account.c:1679 ../src/gtkft.c:157
-#: ../src/protocols/jabber/buddy.c:630 ../src/protocols/jabber/buddy.c:1095
-#: ../src/protocols/jabber/buddy.c:1112 ../src/protocols/novell/novell.c:2860
-msgid "Unknown"
-msgstr "Tundmatu"
-
-#: ../src/blist.c:543
-msgid "buddy list"
-msgstr "sõbranimekiri"
-
-#: ../src/blist.c:1179
-msgid "Chats"
-msgstr "Jututoad"
-
-#: ../src/blist.c:1901
-#, c-format
-msgid ""
-"%d buddy from group %s was not removed because it belongs to an account "
-"which is disabled or offline.  This buddy and the group were not removed.\n"
-msgid_plural ""
-"%d buddies from group %s were not removed because they belong to accounts "
-"which are currently disabled or offline.  These buddies and the group were "
-"not removed.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/blist.c:1911
-msgid "Group not removed"
-msgstr ""
-
-#: ../src/connection.c:98
-msgid "Registration Error"
-msgstr ""
-
-#: ../src/connection.c:280
-#, c-format
-msgid "+++ %s signed on"
-msgstr "+++ %s logis sisse"
-
-#: ../src/connection.c:313
-#, c-format
-msgid "+++ %s signed off"
-msgstr "+++ %s logis välja"
-
-#: ../src/conversation.c:163
-msgid "Unable to send message: The message is too large."
-msgstr "Sõnumit pole võimalik saata: Sõnum on liiga suur."
-
-#: ../src/conversation.c:166 ../src/conversation.c:179
-#, fuzzy, c-format
-msgid "Unable to send message to %s."
-msgstr "Kasutajale %s pole võimalik sõnumit saata."
-
-#: ../src/conversation.c:167
-msgid "The message is too large."
-msgstr "Sõnum on liiga suur."
-
-#: ../src/conversation.c:176
-msgid "Unable to send message."
-msgstr "Sõnumit pole võimalik saata."
-
-#: ../src/conversation.c:1517
-#, c-format
-msgid "%s entered the room."
-msgstr "%s sisenes tuppa."
-
-#: ../src/conversation.c:1520
-#, c-format
-msgid "%s [<I>%s</I>] entered the room."
-msgstr "%s [<I>%s</I>] sisenes tuppa."
-
-#: ../src/conversation.c:1627
-#, c-format
-msgid "You are now known as %s"
-msgstr "Sa oled nüüd nimega %s"
-
-#: ../src/conversation.c:1647
-#, c-format
-msgid "%s is now known as %s"
-msgstr "%s on nüüd nimega %s"
-
-#: ../src/conversation.c:1720
-#, c-format
-msgid "%s left the room."
-msgstr "%s väljus toast."
-
-#: ../src/conversation.c:1723
-#, c-format
-msgid "%s left the room (%s)."
-msgstr "%s väljus toast (%s)."
-
-#: ../src/desktopitem.c:286 ../src/desktopitem.c:877
-msgid "No name"
-msgstr ""
-
-#: ../src/ft.c:189 ../src/protocols/msn/msn.c:412
-#, c-format
-msgid ""
-"Error reading %s: \n"
-"%s.\n"
-msgstr ""
-
-#: ../src/ft.c:193
-#, c-format
-msgid ""
-"Error writing %s: \n"
-"%s.\n"
-msgstr ""
-
-#: ../src/ft.c:197
-#, c-format
-msgid ""
-"Error accessing %s: \n"
-"%s.\n"
-msgstr ""
-
-#: ../src/ft.c:230
-msgid "Cannot send a file of 0 bytes."
-msgstr "Nullsuurusega faili pole võimalik saata."
-
-#: ../src/ft.c:240
-msgid "Cannot send a directory."
-msgstr "Kataloogi pole võimalik saata."
-
-#: ../src/ft.c:249
-#, c-format
-msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr ""
-
-#: ../src/ft.c:307
-#, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr "%s soovib saata sulle faili %s (%s)"
-
-#: ../src/ft.c:314
-#, c-format
-msgid "%s wants to send you a file"
-msgstr "%s soovib saata sulle faili"
-
-#: ../src/ft.c:355
-#, c-format
-msgid "Accept file transfer request from %s?"
-msgstr "Kas nõustud failiülekandega kasutajalt %s?"
-
-#: ../src/ft.c:359
-#, c-format
-msgid ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-"Fail on allalaadimiseks saadaval:\n"
-"Kaughost: %s\n"
-"Kaugport: %d"
-
-#: ../src/ft.c:391
-#, c-format
-msgid "%s is offering to send file %s"
-msgstr "%s pakub faili %s saatmist"
-
-#: ../src/ft.c:443
-#, c-format
-msgid "%s is not a valid filename.\n"
-msgstr "%s ei ole lubatud failinimi.\n"
-
-#: ../src/ft.c:464
-#, c-format
-msgid "Offering to send %s to %s"
-msgstr "Pakun faili %s saatmist kasutajale %s"
-
-#: ../src/ft.c:476
-#, fuzzy, c-format
-msgid "Starting transfer of %s from %s"
-msgstr "%s ülekandmise alustamine allikast %s"
-
-#: ../src/ft.c:630
-#, c-format
-msgid "Transfer of file %s complete"
-msgstr "Fail %s täielikult üle kantud"
-
-#: ../src/ft.c:633
-msgid "File transfer complete"
-msgstr "Fail on täielikult üle kantud"
-
-#: ../src/ft.c:1024
-#, c-format
-msgid "You canceled the transfer of %s"
-msgstr "Sa katkestasid faili %s ülekande"
-
-#: ../src/ft.c:1029
-msgid "File transfer cancelled"
-msgstr "Faili ülekandmine katkestatud"
-
-#: ../src/ft.c:1086
-#, c-format
-msgid "%s canceled the transfer of %s"
-msgstr "%s katkestas faili %s ülekande"
-
-#: ../src/ft.c:1091
-#, c-format
-msgid "%s canceled the file transfer"
-msgstr "%s katkestas failiülekande"
-
-#: ../src/ft.c:1148
-#, fuzzy, c-format
-msgid "File transfer to %s failed."
-msgstr "Tõrge faili ülekandmisel kasutajale %s."
-
-#: ../src/ft.c:1150
-#, fuzzy, c-format
-msgid "File transfer from %s failed."
-msgstr "Tõrge faili ülekandmisel kasutajalt %s."
-
-#: ../src/gtkaccount.c:374
-#, c-format
-msgid ""
-"<b>File:</b> %s\n"
-"<b>File size:</b> %s\n"
-"<b>Image size:</b> %dx%d"
-msgstr ""
-"<b>Fail:</b> %s\n"
-"<b>Faili suurus:</b> %s\n"
-"<b>Pildi suurus:</b> %dx%d"
+#: ../console/plugins/lastlog.c:69
+msgid "Lastlog"
+msgstr ""
+
+#: ../console/plugins/lastlog.c:99
+msgid "lastlog: Searches for a substring in the backlog."
+msgstr ""
+
+#: ../console/plugins/lastlog.c:121
+msgid "GntLastlog"
+msgstr ""
+
+#: ../console/plugins/lastlog.c:123 ../console/plugins/lastlog.c:124
+msgid "Lastlog plugin for gaim-text."
+msgstr ""
+
+#: ../gtk/eggtrayicon.c:129
+msgid "Orientation"
+msgstr "Suund"
+
+#: ../gtk/eggtrayicon.c:130
+msgid "The orientation of the tray."
+msgstr "Salve suund"
+
+#: ../gtk/gaimstock.c:137
+msgid "_Alias"
+msgstr "_Alias"
+
+#. join button
+#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1120 ../gtk/gtkroomlist.c:285
+#: ../gtk/gtkroomlist.c:442
+msgid "_Join"
+msgstr "Ü_hine"
+
+#: ../gtk/gaimstock.c:139
+msgid "Close _tabs"
+msgstr "_Sulge sakid"
+
+#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1004
+msgid "I_M"
+msgstr "Vä_lksõnum"
+
+#: ../gtk/gaimstock.c:141
+#, fuzzy
+msgid "_Get Info"
+msgstr "Hangi _teavet"
+
+#: ../gtk/gaimstock.c:142
+msgid "_Invite"
+msgstr "_Kutsu"
+
+#: ../gtk/gaimstock.c:143
+msgid "_Modify"
+msgstr "_Muuda"
+
+#: ../gtk/gaimstock.c:144
+msgid "_Open Mail"
+msgstr "_Ava sõnum"
+
+#. Pause button
+#: ../gtk/gaimstock.c:145 ../gtk/gtkft.c:835
+msgid "_Pause"
+msgstr "P_aus"
 
 #. Build the login options frame.
-#: ../src/gtkaccount.c:762
+#: ../gtk/gtkaccount.c:382
 msgid "Login Options"
 msgstr "Sisselogimise valikud"
 
-#: ../src/gtkaccount.c:779 ../src/gtkft.c:640
-msgid "Protocol:"
-msgstr "Protokoll:"
-
-#: ../src/gtkaccount.c:858
-msgid "Password:"
-msgstr "Parool:"
-
-#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4587 ../src/gtkblist.c:4953
-msgid "Alias:"
-msgstr "Alias:"
-
-#: ../src/gtkaccount.c:867
-msgid "Remember password"
-msgstr "Parooli peetakse meeles"
+#: ../gtk/gtkaccount.c:483
+msgid "Local alias:"
+msgstr "Kohalik alias:"
 
 #. Build the user options frame.
-#: ../src/gtkaccount.c:919
+#: ../gtk/gtkaccount.c:545
 msgid "User Options"
 msgstr "Kasutaja valikud"
 
-#: ../src/gtkaccount.c:932
-msgid "New mail notifications"
-msgstr "Uutest sõnumitest antakse teada"
-
-#: ../src/gtkaccount.c:941
-msgid "Buddy icon:"
-msgstr "Sõbraikoon:"
+#. Buddy icon
+#: ../gtk/gtkaccount.c:563
+msgid "Use this buddy icon for this account:"
+msgstr ""
 
 #. Build the protocol options frame.
-#: ../src/gtkaccount.c:1032
+#: ../gtk/gtkaccount.c:671
 #, c-format
 msgid "%s Options"
 msgstr "%s valikud"
 
-#: ../src/gtkaccount.c:1233
+#: ../gtk/gtkaccount.c:867
 msgid "Use Global Proxy Settings"
 msgstr "Kasutatakse üldisi proksi sätteid"
 
-#: ../src/gtkaccount.c:1239
+#: ../gtk/gtkaccount.c:873
 msgid "No Proxy"
 msgstr "Proksi puudub"
 
-#: ../src/gtkaccount.c:1245
+#: ../gtk/gtkaccount.c:879
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../src/gtkaccount.c:1251
+#: ../gtk/gtkaccount.c:885
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../src/gtkaccount.c:1257
+#: ../gtk/gtkaccount.c:891
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../src/gtkaccount.c:1263 ../src/gtkprefs.c:1043
+#: ../gtk/gtkaccount.c:897 ../gtk/gtkprefs.c:1061
 msgid "Use Environmental Settings"
 msgstr "Kasutatakse keskkonnast tulenevaid sätteid"
 
-#: ../src/gtkaccount.c:1297
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+#: ../gtk/gtkaccount.c:936
+msgid "If you look real closely"
+msgstr ""
+
+#. This is an easter egg. See the comment on the previous line in the source.
+#: ../gtk/gtkaccount.c:939
 msgid "you can see the butterflies mating"
 msgstr ""
 
-#: ../src/gtkaccount.c:1301
-msgid "If you look real closely"
-msgstr ""
-
-#: ../src/gtkaccount.c:1317
+#: ../gtk/gtkaccount.c:960
 msgid "Proxy Options"
 msgstr "Proksi valikud"
 
-#: ../src/gtkaccount.c:1331 ../src/gtkprefs.c:1037
+#: ../gtk/gtkaccount.c:974 ../gtk/gtkprefs.c:1055
 msgid "Proxy _type:"
 msgstr "_Proksi liik:"
 
-#: ../src/gtkaccount.c:1340 ../src/gtkprefs.c:1058
+#: ../gtk/gtkaccount.c:983 ../gtk/gtkprefs.c:1076
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../src/gtkaccount.c:1344 ../src/gtkprefs.c:1076
+#: ../gtk/gtkaccount.c:987 ../gtk/gtkprefs.c:1094
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/gtkaccount.c:1352
+#: ../gtk/gtkaccount.c:995
 msgid "_Username:"
 msgstr "_Kasutajanimi:"
 
-#: ../src/gtkaccount.c:1358 ../src/gtkprefs.c:1113
+#: ../gtk/gtkaccount.c:1001 ../gtk/gtkprefs.c:1131
 msgid "Pa_ssword:"
 msgstr "_Parool:"
 
-#: ../src/gtkaccount.c:1736
+#: ../gtk/gtkaccount.c:1398
 msgid "Add Account"
 msgstr "Konto lisamine"
 
-#: ../src/gtkaccount.c:1738 ../src/gtkblist.c:3542
-msgid "Modify Account"
-msgstr "Konto muutmine"
-
-#: ../src/gtkaccount.c:1760
+#: ../gtk/gtkaccount.c:1422
 msgid "_Basic"
 msgstr "_Põhiline"
 
-#: ../src/gtkaccount.c:1771
+#: ../gtk/gtkaccount.c:1433
 msgid "_Advanced"
 msgstr "L_aiendatud"
 
 #. Register button
-#: ../src/gtkaccount.c:1786 ../src/protocols/jabber/jabber.c:823
+#: ../gtk/gtkaccount.c:1448 ../libgaim/protocols/jabber/jabber.c:853
 msgid "Register"
 msgstr "Registreeri"
 
-#: ../src/gtkaccount.c:2165 ../src/gtksavedstatuses.c:293
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr "Kas sa soovid kustutada kontot %s?"
-
-#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1094 ../src/gtkrequest.c:273
-#: ../src/gtksavedstatuses.c:295
-msgid "Delete"
-msgstr "Kustuta"
-
-#: ../src/gtkaccount.c:2228 ../src/gtksavedstatuses.c:890
-#: ../src/protocols/oscar/oscar.c:2815
-msgid "Screen Name"
-msgstr "Ekraaninimi"
-
-#: ../src/gtkaccount.c:2259
+#: ../gtk/gtkaccount.c:1919 ../gtk/gtkplugin.c:576
+msgid "Enabled"
+msgstr "Lubatud"
+
+#: ../gtk/gtkaccount.c:1927
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../src/gtkaccount.c:2586
-#, 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"
-
-#: ../src/gtkaccount.c:2635
-msgid "Add buddy to your list?"
-msgstr ""
-
-#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:5008 ../src/gtkconv.c:1625
-#: ../src/gtkrequest.c:274 ../src/protocols/gg/gg.c:853
-#: ../src/protocols/oscar/oscar.c:2445
-#: ../src/protocols/sametime/sametime.c:5407 ../src/protocols/silc/chat.c:595
-msgid "Add"
-msgstr "Lisa"
-
-#: ../src/gtkblist.c:664
+#: ../gtk/gtkblist.c:705
 msgid "Join a Chat"
-msgstr "Jututoaga ühinemine"
-
-#: ../src/gtkblist.c:685
+msgstr "Vestlusega ühinemine"
+
+#: ../gtk/gtkblist.c:726
 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"
 
-#: ../src/gtkblist.c:696 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
+#: ../gtk/gtkblist.c:737 ../gtk/gtkpounce.c:523 ../gtk/gtkroomlist.c:378
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../src/gtkblist.c:940
+#: ../gtk/gtkblist.c:1001
 msgid "Get _Info"
 msgstr "Hangi a_ndmed"
 
-#: ../src/gtkblist.c:943 ../src/gtkstock.c:141
-msgid "I_M"
-msgstr "Vä_lksõnum"
-
-#: ../src/gtkblist.c:949
+#: ../gtk/gtkblist.c:1010
 msgid "_Send File"
 msgstr "_Saada fail"
 
-#: ../src/gtkblist.c:956
+#: ../gtk/gtkblist.c:1017
 msgid "Add Buddy _Pounce"
 msgstr "Lisa sõbra_märguanne"
 
-#: ../src/gtkblist.c:960 ../src/gtkblist.c:964 ../src/gtkblist.c:1063
-#: ../src/gtkblist.c:1086
+#: ../gtk/gtkblist.c:1021 ../gtk/gtkblist.c:1025 ../gtk/gtkblist.c:1124
+#: ../gtk/gtkblist.c:1147
 msgid "View _Log"
 msgstr "Vaata _logi"
 
-#: ../src/gtkblist.c:975
+#: ../gtk/gtkblist.c:1036
 msgid "Alias..."
 msgstr "Alias..."
 
-#: ../src/gtkblist.c:978 ../src/gtkconv.c:1622 ../src/gtkrequest.c:275
-msgid "Remove"
-msgstr "Eemalda"
-
-#: ../src/gtkblist.c:984 ../src/gtkblist.c:1071 ../src/gtkblist.c:1092
+#: ../gtk/gtkblist.c:1045 ../gtk/gtkblist.c:1132 ../gtk/gtkblist.c:1153
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../src/gtkblist.c:986 ../src/gtkblist.c:1073 ../src/gtkblist.c:1094
+#: ../gtk/gtkblist.c:1047 ../gtk/gtkblist.c:1134 ../gtk/gtkblist.c:1155
 msgid "_Remove"
 msgstr "_Eemalda"
 
-#: ../src/gtkblist.c:1034
+#: ../gtk/gtkblist.c:1095
 msgid "Add a _Buddy"
 msgstr "Lisa _sõber"
 
-#: ../src/gtkblist.c:1036
+#: ../gtk/gtkblist.c:1097
 msgid "Add a C_hat"
 msgstr "Lisa _jututuba"
 
-#: ../src/gtkblist.c:1039
+#: ../gtk/gtkblist.c:1100
 msgid "_Delete Group"
 msgstr "_Kustuta grupp"
 
-#: ../src/gtkblist.c:1041
+#: ../gtk/gtkblist.c:1102
 msgid "_Rename"
-msgstr "_Nimeta ümber"
-
-#. join button
-#: ../src/gtkblist.c:1059 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
-#: ../src/gtkstock.c:139
-msgid "_Join"
-msgstr "Ü_hine"
-
-#: ../src/gtkblist.c:1061
+msgstr "Muuda _nime"
+
+#: ../gtk/gtkblist.c:1122
 msgid "Auto-Join"
 msgstr "Automaatühinemine"
 
-#: ../src/gtkblist.c:1099 ../src/gtkblist.c:1122
+#: ../gtk/gtkblist.c:1160 ../gtk/gtkblist.c:1183
 msgid "_Collapse"
 msgstr "Ahen_da"
 
-#: ../src/gtkblist.c:1127
+#: ../gtk/gtkblist.c:1188
 msgid "_Expand"
 msgstr "Laien_da"
 
-#: ../src/gtkblist.c:1373 ../src/gtkblist.c:1385 ../src/gtkblist.c:3802
-#: ../src/gtkblist.c:3812
+#: ../gtk/gtkblist.c:1434 ../gtk/gtkblist.c:1446 ../gtk/gtkblist.c:4095
+#: ../gtk/gtkblist.c:4105
 msgid "/Tools/Mute Sounds"
 msgstr "/Vahendid/Vaigista helid"
 
-#: ../src/gtkblist.c:1845 ../src/gtkconv.c:4209 ../src/gtkpounce.c:426
+#: ../gtk/gtkblist.c:1906 ../gtk/gtkconv.c:4277 ../gtk/gtkpounce.c:422
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 
 #. Buddies menu
-#: ../src/gtkblist.c:2419
+#: ../gtk/gtkblist.c:2480
 msgid "/_Buddies"
 msgstr "/_Sõbrad"
 
-#: ../src/gtkblist.c:2420
+#: ../gtk/gtkblist.c:2481
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Sõbrad/Uus _välksõnum..."
 
-#: ../src/gtkblist.c:2421
+#: ../gtk/gtkblist.c:2482
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Sõbrad/Ühine _jututoaga..."
 
-#: ../src/gtkblist.c:2422
+#: ../gtk/gtkblist.c:2483
 msgid "/Buddies/Get User _Info..."
 msgstr "/Sõbrad/Hangi kasutaja _andmed"
 
-#: ../src/gtkblist.c:2423
+#: ../gtk/gtkblist.c:2484
 msgid "/Buddies/View User _Log..."
 msgstr "/Sõbrad/Vaata kasutaja _logi..."
 
-#: ../src/gtkblist.c:2425
+#: ../gtk/gtkblist.c:2486
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Sõbrad/Näita _ühendamata sõpru"
 
-#: ../src/gtkblist.c:2426
+#: ../gtk/gtkblist.c:2487
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Sõbrad/Näita _tühje gruppe"
 
-#: ../src/gtkblist.c:2427
+#: ../gtk/gtkblist.c:2488
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Sõbrad/Näita sõbra ü_ksikasju"
 
-#: ../src/gtkblist.c:2428
+#: ../gtk/gtkblist.c:2489
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Sõbrad/Näita jõ_udeoleku aegu"
 
-#: ../src/gtkblist.c:2429
+#: ../gtk/gtkblist.c:2490
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Sõbrad/Sõp_rade sortimine"
 
-#: ../src/gtkblist.c:2431
+#: ../gtk/gtkblist.c:2492
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Sõbrad/Lisa _sõber..."
 
-#: ../src/gtkblist.c:2432
+#: ../gtk/gtkblist.c:2493
 msgid "/Buddies/Add C_hat..."
 msgstr "/Sõbrad/Lisa ju_tutuba..."
 
-#: ../src/gtkblist.c:2433
+#: ../gtk/gtkblist.c:2494
 msgid "/Buddies/Add _Group..."
 msgstr "/Sõbrad/Lisa _grupp..."
 
-#: ../src/gtkblist.c:2435
+#: ../gtk/gtkblist.c:2496
 msgid "/Buddies/_Quit"
 msgstr "/Sõbrad/_Lõpeta"
 
 #. Accounts menu
-#: ../src/gtkblist.c:2438
+#: ../gtk/gtkblist.c:2499
 msgid "/_Accounts"
 msgstr "/_Kontod"
 
-#: ../src/gtkblist.c:2439 ../src/gtkblist.c:5587
+#: ../gtk/gtkblist.c:2500 ../gtk/gtkblist.c:5945
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Kontod/Lisa või muuda"
 
 #. Tools
-#: ../src/gtkblist.c:2442
+#: ../gtk/gtkblist.c:2503
 msgid "/_Tools"
 msgstr "/_Vahendid"
 
-#: ../src/gtkblist.c:2443
+#: ../gtk/gtkblist.c:2504
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Vahendid/Sõbra_märguanded"
 
-#: ../src/gtkblist.c:2444
+#: ../gtk/gtkblist.c:2505
 msgid "/Tools/Plu_gins"
 msgstr "/Vahendid/Plu_ginad"
 
-#: ../src/gtkblist.c:2445
+#: ../gtk/gtkblist.c:2506
 msgid "/Tools/Pr_eferences"
 msgstr "/Vahendid/_Eelistused"
 
-#: ../src/gtkblist.c:2446
+#: ../gtk/gtkblist.c:2507
 msgid "/Tools/Pr_ivacy"
 msgstr "/Vahendid/_Privaatsus"
 
-#: ../src/gtkblist.c:2448
+#: ../gtk/gtkblist.c:2509
 msgid "/Tools/_File Transfers"
 msgstr "/Vahendid/_Failiülekanded"
 
-#: ../src/gtkblist.c:2449
+#: ../gtk/gtkblist.c:2510
 msgid "/Tools/R_oom List"
 msgstr "/Vahendid/_Tubade nimekiri"
 
-#: ../src/gtkblist.c:2450
+#: ../gtk/gtkblist.c:2511
 msgid "/Tools/System _Log"
 msgstr "/Vahendid/Süsteemne _logi"
 
-#: ../src/gtkblist.c:2452
+#: ../gtk/gtkblist.c:2513
 msgid "/Tools/Mute _Sounds"
 msgstr "/Vahendid/_Vaigista helid"
 
 #. Help
-#: ../src/gtkblist.c:2455
+#: ../gtk/gtkblist.c:2516
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: ../src/gtkblist.c:2456
+#: ../gtk/gtkblist.c:2517
 msgid "/Help/Online _Help"
 msgstr "/Abi/_Online abi"
 
-#: ../src/gtkblist.c:2457
+#: ../gtk/gtkblist.c:2518
 msgid "/Help/_Debug Window"
 msgstr "/Abi/_Silumisaken"
 
-#: ../src/gtkblist.c:2458
+#: ../gtk/gtkblist.c:2519
 msgid "/Help/_About"
 msgstr "/Abi/Gaim'ist _lähemalt"
 
-#: ../src/gtkblist.c:2490 ../src/gtkblist.c:2559
+#: ../gtk/gtkblist.c:2551 ../gtk/gtkblist.c:2620
 #, c-format
 msgid ""
 "\n"
@@ -2479,7 +1472,7 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: ../src/gtkblist.c:2571
+#: ../gtk/gtkblist.c:2632
 #, c-format
 msgid ""
 "\n"
@@ -2488,7 +1481,7 @@
 "\n"
 "<b>Sõbra alias:</b> %s"
 
-#: ../src/gtkblist.c:2583
+#: ../gtk/gtkblist.c:2644
 #, c-format
 msgid ""
 "\n"
@@ -2497,7 +1490,7 @@
 "\n"
 "<b>Hüüdnimi:</b> %s"
 
-#: ../src/gtkblist.c:2592
+#: ../gtk/gtkblist.c:2653
 #, c-format
 msgid ""
 "\n"
@@ -2506,7 +1499,7 @@
 "\n"
 "<b>Sisse loginud:</b> %s"
 
-#: ../src/gtkblist.c:2603
+#: ../gtk/gtkblist.c:2664
 #, c-format
 msgid ""
 "\n"
@@ -2515,7 +1508,7 @@
 "\n"
 "<b>Jõude:</b> %s"
 
-#: ../src/gtkblist.c:2638
+#: ../gtk/gtkblist.c:2699
 #, c-format
 msgid ""
 "\n"
@@ -2524,7 +1517,7 @@
 "\n"
 "<b>Viimati nähtud:</b> %s tagasi"
 
-#: ../src/gtkblist.c:2647
+#: ../gtk/gtkblist.c:2708
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2532,13 +1525,13 @@
 "\n"
 "<b>Olek:</b> Ühendamata"
 
-#: ../src/gtkblist.c:2658
+#: ../gtk/gtkblist.c:2719
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
 msgstr ""
 
-#: ../src/gtkblist.c:2660
+#: ../gtk/gtkblist.c:2721
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2546,7 +1539,7 @@
 "\n"
 "<b>Olek:</b> Äge"
 
-#: ../src/gtkblist.c:2662
+#: ../gtk/gtkblist.c:2723
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2554,197 +1547,208 @@
 "\n"
 "<b>Olek:</b> Rokkiv"
 
-#: ../src/gtkblist.c:2951
+#: ../gtk/gtkblist.c:3190 ../gtk/gtkdocklet.c:421 ../gtk/gtkstatusbox.c:974
+#: ../libgaim/protocols/gg/gg.c:993 ../libgaim/protocols/jabber/buddy.c:1365
+#: ../libgaim/protocols/novell/novell.c:2865
+#: ../libgaim/protocols/oscar/oscar.c:769
+#: ../libgaim/protocols/oscar/oscar.c:5445
+#: ../libgaim/protocols/yahoo/yahoo.c:2883 ../libgaim/status.c:154
+msgid "Offline"
+msgstr "Ühendamata"
+
+#: ../gtk/gtkblist.c:3206
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Jõude %dt %02dm"
 
-#: ../src/gtkblist.c:2953
+#: ../gtk/gtkblist.c:3208
 #, c-format
 msgid "Idle %dm"
 msgstr "Jõude %dm"
 
 #. Idle stuff
-#: ../src/gtkblist.c:2956 ../src/gtkprefs.c:1745
-#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/msn/msn.c:552
-#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2854
-#: ../src/protocols/oscar/oscar.c:2836 ../src/protocols/yahoo/yahoo.c:2731
-#: ../src/protocols/yahoo/yahoo_profile.c:691
+#: ../gtk/gtkblist.c:3211 ../gtk/gtkprefs.c:1765
+#: ../libgaim/protocols/bonjour/bonjour.c:333
+#: ../libgaim/protocols/jabber/buddy.c:635
+#: ../libgaim/protocols/jabber/buddy.c:668 ../libgaim/protocols/msn/msn.c:548
+#: ../libgaim/protocols/msn/state.c:32
+#: ../libgaim/protocols/novell/novell.c:2862
+#: ../libgaim/protocols/oscar/oscar.c:2824
+#: ../libgaim/protocols/yahoo/yahoo.c:2881
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "Jõude"
 
-#: ../src/gtkblist.c:3088
+#: ../gtk/gtkblist.c:3339
 msgid "/Buddies/New Instant Message..."
 msgstr "/Sõbrad/Uus välksõnum..."
 
-#: ../src/gtkblist.c:3089 ../src/gtkblist.c:3122
+#: ../gtk/gtkblist.c:3340 ../gtk/gtkblist.c:3373
 msgid "/Buddies/Join a Chat..."
-msgstr "/Sõbrad/Ühine jututoaga..."
-
-#: ../src/gtkblist.c:3090
+msgstr "/Sõbrad/Ühine vestlusega..."
+
+#: ../gtk/gtkblist.c:3341
 msgid "/Buddies/Get User Info..."
 msgstr "/Sõbrad/Hangi kasutaja andmed..."
 
-#: ../src/gtkblist.c:3091
+#: ../gtk/gtkblist.c:3342
 msgid "/Buddies/Add Buddy..."
 msgstr "/Sõbrad/Lisa sõber..."
 
-#: ../src/gtkblist.c:3092 ../src/gtkblist.c:3125
+#: ../gtk/gtkblist.c:3343 ../gtk/gtkblist.c:3376
 msgid "/Buddies/Add Chat..."
 msgstr "/Sõbrad/Lisa vestlus..."
 
-#: ../src/gtkblist.c:3093
+#: ../gtk/gtkblist.c:3344
 msgid "/Buddies/Add Group..."
 msgstr "/Sõbrad/Lisa grupp..."
 
-#: ../src/gtkblist.c:3128
+#: ../gtk/gtkblist.c:3379
 msgid "/Tools/Buddy Pounces"
 msgstr "/Vahendid/Sõbramärguanded"
 
-#: ../src/gtkblist.c:3131
+#: ../gtk/gtkblist.c:3382
 msgid "/Tools/Privacy"
 msgstr "/Vahendid/Privaatsus"
 
-#: ../src/gtkblist.c:3134
+#: ../gtk/gtkblist.c:3385
 msgid "/Tools/Room List"
 msgstr "/Vahendid/Tubade nimekiri"
 
-#: ../src/gtkblist.c:3328
+#: ../gtk/gtkblist.c:3481 ../gtk/gtkdocklet.c:136
+#, 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"
+
+#: ../gtk/gtkblist.c:3557
 msgid "Manually"
 msgstr "Käsitsi"
 
-#: ../src/gtkblist.c:3330
+#: ../gtk/gtkblist.c:3559
 msgid "Alphabetically"
 msgstr "Tähestikuliselt"
 
-#: ../src/gtkblist.c:3331
+#: ../gtk/gtkblist.c:3560
 msgid "By status"
 msgstr "Oleku järgi"
 
-#: ../src/gtkblist.c:3332
+#: ../gtk/gtkblist.c:3561
 msgid "By log size"
 msgstr "Logi suuruse järgi"
 
-#: ../src/gtkblist.c:3527 ../src/gtkconn.c:196
-#, fuzzy, c-format
+#: ../gtk/gtkblist.c:3769 ../gtk/gtkconn.c:178
+#, c-format
 msgid "%s disconnected"
-msgstr "Server katkestas ühenduse"
-
-#: ../src/gtkblist.c:3543 ../src/protocols/sametime/sametime.c:3629
+msgstr "%s katkestas ühenduse"
+
+#: ../gtk/gtkblist.c:3778 ../libgaim/protocols/sametime/sametime.c:3618
 msgid "Connect"
-msgstr ""
-
-#: ../src/gtkblist.c:3543
-#, fuzzy
+msgstr "Ühendu"
+
+#: ../gtk/gtkblist.c:3778
 msgid "Re-enable Account"
-msgstr "Luba konto"
-
-#: ../src/gtkblist.c:3564
+msgstr "Konto taaslubamine"
+
+#: ../gtk/gtkblist.c:3799
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s väljus võrgust: %s</span>"
 
-#: ../src/gtkblist.c:3691
+#: ../gtk/gtkblist.c:3928
 msgid "/Accounts"
 msgstr "/Kontod"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3796
+#: ../gtk/gtkblist.c:4089
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Sõbrad/Näita ühendamata sõpru"
 
-#: ../src/gtkblist.c:3799
+#: ../gtk/gtkblist.c:4092
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Sõbrad/Näita tühje gruppe"
 
-#: ../src/gtkblist.c:3805
+#: ../gtk/gtkblist.c:4098
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Sõbrad/Näita sõbra üksikasju"
 
-#: ../src/gtkblist.c:3808
+#: ../gtk/gtkblist.c:4101
 msgid "/Buddies/Show Idle Times"
 msgstr "/Sõbrad/Näita jõudeaegu"
 
-#: ../src/gtkblist.c:4520 ../src/protocols/silc/buddy.c:736
-#: ../src/protocols/silc/buddy.c:1030 ../src/protocols/silc/buddy.c:1075
-#: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2978
-msgid "Add Buddy"
-msgstr "Sõbra lisamine"
-
-#: ../src/gtkblist.c:4544
+#: ../gtk/gtkblist.c:4764 ../gtk/plugins/gevolution/gevolution.c:96
+#: ../gtk/plugins/gevolution/gevo-util.c:64 ../libgaim/blist.c:521
+#: ../libgaim/blist.c:1294 ../libgaim/blist.c:1523
+#: ../libgaim/protocols/jabber/roster.c:67
+msgid "Buddies"
+msgstr "Sõbrad"
+
+#: ../gtk/gtkblist.c:4898
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
 "The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr ""
-"Palun sisesta isiku ekraaninimi, keda sa soovid lisada oma sõbranimekirja. "
+"Palun sisesta isiku ekraaninimi, keda sa soovid lisada oma sõbraloendisse. "
 "Vajadusel võid sa lisada ka sõbra aliase või hüüdnime. Võimaluse korral "
 "kuvatakse hüüdnime ekraaninime asemel.\n"
 
-#. Set up stuff for the account box
-#: ../src/gtkblist.c:4614 ../src/gtkblist.c:4933
-msgid "Account:"
-msgstr "Konto:"
-
-#: ../src/gtkblist.c:4866
+#: ../gtk/gtkblist.c:4958 ../gtk/gtkblist.c:5321
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:554
+#: ../gtk/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "Grupp:"
+
+#: ../gtk/gtkblist.c:5219
 msgid "This protocol does not support chat rooms."
 msgstr "See protokoll ei toeta jututubasid"
 
-#: ../src/gtkblist.c:4882
+#: ../gtk/gtkblist.c:5235
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
 
-#: ../src/gtkblist.c:4899
-msgid "Add Chat"
-msgstr "Vestluse lisamine"
-
-#: ../src/gtkblist.c:4923
+#: ../gtk/gtkblist.c:5276
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
 "Palun sisesta alias ja vestluse kohta käivad andmed lisatakse sinu "
-"sõbranimekirjale.\n"
-
-#: ../src/gtkblist.c:5005 ../src/protocols/sametime/sametime.c:5318
-#: ../src/protocols/sametime/sametime.c:5405
-msgid "Add Group"
-msgstr "Grupi lisamine"
-
-#: ../src/gtkblist.c:5006
+"sõbraloenisse.\n"
+
+#: ../gtk/gtkblist.c:5359
 msgid "Please enter the name of the group to be added."
 msgstr "Palun sisesta lisatava grupi nimi."
 
-#: ../src/gtkblist.c:5627
+#: ../gtk/gtkblist.c:5985
 msgid "_Edit Account"
 msgstr "_Redigeeri kontot"
 
-#: ../src/gtkblist.c:5660 ../src/gtkblist.c:5666
+#: ../gtk/gtkblist.c:6018 ../gtk/gtkblist.c:6024 ../gtk/gtkconv.c:2781
 msgid "No actions available"
 msgstr "Toiminguid pole"
 
-#: ../src/gtkblist.c:5674
+#: ../gtk/gtkblist.c:6032
 msgid "_Disable"
 msgstr "_Keela"
 
-#: ../src/gtkblist.c:5686
+#: ../gtk/gtkblist.c:6044
 msgid "Enable Account"
 msgstr "Luba konto"
 
-#: ../src/gtkblist.c:5739
+#: ../gtk/gtkblist.c:6097
 msgid "/Tools"
 msgstr "/Vahendid"
 
-#: ../src/gtkblist.c:5825
-#, fuzzy
+#: ../gtk/gtkblist.c:6183
 msgid "/Buddies/Sort Buddies"
-msgstr "/Sõbrad/Näita _ühendamata sõpru"
-
-#: ../src/gtkconn.c:197
+msgstr "/Sõbrad/Sordi sõbrad"
+
+#: ../gtk/gtkconn.c:179
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
@@ -2752,61 +1756,21 @@
 "and re-enable the account."
 msgstr ""
 
-#: ../src/gtkconv.c:373
-msgid "Supported debug options are:  version"
-msgstr ""
-
-#: ../src/gtkconv.c:409
-msgid "No such command (in this context)."
-msgstr "Sellist käsku pole (selles kontekstis)."
-
-#: ../src/gtkconv.c:412
-msgid ""
-"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
-"The following commands are available in this context:\n"
-msgstr ""
-"Kasuta \"/help &lt;käsk&gt;\" selle käsu abiteabe saamiseks.\n"
-"Sellest kontekstis on saadaval järgnevad käsud:\n"
-
-#: ../src/gtkconv.c:484
-msgid "No such command."
-msgstr "Sellist käsku pole."
-
-#: ../src/gtkconv.c:491
-msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr ""
-
-#: ../src/gtkconv.c:496
-msgid "Your command failed for an unknown reason."
-msgstr ""
-
-#: ../src/gtkconv.c:503
-msgid "That command only works in chats, not IMs."
-msgstr ""
-
-#: ../src/gtkconv.c:506
-msgid "That command only works in IMs, not chats."
-msgstr ""
-
-#: ../src/gtkconv.c:510
-msgid "That command doesn't work on this protocol."
-msgstr ""
-
-#: ../src/gtkconv.c:744 ../src/gtkconv.c:770
+#: ../gtk/gtkconv.c:744 ../gtk/gtkconv.c:770
 msgid "That buddy is not on the same protocol as this chat."
 msgstr ""
 
-#: ../src/gtkconv.c:764
+#: ../gtk/gtkconv.c:764
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 
-#: ../src/gtkconv.c:817
+#: ../gtk/gtkconv.c:817
 msgid "Invite Buddy Into Chat Room"
 msgstr "Sõbra kutsumine jututuppa"
 
 #. Put our happy label in it.
-#: ../src/gtkconv.c:847
+#: ../gtk/gtkconv.c:847
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2814,795 +1778,792 @@
 "Palun sisesta selle kasutaja nimi, keda sa soovid jututuppa kutsuda. Kui "
 "sisestad ka sõnumi, siis saadetakse see sõbrale koos kutsumisteatega."
 
-#: ../src/gtkconv.c:868
+#: ../gtk/gtkconv.c:868
 msgid "_Buddy:"
 msgstr "_Sõber:"
 
-#: ../src/gtkconv.c:888 ../src/gtksavedstatuses.c:1108
-#: ../src/gtksavedstatuses.c:1444
+#: ../gtk/gtkconv.c:888 ../gtk/gtksavedstatuses.c:1111
+#: ../gtk/gtksavedstatuses.c:1447
 msgid "_Message:"
 msgstr "Sõ_num:"
 
-#: ../src/gtkconv.c:945 ../src/gtkconv.c:2392 ../src/gtkdebug.c:217
-#: ../src/gtkft.c:488
+#: ../gtk/gtkconv.c:945 ../gtk/gtkconv.c:2398 ../gtk/gtkdebug.c:218
+#: ../gtk/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Faili pole võimalik avada."
 
-#: ../src/gtkconv.c:951
+#: ../gtk/gtkconv.c:951
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Vestlused - %s</h1>\n"
 
-#: ../src/gtkconv.c:975
+#: ../gtk/gtkconv.c:975
 msgid "Save Conversation"
 msgstr "Vestluse salvestamine"
 
-#: ../src/gtkconv.c:1096 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
+#: ../gtk/gtkconv.c:1122 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756
 msgid "Find"
 msgstr "Otsing"
 
-#: ../src/gtkconv.c:1122 ../src/gtkdebug.c:193
+#: ../gtk/gtkconv.c:1148 ../gtk/gtkdebug.c:194
 msgid "_Search for:"
-msgstr "O_tsi stringi:"
-
-#: ../src/gtkconv.c:1293
+msgstr "O_tsida stringi:"
+
+#: ../gtk/gtkconv.c:1319
 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."
 
-#: ../src/gtkconv.c:1301
+#: ../gtk/gtkconv.c:1327
 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."
 
-#: ../src/gtkconv.c:1562
-msgid "IM"
-msgstr "Välksõnum"
-
-#: ../src/gtkconv.c:1573 ../src/protocols/oscar/oscar.c:642
-msgid "Send File"
-msgstr "Saada fail"
-
-#: ../src/gtkconv.c:1588
+#: ../gtk/gtkconv.c:1595
 msgid "Un-Ignore"
 msgstr "Ära eira"
 
-#: ../src/gtkconv.c:1591
+#: ../gtk/gtkconv.c:1598
 msgid "Ignore"
 msgstr "Eira"
 
-#: ../src/gtkconv.c:1601
-msgid "Info"
-msgstr "Andmed"
-
-#: ../src/gtkconv.c:1611
+#: ../gtk/gtkconv.c:1618
 msgid "Get Away Message"
 msgstr ""
 
-#: ../src/gtkconv.c:1634
+#: ../gtk/gtkconv.c:1641
 msgid "Last said"
 msgstr "Viimati ütles"
 
-#: ../src/gtkconv.c:2400
+#: ../gtk/gtkconv.c:2406
 msgid "Unable to save icon file to disk."
 msgstr ""
 
-#: ../src/gtkconv.c:2424
+#: ../gtk/gtkconv.c:2430
 msgid "Save Icon"
 msgstr "Ikooni salvestamine"
 
-#: ../src/gtkconv.c:2473
+#: ../gtk/gtkconv.c:2479
 msgid "Animate"
 msgstr ""
 
-#: ../src/gtkconv.c:2478
+#: ../gtk/gtkconv.c:2484
 msgid "Hide Icon"
 msgstr "Peida ikoon"
 
-#: ../src/gtkconv.c:2484
+#: ../gtk/gtkconv.c:2490
 msgid "Save Icon As..."
 msgstr "Salvesta ikoon kui..."
 
 #. Conversation menu
-#: ../src/gtkconv.c:2625
+#: ../gtk/gtkconv.c:2630
 msgid "/_Conversation"
 msgstr "/_Vestlus"
 
-#: ../src/gtkconv.c:2627
+#: ../gtk/gtkconv.c:2632
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Vestlus/Uus _välksõnum..."
 
-#: ../src/gtkconv.c:2632
+#: ../gtk/gtkconv.c:2637
 msgid "/Conversation/_Find..."
 msgstr "/Vestlus/_Otsi..."
 
-#: ../src/gtkconv.c:2634
+#: ../gtk/gtkconv.c:2639
 msgid "/Conversation/View _Log"
 msgstr "/Vestlus/Vaata _logi"
 
-#: ../src/gtkconv.c:2635
+#: ../gtk/gtkconv.c:2640
 msgid "/Conversation/_Save As..."
 msgstr "/Vestlus/Salvesta _kui..."
 
-#: ../src/gtkconv.c:2637
-#, fuzzy
+#: ../gtk/gtkconv.c:2642
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Vestlus/Puhasta"
-
-#: ../src/gtkconv.c:2641
+msgstr "/Vestlus/_Puhasta tagasikerimine"
+
+#: ../gtk/gtkconv.c:2646
 msgid "/Conversation/Se_nd File..."
 msgstr "/Vestlus/Saada _fail..."
 
-#: ../src/gtkconv.c:2642
+#: ../gtk/gtkconv.c:2647
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Vestlus/Lisa sõbra_märguanne..."
 
-#: ../src/gtkconv.c:2644
+#: ../gtk/gtkconv.c:2649
 msgid "/Conversation/_Get Info"
 msgstr "/Vestlus/_Hangi teavet"
 
-#: ../src/gtkconv.c:2646
+#: ../gtk/gtkconv.c:2651
 msgid "/Conversation/In_vite..."
 msgstr "/Vestlus/_Kutsu..."
 
-#: ../src/gtkconv.c:2651
-#, fuzzy
+#: ../gtk/gtkconv.c:2653
+msgid "/Conversation/M_ore"
+msgstr ""
+
+#: ../gtk/gtkconv.c:2657
 msgid "/Conversation/Al_ias..."
-msgstr "/Vestlus/_Alias..."
-
-#: ../src/gtkconv.c:2653
+msgstr "/Vestlus/Al_ias..."
+
+#: ../gtk/gtkconv.c:2659
 msgid "/Conversation/_Block..."
 msgstr "/Vestlus/_Bloki..."
 
-#: ../src/gtkconv.c:2655
+#: ../gtk/gtkconv.c:2661
 msgid "/Conversation/_Add..."
 msgstr "/Vestlus/_Lisa..."
 
-#: ../src/gtkconv.c:2657
+#: ../gtk/gtkconv.c:2663
 msgid "/Conversation/_Remove..."
 msgstr "/Vestlus/_Eemalda"
 
-#: ../src/gtkconv.c:2662
+#: ../gtk/gtkconv.c:2668
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Vestlus/Lisa _viit..."
 
-#: ../src/gtkconv.c:2664
+#: ../gtk/gtkconv.c:2670
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Vestlus/Lisa _pilt..."
 
-#: ../src/gtkconv.c:2669
+#: ../gtk/gtkconv.c:2675
 msgid "/Conversation/_Close"
 msgstr "/Vestlus/_Sulge"
 
 #. Options
-#: ../src/gtkconv.c:2673
+#: ../gtk/gtkconv.c:2679
 msgid "/_Options"
-msgstr "/_Valikud"
-
-#: ../src/gtkconv.c:2674
+msgstr "/V_alikud"
+
+#: ../gtk/gtkconv.c:2680
 msgid "/Options/Enable _Logging"
 msgstr "/Valikud/Luba _logimine"
 
-#: ../src/gtkconv.c:2675
+#: ../gtk/gtkconv.c:2681
 msgid "/Options/Enable _Sounds"
 msgstr "/Valikud/Luba _helid"
 
-#: ../src/gtkconv.c:2676
-#, fuzzy
+#: ../gtk/gtkconv.c:2682
 msgid "/Options/Show Buddy _Icon"
-msgstr "Sõbra _ikooni näitamine"
-
-#: ../src/gtkconv.c:2678
-#, fuzzy
+msgstr "/Valikud/Näita sõbra _ikooni"
+
+#: ../gtk/gtkconv.c:2684
 msgid "/Options/Show Formatting _Toolbars"
-msgstr "/Valikud/Luba _vormindamise tööriistad"
-
-#: ../src/gtkconv.c:2679
-#, fuzzy
+msgstr "/Valikud/Näita _vormindamise tööriistu"
+
+#: ../gtk/gtkconv.c:2685
 msgid "/Options/Show Ti_mestamps"
-msgstr "/Valikud/Luba _ajatemplid"
-
-#: ../src/gtkconv.c:2771
+msgstr "/Valikud/Näita _ajatempleid"
+
+#: ../gtk/gtkconv.c:2760
+msgid "/Conversation/More"
+msgstr ""
+
+#: ../gtk/gtkconv.c:2798 ../gtk/gtkconv.c:2825
+msgid "/Conversation"
+msgstr "/Vestlus"
+
+#: ../gtk/gtkconv.c:2835
 msgid "/Conversation/View Log"
-msgstr ""
-
-#: ../src/gtkconv.c:2777
+msgstr "/Vestlus/Vaata logi"
+
+#: ../gtk/gtkconv.c:2841
 msgid "/Conversation/Send File..."
-msgstr ""
-
-#: ../src/gtkconv.c:2781
+msgstr "/Vestlus/Saada fail..."
+
+#: ../gtk/gtkconv.c:2845
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr ""
-
-#: ../src/gtkconv.c:2787
+msgstr "/Vestlus/Lisa sõbramärguanne..."
+
+#: ../gtk/gtkconv.c:2851
 msgid "/Conversation/Get Info"
-msgstr ""
-
-#: ../src/gtkconv.c:2791
+msgstr "/Vestlus/Hangi andmed"
+
+#: ../gtk/gtkconv.c:2855
 msgid "/Conversation/Invite..."
 msgstr "/Vestlus/Kutsu..."
 
-#: ../src/gtkconv.c:2797
+#: ../gtk/gtkconv.c:2861
 msgid "/Conversation/Alias..."
-msgstr ""
-
-#: ../src/gtkconv.c:2801
+msgstr "/Vestlus/Alias..."
+
+#: ../gtk/gtkconv.c:2865
 msgid "/Conversation/Block..."
-msgstr ""
-
-#: ../src/gtkconv.c:2805
+msgstr "/Vestlus/Bloki..."
+
+#: ../gtk/gtkconv.c:2869
 msgid "/Conversation/Add..."
-msgstr ""
-
-#: ../src/gtkconv.c:2809
+msgstr "/Vestlus/Lisa..."
+
+#: ../gtk/gtkconv.c:2873
 msgid "/Conversation/Remove..."
-msgstr ""
-
-#: ../src/gtkconv.c:2815
+msgstr "/Vestlus/Eemalda..."
+
+#: ../gtk/gtkconv.c:2879
 msgid "/Conversation/Insert Link..."
-msgstr ""
-
-#: ../src/gtkconv.c:2819
+msgstr "/Vestlus/Lisa viit..."
+
+#: ../gtk/gtkconv.c:2883
 msgid "/Conversation/Insert Image..."
-msgstr ""
-
-#: ../src/gtkconv.c:2825
+msgstr "/Vestlus/Lisa pilt..."
+
+#: ../gtk/gtkconv.c:2889
 msgid "/Options/Enable Logging"
-msgstr ""
-
-#: ../src/gtkconv.c:2828
+msgstr "/Valikud/Luba logimine"
+
+#: ../gtk/gtkconv.c:2892
 msgid "/Options/Enable Sounds"
-msgstr ""
-
-#: ../src/gtkconv.c:2841
-#, fuzzy
+msgstr "/Valikud/Luba helid"
+
+#: ../gtk/gtkconv.c:2905
 msgid "/Options/Show Formatting Toolbars"
-msgstr "/Valikud/Luba _vormindamise tööriistad"
-
-#: ../src/gtkconv.c:2844
+msgstr "/Valikud/Näita vormindamise tööriistu"
+
+#: ../gtk/gtkconv.c:2908
 msgid "/Options/Show Timestamps"
-msgstr ""
-
-#: ../src/gtkconv.c:2847
-#, fuzzy
+msgstr "/Valikud/Näita ajatempleid"
+
+#: ../gtk/gtkconv.c:2911
 msgid "/Options/Show Buddy Icon"
-msgstr "Sõbra _ikooni näitamine"
-
-#: ../src/gtkconv.c:2927
+msgstr "/Valikud/Näita sõbraikooni"
+
+#: ../gtk/gtkconv.c:2987
 msgid "User is typing..."
-msgstr "Kasutaja kirjutab..."
-
-#: ../src/gtkconv.c:2930
+msgstr "Kasutaja tipib..."
+
+#: ../gtk/gtkconv.c:2990
 msgid "User has typed something and stopped"
-msgstr ""
+msgstr "Kasutaja tippis midagi ja siis jättis selle pooleli"
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:3113
-#, fuzzy
+#: ../gtk/gtkconv.c:3173
 msgid "_Send To"
-msgstr "_Saada kui"
-
-#: ../src/gtkconv.c:3765
-#, fuzzy
+msgstr "Kellele _saata"
+
+#: ../gtk/gtkconv.c:3875
 msgid "_Send"
-msgstr "Saada"
-
-#: ../src/gtkconv.c:3820 ../src/protocols/sametime/sametime.c:3571
+msgstr "_Saada"
+
+#: ../gtk/gtkconv.c:3929 ../libgaim/protocols/sametime/sametime.c:3560
 msgid "Topic:"
 msgstr "Teema:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3872
+#: ../gtk/gtkconv.c:3981
 msgid "0 people in room"
 msgstr "0 isikut toas"
 
-#: ../src/gtkconv.c:3951
-msgid "IM the user"
-msgstr "Välksõnumi saatmine kasutajale"
-
-#: ../src/gtkconv.c:3964
-msgid "Ignore the user"
-msgstr "Kasutaja eiramine"
-
-#: ../src/gtkconv.c:3976
-msgid "Get the user's information"
-msgstr "Kasutaja kohta käiva teabe hankimine"
-
-#: ../src/gtkconv.c:4958 ../src/gtkconv.c:5067
+#: ../gtk/gtkconv.c:5028 ../gtk/gtkconv.c:5149
 #, 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"
 
-#: ../src/gtkconv.c:5624 ../src/gtkstatusbox.c:366
+#: ../gtk/gtkconv.c:5702 ../gtk/gtkstatusbox.c:541
 msgid "Typing"
 msgstr ""
 
-#: ../src/gtkconv.c:5630
-#, fuzzy
+#: ../gtk/gtkconv.c:5708
 msgid "Stopped Typing"
-msgstr "Lõpetab _tippimise"
-
-#: ../src/gtkconv.c:5635
-#, fuzzy
+msgstr ""
+
+#: ../gtk/gtkconv.c:5713
 msgid "Nick Said"
-msgstr "Hüüdnimi"
-
-#: ../src/gtkconv.c:5645
-#, fuzzy
+msgstr ""
+
+#: ../gtk/gtkconv.c:5718 ../gtk/gtkdocklet.c:463
+msgid "Unread Messages"
+msgstr "Lugemata sõnumid"
+
+#: ../gtk/gtkconv.c:5723
 msgid "New Event"
-msgstr "Sündmus"
-
-#: ../src/gtkconv.c:6547
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
-msgstr ""
-"say &lt;message&gt;:  Sõnumi saatmine nagu tehtaks seda ilma käsku "
-"kasutamata."
-
-#: ../src/gtkconv.c:6550
-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."
-
-#: ../src/gtkconv.c:6553
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
-msgstr "debug &lt;võti&gt;:  Silumisteabe saatmine käesolevasse vestlusesse."
-
-#: ../src/gtkconv.c:6556
-#, fuzzy
-msgid "clear: Clears the conversation scrollback."
-msgstr "%s sulges vestlusakna."
-
-#: ../src/gtkconv.c:6559
-msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "help &lt;käsk&gt;:  Abiteave käsu kohta."
-
-#: ../src/gtkconv.c:6718
+msgstr "Uus sündmus"
+
+#: ../gtk/gtkconv.c:6818
 msgid "Confirm close"
-msgstr ""
-
-#: ../src/gtkconv.c:6750
-#, fuzzy
+msgstr "Sulgemiskinnitus"
+
+#: ../gtk/gtkconv.c:6850
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "Kas sa soovid kustutada kontot %s?"
-
-#: ../src/gtkconv.c:7272
+msgstr "Sul on lugemata sõnumeid. Oled sa kindel, et soovid akent sulgeda?"
+
+#: ../gtk/gtkconv.c:7385
 msgid "Close other tabs"
 msgstr "Sulge teised sakid"
 
-#: ../src/gtkconv.c:7278
+#: ../gtk/gtkconv.c:7391
 msgid "Close all tabs"
 msgstr "Sulge kõik sakid"
 
-#: ../src/gtkconv.c:7286
+#: ../gtk/gtkconv.c:7399
 msgid "Detach this tab"
 msgstr "Haagi see sakk lahti"
 
-#: ../src/gtkconv.c:7292
+#: ../gtk/gtkconv.c:7405
 msgid "Close this tab"
 msgstr "Sulge see sakk"
 
-#: ../src/gtkconv.c:7554
+#: ../gtk/gtkconv.c:7672
 msgid "Close conversation"
 msgstr "Vestluse sulgemine"
 
-#: ../src/gtkconv.c:8018
+#: ../gtk/gtkconv.c:8136
 msgid "Last created window"
 msgstr "Viimati loodud aknasse"
 
-#: ../src/gtkconv.c:8020
+#: ../gtk/gtkconv.c:8138
 msgid "Separate IM and Chat windows"
 msgstr "Välksõnumid ja jututoad eraldi akendesse"
 
-#: ../src/gtkconv.c:8022 ../src/gtkprefs.c:1243
+#: ../gtk/gtkconv.c:8140 ../gtk/gtkprefs.c:1263
 msgid "New window"
 msgstr "Uude aknasse"
 
-#: ../src/gtkconv.c:8024
+#: ../gtk/gtkconv.c:8142
 msgid "By group"
 msgstr "Grupi kaupa"
 
-#: ../src/gtkconv.c:8026
+#: ../gtk/gtkconv.c:8144
 msgid "By account"
 msgstr "Konto kaupa"
 
-#: ../src/gtkdebug.c:232
+#: ../gtk/gtkdebug.c:233
 msgid "Save Debug Log"
 msgstr "Silumislogi salvestamine"
 
-#: ../src/gtkdebug.c:586
+#: ../gtk/gtkdebug.c:594
 msgid "Invert"
 msgstr ""
 
-#: ../src/gtkdebug.c:589
+#: ../gtk/gtkdebug.c:597
 msgid "Highlight matches"
-msgstr ""
-
-#: ../src/gtkdebug.c:636
-msgid "Debug Window"
-msgstr "Silumisaken"
-
-#: ../src/gtkdebug.c:689
-msgid "Clear"
-msgstr "Puhastamine"
-
-#: ../src/gtkdebug.c:698
-msgid "Pause"
-msgstr "Paus"
-
-#: ../src/gtkdebug.c:705 ../src/gtkdebug.c:706
-msgid "Timestamps"
-msgstr "Ajatemplid"
-
-#: ../src/gtkdebug.c:724
-#, fuzzy
+msgstr "Vastavuste esiletõstmine"
+
+#: ../gtk/gtkdebug.c:664
+msgid "_Icon Only"
+msgstr ""
+
+#: ../gtk/gtkdebug.c:665
+msgid "_Text Only"
+msgstr ""
+
+#: ../gtk/gtkdebug.c:666
+msgid "_Both Icon & Text"
+msgstr ""
+
+#: ../gtk/gtkdebug.c:802
 msgid "Filter"
-msgstr "Filtreerimine"
-
-#: ../src/gtkdebug.c:743
+msgstr "Filter"
+
+#: ../gtk/gtkdebug.c:821
 msgid "Right click for more options."
 msgstr "Täiendavate valikuta jaoks klõpsa parema nupuga."
 
-#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:103
+#: ../gtk/gtkdebug.c:851
+msgid "Level "
+msgstr ""
+
+#: ../gtk/gtkdebug.c:852 ../gtk/gtkdebug.c:858
+msgid "Select the debug filter level."
+msgstr ""
+
+#: ../gtk/gtkdebug.c:860
+#, fuzzy
+msgid "All"
+msgstr "Luba"
+
+#: ../gtk/gtkdebug.c:861
+#, fuzzy
+msgid "Misc"
+msgstr "Muusika"
+
+#: ../gtk/gtkdebug.c:863
+#, fuzzy
+msgid "Warning"
+msgstr "Jäänud"
+
+#: ../gtk/gtkdebug.c:864
+#, fuzzy
+msgid "Error "
+msgstr "Viga"
+
+#: ../gtk/gtkdebug.c:865
+#, fuzzy
+msgid "Fatal Error"
+msgstr "Viga vestlusel"
+
+#: ../gtk/gtkdialogs.c:66 ../gtk/gtkdialogs.c:109
 msgid "lead developer"
-msgstr ""
-
-#: ../src/gtkdialogs.c:62 ../src/gtkdialogs.c:63 ../src/gtkdialogs.c:65
-#: ../src/gtkdialogs.c:66 ../src/gtkdialogs.c:68 ../src/gtkdialogs.c:69
-#: ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71 ../src/gtkdialogs.c:72
-#: ../src/gtkdialogs.c:73 ../src/gtkdialogs.c:75 ../src/gtkdialogs.c:76
-#: ../src/gtkdialogs.c:77
+msgstr "juhtiv arendaja"
+
+#: ../gtk/gtkdialogs.c:67 ../gtk/gtkdialogs.c:68 ../gtk/gtkdialogs.c:69
+#: ../gtk/gtkdialogs.c:70 ../gtk/gtkdialogs.c:71 ../gtk/gtkdialogs.c:73
+#: ../gtk/gtkdialogs.c:74 ../gtk/gtkdialogs.c:75 ../gtk/gtkdialogs.c:76
+#: ../gtk/gtkdialogs.c:77 ../gtk/gtkdialogs.c:78 ../gtk/gtkdialogs.c:80
+#: ../gtk/gtkdialogs.c:81 ../gtk/gtkdialogs.c:82
 msgid "developer"
 msgstr "arendaja"
 
-#: ../src/gtkdialogs.c:64
-msgid "win32 port"
-msgstr "win32 port"
-
-#: ../src/gtkdialogs.c:67
+#: ../gtk/gtkdialogs.c:72
 msgid "developer & webmaster"
 msgstr "arendaja ja veebimeister"
 
-#: ../src/gtkdialogs.c:74
+#: ../gtk/gtkdialogs.c:79
 msgid "support"
 msgstr "kasutajatugi"
 
-#: ../src/gtkdialogs.c:97 ../src/gtkdialogs.c:98
+#: ../gtk/gtkdialogs.c:101
+msgid "win32 port"
+msgstr "win32 port"
+
+#: ../gtk/gtkdialogs.c:102 ../gtk/gtkdialogs.c:103
 msgid "maintainer"
-msgstr ""
-
-#: ../src/gtkdialogs.c:99
+msgstr "hooldaja"
+
+#: ../gtk/gtkdialogs.c:104
 msgid "libfaim maintainer"
-msgstr ""
-
-#: ../src/gtkdialogs.c:100
+msgstr "libfaimi hooldaja"
+
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../gtk/gtkdialogs.c:106
 msgid "hacker and designated driver [lazy bum]"
 msgstr ""
 
-#: ../src/gtkdialogs.c:101
+#: ../gtk/gtkdialogs.c:107
 msgid "Jabber developer"
 msgstr "Jabberi arendaja"
 
-#: ../src/gtkdialogs.c:102
+#: ../gtk/gtkdialogs.c:108
 msgid "original author"
 msgstr "algupärane autor"
 
-#: ../src/gtkdialogs.c:109 ../src/gtkdialogs.c:110 ../src/gtkdialogs.c:168
+#: ../gtk/gtkdialogs.c:115
+#, fuzzy
+msgid "Arabic"
+msgstr "Amhari"
+
+#: ../gtk/gtkdialogs.c:116 ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:183
 msgid "Bulgarian"
 msgstr "Bulgaaria"
 
-#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:112
+#: ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:119
 msgid "Bengali"
-msgstr ""
-
-#: ../src/gtkdialogs.c:113
+msgstr "Bengaali"
+
+#: ../gtk/gtkdialogs.c:120
 msgid "Bosnian"
 msgstr "Bosnian"
 
-#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
+#: ../gtk/gtkdialogs.c:121 ../gtk/gtkdialogs.c:184 ../gtk/gtkdialogs.c:185
 msgid "Catalan"
 msgstr "Kataloonia"
 
-#: ../src/gtkdialogs.c:115
-msgid "Valencian"
-msgstr ""
-
-#: ../src/gtkdialogs.c:116 ../src/gtkdialogs.c:171
+#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:123
+msgid "Valencian-Catalan"
+msgstr ""
+
+#: ../gtk/gtkdialogs.c:124 ../gtk/gtkdialogs.c:186
 msgid "Czech"
 msgstr "Tšehhi"
 
-#: ../src/gtkdialogs.c:117
+#: ../gtk/gtkdialogs.c:125
 msgid "Danish"
 msgstr "Taani"
 
-#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:119 ../src/gtkdialogs.c:172
+#: ../gtk/gtkdialogs.c:126 ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:187
 msgid "German"
 msgstr "Saksa"
 
-#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:121
+#: ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:129
 msgid "Greek"
 msgstr "Kreeka"
 
-#: ../src/gtkdialogs.c:122
+#: ../gtk/gtkdialogs.c:130
 msgid "Australian English"
 msgstr "Austraalia inglise"
 
-#: ../src/gtkdialogs.c:123
+#: ../gtk/gtkdialogs.c:131
 msgid "Canadian English"
 msgstr "Kanada inglise"
 
-#: ../src/gtkdialogs.c:124
+#: ../gtk/gtkdialogs.c:132
 msgid "British English"
 msgstr "Briti inglise"
 
-#: ../src/gtkdialogs.c:125 ../src/gtkdialogs.c:173 ../src/gtkdialogs.c:174
-#: ../src/gtkdialogs.c:175 ../src/gtkdialogs.c:176
+#: ../gtk/gtkdialogs.c:133 ../gtk/gtkdialogs.c:188 ../gtk/gtkdialogs.c:189
+#: ../gtk/gtkdialogs.c:190 ../gtk/gtkdialogs.c:191
 msgid "Spanish"
 msgstr "Hispaania"
 
-#: ../src/gtkdialogs.c:126 ../src/gtkdialogs.c:127
+#: ../gtk/gtkdialogs.c:134 ../gtk/gtkdialogs.c:135
+msgid "Euskera(Basque)"
+msgstr ""
+
+#: ../gtk/gtkdialogs.c:136 ../gtk/gtkdialogs.c:137
 msgid "Persian"
 msgstr "Pärsia"
 
-#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:177 ../src/gtkdialogs.c:178
+#: ../gtk/gtkdialogs.c:138 ../gtk/gtkdialogs.c:192 ../gtk/gtkdialogs.c:193
 msgid "Finnish"
 msgstr "Soome"
 
-#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:179 ../src/gtkdialogs.c:180
-#: ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
+#: ../gtk/gtkdialogs.c:139 ../gtk/gtkdialogs.c:194 ../gtk/gtkdialogs.c:195
+#: ../gtk/gtkdialogs.c:196 ../gtk/gtkdialogs.c:197
 msgid "French"
 msgstr "Prantsuse"
 
-#: ../src/gtkdialogs.c:130
+#: ../gtk/gtkdialogs.c:140
 msgid "Galician"
 msgstr "Galiitsia"
 
-#: ../src/gtkdialogs.c:131
+#: ../gtk/gtkdialogs.c:141 ../gtk/gtkdialogs.c:142
+msgid "Gujarati"
+msgstr ""
+
+#: ../gtk/gtkdialogs.c:143 ../gtk/gtkdialogs.c:198
 msgid "Hebrew"
 msgstr "Heebrea"
 
-#: ../src/gtkdialogs.c:132
+#: ../gtk/gtkdialogs.c:144
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../src/gtkdialogs.c:133
+#: ../gtk/gtkdialogs.c:145
 msgid "Hungarian"
 msgstr "Ungari"
 
-#: ../src/gtkdialogs.c:134 ../src/gtkdialogs.c:183
+#: ../gtk/gtkdialogs.c:146 ../gtk/gtkdialogs.c:199
 msgid "Italian"
 msgstr "Itaalia"
 
-#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:184 ../src/gtkdialogs.c:185
-#: ../src/gtkdialogs.c:186
+#: ../gtk/gtkdialogs.c:147 ../gtk/gtkdialogs.c:200 ../gtk/gtkdialogs.c:201
+#: ../gtk/gtkdialogs.c:202
 msgid "Japanese"
 msgstr "Jaapani"
 
-#: ../src/gtkdialogs.c:136 ../src/gtkdialogs.c:187
+#: ../gtk/gtkdialogs.c:148 ../gtk/gtkdialogs.c:203
 msgid "Georgian"
 msgstr "Gruusia"
 
-#: ../src/gtkdialogs.c:137 ../src/gtkdialogs.c:188
+#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:204
 msgid "Korean"
 msgstr "Korea"
 
-#: ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:139 ../src/gtkdialogs.c:140
+#: ../gtk/gtkdialogs.c:150 ../gtk/gtkdialogs.c:151 ../gtk/gtkdialogs.c:152
 msgid "Kurdish"
 msgstr "Kurdi"
 
-#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:189 ../src/gtkdialogs.c:190
+#: ../gtk/gtkdialogs.c:153 ../gtk/gtkdialogs.c:205 ../gtk/gtkdialogs.c:206
 msgid "Lithuanian"
 msgstr "Leedu"
 
-#: ../src/gtkdialogs.c:142
+#: ../gtk/gtkdialogs.c:154
 msgid "Macedonian"
 msgstr "Makedoonia"
 
-#: ../src/gtkdialogs.c:143
+#: ../gtk/gtkdialogs.c:155
+#, fuzzy
+msgid "Nepali"
+msgstr "Bengaali"
+
+#: ../gtk/gtkdialogs.c:156
 msgid "Dutch, Flemish"
 msgstr "Hollandi, Flaami"
 
-#: ../src/gtkdialogs.c:144
+#: ../gtk/gtkdialogs.c:157
 msgid "Norwegian"
 msgstr "Norra"
 
-#: ../src/gtkdialogs.c:145 ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:191
+#: ../gtk/gtkdialogs.c:158 ../gtk/gtkdialogs.c:159 ../gtk/gtkdialogs.c:207
 msgid "Polish"
 msgstr "Poola"
 
-#: ../src/gtkdialogs.c:147
+#: ../gtk/gtkdialogs.c:160
 msgid "Portuguese"
 msgstr "Portugali"
 
-#: ../src/gtkdialogs.c:148
+#: ../gtk/gtkdialogs.c:161
 msgid "Portuguese-Brazil"
 msgstr "Portugali-Brasiilia"
 
-#: ../src/gtkdialogs.c:149
+#: ../gtk/gtkdialogs.c:162
 msgid "Romanian"
 msgstr "Rumeenia"
 
-#: ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:192 ../src/gtkdialogs.c:193
+#: ../gtk/gtkdialogs.c:163 ../gtk/gtkdialogs.c:208 ../gtk/gtkdialogs.c:209
 msgid "Russian"
 msgstr "Vene"
 
-#: ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:152
+#: ../gtk/gtkdialogs.c:164 ../gtk/gtkdialogs.c:165
 msgid "Serbian"
 msgstr "Serbia"
 
-#: ../src/gtkdialogs.c:153
+#: ../gtk/gtkdialogs.c:166 ../gtk/gtkdialogs.c:210
+msgid "Slovak"
+msgstr "Slovaki"
+
+#: ../gtk/gtkdialogs.c:167
 msgid "Slovenian"
 msgstr "Sloveenia"
 
-#: ../src/gtkdialogs.c:154 ../src/gtkdialogs.c:195
+#: ../gtk/gtkdialogs.c:168 ../gtk/gtkdialogs.c:211
 msgid "Swedish"
 msgstr "Rootsi"
 
-#: ../src/gtkdialogs.c:155
+#: ../gtk/gtkdialogs.c:169
 msgid "Tamil"
 msgstr "Tamili"
 
-#: ../src/gtkdialogs.c:156
+#: ../gtk/gtkdialogs.c:170
 msgid "Telugu"
-msgstr ""
-
-#: ../src/gtkdialogs.c:157
+msgstr "Telugu"
+
+#: ../gtk/gtkdialogs.c:171
+msgid "Thai"
+msgstr "Tai"
+
+#: ../gtk/gtkdialogs.c:172
 msgid "Turkish"
 msgstr "Türgi"
 
-#: ../src/gtkdialogs.c:158
+#: ../gtk/gtkdialogs.c:173
 msgid "Vietnamese"
 msgstr "Vietnami"
 
-#: ../src/gtkdialogs.c:158
+#: ../gtk/gtkdialogs.c:173
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh ja Gnome-Vi meeskond"
 
-#: ../src/gtkdialogs.c:159 ../src/gtkdialogs.c:196
+#: ../gtk/gtkdialogs.c:174 ../gtk/gtkdialogs.c:212
 msgid "Simplified Chinese"
 msgstr "Hiina lihtsustatud"
 
-#: ../src/gtkdialogs.c:160 ../src/gtkdialogs.c:161 ../src/gtkdialogs.c:197
+#: ../gtk/gtkdialogs.c:175 ../gtk/gtkdialogs.c:176 ../gtk/gtkdialogs.c:213
 msgid "Traditional Chinese"
 msgstr "Hiina traditsiooniline"
 
-#: ../src/gtkdialogs.c:167
+#: ../gtk/gtkdialogs.c:182
 msgid "Amharic"
 msgstr "Amhari"
 
-#: ../src/gtkdialogs.c:194
-msgid "Slovak"
-msgstr "Slovaki"
-
-#: ../src/gtkdialogs.c:238
+#: ../gtk/gtkdialogs.c:294
 msgid "About Gaim"
 msgstr "Lähem teave Gaim'i kohta"
 
-#: ../src/gtkdialogs.c:262
+#: ../gtk/gtkdialogs.c:328
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
-"and Gadu-Gadu 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 Gaim.  Gaim 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 ""
-
-#: ../src/gtkdialogs.c:276
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, 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 Gaim.  "
+"Gaim 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 ""
+
+#: ../gtk/gtkdialogs.c:342
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> #wingaim serveris irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:279
+#: ../gtk/gtkdialogs.c:345
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim serveris irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:285
+#: ../gtk/gtkdialogs.c:351
 msgid "Current Developers"
 msgstr "Praegused arendajad"
 
-#: ../src/gtkdialogs.c:300
+#: ../gtk/gtkdialogs.c:366
 msgid "Crazy Patch Writers"
 msgstr "Hullunud parandustekirjutajad"
 
-#: ../src/gtkdialogs.c:315
+#: ../gtk/gtkdialogs.c:381
 msgid "Retired Developers"
 msgstr "Endised arendajad"
 
-#: ../src/gtkdialogs.c:330
+#: ../gtk/gtkdialogs.c:396
 msgid "Current Translators"
 msgstr "Praegused tõlkijad"
 
-#: ../src/gtkdialogs.c:350
+#: ../gtk/gtkdialogs.c:416
 msgid "Past Translators"
 msgstr "Eelmised tõlkijad"
 
-#: ../src/gtkdialogs.c:368
+#: ../gtk/gtkdialogs.c:434
 msgid "Debugging Information"
 msgstr "Silumisandmed"
 
-#: ../src/gtkdialogs.c:574 ../src/gtkdialogs.c:711 ../src/gtkdialogs.c:774
+#: ../gtk/gtkdialogs.c:648 ../gtk/gtkdialogs.c:785 ../gtk/gtkdialogs.c:865
 msgid "_Name"
 msgstr "_Nimi"
 
-#: ../src/gtkdialogs.c:579 ../src/gtkdialogs.c:716 ../src/gtkdialogs.c:779
+#: ../gtk/gtkdialogs.c:653 ../gtk/gtkdialogs.c:790 ../gtk/gtkdialogs.c:870
 msgid "_Account"
 msgstr "_Konto"
 
-#: ../src/gtkdialogs.c:587
+#: ../gtk/gtkdialogs.c:661
 msgid "New Instant Message"
 msgstr "Uus välksõnum"
 
-#: ../src/gtkdialogs.c:589
-#, fuzzy
+#: ../gtk/gtkdialogs.c:663
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
-msgstr "Palun sisesta isiku nimi, kellele soovid sõnumit saata."
-
-#: ../src/gtkdialogs.c:724
+msgstr ""
+"Palun sisesta isiku ekraaninimi või alias, kellega soovid välksõnumeid "
+"vahetada."
+
+#: ../gtk/gtkdialogs.c:798
 msgid "Get User Info"
 msgstr "Kasutaja andmete hankimine"
 
-#: ../src/gtkdialogs.c:726
-#, fuzzy
+#: ../gtk/gtkdialogs.c:800
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr ""
-"Palun sisesta selle isiku ekraaninimi, kelle kohta käivat teavet sa soovid "
-"vaadata."
-
-#: ../src/gtkdialogs.c:788
+"Palun sisesta isiku ekraaninimi või alias, kelle andmeid sa soovid vaadata."
+
+#: ../gtk/gtkdialogs.c:889
 msgid "View User Log"
 msgstr "Kasutaja logi vaatamine"
 
-#: ../src/gtkdialogs.c:790
+#: ../gtk/gtkdialogs.c:891
 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."
 
-#: ../src/gtkdialogs.c:809
+#: ../gtk/gtkdialogs.c:910
 msgid "Alias Contact"
 msgstr ""
 
-#: ../src/gtkdialogs.c:810
+#: ../gtk/gtkdialogs.c:911
 msgid "Enter an alias for this contact."
 msgstr "Sisesta sellele kontaktile alias."
 
-#: ../src/gtkdialogs.c:812 ../src/gtkdialogs.c:834 ../src/gtkdialogs.c:854
-#: ../src/gtkrequest.c:277 ../src/protocols/silc/chat.c:586
-msgid "Alias"
-msgstr "Alias"
-
-#: ../src/gtkdialogs.c:830
+#: ../gtk/gtkdialogs.c:931
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Sisesta kasutajale %s alias."
 
-#: ../src/gtkdialogs.c:832
+#: ../gtk/gtkdialogs.c:933
 msgid "Alias Buddy"
 msgstr "Sõbrale aliase määramine"
 
-#: ../src/gtkdialogs.c:851
+#: ../gtk/gtkdialogs.c:952
 msgid "Alias Chat"
-msgstr ""
-
-#: ../src/gtkdialogs.c:852
+msgstr "Vestluse alias"
+
+#: ../gtk/gtkdialogs.c:953
 msgid "Enter an alias for this chat."
-msgstr ""
-
-#: ../src/gtkdialogs.c:889
+msgstr "Aliase lisamine vestlusele."
+
+#: ../gtk/gtkdialogs.c:990
 #, fuzzy, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3617,15 +2578,34 @@
 "Sa oled eemaldamas jututuba %s oma sõbranimekirjast.  Kas sa soovid seda "
 "teha?"
 
-#: ../src/gtkdialogs.c:897
+#: ../gtk/gtkdialogs.c:998
 msgid "Remove Contact"
-msgstr ""
-
-#: ../src/gtkdialogs.c:898
+msgstr "Kontakti eemaldamine"
+
+#: ../gtk/gtkdialogs.c:999
 msgid "_Remove Contact"
 msgstr "_Eemalda kontakt"
 
-#: ../src/gtkdialogs.c:949
+#: ../gtk/gtkdialogs.c:1029
+#, fuzzy, c-format
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr ""
+"Sa oled eemaldamas gruppi %s ja kõiki selle liikmeid oma sõbranimekirjast. "
+"Kas sa soovid seda teha?"
+
+#: ../gtk/gtkdialogs.c:1036
+#, fuzzy
+msgid "Merge Groups"
+msgstr "Grupi eemaldamine"
+
+#: ../gtk/gtkdialogs.c:1037
+#, fuzzy
+msgid "_Merge Groups"
+msgstr "_Kustuta grupp"
+
+#: ../gtk/gtkdialogs.c:1087
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3634,15 +2614,15 @@
 "Sa oled eemaldamas gruppi %s ja kõiki selle liikmeid oma sõbranimekirjast. "
 "Kas sa soovid seda teha?"
 
-#: ../src/gtkdialogs.c:952
+#: ../gtk/gtkdialogs.c:1090
 msgid "Remove Group"
 msgstr "Grupi eemaldamine"
 
-#: ../src/gtkdialogs.c:953
+#: ../gtk/gtkdialogs.c:1091
 msgid "_Remove Group"
 msgstr "_Eemalda grupp"
 
-#: ../src/gtkdialogs.c:986
+#: ../gtk/gtkdialogs.c:1124
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
@@ -3650,15 +2630,15 @@
 "Sa oled eemaldamas kasutajat %s oma sõbranimekirjast. Kas sa soovid seda "
 "teha?"
 
-#: ../src/gtkdialogs.c:989
+#: ../gtk/gtkdialogs.c:1127
 msgid "Remove Buddy"
 msgstr "Sõbra eemaldamine"
 
-#: ../src/gtkdialogs.c:990
+#: ../gtk/gtkdialogs.c:1128
 msgid "_Remove Buddy"
 msgstr "_Eemalda sõber"
 
-#: ../src/gtkdialogs.c:1011
+#: ../gtk/gtkdialogs.c:1149
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3667,195 +2647,259 @@
 "Sa oled eemaldamas jututuba %s oma sõbranimekirjast.  Kas sa soovid seda "
 "teha?"
 
-#: ../src/gtkdialogs.c:1014
+#: ../gtk/gtkdialogs.c:1152
 msgid "Remove Chat"
-msgstr "Jututoa eemaldamine"
-
-#: ../src/gtkdialogs.c:1015
+msgstr "Vestluse eemaldamine"
+
+#: ../gtk/gtkdialogs.c:1153
 msgid "_Remove Chat"
-msgstr "_Eemalda jututuba"
-
-#: ../src/gtkft.c:139
+msgstr "_Eemalda vestlus"
+
+#: ../gtk/gtkdocklet.c:133
+msgid "Right-click for more unread messages...\n"
+msgstr "Parema hiireklõpsuga näed veel lugemata sõnumeid...\n"
+
+#: ../gtk/gtkdocklet.c:406
+msgid "Change Status"
+msgstr "Muuda olekut"
+
+#: ../gtk/gtkdocklet.c:409 ../gtk/gtkstatusbox.c:971
+#: ../libgaim/protocols/gg/gg.c:996 ../libgaim/protocols/jabber/buddy.c:1367
+#: ../libgaim/protocols/msn/state.c:29 ../libgaim/protocols/msn/state.c:30
+#: ../libgaim/protocols/msn/state.c:37 ../libgaim/protocols/msn/state.c:38
+#: ../libgaim/protocols/novell/novell.c:2853
+#: ../libgaim/protocols/yahoo/yahoo.c:2885 ../libgaim/status.c:155
+msgid "Available"
+msgstr "Saadaval"
+
+#. Away stuff
+#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#: ../gtk/gtkdocklet.c:413 ../gtk/gtkprefs.c:1779 ../gtk/gtkstatusbox.c:972
+#: ../libgaim/protocols/gg/gg.c:999 ../libgaim/protocols/irc/irc.c:530
+#: ../libgaim/protocols/irc/msgs.c:223
+#: ../libgaim/protocols/jabber/buddy.c:1371
+#: ../libgaim/protocols/novell/novell.c:2856
+#: ../libgaim/protocols/oscar/oscar.c:694
+#: ../libgaim/protocols/oscar/oscar.c:4406
+#: ../libgaim/protocols/oscar/oscar.c:5473
+#: ../libgaim/protocols/silc/buddy.c:1469
+#: ../libgaim/protocols/yahoo/yahoo.c:3359
+#: ../libgaim/protocols/yahoo/yahoo.c:3432 ../libgaim/status.c:158
+msgid "Away"
+msgstr "Eemal"
+
+#: ../gtk/gtkdocklet.c:417 ../gtk/gtkstatusbox.c:973
+#: ../libgaim/protocols/oscar/oscar.c:698
+#: ../libgaim/protocols/yahoo/yahoo.c:2879 ../libgaim/status.c:157
+msgid "Invisible"
+msgstr "Nähtamatu"
+
+#: ../gtk/gtkdocklet.c:458
+msgid "Show Buddy List"
+msgstr "Sõbraloendi näitamine"
+
+#: ../gtk/gtkdocklet.c:484
+msgid "New Message..."
+msgstr "Uus sõnum..."
+
+#: ../gtk/gtkdocklet.c:499
+msgid "Mute Sounds"
+msgstr "Vaigista helid"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: ../gtk/gtkdocklet.c:512
+msgid "Quit"
+msgstr "Lõpeta"
+
+#: ../gtk/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: ../src/gtkft.c:160 ../src/gtkft.c:1063
+#: ../gtk/gtkft.c:153
+msgid "Not started"
+msgstr "Alustamata"
+
+#: ../gtk/gtkft.c:159 ../libgaim/account.c:1662
+#: ../libgaim/protocols/gg/gg.c:1002 ../libgaim/protocols/jabber/buddy.c:630
+#: ../libgaim/protocols/jabber/buddy.c:1361
+#: ../libgaim/protocols/jabber/buddy.c:1378
+#: ../libgaim/protocols/novell/novell.c:2868
+msgid "Unknown"
+msgstr "Tundmatu"
+
+#: ../gtk/gtkft.c:162 ../gtk/gtkft.c:1119
 msgid "Finished"
 msgstr "Lõpetatud"
 
-#: ../src/gtkft.c:163 ../src/gtkft.c:1003
+#: ../gtk/gtkft.c:165 ../gtk/gtkft.c:1059
 msgid "Canceled"
 msgstr "Tühistatud"
 
-#: ../src/gtkft.c:166 ../src/gtkft.c:922
+#: ../gtk/gtkft.c:168 ../gtk/gtkft.c:975
 msgid "Waiting for transfer to begin"
 msgstr "Oodatakse ülekande algust"
 
-#: ../src/gtkft.c:219
+#: ../gtk/gtkft.c:228
+#, fuzzy, c-format
+msgid "File Transfers - %d%% of %d files"
+msgstr "Tõrge faili ülekandmisel kasutajale %s."
+
+#: ../gtk/gtkft.c:233 ../gtk/gtkft.c:763
+msgid "File Transfers"
+msgstr "Failiülekanded"
+
+#: ../gtk/gtkft.c:273
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Saaja:</b>"
 
-#: ../src/gtkft.c:221
+#: ../gtk/gtkft.c:275
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Saatja:</b>"
 
-#: ../src/gtkft.c:225
+#: ../gtk/gtkft.c:279
 msgid "<b>Sending To:</b>"
 msgstr "<b>Faili saaja:</b>"
 
-#: ../src/gtkft.c:227
+#: ../gtk/gtkft.c:281
 msgid "<b>Sending As:</b>"
 msgstr "<b>Saatja:</b>"
 
-#: ../src/gtkft.c:443
+#: ../gtk/gtkft.c:497
 msgid "There is no application configured to open this type of file."
 msgstr "Selle faili avamiseks pole seadistustes rakendust määratud."
 
-#: ../src/gtkft.c:448
+#: ../gtk/gtkft.c:502
 msgid "An error occurred while opening the file."
 msgstr "Faili avamisel tekkis viga."
 
-#: ../src/gtkft.c:485
+#: ../gtk/gtkft.c:539
 #, fuzzy, c-format
 msgid "Error launching %s: %s"
 msgstr "Viga pildi salvestamisel: %s"
 
-#: ../src/gtkft.c:494
+#: ../gtk/gtkft.c:548
 #, fuzzy, c-format
 msgid "Error running %s"
 msgstr "Viga pildi salvestamisel: %s"
 
-#: ../src/gtkft.c:495
+#: ../gtk/gtkft.c:549
 #, c-format
 msgid "Process returned error code %d"
-msgstr ""
-
-#: ../src/gtkft.c:589
+msgstr "Protsess tagastas veakoodi %d"
+
+#: ../gtk/gtkft.c:644
 msgid "Progress"
 msgstr "Edenemine"
 
-#: ../src/gtkft.c:596
+#: ../gtk/gtkft.c:651
 msgid "Filename"
 msgstr "Failinimi"
 
-#: ../src/gtkft.c:603
+#: ../gtk/gtkft.c:658
 msgid "Size"
 msgstr "Suurus"
 
-#: ../src/gtkft.c:610
+#: ../gtk/gtkft.c:665
 msgid "Remaining"
 msgstr "Jäänud"
 
-#: ../src/gtkft.c:641
+#: ../gtk/gtkft.c:696
 msgid "Filename:"
 msgstr "Failinimi:"
 
-#: ../src/gtkft.c:642
+#: ../gtk/gtkft.c:697
 msgid "Local File:"
-msgstr ""
-
-#: ../src/gtkft.c:643
-msgid "Status:"
-msgstr "Olek:"
-
-#: ../src/gtkft.c:644
+msgstr "Kohalik fail:"
+
+#: ../gtk/gtkft.c:699
 msgid "Speed:"
 msgstr "Kiirus:"
 
-#: ../src/gtkft.c:645
+#: ../gtk/gtkft.c:700
 msgid "Time Elapsed:"
 msgstr "Aega kulunud:"
 
-#: ../src/gtkft.c:646
+#: ../gtk/gtkft.c:701
 msgid "Time Remaining:"
 msgstr "Aega jäänud:"
 
-#: ../src/gtkft.c:708
-msgid "File Transfers"
-msgstr "Failiülekanded"
-
-#: ../src/gtkft.c:731
+#: ../gtk/gtkft.c:786
 msgid "Close this window when all transfers _finish"
 msgstr "See aken sule_takse ülekannete lõppemisel"
 
-#: ../src/gtkft.c:741
+#: ../gtk/gtkft.c:796
 msgid "C_lear finished transfers"
 msgstr "_Lõpetatud ülekanded puhastatakse"
 
 #. "Download Details" arrow
-#: ../src/gtkft.c:750
+#: ../gtk/gtkft.c:805
 msgid "File transfer _details"
 msgstr "Failiülekande ü_ksikasjad"
 
-#. Pause button
-#: ../src/gtkft.c:780 ../src/gtkstock.c:146
-msgid "_Pause"
-msgstr "P_aus"
-
 #. Resume button
-#: ../src/gtkft.c:790
+#: ../gtk/gtkft.c:845
 msgid "_Resume"
 msgstr "_Jätka"
 
-#: ../src/gtkft.c:1005
+#: ../gtk/gtkft.c:1061
 msgid "Failed"
 msgstr "Nurjunud"
 
-#: ../src/gtkimhtml.c:821
-#, fuzzy
+#: ../gtk/gtkimhtml.c:814
 msgid "Paste as Plain _Text"
-msgstr "Lihttekst"
-
-#: ../src/gtkimhtml.c:833
-#, fuzzy
+msgstr "Aseta _lihttekstina"
+
+#: ../gtk/gtkimhtml.c:826
 msgid "_Reset formatting"
 msgstr "_Puhasta vormindus"
 
-#: ../src/gtkimhtml.c:1327
+#: ../gtk/gtkimhtml.c:1318
 msgid "Hyperlink color"
 msgstr "Hüperviida värv"
 
-#: ../src/gtkimhtml.c:1328
+#: ../gtk/gtkimhtml.c:1319
 msgid "Color to draw hyperlinks."
-msgstr ""
-
-#: ../src/gtkimhtml.c:1331
-#, fuzzy
+msgstr "Hüperviitade joonistamise värv."
+
+#: ../gtk/gtkimhtml.c:1322
 msgid "Hyperlink prelight color"
-msgstr "Hüperviida värv"
-
-#: ../src/gtkimhtml.c:1332
+msgstr "Hüperviida värv fookuses"
+
+#: ../gtk/gtkimhtml.c:1323
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr ""
-
-#: ../src/gtkimhtml.c:1553
+msgstr "Hüperviitade joonistamise värv hiirekursori fookuse korral."
+
+#: ../gtk/gtkimhtml.c:1544
 msgid "_Copy E-Mail Address"
 msgstr "_Kopeeri e-posti aadress"
 
-#: ../src/gtkimhtml.c:1565
+#: ../gtk/gtkimhtml.c:1556
 msgid "_Open Link in Browser"
 msgstr "_Ava viit veebisirvijas"
 
-#: ../src/gtkimhtml.c:1575
+#: ../gtk/gtkimhtml.c:1566
 msgid "_Copy Link Location"
 msgstr "_Kopeeri viida asukoht"
 
-#: ../src/gtkimhtml.c:3272
+#: ../gtk/gtkimhtml.c:3298
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
 
-#: ../src/gtkimhtml.c:3275
+#: ../gtk/gtkimhtml.c:3301
 msgid ""
 "Unrecognized file type\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
 
-#: ../src/gtkimhtml.c:3288
+#: ../gtk/gtkimhtml.c:3314
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3866,7 +2910,7 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3291
+#: ../gtk/gtkimhtml.c:3317
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3877,181 +2921,181 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3371 ../src/gtkimhtml.c:3383
+#: ../gtk/gtkimhtml.c:3397 ../gtk/gtkimhtml.c:3409
 msgid "Save Image"
 msgstr ""
 
-#: ../src/gtkimhtml.c:3411
+#: ../gtk/gtkimhtml.c:3437
 msgid "_Save Image..."
 msgstr ""
 
-#: ../src/gtkimhtmltoolbar.c:147
+#: ../gtk/gtkimhtmltoolbar.c:147
 msgid "Select Font"
 msgstr "Kirjatüübi valimine"
 
-#: ../src/gtkimhtmltoolbar.c:226
+#: ../gtk/gtkimhtmltoolbar.c:226
 msgid "Select Text Color"
 msgstr "Teksti värvi valimine"
 
-#: ../src/gtkimhtmltoolbar.c:305
+#: ../gtk/gtkimhtmltoolbar.c:305
 msgid "Select Background Color"
 msgstr "Taustavärvi valimine"
 
-#: ../src/gtkimhtmltoolbar.c:394
+#: ../gtk/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: ../src/gtkimhtmltoolbar.c:402
+#: ../gtk/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "_Kirjeldus"
 
-#: ../src/gtkimhtmltoolbar.c:405
+#: ../gtk/gtkimhtmltoolbar.c:405
 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."
 
-#: ../src/gtkimhtmltoolbar.c:409
+#: ../gtk/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
-msgstr "Palin sisesta URL, mida soovid lisada."
-
-#: ../src/gtkimhtmltoolbar.c:414
+msgstr "Palun sisesta URL, mida soovid lisada."
+
+#: ../gtk/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "Viida lisamine"
 
-#: ../src/gtkimhtmltoolbar.c:418
+#: ../gtk/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "L_isa"
 
-#: ../src/gtkimhtmltoolbar.c:487
+#: ../gtk/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr ""
 
-#: ../src/gtkimhtmltoolbar.c:513 ../src/gtkimhtmltoolbar.c:523
+#: ../gtk/gtkimhtmltoolbar.c:513 ../gtk/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
-msgstr ""
-
-#: ../src/gtkimhtmltoolbar.c:721
+msgstr "Pildi lisamine"
+
+#: ../gtk/gtkimhtmltoolbar.c:721
 msgid "This theme has no available smileys."
 msgstr "Selles teemas pole tujunägusid"
 
 #. show everything
-#: ../src/gtkimhtmltoolbar.c:735
+#: ../gtk/gtkimhtmltoolbar.c:735
 msgid "Smile!"
-msgstr ""
-
-#: ../src/gtkimhtmltoolbar.c:923
+msgstr "Naeratus!"
+
+#: ../gtk/gtkimhtmltoolbar.c:922
 msgid "Bold"
 msgstr "Rasvane"
 
-#: ../src/gtkimhtmltoolbar.c:934
+#: ../gtk/gtkimhtmltoolbar.c:933
 msgid "Italic"
 msgstr "Kursiiv"
 
-#: ../src/gtkimhtmltoolbar.c:945
+#: ../gtk/gtkimhtmltoolbar.c:944
 msgid "Underline"
 msgstr "Allajoonitud"
 
-#: ../src/gtkimhtmltoolbar.c:961
+#: ../gtk/gtkimhtmltoolbar.c:960
 msgid "Larger font size"
 msgstr "Suurem kirjatüübi suurus"
 
-#: ../src/gtkimhtmltoolbar.c:973
+#: ../gtk/gtkimhtmltoolbar.c:972
 msgid "Smaller font size"
 msgstr "Väiksem kirjatüübi suurus"
 
-#: ../src/gtkimhtmltoolbar.c:990
-msgid "Font Face"
+#: ../gtk/gtkimhtmltoolbar.c:989
+#, fuzzy
+msgid "Font face"
 msgstr "Kirjatüüp"
 
-#: ../src/gtkimhtmltoolbar.c:1002
+#: ../gtk/gtkimhtmltoolbar.c:1001
 msgid "Foreground font color"
 msgstr "Teksti värv"
 
-#: ../src/gtkimhtmltoolbar.c:1014
+#: ../gtk/gtkimhtmltoolbar.c:1013
 msgid "Background color"
 msgstr "Taustavärv"
 
-#: ../src/gtkimhtmltoolbar.c:1030
-#, fuzzy
+#: ../gtk/gtkimhtmltoolbar.c:1029
 msgid "Reset formatting"
-msgstr "_Puhasta vormindus"
-
-#: ../src/gtkimhtmltoolbar.c:1045
+msgstr "Vorminduse algväärtustamine"
+
+#: ../gtk/gtkimhtmltoolbar.c:1044
 msgid "Insert link"
 msgstr "Viida lisamine"
 
-#: ../src/gtkimhtmltoolbar.c:1055
+#: ../gtk/gtkimhtmltoolbar.c:1054
 msgid "Insert image"
 msgstr "Pildi lisamine"
 
-#: ../src/gtkimhtmltoolbar.c:1066
+#: ../gtk/gtkimhtmltoolbar.c:1065
 msgid "Insert smiley"
 msgstr "Tujunäo lisamine"
 
-#: ../src/gtklog.c:207
+#: ../gtk/gtklog.c:238
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr ""
 
-#: ../src/gtklog.c:212
+#: ../gtk/gtklog.c:243
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr ""
 
-#: ../src/gtklog.c:261
+#: ../gtk/gtklog.c:292
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../src/gtklog.c:308
+#: ../gtk/gtklog.c:339
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
 
-#: ../src/gtklog.c:312
+#: ../gtk/gtklog.c:343
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
 
-#: ../src/gtklog.c:315
+#: ../gtk/gtklog.c:346
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Vestluseid logitakse ainult juhul, kui eelistus \"Kõiki vestlusi logitakse\" "
 "on märgitud."
 
-#: ../src/gtklog.c:319
+#: ../gtk/gtklog.c:350
 msgid "No logs were found"
 msgstr "Logisid ei leitud"
 
-#: ../src/gtklog.c:398
+#: ../gtk/gtklog.c:429
 msgid "Total log size:"
 msgstr "Logide kogusuurus:"
 
-#: ../src/gtklog.c:464
+#: ../gtk/gtklog.c:495
 #, c-format
 msgid "Conversations in %s"
 msgstr "Vestlused %s peal"
 
-#: ../src/gtklog.c:472 ../src/gtklog.c:523
+#: ../gtk/gtklog.c:503 ../gtk/gtklog.c:554
 #, c-format
 msgid "Conversations with %s"
 msgstr "Vestlused - %s"
 
-#: ../src/gtklog.c:548
+#: ../gtk/gtklog.c:579
 msgid "System Log"
 msgstr "Süsteemne logi"
 
-#: ../src/gtkmain.c:307
+#: ../gtk/gtkmain.c:344
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Lähema teabe saamiseks kasuta `%s -h' for more information.\n"
 
-#: ../src/gtkmain.c:309
+#: ../gtk/gtkmain.c:346
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4080,7 +3124,7 @@
 "  -v, --version          käesoleva versiooni kuvamine ja programmi töö\n"
 "                         lõpetamine\n"
 
-#: ../src/gtkmain.c:492
+#: ../gtk/gtkmain.c:528
 #, c-format
 msgid ""
 "Gaim has segfaulted and attempted to dump a core file.\n"
@@ -4102,25 +3146,12 @@
 "%scontactinfo.php\n"
 msgstr ""
 
-#: ../src/gtknotify.c:327
-#, fuzzy
-msgid "New Mail"
-msgstr "_Ava sõnum"
-
-#: ../src/gtknotify.c:343
+#: ../gtk/gtknotify.c:348
 #, fuzzy
 msgid "Open All Messages"
 msgstr "Sõnumi saatmine"
 
-#: ../src/gtknotify.c:409 ../src/protocols/jabber/jabber.c:1115
-msgid "From"
-msgstr ""
-
-#: ../src/gtknotify.c:418
-msgid "Subject"
-msgstr ""
-
-#: ../src/gtknotify.c:427
+#: ../gtk/gtknotify.c:432
 #, fuzzy
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr ""
@@ -4128,14 +3159,14 @@
 "\n"
 "%s"
 
-#: ../src/gtknotify.c:493
+#: ../gtk/gtknotify.c:498
 #, 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."
 
-#: ../src/gtknotify.c:498
+#: ../gtk/gtknotify.c:503
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4146,53 +3177,44 @@
 "\n"
 "%s"
 
-#: ../src/gtknotify.c:685 ../src/protocols/sametime/sametime.c:5458
+#: ../gtk/gtknotify.c:692 ../libgaim/protocols/sametime/sametime.c:5459
 msgid "Search Results"
 msgstr "Otsingutulemused"
 
-#: ../src/gtknotify.c:841 ../src/protocols/oscar/oscar.c:2626
-#, c-format
-msgid "Info for %s"
-msgstr "Andmed: %s"
-
-#: ../src/gtknotify.c:842 ../src/protocols/toc/toc.c:470
-msgid "Buddy Information"
-msgstr "Sõbra andmed"
-
-#: ../src/gtknotify.c:881
+#: ../gtk/gtknotify.c:890
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr ""
 
-#: ../src/gtknotify.c:883 ../src/gtknotify.c:895 ../src/gtknotify.c:908
-#: ../src/gtknotify.c:1031
+#: ../gtk/gtknotify.c:892 ../gtk/gtknotify.c:904 ../gtk/gtknotify.c:917
+#: ../gtk/gtknotify.c:1045
 msgid "Unable to open URL"
 msgstr "URL'i pole võimalik avada"
 
-#: ../src/gtknotify.c:893 ../src/gtknotify.c:906
+#: ../gtk/gtknotify.c:902 ../gtk/gtknotify.c:915
 #, fuzzy, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Viga pildi salvestamisel: %s"
 
-#: ../src/gtknotify.c:1032
+#: ../gtk/gtknotify.c:1046
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
-#: ../src/gtkplugin.c:274
+#: ../gtk/gtkplugin.c:274
 msgid "The following plugins will be unloaded."
 msgstr ""
 
-#: ../src/gtkplugin.c:293
+#: ../gtk/gtkplugin.c:293
 msgid "Multiple plugins will be unloaded."
 msgstr ""
 
-#: ../src/gtkplugin.c:295
+#: ../gtk/gtkplugin.c:295
 #, fuzzy
 msgid "Unload Plugins"
 msgstr "Pluginad"
 
-#: ../src/gtkplugin.c:407
+#: ../gtk/gtkplugin.c:407
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -4203,7 +3225,7 @@
 "<span weight=\"bold\">Veebikoht:</span>\t\t%s\n"
 "<span weight=\"bold\">Failinimi:</span>\t\t%s"
 
-#: ../src/gtkplugin.c:417
+#: ../gtk/gtkplugin.c:417
 #, c-format
 msgid ""
 "%s\n"
@@ -4211,201 +3233,205 @@
 "Check the plugin website for an update.</span>"
 msgstr ""
 
-#: ../src/gtkplugin.c:543
+#: ../gtk/gtkplugin.c:543
 msgid "Configure Pl_ugin"
 msgstr "Seadista pl_uginat"
 
-#: ../src/gtkplugin.c:601
+#: ../gtk/gtkplugin.c:603
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Plugina üksikasjad</b>"
 
-#: ../src/gtkpounce.c:162
+#: ../gtk/gtkpounce.c:155
 msgid "Select a file"
 msgstr "Faili valimine"
 
-#: ../src/gtkpounce.c:259
+#: ../gtk/gtkpounce.c:252
 msgid "Please enter a buddy to pounce."
 msgstr ""
 
-#: ../src/gtkpounce.c:503
+#: ../gtk/gtkpounce.c:499
 msgid "New Buddy Pounce"
 msgstr "Uus sõbramärguanne"
 
-#: ../src/gtkpounce.c:503
+#: ../gtk/gtkpounce.c:499
 msgid "Edit Buddy Pounce"
 msgstr "Sõbramärguande redigeerimine"
 
 #. Create the "Pounce on Whom" frame.
-#: ../src/gtkpounce.c:520
+#: ../gtk/gtkpounce.c:516
 msgid "Pounce on Whom"
 msgstr "Kellest märku antakse"
 
-#: ../src/gtkpounce.c:547
+#: ../gtk/gtkpounce.c:543
 msgid "_Buddy name:"
 msgstr "Sõbra _nimi:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../src/gtkpounce.c:573
+#: ../gtk/gtkpounce.c:569
 msgid "Pounce When Buddy..."
-msgstr "Märguanne kui sõber..."
-
-#: ../src/gtkpounce.c:581
+msgstr "Märguanne, kui sõber..."
+
+#: ../gtk/gtkpounce.c:577
 msgid "Si_gns on"
 msgstr "Lo_gib sisse"
 
-#: ../src/gtkpounce.c:583
+#: ../gtk/gtkpounce.c:579
 msgid "Signs o_ff"
-msgstr "_Logib _välja"
-
-#: ../src/gtkpounce.c:585
+msgstr "Logib _välja"
+
+#: ../gtk/gtkpounce.c:581
 msgid "Goes a_way"
 msgstr "_Eemaldub"
 
-#: ../src/gtkpounce.c:587
+#: ../gtk/gtkpounce.c:583
 msgid "Ret_urns from away"
 msgstr "_Pöördub eemalolekust tagasi"
 
-#: ../src/gtkpounce.c:589
+#: ../gtk/gtkpounce.c:585
 msgid "Becomes _idle"
 msgstr "Jääb _jõude"
 
-#: ../src/gtkpounce.c:591
+#: ../gtk/gtkpounce.c:587
 msgid "Is no longer i_dle"
 msgstr "_Naaseb jõudeolekust"
 
-#: ../src/gtkpounce.c:593
+#: ../gtk/gtkpounce.c:589
 msgid "Starts _typing"
 msgstr "Alustab _tippimist"
 
-#: ../src/gtkpounce.c:595
+#: ../gtk/gtkpounce.c:591
+msgid "P_auses while typing"
+msgstr ""
+
+#: ../gtk/gtkpounce.c:593
 msgid "Stops t_yping"
 msgstr "Lõpetab _tippimise"
 
-#: ../src/gtkpounce.c:597
+#: ../gtk/gtkpounce.c:595
 msgid "Sends a _message"
 msgstr "Saada_b sõnumi"
 
 #. Create the "Action" frame.
-#: ../src/gtkpounce.c:629
+#: ../gtk/gtkpounce.c:630
 msgid "Action"
 msgstr "Tegevus"
 
-#: ../src/gtkpounce.c:637
+#: ../gtk/gtkpounce.c:638
 msgid "Ope_n an IM window"
 msgstr "_Avatakse välksõnumi aken"
 
-#: ../src/gtkpounce.c:639
+#: ../gtk/gtkpounce.c:640
 msgid "_Pop up a notification"
 msgstr "Kuvatakse teavituse _hüpikakent"
 
-#: ../src/gtkpounce.c:641
+#: ../gtk/gtkpounce.c:642
 msgid "Send a _message"
 msgstr "Saa_detakse sõnum"
 
-#: ../src/gtkpounce.c:643
+#: ../gtk/gtkpounce.c:644
 msgid "E_xecute a command"
 msgstr "_Käivitatakse käsk"
 
-#: ../src/gtkpounce.c:645
+#: ../gtk/gtkpounce.c:646
 msgid "P_lay a sound"
 msgstr "Mängitakse _heli"
 
-#: ../src/gtkpounce.c:650
+#: ../gtk/gtkpounce.c:651
 msgid "Brows_e..."
 msgstr "_Sirvi..."
 
-#: ../src/gtkpounce.c:652
+#: ../gtk/gtkpounce.c:653
 msgid "Br_owse..."
 msgstr "_Sirvi..."
 
-#: ../src/gtkpounce.c:653
+#: ../gtk/gtkpounce.c:654
 msgid "Pre_view"
 msgstr "_Eelvaade"
 
-#. Create the "Options" frame.
-#: ../src/gtkpounce.c:765
-msgid "Options"
-msgstr "Valikud"
-
-#: ../src/gtkpounce.c:773
+#: ../gtk/gtkpounce.c:774
 msgid "P_ounce only when my status is not available"
-msgstr "_Märguanne ainult juhul kui ma pole saadaval"
-
-#: ../src/gtkpounce.c:778
+msgstr "_Märguanne ainult juhul, kui ma pole saadaval"
+
+#: ../gtk/gtkpounce.c:779
 msgid "_Recurring"
 msgstr "_Korduv"
 
-#: ../src/gtkpounce.c:1092
-#, fuzzy, c-format
+#: ../gtk/gtkpounce.c:1085
+#, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "Kas sa soovid kustutada kontot %s?"
-
-#: ../src/gtkpounce.c:1240
+msgstr "Kas sa soovid kustutada %2$s märguande %1$s kohta?"
+
+#: ../gtk/gtkpounce.c:1233
 msgid "Pounce Target"
-msgstr ""
-
-#: ../src/gtkpounce.c:1275
+msgstr "Kelle kohta"
+
+#: ../gtk/gtkpounce.c:1268
 msgid "Recurring"
-msgstr ""
-
-#: ../src/gtkpounce.c:1322
+msgstr "Korduv"
+
+#: ../gtk/gtkpounce.c:1315
 msgid "Buddy Pounces"
 msgstr "Sõbramärguanded"
 
-#: ../src/gtkpounce.c:1449
+#: ../gtk/gtkpounce.c:1442
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s alustas sulle sõnumi sisestamist (%s)"
 
-#: ../src/gtkpounce.c:1451
+#: ../gtk/gtkpounce.c:1444
+#, fuzzy, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "%s alustas sulle sõnumi sisestamist (%s)"
+
+#: ../gtk/gtkpounce.c:1446
 #, c-format
 msgid "%s has signed on (%s)"
-msgstr ""
-
-#: ../src/gtkpounce.c:1453
+msgstr "%s logis sisse (%s)"
+
+#: ../gtk/gtkpounce.c:1448
 #, c-format
 msgid "%s has returned from being idle (%s)"
-msgstr ""
-
-#: ../src/gtkpounce.c:1455
+msgstr "%s pole enam jõude (%s)"
+
+#: ../gtk/gtkpounce.c:1450
 #, c-format
 msgid "%s has returned from being away (%s)"
-msgstr ""
-
-#: ../src/gtkpounce.c:1457
+msgstr "%s naases eemalolekust (%s)"
+
+#: ../gtk/gtkpounce.c:1452
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s lõpetas sulle sõnumi sisestamise (%s)"
 
-#: ../src/gtkpounce.c:1459
+#: ../gtk/gtkpounce.c:1454
 #, c-format
 msgid "%s has signed off (%s)"
-msgstr ""
-
-#: ../src/gtkpounce.c:1461
+msgstr "%s logis välja (%s)"
+
+#: ../gtk/gtkpounce.c:1456
 #, c-format
 msgid "%s has become idle (%s)"
-msgstr ""
-
-#: ../src/gtkpounce.c:1463
+msgstr "%s jäi jõude (%s)"
+
+#: ../gtk/gtkpounce.c:1458
 #, c-format
 msgid "%s has gone away. (%s)"
-msgstr ""
-
-#: ../src/gtkpounce.c:1465
-#, fuzzy, c-format
+msgstr "%s eemaldus. (%s)"
+
+#: ../gtk/gtkpounce.c:1460
+#, c-format
 msgid "%s has sent you a message. (%s)"
-msgstr "%s soovib saata sulle faili %s (%s)"
-
-#: ../src/gtkpounce.c:1466
+msgstr "%s saatis sulle sõnumi. (%s)"
+
+#: ../gtk/gtkpounce.c:1461
 msgid "Unknown pounce event. Please report this!"
 msgstr "Tundmatu teavitussündmus. Palun anna sellest teada!"
 
-#: ../src/gtkprefs.c:512
+#: ../gtk/gtkprefs.c:512
 msgid "Smiley theme failed to unpack."
 msgstr "Tõrge tujunägude teema lahtipakkimisel"
 
-#: ../src/gtkprefs.c:638
+#: ../gtk/gtkprefs.c:641
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -4413,52 +3439,64 @@
 "Vali allolevast loendist tujunägude teema, mida sa soovid kasutada. Uusi "
 "teemasid saab paigaldada lohistades neid teemade nimekirja."
 
-#: ../src/gtkprefs.c:673
+#: ../gtk/gtkprefs.c:676
 msgid "Icon"
 msgstr "Ikoon"
 
-#: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:267
-#: ../src/protocols/jabber/buddy.c:818 ../src/protocols/jabber/chat.c:769
+#: ../gtk/gtkprefs.c:683 ../libgaim/protocols/jabber/buddy.c:286
+#: ../libgaim/protocols/jabber/buddy.c:923
+#: ../libgaim/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "Kirjeldus"
 
-#: ../src/gtkprefs.c:821
+#: ../gtk/gtkprefs.c:824
 msgid "_Hide new IM conversations"
 msgstr "Uued välksõnumivestlused _peidetakse"
 
-#: ../src/gtkprefs.c:824 ../src/gtkprefs.c:1764
+#: ../gtk/gtkprefs.c:826 ../gtk/gtkprefs.c:1769 ../gtk/gtkprefs.c:1783
+#: ../gtk/plugins/win32/winprefs/winprefs.c:334
+msgid "Never"
+msgstr "Mitte iial"
+
+#: ../gtk/gtkprefs.c:827 ../gtk/gtkprefs.c:1784
 msgid "When away"
 msgstr "Kui olen eemal"
 
-#: ../src/gtkprefs.c:828
+#: ../gtk/gtkprefs.c:828 ../gtk/plugins/timestamp_format.c:39
+#: ../gtk/plugins/timestamp_format.c:48
+#: ../gtk/plugins/win32/winprefs/winprefs.c:335
+msgid "Always"
+msgstr "Alati"
+
+#: ../gtk/gtkprefs.c:831
 msgid "Send unknown \"_slash\" commands as messages"
 msgstr "Tun_dmatute \"kaldkriipsuga\" käskude saatmine sõnumitena"
 
-#: ../src/gtkprefs.c:830
+#: ../gtk/gtkprefs.c:833
 msgid "Show _formatting on incoming messages"
 msgstr "Sissetulevate sõnumite vorminduse _näitamine"
 
-#: ../src/gtkprefs.c:833
+#: ../gtk/gtkprefs.c:836
 msgid "Show buddy _icons"
 msgstr "Sõbra _ikoon on nähtavalt"
 
-#: ../src/gtkprefs.c:835
+#: ../gtk/gtkprefs.c:838
 msgid "Enable buddy ic_on animation"
 msgstr "Sõbrai_kooni animatsioon on lubatud"
 
-#: ../src/gtkprefs.c:842
+#: ../gtk/gtkprefs.c:845
 msgid "_Notify buddies that you are typing to them"
-msgstr "Sõprade _teavitamine kui sa oled neile sõnumit kirjutamas"
-
-#: ../src/gtkprefs.c:845
+msgstr "Sõprade _teavitamine, kui sa oled neile sõnumit kirjutamas"
+
+#: ../gtk/gtkprefs.c:848
 msgid "Highlight _misspelled words"
 msgstr "Õigekirjaprobleemidega sõnade _esiletõstmine"
 
-#: ../src/gtkprefs.c:849
+#: ../gtk/gtkprefs.c:852
 msgid "Use smooth-scrolling"
 msgstr "Pehme kerimine"
 
-#: ../src/gtkprefs.c:865
+#: ../gtk/gtkprefs.c:868
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -4467,161 +3505,169 @@
 "protokolli. :)"
 
 #. All the tab options!
-#: ../src/gtkprefs.c:887
+#: ../gtk/gtkprefs.c:890
 msgid "Tab Options"
 msgstr "Sakkide valikud"
 
-#: ../src/gtkprefs.c:889
+#: ../gtk/gtkprefs.c:892
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "_Välksõnumid ja vestlused sakkidega aknas"
 
-#: ../src/gtkprefs.c:903
+#: ../gtk/gtkprefs.c:906
 msgid "Show close b_utton on tabs"
 msgstr "Sakkidel näidatakse sul_gemisnuppu"
 
-#: ../src/gtkprefs.c:909
+#: ../gtk/gtkprefs.c:912
 msgid "_Placement:"
 msgstr "_Asetus:"
 
-#: ../src/gtkprefs.c:911
+#: ../gtk/gtkprefs.c:914
 msgid "Top"
 msgstr "Üleval"
 
-#: ../src/gtkprefs.c:912
+#: ../gtk/gtkprefs.c:915
 msgid "Bottom"
 msgstr "All"
 
-#: ../src/gtkprefs.c:913
+#: ../gtk/gtkprefs.c:916
 msgid "Left"
 msgstr "Vasakul"
 
-#: ../src/gtkprefs.c:914
+#: ../gtk/gtkprefs.c:917
 msgid "Right"
 msgstr "Paremal"
 
-#: ../src/gtkprefs.c:916
+#: ../gtk/gtkprefs.c:919
 msgid "Left Vertical"
 msgstr "Vertikaalselt vasakul"
 
-#: ../src/gtkprefs.c:917
+#: ../gtk/gtkprefs.c:920
 msgid "Right Vertical"
 msgstr "Vertikaalselt paremal"
 
-#: ../src/gtkprefs.c:922
+#: ../gtk/gtkprefs.c:925
 msgid "N_ew conversations:"
 msgstr "_Uued vestlused:"
 
-#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:797
-#: ../src/protocols/oscar/oscar.c:3622
+#: ../gtk/gtkprefs.c:976 ../libgaim/protocols/oscar/oscar.c:779
+#: ../libgaim/protocols/oscar/oscar.c:3627
 msgid "IP Address"
 msgstr "IP aadress"
 
-#: ../src/gtkprefs.c:975
+#: ../gtk/gtkprefs.c:978
 msgid "ST_UN server:"
 msgstr "ST_UN server:"
 
-#: ../src/gtkprefs.c:977
+#: ../gtk/gtkprefs.c:990
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr ""
+
+#: ../gtk/gtkprefs.c:994
 msgid "_Autodetect IP address"
 msgstr "IP aadressi _automaattuvastus"
 
-#: ../src/gtkprefs.c:986
+#: ../gtk/gtkprefs.c:1003
 msgid "Public _IP:"
 msgstr "Avalik _IP:"
 
-#: ../src/gtkprefs.c:1014
+#: ../gtk/gtkprefs.c:1032
 msgid "Ports"
 msgstr "Pordid"
 
-#: ../src/gtkprefs.c:1017
+#: ../gtk/gtkprefs.c:1035
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Kuulatavate portide vahemiku käsitsi määramine"
 
-#: ../src/gtkprefs.c:1020
+#: ../gtk/gtkprefs.c:1038
 msgid "_Start port:"
 msgstr "Al_gusport:"
 
-#: ../src/gtkprefs.c:1027
+#: ../gtk/gtkprefs.c:1045
 msgid "_End port:"
 msgstr "_Lõpuport:"
 
-#: ../src/gtkprefs.c:1035
+#: ../gtk/gtkprefs.c:1053
 msgid "Proxy Server"
 msgstr "Proksi server"
 
-#: ../src/gtkprefs.c:1039
+#: ../gtk/gtkprefs.c:1057
 msgid "No proxy"
 msgstr "Proksi puudub"
 
-#: ../src/gtkprefs.c:1095
+#: ../gtk/gtkprefs.c:1113
 msgid "_User:"
 msgstr "Kasuta_ja:"
 
-#: ../src/gtkprefs.c:1157
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: ../src/gtkprefs.c:1158
-msgid "Firebird"
-msgstr "Firebird"
-
-#: ../src/gtkprefs.c:1159
-msgid "Firefox"
-msgstr "Firefox"
-
-#: ../src/gtkprefs.c:1160
-msgid "Galeon"
-msgstr "Galeon"
-
-#: ../src/gtkprefs.c:1161
+#: ../gtk/gtkprefs.c:1176
+msgid "Seamonkey"
+msgstr ""
+
+#: ../gtk/gtkprefs.c:1177
+msgid "Opera"
+msgstr "Opera"
+
+#: ../gtk/gtkprefs.c:1178
+msgid "Netscape"
+msgstr "Netscape"
+
+#: ../gtk/gtkprefs.c:1179
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: ../gtk/gtkprefs.c:1180
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../gtk/gtkprefs.c:1181
 #, fuzzy
 msgid "GNOME Default"
 msgstr "Gnome vaikimisi"
 
-#: ../src/gtkprefs.c:1162
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: ../src/gtkprefs.c:1163
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: ../src/gtkprefs.c:1164
-msgid "Netscape"
-msgstr "Netscape"
-
-#: ../src/gtkprefs.c:1165
-msgid "Opera"
-msgstr "Opera"
-
-#: ../src/gtkprefs.c:1174
+#: ../gtk/gtkprefs.c:1182
+msgid "Galeon"
+msgstr "Galeon"
+
+#: ../gtk/gtkprefs.c:1183
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../gtk/gtkprefs.c:1184
+msgid "Firebird"
+msgstr "Firebird"
+
+#: ../gtk/gtkprefs.c:1185
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../gtk/gtkprefs.c:1194
 msgid "Manual"
 msgstr "Käsitsi"
 
-#: ../src/gtkprefs.c:1227
+#: ../gtk/gtkprefs.c:1247
 msgid "Browser Selection"
 msgstr "Veebisirvija valimine"
 
-#: ../src/gtkprefs.c:1231
+#: ../gtk/gtkprefs.c:1251
 msgid "_Browser:"
 msgstr "Si_rvija:"
 
-#: ../src/gtkprefs.c:1239
+#: ../gtk/gtkprefs.c:1259
 msgid "_Open link in:"
 msgstr "_Viitade avamine:"
 
-#: ../src/gtkprefs.c:1241
+#: ../gtk/gtkprefs.c:1261
 msgid "Browser default"
 msgstr "Veebisirvija vaikimisi sätted"
 
-#: ../src/gtkprefs.c:1242
+#: ../gtk/gtkprefs.c:1262
 msgid "Existing window"
 msgstr "Olemasolevasse aknasse"
 
-#: ../src/gtkprefs.c:1244
+#: ../gtk/gtkprefs.c:1264
 msgid "New tab"
 msgstr "Uude sakki"
 
-#: ../src/gtkprefs.c:1258
+#: ../gtk/gtkprefs.c:1278
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4630,84 +3676,79 @@
 "_Käsitsi:\n"
 "(%s URL'i jaoks)"
 
-#: ../src/gtkprefs.c:1294 ../src/gtkprefs.c:1875
-msgid "Logging"
-msgstr "Logimine"
-
-#: ../src/gtkprefs.c:1297
+#: ../gtk/gtkprefs.c:1317
 msgid "Log _format:"
 msgstr "Logi_vorming:"
 
-#: ../src/gtkprefs.c:1302
+#: ../gtk/gtkprefs.c:1322
 msgid "Log all _instant messages"
 msgstr "Kõiki välksõnumeid _logitakse"
 
-#: ../src/gtkprefs.c:1304
+#: ../gtk/gtkprefs.c:1324
 msgid "Log all c_hats"
 msgstr "Kõiki _vestlusi logitakse"
 
-#: ../src/gtkprefs.c:1306
+#: ../gtk/gtkprefs.c:1326
 msgid "Log all _status changes to system log"
 msgstr "Kõiki _olekumuutusi logitakse süsteemsesse logisse"
 
-#: ../src/gtkprefs.c:1454
+#: ../gtk/gtkprefs.c:1474
 msgid "Sound Selection"
 msgstr "Heli valimine"
 
-#: ../src/gtkprefs.c:1462
+#: ../gtk/gtkprefs.c:1482
 msgid "Quietest"
 msgstr "Vaikseim"
 
-#: ../src/gtkprefs.c:1464
+#: ../gtk/gtkprefs.c:1484
 msgid "Quieter"
 msgstr "Vaiksem"
 
-#: ../src/gtkprefs.c:1466
+#: ../gtk/gtkprefs.c:1486
 msgid "Quiet"
 msgstr "Vaikne"
 
-#: ../src/gtkprefs.c:1468 ../src/protocols/silc/silc.c:670
+#: ../gtk/gtkprefs.c:1488 ../libgaim/protocols/silc/silc.c:670
 msgid "Normal"
 msgstr "Tavaline"
 
-#: ../src/gtkprefs.c:1470
+#: ../gtk/gtkprefs.c:1490
 msgid "Loud"
 msgstr "Valju"
 
-#: ../src/gtkprefs.c:1472
+#: ../gtk/gtkprefs.c:1492
 msgid "Louder"
 msgstr "Valjem"
 
-#: ../src/gtkprefs.c:1474
+#: ../gtk/gtkprefs.c:1494
 msgid "Loudest"
 msgstr "Kõige valjem"
 
-#: ../src/gtkprefs.c:1537
+#: ../gtk/gtkprefs.c:1557
 msgid "Sound Method"
 msgstr "Helitegemise meetod"
 
-#: ../src/gtkprefs.c:1538
+#: ../gtk/gtkprefs.c:1558
 msgid "_Method:"
 msgstr "_Meetod"
 
-#: ../src/gtkprefs.c:1540
+#: ../gtk/gtkprefs.c:1560
 msgid "Console beep"
 msgstr "Konsoolipiiks"
 
-#: ../src/gtkprefs.c:1542
+#: ../gtk/gtkprefs.c:1562
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: ../src/gtkprefs.c:1547
+#: ../gtk/gtkprefs.c:1567
 msgid "Command"
 msgstr "Käsk"
 
-#: ../src/gtkprefs.c:1548
-#, fuzzy
+#: ../gtk/gtkprefs.c:1568
 msgid "No sounds"
-msgstr "Helid"
-
-#: ../src/gtkprefs.c:1556
+msgstr "Helid puuduvad"
+
+#: ../gtk/gtkprefs.c:1576
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4716,199 +3757,199 @@
 "Helitegemise _käsk:\n"
 "(%s failinime jaoks)"
 
-#: ../src/gtkprefs.c:1582
+#: ../gtk/gtkprefs.c:1602
 msgid "Sound Options"
 msgstr "Helide valikud"
 
-#: ../src/gtkprefs.c:1583
+#: ../gtk/gtkprefs.c:1603
 msgid "Sounds when conversation has _focus"
-msgstr "_Heli kui vestlus saab fookuse"
-
-#: ../src/gtkprefs.c:1585
+msgstr "_Heli, kui vestlus saab fookuse"
+
+#: ../gtk/gtkprefs.c:1605
 msgid "_Sounds while away"
 msgstr "Helid ka _eemal olles"
 
-#: ../src/gtkprefs.c:1592
+#: ../gtk/gtkprefs.c:1612
 msgid "Volume:"
 msgstr "Valjus:"
 
-#: ../src/gtkprefs.c:1620
+#: ../gtk/gtkprefs.c:1640
 msgid "Sound Events"
 msgstr "Helisündmused"
 
-#: ../src/gtkprefs.c:1671
+#: ../gtk/gtkprefs.c:1691
 msgid "Play"
 msgstr "Mängida"
 
-#: ../src/gtkprefs.c:1678
+#: ../gtk/gtkprefs.c:1698
 msgid "Event"
 msgstr "Sündmus"
 
-#: ../src/gtkprefs.c:1697
+#: ../gtk/gtkprefs.c:1717
 msgid "Test"
 msgstr "Proovi"
 
-#: ../src/gtkprefs.c:1701
+#: ../gtk/gtkprefs.c:1721
 msgid "Reset"
 msgstr "Algväärtusta"
 
-#: ../src/gtkprefs.c:1705
+#: ../gtk/gtkprefs.c:1725
 msgid "Choose..."
 msgstr "Vali..."
 
-#: ../src/gtkprefs.c:1747
+#: ../gtk/gtkprefs.c:1767
 msgid "_Report idle time:"
 msgstr "_Jõudeoleku ajast teatamine:"
 
-#: ../src/gtkprefs.c:1750
+#: ../gtk/gtkprefs.c:1770
 msgid "From last sent message"
 msgstr "Viimatisaadetud sõnumist"
 
-#: ../src/gtkprefs.c:1752
+#: ../gtk/gtkprefs.c:1772
 msgid "Based on keyboard or mouse use"
 msgstr "Põhineb klaviatuuri ja hiire kasutamisel"
 
-#: ../src/gtkprefs.c:1761
+#: ../gtk/gtkprefs.c:1781
 msgid "_Auto-reply:"
 msgstr "_Automaatne vastamine:"
 
-#: ../src/gtkprefs.c:1765
+#: ../gtk/gtkprefs.c:1785
 msgid "When both away and idle"
 msgstr "Kui olen eemal ja jõude"
 
 #. Auto-away stuff
-#: ../src/gtkprefs.c:1771
+#: ../gtk/gtkprefs.c:1791
 msgid "Auto-away"
 msgstr "Automaatne eemaldumine"
 
-#: ../src/gtkprefs.c:1773
+#: ../gtk/gtkprefs.c:1793
 msgid "Change status when _idle"
 msgstr "Jõudeoleku puhul määratakse uus _olek"
 
-#: ../src/gtkprefs.c:1777
+#: ../gtk/gtkprefs.c:1797
 msgid "_Minutes before changing status:"
-msgstr "Miteme _minuti möödudes olekut muudetakse:"
-
-#: ../src/gtkprefs.c:1785
+msgstr "Mitme _minuti möödudes olekut muudetakse:"
+
+#: ../gtk/gtkprefs.c:1805
 msgid "Change _status to:"
 msgstr "Uueks o_lekuks saab:"
 
 #. Signon status stuff
-#: ../src/gtkprefs.c:1806
-msgid "Status at startup"
-msgstr ""
-
-#: ../src/gtkprefs.c:1808
+#: ../gtk/gtkprefs.c:1826
+#, fuzzy
+msgid "Status at Startup"
+msgstr "Olek käivitamisel"
+
+#: ../gtk/gtkprefs.c:1828
 msgid "Use status from last _exit at startup"
 msgstr "Kä_ivitamisel kasutatakse viimase olekut"
 
-#: ../src/gtkprefs.c:1814
+#: ../gtk/gtkprefs.c:1834
 msgid "Status to a_pply at startup:"
 msgstr "Käivitamisel _rakendatav olek:"
 
-#: ../src/gtkprefs.c:1865
+#: ../gtk/gtkprefs.c:1885
 msgid "Smiley Themes"
 msgstr "Tujunägude teemad"
 
-#: ../src/gtkprefs.c:1866
+#: ../gtk/gtkprefs.c:1886
 msgid "Sounds"
 msgstr "Helid"
 
-#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1851
+#: ../gtk/gtkprefs.c:1887 ../libgaim/protocols/silc/silc.c:1851
 msgid "Network"
 msgstr "Võrk"
 
-#: ../src/gtkprefs.c:1872
+#: ../gtk/gtkprefs.c:1892
 msgid "Browser"
 msgstr "Veebisirvija"
 
-#: ../src/gtkprefs.c:1876
+#: ../gtk/gtkprefs.c:1896
 msgid "Away / Idle"
 msgstr "Eemal / tegevuseta"
 
-#: ../src/gtkprivacy.c:79
+#: ../gtk/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "Lubada kõigil kasutajail minuga ühendust võtta"
 
-#: ../src/gtkprivacy.c:80
+#: ../gtk/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
-msgstr "Lubada ainult minu sõbralistis olevaid kasutajaid"
-
-#: ../src/gtkprivacy.c:81
+msgstr "Lubada ainult minu sõbraloendis olevaid kasutajaid"
+
+#: ../gtk/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "Lubada ainult allpool kuvatud kasutajaid"
 
-#: ../src/gtkprivacy.c:82
+#: ../gtk/gtkprivacy.c:82
 msgid "Block all users"
 msgstr "Blokkida kõik kasutajad"
 
-#: ../src/gtkprivacy.c:83
+#: ../gtk/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "Blokkida ainult allpool kuvatud kasutajad"
 
-#: ../src/gtkprivacy.c:372
+#: ../gtk/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "Privaatsus"
 
-#: ../src/gtkprivacy.c:385
+#: ../gtk/gtkprivacy.c:385
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Privaatsussätted rakenduvad koheselt."
 
 #. "Set privacy for:" label
-#: ../src/gtkprivacy.c:397
+#: ../gtk/gtkprivacy.c:397
 msgid "Set privacy for:"
 msgstr "Privaatsus kontole:"
 
-#: ../src/gtkprivacy.c:562 ../src/gtkprivacy.c:578
+#: ../gtk/gtkprivacy.c:560 ../gtk/gtkprivacy.c:576
 msgid "Permit User"
 msgstr "Kasutaja lubamine"
 
-#: ../src/gtkprivacy.c:563
+#: ../gtk/gtkprivacy.c:561
 msgid "Type a user you permit to contact you."
 msgstr "Sisesta kasutaja, kellel sa lubad endaga ühendust võtta"
 
-#: ../src/gtkprivacy.c:564
+#: ../gtk/gtkprivacy.c:562
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "Palun sisesta kasutaja nimi, kellele sa annad loa endaga ühendust võtta."
 
-#: ../src/gtkprivacy.c:567 ../src/gtkprivacy.c:580
+#: ../gtk/gtkprivacy.c:565 ../gtk/gtkprivacy.c:578
 msgid "_Permit"
 msgstr "L_uba"
 
-#: ../src/gtkprivacy.c:572
+#: ../gtk/gtkprivacy.c:570
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Kas %s tohib sinuga ühendust võtta?"
 
-#: ../src/gtkprivacy.c:574
+#: ../gtk/gtkprivacy.c:572
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Kas sa lubad, et %s saab sinuga ühendust võtta?"
 
-#: ../src/gtkprivacy.c:601 ../src/gtkprivacy.c:614
+#: ../gtk/gtkprivacy.c:599 ../gtk/gtkprivacy.c:612
 msgid "Block User"
 msgstr "Kasutaja blokkimine"
 
-#: ../src/gtkprivacy.c:602
+#: ../gtk/gtkprivacy.c:600
 msgid "Type a user to block."
 msgstr "Sisesta kasutaja, keda blokkida."
 
-#: ../src/gtkprivacy.c:603
+#: ../gtk/gtkprivacy.c:601
 msgid "Please enter the name of the user you wish to block."
 msgstr "Palun sisesta selle kasutaja tunnus, keda sa soovid blokkida."
 
-#: ../src/gtkprivacy.c:605 ../src/gtkprivacy.c:616
-#, fuzzy
+#: ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
 msgid "_Block"
-msgstr "Bloki"
-
-#: ../src/gtkprivacy.c:610
+msgstr "_Bloki"
+
+#: ../gtk/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr "Blokkida %s?"
 
-#: ../src/gtkprivacy.c:612
+#: ../gtk/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Oled sa kindel, et soovid %s blokkida?"
@@ -4916,316 +3957,233 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../src/gtkrequest.c:267 ../src/protocols/msn/dialog.c:114
-#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
-#: ../src/protocols/novell/novell.c:1921 ../src/protocols/silc/buddy.c:313
-#: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
-#: ../src/request.h:1335
+#: ../gtk/gtkrequest.c:267 ../libgaim/protocols/msn/dialog.c:132
+#: ../libgaim/protocols/msn/msn.c:555 ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1920
+#: ../libgaim/protocols/silc/buddy.c:313 ../libgaim/protocols/silc/pk.c:117
+#: ../libgaim/protocols/silc/wb.c:303 ../libgaim/request.h:1335
 msgid "Yes"
 msgstr "Jah"
 
-#: ../src/gtkrequest.c:268 ../src/protocols/msn/dialog.c:115
-#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
-#: ../src/protocols/novell/novell.c:1922 ../src/protocols/silc/buddy.c:314
-#: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
-#: ../src/request.h:1335
+#: ../gtk/gtkrequest.c:268 ../libgaim/protocols/msn/dialog.c:133
+#: ../libgaim/protocols/msn/msn.c:555 ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1921
+#: ../libgaim/protocols/silc/buddy.c:314 ../libgaim/protocols/silc/pk.c:118
+#: ../libgaim/protocols/silc/wb.c:304 ../libgaim/request.h:1335
 msgid "No"
 msgstr "Ei"
 
-#: ../src/gtkrequest.c:271
+#: ../gtk/gtkrequest.c:271
 msgid "Apply"
-msgstr ""
-
-#: ../src/gtkrequest.c:272 ../src/protocols/msn/msn.c:357
-#: ../src/protocols/silc/util.c:336
-msgid "Close"
-msgstr "Sulge"
-
-#: ../src/gtkrequest.c:1467
+msgstr "Rakenda"
+
+#: ../gtk/gtkrequest.c:1467
 msgid "That file already exists"
 msgstr "See fail on juba olemas"
 
-#: ../src/gtkrequest.c:1468
+#: ../gtk/gtkrequest.c:1468
 msgid "Would you like to overwrite it?"
 msgstr "Kas sa soovid seda üle kirjutada?"
 
-#: ../src/gtkrequest.c:1469
+#: ../gtk/gtkrequest.c:1469
 msgid "Overwrite"
-msgstr ""
-
-#: ../src/gtkrequest.c:1470
+msgstr "Kirjuta üle"
+
+#: ../gtk/gtkrequest.c:1470
 msgid "Choose New Name"
-msgstr ""
-
-#: ../src/gtkrequest.c:1512 ../src/gtkrequest.c:1553
+msgstr "Uue nime valimine"
+
+#: ../gtk/gtkrequest.c:1512 ../gtk/gtkrequest.c:1553
 msgid "Save File..."
 msgstr "Faili salvestamine..."
 
-#: ../src/gtkrequest.c:1513 ../src/gtkrequest.c:1554
+#: ../gtk/gtkrequest.c:1513 ../gtk/gtkrequest.c:1554
 msgid "Open File..."
 msgstr "Faili avamine..."
 
-#: ../src/gtkrequest.c:1601 ../src/gtkrequest.c:1615
-#, fuzzy
+#: ../gtk/gtkrequest.c:1601 ../gtk/gtkrequest.c:1615
 msgid "Select Folder..."
-msgstr "Värvuse valimine"
-
-#: ../src/gtkroomlist.c:287
-#, fuzzy
+msgstr "Kataloogi valimine..."
+
+#: ../gtk/gtkroomlist.c:287
 msgid "_Add"
-msgstr "Lisa"
-
-#: ../src/gtkroomlist.c:354
+msgstr "_Lisa"
+
+#: ../gtk/gtkroomlist.c:355
 msgid "Room List"
 msgstr "Tubade nimekiri"
 
 #. list button
-#: ../src/gtkroomlist.c:424
+#: ../gtk/gtkroomlist.c:425
 msgid "_Get List"
 msgstr "_Hangi nimekiri"
 
 #. add button
-#: ../src/gtkroomlist.c:432
-#, fuzzy
+#: ../gtk/gtkroomlist.c:433
 msgid "_Add Chat"
-msgstr "Jututoa lisamine"
-
-#: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:264
-#: ../src/protocols/jabber/buddy.c:812 ../src/protocols/novell/novell.c:1486
-msgid "Title"
-msgstr "Tiitel"
-
-#: ../src/gtksavedstatuses.c:448
-msgid "Type"
-msgstr "Liik"
-
-#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:920
-#: ../src/protocols/bonjour/bonjour.c:256
-#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1461
-#: ../src/protocols/gg/gg.c:1471 ../src/protocols/gg/gg.c:1477
-#: ../src/protocols/gg/gg.c:1486 ../src/protocols/gg/gg.c:1491
-#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1182
-#: ../src/protocols/jabber/jabber.c:1192 ../src/protocols/jabber/jabber.c:1202
-#: ../src/protocols/jabber/jabber.c:1212 ../src/protocols/jabber/jabber.c:1222
-#: ../src/protocols/jabber/jabber.c:1234 ../src/protocols/novell/novell.c:2868
-#: ../src/protocols/novell/novell.c:2974 ../src/protocols/novell/novell.c:2980
-#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:5335
-#: ../src/protocols/oscar/oscar.c:5350 ../src/protocols/oscar/oscar.c:5355
-#: ../src/protocols/oscar/oscar.c:5563 ../src/protocols/oscar/oscar.c:5575
-#: ../src/protocols/sametime/sametime.c:3273
-#: ../src/protocols/sametime/sametime.c:3279
-#: ../src/protocols/sametime/sametime.c:3285
-#: ../src/protocols/sametime/sametime.c:3364
-#: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
-#: ../src/protocols/yahoo/yahoo.c:3286 ../src/protocols/yahoo/yahoo.c:3292
-#: ../src/protocols/zephyr/zephyr.c:2281
-msgid "Message"
-msgstr "Sõnum"
-
-#: ../src/gtksavedstatuses.c:526
-msgid "Saved Statuses"
-msgstr "Salvestatud olekud"
+msgstr "_Lisa vestlus"
 
 #. Use button
-#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1180
+#: ../gtk/gtksavedstatuses.c:549 ../gtk/gtksavedstatuses.c:1183
 msgid "_Use"
 msgstr "_Kasuta"
 
-#: ../src/gtksavedstatuses.c:695
+#: ../gtk/gtksavedstatuses.c:695
 msgid "Title already in use.  You must choose a unique title."
 msgstr ""
 
-#: ../src/gtksavedstatuses.c:879
+#: ../gtk/gtksavedstatuses.c:883
 msgid "Different"
-msgstr ""
-
-#: ../src/gtksavedstatuses.c:909 ../src/gtksavedstatuses.c:1056
-#: ../src/protocols/gg/gg.c:1444 ../src/protocols/gg/gg.c:1448
-#: ../src/protocols/jabber/buddy.c:623 ../src/protocols/jabber/buddy.c:630
-#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1153
-#: ../src/protocols/msn/msn.c:550 ../src/protocols/novell/novell.c:2867
-#: ../src/protocols/novell/novell.c:2871 ../src/protocols/oscar/oscar.c:777
-#: ../src/protocols/oscar/oscar.c:783 ../src/protocols/oscar/oscar.c:786
-#: ../src/protocols/yahoo/yahoo.c:2882
-msgid "Status"
-msgstr "Olek"
-
-#: ../src/gtksavedstatuses.c:1073
+msgstr "Teistsugune"
+
+#: ../gtk/gtksavedstatuses.c:1076
 msgid "_Title:"
 msgstr "_Pealkiri:"
 
-#: ../src/gtksavedstatuses.c:1092 ../src/gtksavedstatuses.c:1413
+#: ../gtk/gtksavedstatuses.c:1095 ../gtk/gtksavedstatuses.c:1416
 msgid "_Status:"
 msgstr "_Olek:"
 
 #. Different status message expander
-#: ../src/gtksavedstatuses.c:1124
+#: ../gtk/gtksavedstatuses.c:1127
 msgid "Use a _different status for some accounts"
-msgstr ""
+msgstr "_Teistsuguse oleku kasutamine mõne konto jaoks"
 
 #. Save & Use button
-#: ../src/gtksavedstatuses.c:1188
+#: ../gtk/gtksavedstatuses.c:1191
 msgid "Sa_ve & Use"
 msgstr "Sal_vesta ja kasuta"
 
-#: ../src/gtksavedstatuses.c:1394
+#: ../gtk/gtksavedstatuses.c:1397
 #, fuzzy, c-format
 msgid "Status for %s"
 msgstr "Olek: %s"
 
-#: ../src/gtksound.c:61
+#: ../gtk/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "Sõber logib sisse"
 
-#: ../src/gtksound.c:62
+#: ../gtk/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "Sõber logib välja"
 
-#: ../src/gtksound.c:63
+#: ../gtk/gtksound.c:65
 msgid "Message received"
 msgstr "Sõnumi vastuvõtmine"
 
-#: ../src/gtksound.c:64
+#: ../gtk/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "Sõnumi vastuvõtmine alustab vestlust"
 
-#: ../src/gtksound.c:65
+#: ../gtk/gtksound.c:67
 msgid "Message sent"
 msgstr "Sõnumi saatmine"
 
-#: ../src/gtksound.c:66
+#: ../gtk/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Isik siseneb jututuppa"
 
-#: ../src/gtksound.c:67
+#: ../gtk/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Isik väljub jututoast"
 
-#: ../src/gtksound.c:68
+#: ../gtk/gtksound.c:70
 msgid "You talk in chat"
 msgstr "Sa kõneled jututoas"
 
-#: ../src/gtksound.c:69
+#: ../gtk/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Teisted kõnelevad jututoas"
 
-#: ../src/gtksound.c:72
-#, fuzzy
+#: ../gtk/gtksound.c:74
 msgid "Someone says your screen name in chat"
-msgstr "Keegi ütleb jututoas sinu nime"
-
-#: ../src/gtksound.c:485
-#, c-format
-msgid "Unable to play sound because the chosen file (%s) does not exist."
-msgstr ""
-
-#: ../src/gtksound.c:501
-msgid ""
-"Unable to play sound because the 'Command' sound method has been chosen, but "
-"no command has been set."
-msgstr ""
-
-#: ../src/gtksound.c:513
-#, c-format
-msgid ""
-"Unable to play sound because the configured sound command could not be "
-"launched: %s"
-msgstr ""
+msgstr "Keegi ütleb vestluses sinu nime"
+
+#: ../gtk/gtksound.c:310
+#, fuzzy
+msgid "GStreamer Failure"
+msgstr "Faili salvestamine"
+
+#: ../gtk/gtksound.c:311
+#, fuzzy
+msgid "GStreamer failed to initialize."
+msgstr "Tõrge tujunägude teema lahtipakkimisel"
 
 #. connect to the server
-#: ../src/gtkstatusbox.c:368 ../src/protocols/irc/irc.c:313
-#: ../src/protocols/jabber/jabber.c:979 ../src/protocols/msn/session.c:349
-#: ../src/protocols/napster/napster.c:536
-#: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1243
-#: ../src/protocols/sametime/sametime.c:3692
-#: ../src/protocols/simple/simple.c:1605 ../src/protocols/yahoo/yahoo.c:2572
-#: ../src/protocols/zephyr/zephyr.c:1565
+#: ../gtk/gtkstatusbox.c:543 ../libgaim/protocols/irc/irc.c:329
+#: ../libgaim/protocols/jabber/jabber.c:1009
+#: ../libgaim/protocols/msn/session.c:344
+#: ../libgaim/protocols/novell/novell.c:2185
+#: ../libgaim/protocols/oscar/oscar.c:1224 ../libgaim/protocols/qq/qq.c:134
+#: ../libgaim/protocols/sametime/sametime.c:3681
+#: ../libgaim/protocols/simple/simple.c:1673
+#: ../libgaim/protocols/yahoo/yahoo.c:2715
+#: ../libgaim/protocols/zephyr/zephyr.c:1617
 msgid "Connecting"
 msgstr "Ühendumine"
 
-#: ../src/gtkstock.c:138
-msgid "_Alias"
-msgstr "_Alias"
-
-#: ../src/gtkstock.c:140
-#, fuzzy
-msgid "Close _tabs"
-msgstr "Sulge"
-
-#: ../src/gtkstock.c:142
-#, fuzzy
-msgid "_Get Info"
-msgstr "Hangi _teavet"
-
-#: ../src/gtkstock.c:143
-msgid "_Invite"
-msgstr "_Kutsu"
-
-#: ../src/gtkstock.c:144
-msgid "_Modify"
-msgstr "_Muuda"
-
-#: ../src/gtkstock.c:145
-msgid "_Open Mail"
-msgstr "_Ava sõnum"
-
-#: ../src/gtkutils.c:1306 ../src/gtkutils.c:1331
+#: ../gtk/gtkstatusbox.c:545
+#, fuzzy
+msgid "Waiting for network connection"
+msgstr "Oodatakse ülekande algust"
+
+#: ../gtk/gtkutils.c:1310 ../gtk/gtkutils.c:1335
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr ""
 
-#: ../src/gtkutils.c:1308 ../src/gtkutils.c:1333
+#: ../gtk/gtkutils.c:1312 ../gtk/gtkutils.c:1337
 #, fuzzy
 msgid "Failed to load image"
 msgstr "Tõrge sõbraga jututoas ühinemisel"
 
-#: ../src/gtkutils.c:1408
+#: ../gtk/gtkutils.c:1412
 #, fuzzy, c-format
 msgid "Cannot send folder %s."
 msgstr "Faili pole võimalik saata"
 
-#: ../src/gtkutils.c:1410
+#: ../gtk/gtkutils.c:1414
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
 msgstr ""
 
-#: ../src/gtkutils.c:1438 ../src/gtkutils.c:1447 ../src/gtkutils.c:1452
+#: ../gtk/gtkutils.c:1442 ../gtk/gtkutils.c:1451 ../gtk/gtkutils.c:1456
 msgid "You have dragged an image"
 msgstr ""
 
-#: ../src/gtkutils.c:1439
+#: ../gtk/gtkutils.c:1443
 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 ""
 
-#: ../src/gtkutils.c:1443 ../src/gtkutils.c:1458
+#: ../gtk/gtkutils.c:1447 ../gtk/gtkutils.c:1462
 #, fuzzy
 msgid "Set as buddy icon"
 msgstr "Sõbra _ikooni näitamine"
 
-#: ../src/gtkutils.c:1444 ../src/gtkutils.c:1459
+#: ../gtk/gtkutils.c:1448 ../gtk/gtkutils.c:1463
 #, fuzzy
 msgid "Send image file"
 msgstr "Sõnumi saatmine"
 
-#: ../src/gtkutils.c:1445 ../src/gtkutils.c:1459
+#: ../gtk/gtkutils.c:1449 ../gtk/gtkutils.c:1463
 #, fuzzy
 msgid "Insert in message"
 msgstr "Pildi lisamine"
 
-#: ../src/gtkutils.c:1448
+#: ../gtk/gtkutils.c:1452
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr ""
 
-#: ../src/gtkutils.c:1453
+#: ../gtk/gtkutils.c:1457
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
 
-#: ../src/gtkutils.c:1455
+#: ../gtk/gtkutils.c:1459
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -5236,140 +4194,2171 @@
 #. * 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
-#: ../src/gtkutils.c:1509
-#, fuzzy
+#: ../gtk/gtkutils.c:1513
 msgid "Cannot send launcher"
-msgstr "Faili pole võimalik saata"
-
-#: ../src/gtkutils.c:1509
+msgstr ""
+
+#: ../gtk/gtkutils.c:1513
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr ""
 
-#: ../src/gtkwhiteboard.c:756 ../src/gtkwhiteboard.c:775
-#, fuzzy
+#: ../gtk/gtkutils.c:2342
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+"<b>Fail:</b> %s\n"
+"<b>Faili suurus:</b> %s\n"
+"<b>Pildi suurus:</b> %dx%d"
+
+#. Label
+#: ../gtk/gtkutils.c:2386 ../gtk/gtkutils.c:2408
+#: ../gtk/plugins/gevolution/new_person_dialog.c:338
+#: ../libgaim/protocols/oscar/oscar.c:600
+msgid "Buddy Icon"
+msgstr "Sõbraikoon"
+
+#: ../gtk/gtkutils.c:2735
+#, fuzzy, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Faili pole võimalik avada."
+
+#: ../gtk/gtkutils.c:2784
+#, c-format
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+
+#: ../gtk/gtkwhiteboard.c:756 ../gtk/gtkwhiteboard.c:775
 msgid "Save File"
-msgstr "Faili salvestamine..."
-
-#: ../src/gtkwhiteboard.c:863
-#, fuzzy
+msgstr "Faili salvestamine"
+
+#: ../gtk/gtkwhiteboard.c:863
 msgid "Select color"
 msgstr "Värvuse valimine"
 
-#: ../src/log.c:167
+#: ../gtk/plugins/cap/cap.c:428
+#, fuzzy
+msgid "Display Statistics"
+msgstr "Serveri statistika"
+
+#: ../gtk/plugins/cap/cap.c:440 ../gtk/plugins/cap/cap.c:443
+msgid "Response Probability:"
+msgstr ""
+
+#: ../gtk/plugins/cap/cap.c:789
+#, fuzzy
+msgid "Statistics Configuration"
+msgstr "Võrgusätted"
+
+#. msg_difference spinner
+#: ../gtk/plugins/cap/cap.c:792
+msgid "Maximum response timeout:"
+msgstr ""
+
+#: ../gtk/plugins/cap/cap.c:795 ../gtk/plugins/cap/cap.c:802
+#: ../gtk/plugins/cap/cap.c:809
+#, fuzzy
+msgid "minutes"
+msgstr "minutit."
+
+#. last_seen spinner
+#: ../gtk/plugins/cap/cap.c:799
+msgid "Maximum last-seen difference:"
+msgstr ""
+
+#. threshold spinner
+#: ../gtk/plugins/cap/cap.c:806
+msgid "Threshold:"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../gtk/plugins/cap/cap.c:915
+msgid "Contact Availability Prediction plugin."
+msgstr ""
+
+#. *  summary
+#: ../gtk/plugins/cap/cap.c:916
+msgid ""
+"The contact availability plugin (cap) is used to display statistical "
+"information about buddies in a users contact list."
+msgstr ""
+
+#: ../gtk/plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "Sõber on jõude"
+
+#: ../gtk/plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "Sõber on eemal"
+
+#: ../gtk/plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "Sõber on kaua eemal"
+
+#. Not used yet.
+#: ../gtk/plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr ""
+
+#: ../gtk/plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "Sõber pole ühendatud"
+
+#: ../gtk/plugins/contact_priority.c:90
+msgid "Point values to use when..."
+msgstr ""
+
+#: ../gtk/plugins/contact_priority.c:118
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr ""
+
+#: ../gtk/plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr ""
+
+#: ../gtk/plugins/contact_priority.c:130
+msgid "Point values to use for account..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/contact_priority.c:182
+msgid "Contact Priority"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../gtk/plugins/contact_priority.c:185
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+
+#. *< description
+#: ../gtk/plugins/contact_priority.c:187
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+
+#: ../gtk/plugins/extplacement.c:80
+msgid "By conversation count"
+msgstr "Vestluste arvu järgi"
+
+#: ../gtk/plugins/extplacement.c:101
+msgid "Conversation Placement"
+msgstr "Vestluse asetamine"
+
+#: ../gtk/plugins/extplacement.c:106
+msgid "Number of conversations per window"
+msgstr "Vestluste arv akna kohta"
+
+#: ../gtk/plugins/extplacement.c:112
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "Välksõnumi- ja jututoaakende eraldamine, kui asetatakse numbrite järgi"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/extplacement.c:135
+msgid "ExtPlacement"
+msgstr "EkstraAsetus"
+
+#. *< name
+#. *< version
+#: ../gtk/plugins/extplacement.c:137
+msgid "Extra conversation placement options."
+msgstr "Täiendavad valikud vestlusakende asetamisele."
+
+#. *< summary
+#. *  description
+#: ../gtk/plugins/extplacement.c:139
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Aknas olevate vestluste arvu vähendamine, võimaluse korral eraldades "
+"välksõnumi- ja jututoaaknaid"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gaiminc.c:91
+msgid "Gaim Demonstration Plugin"
+msgstr "Gaim'i näidisplugin"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/gaiminc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "Näidisplugin, mis teeb midagi - vaata kirjeldust."
+
+#. *  description
+#: ../gtk/plugins/gaiminc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+
+#: ../gtk/plugins/gaimrc.c:41
+msgid "Cursor Color"
+msgstr "Kursori värvus"
+
+#: ../gtk/plugins/gaimrc.c:42
+msgid "Secondary Cursor Color"
+msgstr "Teise kursori värvus"
+
+#: ../gtk/plugins/gaimrc.c:43
+msgid "Hyperlink Color"
+msgstr "Hüperviida värvus"
+
+#: ../gtk/plugins/gaimrc.c:56
+msgid "GtkTreeView Expander Size"
+msgstr ""
+
+#: ../gtk/plugins/gaimrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr ""
+
+#: ../gtk/plugins/gaimrc.c:76
+msgid "Conversation Entry"
+msgstr "Vestluse kirje"
+
+#: ../gtk/plugins/gaimrc.c:77
+msgid "Conversation History"
+msgstr "Vestluste ajalugu"
+
+#: ../gtk/plugins/gaimrc.c:78
+msgid "Log Viewer"
+msgstr "Logivaatur"
+
+#: ../gtk/plugins/gaimrc.c:79
+msgid "Request Dialog"
+msgstr "Küsimisdialoog"
+
+#: ../gtk/plugins/gaimrc.c:80
+msgid "Notify Dialog"
+msgstr "Teavitusdialoog"
+
+#: ../gtk/plugins/gaimrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr ""
+
+#: ../gtk/plugins/gaimrc.c:320
+#, c-format
+msgid "Select Color for %s"
+msgstr "Värvuse valimine %s jaoks"
+
+#: ../gtk/plugins/gaimrc.c:322
+msgid "Select Color"
+msgstr "Värvuse valimine"
+
+#: ../gtk/plugins/gaimrc.c:361
+#, c-format
+msgid "Select Font for %s"
+msgstr "Kirjatüübi valimine %s jaoks"
+
+#: ../gtk/plugins/gaimrc.c:398
+msgid "Select Interface Font"
+msgstr "Liidese kirjatüübi valimine"
+
+#: ../gtk/plugins/gaimrc.c:448
+msgid "General"
+msgstr "Üldine"
+
+#: ../gtk/plugins/gaimrc.c:453
+msgid "GTK+ Interface Font"
+msgstr "GTK+ liidese kirjatüüp"
+
+#: ../gtk/plugins/gaimrc.c:473
+msgid "GTK+ Text Shortcut Theme"
+msgstr ""
+
+#: ../gtk/plugins/gaimrc.c:508
+msgid "Interface colors"
+msgstr "Liidese värvid"
+
+#: ../gtk/plugins/gaimrc.c:532
+msgid "Widget Sizes"
+msgstr "Vidinate suurused"
+
+#: ../gtk/plugins/gaimrc.c:553
+msgid "Fonts"
+msgstr "Kirjatüübid"
+
+#: ../gtk/plugins/gaimrc.c:576
+msgid "Tools"
+msgstr "Vahendid"
+
+#: ../gtk/plugins/gaimrc.c:581
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "Kirjuta sätted %s%sgtkrc-2.0 faili"
+
+#: ../gtk/plugins/gaimrc.c:589
+msgid "Re-read gtkrc files"
+msgstr "Laadi gtkrc failid uuesti"
+
+#: ../gtk/plugins/gaimrc.c:616
+msgid "Gaim GTK+ Theme Control"
+msgstr ""
+
+#: ../gtk/plugins/gaimrc.c:618 ../gtk/plugins/gaimrc.c:619
+msgid "Provides access to commonly used gtkrc settings."
+msgstr ""
+
+#. Configuration frame
+#: ../gtk/plugins/gestures/gestures.c:235
+msgid "Mouse Gestures Configuration"
+msgstr ""
+
+#: ../gtk/plugins/gestures/gestures.c:242
+msgid "Middle mouse button"
+msgstr "Keskmine hiirenupp"
+
+#: ../gtk/plugins/gestures/gestures.c:247
+msgid "Right mouse button"
+msgstr "Parempoolne hiirenupp"
+
+#. "Visual gesture display" checkbox
+#: ../gtk/plugins/gestures/gestures.c:259
+msgid "_Visual gesture display"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gestures/gestures.c:289
+msgid "Mouse Gestures"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/gestures/gestures.c:292
+msgid "Provides support for mouse gestures"
+msgstr ""
+
+#. *  description
+#: ../gtk/plugins/gestures/gestures.c:294
+msgid ""
+"Allows support for mouse gestures in conversation windows.\n"
+"Drag the middle mouse button to perform certain actions:\n"
+"\n"
+"Drag down and then to the right to close a conversation.\n"
+"Drag up and then to the left to switch to the previous conversation.\n"
+"Drag up and then to the right to switch to the next conversation."
+msgstr ""
+
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:143
+msgid "Instant Messaging"
+msgstr "Välksõnumivahendid"
+
+#. Add the label.
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:460
+msgid "Select a person from your address book below, or add a new person."
+msgstr "Vali isik aadressiraamatust või lisa uus."
+
+#. "Search"
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:473
+#: ../gtk/plugins/gevolution/assoc-buddy.c:358
+#: ../libgaim/protocols/jabber/buddy.c:1724
+#: ../libgaim/protocols/oscar/oscar.c:6085 ../libgaim/protocols/qq/group.c:121
+#: ../libgaim/protocols/qq/group_im.c:137
+#: ../libgaim/protocols/qq/sys_msg.c:160 ../libgaim/protocols/qq/sys_msg.c:230
+#: ../libgaim/protocols/qq/sys_msg.c:248
+#: ../libgaim/protocols/sametime/sametime.c:5532
+msgid "Search"
+msgstr "Otsing"
+
+#. "New Person" button
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:580
+#: ../gtk/plugins/gevolution/assoc-buddy.c:469
+#: ../gtk/plugins/gevolution/new_person_dialog.c:251
+msgid "New Person"
+msgstr "Uus isik"
+
+#. "Select Buddy" button
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:597
+msgid "Select Buddy"
+msgstr "Vali sõber"
+
+#. Add the label.
+#: ../gtk/plugins/gevolution/assoc-buddy.c:345
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"Vali aadressiraamatus olev kirje, millega seda sõpra siduda või loo uus isik."
+
+#. Add the expander
+#: ../gtk/plugins/gevolution/assoc-buddy.c:433
+msgid "User _details"
+msgstr "_Kasutaja üksikasjad"
+
+#. "Associate Buddy" button
+#: ../gtk/plugins/gevolution/assoc-buddy.c:486
+msgid "_Associate Buddy"
+msgstr ""
+
+#: ../gtk/plugins/gevolution/eds-utils.c:73
+#: ../gtk/plugins/gevolution/eds-utils.c:86
+#: ../libgaim/protocols/jabber/jabber.c:1154
+msgid "None"
+msgstr "Puudub"
+
+#: ../gtk/plugins/gevolution/gevolution.c:262
+#: ../gtk/plugins/gevolution/gevolution.c:268
+msgid "Unable to send e-mail"
+msgstr "E-kirja pole võimalik saata"
+
+#: ../gtk/plugins/gevolution/gevolution.c:263
+msgid "The evolution executable was not found in the PATH."
+msgstr "Evolutioni programmi pole võimalik PATH radadel leida."
+
+#: ../gtk/plugins/gevolution/gevolution.c:269
+msgid "The specified buddy was not found in the Evolution Contacts."
+msgstr "Määratud sõpra ei leitud evolutioni kontaktide hulgas."
+
+#: ../gtk/plugins/gevolution/gevolution.c:286
+msgid "Add to Address Book"
+msgstr "Lisa aadressiraamatusse"
+
+#: ../gtk/plugins/gevolution/gevolution.c:290
+msgid "Send E-Mail"
+msgstr "Saada e-kiri"
+
+#. Configuration frame
+#: ../gtk/plugins/gevolution/gevolution.c:417
+msgid "Evolution Integration Configuration"
+msgstr "Evolution'iga sidumise sätted"
+
+#. Label
+#: ../gtk/plugins/gevolution/gevolution.c:420
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr "Vali kõik kontod, mille sõbrad tuleb automaatselt lisada."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gevolution/gevolution.c:527
+msgid "Evolution Integration"
+msgstr "Evolution'iga sidumine"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/gevolution/gevolution.c:530
+#: ../gtk/plugins/gevolution/gevolution.c:532
+msgid "Provides integration with Evolution."
+msgstr "Plugin tagab integratsiooni Evolution'iga."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:267
+msgid "Please enter the person's information below."
+msgstr "Palun sisesta isiku andmed."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:271
+msgid "Please enter the buddy's screen name and account type below."
+msgstr "Palun sisesta allolevasse vormi sõbra ekraaninimi ja konto liik."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:291
+msgid "Account type:"
+msgstr "Konto liik:"
+
+#. Optional Information section
+#: ../gtk/plugins/gevolution/new_person_dialog.c:315
+msgid "Optional information:"
+msgstr "Täiendav teave:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:350
+msgid "First name:"
+msgstr "Eesnimi:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:362
+msgid "Last name:"
+msgstr "Perekonnanimi:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:382
+msgid "E-mail:"
+msgstr "E-post:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "GTK signaalitestid"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/gtk-signals-test.c:163 ../gtk/plugins/gtk-signals-test.c:165
+msgid "Test to see that all ui signals are working properly."
+msgstr ""
+
+#: ../gtk/plugins/history.c:188
+msgid "History"
+msgstr "Ajalugu"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/iconaway.c:82
+msgid "Iconify on Away"
+msgstr "Ikoonimine eemaldumisel"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/iconaway.c:85 ../gtk/plugins/iconaway.c:87
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr "Sõbranimekirja ja vestlusakende ikooniks taandamine Sinu eemaldumisel."
+
+#: ../gtk/plugins/mailchk.c:160
+msgid "Mail Checker"
+msgstr "E-post kontrollija"
+
+#: ../gtk/plugins/mailchk.c:162
+msgid "Checks for new local mail."
+msgstr "Uute kohalike e-kirjade kontrollimine."
+
+#: ../gtk/plugins/mailchk.c:163
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr ""
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr ""
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:416
+msgid "Music Messaging"
+msgstr ""
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:417
+msgid "There was a conflict in running the command:"
+msgstr "Käsu käivitamisel tekkis vastuolu:"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:525
+msgid "Error Running Editor"
+msgstr "Viga redaktori käivitamisel"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:526
+msgid "The following error has occurred:"
+msgstr ""
+
+#. Configuration frame
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:625
+msgid "Music Messaging Configuration"
+msgstr ""
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:629
+msgid "Score Editor Path"
+msgstr ""
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:630
+msgid "_Apply"
+msgstr "_Rakenda"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:665
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr ""
+
+#. *  summary
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:667
+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" ----------
+#: ../gtk/plugins/notify.c:687
+msgid "Notify For"
+msgstr "Teavitused kehtivad"
+
+#: ../gtk/plugins/notify.c:691
+msgid "_IM windows"
+msgstr "_Välksõnumiakendele"
+
+#: ../gtk/plugins/notify.c:698
+msgid "C_hat windows"
+msgstr "_Jututoaakendele"
+
+#: ../gtk/plugins/notify.c:706
+msgid "\t_Only when someone says your screen name"
+msgstr "_Ainult juhul, kui keegi ütleb Sinu ekraaninime"
+
+#: ../gtk/plugins/notify.c:716
+msgid "_Focused windows"
+msgstr "_Fookuses olevatele akendele"
+
+#. ---------- "Notification Methods" ----------
+#: ../gtk/plugins/notify.c:724
+msgid "Notification Methods"
+msgstr "Teavitamisviisid"
+
+#: ../gtk/plugins/notify.c:731
+msgid "Prepend _string into window title:"
+msgstr "Aknatiitli ette _lisatakse string:"
+
+#. Count method button
+#: ../gtk/plugins/notify.c:750
+msgid "Insert c_ount of new messages into window title"
+msgstr "Aknatiitlisse lisatakse uute sõnumite _arv"
+
+#. Count xprop method button
+#: ../gtk/plugins/notify.c:759
+#, fuzzy
+msgid "Insert count of new message into _X property"
+msgstr "Aknatiitlisse lisatakse uute sõnumite _arv"
+
+#. Urgent method button
+#: ../gtk/plugins/notify.c:767
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "Aknahalduri \"_URGENT\" vihje"
+
+#. Raise window method button
+#: ../gtk/plugins/notify.c:776
+msgid "R_aise conversation window"
+msgstr "_Vestlusaken tõstetakse esile"
+
+#. ---------- "Notification Removals" ----------
+#: ../gtk/plugins/notify.c:784
+msgid "Notification Removal"
+msgstr "Teavituste eemaldamine"
+
+#. Remove on focus button
+#: ../gtk/plugins/notify.c:789
+msgid "Remove when conversation window _gains focus"
+msgstr "Eemaldamine, kui vestlusaken sa_tub fookusesse"
+
+#. Remove on click button
+#: ../gtk/plugins/notify.c:796
+msgid "Remove when conversation window _receives click"
+msgstr "Eemaldamine, kui vestlusaknale _klikitakse"
+
+#. Remove on type button
+#: ../gtk/plugins/notify.c:804
+msgid "Remove when _typing in conversation window"
+msgstr "Eemaldamine, kui vestlusaknas _tipitakse"
+
+#. Remove on message send button
+#: ../gtk/plugins/notify.c:812
+msgid "Remove when a _message gets sent"
+msgstr "Eemaldamine, kui sõ_num saab saadetud"
+
+#. Remove on conversation switch button
+#: ../gtk/plugins/notify.c:821
+msgid "Remove on switch to conversation ta_b"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/notify.c:910
+msgid "Message Notification"
+msgstr "Sõnumitest teavitaja"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/notify.c:913 ../gtk/plugins/notify.c:915
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr "Mitut sorti võimalusi lugemata sõnumitest teavitamiseks"
+
+#: ../gtk/plugins/raw.c:175
+msgid "Raw"
+msgstr ""
+
+#: ../gtk/plugins/raw.c:177
+msgid "Lets you send raw input to text-based protocols."
+msgstr ""
+
+#: ../gtk/plugins/raw.c:178
+msgid ""
+"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+
+#: ../gtk/plugins/relnot.c:69
+#, c-format
+msgid "You are using Gaim version %s.  The current version is %s.<hr>"
+msgstr "Sa kasutad Gaim'i versiooni %s.  Hetkel on uusim versioon %s.<hr>"
+
+#: ../gtk/plugins/relnot.c:75
+#, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr ""
+"<b>Muudatuste logi:</b>\n"
+"%s<br><br>"
+
+#: ../gtk/plugins/relnot.c:80
+#, c-format
+msgid ""
+"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a>."
+msgstr ""
+"Sa saad uue %s versiooni aadressilt:<br><a href=\"http://gaim.sourceforge."
+"net/\">http://gaim.sourceforge.net</a>."
+
+#: ../gtk/plugins/relnot.c:84 ../gtk/plugins/relnot.c:85
+msgid "New Version Available"
+msgstr "Uus versioon on saadaval"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/relnot.c:143
+msgid "Release Notification"
+msgstr "Väljalasetest teavitaja"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/relnot.c:146
+msgid "Checks periodically for new releases."
+msgstr "Kontrollib korrapäraselt uusi väljalaskeid."
+
+#. *  description
+#: ../gtk/plugins/relnot.c:148
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+
+#: ../gtk/plugins/spellchk.c:1934
+msgid "Duplicate Correction"
+msgstr ""
+
+#: ../gtk/plugins/spellchk.c:1935
+msgid "The specified word already exists in the correction list."
+msgstr ""
+
+#: ../gtk/plugins/spellchk.c:2143
+msgid "Text Replacements"
+msgstr "Tekstiasendused"
+
+#: ../gtk/plugins/spellchk.c:2166
+msgid "You type"
+msgstr "Sina tipid"
+
+#: ../gtk/plugins/spellchk.c:2180
+msgid "You send"
+msgstr "Tekst saaadetakse kui"
+
+#: ../gtk/plugins/spellchk.c:2194
+msgid "Whole words only"
+msgstr "Ainult terved sõnad"
+
+#: ../gtk/plugins/spellchk.c:2206
+msgid "Case sensitive"
+msgstr "Tõstutundlik"
+
+#: ../gtk/plugins/spellchk.c:2232
+msgid "Add a new text replacement"
+msgstr "Uue asenduse lisamine"
+
+#: ../gtk/plugins/spellchk.c:2248
+msgid "You _type:"
+msgstr "Sina _tipid:"
+
+#: ../gtk/plugins/spellchk.c:2265
+msgid "You _send:"
+msgstr "Tekst saadetakse _kui:"
+
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../gtk/plugins/spellchk.c:2277
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr "Arvestatakse suur- ja _väiketähtedega"
+
+#: ../gtk/plugins/spellchk.c:2279
+msgid "Only replace _whole words"
+msgstr "Asendatakse ainult te_rved sõnad"
+
+#: ../gtk/plugins/spellchk.c:2304
+msgid "General Text Replacement Options"
+msgstr "Üldised tekstiasenduse valikud"
+
+#: ../gtk/plugins/spellchk.c:2305
+msgid "Enable replacement of last word on send"
+msgstr ""
+
+#: ../gtk/plugins/spellchk.c:2330
+msgid "Text replacement"
+msgstr "Tekstiasendaja"
+
+#: ../gtk/plugins/spellchk.c:2332 ../gtk/plugins/spellchk.c:2333
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr ""
+"Asendab väljaminevates sõnumites teksti vastavalt kasutaja poolt määratud "
+"reeglitele"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/ticker/ticker.c:77 ../gtk/plugins/ticker/ticker.c:355
+msgid "Buddy Ticker"
+msgstr "Sõbratiksuja"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/ticker/ticker.c:358 ../gtk/plugins/ticker/ticker.c:360
+msgid "A horizontal scrolling version of the buddy list."
+msgstr "Horisontalselt keriv versioon sõbranimekirjast."
+
+#: ../gtk/plugins/timestamp.c:186
+msgid "iChat Timestamp"
+msgstr "iChat ajatempel"
+
+#: ../gtk/plugins/timestamp.c:193
+msgid "Delay"
+msgstr "Viivitus"
+
+#: ../gtk/plugins/timestamp.c:200
+msgid "minutes."
+msgstr "minutit."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/timestamp.c:256
+msgid "Timestamp"
+msgstr "Ajatempel"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/timestamp.c:259 ../gtk/plugins/timestamp.c:261
+msgid "Adds iChat-style timestamps to conversations every N minutes."
+msgstr "iChat-stiilis ajatemplite lisamine vestlusele iga N minuti järel."
+
+#: ../gtk/plugins/timestamp_format.c:22
+msgid "Timestamp Format Options"
+msgstr ""
+
+#: ../gtk/plugins/timestamp_format.c:27
+#, fuzzy
+msgid "_Force (traditional Gaim) 24-hour time format"
+msgstr "Kasutatakse _gaimi traditsioonilist 24-tunnist vormingut"
+
+#: ../gtk/plugins/timestamp_format.c:30
+msgid "Show dates in..."
+msgstr "Kus aegu näidatakse:"
+
+#: ../gtk/plugins/timestamp_format.c:35
+msgid "Co_nversations:"
+msgstr "_Vestlused:"
+
+#: ../gtk/plugins/timestamp_format.c:37 ../gtk/plugins/timestamp_format.c:46
+msgid "For delayed messages"
+msgstr "Viivitusega sõnumitele"
+
+#: ../gtk/plugins/timestamp_format.c:38 ../gtk/plugins/timestamp_format.c:47
+msgid "For delayed messages and in chats"
+msgstr "Viivitusega sõnumitele ja vestlustele"
+
+#: ../gtk/plugins/timestamp_format.c:44
+msgid "_Message Logs:"
+msgstr "Sõnu_milogid:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/timestamp_format.c:149
+msgid "Message Timestamp Formats"
+msgstr "Sõnumi ajatemplivormingud"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/timestamp_format.c:152
+msgid "Customizes the message timestamp formats."
+msgstr "Sõnumite ajatemplite vormingute kohandamine."
+
+#. *  description
+#: ../gtk/plugins/timestamp_format.c:154
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"Selle plugina abil saab kasutaja kohandada vestluse käigus edastatud "
+"sõnumite ajatemplite vorminguid."
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:183
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:569
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:616
+msgid "Opacity:"
+msgstr "Läbipaistmatus:"
+
+#. IM Convo trans options
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:533
+msgid "IM Conversation Windows"
+msgstr "Välksõnumite aknad"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:534
+msgid "_IM window transparency"
+msgstr "_Välksõnumiaknad on läbipaistvad"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:548
+msgid "_Show slider bar in IM window"
+msgstr "_Liuguri näitamine välksõnumiakendes"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:555
+msgid "Remove IM window transparency on focus"
+msgstr "Välksõnumi akna läbipaistvuse eemaldamine selle fokuseerimisel"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:558
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:606
+msgid "Always on top"
+msgstr "Alati pealmine"
+
+#. Buddy List trans options
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:590
+msgid "Buddy List Window"
+msgstr "Sõbranimekirja aken"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:591
+msgid "_Buddy List window transparency"
+msgstr "Sõbraaken on _läbipaistev"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:604
+msgid "Remove Buddy List window transparency on focus"
+msgstr "Sõbranimekirja akna läbipaistvuse eemaldamine selle fokuseerimisel"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:658
+msgid "Transparency"
+msgstr "Läbipaistvus"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:661
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr ""
+
+#. *  description
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:663
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
+msgstr ""
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:306
+msgid "GTK+ Runtime Version"
+msgstr "GTK+ Runtime versioon"
+
+#. Autostart
+#: ../gtk/plugins/win32/winprefs/winprefs.c:314
+msgid "Startup"
+msgstr "Käivitamine"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:315
+msgid "_Start Gaim on Windows startup"
+msgstr "_Gaim'i käivitamine Windows'i käivitamisel"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:328
+msgid "_Dockable Buddy List"
+msgstr "_Dokitav sõbranimekiri"
+
+#. Blist On Top
+#: ../gtk/plugins/win32/winprefs/winprefs.c:332
+msgid "_Keep Buddy List window on top:"
+msgstr "Sõbranimekirja _hoitakse pealmisena:"
+
+#. XXX: Did this ever work?
+#: ../gtk/plugins/win32/winprefs/winprefs.c:337
+msgid "Only when docked"
+msgstr "Ainult dokitud olekus"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:342
+#, fuzzy
+msgid "_Flash window when chat messages are received"
+msgstr "_Akna vilgutamine sõnumite vastuvõtmisel"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:366
+msgid "WinGaim Options"
+msgstr "WinGaim'i valikud"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:368
+msgid "Options specific to Windows Gaim."
+msgstr "Windows'i Gaim'ile omased valikud."
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:369
+#, fuzzy
+msgid "Provides options specific to Windows Gaim, such as buddy list docking."
+msgstr "Windows'i Gaim'ile omased valikud."
+
+#: ../libgaim/account.c:774
+msgid "accounts"
+msgstr "kontod"
+
+#: ../libgaim/account.c:918
+msgid "Password is required to sign on."
+msgstr "Sisselogimiseks on vaja parooli"
+
+#: ../libgaim/account.c:943
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "Sisesta parool %s jaoks (%s)"
+
+#: ../libgaim/account.c:950
+msgid "Enter Password"
+msgstr "Sisesta parool"
+
+#: ../libgaim/account.c:955
+msgid "Save password"
+msgstr "Salvesta parool"
+
+#: ../libgaim/account.c:989 ../libgaim/connection.c:103
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "%s jaoks pole protokollipluginat"
+
+#: ../libgaim/account.c:1071 ../libgaim/protocols/gg/gg.c:696
+#: ../libgaim/protocols/jabber/jabber.c:1304
+msgid "New passwords do not match."
+msgstr "Uued paroolid ei klapi omavahel."
+
+#: ../libgaim/account.c:1080
+msgid "Fill out all fields completely."
+msgstr "Täida kõik väljad."
+
+#: ../libgaim/account.c:1103
+msgid "Original password"
+msgstr "Algne parool"
+
+#: ../libgaim/account.c:1110
+msgid "New password"
+msgstr "Uus parool"
+
+#: ../libgaim/account.c:1117
+msgid "New password (again)"
+msgstr "Uus parool (veel kord)"
+
+#: ../libgaim/account.c:1123
+#, c-format
+msgid "Change password for %s"
+msgstr "%s parooli muutmine"
+
+#: ../libgaim/account.c:1131
+msgid "Please enter your current password and your new password."
+msgstr "Palun sisesta oma praegune parool ja uus parool."
+
+#: ../libgaim/account.c:1161
+#, c-format
+msgid "Change user information for %s"
+msgstr "Kasutaja %s andmete muutmine"
+
+#: ../libgaim/account.c:1164 ../libgaim/protocols/toc/toc.c:1690
+msgid "Set User Info"
+msgstr "Määra kasutajateave"
+
+#: ../libgaim/blist.c:548
+msgid "buddy list"
+msgstr "sõbranimekiri"
+
+#: ../libgaim/blist.c:1919
+#, c-format
+msgid ""
+"%d buddy from group %s was not removed because it belongs to an account "
+"which is disabled or offline.  This buddy and the group were not removed.\n"
+msgid_plural ""
+"%d buddies from group %s were not removed because they belong to accounts "
+"which are currently disabled or offline.  These buddies and the group were "
+"not removed.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libgaim/blist.c:1929
+msgid "Group not removed"
+msgstr "Gruppi ei eemaldatud"
+
+#: ../libgaim/connection.c:105
+msgid "Registration Error"
+msgstr "Viga registreerimisel"
+
+#: ../libgaim/connection.c:293
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s logis sisse"
+
+#: ../libgaim/connection.c:326
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s logis välja"
+
+#: ../libgaim/conversation.c:165
+msgid "Unable to send message: The message is too large."
+msgstr "Sõnumit pole võimalik saata: Sõnum on liiga suur."
+
+#: ../libgaim/conversation.c:168 ../libgaim/conversation.c:181
+#, c-format
+msgid "Unable to send message to %s."
+msgstr "Kasutajale %s pole võimalik sõnumit saata."
+
+#: ../libgaim/conversation.c:169
+msgid "The message is too large."
+msgstr "Sõnum on liiga suur."
+
+#: ../libgaim/conversation.c:178
+msgid "Unable to send message."
+msgstr "Sõnumit pole võimalik saata."
+
+#: ../libgaim/conversation.c:1162
+#, fuzzy
+msgid "Send Message"
+msgstr "Saa_detakse sõnum"
+
+#: ../libgaim/conversation.c:1163
+#, fuzzy
+msgid "_Send Message"
+msgstr "Saa_detakse sõnum"
+
+#: ../libgaim/conversation.c:1566
+#, c-format
+msgid "%s entered the room."
+msgstr "%s sisenes tuppa."
+
+#: ../libgaim/conversation.c:1569
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s [<I>%s</I>] sisenes tuppa."
+
+#: ../libgaim/conversation.c:1674
+#, c-format
+msgid "You are now known as %s"
+msgstr "Sa oled nüüd nimega %s"
+
+#: ../libgaim/conversation.c:1694
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s on nüüd nimega %s"
+
+#: ../libgaim/conversation.c:1767
+#, c-format
+msgid "%s left the room."
+msgstr "%s väljus toast."
+
+#: ../libgaim/conversation.c:1770
+#, c-format
+msgid "%s left the room (%s)."
+msgstr "%s väljus toast (%s)."
+
+#: ../libgaim/desktopitem.c:286 ../libgaim/desktopitem.c:877
+msgid "No name"
+msgstr "Nimetu"
+
+#: ../libgaim/dbus-server.c:577
+#, fuzzy, c-format
+msgid "Failed to get connection: %s"
+msgstr "Uut ühendust pole võimalik luua."
+
+#: ../libgaim/dbus-server.c:585
+#, fuzzy, c-format
+msgid "Failed to get name: %s"
+msgstr "Pole võimalik autentida: %s"
+
+#: ../libgaim/dbus-server.c:598
+#, fuzzy, c-format
+msgid "Failed to get serv name: %s"
+msgstr "Tõrge serveriga ühendumisel."
+
+#: ../libgaim/dnsquery.c:490
+#, fuzzy
+msgid "Unable to create new resolver process\n"
+msgstr "Soklit pole võimalik luua"
+
+#: ../libgaim/dnsquery.c:495
+#, fuzzy
+msgid "Unable to send request to resolver process\n"
+msgstr "Kasutajale %s pole võimalik sõnumit saata."
+
+#: ../libgaim/dnsquery.c:528 ../libgaim/dnsquery.c:676
+#, fuzzy, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr ""
+"Viga faili %s lugemisel: \n"
+"%s.\n"
+
+#: ../libgaim/dnsquery.c:531 ../libgaim/dnsquery.c:690
+#: ../libgaim/dnsquery.c:798
+#, fuzzy, c-format
+msgid "Error resolving %s: %d"
+msgstr ""
+"Viga faili %s lugemisel: \n"
+"%s.\n"
+
+#: ../libgaim/dnsquery.c:553
+#, fuzzy, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr "Viga pildi salvestamisel: %s"
+
+#: ../libgaim/dnsquery.c:557
+msgid "EOF while reading from resolver process"
+msgstr ""
+
+#: ../libgaim/dnsquery.c:734
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr ""
+
+#: ../libgaim/dnsquery.c:735
+#, fuzzy
+msgid "Unknown reason"
+msgstr "Põhjus teadmata."
+
+#: ../libgaim/ft.c:189 ../libgaim/protocols/msn/msn.c:410
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+"Viga faili %s lugemisel: \n"
+"%s.\n"
+
+#: ../libgaim/ft.c:193
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"Viga faili %s kirjutamisel: \n"
+"%s.\n"
+
+#: ../libgaim/ft.c:197
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"Viga failile %s ligipääsul: \n"
+"%s.\n"
+
+#: ../libgaim/ft.c:230
+msgid "Cannot send a file of 0 bytes."
+msgstr "Nullsuurusega faili pole võimalik saata."
+
+#: ../libgaim/ft.c:240
+msgid "Cannot send a directory."
+msgstr "Kataloogi pole võimalik saata."
+
+#: ../libgaim/ft.c:249
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr "%s pole tavaline fail. Ettevaatuse tõttu ei kirjutata seda üle.\n"
+
+#: ../libgaim/ft.c:307
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s soovib saata sulle faili %s (%s)"
+
+#: ../libgaim/ft.c:314
+#, c-format
+msgid "%s wants to send you a file"
+msgstr "%s soovib saata sulle faili"
+
+#: ../libgaim/ft.c:355
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "Kas nõustud failiülekandega kasutajalt %s?"
+
+#: ../libgaim/ft.c:359
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"Fail on allalaadimiseks saadaval:\n"
+"Kaughost: %s\n"
+"Kaugport: %d"
+
+#: ../libgaim/ft.c:392
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr "%s pakub faili %s saatmist"
+
+#: ../libgaim/ft.c:444
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr "%s ei ole lubatud failinimi.\n"
+
+#: ../libgaim/ft.c:465
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr "Pakun faili %s saatmist kasutajale %s"
+
+#: ../libgaim/ft.c:477
+#, c-format
+msgid "Starting transfer of %s from %s"
+msgstr "Faili %s ülekandmise alustamine kasutajalt %s"
+
+#: ../libgaim/ft.c:631
+#, c-format
+msgid "Transfer of file %s complete"
+msgstr "Fail %s täielikult üle kantud"
+
+#: ../libgaim/ft.c:634
+msgid "File transfer complete"
+msgstr "Fail on täielikult üle kantud"
+
+#: ../libgaim/ft.c:1023
+#, c-format
+msgid "You canceled the transfer of %s"
+msgstr "Sa katkestasid faili %s ülekandmise"
+
+#: ../libgaim/ft.c:1028
+msgid "File transfer cancelled"
+msgstr "Faili ülekandmine katkestatud"
+
+#: ../libgaim/ft.c:1086
+#, c-format
+msgid "%s canceled the transfer of %s"
+msgstr "%s katkestas faili %s ülekandmise"
+
+#: ../libgaim/ft.c:1091
+#, c-format
+msgid "%s canceled the file transfer"
+msgstr "%s katkestas failiülekande"
+
+#: ../libgaim/ft.c:1148
+#, c-format
+msgid "File transfer to %s failed."
+msgstr "Tõrge faili ülekandmisel kasutajale %s."
+
+#: ../libgaim/ft.c:1150
+#, c-format
+msgid "File transfer from %s failed."
+msgstr "Tõrge faili ülekandmisel kasutajalt %s."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:1
+msgid "Run the command in a terminal"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:2
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:3
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:4
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:5
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:6
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:7
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:8
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:9
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:10
+msgid "The handler for \"aim\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:11
+msgid "The handler for \"gg\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:12
+msgid "The handler for \"icq\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:13
+msgid "The handler for \"irc\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:14
+msgid "The handler for \"msnim\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:15
+msgid "The handler for \"sip\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:16
+msgid "The handler for \"xmpp\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:17
+msgid "The handler for \"ymsgr\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:18
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:19
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:20
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:21
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:22
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:23
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:24
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:25
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:26
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:27
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:28
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:29
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:30
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:31
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:32
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:33
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr ""
+
+#: ../libgaim/gconf/gaim.schemas.in.h:34
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr ""
+
+#: ../libgaim/log.c:181
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 
-#: ../src/log.c:547
+#: ../libgaim/log.c:562
 msgid "HTML"
 msgstr "HTML"
 
-#: ../src/log.c:558
+#: ../libgaim/log.c:573
 msgid "Plain text"
 msgstr "Lihttekst"
 
-#: ../src/log.c:569
-#, fuzzy
+#: ../libgaim/log.c:584
 msgid "Old Gaim"
-msgstr "Gaim"
-
-#: ../src/log.c:664
+msgstr "Vana Gaim"
+
+#: ../libgaim/log.c:691
 msgid "Logging of this conversation failed."
-msgstr ""
-
-#: ../src/log.c:1007
+msgstr "Tõrge selle vestluse logimisel."
+
+#: ../libgaim/log.c:1041
 msgid "XML"
 msgstr "XML"
 
-#: ../src/log.c:1081
+#: ../libgaim/log.c:1115
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
 
-#: ../src/log.c:1083
+#: ../libgaim/log.c:1117
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
 
-#: ../src/log.c:1140 ../src/log.c:1271
+#: ../libgaim/log.c:1175 ../libgaim/log.c:1306
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 
-#: ../src/log.c:1152 ../src/log.c:1285
+#: ../libgaim/log.c:1187 ../libgaim/log.c:1320
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr ""
 
-#: ../src/log.c:1214
+#: ../libgaim/log.c:1249
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMAATVASTUS>: %s\n"
 
-#: ../src/plugin.c:281 ../src/protocols/msn/servconn.c:139
-#: ../src/protocols/msn/session.c:326 ../src/protocols/oscar/oscar.c:2693
+#: ../libgaim/plugin.c:282 ../libgaim/protocols/jabber/buddy.c:1649
+#: ../libgaim/protocols/msn/servconn.c:139
+#: ../libgaim/protocols/msn/session.c:321
+#: ../libgaim/protocols/oscar/oscar.c:2677
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
-#: ../src/plugin.c:424
+#: ../libgaim/plugin.c:434
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr ""
 
-#: ../src/plugin.c:441
+#: ../libgaim/plugin.c:451
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr ""
 
-#: ../src/plugin.c:458
+#: ../libgaim/plugin.c:468
 msgid "Plugin does not implement all required functions"
 msgstr ""
 
-#: ../src/plugin.c:523
+#: ../libgaim/plugin.c:533
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
 
-#: ../src/plugin.c:528
+#: ../libgaim/plugin.c:538
 msgid "Gaim encountered errors loading the plugin."
 msgstr ""
 
-#: ../src/plugin.c:551
+#: ../libgaim/plugin.c:560
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr ""
 
-#: ../src/plugin.c:555
+#: ../libgaim/plugin.c:564
 msgid "Gaim was unable to load your plugin."
 msgstr ""
 
-#: ../src/plugin.c:657
+#: ../libgaim/plugin.c:664
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr ""
 
-#: ../src/plugin.c:662
+#: ../libgaim/plugin.c:669
 msgid "Gaim encountered errors unloading the plugin."
 msgstr ""
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/dbus-example.c:155
+#, fuzzy
+msgid "DBus Example"
+msgstr "DBus plugina näide"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/dbus-example.c:158 ../libgaim/plugins/dbus-example.c:160
+msgid "DBus Plugin Example"
+msgstr "DBus plugina näide"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/filectl.c:248
+msgid "Gaim File Control"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/filectl.c:251 ../libgaim/plugins/filectl.c:253
+msgid "Allows you to control Gaim by entering commands in a file."
+msgstr ""
+
+#: ../libgaim/plugins/idle.c:158 ../libgaim/plugins/idle.c:216
+msgid "Minutes"
+msgstr "Minuteid"
+
+#. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
+#. If that doesn't translate well into your language, drop the 's before translating.
+#: ../libgaim/plugins/idle.c:165 ../libgaim/plugins/idle.c:198
+#: ../libgaim/plugins/idle.c:223 ../libgaim/plugins/idle.c:315
+msgid "I'dle Mak'er"
+msgstr "Jõudeaja määraja"
+
+#: ../libgaim/plugins/idle.c:166 ../libgaim/plugins/idle.c:255
+msgid "Set Account Idle Time"
+msgstr "Määra konto jõudeaeg"
+
+#: ../libgaim/plugins/idle.c:169 ../libgaim/plugins/idle.c:227
+msgid "_Set"
+msgstr "_Määra"
+
+#: ../libgaim/plugins/idle.c:170 ../libgaim/plugins/idle.c:203
+#: ../libgaim/plugins/idle.c:228
+msgid "_Cancel"
+msgstr "_Loobu"
+
+#: ../libgaim/plugins/idle.c:183
+msgid "None of your accounts are idle."
+msgstr "Ükski sinu konto pole jõude."
+
+#: ../libgaim/plugins/idle.c:199 ../libgaim/plugins/idle.c:259
+msgid "Unset Account Idle Time"
+msgstr "Nulli konto jõudeaeg"
+
+#: ../libgaim/plugins/idle.c:202
+msgid "_Unset"
+msgstr "_Nulli"
+
+#: ../libgaim/plugins/idle.c:224 ../libgaim/plugins/idle.c:263
+msgid "Set Idle Time for All Accounts"
+msgstr "Määra jõudeaeg kõigile kontodele"
+
+#: ../libgaim/plugins/idle.c:268
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr "Nulli kõikide jõudeolevate kontode jõudeaeg"
+
+#: ../libgaim/plugins/idle.c:317 ../libgaim/plugins/idle.c:318
+msgid "Allows you to hand-configure how long you've been idle"
+msgstr "Lubab sul käsitsi määrata, kui kaua sa oled jõude olnud"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ipc-test-client.c:87
+msgid "IPC Test Client"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libgaim/plugins/ipc-test-client.c:90
+msgid "Test plugin IPC support, as a client."
+msgstr ""
+
+#. *  description
+#: ../libgaim/plugins/ipc-test-client.c:92
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ipc-test-server.c:74
+msgid "IPC Test Server"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libgaim/plugins/ipc-test-server.c:77
+msgid "Test plugin IPC support, as a server."
+msgstr ""
+
+#. *  description
+#: ../libgaim/plugins/ipc-test-server.c:79
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr ""
+
+#: ../libgaim/plugins/log_reader.c:1412
+msgid "User is offline."
+msgstr "Kasutaja pole ühendatud."
+
+#: ../libgaim/plugins/log_reader.c:1418
+msgid "Auto-response sent:"
+msgstr "Saadetud automaatvastus:"
+
+#: ../libgaim/plugins/log_reader.c:1428 ../libgaim/plugins/log_reader.c:1431
+#: ../libgaim/plugins/statenotify.c:80
+#, c-format
+msgid "%s has signed off."
+msgstr "%s logis välja."
+
+#: ../libgaim/plugins/log_reader.c:1445
+msgid "One or more messages may have been undeliverable."
+msgstr ""
+
+#: ../libgaim/plugins/log_reader.c:1455
+msgid "You were disconnected from the server."
+msgstr "Sa oled serverist lahti ühendatud."
+
+#: ../libgaim/plugins/log_reader.c:1463
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr ""
+
+#: ../libgaim/plugins/log_reader.c:1478
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr ""
+"Sõnumit pole võimalik saata kuna see on suurimast lubatud pikkusest pikem"
+
+#: ../libgaim/plugins/log_reader.c:1483
+msgid "Message could not be sent."
+msgstr "Sõnumit pole võimalik saata."
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1831 ../libgaim/plugins/log_reader.c:1940
+msgid "Adium"
+msgstr "Adium"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1844 ../libgaim/plugins/log_reader.c:1945
+msgid "Fire"
+msgstr "Tuli"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1856 ../libgaim/plugins/log_reader.c:1949
+msgid "Messenger Plus!"
+msgstr "Messenger Plus!"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1869 ../libgaim/plugins/log_reader.c:1954
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1881 ../libgaim/plugins/log_reader.c:1958
+msgid "Trillian"
+msgstr "Trillian"
+
+#. Add general preferences.
+#: ../libgaim/plugins/log_reader.c:1922
+msgid "General Log Reading Configuration"
+msgstr "Üldise logilugemise sätted"
+
+#: ../libgaim/plugins/log_reader.c:1926
+msgid "Fast size calculations"
+msgstr ""
+
+#: ../libgaim/plugins/log_reader.c:1930
+msgid "Use name heuristics"
+msgstr ""
+
+#. Add Log Directory preferences.
+#: ../libgaim/plugins/log_reader.c:1936
+msgid "Log Directory"
+msgstr "Logikataloog"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/log_reader.c:1981
+msgid "Log Reader"
+msgstr "Logilugeja"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../libgaim/plugins/log_reader.c:1985
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr ""
+
+#. * description
+#: ../libgaim/plugins/log_reader.c:1989
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"\n"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
+msgstr ""
+
+#: ../libgaim/plugins/mono/loader/mono.c:213
+msgid "Mono Plugin Loader"
+msgstr "Mono pluginate laadija"
+
+#: ../libgaim/plugins/mono/loader/mono.c:215
+#: ../libgaim/plugins/mono/loader/mono.c:216
+msgid "Loads .NET plugins with Mono."
+msgstr ".NET pluginate laadimine Mono abil."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/perl/perl.c:588
+msgid "Perl Plugin Loader"
+msgstr "Perl'i pluginate laadija"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../libgaim/plugins/perl/perl.c:590 ../libgaim/plugins/perl/perl.c:591
+msgid "Provides support for loading perl plugins."
+msgstr "Perl'is kirjutatud pluginate tugi"
+
+#: ../libgaim/plugins/psychic.c:19
+msgid "Psychic Mode"
+msgstr ""
+
+#: ../libgaim/plugins/psychic.c:20
+msgid "Psychic mode for incoming conversation"
+msgstr ""
+
+#: ../libgaim/plugins/psychic.c:21
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr ""
+
+#. This is a quote from Star Wars.  You should
+#. probably not translate it literally.  If
+#. you can't find a fitting cultural reference
+#. in your language, consider translating
+#. something like this instead:
+#. "You feel a new message coming."
+#: ../libgaim/plugins/psychic.c:63
+msgid "You feel a disturbance in the force..."
+msgstr ""
+
+#: ../libgaim/plugins/psychic.c:82
+msgid "Only enable for users on the buddy list"
+msgstr "Lubada ainult minu sõbraloendis olevaid kasutajaid"
+
+#: ../libgaim/plugins/psychic.c:87
+msgid "Disable when away"
+msgstr "Keelata, kui olen eemal"
+
+#: ../libgaim/plugins/psychic.c:91
+msgid "Display notification message in conversations"
+msgstr "Teavitussõnumite kuvamine vestlustes"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/signals-test.c:684
+msgid "Signals Test"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/signals-test.c:687 ../libgaim/plugins/signals-test.c:689
+msgid "Test to see that all signals are working properly."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/simple.c:37
+msgid "Simple Plugin"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/simple.c:40 ../libgaim/plugins/simple.c:42
+msgid "Tests to see that most things are working."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ssl/ssl.c:97 ../libgaim/plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:240
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:243
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:245
+msgid "Provides SSL support through GNUTLS."
+msgstr "SSL toe tagamine GNUTLS-i abil."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl-nss.c:409
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ssl/ssl-nss.c:412 ../libgaim/plugins/ssl/ssl-nss.c:414
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "SSL toe tagamine Mozilla NSS_i abil."
+
+#: ../libgaim/plugins/statenotify.c:50
+#, c-format
+msgid "%s is no longer away."
+msgstr "%s pole enam eemal."
+
+#: ../libgaim/plugins/statenotify.c:52
+#, c-format
+msgid "%s has gone away."
+msgstr "%s läks eemale."
+
+#: ../libgaim/plugins/statenotify.c:62
+#, c-format
+msgid "%s has become idle."
+msgstr "%s on jõude."
+
+#: ../libgaim/plugins/statenotify.c:64
+#, c-format
+msgid "%s is no longer idle."
+msgstr "%s pole enam jõude."
+
+#: ../libgaim/plugins/statenotify.c:73
+#, c-format
+msgid "%s has signed on."
+msgstr "%s logis sisse."
+
+#: ../libgaim/plugins/statenotify.c:91
+msgid "Notify When"
+msgstr "Teavitatakse kui"
+
+#: ../libgaim/plugins/statenotify.c:94
+msgid "Buddy Goes _Away"
+msgstr "Sõber läheb _eemale"
+
+#: ../libgaim/plugins/statenotify.c:97
+msgid "Buddy Goes _Idle"
+msgstr "Sõber on _tegevuseta"
+
+#: ../libgaim/plugins/statenotify.c:100
+msgid "Buddy _Signs On/Off"
+msgstr "Sõber logib s_isse või välja"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/statenotify.c:142
+msgid "Buddy State Notification"
+msgstr "Sõprade oleku teavitaja"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/statenotify.c:145 ../libgaim/plugins/statenotify.c:148
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr ""
+"Vestlusakendes teavitatakse sind sõprade eemaldumisest või tegevuseta "
+"olekust."
+
+#: ../libgaim/plugins/tcl/tcl.c:413
+msgid "Tcl Plugin Loader"
+msgstr ""
+
+#: ../libgaim/plugins/tcl/tcl.c:415 ../libgaim/plugins/tcl/tcl.c:416
+msgid "Provides support for loading Tcl plugins"
+msgstr ""
+
 #. Send a message about the connection error
-#: ../src/protocols/bonjour/bonjour.c:111
+#: ../libgaim/protocols/bonjour/bonjour.c:111
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Sissetulevaid välksõnumiühendusi pole võimalik kuulata\n"
 
-#: ../src/protocols/bonjour/bonjour.c:146
+#: ../libgaim/protocols/bonjour/bonjour.c:146
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#: ../src/protocols/bonjour/bonjour.c:337
-#: ../src/protocols/sametime/sametime.c:3250
+#: ../libgaim/protocols/bonjour/bonjour.c:337
+#: ../libgaim/protocols/sametime/sametime.c:3239
 #, c-format
 msgid ""
 "\n"
@@ -5378,7 +6367,7 @@
 "\n"
 "<b>Olek:</b> %s"
 
-#: ../src/protocols/bonjour/bonjour.c:339
+#: ../libgaim/protocols/bonjour/bonjour.c:339
 #, c-format
 msgid ""
 "\n"
@@ -5397,431 +6386,404 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/bonjour/bonjour.c:433
-#: ../src/protocols/bonjour/bonjour.c:435
+#: ../libgaim/protocols/bonjour/bonjour.c:435
+#: ../libgaim/protocols/bonjour/bonjour.c:437
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour protokolli plugin"
 
-#: ../src/protocols/bonjour/bonjour.c:471
-#: ../src/protocols/bonjour/bonjour.c:479
-#: ../src/protocols/bonjour/bonjour.c:537
+#: ../libgaim/protocols/bonjour/bonjour.c:473
+#: ../libgaim/protocols/bonjour/bonjour.c:481
+#: ../libgaim/protocols/bonjour/bonjour.c:539
+#: ../libgaim/protocols/silc/silc.c:301
 msgid "Gaim User"
 msgstr ""
 
 #. Creating the user splits
-#: ../src/protocols/bonjour/bonjour.c:575 ../src/protocols/silc/silc.c:935
+#: ../libgaim/protocols/bonjour/bonjour.c:577
+#: ../libgaim/protocols/silc/silc.c:935
 msgid "Hostname"
 msgstr "Hostinimi"
 
 #. Creating the options for the protocol
-#. port to connect to
-#: ../src/protocols/bonjour/bonjour.c:579 ../src/protocols/irc/irc.c:900
-#: ../src/protocols/msn/msn.c:2054 ../src/protocols/napster/napster.c:724
-#: ../src/protocols/sametime/sametime.c:5642 ../src/protocols/silc/silc.c:1859
-msgid "Port"
-msgstr "Port"
-
-#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:605
-#: ../src/protocols/jabber/jabber.c:770
+#: ../libgaim/protocols/bonjour/bonjour.c:581 ../libgaim/protocols/gg/gg.c:622
+#: ../libgaim/protocols/jabber/jabber.c:800
 msgid "First name"
 msgstr "Eesnimi"
 
-#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:600
-#: ../src/protocols/jabber/jabber.c:775
+#: ../libgaim/protocols/bonjour/bonjour.c:584 ../libgaim/protocols/gg/gg.c:617
+#: ../libgaim/protocols/jabber/jabber.c:805
 msgid "Last name"
 msgstr "Perekonnanimi"
 
-#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/gg/gg.c:468
-#: ../src/protocols/jabber/jabber.c:760 ../src/protocols/silc/silc.c:699
-#: ../src/protocols/silc/silc.c:939
-#, fuzzy
+#: ../libgaim/protocols/bonjour/bonjour.c:587 ../libgaim/protocols/gg/gg.c:468
+#: ../libgaim/protocols/jabber/jabber.c:790
+#: ../libgaim/protocols/silc/silc.c:699 ../libgaim/protocols/silc/silc.c:939
 msgid "E-mail"
-msgstr "E-post:"
-
-#: ../src/protocols/bonjour/bonjour.h:35
+msgstr "E-post"
+
+#: ../libgaim/protocols/bonjour/bonjour.c:590
+#, fuzzy
+msgid "AIM Account"
+msgstr "Konto lisamine"
+
+#: ../libgaim/protocols/bonjour/bonjour.c:593
+#, fuzzy
+msgid "Jabber Account"
+msgstr "Luba konto"
+
+#: ../libgaim/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
 msgstr ""
 
-#: ../src/protocols/bonjour/jabber.c:357
-#, fuzzy, c-format
+#: ../libgaim/protocols/bonjour/jabber.c:374
+#, c-format
 msgid "%s has closed the conversation."
-msgstr "%s sulges vestlusakna."
-
-#: ../src/protocols/bonjour/jabber.c:439
-#, fuzzy
+msgstr "%s sulges vestluse."
+
+#: ../libgaim/protocols/bonjour/jabber.c:461
 msgid "Cannot open socket"
 msgstr "Soklit pole võimalik avada"
 
-#: ../src/protocols/bonjour/jabber.c:447
-#, fuzzy
+#: ../libgaim/protocols/bonjour/jabber.c:469
 msgid "Error setting socket options"
-msgstr "Viga ühenduse loomisel"
-
-#: ../src/protocols/bonjour/jabber.c:458
-msgid "Cannot bind socket to port"
-msgstr ""
-
-#: ../src/protocols/bonjour/jabber.c:465
-#, fuzzy
-msgid "Cannot listen on socket"
-msgstr "Faili pole võimalik saata"
-
-#: ../src/protocols/bonjour/jabber.c:559
+msgstr "Viga soklivalikute seadmisel"
+
+#: ../libgaim/protocols/bonjour/jabber.c:493
+msgid "Could not bind socket to port"
+msgstr "Soklit pole võimalik porti kuulama panna"
+
+#: ../libgaim/protocols/bonjour/jabber.c:501
+msgid "Could not listen on socket"
+msgstr "Soklit pole võimalik kuulata"
+
+#: ../libgaim/protocols/bonjour/jabber.c:594
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-#: ../src/protocols/gg/gg.c:76 ../src/proxy.c:2345
+#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1776
 msgid "Invalid proxy settings"
 msgstr "Vigased proksi sätted"
 
-#: ../src/protocols/gg/gg.c:77 ../src/proxy.c:2345
+#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1776
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
 
-#: ../src/protocols/gg/gg.c:115 ../src/protocols/gg/gg.c:137
-#: ../src/protocols/gg/gg.c:180
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:115 ../libgaim/protocols/gg/gg.c:137
+#: ../libgaim/protocols/gg/gg.c:180
 msgid "Token Error"
-msgstr "Tundmatu viga"
-
-#: ../src/protocols/gg/gg.c:116 ../src/protocols/gg/gg.c:138
-#: ../src/protocols/gg/gg.c:181
+msgstr ""
+
+#: ../libgaim/protocols/gg/gg.c:116 ../libgaim/protocols/gg/gg.c:138
+#: ../libgaim/protocols/gg/gg.c:181
 #, fuzzy
 msgid "Unable to fetch the token.\n"
 msgstr "Soklit pole võimalik luua"
 
-#: ../src/protocols/gg/gg.c:269 ../src/protocols/gg/gg.c:288
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:269 ../libgaim/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
-msgstr "Faili salvestamine..."
-
-#: ../src/protocols/gg/gg.c:270
+msgstr "Sõbraloendi salvestamine..."
+
+#: ../libgaim/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr ""
 
-#: ../src/protocols/gg/gg.c:276 ../src/protocols/gg/gg.c:278
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:276 ../libgaim/protocols/gg/gg.c:278
 msgid "Couldn't open file"
-msgstr "Faili pole võimalik saata"
-
-#: ../src/protocols/gg/gg.c:289
-#, fuzzy
+msgstr "Faili pole võimalik avada"
+
+#: ../libgaim/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
-msgstr "Paroolimuutmine õnnestus"
-
-#: ../src/protocols/gg/gg.c:307 ../src/protocols/gg/gg.c:308
-#, fuzzy
+msgstr "Sõbraloendi salvestamine õnnestus"
+
+#: ../libgaim/protocols/gg/gg.c:307 ../libgaim/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
-msgstr "Sõbranimekirja pole võimalik eksportida"
-
-#: ../src/protocols/gg/gg.c:324
+msgstr "Sõbraloendit pole võimalik laadida"
+
+#: ../libgaim/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
-msgstr ""
-
-#: ../src/protocols/gg/gg.c:325
-#, fuzzy
+msgstr "Sõbraloendi laadimine..."
+
+#: ../libgaim/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
-msgstr "Paroolimuutmine õnnestus"
-
-#: ../src/protocols/gg/gg.c:336
+msgstr "Sõbraloend edukalt laaditud!"
+
+#: ../libgaim/protocols/gg/gg.c:336
 msgid "Save buddylist..."
-msgstr "Sõbranimekirja salvestamine..."
-
-#: ../src/protocols/gg/gg.c:380
+msgstr "Sõbraloendi salvestamine..."
+
+#: ../libgaim/protocols/gg/gg.c:380
 msgid "Fill in the registration fields."
 msgstr ""
 
-#: ../src/protocols/gg/gg.c:385
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:385
 msgid "Passwords do not match."
-msgstr "Uued paroolid ei klapi omavahel."
-
-#: ../src/protocols/gg/gg.c:394
-#, fuzzy
+msgstr "Paroolid ei klapi omavahel."
+
+#: ../libgaim/protocols/gg/gg.c:394
 msgid "Unable to register new account. Error occurred.\n"
-msgstr "Uut ühendust pole võimalik luua."
-
-#: ../src/protocols/gg/gg.c:407
+msgstr "Uut kontot pole vea tõttu võimalik registreerida.\n"
+
+#: ../libgaim/protocols/gg/gg.c:407
 msgid "New Gadu-Gadu Account Registered"
 msgstr ""
 
-#: ../src/protocols/gg/gg.c:408
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:408
 msgid "Registration completed successfully!"
-msgstr "Registreerimine õnnestus"
-
-#: ../src/protocols/gg/gg.c:473 ../src/protocols/gg/gg.c:747
-#: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1307
+msgstr "Registreerimine edukalt läbi viidud!"
+
+#: ../libgaim/protocols/gg/gg.c:473 ../libgaim/protocols/gg/gg.c:764
+#: ../libgaim/protocols/jabber/jabber.c:779
+#: ../libgaim/protocols/jabber/jabber.c:1339
 msgid "Password"
 msgstr "Parool"
 
-#: ../src/protocols/gg/gg.c:478 ../src/protocols/gg/gg.c:752
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:478 ../libgaim/protocols/gg/gg.c:769
 msgid "Password (retype)"
-msgstr "Parool saadetud"
-
-#: ../src/protocols/gg/gg.c:483 ../src/protocols/gg/gg.c:757
-#, fuzzy
+msgstr "Parool (uuesti)"
+
+#: ../libgaim/protocols/gg/gg.c:483 ../libgaim/protocols/gg/gg.c:774
 msgid "Enter current token"
-msgstr "%s pole hetkel sisse logitud."
-
-#: ../src/protocols/gg/gg.c:489 ../src/protocols/gg/gg.c:763
-#, fuzzy
+msgstr ""
+
+#: ../libgaim/protocols/gg/gg.c:489 ../libgaim/protocols/gg/gg.c:780
 msgid "Current token"
-msgstr "Hetkel jututubades"
-
-#: ../src/protocols/gg/gg.c:493 ../src/protocols/gg/gg.c:494
-#, fuzzy
+msgstr ""
+
+#: ../libgaim/protocols/gg/gg.c:493 ../libgaim/protocols/gg/gg.c:494
 msgid "Register New Gadu-Gadu Account"
-msgstr "Uue Jabber'i konto registreerimine"
-
-#: ../src/protocols/gg/gg.c:495
+msgstr "Uue Gadu-Gadu konto registreerimine"
+
+#: ../libgaim/protocols/gg/gg.c:495
 msgid "Please, fill in the following fields"
-msgstr ""
-
-#: ../src/protocols/gg/gg.c:590 ../src/protocols/gg/gg.c:1657
-#, fuzzy
-msgid "Unable to initiate a new search"
-msgstr "Kasutajat pole võimalik kutsuda (%s)."
-
-#: ../src/protocols/gg/gg.c:591 ../src/protocols/gg/gg.c:1658
-msgid "You have a pending search. Please wait for it to finish."
-msgstr ""
+msgstr "Palun täida järgnevad väljad"
 
 #. General
-#: ../src/protocols/gg/gg.c:610 ../src/protocols/gg/gg.c:1018
-#: ../src/protocols/gg/gg.c:2048 ../src/protocols/jabber/buddy.c:252
-#: ../src/protocols/jabber/buddy.c:695 ../src/protocols/jabber/buddy.c:1259
-#: ../src/protocols/jabber/buddy.c:1406 ../src/protocols/jabber/jabber.c:765
-#: ../src/protocols/msn/msn.c:1373 ../src/protocols/msn/msn.c:1535
-#: ../src/protocols/silc/buddy.c:1528 ../src/protocols/silc/ops.c:1036
-#: ../src/protocols/silc/ops.c:1179 ../src/protocols/silc/ops.c:1328
-#: ../src/protocols/yahoo/yahoo_profile.c:1041
+#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1038
+#: ../libgaim/protocols/gg/gg.c:1104 ../libgaim/protocols/gg/gg.c:2182
+#: ../libgaim/protocols/jabber/buddy.c:271
+#: ../libgaim/protocols/jabber/buddy.c:800
+#: ../libgaim/protocols/jabber/buddy.c:1526
+#: ../libgaim/protocols/jabber/buddy.c:1708
+#: ../libgaim/protocols/jabber/jabber.c:795
+#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1536
+#: ../libgaim/protocols/qq/buddy_info.c:41
+#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1036
+#: ../libgaim/protocols/silc/ops.c:1179 ../libgaim/protocols/silc/ops.c:1328
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1055
 msgid "Nickname"
 msgstr "Hüüdnimi"
 
-#: ../src/protocols/gg/gg.c:615 ../src/protocols/gg/gg.c:1021
-#: ../src/protocols/jabber/jabber.c:785 ../src/protocols/oscar/oscar.c:3668
-#: ../src/protocols/oscar/oscar.c:3676
+#: ../libgaim/protocols/gg/gg.c:632 ../libgaim/protocols/gg/gg.c:1043
+#: ../libgaim/protocols/gg/gg.c:1107 ../libgaim/protocols/jabber/jabber.c:815
+#: ../libgaim/protocols/oscar/oscar.c:3683
+#: ../libgaim/protocols/oscar/oscar.c:3691
+#: ../libgaim/protocols/qq/buddy_info.c:47
 msgid "City"
 msgstr "Linn"
 
-#: ../src/protocols/gg/gg.c:620
+#: ../libgaim/protocols/gg/gg.c:637
 msgid "Year of birth"
-msgstr ""
-
-#: ../src/protocols/gg/gg.c:623 ../src/protocols/msn/msn.c:1537
-#: ../src/protocols/oscar/oscar.c:3642
-#: ../src/protocols/yahoo/yahoo_profile.c:1066
+msgstr "Sünniaasta"
+
+#: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1538
+#: ../libgaim/protocols/oscar/oscar.c:3647
+#: ../libgaim/protocols/qq/buddy_info.c:44
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1080
 msgid "Gender"
 msgstr "Sugu"
 
-#: ../src/protocols/gg/gg.c:624
+#: ../libgaim/protocols/gg/gg.c:641
 msgid "Male or female"
-msgstr ""
-
-#: ../src/protocols/gg/gg.c:625 ../src/protocols/oscar/oscar.c:3642
+msgstr "Mees või naine"
+
+#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3647
+#: ../libgaim/protocols/qq/buddy_info.c:81
 msgid "Male"
 msgstr "Mees"
 
-#: ../src/protocols/gg/gg.c:626 ../src/protocols/oscar/oscar.c:3642
+#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3647
+#: ../libgaim/protocols/qq/buddy_info.c:82
 msgid "Female"
 msgstr "Naine"
 
-#: ../src/protocols/gg/gg.c:630
+#: ../libgaim/protocols/gg/gg.c:647
 msgid "Only online"
 msgstr ""
 
-#: ../src/protocols/gg/gg.c:634 ../src/protocols/gg/gg.c:635
+#: ../libgaim/protocols/gg/gg.c:651 ../libgaim/protocols/gg/gg.c:652
 msgid "Find buddies"
 msgstr ""
 
-#: ../src/protocols/gg/gg.c:636
+#: ../libgaim/protocols/gg/gg.c:653
 #, fuzzy
 msgid "Please, enter your search criteria below"
 msgstr "Palun sisesta uus parool"
 
-#: ../src/protocols/gg/gg.c:673
+#: ../libgaim/protocols/gg/gg.c:690
 msgid "Fill in the fields."
 msgstr ""
 
-#: ../src/protocols/gg/gg.c:685
+#: ../libgaim/protocols/gg/gg.c:702
 msgid "Your current password is different from the one that you specified."
 msgstr ""
 
-#: ../src/protocols/gg/gg.c:699
-msgid "Unable to change password. Error occured.\n"
-msgstr ""
-
-#: ../src/protocols/gg/gg.c:708
+#: ../libgaim/protocols/gg/gg.c:716
+#, fuzzy
+msgid "Unable to change password. Error occurred.\n"
+msgstr "Uut kontot pole vea tõttu võimalik registreerida.\n"
+
+#: ../libgaim/protocols/gg/gg.c:725
 msgid "Change password for the Gadu-Gadu account"
-msgstr ""
-
-#: ../src/protocols/gg/gg.c:709
-#, fuzzy
+msgstr "Gadu-Gadu konto parooli muutmine"
+
+#: ../libgaim/protocols/gg/gg.c:726
 msgid "Password was changed successfully!"
-msgstr "Paroolimuutmine õnnestus"
-
-#: ../src/protocols/gg/gg.c:742
-#, fuzzy
+msgstr "Parool on edukalt muudetud!"
+
+#: ../libgaim/protocols/gg/gg.c:759
 msgid "Current password"
-msgstr "Uus parool"
-
-#: ../src/protocols/gg/gg.c:767
-#, fuzzy
+msgstr "Praegune parool"
+
+#: ../libgaim/protocols/gg/gg.c:784
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr "Palun sisesta oma praegune parool ja uus parool."
-
-#: ../src/protocols/gg/gg.c:771 ../src/protocols/gg/gg.c:772
-#, fuzzy
+msgstr "Palun sisesta oma praegune parool ja uus parool UIN-i jaoks: "
+
+#: ../libgaim/protocols/gg/gg.c:788 ../libgaim/protocols/gg/gg.c:789
 msgid "Change Gadu-Gadu Password"
-msgstr "Muuda parooli"
-
-#: ../src/protocols/gg/gg.c:846
+msgstr "Gadu-Gadu parooli muutmine"
+
+#: ../libgaim/protocols/gg/gg.c:863
 #, fuzzy, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Jututoa eemaldamine sinu sõbranimekirjast"
 
-#: ../src/protocols/gg/gg.c:849 ../src/protocols/gg/gg.c:850
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:866 ../libgaim/protocols/gg/gg.c:867
 msgid "Add to chat..."
-msgstr "Lisa _jututuba"
-
-#: ../src/protocols/gg/gg.c:993
-msgid "No matching users found"
-msgstr ""
-
-#: ../src/protocols/gg/gg.c:994
-msgid "There are no users matching your search criteria."
-msgstr ""
-
-#: ../src/protocols/gg/gg.c:1006 ../src/protocols/gg/gg.c:1073
-#: ../src/protocols/oscar/oscar.c:3779
-#, fuzzy
-msgid "Unable to display the search results."
-msgstr "Kasutajat pole võimalik kutsuda (%s)."
-
-#: ../src/protocols/gg/gg.c:1012 ../src/protocols/oscar/oscar.c:3614
+msgstr "Lisa vestlusesse..."
+
+#: ../libgaim/protocols/gg/gg.c:1029 ../libgaim/protocols/gg/gg.c:1098
+#: ../libgaim/protocols/oscar/oscar.c:3619
 msgid "UIN"
 msgstr "UIN"
 
-#: ../src/protocols/gg/gg.c:1015 ../src/protocols/jabber/buddy.c:1255
-#: ../src/protocols/jabber/buddy.c:1396 ../src/protocols/oscar/oscar.c:3625
-#: ../src/protocols/silc/ops.c:1024
+#: ../libgaim/protocols/gg/gg.c:1033 ../libgaim/protocols/gg/gg.c:1101
+#: ../libgaim/protocols/jabber/buddy.c:1522
+#: ../libgaim/protocols/jabber/buddy.c:1698
+#: ../libgaim/protocols/oscar/oscar.c:3630
+#: ../libgaim/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Eesnimi"
 
-#: ../src/protocols/gg/gg.c:1024
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:1052 ../libgaim/protocols/gg/gg.c:1110
 msgid "Birth Year"
 msgstr "Sünniaasta"
 
-#: ../src/protocols/gg/gg.c:1064
+#: ../libgaim/protocols/gg/gg.c:1092 ../libgaim/protocols/gg/gg.c:1161
+#: ../libgaim/protocols/oscar/oscar.c:3794
+msgid "Unable to display the search results."
+msgstr "Otsingutulemusi pole võimalik kuvada."
+
+#: ../libgaim/protocols/gg/gg.c:1152
 msgid "Gadu-Gadu Public Directory"
 msgstr ""
 
-#: ../src/protocols/gg/gg.c:1065
+#: ../libgaim/protocols/gg/gg.c:1153
 msgid "Search results"
 msgstr "Otsingutulemused"
 
-#: ../src/protocols/gg/gg.c:1162 ../src/protocols/gg/gg.c:1309
+#: ../libgaim/protocols/gg/gg.c:1196
+msgid "No matching users found"
+msgstr ""
+
+#: ../libgaim/protocols/gg/gg.c:1197
+msgid "There are no users matching your search criteria."
+msgstr ""
+
+#: ../libgaim/protocols/gg/gg.c:1291 ../libgaim/protocols/gg/gg.c:1440
 msgid "Unable to read socket"
-msgstr "Ei suuda soklit lugeda"
-
-#: ../src/protocols/gg/gg.c:1245
-#, fuzzy
+msgstr "Soklit pole võimalik lugeda"
+
+#: ../libgaim/protocols/gg/gg.c:1376
 msgid "Buddy list downloaded"
-msgstr "Sõber on tegevuseta:"
-
-#: ../src/protocols/gg/gg.c:1246
-#, fuzzy
+msgstr "Sõbraloend alla laaditud"
+
+#: ../libgaim/protocols/gg/gg.c:1377
 msgid "Your buddy list was downloaded from the server."
-msgstr "Sa oled serverist lahti ühendatud."
-
-#: ../src/protocols/gg/gg.c:1253
-#, fuzzy
+msgstr "Sinu sõbraloend on serverist alla laaditud."
+
+#: ../libgaim/protocols/gg/gg.c:1384
 msgid "Buddy list uploaded"
-msgstr "Sõprade kuvamine"
-
-#: ../src/protocols/gg/gg.c:1254
-#, fuzzy
+msgstr "Sõbraloend üles laaditud"
+
+#: ../libgaim/protocols/gg/gg.c:1385
 msgid "Your buddy list was stored on the server."
-msgstr "Sa oled serverist lahti ühendatud."
-
-#: ../src/protocols/gg/gg.c:1355 ../src/protocols/gg/gg.c:1579
-#, fuzzy
+msgstr "Sinu sõbraloend on serverisse üles laaditud."
+
+#: ../libgaim/protocols/gg/gg.c:1486 ../libgaim/protocols/gg/gg.c:1710
 msgid "Connection failed."
-msgstr "Tõrge ühendumisel"
-
-#: ../src/protocols/gg/gg.c:1485 ../src/protocols/msn/msn.c:566
+msgstr "Tõrge ühendumisel."
+
+#: ../libgaim/protocols/gg/gg.c:1616 ../libgaim/protocols/msn/msn.c:562
 msgid "Blocked"
 msgstr "Blokitud"
 
-#: ../src/protocols/gg/gg.c:1508
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:1639
 msgid "Add to chat"
-msgstr "Jututoa lisamine"
-
-#: ../src/protocols/gg/gg.c:1517
-#, fuzzy
+msgstr "Vestlusese lisamine"
+
+#: ../libgaim/protocols/gg/gg.c:1648
 msgid "Unblock"
-msgstr "Bloki"
-
-#: ../src/protocols/gg/gg.c:1521
+msgstr "Võta blokk maha"
+
+#: ../libgaim/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr "Bloki"
 
-#: ../src/protocols/gg/gg.c:1538
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:1669
 msgid "Chat _name:"
-msgstr "Perekonnanimi:"
-
-#: ../src/protocols/gg/gg.c:1769
-#, fuzzy
+msgstr "Vestluse _nimi:"
+
+#: ../libgaim/protocols/gg/gg.c:1902
 msgid "Chat error"
-msgstr "Kirjutamise viga"
-
-#: ../src/protocols/gg/gg.c:1770
-#, fuzzy
+msgstr "Viga vestlusel"
+
+#: ../libgaim/protocols/gg/gg.c:1903
 msgid "This chat name is already in use"
-msgstr "See fail on juba olemas"
-
-#: ../src/protocols/gg/gg.c:1853
-#, fuzzy
+msgstr "Selline vestluse nimi on juba kasutusel"
+
+#: ../libgaim/protocols/gg/gg.c:1986
 msgid "Not connected to the server."
-msgstr "Sa oled serverist lahti ühendatud."
-
-#: ../src/protocols/gg/gg.c:1876
-#, fuzzy
+msgstr "Puudub ühendus serveriga."
+
+#: ../libgaim/protocols/gg/gg.c:2009
 msgid "Find buddies..."
-msgstr "T_uhmista tegevuseta sõbrad"
-
-#: ../src/protocols/gg/gg.c:1882
-#, fuzzy
+msgstr "Otsi sõpru..."
+
+#: ../libgaim/protocols/gg/gg.c:2015
 msgid "Change password..."
-msgstr "Muuda parooli"
-
-#: ../src/protocols/gg/gg.c:1888
+msgstr "Muuda parooli..."
+
+#: ../libgaim/protocols/gg/gg.c:2021
 msgid "Upload buddylist to Server"
-msgstr ""
-
-#: ../src/protocols/gg/gg.c:1892
+msgstr "Sõbraloendi üleslaadimine serverisse"
+
+#: ../libgaim/protocols/gg/gg.c:2025
 msgid "Download buddylist from Server"
-msgstr ""
-
-#: ../src/protocols/gg/gg.c:1896
+msgstr "Sõbraloendi serverist allalaadimine"
+
+#: ../libgaim/protocols/gg/gg.c:2029
 msgid "Delete buddylist from Server"
-msgstr ""
-
-#: ../src/protocols/gg/gg.c:1900
+msgstr "Sõbraloendi kustutamine serverist"
+
+#: ../libgaim/protocols/gg/gg.c:2033
 msgid "Save buddylist to file..."
-msgstr ""
-
-#: ../src/protocols/gg/gg.c:1904
+msgstr "Sõbraloendi salvestamine faili..."
+
+#: ../libgaim/protocols/gg/gg.c:2037
 msgid "Load buddylist from file..."
-msgstr ""
+msgstr "Sõbraloendi laadimine failist..."
 
 #. magic
 #. major_version
@@ -5834,121 +6796,122 @@
 #. id
 #. name
 #. version
-#: ../src/protocols/gg/gg.c:2000
+#: ../libgaim/protocols/gg/gg.c:2134
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu protokolli plugin"
 
 #. summary
-#: ../src/protocols/gg/gg.c:2001
+#: ../libgaim/protocols/gg/gg.c:2135
 msgid "Polish popular IM"
 msgstr ""
 
-#: ../src/protocols/gg/gg.c:2049
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:2183
 msgid "Gadu-Gadu User"
-msgstr "Gadu-Gadu otsingumootor"
-
-#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1586
+msgstr "Gadu-Gadu kasutaja"
+
+#: ../libgaim/protocols/irc/cmds.c:43 ../libgaim/protocols/silc/silc.c:1585
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Tundmatu käsk: %s"
 
-#: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:592
-#: ../src/protocols/silc/silc.c:1294
+#: ../libgaim/protocols/irc/cmds.c:505 ../libgaim/protocols/jabber/chat.c:591
+#: ../libgaim/protocols/silc/silc.c:1293
 #, c-format
 msgid "current topic is: %s"
 msgstr "hetketeema on: %s"
 
-#: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:596
-#: ../src/protocols/silc/silc.c:1298
+#: ../libgaim/protocols/irc/cmds.c:509 ../libgaim/protocols/jabber/chat.c:595
+#: ../libgaim/protocols/silc/silc.c:1297
 msgid "No topic is set"
 msgstr "Teemat pole seatud"
 
-#: ../src/protocols/irc/dcc_send.c:287 ../src/protocols/irc/dcc_send.c:326
-#: ../src/protocols/yahoo/yahoo_filexfer.c:252
-#: ../src/protocols/yahoo/yahoo_filexfer.c:261
-#: ../src/protocols/yahoo/yahoo_filexfer.c:270
-#, fuzzy
+#: ../libgaim/protocols/irc/dcc_send.c:293
+#: ../libgaim/protocols/irc/dcc_send.c:334
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:268
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:277
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:290
 msgid "File Transfer Failed"
-msgstr "Faili ülekandmine katkestatud"
-
-#: ../src/protocols/irc/dcc_send.c:288 ../src/protocols/irc/dcc_send.c:327
+msgstr "Tõrge faili ülekandmisel"
+
+#: ../libgaim/protocols/irc/dcc_send.c:294
+#: ../libgaim/protocols/irc/dcc_send.c:335
 msgid "Gaim could not open a listening port."
-msgstr ""
-
-#: ../src/protocols/irc/irc.c:78
+msgstr "Gaim ei suuda kuulamisporti avada."
+
+#: ../libgaim/protocols/irc/irc.c:80
 msgid "Error displaying MOTD"
 msgstr "Viga päevasõnumi kuvamisel"
 
-#: ../src/protocols/irc/irc.c:78
+#: ../libgaim/protocols/irc/irc.c:80
 msgid "No MOTD available"
 msgstr "Päevasõnumit pole saadaval"
 
-#: ../src/protocols/irc/irc.c:79
+#: ../libgaim/protocols/irc/irc.c:81
 msgid "There is no MOTD associated with this connection."
 msgstr "Selle ühendusega pole päevasõnumit seotud"
 
-#: ../src/protocols/irc/irc.c:82
+#: ../libgaim/protocols/irc/irc.c:84
 #, c-format
 msgid "MOTD for %s"
 msgstr "%s päevasõnum"
 
-#: ../src/protocols/irc/irc.c:119 ../src/protocols/irc/irc.c:149
-#: ../src/protocols/irc/irc.c:604 ../src/protocols/irc/irc.c:629
+#: ../libgaim/protocols/irc/irc.c:128 ../libgaim/protocols/irc/irc.c:166
+#: ../libgaim/protocols/irc/irc.c:614 ../libgaim/protocols/irc/irc.c:639
 msgid "Server has disconnected"
 msgstr "Server katkestas ühenduse"
 
-#: ../src/protocols/irc/irc.c:242
+#: ../libgaim/protocols/irc/irc.c:259
 msgid "View MOTD"
 msgstr "Vaata päevasõnumit"
 
-#: ../src/protocols/irc/irc.c:254 ../src/protocols/silc/chat.c:33
+#: ../libgaim/protocols/irc/irc.c:271 ../libgaim/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanal:"
 
-#: ../src/protocols/irc/irc.c:260 ../src/protocols/jabber/chat.c:59
+#: ../libgaim/protocols/irc/irc.c:277 ../libgaim/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Parool:"
 
-#: ../src/protocols/irc/irc.c:292
+#: ../libgaim/protocols/irc/irc.c:308
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nimed ei tohi sisaldada tühje kohti"
 
-#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:550
-#: ../src/protocols/jabber/jabber.c:890
+#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:575
+#: ../libgaim/protocols/jabber/jabber.c:920
 msgid "SSL support unavailable"
 msgstr "SSL-i tugi pole saadaval"
 
-#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:450
-#: ../src/protocols/simple/simple.c:1518
+#: ../libgaim/protocols/irc/irc.c:349 ../libgaim/protocols/simple/simple.c:466
+#: ../libgaim/protocols/simple/simple.c:1588
 msgid "Couldn't create socket"
-msgstr ""
-
-#: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:421
-#: ../src/protocols/oscar/oscar.c:1239
+msgstr "Soklit pole võimalik luua"
+
+#: ../libgaim/protocols/irc/irc.c:415 ../libgaim/protocols/jabber/jabber.c:451
+#: ../libgaim/protocols/oscar/oscar.c:1220
 msgid "Couldn't connect to host"
 msgstr "Hostiga pole võimalik ühenduda"
 
-#: ../src/protocols/irc/irc.c:429 ../src/protocols/jabber/jabber.c:448
+#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:475
 msgid "Connection Failed"
 msgstr "Tõrge ühendumisel"
 
-#: ../src/protocols/irc/irc.c:432 ../src/protocols/jabber/jabber.c:451
+#: ../libgaim/protocols/irc/irc.c:440 ../libgaim/protocols/jabber/jabber.c:478
 msgid "SSL Handshake Failed"
 msgstr "Tõrge SSL käepigistusel"
 
-#: ../src/protocols/irc/irc.c:601 ../src/protocols/irc/irc.c:626
+#: ../libgaim/protocols/irc/irc.c:611 ../libgaim/protocols/irc/irc.c:636
 msgid "Read error"
-msgstr ""
-
-#: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1420
-#: ../src/protocols/yahoo/yahoochat.c:1430
+msgstr "Viga lugemisel"
+
+#: ../libgaim/protocols/irc/irc.c:775 ../libgaim/protocols/silc/chat.c:1421
+#: ../libgaim/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Kasutajad"
 
-#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3361
-#: ../src/protocols/silc/chat.c:1423 ../src/protocols/silc/ops.c:1380
-#: ../src/protocols/yahoo/yahoochat.c:1439
+#: ../libgaim/protocols/irc/irc.c:778
+#: ../libgaim/protocols/sametime/sametime.c:3350
+#: ../libgaim/protocols/silc/chat.c:1424 ../libgaim/protocols/silc/ops.c:1380
+#: ../libgaim/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "Teema"
 
@@ -5960,38 +6923,48 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/irc/irc.c:877
+#: ../libgaim/protocols/irc/irc.c:908
 msgid "IRC Protocol Plugin"
 msgstr "IRC protokolli plugin"
 
 #. *  summary
-#: ../src/protocols/irc/irc.c:878
+#: ../libgaim/protocols/irc/irc.c:909
 msgid "The IRC Protocol Plugin that Sucks Less"
-msgstr ""
+msgstr "IRC protokolli plugin, mis Imeb Vähem"
 
 #. host to connect to
-#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:235
-#: ../src/protocols/jabber/jabber.c:1905
-#: ../src/protocols/napster/napster.c:719
-#: ../src/protocols/sametime/sametime.c:5637 ../src/protocols/silc/ops.c:1242
-#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1765
+#: ../libgaim/protocols/irc/irc.c:928 ../libgaim/protocols/irc/msgs.c:235
+#: ../libgaim/protocols/jabber/jabber.c:1970
+#: ../libgaim/protocols/msn/msn.c:2054 ../libgaim/protocols/oscar/oscar.c:6531
+#: ../libgaim/protocols/sametime/sametime.c:5638
+#: ../libgaim/protocols/silc/ops.c:1242 ../libgaim/protocols/silc/ops.c:1344
+#: ../libgaim/protocols/simple/simple.c:1839
+#: ../libgaim/protocols/toc/toc.c:2347
 msgid "Server"
 msgstr "Server"
 
-#: ../src/protocols/irc/irc.c:903
+#. port to connect to
+#: ../libgaim/protocols/irc/irc.c:931 ../libgaim/protocols/msn/msn.c:2059
+#: ../libgaim/protocols/oscar/oscar.c:6534
+#: ../libgaim/protocols/sametime/sametime.c:5643
+#: ../libgaim/protocols/silc/silc.c:1859 ../libgaim/protocols/toc/toc.c:2351
+msgid "Port"
+msgstr "Port"
+
+#: ../libgaim/protocols/irc/irc.c:934
 msgid "Encodings"
 msgstr "Kooditabelid"
 
-#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:229
-#: ../src/protocols/jabber/jabber.c:745 ../src/protocols/silc/buddy.c:1531
-#: ../src/protocols/silc/ops.c:1189 ../src/protocols/silc/ops.c:1191
-#: ../src/protocols/silc/ops.c:1338 ../src/protocols/silc/ops.c:1340
-#: ../src/protocols/silc/silc.c:933
+#: ../libgaim/protocols/irc/irc.c:937 ../libgaim/protocols/irc/msgs.c:229
+#: ../libgaim/protocols/jabber/jabber.c:775
+#: ../libgaim/protocols/silc/buddy.c:1531 ../libgaim/protocols/silc/ops.c:1189
+#: ../libgaim/protocols/silc/ops.c:1191 ../libgaim/protocols/silc/ops.c:1338
+#: ../libgaim/protocols/silc/ops.c:1340 ../libgaim/protocols/silc/silc.c:933
 msgid "Username"
 msgstr "Kasutajanimi"
 
-#: ../src/protocols/irc/irc.c:909 ../src/protocols/irc/msgs.c:230
-#: ../src/protocols/silc/silc.c:937
+#: ../libgaim/protocols/irc/irc.c:940 ../libgaim/protocols/irc/msgs.c:230
+#: ../libgaim/protocols/silc/silc.c:937
 msgid "Real name"
 msgstr "Tegelik nimi"
 
@@ -5999,163 +6972,163 @@
 #. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../src/protocols/irc/irc.c:917
+#: ../libgaim/protocols/irc/irc.c:948
 msgid "Use SSL"
-msgstr "SSL-i kasutamine"
-
-#: ../src/protocols/irc/msgs.c:107
+msgstr "Kasutatakse SSL-i"
+
+#: ../libgaim/protocols/irc/msgs.c:107
 msgid "Bad mode"
-msgstr ""
-
-#: ../src/protocols/irc/msgs.c:118
+msgstr "Vigane režiim"
+
+#: ../libgaim/protocols/irc/msgs.c:118
 #, c-format
 msgid "You are banned from %s."
 msgstr ""
 
-#: ../src/protocols/irc/msgs.c:119
+#: ../libgaim/protocols/irc/msgs.c:119
 msgid "Banned"
 msgstr ""
 
-#: ../src/protocols/irc/msgs.c:136
+#: ../libgaim/protocols/irc/msgs.c:136
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr ""
 
-#: ../src/protocols/irc/msgs.c:215 ../src/protocols/irc/msgs.c:235
-#: ../src/protocols/irc/msgs.c:248
+#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/irc/msgs.c:235
+#: ../libgaim/protocols/irc/msgs.c:248
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../src/protocols/irc/msgs.c:215 ../src/protocols/oscar/oscar.c:3615
-#: ../src/protocols/silc/ops.c:1412
+#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/oscar/oscar.c:3620
+#: ../libgaim/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "Hüüdnimi"
 
-#: ../src/protocols/irc/msgs.c:218
+#: ../libgaim/protocols/irc/msgs.c:218
 msgid " <i>(ircop)</i>"
 msgstr ""
 
-#: ../src/protocols/irc/msgs.c:219
+#: ../libgaim/protocols/irc/msgs.c:219
 msgid " <i>(identified)</i>"
 msgstr ""
 
-#: ../src/protocols/irc/msgs.c:223 ../src/protocols/irc/msgs.c:229
-#: ../src/protocols/irc/msgs.c:230 ../src/protocols/irc/msgs.c:241
-#: ../src/protocols/yahoo/yahoo_profile.c:691
+#: ../libgaim/protocols/irc/msgs.c:223 ../libgaim/protocols/irc/msgs.c:229
+#: ../libgaim/protocols/irc/msgs.c:230 ../libgaim/protocols/irc/msgs.c:241
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:241 ../src/protocols/silc/ops.c:1255
+#: ../libgaim/protocols/irc/msgs.c:241 ../libgaim/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "Hetkel jututubades"
 
-#: ../src/protocols/irc/msgs.c:246
+#: ../libgaim/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Tegevuseta:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:248
+#: ../libgaim/protocols/irc/msgs.c:248
 msgid "Online since"
 msgstr "Ühendatud alates"
 
-#: ../src/protocols/irc/msgs.c:252
+#: ../libgaim/protocols/irc/msgs.c:252
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr ""
 
-#: ../src/protocols/irc/msgs.c:326
+#: ../libgaim/protocols/irc/msgs.c:329
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s määras uueks teemaks: %s"
 
-#: ../src/protocols/irc/msgs.c:328
-#, fuzzy, c-format
+#: ../libgaim/protocols/irc/msgs.c:331
+#, c-format
 msgid "%s has cleared the topic."
-msgstr "%s määras uueks teemaks: %s"
-
-#: ../src/protocols/irc/msgs.c:336
+msgstr "%s puhastas teema."
+
+#: ../libgaim/protocols/irc/msgs.c:339
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Kanali %s teema on: %s"
 
-#: ../src/protocols/irc/msgs.c:354
+#: ../libgaim/protocols/irc/msgs.c:357
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Tundmatu sõnum '%s'"
 
-#: ../src/protocols/irc/msgs.c:355
+#: ../libgaim/protocols/irc/msgs.c:358
 msgid "Unknown message"
 msgstr "Tundmatu sõnum"
 
-#: ../src/protocols/irc/msgs.c:355
+#: ../libgaim/protocols/irc/msgs.c:358
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr ""
 
-#: ../src/protocols/irc/msgs.c:378
+#: ../libgaim/protocols/irc/msgs.c:381
 #, c-format
 msgid "Users on %s: %s"
 msgstr ""
 
-#: ../src/protocols/irc/msgs.c:506
+#: ../libgaim/protocols/irc/msgs.c:509
 msgid "Time Response"
 msgstr ""
 
-#: ../src/protocols/irc/msgs.c:507
+#: ../libgaim/protocols/irc/msgs.c:510
 msgid "The IRC server's local time is:"
-msgstr ""
-
-#: ../src/protocols/irc/msgs.c:518
+msgstr "IRC serveri kohalik aeg on:"
+
+#: ../libgaim/protocols/irc/msgs.c:521
 msgid "No such channel"
 msgstr "Sellist kanalit pole"
 
 #. does this happen?
-#: ../src/protocols/irc/msgs.c:529
+#: ../libgaim/protocols/irc/msgs.c:532
 msgid "no such channel"
-msgstr ""
-
-#: ../src/protocols/irc/msgs.c:532
+msgstr "sellist kanalit pole"
+
+#: ../libgaim/protocols/irc/msgs.c:535
 msgid "User is not logged in"
 msgstr "Kasutaja pole sisse logitud"
 
-#: ../src/protocols/irc/msgs.c:537
+#: ../libgaim/protocols/irc/msgs.c:540
 msgid "No such nick or channel"
 msgstr "Sellist kanalit või hüüdnime pole"
 
-#: ../src/protocols/irc/msgs.c:557
+#: ../libgaim/protocols/irc/msgs.c:560
 msgid "Could not send"
 msgstr "Ei saa saata"
 
-#: ../src/protocols/irc/msgs.c:613
+#: ../libgaim/protocols/irc/msgs.c:616
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Ühinemine %s'ga on vaja kutset."
 
-#: ../src/protocols/irc/msgs.c:614
+#: ../libgaim/protocols/irc/msgs.c:617
 msgid "Invitation only"
 msgstr "Ainult kutsetega"
 
-#: ../src/protocols/irc/msgs.c:715
+#: ../libgaim/protocols/irc/msgs.c:726
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Sind löödi %s poolt välja (%s)"
 
 #. Remove user from channel
-#: ../src/protocols/irc/msgs.c:720 ../src/protocols/silc/ops.c:721
+#: ../libgaim/protocols/irc/msgs.c:731 ../libgaim/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Välja löödyd %s poolt (%s)"
 
-#: ../src/protocols/irc/msgs.c:743
+#: ../libgaim/protocols/irc/msgs.c:754
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mood (%s %s) %s poolt"
 
-#: ../src/protocols/irc/msgs.c:828 ../src/protocols/irc/msgs.c:829
+#: ../libgaim/protocols/irc/msgs.c:839 ../libgaim/protocols/irc/msgs.c:840
 msgid "Invalid nickname"
 msgstr "Vigane hüüdnimi"
 
-#: ../src/protocols/irc/msgs.c:830
+#: ../libgaim/protocols/irc/msgs.c:841
 #, fuzzy
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
@@ -6164,7 +7137,7 @@
 "Sinu valitud hüüdnimi lükati serveri poolt tagasi, arvatavasti sisaldab nimi "
 "lubamatuid märke."
 
-#: ../src/protocols/irc/msgs.c:834
+#: ../libgaim/protocols/irc/msgs.c:846
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6172,52 +7145,51 @@
 "Sinu valitud hüüdnimi lükati serveri poolt tagasi, arvatavasti sisaldab nimi "
 "lubamatuid märke."
 
-#: ../src/protocols/irc/msgs.c:873
+#: ../libgaim/protocols/irc/msgs.c:885
 msgid "Cannot change nick"
 msgstr ""
 
-#: ../src/protocols/irc/msgs.c:873
+#: ../libgaim/protocols/irc/msgs.c:885
 msgid "Could not change nick"
 msgstr ""
 
-#: ../src/protocols/irc/msgs.c:894
+#: ../libgaim/protocols/irc/msgs.c:906
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr ""
 
-#: ../src/protocols/irc/msgs.c:936
+#: ../libgaim/protocols/irc/msgs.c:948
 msgid "Error: invalid PONG from server"
-msgstr ""
-
-#: ../src/protocols/irc/msgs.c:938
+msgstr "Viga: vigane PONG serverilt"
+
+#: ../libgaim/protocols/irc/msgs.c:950
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
-msgstr ""
-
-#: ../src/protocols/irc/msgs.c:1019
+msgstr "PING-i vastus -- Mahajäämus %lu sekundit"
+
+#: ../libgaim/protocols/irc/msgs.c:1031
 #, c-format
 msgid "Cannot join %s:"
 msgstr ""
 
-#: ../src/protocols/irc/msgs.c:1020 ../src/protocols/silc/ops.c:1128
+#: ../libgaim/protocols/irc/msgs.c:1032 ../libgaim/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr ""
 
-#: ../src/protocols/irc/msgs.c:1054
-#, fuzzy
+#: ../libgaim/protocols/irc/msgs.c:1066
 msgid "Nick or channel is temporarily unavailable."
-msgstr "Kataloogiteenus pole ajutiselt saadaval."
-
-#: ../src/protocols/irc/msgs.c:1066
+msgstr "Kasutajanimi või kanal pole ajutiselt saadaval."
+
+#: ../libgaim/protocols/irc/msgs.c:1078
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:114
+#: ../libgaim/protocols/irc/parse.c:116
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;tegevusm&gt;:  Tegevuse sooritamine."
 
-#: ../src/protocols/irc/parse.c:115
+#: ../libgaim/protocols/irc/parse.c:117
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -6225,309 +7197,334 @@
 "away [sõnum]:  Eemaloleku teate määramine. Ilma sõnumita käsku kasutatakse "
 "eemaolekust tagasitulemise puhul."
 
-#: ../src/protocols/irc/parse.c:116
+#: ../libgaim/protocols/irc/parse.c:118
 msgid "chanserv: Send a command to chanserv"
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:117
+#: ../libgaim/protocols/irc/parse.c:119
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:118
+#: ../libgaim/protocols/irc/parse.c:120
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:119
+#: ../libgaim/protocols/irc/parse.c:121
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:120
+#: ../libgaim/protocols/irc/parse.c:122
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:121
+#: ../libgaim/protocols/irc/parse.c:123
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:122
+#: ../libgaim/protocols/irc/parse.c:124
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:123
+#: ../libgaim/protocols/irc/parse.c:125
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:124
+#: ../libgaim/protocols/irc/parse.c:126
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;tegevusm&gt;:  Tegevuse sooritamine."
 
-#: ../src/protocols/irc/parse.c:125
+#: ../libgaim/protocols/irc/parse.c:127
 msgid "memoserv: Send a command to memoserv"
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:126
+#: ../libgaim/protocols/irc/parse.c:128
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:127
+#: ../libgaim/protocols/irc/parse.c:129
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:128
+#: ../libgaim/protocols/irc/parse.c:130
 msgid "names [channel]:  List the users currently in a channel."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1743
+#: ../libgaim/protocols/irc/parse.c:131
+#: ../libgaim/protocols/jabber/jabber.c:1775
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:130
+#: ../libgaim/protocols/irc/parse.c:132
 msgid "nickserv: Send a command to nickserv"
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:131
+#: ../libgaim/protocols/irc/parse.c:133
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:132
+#: ../libgaim/protocols/irc/parse.c:134
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:133
+#: ../libgaim/protocols/irc/parse.c:135
 msgid "operserv: Send a command to operserv"
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:134
+#: ../libgaim/protocols/irc/parse.c:136
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:135
+#: ../libgaim/protocols/irc/parse.c:137
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:136
+#: ../libgaim/protocols/irc/parse.c:138
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:137
+#: ../libgaim/protocols/irc/parse.c:139
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:138
+#: ../libgaim/protocols/irc/parse.c:140
 msgid "quote [...]:  Send a raw command to the server."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:139
+#: ../libgaim/protocols/irc/parse.c:141
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:140
+#: ../libgaim/protocols/irc/parse.c:142
 msgid "time: Displays the current local time at the IRC server."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:141
+#: ../libgaim/protocols/irc/parse.c:143
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:142
+#: ../libgaim/protocols/irc/parse.c:144
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:143
+#: ../libgaim/protocols/irc/parse.c:145
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr ""
+
+#: ../libgaim/protocols/irc/parse.c:146
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:144
+#: ../libgaim/protocols/irc/parse.c:147
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:145
+#: ../libgaim/protocols/irc/parse.c:148
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:439
+#: ../libgaim/protocols/irc/parse.c:442
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr ""
 
-#: ../src/protocols/irc/parse.c:440
+#: ../libgaim/protocols/irc/parse.c:443
 msgid "PONG"
-msgstr ""
-
-#: ../src/protocols/irc/parse.c:440
+msgstr "PONG"
+
+#: ../libgaim/protocols/irc/parse.c:443
 msgid "CTCP PING reply"
-msgstr ""
-
-#: ../src/protocols/irc/parse.c:542 ../src/protocols/irc/parse.c:546
-#: ../src/protocols/toc/toc.c:190 ../src/protocols/toc/toc.c:688
-#: ../src/protocols/toc/toc.c:704 ../src/protocols/toc/toc.c:780
+msgstr "CTCP PING vastus"
+
+#: ../libgaim/protocols/irc/parse.c:548 ../libgaim/protocols/irc/parse.c:552
+#: ../libgaim/protocols/toc/toc.c:191 ../libgaim/protocols/toc/toc.c:694
+#: ../libgaim/protocols/toc/toc.c:710 ../libgaim/protocols/toc/toc.c:786
 msgid "Disconnected."
-msgstr ""
-
-#: ../src/protocols/jabber/auth.c:51
-msgid ""
-"Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
-"account properties"
-msgstr ""
-
-#: ../src/protocols/jabber/auth.c:53
+msgstr "Lahti ühendatud."
+
+#: ../libgaim/protocols/jabber/auth.c:49
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "Server vajab sisselogimiseks TLS/SSL'i.  TLS/SSL tuge ei leitud."
-
-#: ../src/protocols/jabber/auth.c:114
+msgstr "Server vajab sisselogimiseks TLS/SSL-i.  TLS/SSL tuge ei leitud."
+
+#: ../libgaim/protocols/jabber/auth.c:109
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server vajab avatekstiautentimist üle krüptimata andmevoo"
 
-#: ../src/protocols/jabber/auth.c:234
+#: ../libgaim/protocols/jabber/auth.c:229
 msgid "Server couldn't authenticate you without a password"
 msgstr ""
 
-#: ../src/protocols/jabber/auth.c:237 ../src/protocols/jabber/auth.c:238
-#: ../src/protocols/jabber/auth.c:398 ../src/protocols/jabber/auth.c:399
-#: ../src/protocols/jabber/auth.c:480 ../src/protocols/jabber/auth.c:481
+#: ../libgaim/protocols/jabber/auth.c:232
+#: ../libgaim/protocols/jabber/auth.c:233
+#: ../libgaim/protocols/jabber/auth.c:401
+#: ../libgaim/protocols/jabber/auth.c:402
+#: ../libgaim/protocols/jabber/auth.c:483
+#: ../libgaim/protocols/jabber/auth.c:484
 msgid "Plaintext Authentication"
 msgstr ""
 
-#: ../src/protocols/jabber/auth.c:239 ../src/protocols/jabber/auth.c:400
-#: ../src/protocols/jabber/auth.c:482
+#: ../libgaim/protocols/jabber/auth.c:234
+#: ../libgaim/protocols/jabber/auth.c:403
+#: ../libgaim/protocols/jabber/auth.c:485
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr ""
 
-#: ../src/protocols/jabber/auth.c:245 ../src/protocols/jabber/auth.c:408
-#: ../src/protocols/jabber/auth.c:490
+#: ../libgaim/protocols/jabber/auth.c:240
+#: ../libgaim/protocols/jabber/auth.c:411
+#: ../libgaim/protocols/jabber/auth.c:493
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
 #. This should never happen!
-#: ../src/protocols/jabber/auth.c:321 ../src/protocols/jabber/auth.c:443
-#: ../src/protocols/jabber/auth.c:611 ../src/protocols/jabber/auth.c:744
-#: ../src/protocols/jabber/auth.c:756 ../src/protocols/jabber/auth.c:775
-#: ../src/protocols/jabber/jabber.c:110
+#: ../libgaim/protocols/jabber/auth.c:324
+#: ../libgaim/protocols/jabber/auth.c:446
+#: ../libgaim/protocols/jabber/auth.c:614
+#: ../libgaim/protocols/jabber/auth.c:747
+#: ../libgaim/protocols/jabber/auth.c:759
+#: ../libgaim/protocols/jabber/auth.c:778
+#: ../libgaim/protocols/jabber/jabber.c:112
 msgid "Invalid response from server."
 msgstr ""
 
-#: ../src/protocols/jabber/auth.c:632
+#: ../libgaim/protocols/jabber/auth.c:635
 msgid "Invalid challenge from server"
 msgstr ""
 
-#: ../src/protocols/jabber/auth.c:719
+#: ../libgaim/protocols/jabber/auth.c:722
 msgid "SASL error"
-msgstr ""
-
-#: ../src/protocols/jabber/buddy.c:249 ../src/protocols/jabber/buddy.c:664
-#: ../src/protocols/silc/ops.c:1020
+msgstr "SASL viga"
+
+#: ../libgaim/protocols/jabber/buddy.c:268
+#: ../libgaim/protocols/jabber/buddy.c:769
+#: ../libgaim/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Täisnimi"
 
-#: ../src/protocols/jabber/buddy.c:250 ../src/protocols/jabber/buddy.c:677
-#: ../src/protocols/silc/ops.c:1032
+#: ../libgaim/protocols/jabber/buddy.c:269
+#: ../libgaim/protocols/jabber/buddy.c:782
+#: ../libgaim/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Perekonnanimi"
 
-#: ../src/protocols/jabber/buddy.c:251 ../src/protocols/jabber/buddy.c:681
+#: ../libgaim/protocols/jabber/buddy.c:270
+#: ../libgaim/protocols/jabber/buddy.c:786
 msgid "Given Name"
 msgstr ""
 
-#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:805
+#: ../libgaim/protocols/jabber/buddy.c:272
+#: ../libgaim/protocols/jabber/jabber.c:835
 msgid "URL"
 msgstr "URL"
 
-#: ../src/protocols/jabber/buddy.c:254 ../src/protocols/jabber/buddy.c:733
+#: ../libgaim/protocols/jabber/buddy.c:273
+#: ../libgaim/protocols/jabber/buddy.c:838
 msgid "Street Address"
 msgstr "Tänavaaadress"
 
-#: ../src/protocols/jabber/buddy.c:255 ../src/protocols/jabber/buddy.c:729
+#: ../libgaim/protocols/jabber/buddy.c:274
+#: ../libgaim/protocols/jabber/buddy.c:834
 msgid "Extended Address"
 msgstr "Laiendatud aadress"
 
-#: ../src/protocols/jabber/buddy.c:256 ../src/protocols/jabber/buddy.c:737
+#: ../libgaim/protocols/jabber/buddy.c:275
+#: ../libgaim/protocols/jabber/buddy.c:842
 msgid "Locality"
 msgstr ""
 
-#: ../src/protocols/jabber/buddy.c:257 ../src/protocols/jabber/buddy.c:741
+#: ../libgaim/protocols/jabber/buddy.c:276
+#: ../libgaim/protocols/jabber/buddy.c:846
 msgid "Region"
 msgstr "Piirkond"
 
-#: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:745
+#: ../libgaim/protocols/jabber/buddy.c:277
+#: ../libgaim/protocols/jabber/buddy.c:850
 msgid "Postal Code"
 msgstr "Postiindeks"
 
-#: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:750
-#: ../src/protocols/silc/silc.c:943
+#: ../libgaim/protocols/jabber/buddy.c:278
+#: ../libgaim/protocols/jabber/buddy.c:855
+#: ../libgaim/protocols/silc/silc.c:943
 msgid "Country"
 msgstr "Riik"
 
-#: ../src/protocols/jabber/buddy.c:260 ../src/protocols/jabber/buddy.c:761
-#: ../src/protocols/jabber/buddy.c:768
+#: ../libgaim/protocols/jabber/buddy.c:279
+#: ../libgaim/protocols/jabber/buddy.c:866
+#: ../libgaim/protocols/jabber/buddy.c:873
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../src/protocols/jabber/buddy.c:261 ../src/protocols/jabber/buddy.c:779
-#: ../src/protocols/jabber/buddy.c:787 ../src/protocols/jabber/buddy.c:1261
-#: ../src/protocols/silc/ops.c:1075 ../src/protocols/silc/util.c:512
-#: ../src/protocols/yahoo/yahoo_profile.c:1036
+#: ../libgaim/protocols/jabber/buddy.c:280
+#: ../libgaim/protocols/jabber/buddy.c:884
+#: ../libgaim/protocols/jabber/buddy.c:892
+#: ../libgaim/protocols/jabber/buddy.c:1528
+#: ../libgaim/protocols/silc/ops.c:1075 ../libgaim/protocols/silc/util.c:553
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1050
 msgid "E-Mail"
 msgstr "E-post"
 
-#: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:802
+#: ../libgaim/protocols/jabber/buddy.c:281
+#: ../libgaim/protocols/jabber/buddy.c:907
 msgid "Organization Name"
 msgstr "Organisatsiooni nimi"
 
-#: ../src/protocols/jabber/buddy.c:263 ../src/protocols/jabber/buddy.c:806
+#: ../libgaim/protocols/jabber/buddy.c:282
+#: ../libgaim/protocols/jabber/buddy.c:911
 msgid "Organization Unit"
 msgstr "Organisatsiooni üksus"
 
-#: ../src/protocols/jabber/buddy.c:265 ../src/protocols/jabber/buddy.c:815
+#: ../libgaim/protocols/jabber/buddy.c:284
+#: ../libgaim/protocols/jabber/buddy.c:920
 msgid "Role"
 msgstr "Roll"
 
-#: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:698
-#: ../src/protocols/msn/msn.c:1594 ../src/protocols/oscar/oscar.c:3648
+#: ../libgaim/protocols/jabber/buddy.c:285
+#: ../libgaim/protocols/jabber/buddy.c:803 ../libgaim/protocols/msn/msn.c:1595
+#: ../libgaim/protocols/oscar/oscar.c:3663
 msgid "Birthday"
 msgstr "Sünnipäev"
 
-#: ../src/protocols/jabber/buddy.c:567 ../src/protocols/jabber/buddy.c:568
+#: ../libgaim/protocols/jabber/buddy.c:582
+#: ../libgaim/protocols/jabber/buddy.c:583
 msgid "Edit Jabber vCard"
 msgstr "Jabber'i vKaardi redigeerimine"
 
-#: ../src/protocols/jabber/buddy.c:569
+#: ../libgaim/protocols/jabber/buddy.c:584
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -6535,644 +7532,704 @@
 "Ükski allpool olev väli pole kohustuslik. Sisesta ainult seda teavet, mis "
 "tundub sulle sobilik."
 
-#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1908
+#: ../libgaim/protocols/jabber/buddy.c:640
+msgid "Client:"
+msgstr "Klient:"
+
+#: ../libgaim/protocols/jabber/buddy.c:644
+#: ../libgaim/protocols/jabber/buddy.c:677
+msgid "Operating System"
+msgstr "Operatsioonisüsteem"
+
+#: ../libgaim/protocols/jabber/buddy.c:654
+#: ../libgaim/protocols/jabber/jabber.c:1973
 msgid "Resource"
 msgstr "Vahend"
 
-#: ../src/protocols/jabber/buddy.c:685 ../src/protocols/silc/ops.c:1028
+#: ../libgaim/protocols/jabber/buddy.c:656
+#: ../libgaim/protocols/jabber/jabber.c:1213
+#: ../libgaim/protocols/jabber/jabber.c:1223
+#: ../libgaim/protocols/jabber/jabber.c:1233
+#: ../libgaim/protocols/jabber/jabber.c:1243
+#: ../libgaim/protocols/jabber/jabber.c:1253
+msgid "Priority"
+msgstr "Tähtsus"
+
+#: ../libgaim/protocols/jabber/buddy.c:673
+#, fuzzy
+msgid "Client"
+msgstr "Klient:"
+
+#: ../libgaim/protocols/jabber/buddy.c:790
+#: ../libgaim/protocols/silc/ops.c:1028
 msgid "Middle Name"
-msgstr ""
-
-#: ../src/protocols/jabber/buddy.c:718 ../src/protocols/jabber/jabber.c:780
-#: ../src/protocols/oscar/oscar.c:3667 ../src/protocols/oscar/oscar.c:3675
-#: ../src/protocols/silc/ops.c:1064
+msgstr "Keskmine nimi"
+
+#: ../libgaim/protocols/jabber/buddy.c:823
+#: ../libgaim/protocols/jabber/jabber.c:810
+#: ../libgaim/protocols/oscar/oscar.c:3682
+#: ../libgaim/protocols/oscar/oscar.c:3690
+#: ../libgaim/protocols/qq/buddy_info.c:54
+#: ../libgaim/protocols/silc/ops.c:1064
 msgid "Address"
-msgstr ""
-
-#: ../src/protocols/jabber/buddy.c:725
+msgstr "Aadress"
+
+#: ../libgaim/protocols/jabber/buddy.c:830
 msgid "P.O. Box"
-msgstr ""
-
-#: ../src/protocols/jabber/buddy.c:839
+msgstr "Postkast"
+
+#: ../libgaim/protocols/jabber/buddy.c:944
 msgid "Photo"
 msgstr "Foto"
 
-#: ../src/protocols/jabber/buddy.c:839
+#: ../libgaim/protocols/jabber/buddy.c:944
 msgid "Logo"
 msgstr "Logo"
 
-#: ../src/protocols/jabber/buddy.c:1042
+#: ../libgaim/protocols/jabber/buddy.c:1308
 msgid "Un-hide From"
 msgstr ""
 
-#: ../src/protocols/jabber/buddy.c:1046
+#: ../libgaim/protocols/jabber/buddy.c:1312
 msgid "Temporarily Hide From"
 msgstr ""
 
 #. && NOT ME
-#: ../src/protocols/jabber/buddy.c:1054
+#: ../libgaim/protocols/jabber/buddy.c:1320
 msgid "Cancel Presence Notification"
 msgstr ""
 
-#: ../src/protocols/jabber/buddy.c:1061
+#: ../libgaim/protocols/jabber/buddy.c:1327
 msgid "(Re-)Request authorization"
 msgstr "Küsi (uuesti) autoriseerimist"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../src/protocols/jabber/buddy.c:1070
+#: ../libgaim/protocols/jabber/buddy.c:1336
 msgid "Unsubscribe"
 msgstr ""
 
-#: ../src/protocols/jabber/buddy.c:1097 ../src/protocols/jabber/chat.c:677
-#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1165
-#: ../src/protocols/silc/ops.c:1449
-msgid "Error"
-msgstr "Viga"
-
-#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1190
+#: ../libgaim/protocols/jabber/buddy.c:1369
+#: ../libgaim/protocols/jabber/jabber.c:1222
 msgid "Chatty"
 msgstr "Lobisev"
 
-#: ../src/protocols/jabber/buddy.c:1107 ../src/status.c:159
+#: ../libgaim/protocols/jabber/buddy.c:1373 ../libgaim/status.c:159
 msgid "Extended Away"
 msgstr "Kaua eemal"
 
-#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1220
-#: ../src/protocols/oscar/oscar.c:715 ../src/protocols/oscar/oscar.c:5592
-#: ../src/protocols/sametime/sametime.c:3284
+#: ../libgaim/protocols/jabber/buddy.c:1375
+#: ../libgaim/protocols/jabber/jabber.c:1252
+#: ../libgaim/protocols/oscar/oscar.c:688
+#: ../libgaim/protocols/oscar/oscar.c:5654
+#: ../libgaim/protocols/sametime/sametime.c:3273
 msgid "Do Not Disturb"
 msgstr "Mitte segada"
 
-#: ../src/protocols/jabber/buddy.c:1253
+#: ../libgaim/protocols/jabber/buddy.c:1520
 msgid "JID"
 msgstr ""
 
-#: ../src/protocols/jabber/buddy.c:1257 ../src/protocols/jabber/buddy.c:1401
-#: ../src/protocols/oscar/oscar.c:3626
+#: ../libgaim/protocols/jabber/buddy.c:1524
+#: ../libgaim/protocols/jabber/buddy.c:1703
+#: ../libgaim/protocols/oscar/oscar.c:3631
 msgid "Last Name"
 msgstr "Perekonnanimi"
 
-#: ../src/protocols/jabber/buddy.c:1289
+#: ../libgaim/protocols/jabber/buddy.c:1556
 msgid "The following are the results of your search"
 msgstr ""
 
-#: ../src/protocols/jabber/buddy.c:1388
-#, fuzzy, c-format
+#. current comment from Jabber User Directory users.jabber.org
+#: ../libgaim/protocols/jabber/buddy.c:1631
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/buddy.c:1651
+msgid "Directory Query Failed"
+msgstr ""
+
+#: ../libgaim/protocols/jabber/buddy.c:1652
+#, fuzzy
+msgid "Could not query the directory server."
+msgstr "Sa oled serverist lahti ühendatud."
+
+#. Try to translate the message (see static message
+#. list in jabber_user_dir_comments[])
+#: ../libgaim/protocols/jabber/buddy.c:1686
+#, c-format
 msgid "Server Instructions: %s"
-msgstr "Serveri andmed"
-
-#: ../src/protocols/jabber/buddy.c:1392
+msgstr "Serveri juhised: %s"
+
+#: ../libgaim/protocols/jabber/buddy.c:1693
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr ""
 
-#: ../src/protocols/jabber/buddy.c:1411 ../src/protocols/novell/novell.c:1490
-#: ../src/protocols/oscar/oscar.c:3628 ../src/protocols/oscar/oscar.c:3635
+#: ../libgaim/protocols/jabber/buddy.c:1713
+#: ../libgaim/protocols/novell/novell.c:1488
+#: ../libgaim/protocols/oscar/oscar.c:3633
+#: ../libgaim/protocols/oscar/oscar.c:3640
 msgid "E-Mail Address"
-msgstr ""
-
-#: ../src/protocols/jabber/buddy.c:1420 ../src/protocols/jabber/buddy.c:1421
+msgstr "E-posti aadress"
+
+#: ../libgaim/protocols/jabber/buddy.c:1722
+#: ../libgaim/protocols/jabber/buddy.c:1723
 msgid "Search for Jabber users"
-msgstr ""
-
-#: ../src/protocols/jabber/buddy.c:1435
-#, fuzzy
+msgstr "Jabberikasutajate otsimine"
+
+#: ../libgaim/protocols/jabber/buddy.c:1737
 msgid "Invalid Directory"
-msgstr "Vigane grupp"
-
-#: ../src/protocols/jabber/buddy.c:1452
-#, fuzzy
+msgstr "Vigane kataloog"
+
+#: ../libgaim/protocols/jabber/buddy.c:1754
 msgid "Enter a User Directory"
-msgstr "Kataloogi pole võimalik saata."
-
-#: ../src/protocols/jabber/buddy.c:1453
-#, fuzzy
+msgstr "Kasutajate kataloogi sisestamine"
+
+#: ../libgaim/protocols/jabber/buddy.c:1755
 msgid "Select a user directory to search"
-msgstr "Vali jututoaserver, kuhu päring esitada"
-
-#: ../src/protocols/jabber/buddy.c:1456
-#, fuzzy
+msgstr "Vali kasutajate kataloog, millest otsida"
+
+#: ../libgaim/protocols/jabber/buddy.c:1758
 msgid "Search Directory"
-msgstr "O_tsi stringi:"
-
-#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:5081
-#: ../src/protocols/yahoo/yahoochat.c:998
+msgstr "Kataloogist otsimine"
+
+#: ../libgaim/protocols/jabber/chat.c:41
+#: ../libgaim/protocols/oscar/oscar.c:5137
+#: ../libgaim/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_Tuba:"
 
-#: ../src/protocols/jabber/chat.c:47
+#: ../libgaim/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/protocols/jabber/chat.c:53
+#: ../libgaim/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr ""
 
-#: ../src/protocols/jabber/chat.c:223
+#: ../libgaim/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
-msgstr ""
-
-#: ../src/protocols/jabber/chat.c:224
+msgstr "%s pole korrektne toa nimi"
+
+#: ../libgaim/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
-msgstr ""
-
-#: ../src/protocols/jabber/chat.c:229
+msgstr "Vigane toa nimi"
+
+#: ../libgaim/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
-msgstr ""
-
-#: ../src/protocols/jabber/chat.c:230 ../src/protocols/jabber/chat.c:231
+msgstr "%s pole korrektne serveri nimi"
+
+#: ../libgaim/protocols/jabber/chat.c:230
+#: ../libgaim/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
-msgstr ""
-
-#: ../src/protocols/jabber/chat.c:235
+msgstr "Vigane sereri nimi"
+
+#: ../libgaim/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr ""
 
-#: ../src/protocols/jabber/chat.c:236 ../src/protocols/jabber/chat.c:237
+#: ../libgaim/protocols/jabber/chat.c:236
+#: ../libgaim/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr ""
 
-#: ../src/protocols/jabber/chat.c:395
+#: ../libgaim/protocols/jabber/chat.c:396
 msgid "Configuration error"
-msgstr ""
-
-#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:549
+msgstr "Seadistamise viga"
+
+#: ../libgaim/protocols/jabber/chat.c:405
+#: ../libgaim/protocols/jabber/chat.c:548
 msgid "Unable to configure"
-msgstr ""
-
-#: ../src/protocols/jabber/chat.c:420
+msgstr "Seadistada pole võimalik"
+
+#: ../libgaim/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
-msgstr ""
-
-#: ../src/protocols/jabber/chat.c:421
+msgstr "Viga toa seadistustes"
+
+#: ../libgaim/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr ""
 
-#: ../src/protocols/jabber/chat.c:471 ../src/protocols/jabber/chat.c:540
+#: ../libgaim/protocols/jabber/chat.c:470
+#: ../libgaim/protocols/jabber/chat.c:539
 msgid "Registration error"
-msgstr ""
-
-#: ../src/protocols/jabber/chat.c:628
+msgstr "Viga registreerimisel"
+
+#: ../libgaim/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr ""
-
-#: ../src/protocols/jabber/chat.c:678 ../src/protocols/jabber/chat.c:689
-#: ../src/protocols/silc/ops.c:1449
-#, fuzzy
+msgstr "Mitte-MUC jututubades pole lühinime muutmine toetatud"
+
+#: ../libgaim/protocols/jabber/chat.c:678
+#: ../libgaim/protocols/jabber/chat.c:689 ../libgaim/protocols/silc/ops.c:1449
 msgid "Error retrieving room list"
-msgstr "Viga tubade nimekirja vastuvõtmisel"
-
-#: ../src/protocols/jabber/chat.c:737
+msgstr "Viga tubade loendi vastuvõtmisel"
+
+#: ../libgaim/protocols/jabber/chat.c:737
 msgid "Invalid Server"
-msgstr ""
-
-#: ../src/protocols/jabber/chat.c:775
+msgstr "Vigane server"
+
+#: ../libgaim/protocols/jabber/chat.c:775
 msgid "Enter a Conference Server"
 msgstr "Jututoaserveri sisestamine"
 
-#: ../src/protocols/jabber/chat.c:776
+#: ../libgaim/protocols/jabber/chat.c:776
 msgid "Select a conference server to query"
 msgstr "Vali jututoaserver, kuhu päring esitada"
 
-#: ../src/protocols/jabber/chat.c:779
+#: ../libgaim/protocols/jabber/chat.c:779
 msgid "Find Rooms"
 msgstr "Otsi jututube"
 
-#: ../src/protocols/jabber/jabber.c:79
+#: ../libgaim/protocols/jabber/jabber.c:81
 msgid "Error initializing session"
 msgstr "Viga seansi lähtestamisel"
 
-#: ../src/protocols/jabber/jabber.c:226 ../src/protocols/jabber/jabber.c:275
-#: ../src/protocols/jabber/jabber.c:303
+#: ../libgaim/protocols/jabber/jabber.c:240
+#: ../libgaim/protocols/jabber/jabber.c:291
+#: ../libgaim/protocols/jabber/jabber.c:319
 msgid "Write error"
 msgstr "Kirjutamise viga"
 
-#: ../src/protocols/jabber/jabber.c:355 ../src/protocols/jabber/jabber.c:388
+#: ../libgaim/protocols/jabber/jabber.c:387
+#: ../libgaim/protocols/jabber/jabber.c:424
 msgid "Read Error"
 msgstr "Lugemise viga"
 
-#: ../src/protocols/jabber/jabber.c:474 ../src/protocols/jabber/jabber.c:900
+#: ../libgaim/protocols/jabber/jabber.c:497
+#: ../libgaim/protocols/jabber/jabber.c:930
 msgid "Unable to create socket"
 msgstr "Soklit pole võimalik luua"
 
-#: ../src/protocols/jabber/jabber.c:520 ../src/protocols/jabber/jabber.c:857
+#: ../libgaim/protocols/jabber/jabber.c:545
+#: ../libgaim/protocols/jabber/jabber.c:888
 msgid "Invalid Jabber ID"
 msgstr "Vigane Jabber'i ID"
 
-#: ../src/protocols/jabber/jabber.c:590
+#: ../libgaim/protocols/jabber/jabber.c:616
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Kasutaja %s@%s registreerimine õnnestus"
 
-#: ../src/protocols/jabber/jabber.c:592 ../src/protocols/jabber/jabber.c:593
+#: ../libgaim/protocols/jabber/jabber.c:618
+#: ../libgaim/protocols/jabber/jabber.c:619
 msgid "Registration Successful"
 msgstr "Registreerimine õnnestus"
 
-#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/jabber/jabber.c:1456
+#: ../libgaim/protocols/jabber/jabber.c:625
+#: ../libgaim/protocols/jabber/jabber.c:1488
 msgid "Unknown Error"
 msgstr "Tundmatu viga"
 
-#: ../src/protocols/jabber/jabber.c:601 ../src/protocols/jabber/jabber.c:602
+#: ../libgaim/protocols/jabber/jabber.c:627
+#: ../libgaim/protocols/jabber/jabber.c:628
 msgid "Registration Failed"
 msgstr "Tõrge registreerimisel"
 
-#: ../src/protocols/jabber/jabber.c:713 ../src/protocols/jabber/jabber.c:714
+#: ../libgaim/protocols/jabber/jabber.c:743
+#: ../libgaim/protocols/jabber/jabber.c:744
 msgid "Already Registered"
 msgstr "Juba registreeritud"
 
-#: ../src/protocols/jabber/jabber.c:790 ../src/protocols/oscar/oscar.c:3669
-#: ../src/protocols/oscar/oscar.c:3677
+#: ../libgaim/protocols/jabber/jabber.c:820
+#: ../libgaim/protocols/oscar/oscar.c:3684
+#: ../libgaim/protocols/oscar/oscar.c:3692
 msgid "State"
-msgstr ""
-
-#: ../src/protocols/jabber/jabber.c:795
+msgstr "Olek"
+
+#: ../libgaim/protocols/jabber/jabber.c:825
 msgid "Postal code"
 msgstr "Postiindeks"
 
-#: ../src/protocols/jabber/jabber.c:800 ../src/protocols/silc/ops.c:1069
-#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:514
+#: ../libgaim/protocols/jabber/jabber.c:830
+#: ../libgaim/protocols/silc/ops.c:1069 ../libgaim/protocols/silc/silc.c:701
+#: ../libgaim/protocols/silc/util.c:555
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/protocols/jabber/jabber.c:810
+#: ../libgaim/protocols/jabber/jabber.c:840
 msgid "Date"
-msgstr ""
-
-#: ../src/protocols/jabber/jabber.c:818
+msgstr "Kuupäev"
+
+#: ../libgaim/protocols/jabber/jabber.c:848
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:821 ../src/protocols/jabber/jabber.c:822
+#: ../libgaim/protocols/jabber/jabber.c:851
+#: ../libgaim/protocols/jabber/jabber.c:852
 msgid "Register New Jabber Account"
 msgstr "Uue Jabber'i konto registreerimine"
 
-#: ../src/protocols/jabber/jabber.c:983
+#: ../libgaim/protocols/jabber/jabber.c:1013
 msgid "Initializing Stream"
 msgstr "Andmevoo lähtestamine"
 
-#: ../src/protocols/jabber/jabber.c:989 ../src/protocols/msn/session.c:355
+#: ../libgaim/protocols/jabber/jabber.c:1018
+#: ../libgaim/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Autentimine"
 
-#: ../src/protocols/jabber/jabber.c:998
+#: ../libgaim/protocols/jabber/jabber.c:1027
 msgid "Re-initializing Stream"
 msgstr "Andmevaa taaslähtestamine"
 
-#: ../src/protocols/jabber/jabber.c:1069 ../src/protocols/jabber/jabber.c:1434
-#: ../src/protocols/jabber/jabber.c:1475 ../src/protocols/jabber/jabber.c:1509
-#: ../src/protocols/oscar/oscar.c:784 ../src/protocols/oscar/oscar.c:5383
+#: ../libgaim/protocols/jabber/jabber.c:1101
+#: ../libgaim/protocols/jabber/jabber.c:1466
+#: ../libgaim/protocols/jabber/jabber.c:1507
+#: ../libgaim/protocols/jabber/jabber.c:1541
+#: ../libgaim/protocols/oscar/oscar.c:766
+#: ../libgaim/protocols/oscar/oscar.c:5443
 msgid "Not Authorized"
 msgstr "Autoriseerimata"
 
-#: ../src/protocols/jabber/jabber.c:1111
+#: ../libgaim/protocols/jabber/jabber.c:1143
 msgid "Both"
-msgstr ""
-
-#: ../src/protocols/jabber/jabber.c:1113
+msgstr "Mõlemad"
+
+#: ../libgaim/protocols/jabber/jabber.c:1145
 msgid "From (To pending)"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1118
+#: ../libgaim/protocols/jabber/jabber.c:1150
 msgid "To"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1120
+#: ../libgaim/protocols/jabber/jabber.c:1152
 msgid "None (To pending)"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1124
+#: ../libgaim/protocols/jabber/jabber.c:1156
 msgid "Subscription"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1181 ../src/protocols/jabber/jabber.c:1191
-#: ../src/protocols/jabber/jabber.c:1201 ../src/protocols/jabber/jabber.c:1211
-#: ../src/protocols/jabber/jabber.c:1221
-#, fuzzy
-msgid "Priority"
-msgstr "Port"
-
-#: ../src/protocols/jabber/jabber.c:1250
+#: ../libgaim/protocols/jabber/jabber.c:1282
 msgid "Password Changed"
 msgstr "Parool muudetud"
 
-#: ../src/protocols/jabber/jabber.c:1251
+#: ../libgaim/protocols/jabber/jabber.c:1283
 msgid "Your password has been changed."
-msgstr ""
-
-#: ../src/protocols/jabber/jabber.c:1255 ../src/protocols/jabber/jabber.c:1256
+msgstr "Sinu parool on muudetud."
+
+#: ../libgaim/protocols/jabber/jabber.c:1287
+#: ../libgaim/protocols/jabber/jabber.c:1288
 msgid "Error changing password"
 msgstr "Viga parooli muutmisel"
 
-#: ../src/protocols/jabber/jabber.c:1312
+#: ../libgaim/protocols/jabber/jabber.c:1344
 msgid "Password (again)"
 msgstr "Parool (uuesti)"
 
-#: ../src/protocols/jabber/jabber.c:1317 ../src/protocols/jabber/jabber.c:1318
+#: ../libgaim/protocols/jabber/jabber.c:1349
+#: ../libgaim/protocols/jabber/jabber.c:1350
 msgid "Change Jabber Password"
 msgstr "Jabber'i parooli muutmine"
 
-#: ../src/protocols/jabber/jabber.c:1318
+#: ../libgaim/protocols/jabber/jabber.c:1350
 msgid "Please enter your new password"
 msgstr "Palun sisesta uus parool"
 
-#: ../src/protocols/jabber/jabber.c:1328 ../src/protocols/oscar/oscar.c:6147
-#: ../src/protocols/silc/silc.c:1023
+#: ../libgaim/protocols/jabber/jabber.c:1360
+#: ../libgaim/protocols/oscar/oscar.c:6245
+#: ../libgaim/protocols/silc/silc.c:1023
 msgid "Set User Info..."
 msgstr "Määra kasutajateave..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1333 ../src/protocols/oscar/oscar.c:6158
-#: ../src/protocols/silc/silc.c:1019
+#: ../libgaim/protocols/jabber/jabber.c:1365
+#: ../libgaim/protocols/oscar/oscar.c:6256
+#: ../libgaim/protocols/silc/silc.c:1019
 msgid "Change Password..."
-msgstr ""
+msgstr "Parooli muutmine..."
 
 #. }
-#: ../src/protocols/jabber/jabber.c:1338
-#, fuzzy
+#: ../libgaim/protocols/jabber/jabber.c:1370
 msgid "Search for Users..."
-msgstr "O_tsi stringi:"
-
-#: ../src/protocols/jabber/jabber.c:1414
+msgstr "Kasutajate otsimine"
+
+#: ../libgaim/protocols/jabber/jabber.c:1446
 msgid "Bad Request"
 msgstr "Vigane päring"
 
-#: ../src/protocols/jabber/jabber.c:1416
+#: ../libgaim/protocols/jabber/jabber.c:1448
 msgid "Conflict"
-msgstr ""
-
-#: ../src/protocols/jabber/jabber.c:1418
+msgstr "Konflikt"
+
+#: ../libgaim/protocols/jabber/jabber.c:1450
 msgid "Feature Not Implemented"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1420
+#: ../libgaim/protocols/jabber/jabber.c:1452
 msgid "Forbidden"
 msgstr "Keelatud"
 
-#: ../src/protocols/jabber/jabber.c:1422
+#: ../libgaim/protocols/jabber/jabber.c:1454
 msgid "Gone"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1424 ../src/protocols/jabber/jabber.c:1499
+#: ../libgaim/protocols/jabber/jabber.c:1456
+#: ../libgaim/protocols/jabber/jabber.c:1531
 msgid "Internal Server Error"
 msgstr "Serveri sisemine viga"
 
-#: ../src/protocols/jabber/jabber.c:1426
+#: ../libgaim/protocols/jabber/jabber.c:1458
 msgid "Item Not Found"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1428
+#: ../libgaim/protocols/jabber/jabber.c:1460
 msgid "Malformed Jabber ID"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1430
+#: ../libgaim/protocols/jabber/jabber.c:1462
 msgid "Not Acceptable"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1432
+#: ../libgaim/protocols/jabber/jabber.c:1464
 msgid "Not Allowed"
-msgstr ""
-
-#: ../src/protocols/jabber/jabber.c:1436
+msgstr "Pole lubatud"
+
+#: ../libgaim/protocols/jabber/jabber.c:1468
 msgid "Payment Required"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1438
+#: ../libgaim/protocols/jabber/jabber.c:1470
 msgid "Recipient Unavailable"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1442
+#: ../libgaim/protocols/jabber/jabber.c:1474
 msgid "Registration Required"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1444
+#: ../libgaim/protocols/jabber/jabber.c:1476
 msgid "Remote Server Not Found"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1446
+#: ../libgaim/protocols/jabber/jabber.c:1478
 msgid "Remote Server Timeout"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1448
+#: ../libgaim/protocols/jabber/jabber.c:1480
 msgid "Server Overloaded"
 msgstr "Server on ülekoormatud"
 
-#: ../src/protocols/jabber/jabber.c:1450
+#: ../libgaim/protocols/jabber/jabber.c:1482
 msgid "Service Unavailable"
 msgstr "Teenus pole saadaval"
 
-#: ../src/protocols/jabber/jabber.c:1452
+#: ../libgaim/protocols/jabber/jabber.c:1484
 msgid "Subscription Required"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1454
+#: ../libgaim/protocols/jabber/jabber.c:1486
 msgid "Unexpected Request"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1461
+#: ../libgaim/protocols/jabber/jabber.c:1493
 msgid "Authorization Aborted"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1463
+#: ../libgaim/protocols/jabber/jabber.c:1495
 msgid "Incorrect encoding in authorization"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1466
+#: ../libgaim/protocols/jabber/jabber.c:1498
 msgid "Invalid authzid"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1469
+#: ../libgaim/protocols/jabber/jabber.c:1501
 msgid "Invalid Authorization Mechanism"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1472
+#: ../libgaim/protocols/jabber/jabber.c:1504
 msgid "Authorization mechanism too weak"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1477
+#: ../libgaim/protocols/jabber/jabber.c:1509
 msgid "Temporary Authentication Failure"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1480
+#: ../libgaim/protocols/jabber/jabber.c:1512
 msgid "Authentication Failure"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1484
+#: ../libgaim/protocols/jabber/jabber.c:1516
 msgid "Bad Format"
 msgstr "Vigane vorming"
 
-#: ../src/protocols/jabber/jabber.c:1486
+#: ../libgaim/protocols/jabber/jabber.c:1518
 msgid "Bad Namespace Prefix"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1489
+#: ../libgaim/protocols/jabber/jabber.c:1521
 msgid "Resource Conflict"
 msgstr "Vahendi vastuolu"
 
-#: ../src/protocols/jabber/jabber.c:1491 ../src/protocols/silc/ops.c:1728
+#: ../libgaim/protocols/jabber/jabber.c:1523
+#: ../libgaim/protocols/silc/ops.c:1727
 msgid "Connection Timeout"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1493
+#: ../libgaim/protocols/jabber/jabber.c:1525
 msgid "Host Gone"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1495
+#: ../libgaim/protocols/jabber/jabber.c:1527
 msgid "Host Unknown"
 msgstr "Tundmatu host"
 
-#: ../src/protocols/jabber/jabber.c:1497
+#: ../libgaim/protocols/jabber/jabber.c:1529
 msgid "Improper Addressing"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1501
+#: ../libgaim/protocols/jabber/jabber.c:1533
 msgid "Invalid ID"
 msgstr "Vigane ID"
 
-#: ../src/protocols/jabber/jabber.c:1503
+#: ../libgaim/protocols/jabber/jabber.c:1535
 msgid "Invalid Namespace"
 msgstr "Vigane nimeruum"
 
-#: ../src/protocols/jabber/jabber.c:1505
+#: ../libgaim/protocols/jabber/jabber.c:1537
 msgid "Invalid XML"
 msgstr "Vigane XML"
 
-#: ../src/protocols/jabber/jabber.c:1507
+#: ../libgaim/protocols/jabber/jabber.c:1539
 msgid "Non-matching Hosts"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1511
+#: ../libgaim/protocols/jabber/jabber.c:1543
 msgid "Policy Violation"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1513
+#: ../libgaim/protocols/jabber/jabber.c:1545
 msgid "Remote Connection Failed"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1515
+#: ../libgaim/protocols/jabber/jabber.c:1547
 msgid "Resource Constraint"
 msgstr "Vahendi piirang"
 
-#: ../src/protocols/jabber/jabber.c:1517
+#: ../libgaim/protocols/jabber/jabber.c:1549
 msgid "Restricted XML"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1519
+#: ../libgaim/protocols/jabber/jabber.c:1551
 msgid "See Other Host"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1521
+#: ../libgaim/protocols/jabber/jabber.c:1553
 msgid "System Shutdown"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1523
+#: ../libgaim/protocols/jabber/jabber.c:1555
 msgid "Undefined Condition"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1525
+#: ../libgaim/protocols/jabber/jabber.c:1557
 msgid "Unsupported Encoding"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1527
+#: ../libgaim/protocols/jabber/jabber.c:1559
 msgid "Unsupported Stanza Type"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1529
+#: ../libgaim/protocols/jabber/jabber.c:1561
 msgid "Unsupported Version"
-msgstr ""
-
-#: ../src/protocols/jabber/jabber.c:1531
+msgstr "Toetamata versioon"
+
+#: ../libgaim/protocols/jabber/jabber.c:1563
 msgid "XML Not Well Formed"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1533
+#: ../libgaim/protocols/jabber/jabber.c:1565
 msgid "Stream Error"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1600
+#: ../libgaim/protocols/jabber/jabber.c:1632
 #, c-format
 msgid "Unable to ban user %s"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1620
+#: ../libgaim/protocols/jabber/jabber.c:1652
 #, fuzzy, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Tundmatu käsk: %s"
 
-#: ../src/protocols/jabber/jabber.c:1625
+#: ../libgaim/protocols/jabber/jabber.c:1657
 #, fuzzy, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Kasutajat pole võimalik kutsuda (%s)."
 
-#: ../src/protocols/jabber/jabber.c:1644
+#: ../libgaim/protocols/jabber/jabber.c:1676
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Tundmatu roll: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1651
-#, fuzzy, c-format
+#: ../libgaim/protocols/jabber/jabber.c:1683
+#, c-format
 msgid "Unable to set role \"%s\" for user: %s"
-msgstr "Kasutajat pole võimalik kutsuda (%s)."
-
-#: ../src/protocols/jabber/jabber.c:1704
+msgstr "Kasutajale pole võimalik rolli \"%s\" määrata: %s"
+
+#: ../libgaim/protocols/jabber/jabber.c:1736
 #, c-format
 msgid "Unable to kick user %s"
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1735
+#: ../libgaim/protocols/jabber/jabber.c:1767
 msgid "config:  Configure a chat room."
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1739
+#: ../libgaim/protocols/jabber/jabber.c:1771
 msgid "configure:  Configure a chat room."
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1748
+#: ../libgaim/protocols/jabber/jabber.c:1780
 msgid "part [room]:  Leave the room."
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1753
+#: ../libgaim/protocols/jabber/jabber.c:1785
 msgid "register:  Register with a chat room."
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1759
+#: ../libgaim/protocols/jabber/jabber.c:1791
 msgid "topic [new topic]:  View or change the topic."
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1765
+#: ../libgaim/protocols/jabber/jabber.c:1797
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1771
+#: ../libgaim/protocols/jabber/jabber.c:1803
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1777
+#: ../libgaim/protocols/jabber/jabber.c:1809
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1783
+#: ../libgaim/protocols/jabber/jabber.c:1815
 #, fuzzy
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 "msg &lt;kasutaja&gt; &lt;sõnum&gt;:  Erasõnumi saatmine teisele kasutajale."
 
-#: ../src/protocols/jabber/jabber.c:1789
+#: ../libgaim/protocols/jabber/jabber.c:1821
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1795
+#: ../libgaim/protocols/jabber/jabber.c:1827
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1800
+#: ../libgaim/protocols/jabber/jabber.c:1832
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -7188,431 +8245,434 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/jabber/jabber.c:1883 ../src/protocols/jabber/jabber.c:1885
+#: ../libgaim/protocols/jabber/jabber.c:1948
+#: ../libgaim/protocols/jabber/jabber.c:1950
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber protokolli plugin"
 
-#: ../src/protocols/jabber/jabber.c:1911
-msgid "Use TLS if available"
-msgstr "TLS'i kasutamine võimaluse korral"
-
-#: ../src/protocols/jabber/jabber.c:1916
-msgid "Require TLS"
-msgstr ""
-
-#: ../src/protocols/jabber/jabber.c:1919
+#: ../libgaim/protocols/jabber/jabber.c:1976
 msgid "Force old (port 5223) SSL"
-msgstr "Vana SSL'i pealesurumine (port 5223)"
-
-#: ../src/protocols/jabber/jabber.c:1924
+msgstr "Vana SSL-i pealesurumine (port 5223)"
+
+#: ../libgaim/protocols/jabber/jabber.c:1981
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Avatekstiautentimise lubamine üle krüptimata andmevoo"
 
-#: ../src/protocols/jabber/jabber.c:1929 ../src/protocols/simple/simple.c:1771
+#: ../libgaim/protocols/jabber/jabber.c:1986
+#: ../libgaim/protocols/simple/simple.c:1845
 msgid "Connect port"
 msgstr "Ühendumisport"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1933 ../src/protocols/silc/silc.c:1855
+#: ../libgaim/protocols/jabber/jabber.c:1990
+#: ../libgaim/protocols/silc/silc.c:1855
 msgid "Connect server"
 msgstr "Ühendumisserver"
 
-#: ../src/protocols/jabber/message.c:108
+#: ../libgaim/protocols/jabber/message.c:117
 #, c-format
 msgid "Message from %s"
 msgstr ""
 
-#: ../src/protocols/jabber/message.c:172
+#: ../libgaim/protocols/jabber/message.c:181
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s seadis uueks teemaks: %s"
 
-#: ../src/protocols/jabber/message.c:174
+#: ../libgaim/protocols/jabber/message.c:183
 #, c-format
 msgid "The topic is: %s"
 msgstr "Teema on: %s"
 
-#: ../src/protocols/jabber/message.c:224
+#: ../libgaim/protocols/jabber/message.c:233
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Tõrge sõnumi edastamisel kasutajale %s: %s"
 
-#: ../src/protocols/jabber/message.c:227
+#: ../libgaim/protocols/jabber/message.c:236
 msgid "Jabber Message Error"
 msgstr "Jabberi sõnumi viga"
 
-#: ../src/protocols/jabber/message.c:295
+#: ../libgaim/protocols/jabber/message.c:316
 #, c-format
 msgid " (Code %s)"
 msgstr " (Kood %s)"
 
-#: ../src/protocols/jabber/parser.c:131
+#: ../libgaim/protocols/jabber/parser.c:179
 msgid "XML Parse error"
 msgstr "XML'i parsimise viga"
 
-#: ../src/protocols/jabber/presence.c:309
+#: ../libgaim/protocols/jabber/presence.c:304
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: ../src/protocols/jabber/presence.c:314 ../src/protocols/msn/userlist.c:104
+#: ../libgaim/protocols/jabber/presence.c:309
+#: ../libgaim/protocols/msn/userlist.c:98
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
-msgstr "Kasutaja %s soovib lisada %s oma sõbranimekirja."
-
-#: ../src/protocols/jabber/presence.c:323 ../src/protocols/oscar/oscar.c:2373
-#: ../src/protocols/oscar/oscar.c:5012
+msgstr "Kasutaja %s soovib lisada %s oma sõbraloendisse."
+
+#: ../libgaim/protocols/jabber/presence.c:318
+#: ../libgaim/protocols/oscar/oscar.c:2357
+#: ../libgaim/protocols/oscar/oscar.c:5068
 msgid "_Authorize"
 msgstr "_Autoriseeri"
 
-#: ../src/protocols/jabber/presence.c:324 ../src/protocols/oscar/oscar.c:2375
-#: ../src/protocols/oscar/oscar.c:5013
+#: ../libgaim/protocols/jabber/presence.c:319
+#: ../libgaim/protocols/oscar/oscar.c:2359
+#: ../libgaim/protocols/oscar/oscar.c:5069
 msgid "_Deny"
 msgstr "_Keela"
 
-#: ../src/protocols/jabber/presence.c:381
-#: ../src/protocols/jabber/presence.c:382
+#: ../libgaim/protocols/jabber/presence.c:376
+#: ../libgaim/protocols/jabber/presence.c:377
 msgid "Create New Room"
 msgstr ""
 
-#: ../src/protocols/jabber/presence.c:383
+#: ../libgaim/protocols/jabber/presence.c:378
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
 
-#: ../src/protocols/jabber/presence.c:386
+#: ../libgaim/protocols/jabber/presence.c:381
 msgid "_Configure Room"
 msgstr ""
 
-#: ../src/protocols/jabber/presence.c:388
+#: ../libgaim/protocols/jabber/presence.c:383
 msgid "_Accept Defaults"
 msgstr ""
 
-#: ../src/protocols/jabber/presence.c:426
+#: ../libgaim/protocols/jabber/presence.c:421
 #, c-format
 msgid "Error in chat %s"
 msgstr ""
 
-#: ../src/protocols/jabber/presence.c:429
+#: ../libgaim/protocols/jabber/presence.c:424
 #, c-format
 msgid "Error joining chat %s"
 msgstr ""
 
-#: ../src/protocols/jabber/si.c:728
+#: ../libgaim/protocols/jabber/si.c:764
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 
-#: ../src/protocols/jabber/si.c:729 ../src/protocols/jabber/si.c:730
+#: ../libgaim/protocols/jabber/si.c:765 ../libgaim/protocols/jabber/si.c:766
 msgid "File Send Failed"
 msgstr ""
 
-#: ../src/protocols/msn/dialog.c:92
+#: ../libgaim/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Küsimus konto %s sõbranimekirja sünkroniseerimise kohta (%s)"
 
-#: ../src/protocols/msn/dialog.c:98
+#: ../libgaim/protocols/msn/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
 msgstr ""
-"%s on kohalikus nimekirjas grupis \"%s\" kuid mitte serveri nimekirjas. Kas "
+"%s on kohalikus nimekirjas grupis \"%s\", kuid mitte serveri nimekirjas. Kas "
 "sa soovid sõpra sinna nimekirja lisada?"
 
-#: ../src/protocols/msn/dialog.c:106
+#: ../libgaim/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:35
+#: ../libgaim/protocols/msn/error.c:35
 msgid "Unable to parse message"
 msgstr "Sõnumit pole võimalik parsida"
 
-#: ../src/protocols/msn/error.c:38
+#: ../libgaim/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Süntaksi viga (arvatavasti Gaim'i probleem)"
 
-#: ../src/protocols/msn/error.c:42
+#: ../libgaim/protocols/msn/error.c:42
 msgid "Invalid e-mail address"
 msgstr "Vigane e-posti aadress"
 
-#: ../src/protocols/msn/error.c:45
+#: ../libgaim/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr "Kasutajat pole olemas"
 
-#: ../src/protocols/msn/error.c:49
+#: ../libgaim/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:52
+#: ../libgaim/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:55
+#: ../libgaim/protocols/msn/error.c:55
 msgid "Invalid Username"
 msgstr "Vigane kasutajanimi"
 
-#: ../src/protocols/msn/error.c:58
+#: ../libgaim/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
 msgstr "Vigane sõbralik nimi"
 
-#: ../src/protocols/msn/error.c:61
+#: ../libgaim/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "Nimekiri on täis"
 
-#: ../src/protocols/msn/error.c:64
+#: ../libgaim/protocols/msn/error.c:64
 msgid "Already there"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:67
+#: ../libgaim/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:705
+#: ../libgaim/protocols/msn/error.c:70
+#: ../libgaim/protocols/zephyr/zephyr.c:757
 msgid "User is offline"
 msgstr "Kasutaja pole ühendatud"
 
-#: ../src/protocols/msn/error.c:73
+#: ../libgaim/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:76
+#: ../libgaim/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:79
+#: ../libgaim/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "Liiga palju gruppe"
 
-#: ../src/protocols/msn/error.c:82
+#: ../libgaim/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "Vigane grupp"
 
-#: ../src/protocols/msn/error.c:85
+#: ../libgaim/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr "Kasutaja pole grupis"
 
-#: ../src/protocols/msn/error.c:88
+#: ../libgaim/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr "Grupinimi on liiga pikk"
 
-#: ../src/protocols/msn/error.c:91
+#: ../libgaim/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:95
+#: ../libgaim/protocols/msn/error.c:95
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:99
+#: ../libgaim/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:102
+#: ../libgaim/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:106
+#: ../libgaim/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:109
+#: ../libgaim/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:148
+#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:123
 msgid "Not logged in"
 msgstr "Pole sisse logitud"
 
-#: ../src/protocols/msn/error.c:116
+#: ../libgaim/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
 msgstr "Server pole ajutiselt kättesaadav"
 
-#: ../src/protocols/msn/error.c:119
+#: ../libgaim/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "Andmebaasiserveri viga"
 
-#: ../src/protocols/msn/error.c:122
+#: ../libgaim/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:125
+#: ../libgaim/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "Viga failioperatsioonil"
 
-#: ../src/protocols/msn/error.c:128
+#: ../libgaim/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "Viga mälu eraldamisel"
 
-#: ../src/protocols/msn/error.c:131
+#: ../libgaim/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:135
+#: ../libgaim/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "Server on hõivatud"
 
-#: ../src/protocols/msn/error.c:138 ../src/protocols/msn/error.c:151
-#: ../src/protocols/msn/error.c:206
+#: ../libgaim/protocols/msn/error.c:138 ../libgaim/protocols/msn/error.c:151
+#: ../libgaim/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "Server pole saadaval"
 
-#: ../src/protocols/msn/error.c:141
+#: ../libgaim/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:144
+#: ../libgaim/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "Viga andmebaasiühenduses"
 
-#: ../src/protocols/msn/error.c:148
+#: ../libgaim/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:155
+#: ../libgaim/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "Viga ühenduse loomisel"
 
-#: ../src/protocols/msn/error.c:159
+#: ../libgaim/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:162
+#: ../libgaim/protocols/msn/error.c:162
 msgid "Unable to write"
-msgstr ""
-
-#: ../src/protocols/msn/error.c:165
+msgstr "Kirjutamine pole võimalik"
+
+#: ../libgaim/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr "Seanss on ülekoormatud"
 
-#: ../src/protocols/msn/error.c:168
+#: ../libgaim/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "Kasutaja on liiga aktiivne"
 
-#: ../src/protocols/msn/error.c:171
+#: ../libgaim/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "Liiga palju seansse"
 
-#: ../src/protocols/msn/error.c:174
+#: ../libgaim/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:177
+#: ../libgaim/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:180
+#: ../libgaim/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:185
+#: ../libgaim/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:194
+#: ../libgaim/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "Server on liiga hõivatud"
 
-#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:1338
-#: ../src/protocols/silc/ops.c:1717 ../src/protocols/toc/toc.c:722
+#: ../libgaim/protocols/msn/error.c:198
+#: ../libgaim/protocols/oscar/oscar.c:1310
+#: ../libgaim/protocols/silc/ops.c:1716 ../libgaim/protocols/toc/toc.c:728
+#: ../libgaim/proxy.c:1344
 msgid "Authentication failed"
 msgstr "Tõrge autentimisel"
 
-#: ../src/protocols/msn/error.c:201
+#: ../libgaim/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:209
+#: ../libgaim/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:213
+#: ../libgaim/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:217
+#: ../libgaim/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:220
+#: ../libgaim/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "Halb pilet"
 
-#: ../src/protocols/msn/error.c:224
+#: ../libgaim/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Tundmatu veakood %d"
 
-#: ../src/protocols/msn/error.c:236
+#: ../libgaim/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN'i viga: %s\n"
 
-#: ../src/protocols/msn/msn.c:113
+#: ../libgaim/protocols/msn/msn.c:113
 msgid "You have just sent a Nudge!"
 msgstr ""
 
-#: ../src/protocols/msn/msn.c:138
+#: ../libgaim/protocols/msn/msn.c:138
 msgid "Your new MSN friendly name is too long."
 msgstr "Sinu MSN'i sõbralik nimi on liiga pikk."
 
-#: ../src/protocols/msn/msn.c:246
+#: ../libgaim/protocols/msn/msn.c:246
 msgid "Set your friendly name."
 msgstr "Sõbraliku nime määramine."
 
-#: ../src/protocols/msn/msn.c:247
+#: ../libgaim/protocols/msn/msn.c:247
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Selle nimega näevad sind MSN'is olevad sõbrad."
 
-#: ../src/protocols/msn/msn.c:263
+#: ../libgaim/protocols/msn/msn.c:263
 msgid "Set your home phone number."
 msgstr "Määra oma kodutelefoni number."
 
-#: ../src/protocols/msn/msn.c:278
+#: ../libgaim/protocols/msn/msn.c:278
 msgid "Set your work phone number."
 msgstr "Määra oma töötelefoni number."
 
-#: ../src/protocols/msn/msn.c:293
+#: ../libgaim/protocols/msn/msn.c:293
 msgid "Set your mobile phone number."
 msgstr "Määra oma mobiiltelefoni number."
 
-#: ../src/protocols/msn/msn.c:306
+#: ../libgaim/protocols/msn/msn.c:306
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: ../src/protocols/msn/msn.c:307
+#: ../libgaim/protocols/msn/msn.c:307
 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 ""
 
-#: ../src/protocols/msn/msn.c:311
+#: ../libgaim/protocols/msn/msn.c:311
 msgid "Allow"
 msgstr "Luba"
 
-#: ../src/protocols/msn/msn.c:312
+#: ../libgaim/protocols/msn/msn.c:312
 msgid "Disallow"
 msgstr "Ära luba"
 
-#: ../src/protocols/msn/msn.c:328
+#: ../libgaim/protocols/msn/msn.c:328
 msgid "This Hotmail account may not be active."
 msgstr ""
 
-#: ../src/protocols/msn/msn.c:354
+#: ../libgaim/protocols/msn/msn.c:354
 msgid "Send a mobile message."
 msgstr ""
 
-#: ../src/protocols/msn/msn.c:356
+#: ../libgaim/protocols/msn/msn.c:356
 msgid "Page"
 msgstr ""
 
-#: ../src/protocols/msn/msn.c:550 ../src/protocols/msn/msn.c:557
-#: ../src/protocols/msn/msn.c:566 ../src/protocols/sametime/sametime.c:3246
-#: ../src/protocols/yahoo/yahoo.c:2882 ../src/protocols/yahoo/yahoo.c:2888
+#: ../libgaim/protocols/msn/msn.c:546 ../libgaim/protocols/msn/msn.c:553
+#: ../libgaim/protocols/msn/msn.c:562
+#: ../libgaim/protocols/sametime/sametime.c:3235
+#: ../libgaim/protocols/yahoo/yahoo.c:3032
+#: ../libgaim/protocols/yahoo/yahoo.c:3038
 #, c-format
 msgid ""
 "\n"
@@ -7621,307 +8681,320 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: ../src/protocols/msn/msn.c:557
+#: ../libgaim/protocols/msn/msn.c:553
 msgid "Has you"
-msgstr "Sina tema nimekirjas"
-
-#: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3296
+msgstr "Sina tema loendis"
+
+#: ../libgaim/protocols/msn/msn.c:583 ../libgaim/protocols/msn/state.c:33
+#: ../libgaim/protocols/yahoo/yahoo.c:2861
+#: ../libgaim/protocols/yahoo/yahoo.c:3466
 msgid "Be Right Back"
 msgstr "Tulen kohe tagasi"
 
-#: ../src/protocols/msn/msn.c:591 ../src/protocols/msn/state.c:31
-#: ../src/protocols/novell/novell.c:2851 ../src/protocols/novell/novell.c:2985
-#: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
-#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3299
+#: ../libgaim/protocols/msn/msn.c:587 ../libgaim/protocols/msn/state.c:31
+#: ../libgaim/protocols/novell/novell.c:2859
+#: ../libgaim/protocols/novell/novell.c:2993
+#: ../libgaim/protocols/silc/buddy.c:1473 ../libgaim/protocols/silc/silc.c:53
+#: ../libgaim/protocols/yahoo/yahoo.c:2863
+#: ../libgaim/protocols/yahoo/yahoo.c:3469
 msgid "Busy"
 msgstr "Hõivatud"
 
-#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2721
-#: ../src/protocols/yahoo/yahoo.c:3311
+#: ../libgaim/protocols/msn/msn.c:591 ../libgaim/protocols/yahoo/yahoo.c:2871
+#: ../libgaim/protocols/yahoo/yahoo.c:3481
 msgid "On the Phone"
 msgstr "Räägin telefoniga"
 
-#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2725
-#: ../src/protocols/yahoo/yahoo.c:3317
+#: ../libgaim/protocols/msn/msn.c:595 ../libgaim/protocols/yahoo/yahoo.c:2875
+#: ../libgaim/protocols/yahoo/yahoo.c:3487
 msgid "Out to Lunch"
 msgstr "Lõunal"
 
-#: ../src/protocols/msn/msn.c:623
+#: ../libgaim/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "Määra sõbralik nimi..."
 
-#: ../src/protocols/msn/msn.c:628
+#: ../libgaim/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "Määra kodutelefoni number..."
 
-#: ../src/protocols/msn/msn.c:632
+#: ../libgaim/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "Määra töötelefoni number..."
 
-#: ../src/protocols/msn/msn.c:636
+#: ../libgaim/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "Määra mobiiltelefoni number..."
 
-#: ../src/protocols/msn/msn.c:642
+#: ../libgaim/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr ""
 
-#: ../src/protocols/msn/msn.c:647
+#: ../libgaim/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr ""
 
-#: ../src/protocols/msn/msn.c:657
+#: ../libgaim/protocols/msn/msn.c:653
 msgid "Open Hotmail Inbox"
 msgstr "Ava Hotmaili postkast"
 
-#: ../src/protocols/msn/msn.c:681
+#: ../libgaim/protocols/msn/msn.c:677
 msgid "Send to Mobile"
 msgstr ""
 
-#: ../src/protocols/msn/msn.c:691 ../src/protocols/novell/novell.c:3441
+#: ../libgaim/protocols/msn/msn.c:687
+#: ../libgaim/protocols/novell/novell.c:3449
 msgid "Initiate _Chat"
 msgstr "Algata _jututuba"
 
-#: ../src/protocols/msn/msn.c:729
+#: ../libgaim/protocols/msn/msn.c:725
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
 msgstr ""
 
-#: ../src/protocols/msn/msn.c:757
+#: ../libgaim/protocols/msn/msn.c:752
 msgid "Failed to connect to server."
 msgstr "Tõrge serveriga ühendumisel."
 
-#: ../src/protocols/msn/msn.c:1366 ../src/protocols/yahoo/yahoo_profile.c:685
-#: ../src/protocols/zephyr/zephyr.c:736 ../src/protocols/zephyr/zephyr.c:1153
+#: ../libgaim/protocols/msn/msn.c:1363
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:685
+#: ../libgaim/protocols/zephyr/zephyr.c:788
+#: ../libgaim/protocols/zephyr/zephyr.c:1205
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1373 ../src/protocols/yahoo/yahoo_profile.c:1208
-#: ../src/util.c:1061
+#: ../libgaim/protocols/msn/msn.c:1370
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1223 ../libgaim/util.c:1109
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: ../src/protocols/msn/msn.c:1463
+#: ../libgaim/protocols/msn/msn.c:1462
 msgid "MSN Profile"
 msgstr "MSN'i profiil"
 
-#: ../src/protocols/msn/msn.c:1468 ../src/protocols/msn/msn.c:1794
-#: ../src/protocols/yahoo/yahoo_profile.c:795
+#: ../libgaim/protocols/msn/msn.c:1467 ../libgaim/protocols/msn/msn.c:1796
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:794
 msgid "Error retrieving profile"
 msgstr "Viga profiili vastuvõtmisel"
 
-#: ../src/protocols/msn/msn.c:1536 ../src/protocols/oscar/oscar.c:3654
-#: ../src/protocols/yahoo/yahoo_profile.c:1056
+#: ../libgaim/protocols/msn/msn.c:1537 ../libgaim/protocols/oscar/oscar.c:3669
+#: ../libgaim/protocols/qq/buddy_info.c:43
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1070
 msgid "Age"
 msgstr "Vanus"
 
-#: ../src/protocols/msn/msn.c:1538 ../src/protocols/yahoo/yahoo_profile.c:1071
+#: ../libgaim/protocols/msn/msn.c:1539 ../libgaim/protocols/qq/buddy_info.c:49
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
 msgid "Occupation"
 msgstr ""
 
-#: ../src/protocols/msn/msn.c:1539 ../src/protocols/novell/novell.c:1480
-#: ../src/protocols/yahoo/yahoo_profile.c:1051
+#: ../libgaim/protocols/msn/msn.c:1540
+#: ../libgaim/protocols/novell/novell.c:1478
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1065
 msgid "Location"
 msgstr "Asukoht"
 
-#: ../src/protocols/msn/msn.c:1544 ../src/protocols/msn/msn.c:1723
-#: ../src/protocols/msn/msn.c:1729 ../src/protocols/msn/msn.c:1736
+#: ../libgaim/protocols/msn/msn.c:1545 ../libgaim/protocols/msn/msn.c:1725
+#: ../libgaim/protocols/msn/msn.c:1731 ../libgaim/protocols/msn/msn.c:1738
 msgid "Hobbies and Interests"
 msgstr ""
 
-#: ../src/protocols/msn/msn.c:1550 ../src/protocols/msn/msn.c:1657
-#: ../src/protocols/msn/msn.c:1663 ../src/protocols/msn/msn.c:1670
-#: ../src/protocols/msn/msn.c:1678 ../src/protocols/msn/msn.c:1685
+#: ../libgaim/protocols/msn/msn.c:1551 ../libgaim/protocols/msn/msn.c:1659
+#: ../libgaim/protocols/msn/msn.c:1665 ../libgaim/protocols/msn/msn.c:1672
+#: ../libgaim/protocols/msn/msn.c:1680 ../libgaim/protocols/msn/msn.c:1687
 msgid "A Little About Me"
 msgstr ""
 
-#: ../src/protocols/msn/msn.c:1556
+#: ../libgaim/protocols/msn/msn.c:1557
 #, fuzzy, c-format
 msgid "%s<b>General</b><br>%s"
 msgstr "<br><b>Kanali teema:</b><br>%s"
 
 #. Social
-#: ../src/protocols/msn/msn.c:1565 ../src/protocols/yahoo/yahoo_profile.c:1061
+#: ../libgaim/protocols/msn/msn.c:1566
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1075
 msgid "Marital Status"
 msgstr "Perekonnaseis"
 
-#: ../src/protocols/msn/msn.c:1566
+#: ../libgaim/protocols/msn/msn.c:1567
 #, fuzzy
 msgid "Interests"
 msgstr "L_isa"
 
-#: ../src/protocols/msn/msn.c:1567
+#: ../libgaim/protocols/msn/msn.c:1568
 msgid "Pets"
 msgstr "Lemmikloomad"
 
-#: ../src/protocols/msn/msn.c:1568
+#: ../libgaim/protocols/msn/msn.c:1569
 msgid "Hometown"
 msgstr "Kodulinn"
 
-#: ../src/protocols/msn/msn.c:1569
+#: ../libgaim/protocols/msn/msn.c:1570
 msgid "Places Lived"
 msgstr ""
 
-#: ../src/protocols/msn/msn.c:1570
+#: ../libgaim/protocols/msn/msn.c:1571
 msgid "Fashion"
 msgstr "Mood"
 
-#: ../src/protocols/msn/msn.c:1571
+#: ../libgaim/protocols/msn/msn.c:1572
 msgid "Humor"
 msgstr "Huumor"
 
-#: ../src/protocols/msn/msn.c:1572
+#: ../libgaim/protocols/msn/msn.c:1573
 msgid "Music"
 msgstr "Muusika"
 
-#: ../src/protocols/msn/msn.c:1573 ../src/protocols/msn/msn.c:1745
-#: ../src/protocols/msn/msn.c:1751 ../src/protocols/yahoo/yahoo_profile.c:1113
+#: ../libgaim/protocols/msn/msn.c:1574 ../libgaim/protocols/msn/msn.c:1747
+#: ../libgaim/protocols/msn/msn.c:1753
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1127
 msgid "Favorite Quote"
 msgstr "Lemmiktsitaat"
 
-#: ../src/protocols/msn/msn.c:1577
+#: ../libgaim/protocols/msn/msn.c:1578
 #, c-format
 msgid "%s<b>Social</b><br>%s"
 msgstr ""
 
-#: ../src/protocols/msn/msn.c:1586
+#: ../libgaim/protocols/msn/msn.c:1587
 msgid "Significant Other"
 msgstr ""
 
-#: ../src/protocols/msn/msn.c:1587
+#: ../libgaim/protocols/msn/msn.c:1588
 msgid "Home Phone"
 msgstr "Kodutelefon"
 
-#: ../src/protocols/msn/msn.c:1588
+#: ../libgaim/protocols/msn/msn.c:1589
 msgid "Home Phone 2"
 msgstr "Kodutelefon 2"
 
-#: ../src/protocols/msn/msn.c:1589 ../src/protocols/oscar/oscar.c:3666
+#: ../libgaim/protocols/msn/msn.c:1590 ../libgaim/protocols/oscar/oscar.c:3681
 msgid "Home Address"
 msgstr "Koduaadress"
 
-#: ../src/protocols/msn/msn.c:1590
+#: ../libgaim/protocols/msn/msn.c:1591
 msgid "Personal Mobile"
 msgstr "Isiklik mobiiltelefon"
 
-#: ../src/protocols/msn/msn.c:1591
+#: ../libgaim/protocols/msn/msn.c:1592
 msgid "Home Fax"
 msgstr "Kodufaks"
 
-#: ../src/protocols/msn/msn.c:1592
+#: ../libgaim/protocols/msn/msn.c:1593
 msgid "Personal E-Mail"
 msgstr "Isiklik e-post"
 
-#: ../src/protocols/msn/msn.c:1593
+#: ../libgaim/protocols/msn/msn.c:1594
 #, fuzzy
 msgid "Personal IM"
 msgstr "Isiklik veebileht"
 
-#: ../src/protocols/msn/msn.c:1595
+#: ../libgaim/protocols/msn/msn.c:1596
 msgid "Anniversary"
 msgstr ""
 
-#: ../src/protocols/msn/msn.c:1596 ../src/protocols/msn/msn.c:1620
+#: ../libgaim/protocols/msn/msn.c:1597 ../libgaim/protocols/msn/msn.c:1622
 msgid "Notes"
 msgstr "Märkused"
 
-#: ../src/protocols/msn/msn.c:1600
+#: ../libgaim/protocols/msn/msn.c:1601
 #, c-format
 msgid "<br><b>Personal</b><br>%s"
 msgstr "<br><b>Isiklik</b><br>%s"
 
-#: ../src/protocols/msn/msn.c:1607 ../src/protocols/silc/ops.c:1044
+#: ../libgaim/protocols/msn/msn.c:1609 ../libgaim/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Töö nimetus"
 
-#: ../src/protocols/msn/msn.c:1608 ../src/protocols/oscar/oscar.c:3683
+#: ../libgaim/protocols/msn/msn.c:1610 ../libgaim/protocols/oscar/oscar.c:3698
 msgid "Company"
 msgstr "Firma"
 
-#: ../src/protocols/msn/msn.c:1609 ../src/protocols/novell/novell.c:1482
+#: ../libgaim/protocols/msn/msn.c:1611
+#: ../libgaim/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Osakond"
 
-#: ../src/protocols/msn/msn.c:1610
+#: ../libgaim/protocols/msn/msn.c:1612
 msgid "Profession"
 msgstr "Ametikoht"
 
-#: ../src/protocols/msn/msn.c:1611
+#: ../libgaim/protocols/msn/msn.c:1613
 msgid "Work Phone"
 msgstr "Töötelefon"
 
-#: ../src/protocols/msn/msn.c:1612
+#: ../libgaim/protocols/msn/msn.c:1614
 msgid "Work Phone 2"
 msgstr "Töötelefon 2"
 
-#: ../src/protocols/msn/msn.c:1613 ../src/protocols/oscar/oscar.c:3674
+#: ../libgaim/protocols/msn/msn.c:1615 ../libgaim/protocols/oscar/oscar.c:3689
 msgid "Work Address"
 msgstr "Tööaadress"
 
-#: ../src/protocols/msn/msn.c:1614
+#: ../libgaim/protocols/msn/msn.c:1616
 msgid "Work Mobile"
 msgstr "Töö-mobiiltelefon"
 
-#: ../src/protocols/msn/msn.c:1615
+#: ../libgaim/protocols/msn/msn.c:1617
 msgid "Work Pager"
 msgstr "Tööpeiler"
 
-#: ../src/protocols/msn/msn.c:1616
+#: ../libgaim/protocols/msn/msn.c:1618
 msgid "Work Fax"
 msgstr "Tööfaks"
 
-#: ../src/protocols/msn/msn.c:1617
+#: ../libgaim/protocols/msn/msn.c:1619
 msgid "Work E-Mail"
 msgstr "Töö e-post"
 
-#: ../src/protocols/msn/msn.c:1618
+#: ../libgaim/protocols/msn/msn.c:1620
 msgid "Work IM"
 msgstr ""
 
-#: ../src/protocols/msn/msn.c:1619
+#: ../libgaim/protocols/msn/msn.c:1621
 msgid "Start Date"
 msgstr "Alguskuupäev"
 
-#: ../src/protocols/msn/msn.c:1624
+#: ../libgaim/protocols/msn/msn.c:1626
 #, c-format
 msgid "<br><b>Business</b><br>%s"
 msgstr "<br><b>Äri</b><br>%s"
 
-#: ../src/protocols/msn/msn.c:1635
+#: ../libgaim/protocols/msn/msn.c:1637
 #, c-format
 msgid "<hr><b>Contact Info</b>%s%s"
 msgstr "<hr><b>Kontaktandmed</b>%s%s"
 
-#: ../src/protocols/msn/msn.c:1694 ../src/protocols/msn/msn.c:1700
-#: ../src/protocols/msn/msn.c:1707 ../src/protocols/msn/msn.c:1714
+#: ../libgaim/protocols/msn/msn.c:1696 ../libgaim/protocols/msn/msn.c:1702
+#: ../libgaim/protocols/msn/msn.c:1709 ../libgaim/protocols/msn/msn.c:1716
 msgid "Favorite Things"
 msgstr "Lemmikasjad"
 
-#: ../src/protocols/msn/msn.c:1759
+#: ../libgaim/protocols/msn/msn.c:1761
 msgid "Last Updated"
 msgstr "Viimati uuendatud"
 
-#: ../src/protocols/msn/msn.c:1771 ../src/protocols/silc/ops.c:1060
+#: ../libgaim/protocols/msn/msn.c:1773 ../libgaim/protocols/qq/buddy_info.c:58
+#: ../libgaim/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Koduleht"
 
-#: ../src/protocols/msn/msn.c:1796
+#: ../libgaim/protocols/msn/msn.c:1798
 msgid "The user has not created a public profile."
 msgstr "Kasutaja pole loonud avalikku profiili."
 
-#: ../src/protocols/msn/msn.c:1797
+#: ../libgaim/protocols/msn/msn.c:1799
 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 ""
 
-#: ../src/protocols/msn/msn.c:1801
+#: ../libgaim/protocols/msn/msn.c:1803
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -7930,12 +9003,13 @@
 "tõenäolisemalt pole seda kasutajat olemas."
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1806
+#: ../libgaim/protocols/msn/msn.c:1808
 #, c-format
 msgid "<hr><b>%s:</b> "
 msgstr "<hr><b>%s:</b> "
 
-#: ../src/protocols/msn/msn.c:1806 ../src/protocols/yahoo/yahoo_profile.c:1208
+#: ../libgaim/protocols/msn/msn.c:1808
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1223
 msgid "Profile URL"
 msgstr "Profiili URL"
 
@@ -7949,85 +9023,96 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:2028 ../src/protocols/msn/msn.c:2030
+#: ../libgaim/protocols/msn/msn.c:2033 ../libgaim/protocols/msn/msn.c:2035
 msgid "MSN Protocol Plugin"
 msgstr "MSN protokolli plugin"
 
-#: ../src/protocols/msn/msn.c:2049
-msgid "Login server"
-msgstr "Sisselogimise server"
-
-#: ../src/protocols/msn/msn.c:2058
+#: ../libgaim/protocols/msn/msn.c:2063
 msgid "Use HTTP Method"
 msgstr "Kasutatakse HTTP meetodit"
 
-#: ../src/protocols/msn/msn.c:2063
+#: ../libgaim/protocols/msn/msn.c:2068
 msgid "Show custom smileys"
 msgstr "Kasutatakse kohandatud tujunägusid"
 
-#: ../src/protocols/msn/msn.c:2071
+#: ../libgaim/protocols/msn/msn.c:2076
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
-#: ../src/protocols/msn/nexus.c:141 ../src/protocols/msn/servconn.c:133
-#: ../src/protocols/yahoo/yahoochat.c:1345
-#: ../src/protocols/yahoo/yahoochat.c:1372
+#: ../libgaim/protocols/msn/nexus.c:146
+#: ../libgaim/protocols/msn/servconn.c:133
+#: ../libgaim/protocols/qq/qq_proxy.c:242
+#: ../libgaim/protocols/qq/qq_proxy.c:321
+#: ../libgaim/protocols/qq/qq_proxy.c:366
+#: ../libgaim/protocols/qq/qq_proxy.c:399
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:62
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:162
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:186
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:199
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:228
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:242
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:267
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:301
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:331
+#: ../libgaim/protocols/yahoo/yahoochat.c:1357
+#: ../libgaim/protocols/yahoo/yahoochat.c:1383
 msgid "Unable to connect"
 msgstr "Ühendumine pole võimalik"
 
-#: ../src/protocols/msn/notification.c:178
+#: ../libgaim/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr ""
 
-#: ../src/protocols/msn/notification.c:184
-#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:334
+#: ../libgaim/protocols/msn/notification.c:184
+#: ../libgaim/protocols/msn/notification.c:532
+#: ../libgaim/protocols/msn/session.c:329
 msgid "Unknown error."
 msgstr "Tundmatu viga."
 
-#: ../src/protocols/msn/notification.c:187
+#: ../libgaim/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr ""
 
-#: ../src/protocols/msn/notification.c:498
+#: ../libgaim/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr ""
 
-#: ../src/protocols/msn/notification.c:502
+#: ../libgaim/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr ""
 
-#: ../src/protocols/msn/notification.c:506
+#: ../libgaim/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr ""
 
-#: ../src/protocols/msn/notification.c:514
+#: ../libgaim/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr ""
 
-#: ../src/protocols/msn/notification.c:523
+#: ../libgaim/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr ""
 
-#: ../src/protocols/msn/notification.c:528
+#: ../libgaim/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "Teenus pole ajutiselt kättesaadav."
 
-#: ../src/protocols/msn/notification.c:821
+#: ../libgaim/protocols/msn/notification.c:823
 msgid "Unable to rename group"
 msgstr "Gruppi pole võimalik ümber nimetada"
 
-#: ../src/protocols/msn/notification.c:876
+#: ../libgaim/protocols/msn/notification.c:878
 msgid "Unable to delete group"
 msgstr "Gruppi pole võimalik ümber kustutada"
 
-#: ../src/protocols/msn/notification.c:1309
+#: ../libgaim/protocols/msn/notification.c:1314
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -8046,457 +9131,394 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/protocols/msn/servconn.c:135
+#: ../libgaim/protocols/msn/servconn.c:135
 msgid "Writing error"
-msgstr "Kirjutamise viga"
-
-#: ../src/protocols/msn/servconn.c:137
+msgstr "Viga kirjutamisel"
+
+#: ../libgaim/protocols/msn/servconn.c:137
 msgid "Reading error"
-msgstr "Lugemise viga"
-
-#: ../src/protocols/msn/servconn.c:144
-#, fuzzy, c-format
+msgstr "Viga lugemisel"
+
+#: ../libgaim/protocols/msn/servconn.c:144
+#, c-format
 msgid ""
 "Connection error from %s server:\n"
 "%s"
 msgstr ""
-"Ühenduse viga %s serverist (%s):\n"
+"Ühenduse viga %s serverist:\n"
 "%s"
 
-#: ../src/protocols/msn/session.c:304
+#: ../libgaim/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "Meie protokoll pole serveri poolt toetatud."
 
-#: ../src/protocols/msn/session.c:308
+#: ../libgaim/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "Viga HTTP parsimisel."
 
-#. MSG_SERVER_GHOST
-#. Looks like someone logged in as us! =-O
-#: ../src/protocols/msn/session.c:312 ../src/protocols/napster/napster.c:456
-#: ../src/protocols/oscar/oscar.c:3407 ../src/protocols/yahoo/yahoo.c:193
+#: ../libgaim/protocols/msn/session.c:307
+#: ../libgaim/protocols/oscar/oscar.c:3409
+#: ../libgaim/protocols/yahoo/yahoo.c:191
 msgid "You have signed on from another location."
 msgstr "Sa oled teisest kohast sisse loginud."
 
-#: ../src/protocols/msn/session.c:315
+#: ../libgaim/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN serverid pole ajutiselt kättesaadavad. Palun oota ja proovi uuesti."
 
-#: ../src/protocols/msn/session.c:320
+#: ../libgaim/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN serverid jäetakse ajutiselt seisma"
 
-#: ../src/protocols/msn/session.c:324
+#: ../libgaim/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Pole võimalik autentida: %s"
 
-#: ../src/protocols/msn/session.c:329
+#: ../libgaim/protocols/msn/session.c:324
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Sinu MSN'i sõbranimekiri pole ajutiselt saadaval. Palun oota ja proovi "
 "uuesti."
 
-#: ../src/protocols/msn/session.c:350 ../src/protocols/msn/session.c:352
+#: ../libgaim/protocols/msn/session.c:345
+#: ../libgaim/protocols/msn/session.c:347
 msgid "Handshaking"
 msgstr "Käepigistus"
 
-#: ../src/protocols/msn/session.c:351
+#: ../libgaim/protocols/msn/session.c:346
 msgid "Transferring"
 msgstr "Ülekandmine"
 
-#: ../src/protocols/msn/session.c:353
+#: ../libgaim/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr "Autentimise alustamine"
 
-#: ../src/protocols/msn/session.c:354
+#: ../libgaim/protocols/msn/session.c:349
 msgid "Getting cookie"
 msgstr "Küpsise võtmine"
 
-#: ../src/protocols/msn/session.c:356
+#: ../libgaim/protocols/msn/session.c:351
 msgid "Sending cookie"
 msgstr "Küpsise saatmine"
 
-#: ../src/protocols/msn/session.c:357
+#: ../libgaim/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
-msgstr "Sõbranimekirja vastuvõtmine"
-
-#: ../src/protocols/msn/state.c:34
+msgstr "Sõbraloendi vastuvõtmine"
+
+#: ../libgaim/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Arvutist eemal"
 
-#: ../src/protocols/msn/state.c:35
+#: ../libgaim/protocols/msn/state.c:35
 msgid "On The Phone"
 msgstr "Räägin telefoniga"
 
-#: ../src/protocols/msn/state.c:36
+#: ../libgaim/protocols/msn/state.c:36
 msgid "Out To Lunch"
 msgstr "Lõunal"
 
-#: ../src/protocols/msn/switchboard.c:406
+#: ../libgaim/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr ""
 
-#: ../src/protocols/msn/switchboard.c:414
+#: ../libgaim/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Nähtamatu olles pole võimalik sõnumit saata:"
 
-#: ../src/protocols/msn/switchboard.c:418
+#: ../libgaim/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "Võrku ühendumata kasutajale pole võimalik sõnumit saata:"
 
-#: ../src/protocols/msn/switchboard.c:422
+#: ../libgaim/protocols/msn/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Ühenduse vea tõttu pole võimalik sõnumit saata:"
 
-#: ../src/protocols/msn/switchboard.c:426
-#, fuzzy
+#: ../libgaim/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
-msgstr "Võrku ühendumata kasutajale pole võimalik sõnumit saata:"
-
-#: ../src/protocols/msn/switchboard.c:430
+msgstr "Sõnumit pole võimalik saata kuna me saadame liiga kiiresti:"
+
+#: ../libgaim/protocols/msn/switchboard.c:424
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 
-#: ../src/protocols/msn/switchboard.c:438
+#: ../libgaim/protocols/msn/switchboard.c:432
 msgid "Message may have not been sent because an unknown error occurred:"
-msgstr ""
-
-#: ../src/protocols/msn/switchboard.c:959
-#, fuzzy, c-format
+msgstr "Sõnumit pole võimlik saata kuna leidis aset tundmatu viga:"
+
+#: ../libgaim/protocols/msn/switchboard.c:952
+#, c-format
 msgid "%s just sent you a Nudge!"
-msgstr "%s soovib saata sulle faili"
-
-#: ../src/protocols/msn/userlist.c:96
+msgstr ""
+
+#: ../libgaim/protocols/msn/userlist.c:90
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
-msgstr "Kasutaja %s (%s) soovib lisada %s oma sõbranimekirja."
-
-#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:915
+msgstr "Kasutaja %s (%s) soovib lisada %s oma sõbraloendisse."
+
+#: ../libgaim/protocols/msn/userlist.c:105
+#: ../libgaim/protocols/yahoo/yahoo.c:1002
 msgid "Authorize"
 msgstr "Autoriseeri"
 
-#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:917
+#: ../libgaim/protocols/msn/userlist.c:106
+#: ../libgaim/protocols/yahoo/yahoo.c:1004
 msgid "Deny"
 msgstr "Keela"
 
-#: ../src/protocols/msn/userlist.c:286
-#, fuzzy, c-format
+#: ../libgaim/protocols/msn/userlist.c:280
+#, c-format
 msgid "%s has added you to his or her buddy list."
-msgstr "Kasutaja %s soovib lisada sind oma sõbranimekirja."
-
-#: ../src/protocols/msn/userlist.c:350
-#, fuzzy, c-format
+msgstr "%s lisas sinu oma sõbranimekirja."
+
+#: ../libgaim/protocols/msn/userlist.c:349
+#, c-format
 msgid "%s has removed you from his or her buddy list."
-msgstr "Kasutaja eemaldamine sinu sõbranimekirjast"
-
-#: ../src/protocols/msn/userlist.c:679
-#, fuzzy, c-format
+msgstr "%s eemaldas sinu oma sõbranimekirjast."
+
+#: ../libgaim/protocols/msn/userlist.c:671
+#, c-format
 msgid "Unable to add \"%s\"."
-msgstr "Ei suuda lugeda faili %s."
-
-#: ../src/protocols/msn/userlist.c:681
+msgstr "\"%s\" pole võimalik lisada."
+
+#: ../libgaim/protocols/msn/userlist.c:673
 msgid "The screen name specified is invalid."
-msgstr ""
-
-#: ../src/protocols/napster/napster.c:266
-msgid "Unable to read header from server"
-msgstr "Ei suuda lugeda serverist päist"
-
-#: ../src/protocols/napster/napster.c:280
-#, c-format
-msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
-msgstr ""
-"Ei suuda lugeda serverilt tulnud sõnumit: %s.  Käsk on %hd, pikkus on %hd."
-
-#: ../src/protocols/napster/napster.c:296
-#, fuzzy
-msgid "Unknown server error."
-msgstr "Tundmatu viga"
-
-#: ../src/protocols/napster/napster.c:345
-#, c-format
-msgid "users: %s, files: %s, size: %sGB"
-msgstr ""
-
-#. MSG_SERVER_HOTLIST_ERROR
-#: ../src/protocols/napster/napster.c:356
-#, c-format
-msgid "Unable to add \"%s\" to your Napster hotlist"
-msgstr ""
-
-#. MSG_CLIENT_WHOIS
-#: ../src/protocols/napster/napster.c:420
-#, c-format
-msgid "%s requested your information"
-msgstr ""
-
-#. MSG_CLIENT_PING
-#: ../src/protocols/napster/napster.c:460
-#, c-format
-msgid "%s requested a PING"
-msgstr ""
-
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../src/protocols/napster/napster.c:507
-#: ../src/protocols/napster/napster.c:543 ../src/protocols/toc/toc.c:172
-#: ../src/protocols/yahoo/yahoo.c:2239 ../src/protocols/yahoo/yahoo.c:2266
-#: ../src/protocols/yahoo/yahoo.c:2349 ../src/protocols/yahoo/yahoo.c:2364
-#: ../src/protocols/yahoo/yahoo_filexfer.c:74
-#: ../src/protocols/yahoo/yahoo_filexfer.c:137
-#: ../src/protocols/yahoo/ycht.c:540
-msgid "Unable to connect."
-msgstr ""
-
-#: ../src/protocols/napster/napster.c:599 ../src/protocols/toc/toc.c:1367
-msgid "_Group:"
-msgstr "_Grupp:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../src/protocols/napster/napster.c:699
-#: ../src/protocols/napster/napster.c:701
-msgid "NAPSTER Protocol Plugin"
-msgstr "NAPSTER protokolli plugin"
-
-#: ../src/protocols/novell/nmuser.c:1868
+msgstr "Määratud ekraaninimi on vigane."
+
+#: ../libgaim/protocols/novell/nmuser.c:1879
 msgid "Required parameters not passed in"
 msgstr ""
 
-#: ../src/protocols/novell/nmuser.c:1871
+#: ../libgaim/protocols/novell/nmuser.c:1882
 msgid "Unable to write to network"
-msgstr ""
-
-#: ../src/protocols/novell/nmuser.c:1874
+msgstr "Võrku kirjutamine pole võimalik"
+
+#: ../libgaim/protocols/novell/nmuser.c:1885
 msgid "Unable to read from network"
-msgstr "Ei suuda võrgust lugeda"
-
-#: ../src/protocols/novell/nmuser.c:1877
+msgstr "Võrgust pole võimalik lugeda"
+
+#: ../libgaim/protocols/novell/nmuser.c:1888
 msgid "Error communicating with server"
-msgstr ""
-
-#: ../src/protocols/novell/nmuser.c:1881
+msgstr "Viga serveriga suhtlemisel"
+
+#: ../libgaim/protocols/novell/nmuser.c:1892
 msgid "Conference not found"
-msgstr ""
-
-#: ../src/protocols/novell/nmuser.c:1884
+msgstr "Konverentsi ei leitud"
+
+#: ../libgaim/protocols/novell/nmuser.c:1895
 msgid "Conference does not exist"
-msgstr ""
-
-#: ../src/protocols/novell/nmuser.c:1888
+msgstr "Konverentsi pole olemas"
+
+#: ../libgaim/protocols/novell/nmuser.c:1899
 msgid "A folder with that name already exists"
-msgstr ""
-
-#: ../src/protocols/novell/nmuser.c:1891
+msgstr "Selle nimega kataloog on juba olemas"
+
+#: ../libgaim/protocols/novell/nmuser.c:1902
 msgid "Not supported"
-msgstr ""
-
-#: ../src/protocols/novell/nmuser.c:1895
+msgstr "Toetamata"
+
+#: ../libgaim/protocols/novell/nmuser.c:1906
 msgid "Password has expired"
 msgstr "Parool on aegunud"
 
-#: ../src/protocols/novell/nmuser.c:1898
+#: ../libgaim/protocols/novell/nmuser.c:1909
 msgid "Invalid password"
-msgstr ""
-
-#: ../src/protocols/novell/nmuser.c:1901
+msgstr "Vigane parool"
+
+#: ../libgaim/protocols/novell/nmuser.c:1912
 msgid "User not found"
-msgstr ""
-
-#: ../src/protocols/novell/nmuser.c:1904
+msgstr "Kasutajat ei leitud"
+
+#: ../libgaim/protocols/novell/nmuser.c:1915
 msgid "Account has been disabled"
-msgstr ""
-
-#: ../src/protocols/novell/nmuser.c:1907
+msgstr "Konto on keelatud"
+
+#: ../libgaim/protocols/novell/nmuser.c:1918
 msgid "The server could not access the directory"
 msgstr ""
 
-#: ../src/protocols/novell/nmuser.c:1910
+#: ../libgaim/protocols/novell/nmuser.c:1921
 msgid "Your system administrator has disabled this operation"
-msgstr ""
-
-#: ../src/protocols/novell/nmuser.c:1913
+msgstr "Sinu süsteemiülem on selle toimingu keelanud"
+
+#: ../libgaim/protocols/novell/nmuser.c:1924
 msgid "The server is unavailable; try again later"
-msgstr ""
-
-#: ../src/protocols/novell/nmuser.c:1916
+msgstr "Server pole saadavalm, proovi hiljem uuesti"
+
+#: ../libgaim/protocols/novell/nmuser.c:1927
 msgid "Cannot add a contact to the same folder twice"
 msgstr ""
 
-#: ../src/protocols/novell/nmuser.c:1919
+#: ../libgaim/protocols/novell/nmuser.c:1930
 msgid "Cannot add yourself"
-msgstr ""
-
-#: ../src/protocols/novell/nmuser.c:1922
+msgstr "Ennast pole võimalik lisada"
+
+#: ../libgaim/protocols/novell/nmuser.c:1933
 msgid "Master archive is misconfigured"
 msgstr ""
 
-#: ../src/protocols/novell/nmuser.c:1926
+#: ../libgaim/protocols/novell/nmuser.c:1937
 msgid "Invalid username or password"
-msgstr ""
-
-#: ../src/protocols/novell/nmuser.c:1929
+msgstr "Vigane kasutajanimi või parool"
+
+#: ../libgaim/protocols/novell/nmuser.c:1940
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
-#: ../src/protocols/novell/nmuser.c:1932
+#: ../libgaim/protocols/novell/nmuser.c:1943
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
 msgstr ""
 
-#: ../src/protocols/novell/nmuser.c:1935
+#: ../libgaim/protocols/novell/nmuser.c:1946
 msgid "You cannot add the same person twice to a conversation"
 msgstr ""
 
-#: ../src/protocols/novell/nmuser.c:1939
+#: ../libgaim/protocols/novell/nmuser.c:1950
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr ""
 
-#: ../src/protocols/novell/nmuser.c:1942
+#: ../libgaim/protocols/novell/nmuser.c:1953
 msgid "You have entered an invalid username"
-msgstr ""
-
-#: ../src/protocols/novell/nmuser.c:1945
+msgstr "Sa sisestasid vigase kasutajanime"
+
+#: ../libgaim/protocols/novell/nmuser.c:1956
 msgid "An error occurred while updating the directory"
 msgstr ""
 
-#: ../src/protocols/novell/nmuser.c:1948
+#: ../libgaim/protocols/novell/nmuser.c:1959
 msgid "Incompatible protocol version"
 msgstr ""
 
-#: ../src/protocols/novell/nmuser.c:1951
+#: ../libgaim/protocols/novell/nmuser.c:1962
 msgid "The user has blocked you"
 msgstr "Sa oled kasutaja poolt blokitud"
 
-#: ../src/protocols/novell/nmuser.c:1954
+#: ../libgaim/protocols/novell/nmuser.c:1965
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr ""
 
-#: ../src/protocols/novell/nmuser.c:1957
+#: ../libgaim/protocols/novell/nmuser.c:1968
 msgid "The user is either offline or you are blocked"
 msgstr "Kasutaja pole võrgus või oled sa blokitud"
 
-#: ../src/protocols/novell/nmuser.c:1960
+#: ../libgaim/protocols/novell/nmuser.c:1971
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:124
+#: ../libgaim/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:247
+#: ../libgaim/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:396
+#: ../libgaim/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr ""
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../src/protocols/novell/novell.c:422
+#: ../libgaim/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Sõnumit pole võimalik saata (%s)."
 
-#: ../src/protocols/novell/novell.c:493 ../src/protocols/novell/novell.c:987
+#: ../libgaim/protocols/novell/novell.c:493
+#: ../libgaim/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Kasutajat pole võimalik kutsuda (%s)."
 
-#: ../src/protocols/novell/novell.c:532
+#: ../libgaim/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:537
+#: ../libgaim/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:584
+#: ../libgaim/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:632
+#: ../libgaim/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:705
+#: ../libgaim/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
-msgstr ""
-
-#: ../src/protocols/novell/novell.c:751 ../src/protocols/novell/novell.c:897
+msgstr "Kasutaja %s (%s) kohta pole võimalik üksikasju hankida."
+
+#: ../libgaim/protocols/novell/novell.c:751
+#: ../libgaim/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:798
+#: ../libgaim/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:851
+#: ../libgaim/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:919
+#: ../libgaim/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1654
+#: ../libgaim/protocols/novell/novell.c:942
+#: ../libgaim/protocols/novell/novell.c:1652
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:1014
+#: ../libgaim/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:1123 ../src/protocols/novell/novell.c:1693
+#: ../libgaim/protocols/novell/novell.c:1121
+#: ../libgaim/protocols/novell/novell.c:1697
 msgid "Error communicating with server. Closing connection."
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:1478
+#: ../libgaim/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Telefoninumber"
 
-#: ../src/protocols/novell/novell.c:1484
+#: ../libgaim/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:1488
+#: ../libgaim/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:1506
+#: ../libgaim/protocols/novell/novell.c:1504
 msgid "User ID"
 msgstr "Kasutaja ID"
 
@@ -8507,41 +9529,41 @@
 #. tag, value);
 #. }
 #.
-#: ../src/protocols/novell/novell.c:1520
+#: ../libgaim/protocols/novell/novell.c:1518
 msgid "Full name"
-msgstr ""
-
-#: ../src/protocols/novell/novell.c:1644
+msgstr "Täisnimi"
+
+#: ../libgaim/protocols/novell/novell.c:1642
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:1669
+#: ../libgaim/protocols/novell/novell.c:1673
 msgid "Unable to make SSL connection to server."
 msgstr "Serverisse pole võimalik SSL-ühendust luua."
 
-#: ../src/protocols/novell/novell.c:1726
+#: ../libgaim/protocols/novell/novell.c:1725
 msgid "Authenticating..."
-msgstr ""
-
-#: ../src/protocols/novell/novell.c:1738
+msgstr "Autentimine..."
+
+#: ../libgaim/protocols/novell/novell.c:1737
 msgid "Unable to connect to server."
-msgstr ""
-
-#: ../src/protocols/novell/novell.c:1741
+msgstr "Serveriga pole võimalik ühenduda."
+
+#: ../libgaim/protocols/novell/novell.c:1740
 msgid "Waiting for response..."
-msgstr ""
-
-#: ../src/protocols/novell/novell.c:1876
+msgstr "Vastuse ootamine..."
+
+#: ../libgaim/protocols/novell/novell.c:1875
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:1904
+#: ../libgaim/protocols/novell/novell.c:1903
 msgid "Invitation to Conversation"
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:1905
+#: ../libgaim/protocols/novell/novell.c:1904
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8549,15 +9571,16 @@
 "Sent: %s"
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:1907
+#: ../libgaim/protocols/novell/novell.c:1906
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:2014
+#. we don't want to reconnect in this case
+#: ../libgaim/protocols/novell/novell.c:2015
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Sind logiti välja kuna sa logisid sisse teisest tööjaamast."
 
-#: ../src/protocols/novell/novell.c:2070
+#: ../libgaim/protocols/novell/novell.c:2072
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -8567,19 +9590,19 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../src/protocols/novell/novell.c:2168
+#: ../libgaim/protocols/novell/novell.c:2170
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:2190
+#: ../libgaim/protocols/novell/novell.c:2198
 msgid "Error. SSL support is not installed."
 msgstr "Viga. SSL-i tugi pole paigaldatud."
 
-#: ../src/protocols/novell/novell.c:2499
+#: ../libgaim/protocols/novell/novell.c:2507
 msgid "This conference has been closed. No more messages can be sent."
-msgstr ""
+msgstr "See konverents on suletud. Rohkem sõnumeid pole võimalik saata."
 
 #. *< type
 #. *< ui_requirement
@@ -8591,115 +9614,182 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/novell/novell.c:3543 ../src/protocols/novell/novell.c:3545
+#: ../libgaim/protocols/novell/novell.c:3552
+#: ../libgaim/protocols/novell/novell.c:3554
 msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr ""
-
-#: ../src/protocols/novell/novell.c:3564
+msgstr "Novell GroupWise Messenger protokolli plugin"
+
+#: ../libgaim/protocols/novell/novell.c:3573
 msgid "Server address"
 msgstr "Serveri aadress"
 
-#: ../src/protocols/novell/novell.c:3568
+#: ../libgaim/protocols/novell/novell.c:3577
 msgid "Server port"
 msgstr "Serveri port"
 
-#: ../src/protocols/oscar/oscar.c:144
+#: ../libgaim/protocols/oscar/flap_connection.c:237
+#: ../libgaim/protocols/yahoo/yahoo.c:2268
+#: ../libgaim/protocols/yahoo/yahoo.c:2426
+#: ../libgaim/protocols/yahoo/ycht.c:481 ../libgaim/proxy.c:570
+#: ../libgaim/proxy.c:1078 ../libgaim/proxy.c:1189 ../libgaim/proxy.c:1289
+#: ../libgaim/proxy.c:1417
+msgid "Server closed the connection."
+msgstr "Server sulges ühenduse."
+
+#: ../libgaim/protocols/oscar/flap_connection.c:239
+#: ../libgaim/protocols/yahoo/yahoo.c:2262
+#: ../libgaim/protocols/yahoo/yahoo.c:2420 ../libgaim/proxy.c:582
+#: ../libgaim/proxy.c:1090 ../libgaim/proxy.c:1201 ../libgaim/proxy.c:1301
+#: ../libgaim/proxy.c:1429
+#, fuzzy, c-format
+msgid ""
+"Lost connection with server:\n"
+"%s"
+msgstr "Puudub ühendus serveriga."
+
+#: ../libgaim/protocols/oscar/flap_connection.c:242 ../libgaim/proxy.c:1107
+#: ../libgaim/proxy.c:1214 ../libgaim/proxy.c:1313 ../libgaim/proxy.c:1385
+#: ../libgaim/proxy.c:1442
+#, fuzzy
+msgid "Received invalid data on connection with server."
+msgstr "Serverisse pole võimalik SSL-ühendust luua."
+
+#: ../libgaim/protocols/oscar/flap_connection.c:244
+#, fuzzy, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr "Tõrge serveriga ühendumisel."
+
+#: ../libgaim/protocols/oscar/odc.c:40
+#, fuzzy
+msgid "The remote user has closed the connection."
+msgstr "%s sulges vestlusakna."
+
+#: ../libgaim/protocols/oscar/odc.c:42
+#, fuzzy
+msgid "The remote user has declined your request."
+msgstr "Sa oled kasutaja poolt blokitud"
+
+#: ../libgaim/protocols/oscar/odc.c:44
+#, fuzzy, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "Tõrge serveriga ühendumisel."
+
+#: ../libgaim/protocols/oscar/odc.c:47
+msgid "Received invalid data on connection with remote user."
+msgstr ""
+
+#: ../libgaim/protocols/oscar/odc.c:49
+msgid "Could not establish a connection with the remote user."
+msgstr ""
+
+#: ../libgaim/protocols/oscar/odc.c:561
+msgid "Direct IM established"
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oft.c:457
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:119
 msgid "Invalid error"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:145
+#: ../libgaim/protocols/oscar/oscar.c:120
 msgid "Invalid SNAC"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:146
+#: ../libgaim/protocols/oscar/oscar.c:121
 msgid "Rate to host"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:147
+#: ../libgaim/protocols/oscar/oscar.c:122
 msgid "Rate to client"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:149
+#: ../libgaim/protocols/oscar/oscar.c:124
 msgid "Service unavailable"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:150
+#: ../libgaim/protocols/oscar/oscar.c:125
 msgid "Service not defined"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:151
+#: ../libgaim/protocols/oscar/oscar.c:126
 msgid "Obsolete SNAC"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:152
+#: ../libgaim/protocols/oscar/oscar.c:127
 msgid "Not supported by host"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:153
+#: ../libgaim/protocols/oscar/oscar.c:128
 msgid "Not supported by client"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:154
+#: ../libgaim/protocols/oscar/oscar.c:129
 msgid "Refused by client"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:155
+#: ../libgaim/protocols/oscar/oscar.c:130
 msgid "Reply too big"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:156
+#: ../libgaim/protocols/oscar/oscar.c:131
 msgid "Responses lost"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:157
+#: ../libgaim/protocols/oscar/oscar.c:132
 msgid "Request denied"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:158
+#: ../libgaim/protocols/oscar/oscar.c:133
 msgid "Busted SNAC payload"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:159
+#: ../libgaim/protocols/oscar/oscar.c:134
 msgid "Insufficient rights"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:160
+#: ../libgaim/protocols/oscar/oscar.c:135
 msgid "In local permit/deny"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:161
+#: ../libgaim/protocols/oscar/oscar.c:136
 msgid "Too evil (sender)"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:162
+#: ../libgaim/protocols/oscar/oscar.c:137
 msgid "Too evil (receiver)"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:163
+#: ../libgaim/protocols/oscar/oscar.c:138
 msgid "User temporarily unavailable"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:164
+#: ../libgaim/protocols/oscar/oscar.c:139
 msgid "No match"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:165
+#: ../libgaim/protocols/oscar/oscar.c:140
 msgid "List overflow"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:166
+#: ../libgaim/protocols/oscar/oscar.c:141
 msgid "Request ambiguous"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:167
+#: ../libgaim/protocols/oscar/oscar.c:142
 msgid "Queue full"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:168
+#: ../libgaim/protocols/oscar/oscar.c:143
 msgid "Not while on AOL"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:348
+#: ../libgaim/protocols/oscar/oscar.c:321
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -8707,149 +9797,158 @@
 "your AIM/ICQ account.)"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:451
+#: ../libgaim/protocols/oscar/oscar.c:424
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:630
+#: ../libgaim/protocols/oscar/oscar.c:603
 msgid "Voice"
 msgstr "Hääl"
 
-#: ../src/protocols/oscar/oscar.c:633
+#: ../libgaim/protocols/oscar/oscar.c:606
 msgid "AIM Direct IM"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:636 ../src/protocols/silc/silc.c:697
-#: ../src/protocols/silc/util.c:510
+#: ../libgaim/protocols/oscar/oscar.c:609 ../libgaim/protocols/silc/silc.c:697
+#: ../libgaim/protocols/silc/util.c:551
 msgid "Chat"
 msgstr "Vestlus"
 
-#: ../src/protocols/oscar/oscar.c:639 ../src/protocols/oscar/oscar.c:5758
+#: ../libgaim/protocols/oscar/oscar.c:612
+#: ../libgaim/protocols/oscar/oscar.c:5852
 msgid "Get File"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:646
+#: ../libgaim/protocols/oscar/oscar.c:619
 msgid "Games"
 msgstr "Mängud"
 
-#: ../src/protocols/oscar/oscar.c:649
+#: ../libgaim/protocols/oscar/oscar.c:622
 msgid "Add-Ins"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:652
+#: ../libgaim/protocols/oscar/oscar.c:625
 msgid "Send Buddy List"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:655
+#: ../libgaim/protocols/oscar/oscar.c:628
 msgid "ICQ Direct Connect"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:658
+#: ../libgaim/protocols/oscar/oscar.c:631
 msgid "AP User"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:661
+#: ../libgaim/protocols/oscar/oscar.c:634
 msgid "ICQ RTF"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:664
+#: ../libgaim/protocols/oscar/oscar.c:637
 msgid "Nihilist"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:667
+#: ../libgaim/protocols/oscar/oscar.c:640
 msgid "ICQ Server Relay"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:670
+#: ../libgaim/protocols/oscar/oscar.c:643
 msgid "Old ICQ UTF8"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:673
+#: ../libgaim/protocols/oscar/oscar.c:646
 msgid "Trillian Encryption"
 msgstr "Trillian krüptimine"
 
-#: ../src/protocols/oscar/oscar.c:676
+#: ../libgaim/protocols/oscar/oscar.c:649
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../src/protocols/oscar/oscar.c:679
+#: ../libgaim/protocols/oscar/oscar.c:652
 msgid "Hiptop"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:682
+#: ../libgaim/protocols/oscar/oscar.c:655
 msgid "Security Enabled"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:685
+#: ../libgaim/protocols/oscar/oscar.c:658
 msgid "Video Chat"
 msgstr "Videovestlus"
 
-#: ../src/protocols/oscar/oscar.c:689
+#: ../libgaim/protocols/oscar/oscar.c:662
 msgid "iChat AV"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:692
+#: ../libgaim/protocols/oscar/oscar.c:665
 msgid "Live Video"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:695
+#: ../libgaim/protocols/oscar/oscar.c:668
 msgid "Camera"
 msgstr "Kaamera"
 
-#: ../src/protocols/oscar/oscar.c:713 ../src/protocols/oscar/oscar.c:5569
+#: ../libgaim/protocols/oscar/oscar.c:686
+#: ../libgaim/protocols/oscar/oscar.c:5629
 msgid "Free For Chat"
 msgstr "Vestluseks vaba"
 
-#: ../src/protocols/oscar/oscar.c:717 ../src/protocols/oscar/oscar.c:5597
+#: ../libgaim/protocols/oscar/oscar.c:690
+#: ../libgaim/protocols/oscar/oscar.c:5661
 msgid "Not Available"
 msgstr "Pole saadaval"
 
-#: ../src/protocols/oscar/oscar.c:719 ../src/protocols/oscar/oscar.c:5587
+#: ../libgaim/protocols/oscar/oscar.c:692
+#: ../libgaim/protocols/oscar/oscar.c:5647
 msgid "Occupied"
 msgstr "Hõivatud"
 
-#: ../src/protocols/oscar/oscar.c:723
+#: ../libgaim/protocols/oscar/oscar.c:696
 msgid "Web Aware"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:727
+#: ../libgaim/protocols/oscar/oscar.c:700
 msgid "Online"
 msgstr "Ühendatud"
 
-#: ../src/protocols/oscar/oscar.c:804 ../src/protocols/oscar/oscar.c:2816
+#: ../libgaim/protocols/oscar/oscar.c:786
+#: ../libgaim/protocols/oscar/oscar.c:2804
 msgid "Warning Level"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:813
+#: ../libgaim/protocols/oscar/oscar.c:795
 msgid "Buddy Comment"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:966
-#, fuzzy
-msgid "Could not connect to authentication server"
-msgstr "Sa oled serverist lahti ühendatud."
-
-#: ../src/protocols/oscar/oscar.c:968
-#, fuzzy
-msgid "Could not connect to BOS server"
+#: ../libgaim/protocols/oscar/oscar.c:931
+#, fuzzy, c-format
+msgid ""
+"Could not connect to authentication server:\n"
+"%s"
+msgstr "Autentimisserverisse pole võimalik ühenduda"
+
+#: ../libgaim/protocols/oscar/oscar.c:939
+#, fuzzy, c-format
+msgid ""
+"Could not connect to BOS server:\n"
+"%s"
 msgstr "Tõrge serveriga ühendumisel."
 
-#: ../src/protocols/oscar/oscar.c:991
+#: ../libgaim/protocols/oscar/oscar.c:979
 msgid "Screen name sent"
 msgstr "Ekraaninimi saadetud"
 
-#: ../src/protocols/oscar/oscar.c:996
+#: ../libgaim/protocols/oscar/oscar.c:984
 msgid "Connection established, cookie sent"
 msgstr "Ühendus saavutatud, küpsis saadetud"
 
 #. TODO: Don't call this with ssi
-#: ../src/protocols/oscar/oscar.c:1027
+#: ../libgaim/protocols/oscar/oscar.c:1013
 msgid "Finalizing connection"
 msgstr "Ühendumise lõpuleviimine"
 
-#: ../src/protocols/oscar/oscar.c:1213
+#: ../libgaim/protocols/oscar/oscar.c:1197
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8857,126 +9956,142 @@
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:1315 ../src/protocols/toc/toc.c:543
-msgid "Incorrect nickname or password."
-msgstr "Vigane hüüdnimi või parool."
-
-#: ../src/protocols/oscar/oscar.c:1320
+#: ../libgaim/protocols/oscar/oscar.c:1282
+#, fuzzy
+msgid "Invalid screen name."
+msgstr "Vigane kasutajanimi."
+
+#: ../libgaim/protocols/oscar/oscar.c:1287
+#: ../libgaim/protocols/yahoo/yahoo.c:1928
+msgid "Incorrect password."
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:1292
 msgid "Your account is currently suspended."
 msgstr ""
 
 #. service temporarily unavailable
-#: ../src/protocols/oscar/oscar.c:1324
+#: ../libgaim/protocols/oscar/oscar.c:1296
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL'i välksõnumiserver pole ajutiselt saadaval."
 
-#: ../src/protocols/oscar/oscar.c:1329
+#: ../libgaim/protocols/oscar/oscar.c:1301
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:1334
+#: ../libgaim/protocols/oscar/oscar.c:1306
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Sinu poolt kasutatava kliendi versioon on liiga vana. Palun hangi uuem "
 "versioon aadressilt %s"
 
-#: ../src/protocols/oscar/oscar.c:1370
+#: ../libgaim/protocols/oscar/oscar.c:1341
 msgid "Could Not Connect"
 msgstr "Pole võimalik ühenduda"
 
-#: ../src/protocols/oscar/oscar.c:1375
+#: ../libgaim/protocols/oscar/oscar.c:1346
 msgid "Received authorization"
 msgstr "Autoriseerimine vastu võetud"
 
-#: ../src/protocols/oscar/oscar.c:1398
+#: ../libgaim/protocols/oscar/oscar.c:1369
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:1412
+#: ../libgaim/protocols/oscar/oscar.c:1383
 msgid "Enter SecurID"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:1413
+#: ../libgaim/protocols/oscar/oscar.c:1384
 msgid "Enter the 6 digit number from the digital display."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:1453 ../src/protocols/oscar/oscar.c:1483
+#: ../libgaim/protocols/oscar/oscar.c:1424
+#: ../libgaim/protocols/oscar/oscar.c:1467
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:1456 ../src/protocols/oscar/oscar.c:1486
+#: ../libgaim/protocols/oscar/oscar.c:1427
+#: ../libgaim/protocols/oscar/oscar.c:1470
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:1572
+#: ../libgaim/protocols/oscar/oscar.c:1556
 #, fuzzy, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Sa oled serverist lahti ühendatud."
 
-#: ../src/protocols/oscar/oscar.c:1575
+#: ../libgaim/protocols/oscar/oscar.c:1559
 msgid "Gaim was unable to get a valid login hash."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:1601
+#: ../libgaim/protocols/oscar/oscar.c:1585
 msgid "Password sent"
 msgstr "Parool saadetud"
 
-#: ../src/protocols/oscar/oscar.c:2147
+#: ../libgaim/protocols/oscar/oscar.c:1641
+msgid "gaim_proxy_connect() failed"
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:2139
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:2157
+#: ../libgaim/protocols/oscar/oscar.c:2148
 msgid "Authorization Request Message:"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:2158
+#: ../libgaim/protocols/oscar/oscar.c:2149
 msgid "Please authorize me!"
 msgstr "Palun autoriseeri mind!"
 
-#: ../src/protocols/oscar/oscar.c:2192
+#: ../libgaim/protocols/oscar/oscar.c:2181
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:2197
+#: ../libgaim/protocols/oscar/oscar.c:2186
 msgid "Request Authorization"
 msgstr "Autoriseerimise küsimine"
 
-#: ../src/protocols/oscar/oscar.c:2199
+#: ../libgaim/protocols/oscar/oscar.c:2188
 #, fuzzy
 msgid "_Request Authorization"
 msgstr "Autoriseerimise küsimine"
 
-#: ../src/protocols/oscar/oscar.c:2243 ../src/protocols/oscar/oscar.c:2251
-#: ../src/protocols/oscar/oscar.c:2359 ../src/protocols/oscar/oscar.c:2383
-#: ../src/protocols/oscar/oscar.c:4998 ../src/protocols/oscar/oscar.c:5050
+#: ../libgaim/protocols/oscar/oscar.c:2229
+#: ../libgaim/protocols/oscar/oscar.c:2236
+#: ../libgaim/protocols/oscar/oscar.c:2343
+#: ../libgaim/protocols/oscar/oscar.c:2367
+#: ../libgaim/protocols/oscar/oscar.c:5054
+#: ../libgaim/protocols/oscar/oscar.c:5106
 msgid "No reason given."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:2250
+#: ../libgaim/protocols/oscar/oscar.c:2235
 msgid "Authorization Denied Message:"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:2361
+#: ../libgaim/protocols/oscar/oscar.c:2345
 #, fuzzy, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr "Kasutaja %s soovib lisada sind oma sõbranimekirja."
 
-#: ../src/protocols/oscar/oscar.c:2371 ../src/protocols/oscar/oscar.c:5010
+#: ../libgaim/protocols/oscar/oscar.c:2355
+#: ../libgaim/protocols/oscar/oscar.c:5066
 msgid "Authorization Request"
 msgstr "Autoriseerimispäring"
 
-#: ../src/protocols/oscar/oscar.c:2383
+#: ../libgaim/protocols/oscar/oscar.c:2367
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8984,17 +10099,17 @@
 "%s"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:2384
+#: ../libgaim/protocols/oscar/oscar.c:2368
 msgid "ICQ authorization denied."
 msgstr ""
 
 #. Someone has granted you authorization
-#: ../src/protocols/oscar/oscar.c:2391
+#: ../libgaim/protocols/oscar/oscar.c:2375
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:2399
+#: ../libgaim/protocols/oscar/oscar.c:2383
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9003,7 +10118,7 @@
 "%s"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:2407
+#: ../libgaim/protocols/oscar/oscar.c:2391
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9012,7 +10127,7 @@
 "%s"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:2415
+#: ../libgaim/protocols/oscar/oscar.c:2399
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -9021,35 +10136,35 @@
 "%s"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:2436
+#: ../libgaim/protocols/oscar/oscar.c:2420
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:2442
+#: ../libgaim/protocols/oscar/oscar.c:2426
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:2446
+#: ../libgaim/protocols/oscar/oscar.c:2430
 #, fuzzy
 msgid "_Decline"
 msgstr "_Kirjeldus"
 
-#: ../src/protocols/oscar/oscar.c:2530
+#: ../libgaim/protocols/oscar/oscar.c:2514
 #, 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] ""
 
-#: ../src/protocols/oscar/oscar.c:2539
+#: ../libgaim/protocols/oscar/oscar.c:2523
 #, 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] ""
 
-#: ../src/protocols/oscar/oscar.c:2548
+#: ../libgaim/protocols/oscar/oscar.c:2532
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -9058,255 +10173,261 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/protocols/oscar/oscar.c:2557
+#: ../libgaim/protocols/oscar/oscar.c:2541
 #, 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] ""
 
-#: ../src/protocols/oscar/oscar.c:2566
+#: ../libgaim/protocols/oscar/oscar.c:2550
 #, 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] ""
 
-#: ../src/protocols/oscar/oscar.c:2575
+#: ../libgaim/protocols/oscar/oscar.c:2559
 #, 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."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/protocols/oscar/oscar.c:2631
+#: ../libgaim/protocols/oscar/oscar.c:2615
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:2692
+#: ../libgaim/protocols/oscar/oscar.c:2676
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
 #. Data is assumed to be the destination sn
-#: ../src/protocols/oscar/oscar.c:2728
+#: ../libgaim/protocols/oscar/oscar.c:2712
 #, c-format
 msgid "Unable to send message: %s"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:2728 ../src/protocols/oscar/oscar.c:2733
-#: ../src/protocols/oscar/oscar.c:2791 ../src/protocols/oscar/oscar.c:2795
+#: ../libgaim/protocols/oscar/oscar.c:2712
+#: ../libgaim/protocols/oscar/oscar.c:2717
+#: ../libgaim/protocols/oscar/oscar.c:2779
+#: ../libgaim/protocols/oscar/oscar.c:2783
 msgid "Unknown reason."
 msgstr "Põhjus teadmata."
 
-#: ../src/protocols/oscar/oscar.c:2731
-#: ../src/protocols/sametime/sametime.c:2370
+#: ../libgaim/protocols/oscar/oscar.c:2715
+#: ../libgaim/protocols/sametime/sametime.c:2363
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Kasutajale %s pole võimalik sõnumit saata:"
 
-#: ../src/protocols/oscar/oscar.c:2791
+#: ../libgaim/protocols/oscar/oscar.c:2779
 #, c-format
 msgid "User information not available: %s"
 msgstr "Kasutajateave pole saadaval: %s"
 
-#: ../src/protocols/oscar/oscar.c:2794
+#: ../libgaim/protocols/oscar/oscar.c:2782
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Kasutajateave %s kohta pole saadaval:"
 
-#: ../src/protocols/oscar/oscar.c:2820
+#: ../libgaim/protocols/oscar/oscar.c:2808
 msgid "Online Since"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:2825
-#: ../src/protocols/yahoo/yahoo_profile.c:1159
+#: ../libgaim/protocols/oscar/oscar.c:2813
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1174
 msgid "Member Since"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:2830
+#: ../libgaim/protocols/oscar/oscar.c:2818
 msgid "Capabilities"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:2848
+#: ../libgaim/protocols/oscar/oscar.c:2836
 msgid "Available Message"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:2937
+#: ../libgaim/protocols/oscar/oscar.c:2936
 msgid "Your AIM connection may be lost."
 msgstr ""
 
 #. The conversion failed!
-#: ../src/protocols/oscar/oscar.c:3118
+#: ../libgaim/protocols/oscar/oscar.c:3117
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:3336
+#: ../libgaim/protocols/oscar/oscar.c:3338
 msgid "Rate limiting error."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:3337
+#: ../libgaim/protocols/oscar/oscar.c:3339
 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 ""
 
-#: ../src/protocols/oscar/oscar.c:3409
+#: ../libgaim/protocols/oscar/oscar.c:3411
 msgid "You have been signed off for an unknown reason."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:3422 ../src/protocols/toc/toc.c:971
+#: ../libgaim/protocols/oscar/oscar.c:3424 ../libgaim/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:3640 ../src/protocols/silc/util.c:542
+#: ../libgaim/protocols/oscar/oscar.c:3645
+#: ../libgaim/protocols/silc/util.c:583
 msgid "Mobile Phone"
 msgstr "Mobiiltelefon"
 
-#: ../src/protocols/oscar/oscar.c:3657
+#: ../libgaim/protocols/oscar/oscar.c:3672
 msgid "Personal Web Page"
 msgstr "Isiklik veebileht"
 
-#: ../src/protocols/oscar/oscar.c:3661
+#: ../libgaim/protocols/oscar/oscar.c:3676
+#: ../libgaim/protocols/qq/buddy_info.c:38
 msgid "Additional Information"
 msgstr "Täiendavad andmed"
 
-#: ../src/protocols/oscar/oscar.c:3670 ../src/protocols/oscar/oscar.c:3678
+#: ../libgaim/protocols/oscar/oscar.c:3685
+#: ../libgaim/protocols/oscar/oscar.c:3693
 msgid "Zip Code"
 msgstr "Indeks"
 
-#: ../src/protocols/oscar/oscar.c:3682
+#: ../libgaim/protocols/oscar/oscar.c:3697
 msgid "Work Information"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:3684
+#: ../libgaim/protocols/oscar/oscar.c:3699
 msgid "Division"
 msgstr "Üksus"
 
-#: ../src/protocols/oscar/oscar.c:3685
+#: ../libgaim/protocols/oscar/oscar.c:3700
 msgid "Position"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:3687
+#: ../libgaim/protocols/oscar/oscar.c:3702
 msgid "Web Page"
 msgstr "Veebileht"
 
-#: ../src/protocols/oscar/oscar.c:3745
+#: ../libgaim/protocols/oscar/oscar.c:3760
 msgid "Pop-Up Message"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:3785
+#: ../libgaim/protocols/oscar/oscar.c:3800
 #, 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] ""
 
-#: ../src/protocols/oscar/oscar.c:3790
+#: ../libgaim/protocols/oscar/oscar.c:3805
 #, fuzzy
 msgid "Screen name"
 msgstr "Ekraaninimi:"
 
-#: ../src/protocols/oscar/oscar.c:3816
+#: ../libgaim/protocols/oscar/oscar.c:3831
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:3837
+#: ../libgaim/protocols/oscar/oscar.c:3852
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:3839
+#: ../libgaim/protocols/oscar/oscar.c:3854
 msgid "Account Confirmation Requested"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:3870
+#: ../libgaim/protocols/oscar/oscar.c:3885
 msgid "Error Changing Account Info"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:3873
+#: ../libgaim/protocols/oscar/oscar.c:3888
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:3876
+#: ../libgaim/protocols/oscar/oscar.c:3891
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:3879
+#: ../libgaim/protocols/oscar/oscar.c:3894
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:3882
+#: ../libgaim/protocols/oscar/oscar.c:3897
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:3885
+#: ../libgaim/protocols/oscar/oscar.c:3900
 #, 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 ""
 
-#: ../src/protocols/oscar/oscar.c:3888
+#: ../libgaim/protocols/oscar/oscar.c:3903
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:3891
+#: ../libgaim/protocols/oscar/oscar.c:3906
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Viga 0x%04x: Tundmatu viga."
 
-#: ../src/protocols/oscar/oscar.c:3901
+#: ../libgaim/protocols/oscar/oscar.c:3916
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
 "%s"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:3902 ../src/protocols/oscar/oscar.c:3909
+#: ../libgaim/protocols/oscar/oscar.c:3917
+#: ../libgaim/protocols/oscar/oscar.c:3924
 msgid "Account Info"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:3907
+#: ../libgaim/protocols/oscar/oscar.c:3922
 #, fuzzy, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Kanali %s teema on: %s"
 
-#: ../src/protocols/oscar/oscar.c:4070
+#: ../libgaim/protocols/oscar/oscar.c:4097
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:4310
+#: ../libgaim/protocols/oscar/oscar.c:4349
 msgid "Unable to set AIM profile."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:4311
+#: ../libgaim/protocols/oscar/oscar.c:4350
 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 ""
 
-#: ../src/protocols/oscar/oscar.c:4325
+#: ../libgaim/protocols/oscar/oscar.c:4364
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -9317,11 +10438,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/protocols/oscar/oscar.c:4330
+#: ../libgaim/protocols/oscar/oscar.c:4369
 msgid "Profile too long."
 msgstr "Profiil on liiga pikk."
 
-#: ../src/protocols/oscar/oscar.c:4377
+#: ../libgaim/protocols/oscar/oscar.c:4413
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -9332,11 +10453,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/protocols/oscar/oscar.c:4382
+#: ../libgaim/protocols/oscar/oscar.c:4418
 msgid "Away message too long."
 msgstr "Eemaloleku teade on liiga pikk."
 
-#: ../src/protocols/oscar/oscar.c:4451
+#: ../libgaim/protocols/oscar/oscar.c:4487
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9344,40 +10465,45 @@
 "spaces, or contain only numbers."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:4453 ../src/protocols/oscar/oscar.c:4856
-#: ../src/protocols/oscar/oscar.c:4870
+#: ../libgaim/protocols/oscar/oscar.c:4489
+#: ../libgaim/protocols/oscar/oscar.c:4902
+#: ../libgaim/protocols/oscar/oscar.c:4916
 msgid "Unable To Add"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:4559
+#: ../libgaim/protocols/oscar/oscar.c:4593
 msgid "Unable To Retrieve Buddy List"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:4560
+#: ../libgaim/protocols/oscar/oscar.c:4594
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:4754 ../src/protocols/oscar/oscar.c:4755
-#: ../src/protocols/oscar/oscar.c:4760 ../src/protocols/oscar/oscar.c:4914
-#: ../src/protocols/oscar/oscar.c:4915 ../src/protocols/oscar/oscar.c:4920
+#: ../libgaim/protocols/oscar/oscar.c:4797
+#: ../libgaim/protocols/oscar/oscar.c:4798
+#: ../libgaim/protocols/oscar/oscar.c:4803
+#: ../libgaim/protocols/oscar/oscar.c:4970
+#: ../libgaim/protocols/oscar/oscar.c:4971
+#: ../libgaim/protocols/oscar/oscar.c:4976
 msgid "Orphans"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:4854
+#: ../libgaim/protocols/oscar/oscar.c:4900
 #, 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 ""
 
-#: ../src/protocols/oscar/oscar.c:4854 ../src/protocols/oscar/oscar.c:4868
+#: ../libgaim/protocols/oscar/oscar.c:4900
+#: ../libgaim/protocols/oscar/oscar.c:4914
 msgid "(no name)"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:4868
+#: ../libgaim/protocols/oscar/oscar.c:4914
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -9385,18 +10511,18 @@
 "buddy list."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:4951
+#: ../libgaim/protocols/oscar/oscar.c:5007
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:4957
+#: ../libgaim/protocols/oscar/oscar.c:5013
 msgid "Authorization Given"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5001
+#: ../libgaim/protocols/oscar/oscar.c:5057
 #, fuzzy, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9404,17 +10530,17 @@
 msgstr "Kasutaja %s soovib lisada sind oma sõbranimekirja."
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:5046
+#: ../libgaim/protocols/oscar/oscar.c:5102
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5047
+#: ../libgaim/protocols/oscar/oscar.c:5103
 msgid "Authorization Granted"
 msgstr ""
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:5050
+#: ../libgaim/protocols/oscar/oscar.c:5106
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9422,176 +10548,182 @@
 "%s"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5051
+#: ../libgaim/protocols/oscar/oscar.c:5107
 msgid "Authorization Denied"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5087 ../src/protocols/toc/toc.c:1372
+#: ../libgaim/protocols/oscar/oscar.c:5143 ../libgaim/protocols/toc/toc.c:1378
 msgid "_Exchange:"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5127
+#: ../libgaim/protocols/oscar/oscar.c:5183
 msgid "Invalid chat name specified."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5197
+#: ../libgaim/protocols/oscar/oscar.c:5253
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5355
+#: ../libgaim/protocols/oscar/oscar.c:5415
 msgid "<i>(retrieving)</i>"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5660
+#: ../libgaim/protocols/oscar/oscar.c:5728
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Sõbrakommentaar %s kohta"
 
-#: ../src/protocols/oscar/oscar.c:5661
+#: ../libgaim/protocols/oscar/oscar.c:5729
 msgid "Buddy Comment:"
 msgstr "Sõbrakommentaar:"
 
-#: ../src/protocols/oscar/oscar.c:5707
+#: ../libgaim/protocols/oscar/oscar.c:5775
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5711
+#: ../libgaim/protocols/oscar/oscar.c:5779
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5715
+#: ../libgaim/protocols/oscar/oscar.c:5783
+#: ../libgaim/protocols/oscar/peer.c:990
 #, fuzzy
 msgid "_Connect"
-msgstr "Ühendu _uuesti"
-
-#: ../src/protocols/oscar/oscar.c:5728
+msgstr "Ü_hendu"
+
+#: ../libgaim/protocols/oscar/oscar.c:5817
+#, fuzzy
+msgid "Get AIM Info"
+msgstr "Hangi a_ndmed"
+
+#: ../libgaim/protocols/oscar/oscar.c:5823
 msgid "Edit Buddy Comment"
 msgstr "Redigeeri sõbrakommentaari"
 
-#: ../src/protocols/oscar/oscar.c:5735
+#: ../libgaim/protocols/oscar/oscar.c:5831
 msgid "Get Status Msg"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5750
+#: ../libgaim/protocols/oscar/oscar.c:5844
 msgid "Direct IM"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5770
+#: ../libgaim/protocols/oscar/oscar.c:5866
 msgid "Re-request Authorization"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5827
+#: ../libgaim/protocols/oscar/oscar.c:5925
 #, fuzzy
 msgid "Require authorization"
 msgstr "Autoriseerimise küsimine"
 
-#: ../src/protocols/oscar/oscar.c:5830
+#: ../libgaim/protocols/oscar/oscar.c:5928
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5835
+#: ../libgaim/protocols/oscar/oscar.c:5933
 #, fuzzy
 msgid "ICQ Privacy Options"
 msgstr "Proksi valikud"
 
-#: ../src/protocols/oscar/oscar.c:5852
+#: ../libgaim/protocols/oscar/oscar.c:5950
 msgid "The new formatting is invalid."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5853
+#: ../libgaim/protocols/oscar/oscar.c:5951
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5860
+#: ../libgaim/protocols/oscar/oscar.c:5958
 msgid "New screen name formatting:"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5916
+#: ../libgaim/protocols/oscar/oscar.c:6014
 msgid "Change Address To:"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5961
+#: ../libgaim/protocols/oscar/oscar.c:6059
 msgid "<i>you are not waiting for authorization</i>"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5964
+#: ../libgaim/protocols/oscar/oscar.c:6062
 msgid "You are awaiting authorization from the following buddies"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5965
+#: ../libgaim/protocols/oscar/oscar.c:6063
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5982
+#: ../libgaim/protocols/oscar/oscar.c:6080
 msgid "Find Buddy by E-Mail"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5983
+#: ../libgaim/protocols/oscar/oscar.c:6081
 msgid "Search for a buddy by e-mail address"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5984
+#: ../libgaim/protocols/oscar/oscar.c:6082
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:6153
+#: ../libgaim/protocols/oscar/oscar.c:6251
 msgid "Set User Info (URL)..."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:6164
+#: ../libgaim/protocols/oscar/oscar.c:6262
 msgid "Change Password (URL)"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:6168
+#: ../libgaim/protocols/oscar/oscar.c:6266
 msgid "Configure IM Forwarding (URL)"
 msgstr ""
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:6178
+#: ../libgaim/protocols/oscar/oscar.c:6276
 #, fuzzy
 msgid "Set Privacy Options..."
 msgstr "Privaatsus kontole:"
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:6185
+#: ../libgaim/protocols/oscar/oscar.c:6283
 msgid "Format Screen Name..."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:6189
+#: ../libgaim/protocols/oscar/oscar.c:6287
 msgid "Confirm Account"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:6193
+#: ../libgaim/protocols/oscar/oscar.c:6291
 msgid "Display Currently Registered E-Mail Address"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:6197
+#: ../libgaim/protocols/oscar/oscar.c:6295
 msgid "Change Currently Registered E-Mail Address..."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:6204
+#: ../libgaim/protocols/oscar/oscar.c:6302
 msgid "Show Buddies Awaiting Authorization"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:6210
+#: ../libgaim/protocols/oscar/oscar.c:6308
 msgid "Search for Buddy by E-Mail Address..."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:6215
+#: ../libgaim/protocols/oscar/oscar.c:6313
 msgid "Search for Buddy by Information"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:6281
+#: ../libgaim/protocols/oscar/oscar.c:6381
 #, fuzzy
 msgid "Use recent buddies group"
 msgstr "Kasutaja pole grupis"
 
-#: ../src/protocols/oscar/oscar.c:6284
+#: ../libgaim/protocols/oscar/oscar.c:6384
 #, fuzzy
 msgid "Show how long you have been idle"
 msgstr "Lubab sul käsitsi määrata, kui kaua sa oled jõude olnud"
@@ -9606,165 +10738,932 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:6409 ../src/protocols/oscar/oscar.c:6411
+#: ../libgaim/protocols/oscar/oscar.c:6510
+#: ../libgaim/protocols/oscar/oscar.c:6512
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ protokolli plugin"
 
-#: ../src/protocols/oscar/oscar.c:6430
-msgid "Auth host"
-msgstr "Autentimishost"
-
-#: ../src/protocols/oscar/oscar.c:6433
-msgid "Auth port"
-msgstr "Autentimisport"
-
-#: ../src/protocols/oscar/oscar.c:6436 ../src/protocols/zephyr/zephyr.c:2920
+#: ../libgaim/protocols/oscar/oscar.c:6537
+#: ../libgaim/protocols/yahoo/yahoo.c:3950
+#: ../libgaim/protocols/zephyr/zephyr.c:2980
 msgid "Encoding"
 msgstr "Kooditabel"
 
-#: ../src/protocols/oscar/oscar.c:6441
-msgid ""
-"Always use AIM/ICQ proxy server\n"
+#: ../libgaim/protocols/oscar/oscar.c:6541
+msgid ""
+"Always use AIM/ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:415
-#, fuzzy
+#: ../libgaim/protocols/oscar/peer.c:623
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr ""
+
+#: ../libgaim/protocols/oscar/peer.c:703 ../libgaim/protocols/oscar/peer.c:738
+#, fuzzy, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr "Tõrge serveriga ühendumisel."
+
+#: ../libgaim/protocols/oscar/peer.c:803
+msgid "Attempting to connect via proxy server."
+msgstr "Proovitakse ühenduda proksi serveri kaudu."
+
+#: ../libgaim/protocols/oscar/peer.c:980
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr ""
+
+#: ../libgaim/protocols/oscar/peer.c:984
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:37
+#, fuzzy
+msgid "Primary Information"
+msgstr "Serveri andmed"
+
+#: ../libgaim/protocols/qq/buddy_info.c:39
+#, fuzzy
+msgid "Personal Introduction"
+msgstr "Isiklik veebileht"
+
+#: ../libgaim/protocols/qq/buddy_info.c:40
+msgid "QQ Number"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:45
+#, fuzzy
+msgid "Country/Region"
+msgstr "Riik"
+
+#: ../libgaim/protocols/qq/buddy_info.c:46
+msgid "Province/State"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:48
+msgid "Horoscope Symbol"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:50
+msgid "Zodiac Sign"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:51
+msgid "Blood Type"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:52
+#, fuzzy
+msgid "College"
+msgstr "Ahen_da"
+
+#: ../libgaim/protocols/qq/buddy_info.c:53
+#, fuzzy
+msgid "Email"
+msgstr "E-post"
+
+#: ../libgaim/protocols/qq/buddy_info.c:55
+#, fuzzy
+msgid "Zipcode"
+msgstr "Indeks"
+
+#: ../libgaim/protocols/qq/buddy_info.c:56
+#, fuzzy
+msgid "Cellphone Number"
+msgstr "Telefoninumber"
+
+#: ../libgaim/protocols/qq/buddy_info.c:57
+#, fuzzy
+msgid "Phone Number"
+msgstr "Telefoninumber"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Aquarius"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+#, fuzzy
+msgid "Pisces"
+msgstr "Lemmikloomad"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+#, fuzzy
+msgid "Aries"
+msgstr "Aadress"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+#, fuzzy
+msgid "Taurus"
+msgstr "Türgi"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+#, fuzzy
+msgid "Gemini"
+msgstr "Saksa"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+#, fuzzy
+msgid "Cancer"
+msgstr "Loobu"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Leo"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Virgo"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Libra"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Scorpio"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Sagittarius"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Capricorn"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Rat"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Ox"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+#, fuzzy
+msgid "Tiger"
+msgstr "Tiitel"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Rabbit"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Dragon"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+#, fuzzy
+msgid "Snake"
+msgstr "Salvestamine"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+#, fuzzy
+msgid "Horse"
+msgstr "Hostinimi"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Goat"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+#, fuzzy
+msgid "Monkey"
+msgstr "Puudub"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+#, fuzzy
+msgid "Rooster"
+msgstr "Registreeri"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Dog"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Pig"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:76
+#, fuzzy
+msgid "Other"
+msgstr "Opera"
+
+#: ../libgaim/protocols/qq/buddy_info.c:477
+#: ../libgaim/protocols/qq/buddy_info.c:478
+#, fuzzy
+msgid "Modify my information"
+msgstr "Sõbra andmed"
+
+#: ../libgaim/protocols/qq/buddy_info.c:479
+#, fuzzy
+msgid "Update my information"
+msgstr "Kasutaja andmed"
+
+#: ../libgaim/protocols/qq/buddy_info.c:502
+#, fuzzy
+msgid "Your information has been updated"
+msgstr "Sinu parool on muudetud."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:205
+#: ../libgaim/protocols/qq/group_opt.c:133
+#, c-format
+msgid "You rejected %d's request"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:206
+#: ../libgaim/protocols/qq/group_opt.c:134
+msgid "Input your reason:"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:208
+msgid "Reject request"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:209
+#: ../libgaim/protocols/qq/group_opt.c:137
+msgid "Sorry, you are not my type..."
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:210
+#: ../libgaim/protocols/qq/group_im.c:134
+#: ../libgaim/protocols/qq/group_opt.c:123
+#: ../libgaim/protocols/qq/sys_msg.c:83 ../libgaim/protocols/qq/sys_msg.c:226
+#, fuzzy
+msgid "Reject"
+msgstr "Algväärtusta"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:270
+msgid "Add buddy with auth request fails"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:301
+msgid "You have successfully removed a buddy"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:329
+msgid "You have successfully removed yourself from a buddy"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:393
+#, fuzzy, c-format
+msgid "User %d needs authentication"
+msgstr "Autentimise alustamine"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:395
+#: ../libgaim/protocols/qq/group_join.c:132
+msgid "Input request here"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:396
+#: ../libgaim/protocols/qq/group_join.c:133
+#, fuzzy
+msgid "Would you be my friend?"
+msgstr "Kas sa soovid seda üle kirjutada?"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:397
+#: ../libgaim/protocols/qq/group_join.c:134
+#: ../libgaim/protocols/qq/group_opt.c:138
+#: ../libgaim/protocols/qq/sendqueue.c:198
+#, fuzzy
+msgid "Send"
+msgstr "_Saada"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:404
+#, fuzzy, c-format
+msgid "You have added %d in buddy list"
+msgstr "%s lisas sinu oma sõbranimekirja."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:501
+#, fuzzy
+msgid "QQid Error"
+msgstr "Lugemise viga"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:502
+#, fuzzy
+msgid "Invalid QQid"
+msgstr "Vigane ID"
+
+#: ../libgaim/protocols/qq/group.c:63
+msgid "ID: "
+msgstr ""
+
+#: ../libgaim/protocols/qq/group.c:96
+#, fuzzy
+msgid "Group ID"
+msgstr "Grupp:"
+
+#: ../libgaim/protocols/qq/group.c:98
+#, fuzzy
+msgid "Creator"
+msgstr "Algata"
+
+#: ../libgaim/protocols/qq/group.c:101
+#, fuzzy
+msgid "Group Description"
+msgstr "Kirjeldus"
+
+#: ../libgaim/protocols/qq/group.c:107
+#, fuzzy
+msgid "Auth"
+msgstr "Autoriseeri"
+
+#: ../libgaim/protocols/qq/group.c:117
+msgid "QQ Qun"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group.c:118
+msgid "Please input external group ID"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group.c:119
+msgid "You can only search for permanent QQ groups\n"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:120
+#, fuzzy, c-format
+msgid "User %d applied to join group %d"
+msgstr "Kasutaja pole grupis"
+
+#: ../libgaim/protocols/qq/group_im.c:121
+#: ../libgaim/protocols/qq/group_im.c:170
+#: ../libgaim/protocols/qq/sys_msg.c:178
+#, c-format
+msgid "Reason: %s"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:128
+#: ../libgaim/protocols/qq/group_im.c:172
+#: ../libgaim/protocols/qq/group_im.c:212
+#: ../libgaim/protocols/qq/group_im.c:247
+#: ../libgaim/protocols/qq/group_im.c:281
+#: ../libgaim/protocols/qq/group_join.c:227
+#: ../libgaim/protocols/qq/group_join.c:353
+#: ../libgaim/protocols/qq/group_opt.c:228
+#: ../libgaim/protocols/qq/group_opt.c:298
+#: ../libgaim/protocols/qq/group_opt.c:384
+#, fuzzy
+msgid "QQ Qun Operation"
+msgstr "Helide valikud"
+
+#: ../libgaim/protocols/qq/group_im.c:131
+#: ../libgaim/protocols/qq/group_opt.c:125
+#: ../libgaim/protocols/qq/sys_msg.c:85 ../libgaim/protocols/qq/sys_msg.c:228
+msgid "Approve"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:169
+#, c-format
+msgid "You request to join group %d has been rejected by admin %d"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:210
+#, c-format
+msgid "You request to join group %d has been approved by admin %d"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:246
+#, c-format
+msgid "You [%d] has exit group \"%d\""
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:280
+#, c-format
+msgid "You [%d] has been added by group \"%d\""
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:281
+#, fuzzy
+msgid "This group has been added to your buddy list"
+msgstr "%s lisas sinu oma sõbranimekirja."
+
+#: ../libgaim/protocols/qq/group_internal.c:39
+msgid "I am not member"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_internal.c:42
+msgid "I am a member"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_internal.c:45
+msgid "I am applying to join"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_internal.c:48
+msgid "I am the admin"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_internal.c:51
+#, fuzzy
+msgid "Unknown status"
+msgstr "Tundmatu sõnum"
+
+#: ../libgaim/protocols/qq/group_join.c:78
+msgid "This group does not allow others to join"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:227
+msgid "You have successfully exited the group"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:251
+msgid "QQ Group Auth"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:252
+msgid "Your authorization operation has been accepted by the QQ server"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:323
+msgid "You inputted a group id outside the acceptable range"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:354
+#, fuzzy
+msgid "Are you sure to exit this Qun?"
+msgstr "Kas sa soovid kustutada kontot %s?"
+
+#: ../libgaim/protocols/qq/group_join.c:356
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:359
+msgid "Go ahead"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_network.c:88
+#, c-format
+msgid "Code [0x%02X]: %s"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_network.c:89
+#, fuzzy
+msgid "Group Operation Error"
+msgstr "Viga failioperatsioonil"
+
+#: ../libgaim/protocols/qq/group_opt.c:122
+#: ../libgaim/protocols/qq/sys_msg.c:82
+msgid "Do you wanna approve the request?"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:228
+msgid "You have successfully modify Qun member"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:298
+msgid "You have successfully modify Qun information"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:385
+msgid "You have successfully created a Qun"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:387
+#, fuzzy
+msgid "Would you like to set up the Qun details now?"
+msgstr "Kas sa soovid seda üle kirjutada?"
+
+#: ../libgaim/protocols/qq/group_opt.c:388
+#, fuzzy
+msgid "Setup"
+msgstr "_Määra"
+
+#: ../libgaim/protocols/qq/im.c:421
+#, fuzzy
+msgid "System Message"
+msgstr "Süsteemne logi"
+
+#: ../libgaim/protocols/qq/im.c:565
+#, fuzzy
+msgid "Server ACK"
+msgstr "Server"
+
+#: ../libgaim/protocols/qq/im.c:565
+#, fuzzy
+msgid "Send IM fail\n"
+msgstr "Saada e-kiri"
+
+#: ../libgaim/protocols/qq/keep_alive.c:81
+msgid "Keep alive error, seems connection lost!"
+msgstr ""
+
+#: ../libgaim/protocols/qq/login_logout.c:404
+msgid "Request login token error!"
+msgstr ""
+
+#: ../libgaim/protocols/qq/login_logout.c:479
+msgid "Wrong password!"
+msgstr "Vale parool!"
+
+#: ../libgaim/protocols/qq/login_logout.c:482
+msgid "Unable to login, check debug log"
+msgstr ""
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: ../libgaim/protocols/qq/qq.c:137 ../libgaim/protocols/toc/toc.c:173
+#: ../libgaim/protocols/yahoo/yahoo.c:2356
+#: ../libgaim/protocols/yahoo/yahoo.c:2383
+#: ../libgaim/protocols/yahoo/yahoo.c:2490
+#: ../libgaim/protocols/yahoo/yahoo.c:2511
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libgaim/protocols/yahoo/ycht.c:549
+msgid "Unable to connect."
+msgstr "Ühendumine pole võimalik."
+
+#: ../libgaim/protocols/qq/qq.c:283
+msgid "QQ: Available"
+msgstr "QQ: Saadaval"
+
+#: ../libgaim/protocols/qq/qq.c:287
+msgid "QQ: Away"
+msgstr "QQ: Eemal"
+
+#: ../libgaim/protocols/qq/qq.c:291
+msgid "QQ: Invisible"
+msgstr "QQ: Nähtamatu"
+
+#: ../libgaim/protocols/qq/qq.c:295
+msgid "QQ: Offline"
+msgstr "QQ: Ühendamata"
+
+#: ../libgaim/protocols/qq/qq.c:372
+msgid "Invalid name"
+msgstr "Vigane nimi"
+
+#: ../libgaim/protocols/qq/qq.c:442
+msgid "Selection"
+msgstr "Valimine"
+
+#: ../libgaim/protocols/qq/qq.c:445
+msgid "Select a number"
+msgstr "Numbri valimine"
+
+#: ../libgaim/protocols/qq/qq.c:451
+msgid "Faces"
+msgstr "Näod"
+
+#: ../libgaim/protocols/qq/qq.c:456
+msgid "Change Your QQ Face"
+msgstr ""
+
+#: ../libgaim/protocols/qq/qq.c:457
+#, fuzzy
+msgid "Change Face"
+msgstr "Muuda olekut"
+
+#: ../libgaim/protocols/qq/qq.c:458
+#, fuzzy
+msgid "Update"
+msgstr "Viimane uuendus"
+
+#: ../libgaim/protocols/qq/qq.c:512
+#, c-format
+msgid "<b>Current Online</b>: %d<br>\n"
+msgstr "<b>Hetkel ühendatux</b>: %d<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:513
+#, c-format
+msgid "<b>Last Refresh</b>: %s<br>\n"
+msgstr "<b>Viimane värskendus</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:517
+#, c-format
+msgid "<b>Connection Mode</b>: %s<br>\n"
+msgstr "<b>Ühenduse režiim</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:518
+#, c-format
+msgid "<b>Server IP</b>: %s: %d<br>\n"
+msgstr "<b>Serveri IP</b>: %s: %d<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:519
+#, c-format
+msgid "<b>My Public IP</b>: %s<br>\n"
+msgstr "<b>Minu avalik IP</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:524
+#, c-format
+msgid "<b>Login Time</b>: %s<br>\n"
+msgstr "<b>Sisselogimise aeg</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:525
+#, c-format
+msgid "<b>Last Login IP</b>: %s<br>\n"
+msgstr "<b>Viimase sisselogimise IP</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:526
+#, c-format
+msgid "<b>Last Login Time</b>: %s\n"
+msgstr "<b>Viimase sisselogimise aeg</b>: %s\n"
+
+#: ../libgaim/protocols/qq/qq.c:530
+msgid "Login Information"
+msgstr "Sisselogimise andmed"
+
+#: ../libgaim/protocols/qq/qq.c:802
+msgid "Modify My Information"
+msgstr "Minu andmete muutmine"
+
+#: ../libgaim/protocols/qq/qq.c:805
+msgid "Change My Face"
+msgstr "Minu näo muutmine"
+
+#: ../libgaim/protocols/qq/qq.c:808 ../libgaim/protocols/toc/toc.c:1700
+msgid "Change Password"
+msgstr "Muuda parooli"
+
+#: ../libgaim/protocols/qq/qq.c:811
+msgid "Show Login Information"
+msgstr "Sisselogimisandmete näitamine"
+
+#: ../libgaim/protocols/qq/qq.c:837
+msgid "Exit this QQ Qun"
+msgstr ""
+
+#: ../libgaim/protocols/qq/qq.c:922
+msgid "This function has not be implemented yet"
+msgstr ""
+
+#: ../libgaim/protocols/qq/qq.c:922
+#, fuzzy
+msgid "Please wait for new version"
+msgstr "Palun sisesta uus parool"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/protocols/qq/qq.c:1004 ../libgaim/protocols/qq/qq.c:1006
+#, fuzzy
+msgid "QQ Protocol\tPlugin"
+msgstr "IRC protokolli plugin"
+
+#: ../libgaim/protocols/qq/qq.c:1025
+#, fuzzy
+msgid "Login in TCP"
+msgstr "Ühine vestlusega"
+
+#: ../libgaim/protocols/qq/qq.c:1028
+#, fuzzy
+msgid "Login Hidden"
+msgstr "Sisselogimise valikud"
+
+#: ../libgaim/protocols/qq/qq.c:1031
+msgid "QQ Server"
+msgstr "QQ Server"
+
+#: ../libgaim/protocols/qq/qq.c:1034
+msgid "QQ Port"
+msgstr "QQ Port"
+
+#: ../libgaim/protocols/qq/qq_proxy.c:493
+msgid "Socket send error"
+msgstr ""
+
+#: ../libgaim/protocols/qq/qq_proxy.c:496
+msgid "Connection refused"
+msgstr "Ühendus lükati tagasi"
+
+#: ../libgaim/protocols/qq/recv_core.c:304
+msgid "Socket error"
+msgstr "Sokli viga"
+
+#: ../libgaim/protocols/qq/recv_core.c:314
+msgid "Unable to read from socket"
+msgstr "Soklist pole võimalik lugeda"
+
+#: ../libgaim/protocols/qq/send_file.c:706
+#, fuzzy, c-format
+msgid "%d has declined the file %s"
+msgstr "%s määras uueks teemaks: %s"
+
+#: ../libgaim/protocols/qq/send_file.c:709
+#: ../libgaim/protocols/qq/send_file.c:738
+msgid "File Send"
+msgstr "Faili saatmine"
+
+#: ../libgaim/protocols/qq/send_file.c:735
+#, fuzzy, c-format
+msgid "%d canceled the transfer of %s"
+msgstr "%s katkestas faili %s ülekandmise"
+
+#: ../libgaim/protocols/qq/sendqueue.c:167
+msgid "Connection lost!"
+msgstr "Ühendus katkes!"
+
+#. cancel logging progress
+#: ../libgaim/protocols/qq/sendqueue.c:174
+msgid "Login failed, no reply!"
+msgstr ""
+
+#: ../libgaim/protocols/qq/sendqueue.c:179
+msgid "Connection timeout!"
+msgstr "Ühendumine ületas ajapiirangu!"
+
+#: ../libgaim/protocols/qq/sendqueue.c:179
+msgid "User info is not updated"
+msgstr "Kasutaja andmeid ei uuendatud"
+
+#: ../libgaim/protocols/qq/sendqueue.c:194
+msgid "Send packet"
+msgstr "Paketi saatmine"
+
+#: ../libgaim/protocols/qq/sendqueue.c:196
+msgid "Packets lost, send again?"
+msgstr "Pakett läks kaotsi, kas saata uuesti?"
+
+#: ../libgaim/protocols/qq/sys_msg.c:101
+msgid "Do you wanna add this buddy?"
+msgstr ""
+
+#. only need to get value
+#: ../libgaim/protocols/qq/sys_msg.c:153
+#, fuzzy, c-format
+msgid "You have been added by %s"
+msgstr "Sind löödi %s poolt välja (%s)"
+
+#: ../libgaim/protocols/qq/sys_msg.c:156
+#, fuzzy
+msgid "Would like to add him?"
+msgstr "Kas sa soovid seda üle kirjutada?"
+
+#: ../libgaim/protocols/qq/sys_msg.c:162
+#, fuzzy, c-format
+msgid "%s has added you [%s]"
+msgstr "%s logis sisse (%s)"
+
+#: ../libgaim/protocols/qq/sys_msg.c:177
+#, fuzzy, c-format
+msgid "User %s rejected your request"
+msgstr "Sa oled kasutaja poolt blokitud"
+
+#: ../libgaim/protocols/qq/sys_msg.c:197
+#, fuzzy, c-format
+msgid "User %s has approved your request"
+msgstr "Sa oled kasutaja poolt blokitud"
+
+#: ../libgaim/protocols/qq/sys_msg.c:220
+#, fuzzy, c-format
+msgid "%s wanna add you [%s] as friends"
+msgstr "%s soovib saata sulle faili"
+
+#: ../libgaim/protocols/qq/sys_msg.c:221
+#, c-format
+msgid "Message: %s"
+msgstr "Sõnum: %s"
+
+#: ../libgaim/protocols/qq/sys_msg.c:242
+#, fuzzy, c-format
+msgid "%s is not in your buddy list"
+msgstr "%s lisas sinu oma sõbranimekirja."
+
+#: ../libgaim/protocols/qq/sys_msg.c:244
+#, fuzzy
+msgid "Would you like to add him?"
+msgstr "Kas sa soovid seda üle kirjutada?"
+
+#: ../libgaim/protocols/sametime/sametime.c:415
 msgid "Connection closed (writing)"
-msgstr "Tõrge ühendumisel"
-
-#: ../src/protocols/sametime/sametime.c:1264
+msgstr "Ühendus suletud (kirjutamine)"
+
+#: ../libgaim/protocols/sametime/sametime.c:1261
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1265
+#: ../libgaim/protocols/sametime/sametime.c:1262
 #, fuzzy, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1267
+#: ../libgaim/protocols/sametime/sametime.c:1264
 #, c-format
 msgid "Info for Group %s"
 msgstr "Grupi %s andmed"
 
-#: ../src/protocols/sametime/sametime.c:1269
+#: ../libgaim/protocols/sametime/sametime.c:1266
 msgid "Notes Address Book Information"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1301
+#: ../libgaim/protocols/sametime/sametime.c:1298
 #, fuzzy
 msgid "Invite Group to Conference..."
 msgstr "Algata konverents"
 
-#: ../src/protocols/sametime/sametime.c:1311
+#: ../libgaim/protocols/sametime/sametime.c:1308
 msgid "Get Notes Address Book Info"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1464
-#, fuzzy
+#: ../libgaim/protocols/sametime/sametime.c:1461
 msgid "Sending Handshake"
-msgstr "Küpsise saatmine"
-
-#: ../src/protocols/sametime/sametime.c:1469
-#, fuzzy
+msgstr "Käepigistuse saatmine"
+
+#: ../libgaim/protocols/sametime/sametime.c:1466
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "Oodatakse ülekande algust"
-
-#: ../src/protocols/sametime/sametime.c:1474
+msgstr ""
+
+#: ../libgaim/protocols/sametime/sametime.c:1471
 msgid "Handshake Acknowledged, Sending Login"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1479
+#: ../libgaim/protocols/sametime/sametime.c:1476
 msgid "Waiting for Login Acknowledgement"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1484
-#, fuzzy
+#: ../libgaim/protocols/sametime/sametime.c:1481
 msgid "Login Redirected"
-msgstr "Sisselogimise server"
-
-#: ../src/protocols/sametime/sametime.c:1490
+msgstr "Sisselogimine on ümber suunatud"
+
+#: ../libgaim/protocols/sametime/sametime.c:1487
 msgid "Forcing Login"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1494
+#: ../libgaim/protocols/sametime/sametime.c:1491
 msgid "Login Acknowledged"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1499
-#, fuzzy
+#: ../libgaim/protocols/sametime/sametime.c:1496
 msgid "Starting Services"
-msgstr "Autentimise alustamine"
-
-#: ../src/protocols/sametime/sametime.c:1504
-#, fuzzy
+msgstr "Teenuste käivitamine"
+
+#: ../libgaim/protocols/sametime/sametime.c:1501
 msgid "Connected"
-msgstr "Ühendumine"
-
-#: ../src/protocols/sametime/sametime.c:1602
+msgstr "Ühendatud"
+
+#: ../libgaim/protocols/sametime/sametime.c:1599
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1607
+#: ../libgaim/protocols/sametime/sametime.c:1604
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1659
+#: ../libgaim/protocols/sametime/sametime.c:1656
 #, fuzzy
 msgid "Connection reset"
 msgstr "Tõrge ühendumisel"
 
-#: ../src/protocols/sametime/sametime.c:1666
+#: ../libgaim/protocols/sametime/sametime.c:1663
 #, fuzzy, c-format
 msgid "Error reading from socket: %s"
 msgstr "Viga pildi salvestamisel: %s"
 
 #. this is a regular connect, error out
-#: ../src/protocols/sametime/sametime.c:1695
-#: ../src/protocols/sametime/sametime.c:3695
+#: ../libgaim/protocols/sametime/sametime.c:1688
+#: ../libgaim/protocols/sametime/sametime.c:3685
 msgid "Unable to connect to host"
 msgstr "Hostiga pole võimalik ühenduda"
 
-#: ../src/protocols/sametime/sametime.c:1733
+#: ../libgaim/protocols/sametime/sametime.c:1726
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1907
+#: ../libgaim/protocols/sametime/sametime.c:1900
 msgid "Conference Closed"
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:2364
+msgstr "Konverents suletud"
+
+#: ../libgaim/protocols/sametime/sametime.c:2357
 #, fuzzy
 msgid "Unable to send message: "
 msgstr "Sõnumit pole võimalik saata."
 
-#: ../src/protocols/sametime/sametime.c:2925
+#: ../libgaim/protocols/sametime/sametime.c:2914
 #, fuzzy
 msgid "Place Closed"
 msgstr "Tühistatud"
 
-#: ../src/protocols/sametime/sametime.c:3216
+#: ../libgaim/protocols/sametime/sametime.c:3205
 msgid "Microphone"
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:3217
+msgstr "Mikrofon"
+
+#: ../libgaim/protocols/sametime/sametime.c:3206
 msgid "Speakers"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:3218
+#: ../libgaim/protocols/sametime/sametime.c:3207
 msgid "Video Camera"
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:3222
-#, fuzzy
+msgstr "Videokaamera"
+
+#: ../libgaim/protocols/sametime/sametime.c:3211
 msgid "File Transfer"
-msgstr "Failiülekanded"
-
-#: ../src/protocols/sametime/sametime.c:3256
+msgstr "Failiülekanne"
+
+#: ../libgaim/protocols/sametime/sametime.c:3245
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -9773,49 +11672,46 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:3261
+#: ../libgaim/protocols/sametime/sametime.c:3250
 msgid ""
 "\n"
 "<b>External User</b>"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:3367
+#: ../libgaim/protocols/sametime/sametime.c:3356
 #, fuzzy
 msgid "Create conference with user"
 msgstr "Vali jututoaserver, kuhu päring esitada"
 
-#: ../src/protocols/sametime/sametime.c:3368
+#: ../libgaim/protocols/sametime/sametime.c:3357
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:3372
-#, fuzzy
+#: ../libgaim/protocols/sametime/sametime.c:3361
 msgid "New Conference"
-msgstr "Algata konverents"
-
-#: ../src/protocols/sametime/sametime.c:3374
+msgstr "Uus konverents"
+
+#: ../libgaim/protocols/sametime/sametime.c:3363
 msgid "Create"
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:3438
-#, fuzzy
+msgstr "Algata"
+
+#: ../libgaim/protocols/sametime/sametime.c:3427
 msgid "Available Conferences"
-msgstr "Algata konverents"
-
-#: ../src/protocols/sametime/sametime.c:3444
-#, fuzzy
+msgstr "Saadaolevad konverentsid"
+
+#: ../libgaim/protocols/sametime/sametime.c:3433
 msgid "Create New Conference..."
-msgstr "Algata konverents"
-
-#: ../src/protocols/sametime/sametime.c:3451
+msgstr "Uue konverentsi loomine..."
+
+#: ../libgaim/protocols/sametime/sametime.c:3440
 #, fuzzy
 msgid "Invite user to a conference"
 msgstr "Algata konverents"
 
-#: ../src/protocols/sametime/sametime.c:3452
+#: ../libgaim/protocols/sametime/sametime.c:3441
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -9823,188 +11719,181 @@
 "this user to."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:3457
-#, fuzzy
+#: ../libgaim/protocols/sametime/sametime.c:3446
 msgid "Invite to Conference"
-msgstr "Algata konverents"
-
-#: ../src/protocols/sametime/sametime.c:3459
-msgid "Invite"
-msgstr "Kutsu"
-
-#: ../src/protocols/sametime/sametime.c:3547
+msgstr "Konverentsile kutsumine"
+
+#: ../libgaim/protocols/sametime/sametime.c:3536
 #, fuzzy
 msgid "Invite to Conference..."
 msgstr "Algata konverents"
 
-#: ../src/protocols/sametime/sametime.c:3552
+#: ../libgaim/protocols/sametime/sametime.c:3541
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:3599
+#: ../libgaim/protocols/sametime/sametime.c:3588
 msgid "No Sametime Community Server specified"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:3621
+#: ../libgaim/protocols/sametime/sametime.c:3610
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:3626
+#: ../libgaim/protocols/sametime/sametime.c:3615
 msgid "Meanwhile Connection Setup"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:3627
+#: ../libgaim/protocols/sametime/sametime.c:3616
 msgid "No Sametime Community Server Specified"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:4084
+#: ../libgaim/protocols/sametime/sametime.c:4084
 msgid "<b>External User</b><br>"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:4087
-#, fuzzy, c-format
+#: ../libgaim/protocols/sametime/sametime.c:4087
+#, c-format
 msgid "<b>User ID:</b> %s<br>"
-msgstr "<b>%s:</b> %s<br>"
-
-#: ../src/protocols/sametime/sametime.c:4093
-#, fuzzy, c-format
+msgstr "<b>Kasutaja ID:</b> %s<br>"
+
+#: ../libgaim/protocols/sametime/sametime.c:4093
+#, c-format
 msgid "<b>Full Name:</b> %s<br>"
-msgstr "<b>Alias:</b> %s<br>"
-
-#: ../src/protocols/sametime/sametime.c:4099
+msgstr "<b>Täisnimi:</b> %s<br>"
+
+#: ../libgaim/protocols/sametime/sametime.c:4099
 msgid "<b>Last Known Client:</b> "
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:4107
+msgstr "<b>Viimane teadaolev klient:</b>"
+
+#: ../libgaim/protocols/sametime/sametime.c:4107
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Tundmatu (0x%04x)<br>"
 
-#: ../src/protocols/sametime/sametime.c:4114
-#, fuzzy, c-format
+#: ../libgaim/protocols/sametime/sametime.c:4114
+#, c-format
 msgid "<b>Supports:</b> %s<br>"
-msgstr "<b>%s:</b> %s<br>"
-
-#: ../src/protocols/sametime/sametime.c:4120
-#, fuzzy, c-format
+msgstr "<b>Toetatud:</b> %s<br>"
+
+#: ../libgaim/protocols/sametime/sametime.c:4120
+#, c-format
 msgid "<b>Status:</b> %s"
-msgstr "<b>%s:</b> %s"
-
-#: ../src/protocols/sametime/sametime.c:4263
-#: ../src/protocols/sametime/sametime.c:5426
-#, fuzzy
+msgstr "<b>Seisund:</b> %s"
+
+#: ../libgaim/protocols/sametime/sametime.c:4263
+#: ../libgaim/protocols/sametime/sametime.c:5427
 msgid "User Name"
 msgstr "Kasutajanimi"
 
-#: ../src/protocols/sametime/sametime.c:4266
-#: ../src/protocols/sametime/sametime.c:5429
+#: ../libgaim/protocols/sametime/sametime.c:4266
+#: ../libgaim/protocols/sametime/sametime.c:5430
 msgid "Sametime ID"
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:4290
+msgstr "Sametime ID"
+
+#: ../libgaim/protocols/sametime/sametime.c:4290
 msgid "An ambiguous user ID was entered"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:4291
+#: ../libgaim/protocols/sametime/sametime.c:4291
 #, 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 ""
 
-#: ../src/protocols/sametime/sametime.c:4296
+#: ../libgaim/protocols/sametime/sametime.c:4296
 msgid "Select User"
 msgstr "Vali kasutaja"
 
-#: ../src/protocols/sametime/sametime.c:4366
+#: ../libgaim/protocols/sametime/sametime.c:4366
 msgid "Unable to add user: user not found"
 msgstr "Kasutajat pole võimalik lisada: kasutajat ei leitud"
 
-#: ../src/protocols/sametime/sametime.c:4368
+#: ../libgaim/protocols/sametime/sametime.c:4368
 #, 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 ""
 
-#: ../src/protocols/sametime/sametime.c:4373
-#, fuzzy
+#: ../libgaim/protocols/sametime/sametime.c:4373
 msgid "Unable to add user"
-msgstr "Ei suuda soklit lugeda"
-
-#: ../src/protocols/sametime/sametime.c:4945
-#, fuzzy, c-format
+msgstr "Kasutajat pole võimalik lisada"
+
+#: ../libgaim/protocols/sametime/sametime.c:4945
+#, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
-msgstr "Viga pildi salvestamisel: %s"
-
-#: ../src/protocols/sametime/sametime.c:5076
+msgstr ""
+"Viga faili %s lugemisel: \n"
+"%s\n"
+
+#: ../libgaim/protocols/sametime/sametime.c:5077
 #, fuzzy
 msgid "Remotely Stored Buddy List"
 msgstr "Jututoa eemaldamine sinu sõbranimekirjast"
 
-#: ../src/protocols/sametime/sametime.c:5081
+#: ../libgaim/protocols/sametime/sametime.c:5082
 #, fuzzy
 msgid "Buddy List Storage Mode"
 msgstr "Sõbranimekirja sortimine"
 
-#: ../src/protocols/sametime/sametime.c:5084
+#: ../libgaim/protocols/sametime/sametime.c:5085
 #, fuzzy
 msgid "Local Buddy List Only"
 msgstr "_Dokitav sõbranimekiri"
 
-#: ../src/protocols/sametime/sametime.c:5086
+#: ../libgaim/protocols/sametime/sametime.c:5087
 #, fuzzy
 msgid "Merge List from Server"
 msgstr "Sa oled serverist lahti ühendatud."
 
-#: ../src/protocols/sametime/sametime.c:5088
+#: ../libgaim/protocols/sametime/sametime.c:5089
 msgid "Merge and Save List to Server"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5090
+#: ../libgaim/protocols/sametime/sametime.c:5091
 msgid "Synchronize List with Server"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5139
+#: ../libgaim/protocols/sametime/sametime.c:5140
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5178
+#: ../libgaim/protocols/sametime/sametime.c:5179
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5231
-#, fuzzy
+#: ../libgaim/protocols/sametime/sametime.c:5232
 msgid "Unable to add group: group exists"
-msgstr "Gruppi pole võimalik ümber kustutada"
-
-#: ../src/protocols/sametime/sametime.c:5232
+msgstr "Gruppi pole võimalik lisada: grupp on juba olemas"
+
+#: ../libgaim/protocols/sametime/sametime.c:5233
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:5235
-#: ../src/protocols/sametime/sametime.c:5364
-#, fuzzy
+msgstr "Grupp '%s' on sinu sõbraloendis juba olemas."
+
+#: ../libgaim/protocols/sametime/sametime.c:5236
+#: ../libgaim/protocols/sametime/sametime.c:5365
 msgid "Unable to add group"
-msgstr "Gruppi pole võimalik ümber kustutada"
-
-#: ../src/protocols/sametime/sametime.c:5294
+msgstr "Gruppi pole võimalik lisada"
+
+#: ../libgaim/protocols/sametime/sametime.c:5295
 msgid "Possible Matches"
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:5310
+msgstr "Võimalikud vastavused"
+
+#: ../libgaim/protocols/sametime/sametime.c:5311
 msgid "Notes Address Book group results"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5311
+#: ../libgaim/protocols/sametime/sametime.c:5312
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10012,39 +11901,37 @@
 "to your buddy list."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5316
-#, fuzzy
+#: ../libgaim/protocols/sametime/sametime.c:5317
 msgid "Select Notes Address Book"
-msgstr "Tänavaaadress"
-
-#: ../src/protocols/sametime/sametime.c:5358
-#, fuzzy
+msgstr ""
+
+#: ../libgaim/protocols/sametime/sametime.c:5359
 msgid "Unable to add group: group not found"
-msgstr "Ei suuda võrgust lugeda"
-
-#: ../src/protocols/sametime/sametime.c:5360
+msgstr "Gruppi pole võimalik lisada: gruppi ei leitud"
+
+#: ../libgaim/protocols/sametime/sametime.c:5361
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5401
+#: ../libgaim/protocols/sametime/sametime.c:5402
 msgid "Notes Address Book Group"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5402
+#: ../libgaim/protocols/sametime/sametime.c:5403
 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 ""
 
-#: ../src/protocols/sametime/sametime.c:5450
+#: ../libgaim/protocols/sametime/sametime.c:5451
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Otsingutulemused '%s' jaoks"
 
-#: ../src/protocols/sametime/sametime.c:5451
+#: ../libgaim/protocols/sametime/sametime.c:5452
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10052,115 +11939,115 @@
 "buttons below."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5483
+#: ../libgaim/protocols/sametime/sametime.c:5484
 msgid "No matches"
 msgstr "Vastavusi pole"
 
-#: ../src/protocols/sametime/sametime.c:5484
+#: ../libgaim/protocols/sametime/sametime.c:5485
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5488
+#: ../libgaim/protocols/sametime/sametime.c:5489
 msgid "No Matches"
 msgstr "Vastavusi pole"
 
-#: ../src/protocols/sametime/sametime.c:5525
+#: ../libgaim/protocols/sametime/sametime.c:5526
 #, fuzzy
 msgid "Search for a user"
 msgstr "O_tsi stringi:"
 
-#: ../src/protocols/sametime/sametime.c:5526
+#: ../libgaim/protocols/sametime/sametime.c:5527
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5529
+#: ../libgaim/protocols/sametime/sametime.c:5530
 msgid "User Search"
 msgstr "Kasutajaotsing"
 
-#: ../src/protocols/sametime/sametime.c:5541
+#: ../libgaim/protocols/sametime/sametime.c:5542
 msgid "Import Sametime List..."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5545
+#: ../libgaim/protocols/sametime/sametime.c:5546
 msgid "Export Sametime List..."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5549
+#: ../libgaim/protocols/sametime/sametime.c:5550
 #, fuzzy
 msgid "Add Notes Address Book Group..."
 msgstr "/Sõbrad/Lisa _grupp..."
 
-#: ../src/protocols/sametime/sametime.c:5553
+#: ../libgaim/protocols/sametime/sametime.c:5554
 msgid "User Search..."
 msgstr "Kasutajaotsing..."
 
-#: ../src/protocols/sametime/sametime.c:5650
+#: ../libgaim/protocols/sametime/sametime.c:5651
 msgid "Force login (ignore server redirects)"
 msgstr ""
 
 #. pretend to be Sametime Connect
-#: ../src/protocols/sametime/sametime.c:5660
+#: ../libgaim/protocols/sametime/sametime.c:5661
 msgid "Hide client identity"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:52 ../src/protocols/silc/buddy.c:420
-#: ../src/protocols/silc/buddy.c:545 ../src/protocols/silc/buddy.c:711
-#: ../src/protocols/silc/ft.c:338
+#: ../libgaim/protocols/silc/buddy.c:52 ../libgaim/protocols/silc/buddy.c:420
+#: ../libgaim/protocols/silc/buddy.c:545 ../libgaim/protocols/silc/buddy.c:711
+#: ../libgaim/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:53 ../src/protocols/silc/buddy.c:115
-#: ../src/protocols/silc/buddy.c:120 ../src/protocols/silc/buddy.c:124
-#: ../src/protocols/silc/buddy.c:129 ../src/protocols/silc/buddy.c:134
-#: ../src/protocols/silc/buddy.c:139 ../src/protocols/silc/buddy.c:257
+#: ../libgaim/protocols/silc/buddy.c:53 ../libgaim/protocols/silc/buddy.c:115
+#: ../libgaim/protocols/silc/buddy.c:120 ../libgaim/protocols/silc/buddy.c:124
+#: ../libgaim/protocols/silc/buddy.c:129 ../libgaim/protocols/silc/buddy.c:134
+#: ../libgaim/protocols/silc/buddy.c:139 ../libgaim/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:54
+#: ../libgaim/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:116
+#: ../libgaim/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:120
+#: ../libgaim/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:125
+#: ../libgaim/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:130
+#: ../libgaim/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:135
+#: ../libgaim/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:140
+#: ../libgaim/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:258 ../src/protocols/silc/buddy.c:388
-#: ../src/protocols/silc/buddy.c:513
+#: ../libgaim/protocols/silc/buddy.c:258 ../libgaim/protocols/silc/buddy.c:388
+#: ../libgaim/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:294
+#: ../libgaim/protocols/silc/buddy.c:294
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:298
+#: ../libgaim/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -10168,306 +12055,308 @@
 "Remote port: %d"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:311
+#: ../libgaim/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:387 ../src/protocols/silc/buddy.c:422
-#: ../src/protocols/silc/buddy.c:464
+#: ../libgaim/protocols/silc/buddy.c:387 ../libgaim/protocols/silc/buddy.c:422
+#: ../libgaim/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:423
+#: ../libgaim/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:465
+#: ../libgaim/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:512 ../src/protocols/silc/buddy.c:547
-#: ../src/protocols/silc/ops.c:1492 ../src/protocols/silc/ops.c:1503
+#: ../libgaim/protocols/silc/buddy.c:512 ../libgaim/protocols/silc/buddy.c:547
+#: ../libgaim/protocols/silc/ops.c:1492 ../libgaim/protocols/silc/ops.c:1503
 msgid "Get Public Key"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:548 ../src/protocols/silc/ops.c:1493
-#: ../src/protocols/silc/ops.c:1504
+#: ../libgaim/protocols/silc/buddy.c:548 ../libgaim/protocols/silc/ops.c:1493
+#: ../libgaim/protocols/silc/ops.c:1504
 msgid "Cannot fetch the public key"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:634 ../src/protocols/silc/buddy.c:1647
+#: ../libgaim/protocols/silc/buddy.c:634
+#: ../libgaim/protocols/silc/buddy.c:1647
 msgid "Show Public Key"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:635 ../src/protocols/silc/buddy.c:1030
-#: ../src/protocols/silc/chat.c:236
+#: ../libgaim/protocols/silc/buddy.c:635
+#: ../libgaim/protocols/silc/buddy.c:1030 ../libgaim/protocols/silc/chat.c:237
 msgid "Could not load public key"
-msgstr ""
-
-#: ../src/protocols/silc/buddy.c:712 ../src/protocols/silc/ops.c:1087
-#: ../src/protocols/silc/ops.c:1159 ../src/protocols/silc/ops.c:1294
-#: ../src/protocols/silc/ops.c:1295 ../src/protocols/silc/ops.c:1313
+msgstr "Avalikku võtit pole võimalik laadida"
+
+#: ../libgaim/protocols/silc/buddy.c:712 ../libgaim/protocols/silc/ops.c:1087
+#: ../libgaim/protocols/silc/ops.c:1159 ../libgaim/protocols/silc/ops.c:1294
+#: ../libgaim/protocols/silc/ops.c:1295 ../libgaim/protocols/silc/ops.c:1313
 msgid "User Information"
-msgstr ""
-
-#: ../src/protocols/silc/buddy.c:713 ../src/protocols/silc/ops.c:1160
-#: ../src/protocols/silc/ops.c:1314
+msgstr "Kasutaja andmed"
+
+#: ../libgaim/protocols/silc/buddy.c:713 ../libgaim/protocols/silc/ops.c:1160
+#: ../libgaim/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:734
+#: ../libgaim/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:737
+#: ../libgaim/protocols/silc/buddy.c:737
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
 msgstr ""
 
 #. Open file selector to select the public key.
-#: ../src/protocols/silc/buddy.c:1064
+#: ../libgaim/protocols/silc/buddy.c:1064
 msgid "Open..."
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1073
+#: ../libgaim/protocols/silc/buddy.c:1073
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1076
+#: ../libgaim/protocols/silc/buddy.c:1076
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1079
+#: ../libgaim/protocols/silc/buddy.c:1079
 msgid "_Import..."
-msgstr ""
-
-#: ../src/protocols/silc/buddy.c:1175
+msgstr "_Impordi..."
+
+#: ../libgaim/protocols/silc/buddy.c:1175
 msgid "Select correct user"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1177
+#: ../libgaim/protocols/silc/buddy.c:1177
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1179
+#: ../libgaim/protocols/silc/buddy.c:1179
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1467
+#: ../libgaim/protocols/silc/buddy.c:1467
 msgid "Detached"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1471 ../src/protocols/silc/silc.c:55
+#: ../libgaim/protocols/silc/buddy.c:1471 ../libgaim/protocols/silc/silc.c:55
 msgid "Indisposed"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1475 ../src/protocols/silc/silc.c:57
+#: ../libgaim/protocols/silc/buddy.c:1475 ../libgaim/protocols/silc/silc.c:57
 msgid "Wake Me Up"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1477 ../src/protocols/silc/silc.c:49
+#: ../libgaim/protocols/silc/buddy.c:1477 ../libgaim/protocols/silc/silc.c:49
 msgid "Hyper Active"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1479
+#: ../libgaim/protocols/silc/buddy.c:1479
 msgid "Robot"
-msgstr ""
-
-#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:672
-#: ../src/protocols/silc/util.c:473
+msgstr "Robot"
+
+#: ../libgaim/protocols/silc/buddy.c:1486 ../libgaim/protocols/silc/silc.c:672
+#: ../libgaim/protocols/silc/util.c:514
 msgid "Happy"
-msgstr ""
-
-#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:674
-#: ../src/protocols/silc/util.c:475
+msgstr "Õnnelik"
+
+#: ../libgaim/protocols/silc/buddy.c:1488 ../libgaim/protocols/silc/silc.c:674
+#: ../libgaim/protocols/silc/util.c:516
 msgid "Sad"
-msgstr ""
-
-#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:676
-#: ../src/protocols/silc/util.c:477
+msgstr "Kurb"
+
+#: ../libgaim/protocols/silc/buddy.c:1490 ../libgaim/protocols/silc/silc.c:676
+#: ../libgaim/protocols/silc/util.c:518
 msgid "Angry"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:678
-#: ../src/protocols/silc/util.c:479
+#: ../libgaim/protocols/silc/buddy.c:1492 ../libgaim/protocols/silc/silc.c:678
+#: ../libgaim/protocols/silc/util.c:520
 msgid "Jealous"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:680
-#: ../src/protocols/silc/util.c:481
+#: ../libgaim/protocols/silc/buddy.c:1494 ../libgaim/protocols/silc/silc.c:680
+#: ../libgaim/protocols/silc/util.c:522
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:682
-#: ../src/protocols/silc/util.c:483
+#: ../libgaim/protocols/silc/buddy.c:1496 ../libgaim/protocols/silc/silc.c:682
+#: ../libgaim/protocols/silc/util.c:524
 msgid "Invincible"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/util.c:485
+#: ../libgaim/protocols/silc/buddy.c:1498 ../libgaim/protocols/silc/util.c:526
 msgid "In Love"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:686
-#: ../src/protocols/silc/util.c:487
+#: ../libgaim/protocols/silc/buddy.c:1500 ../libgaim/protocols/silc/silc.c:686
+#: ../libgaim/protocols/silc/util.c:528
 msgid "Sleepy"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:688
-#: ../src/protocols/silc/util.c:489
+#: ../libgaim/protocols/silc/buddy.c:1502 ../libgaim/protocols/silc/silc.c:688
+#: ../libgaim/protocols/silc/util.c:530
 msgid "Bored"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:690
-#: ../src/protocols/silc/util.c:491
+#: ../libgaim/protocols/silc/buddy.c:1504 ../libgaim/protocols/silc/silc.c:690
+#: ../libgaim/protocols/silc/util.c:532
 msgid "Excited"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:692
-#: ../src/protocols/silc/util.c:493
+#: ../libgaim/protocols/silc/buddy.c:1506 ../libgaim/protocols/silc/silc.c:692
+#: ../libgaim/protocols/silc/util.c:534
 msgid "Anxious"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1534 ../src/protocols/silc/ops.c:1196
+#: ../libgaim/protocols/silc/buddy.c:1534 ../libgaim/protocols/silc/ops.c:1196
 msgid "User Modes"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1550 ../src/protocols/silc/ops.c:1205
+#: ../libgaim/protocols/silc/buddy.c:1550 ../libgaim/protocols/silc/ops.c:1205
 msgid "Mood"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1555 ../src/protocols/silc/ops.c:1217
+#: ../libgaim/protocols/silc/buddy.c:1555 ../libgaim/protocols/silc/ops.c:1217
 msgid "Preferred Contact"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1560 ../src/protocols/silc/ops.c:1222
+#: ../libgaim/protocols/silc/buddy.c:1560 ../libgaim/protocols/silc/ops.c:1222
 msgid "Preferred Language"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1565 ../src/protocols/silc/ops.c:1227
+#: ../libgaim/protocols/silc/buddy.c:1565 ../libgaim/protocols/silc/ops.c:1227
 msgid "Device"
-msgstr ""
-
-#: ../src/protocols/silc/buddy.c:1570 ../src/protocols/silc/ops.c:1232
-#: ../src/protocols/silc/silc.c:740 ../src/protocols/silc/silc.c:742
+msgstr "Seade"
+
+#: ../libgaim/protocols/silc/buddy.c:1570 ../libgaim/protocols/silc/ops.c:1232
+#: ../libgaim/protocols/silc/silc.c:740 ../libgaim/protocols/silc/silc.c:742
 msgid "Timezone"
-msgstr ""
-
-#: ../src/protocols/silc/buddy.c:1575 ../src/protocols/silc/ops.c:1237
+msgstr "Ajavöönd"
+
+#: ../libgaim/protocols/silc/buddy.c:1575 ../libgaim/protocols/silc/ops.c:1237
 msgid "Geolocation"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1629
+#: ../libgaim/protocols/silc/buddy.c:1629
 msgid "Reset IM Key"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1635
+#: ../libgaim/protocols/silc/buddy.c:1635
 msgid "IM with Key Exchange"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1640
+#: ../libgaim/protocols/silc/buddy.c:1640
 msgid "IM with Password"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1653
+#: ../libgaim/protocols/silc/buddy.c:1653
 msgid "Get Public Key..."
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1660 ../src/protocols/silc/ops.c:1623
+#: ../libgaim/protocols/silc/buddy.c:1660 ../libgaim/protocols/silc/ops.c:1622
 msgid "Kill User"
 msgstr ""
 
-#: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:971
+#: ../libgaim/protocols/silc/buddy.c:1670 ../libgaim/protocols/silc/chat.c:972
 msgid "Draw On Whiteboard"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:39
+#: ../libgaim/protocols/silc/chat.c:39
 msgid "_Passphrase:"
-msgstr ""
-
-#: ../src/protocols/silc/chat.c:80
+msgstr "_Parool:"
+
+#: ../libgaim/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
-msgstr ""
-
-#: ../src/protocols/silc/chat.c:81 ../src/protocols/silc/chat.c:173
+msgstr "Kanalit %s pole võrgus olemas"
+
+#: ../libgaim/protocols/silc/chat.c:81 ../libgaim/protocols/silc/chat.c:174
 msgid "Channel Information"
-msgstr ""
-
-#: ../src/protocols/silc/chat.c:82
+msgstr "Kanali andmed"
+
+#: ../libgaim/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
-msgstr ""
-
-#: ../src/protocols/silc/chat.c:119
+msgstr "Kanali andmeid pole võimalik hankida"
+
+#: ../libgaim/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Kanali nimi:</b> %s"
 
-#: ../src/protocols/silc/chat.c:122
+#: ../libgaim/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Kasutajate arv:</b> %d"
 
-#: ../src/protocols/silc/chat.c:129
+#: ../libgaim/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Kanali asutaja:</b> %s"
 
-#: ../src/protocols/silc/chat.c:138
+#: ../libgaim/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Kanali šiffer:</b> %s"
 
-#: ../src/protocols/silc/chat.c:141
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#: ../libgaim/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
-msgstr ""
-
-#: ../src/protocols/silc/chat.c:146
+msgstr "<br><b>Kanali HMAC:</b> %s"
+
+#: ../libgaim/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Kanali teema:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:151
+#: ../libgaim/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:164
+#: ../libgaim/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Asutaja võtme sõrmejälg:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:165
+#: ../libgaim/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:235
+#: ../libgaim/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
 msgstr ""
 
 #. Add new public key
-#: ../src/protocols/silc/chat.c:290
+#: ../libgaim/protocols/silc/chat.c:291
 msgid "Open Public Key..."
-msgstr ""
-
-#: ../src/protocols/silc/chat.c:399
+msgstr "Avaliku võtme avamine..."
+
+#: ../libgaim/protocols/silc/chat.c:400
 msgid "Channel Passphrase"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:406
+#: ../libgaim/protocols/silc/chat.c:407
 msgid "Channel Public Keys List"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:411
+#: ../libgaim/protocols/silc/chat.c:412
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -10476,323 +12365,318 @@
 "able to join."
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:420 ../src/protocols/silc/chat.c:421
-#: ../src/protocols/silc/chat.c:458 ../src/protocols/silc/chat.c:459
-#: ../src/protocols/silc/chat.c:905
+#: ../libgaim/protocols/silc/chat.c:421 ../libgaim/protocols/silc/chat.c:422
+#: ../libgaim/protocols/silc/chat.c:459 ../libgaim/protocols/silc/chat.c:460
+#: ../libgaim/protocols/silc/chat.c:906
 msgid "Channel Authentication"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:422 ../src/protocols/silc/chat.c:460
+#: ../libgaim/protocols/silc/chat.c:423 ../libgaim/protocols/silc/chat.c:461
 msgid "Add / Remove"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:577
+#: ../libgaim/protocols/silc/chat.c:578
 msgid "Group Name"
 msgstr "Grupinimi"
 
-#: ../src/protocols/silc/chat.c:581 ../src/protocols/silc/ops.c:1908
-#: ../src/protocols/silc/silc.c:948
+#: ../libgaim/protocols/silc/chat.c:582 ../libgaim/protocols/silc/ops.c:1907
+#: ../libgaim/protocols/silc/silc.c:948
 msgid "Passphrase"
-msgstr ""
-
-#: ../src/protocols/silc/chat.c:592
+msgstr "Parool"
+
+#: ../libgaim/protocols/silc/chat.c:593
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:594
+#: ../libgaim/protocols/silc/chat.c:595
 msgid "Add Channel Private Group"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:721
+#: ../libgaim/protocols/silc/chat.c:722
 msgid "User Limit"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:722
+#: ../libgaim/protocols/silc/chat.c:723
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:877
-msgid "Get Info"
-msgstr ""
-
-#: ../src/protocols/silc/chat.c:885
+#: ../libgaim/protocols/silc/chat.c:886
 msgid "Invite List"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:890
+#: ../libgaim/protocols/silc/chat.c:891
 msgid "Ban List"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:898
+#: ../libgaim/protocols/silc/chat.c:899
 msgid "Add Private Group"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:911
+#: ../libgaim/protocols/silc/chat.c:912
 msgid "Reset Permanent"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:916
+#: ../libgaim/protocols/silc/chat.c:917
 msgid "Set Permanent"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:924
+#: ../libgaim/protocols/silc/chat.c:925
 msgid "Set User Limit"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:930
+#: ../libgaim/protocols/silc/chat.c:931
 msgid "Reset Topic Restriction"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:935
+#: ../libgaim/protocols/silc/chat.c:936
 msgid "Set Topic Restriction"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:942
+#: ../libgaim/protocols/silc/chat.c:943
 msgid "Reset Private Channel"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:947
+#: ../libgaim/protocols/silc/chat.c:948
 msgid "Set Private Channel"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:954
+#: ../libgaim/protocols/silc/chat.c:955
 msgid "Reset Secret Channel"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:959
+#: ../libgaim/protocols/silc/chat.c:960
 msgid "Set Secret Channel"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:1033
+#: ../libgaim/protocols/silc/chat.c:1034
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:1037
+#: ../libgaim/protocols/silc/chat.c:1038
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:1096
+#: ../libgaim/protocols/silc/chat.c:1097
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:1098
+#: ../libgaim/protocols/silc/chat.c:1099
 msgid "Join Private Group"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:1099
+#: ../libgaim/protocols/silc/chat.c:1100
 msgid "Cannot join private group"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
+#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1156
 #, fuzzy
 msgid "Call Command"
 msgstr "Käsk"
 
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
+#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1156
 msgid "Cannot call command"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1157
+#: ../libgaim/protocols/silc/chat.c:1295 ../libgaim/protocols/silc/silc.c:1157
 msgid "Unknown command"
 msgstr "Tundmatu käsk"
 
-#: ../src/protocols/silc/ft.c:89 ../src/protocols/silc/ft.c:92
-#: ../src/protocols/silc/ft.c:96 ../src/protocols/silc/ft.c:100
-#: ../src/protocols/silc/ft.c:104 ../src/protocols/silc/ft.c:205
-#: ../src/protocols/silc/ft.c:210 ../src/protocols/silc/ft.c:215
-#: ../src/protocols/silc/ft.c:221 ../src/protocols/silc/ft.c:340
+#: ../libgaim/protocols/silc/ft.c:89 ../libgaim/protocols/silc/ft.c:92
+#: ../libgaim/protocols/silc/ft.c:96 ../libgaim/protocols/silc/ft.c:100
+#: ../libgaim/protocols/silc/ft.c:104 ../libgaim/protocols/silc/ft.c:205
+#: ../libgaim/protocols/silc/ft.c:210 ../libgaim/protocols/silc/ft.c:215
+#: ../libgaim/protocols/silc/ft.c:221 ../libgaim/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr ""
 
-#: ../src/protocols/silc/ft.c:90 ../src/protocols/silc/ft.c:93
-#: ../src/protocols/silc/ft.c:97 ../src/protocols/silc/ft.c:101
-#: ../src/protocols/silc/ft.c:105
+#: ../libgaim/protocols/silc/ft.c:90 ../libgaim/protocols/silc/ft.c:93
+#: ../libgaim/protocols/silc/ft.c:97 ../libgaim/protocols/silc/ft.c:101
+#: ../libgaim/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "Viga faili ülekandmisel"
 
-#: ../src/protocols/silc/ft.c:94
+#: ../libgaim/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr ""
 
-#: ../src/protocols/silc/ft.c:98
+#: ../libgaim/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr ""
 
-#: ../src/protocols/silc/ft.c:102
+#: ../libgaim/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Failiülekande seanssi pole olemas"
 
-#: ../src/protocols/silc/ft.c:206
+#: ../libgaim/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "Pole ühtegi akriivset failiülekandeseanssi"
 
-#: ../src/protocols/silc/ft.c:211
+#: ../libgaim/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "Failiülekanne on juba käivitatud"
 
-#: ../src/protocols/silc/ft.c:216
+#: ../libgaim/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr ""
 
-#: ../src/protocols/silc/ft.c:222
+#: ../libgaim/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Failiülekannet pole võimalik alustada"
 
-#: ../src/protocols/silc/ft.c:341
+#: ../libgaim/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "Faili pole võimalik saata"
 
-#: ../src/protocols/silc/ops.c:555 ../src/protocols/silc/ops.c:564
-#: ../src/protocols/silc/ops.c:573
+#: ../libgaim/protocols/silc/ops.c:554 ../libgaim/protocols/silc/ops.c:563
+#: ../libgaim/protocols/silc/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:639
+#: ../libgaim/protocols/silc/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:643
+#: ../libgaim/protocols/silc/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:676
+#: ../libgaim/protocols/silc/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:684
+#: ../libgaim/protocols/silc/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:713
+#: ../libgaim/protocols/silc/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:743 ../src/protocols/silc/ops.c:748
-#: ../src/protocols/silc/ops.c:753
+#: ../libgaim/protocols/silc/ops.c:742 ../libgaim/protocols/silc/ops.c:747
+#: ../libgaim/protocols/silc/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:774 ../src/protocols/silc/ops.c:779
-#: ../src/protocols/silc/ops.c:784
+#: ../libgaim/protocols/silc/ops.c:773 ../libgaim/protocols/silc/ops.c:778
+#: ../libgaim/protocols/silc/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:830
+#: ../libgaim/protocols/silc/ops.c:829
 msgid "Server signoff"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1017
+#: ../libgaim/protocols/silc/ops.c:1017
 msgid "Personal Information"
-msgstr ""
-
-#: ../src/protocols/silc/ops.c:1040
+msgstr "Isiklikud andmed"
+
+#: ../libgaim/protocols/silc/ops.c:1040
 msgid "Birth Day"
-msgstr ""
-
-#: ../src/protocols/silc/ops.c:1048
+msgstr "Sünnipäev"
+
+#: ../libgaim/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:941
+#: ../libgaim/protocols/silc/ops.c:1052 ../libgaim/protocols/silc/silc.c:941
 msgid "Organization"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1056
+#: ../libgaim/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1080
+#: ../libgaim/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1128
+#: ../libgaim/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1183 ../src/protocols/silc/ops.c:1332
-#: ../src/protocols/yahoo/yahoo_profile.c:1046
-#, fuzzy
+#: ../libgaim/protocols/silc/ops.c:1183 ../libgaim/protocols/silc/ops.c:1332
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1060
 msgid "Real Name"
 msgstr "Tegelik nimi"
 
-#: ../src/protocols/silc/ops.c:1211
+#: ../libgaim/protocols/silc/ops.c:1211
 msgid "Status Text"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1284 ../src/protocols/silc/ops.c:1354
+#: ../libgaim/protocols/silc/ops.c:1284 ../libgaim/protocols/silc/ops.c:1354
 msgid "Public Key Fingerprint"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1285 ../src/protocols/silc/ops.c:1355
+#: ../libgaim/protocols/silc/ops.c:1285 ../libgaim/protocols/silc/ops.c:1355
 msgid "Public Key Babbleprint"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1298
+#: ../libgaim/protocols/silc/ops.c:1298
 msgid "_More..."
 msgstr "_Veel..."
 
-#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1007
+#: ../libgaim/protocols/silc/ops.c:1369 ../libgaim/protocols/silc/silc.c:1007
 msgid "Detach From Server"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1369
+#: ../libgaim/protocols/silc/ops.c:1369
 msgid "Cannot detach"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1380
+#: ../libgaim/protocols/silc/ops.c:1380
 msgid "Cannot set topic"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1412
+#: ../libgaim/protocols/silc/ops.c:1412
 msgid "Failed to change nickname"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1460
+#: ../libgaim/protocols/silc/ops.c:1460
 msgid "Roomlist"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1460
+#: ../libgaim/protocols/silc/ops.c:1460
 msgid "Cannot get room list"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1505
+#: ../libgaim/protocols/silc/ops.c:1505
 msgid "No public key was received"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1518 ../src/protocols/silc/ops.c:1531
+#: ../libgaim/protocols/silc/ops.c:1517 ../libgaim/protocols/silc/ops.c:1530
 msgid "Server Information"
 msgstr "Serveri andmed"
 
-#: ../src/protocols/silc/ops.c:1519
+#: ../libgaim/protocols/silc/ops.c:1518
 msgid "Cannot get server information"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1548 ../src/protocols/silc/ops.c:1557
+#: ../libgaim/protocols/silc/ops.c:1547 ../libgaim/protocols/silc/ops.c:1556
 msgid "Server Statistics"
 msgstr "Serveri statistika"
 
-#: ../src/protocols/silc/ops.c:1549
+#: ../libgaim/protocols/silc/ops.c:1548
 msgid "Cannot get server statistics"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1558
+#: ../libgaim/protocols/silc/ops.c:1557
 msgid "No server statistics available"
 msgstr "Serveri statistika pole saadaval"
 
-#: ../src/protocols/silc/ops.c:1580
+#: ../libgaim/protocols/silc/ops.c:1579
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -10812,113 +12696,113 @@
 "Total router operators: %d\n"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1603
+#: ../libgaim/protocols/silc/ops.c:1602
 msgid "Network Statistics"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1611 ../src/protocols/silc/ops.c:1616
+#: ../libgaim/protocols/silc/ops.c:1610 ../libgaim/protocols/silc/ops.c:1615
 msgid "Ping"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1611
+#: ../libgaim/protocols/silc/ops.c:1610
 msgid "Ping failed"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1616
+#: ../libgaim/protocols/silc/ops.c:1615
 msgid "Ping reply received from server"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1624
+#: ../libgaim/protocols/silc/ops.c:1623
 msgid "Could not kill user"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1708
+#: ../libgaim/protocols/silc/ops.c:1707
 msgid "Error during connecting to SILC Server"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1713
+#: ../libgaim/protocols/silc/ops.c:1712
 msgid "Key Exchange failed"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1722
+#: ../libgaim/protocols/silc/ops.c:1721
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1757
+#: ../libgaim/protocols/silc/ops.c:1756
 msgid "Disconnected by server"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1819 ../src/protocols/silc/ops.c:1866
-#: ../src/protocols/silc/silc.c:199
+#: ../libgaim/protocols/silc/ops.c:1818 ../libgaim/protocols/silc/ops.c:1865
+#: ../libgaim/protocols/silc/silc.c:189
 msgid "Resuming session"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1821
+#: ../libgaim/protocols/silc/ops.c:1820
 msgid "Authenticating connection"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1868
+#: ../libgaim/protocols/silc/ops.c:1867
 msgid "Verifying server public key"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1909
+#: ../libgaim/protocols/silc/ops.c:1908
 msgid "Passphrase required"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1938
+#: ../libgaim/protocols/silc/ops.c:1937
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Tõrge: Versioonid ei klapi, uuenda oma klienti"
 
-#: ../src/protocols/silc/ops.c:1941
+#: ../libgaim/protocols/silc/ops.c:1940
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Tõrge: Teine pool ei toeta või ei usalda sinu avalikku võtit"
 
-#: ../src/protocols/silc/ops.c:1944
+#: ../libgaim/protocols/silc/ops.c:1943
 msgid "Failure: Remote does not support proposed KE group"
 msgstr ""
 
-#: ../src/protocols/silc/ops.c:1947
+#: ../libgaim/protocols/silc/ops.c:1946
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Tõrge: Teine pool ei toeta pakutud šifrit"
 
-#: ../src/protocols/silc/ops.c:1950
+#: ../libgaim/protocols/silc/ops.c:1949
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Tõrge: Teine pool ei toeta pakutud PKCS'i"
 
-#: ../src/protocols/silc/ops.c:1953
+#: ../libgaim/protocols/silc/ops.c:1952
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Tõrge: Teine pool ei toeta pakutud räsifunktsiooni"
 
-#: ../src/protocols/silc/ops.c:1956
+#: ../libgaim/protocols/silc/ops.c:1955
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Tõrge: Teine pool ei toeta pakutud HMAC'i"
 
-#: ../src/protocols/silc/ops.c:1958
+#: ../libgaim/protocols/silc/ops.c:1957
 msgid "Failure: Incorrect signature"
 msgstr "Tõrge: Vigane signatuur"
 
-#: ../src/protocols/silc/ops.c:1960
+#: ../libgaim/protocols/silc/ops.c:1959
 msgid "Failure: Invalid cookie"
 msgstr "Tõrge: Vigane küpsis"
 
-#: ../src/protocols/silc/ops.c:1971
+#: ../libgaim/protocols/silc/ops.c:1970
 msgid "Failure: Authentication failed"
 msgstr "Tõrge: Autentimine nurjus"
 
-#: ../src/protocols/silc/pk.c:103
+#: ../libgaim/protocols/silc/pk.c:103
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 msgstr ""
 
-#: ../src/protocols/silc/pk.c:108
+#: ../libgaim/protocols/silc/pk.c:108
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr ""
 
-#: ../src/protocols/silc/pk.c:112
+#: ../libgaim/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -10927,337 +12811,327 @@
 "%s\n"
 msgstr ""
 
-#: ../src/protocols/silc/pk.c:115 ../src/protocols/silc/pk.c:140
+#: ../libgaim/protocols/silc/pk.c:115 ../libgaim/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr ""
 
-#: ../src/protocols/silc/pk.c:119
+#: ../libgaim/protocols/silc/pk.c:119
 msgid "_View..."
 msgstr ""
 
-#: ../src/protocols/silc/pk.c:141
+#: ../libgaim/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:158
+#: ../libgaim/protocols/silc/silc.c:160
 msgid "Connection failed"
 msgstr "Tõrge ühendumisel"
 
-#: ../src/protocols/silc/silc.c:191
+#: ../libgaim/protocols/silc/silc.c:181
 msgid "Cannot initialize SILC Client connection"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:202
+#: ../libgaim/protocols/silc/silc.c:192
 msgid "Performing key exchange"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:287
+#: ../libgaim/protocols/silc/silc.c:278
 msgid "Out of memory"
 msgstr "Vaba pole piisavalt mälu"
 
-#: ../src/protocols/silc/silc.c:328
+#: ../libgaim/protocols/silc/silc.c:324
 msgid "Cannot initialize SILC protocol"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:335
+#: ../libgaim/protocols/silc/silc.c:331
 #, fuzzy
 msgid "Cannot find/access ~/.silc directory"
 msgstr "Kataloogi pole võimalik saata."
 
 #. Progress
-#: ../src/protocols/silc/silc.c:340
+#: ../libgaim/protocols/silc/silc.c:336
 msgid "Connecting to SILC Server"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:349
+#: ../libgaim/protocols/silc/silc.c:345
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:369
-#, fuzzy
+#: ../libgaim/protocols/silc/silc.c:367
 msgid "Unable to create connection"
-msgstr "Uut ühendust pole võimalik luua."
-
-#: ../src/protocols/silc/silc.c:668
+msgstr "Ühendust pole võimalik luua"
+
+#: ../libgaim/protocols/silc/silc.c:668
 msgid "Your Current Mood"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:684
-#, fuzzy
+#: ../libgaim/protocols/silc/silc.c:684
 msgid "In love"
-msgstr "Eira"
-
-#: ../src/protocols/silc/silc.c:695
+msgstr "Armunud"
+
+#: ../libgaim/protocols/silc/silc.c:695
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:518
+#: ../libgaim/protocols/silc/silc.c:703 ../libgaim/protocols/silc/util.c:559
 msgid "SMS"
 msgstr "SMS"
 
-#: ../src/protocols/silc/silc.c:705 ../src/protocols/silc/util.c:520
+#: ../libgaim/protocols/silc/silc.c:705 ../libgaim/protocols/silc/util.c:561
 msgid "MMS"
 msgstr "MMS"
 
-#: ../src/protocols/silc/silc.c:707
+#: ../libgaim/protocols/silc/silc.c:707
 #, fuzzy
 msgid "Video conferencing"
 msgstr "Algata konverents"
 
-#: ../src/protocols/silc/silc.c:712
+#: ../libgaim/protocols/silc/silc.c:712
 msgid "Your Current Status"
 msgstr "Sinu hetkeolek"
 
-#: ../src/protocols/silc/silc.c:719
+#: ../libgaim/protocols/silc/silc.c:719
 msgid "Online Services"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:722
+#: ../libgaim/protocols/silc/silc.c:722
 msgid "Let others see what services you are using"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:728
+#: ../libgaim/protocols/silc/silc.c:728
 msgid "Let others see what computer you are using"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:735
+#: ../libgaim/protocols/silc/silc.c:735
 msgid "Your VCard File"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:747 ../src/protocols/silc/silc.c:748
+#: ../libgaim/protocols/silc/silc.c:747 ../libgaim/protocols/silc/silc.c:748
 msgid "User Online Status Attributes"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:749
+#: ../libgaim/protocols/silc/silc.c:749
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
 "about yourself."
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:789 ../src/protocols/silc/silc.c:795
-#: ../src/protocols/silc/silc.c:1435
+#: ../libgaim/protocols/silc/silc.c:789 ../libgaim/protocols/silc/silc.c:795
+#: ../libgaim/protocols/silc/silc.c:1434
 msgid "Message of the Day"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:789
+#: ../libgaim/protocols/silc/silc.c:789
 msgid "No Message of the Day available"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:790 ../src/protocols/silc/silc.c:1430
+#: ../libgaim/protocols/silc/silc.c:790 ../libgaim/protocols/silc/silc.c:1429
 msgid "There is no Message of the Day associated with this connection"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:841 ../src/protocols/silc/silc.c:885
-#: ../src/protocols/silc/silc.c:956 ../src/protocols/silc/silc.c:957
-#, fuzzy
+#: ../libgaim/protocols/silc/silc.c:841 ../libgaim/protocols/silc/silc.c:885
+#: ../libgaim/protocols/silc/silc.c:956 ../libgaim/protocols/silc/silc.c:957
 msgid "Create New SILC Key Pair"
-msgstr "Vaikimisi SILC võtmepaar"
-
-#: ../src/protocols/silc/silc.c:841
-#, fuzzy
+msgstr "Uue SILC võtmepaari loomine"
+
+#: ../libgaim/protocols/silc/silc.c:841
 msgid "Passphrases do not match"
-msgstr "Uued paroolid ei klapi omavahel."
-
-#: ../src/protocols/silc/silc.c:885
-#, fuzzy
+msgstr "Paroolid ei klapi omavahel"
+
+#: ../libgaim/protocols/silc/silc.c:885
 msgid "Key Pair Generation failed"
-msgstr "Tõrge: Autentimine nurjus"
-
-#: ../src/protocols/silc/silc.c:924
-#, fuzzy
+msgstr "Tõrge võtmepaari genereerimisel"
+
+#: ../libgaim/protocols/silc/silc.c:924
 msgid "Key length"
-msgstr "Võtme pikkus: \t%d bitti\n"
-
-#: ../src/protocols/silc/silc.c:926
-#, fuzzy
+msgstr "Võtme pikkus"
+
+#: ../libgaim/protocols/silc/silc.c:926
 msgid "Public key file"
 msgstr "Avaliku võtme fail"
 
-#: ../src/protocols/silc/silc.c:928
-#, fuzzy
+#: ../libgaim/protocols/silc/silc.c:928
 msgid "Private key file"
 msgstr "Salajase võtme fail"
 
-#: ../src/protocols/silc/silc.c:951
-#, fuzzy
+#: ../libgaim/protocols/silc/silc.c:951
 msgid "Passphrase (retype)"
-msgstr "Parool saadetud"
-
-#: ../src/protocols/silc/silc.c:958
-#, fuzzy
+msgstr "Parool (uuesti)"
+
+#: ../libgaim/protocols/silc/silc.c:958
 msgid "Generate Key Pair"
-msgstr "Vaikimisi SILC võtmepaar"
-
-#: ../src/protocols/silc/silc.c:1002
+msgstr "Võtmepaari loomine"
+
+#: ../libgaim/protocols/silc/silc.c:1002
 msgid "Online Status"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1011
+#: ../libgaim/protocols/silc/silc.c:1011
 msgid "View Message of the Day"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1015
-#, fuzzy
+#: ../libgaim/protocols/silc/silc.c:1015
 msgid "Create SILC Key Pair..."
-msgstr "Vaikimisi SILC võtmepaar"
-
-#: ../src/protocols/silc/silc.c:1114
+msgstr "SILC võtmepaari loomine..."
+
+#: ../libgaim/protocols/silc/silc.c:1114
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1306
+#: ../libgaim/protocols/silc/silc.c:1305
 msgid "Topic too long"
-msgstr ""
-
-#: ../src/protocols/silc/silc.c:1387
+msgstr "Teema on liiga pikk"
+
+#: ../libgaim/protocols/silc/silc.c:1386
 msgid "You must specify a nick"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1489
+#: ../libgaim/protocols/silc/silc.c:1488
 #, c-format
 msgid "channel %s not found"
-msgstr ""
-
-#: ../src/protocols/silc/silc.c:1494
+msgstr "kanalit %s ei leitud"
+
+#: ../libgaim/protocols/silc/silc.c:1493
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1496
+#: ../libgaim/protocols/silc/silc.c:1495
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1509
+#: ../libgaim/protocols/silc/silc.c:1508
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1539
+#: ../libgaim/protocols/silc/silc.c:1538
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Tundmatu käsk: %s, (võibolla Gaim'i viga)"
 
-#: ../src/protocols/silc/silc.c:1602
+#: ../libgaim/protocols/silc/silc.c:1601
 msgid "part [channel]:  Leave the chat"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1606
+#: ../libgaim/protocols/silc/silc.c:1605
 msgid "leave [channel]:  Leave the chat"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1610
+#: ../libgaim/protocols/silc/silc.c:1609
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;new topic&gt;]:  Teema vaatamine või muutmine"
 
-#: ../src/protocols/silc/silc.c:1615
+#: ../libgaim/protocols/silc/silc.c:1614
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1619
+#: ../libgaim/protocols/silc/silc.c:1618
 msgid "list:  List channels on this network"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1623
+#: ../libgaim/protocols/silc/silc.c:1622
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1627 ../src/protocols/zephyr/zephyr.c:2622
+#: ../libgaim/protocols/silc/silc.c:1626
+#: ../libgaim/protocols/zephyr/zephyr.c:2681
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;hüüdnimi&gt; &lt;sõnum&gt;:  Erasõnumi saatmine kasutajale"
 
-#: ../src/protocols/silc/silc.c:1631
+#: ../libgaim/protocols/silc/silc.c:1630
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;hüüdnimi&gt; [&lt;sõnum&gt;]:  Erasõnumi saatmine kasutajale"
 
-#: ../src/protocols/silc/silc.c:1635
+#: ../libgaim/protocols/silc/silc.c:1634
 msgid "motd:  View the server's Message Of The Day"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1639
+#: ../libgaim/protocols/silc/silc.c:1638
 msgid "detach:  Detach this session"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1643
+#: ../libgaim/protocols/silc/silc.c:1642
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1647
+#: ../libgaim/protocols/silc/silc.c:1646
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1653
+#: ../libgaim/protocols/silc/silc.c:1652
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1657
+#: ../libgaim/protocols/silc/silc.c:1656
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1661
+#: ../libgaim/protocols/silc/silc.c:1660
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1665
+#: ../libgaim/protocols/silc/silc.c:1664
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1669
+#: ../libgaim/protocols/silc/silc.c:1668
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1673
+#: ../libgaim/protocols/silc/silc.c:1672
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1677
+#: ../libgaim/protocols/silc/silc.c:1676
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1681
+#: ../libgaim/protocols/silc/silc.c:1680
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1685
+#: ../libgaim/protocols/silc/silc.c:1684
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1689
+#: ../libgaim/protocols/silc/silc.c:1688
 msgid "info [server]:  View server administrative details"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1693
+#: ../libgaim/protocols/silc/silc.c:1692
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1697
+#: ../libgaim/protocols/silc/silc.c:1696
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1701
+#: ../libgaim/protocols/silc/silc.c:1700
 msgid "stats:  View server and network statistics"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1705
+#: ../libgaim/protocols/silc/silc.c:1704
 msgid "ping:  Send PING to the connected server"
-msgstr ""
-
-#: ../src/protocols/silc/silc.c:1710
+msgstr "ping:  Ühendatud serverile PING-i saatmine"
+
+#: ../libgaim/protocols/silc/silc.c:1709
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1714
+#: ../libgaim/protocols/silc/silc.c:1713
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -11272,115 +13146,111 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../src/protocols/silc/silc.c:1823
+#: ../libgaim/protocols/silc/silc.c:1823
 msgid "SILC Protocol Plugin"
 msgstr "SILC protokolli plugin"
 
 #. *  description
-#: ../src/protocols/silc/silc.c:1825
+#: ../libgaim/protocols/silc/silc.c:1825
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) protokoll"
 
-#: ../src/protocols/silc/silc.c:1862
-#, fuzzy
+#: ../libgaim/protocols/silc/silc.c:1862
 msgid "Public Key file"
 msgstr "Avaliku võtme fail"
 
-#: ../src/protocols/silc/silc.c:1866
-#, fuzzy
+#: ../libgaim/protocols/silc/silc.c:1866
 msgid "Private Key file"
 msgstr "Salajase võtme fail"
 
-#: ../src/protocols/silc/silc.c:1876
+#: ../libgaim/protocols/silc/silc.c:1876
 msgid "Cipher"
-msgstr ""
-
-#: ../src/protocols/silc/silc.c:1886
+msgstr "Šiffer"
+
+#: ../libgaim/protocols/silc/silc.c:1886
 msgid "HMAC"
-msgstr ""
-
-#: ../src/protocols/silc/silc.c:1889
+msgstr "HMAC"
+
+#: ../libgaim/protocols/silc/silc.c:1889
 msgid "Public key authentication"
 msgstr "Avaliku võtmega autentimine"
 
-#: ../src/protocols/silc/silc.c:1892
+#: ../libgaim/protocols/silc/silc.c:1892
 msgid "Reject watching by other users"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1895
+#: ../libgaim/protocols/silc/silc.c:1895
 msgid "Block invites"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1898
+#: ../libgaim/protocols/silc/silc.c:1898
 msgid "Block IMs without Key Exchange"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1901
+#: ../libgaim/protocols/silc/silc.c:1901
 msgid "Reject online status attribute requests"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1904
+#: ../libgaim/protocols/silc/silc.c:1904
 msgid "Block messages to whiteboard"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1907
-#, fuzzy
+#: ../libgaim/protocols/silc/silc.c:1907
 msgid "Automatically open whiteboard"
-msgstr "_Kontaktide automaatne laiendamine"
-
-#: ../src/protocols/silc/silc.c:1910
-#, fuzzy
+msgstr ""
+
+#: ../libgaim/protocols/silc/silc.c:1910
 msgid "Digitally sign and verify all messages"
-msgstr "Kõikide välksõnumite digitaalne signeerimine"
-
-#: ../src/protocols/silc/util.c:206 ../src/protocols/silc/util.c:231
+msgstr "Kõikide sõnumite digitaalne signeerimine ja verifitseerimine"
+
+#: ../libgaim/protocols/silc/util.c:207 ../libgaim/protocols/silc/util.c:247
 msgid "Creating SILC key pair..."
-msgstr ""
+msgstr "SILC võtmepaari loomine..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../src/protocols/silc/util.c:314
+#: ../libgaim/protocols/silc/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Tegelik nimi: \t%s\n"
 
-#: ../src/protocols/silc/util.c:316
+#: ../libgaim/protocols/silc/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Kasutajanimi: \t%s\n"
 
-#: ../src/protocols/silc/util.c:318
-#, fuzzy, c-format
+#: ../libgaim/protocols/silc/util.c:359
+#, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-post: \t\t%s\n"
 
-#: ../src/protocols/silc/util.c:320
+#: ../libgaim/protocols/silc/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Hostinimi: \t%s\n"
 
-#: ../src/protocols/silc/util.c:322
+#: ../libgaim/protocols/silc/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
-msgstr ""
-
-#: ../src/protocols/silc/util.c:324
+msgstr "Organisatsioon: \t%s\n"
+
+#: ../libgaim/protocols/silc/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Riik: \t%s\n"
 
-#: ../src/protocols/silc/util.c:325
+#: ../libgaim/protocols/silc/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritm: \t%s\n"
 
-#: ../src/protocols/silc/util.c:326
+#: ../libgaim/protocols/silc/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Võtme pikkus: \t%d bitti\n"
 
-#: ../src/protocols/silc/util.c:328
+#: ../libgaim/protocols/silc/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -11391,78 +13261,85 @@
 "%s\n"
 "\n"
 
-#: ../src/protocols/silc/util.c:329
+#: ../libgaim/protocols/silc/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
 
-#: ../src/protocols/silc/util.c:333 ../src/protocols/silc/util.c:334
+#: ../libgaim/protocols/silc/util.c:374 ../libgaim/protocols/silc/util.c:375
 msgid "Public Key Information"
 msgstr "Avaliku võtme teave"
 
-#: ../src/protocols/silc/util.c:516
+#: ../libgaim/protocols/silc/util.c:557
 msgid "Paging"
 msgstr ""
 
-#: ../src/protocols/silc/util.c:522
+#: ../libgaim/protocols/silc/util.c:563
 msgid "Video Conferencing"
 msgstr ""
 
-#: ../src/protocols/silc/util.c:540
+#: ../libgaim/protocols/silc/util.c:581
 msgid "Computer"
 msgstr "Arvuti"
 
-#: ../src/protocols/silc/util.c:544
+#: ../libgaim/protocols/silc/util.c:585
 msgid "PDA"
 msgstr ""
 
-#: ../src/protocols/silc/util.c:546
+#: ../libgaim/protocols/silc/util.c:587
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../src/protocols/silc/wb.c:284
+#: ../libgaim/protocols/silc/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
 
-#: ../src/protocols/silc/wb.c:288
+#: ../libgaim/protocols/silc/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr ""
 
-#: ../src/protocols/silc/wb.c:302
+#: ../libgaim/protocols/silc/wb.c:302
 msgid "Whiteboard"
 msgstr ""
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../src/protocols/simple/simple.c:409
-#, fuzzy
+#: ../libgaim/protocols/simple/simple.c:416
 msgid "Could not write"
-msgstr "Ei saa saata"
-
-#: ../src/protocols/simple/simple.c:424 ../src/protocols/simple/simple.c:1422
+msgstr "Pole võimalik kirjutada"
+
+#: ../libgaim/protocols/simple/simple.c:438
+#: ../libgaim/protocols/simple/simple.c:1484
 msgid "Could not connect"
-msgstr ""
-
-#: ../src/protocols/simple/simple.c:994
+msgstr "Pole võimalik ühenduda"
+
+#: ../libgaim/protocols/simple/simple.c:1037
 msgid "Wrong Password"
 msgstr "Vale parool"
 
-#: ../src/protocols/simple/simple.c:1453 ../src/protocols/simple/simple.c:1492
-#: ../src/protocols/simple/simple.c:1504 ../src/protocols/simple/simple.c:1562
+#: ../libgaim/protocols/simple/simple.c:1518
+#: ../libgaim/protocols/simple/simple.c:1560
+#: ../libgaim/protocols/simple/simple.c:1574
+#: ../libgaim/protocols/simple/simple.c:1626
 #, fuzzy
 msgid "Could not create listen socket"
 msgstr "Soklit pole võimalik luua"
 
-#: ../src/protocols/simple/simple.c:1474
+#: ../libgaim/protocols/simple/simple.c:1541
 msgid "Couldn't resolve host"
 msgstr "Hosti pole võimalik lahendada"
 
-#: ../src/protocols/simple/simple.c:1583
+#: ../libgaim/protocols/simple/simple.c:1634
+#, fuzzy
+msgid "Could not resolve hostname"
+msgstr "Hosti pole võimalik lahendada"
+
+#: ../libgaim/protocols/simple/simple.c:1651
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "IRC nimed ei tohi sisaldada tühje kohti"
@@ -11475,256 +13352,248 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/simple/simple.c:1745
-#, fuzzy
+#: ../libgaim/protocols/simple/simple.c:1819
 msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "SILC protokolli plugin"
+msgstr "SIP/SIMPLE protokolli plugin"
 
 #. *  summary
-#: ../src/protocols/simple/simple.c:1746
-#, fuzzy
+#: ../libgaim/protocols/simple/simple.c:1820
 msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "SILC protokolli plugin"
-
-#: ../src/protocols/simple/simple.c:1768
+msgstr "SIP/SIMPLE protokolli plugin"
+
+#: ../libgaim/protocols/simple/simple.c:1842
 msgid "Publish status (note: everyone may watch you)"
-msgstr ""
-
-#: ../src/protocols/simple/simple.c:1774
-#, fuzzy
+msgstr "Olek avalikustatakse (märkus: igaüks võib sind näha)"
+
+#: ../libgaim/protocols/simple/simple.c:1848
 msgid "Use UDP"
-msgstr "Kasutaja ID"
-
-#: ../src/protocols/simple/simple.c:1776
-#, fuzzy
+msgstr "Kasutatakse UDP-d"
+
+#: ../libgaim/protocols/simple/simple.c:1850
 msgid "Use proxy"
-msgstr "Proksi puudub"
-
-#: ../src/protocols/simple/simple.c:1778
-#, fuzzy
+msgstr "Kasutatakse proksit"
+
+#: ../libgaim/protocols/simple/simple.c:1852
 msgid "Proxy"
-msgstr "Proksi puudub"
-
-#: ../src/protocols/simple/simple.c:1780
-#, fuzzy
+msgstr "Proksi"
+
+#: ../libgaim/protocols/simple/simple.c:1854
 msgid "Auth User"
-msgstr "Autentimisport"
-
-#: ../src/protocols/simple/simple.c:1782
-#, fuzzy
+msgstr "Autentimiskasutaja"
+
+#: ../libgaim/protocols/simple/simple.c:1856
 msgid "Auth Domain"
-msgstr "Automaatne"
-
-#: ../src/protocols/toc/toc.c:139
+msgstr "Autentimisdomeen"
+
+#: ../libgaim/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
-msgstr ""
-
-#: ../src/protocols/toc/toc.c:148
+msgstr "%s lahendamine"
+
+#: ../libgaim/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:200
+#: ../libgaim/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:482
+#: ../libgaim/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
-msgstr ""
-
-#: ../src/protocols/toc/toc.c:485
+msgstr "Faili %s pole võimalik kirjutada."
+
+#: ../libgaim/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
-msgstr "Ei suuda lugeda faili %s."
-
-#: ../src/protocols/toc/toc.c:488
+msgstr "Faili %s pole võimalik lugeda."
+
+#: ../libgaim/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:491
+#: ../libgaim/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s pole hetkel sisse logitud."
 
-#: ../src/protocols/toc/toc.c:494
+#: ../libgaim/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:497
+#: ../libgaim/protocols/toc/toc.c:503
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:500
+#: ../libgaim/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:503
+#: ../libgaim/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:506
+#: ../libgaim/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:509
+#: ../libgaim/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:512
+#: ../libgaim/protocols/toc/toc.c:518
 msgid "Failure."
 msgstr "Tõrge."
 
-#: ../src/protocols/toc/toc.c:515
+#: ../libgaim/protocols/toc/toc.c:521
 msgid "Too many matches."
 msgstr "Liiga palju vastavusi."
 
-#: ../src/protocols/toc/toc.c:518
+#: ../libgaim/protocols/toc/toc.c:524
 msgid "Need more qualifiers."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:521
+#: ../libgaim/protocols/toc/toc.c:527
 msgid "Dir service temporarily unavailable."
 msgstr "Kataloogiteenus pole ajutiselt saadaval."
 
-#: ../src/protocols/toc/toc.c:524
+#: ../libgaim/protocols/toc/toc.c:530
 msgid "E-mail lookup restricted."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:527
+#: ../libgaim/protocols/toc/toc.c:533
 msgid "Keyword ignored."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:530
+#: ../libgaim/protocols/toc/toc.c:536
 msgid "No keywords."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:533
+#: ../libgaim/protocols/toc/toc.c:539
 msgid "User has no directory information."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:537
+#: ../libgaim/protocols/toc/toc.c:543
 msgid "Country not supported."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:540
+#: ../libgaim/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:546
+#: ../libgaim/protocols/toc/toc.c:549
+msgid "Incorrect nickname or password."
+msgstr "Vigane hüüdnimi või parool."
+
+#: ../libgaim/protocols/toc/toc.c:552
 msgid "The service is temporarily unavailable."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:549
+#: ../libgaim/protocols/toc/toc.c:555
 msgid "Your warning level is currently too high to log in."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:552
+#: ../libgaim/protocols/toc/toc.c:558
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:554
+#: ../libgaim/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:557
+#: ../libgaim/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:584
-#, fuzzy
+#: ../libgaim/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
-msgstr "Vigane grupp"
-
-#: ../src/protocols/toc/toc.c:668
+msgstr "Vigane grupinimi"
+
+#: ../libgaim/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:708
+#: ../libgaim/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
-msgstr ""
-
-#: ../src/protocols/toc/toc.c:786
+msgstr "Vastuse ootamine..."
+
+#: ../libgaim/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:989
+#: ../libgaim/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Paroolimuutmine õnnestus"
 
-#: ../src/protocols/toc/toc.c:993
+#: ../libgaim/protocols/toc/toc.c:999
 msgid "TOC has sent a PAUSE command."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:994
+#: ../libgaim/protocols/toc/toc.c:1000
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
 "is only temporary, please be patient."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:1549
+#: ../libgaim/protocols/toc/toc.c:1373
+msgid "_Group:"
+msgstr "_Grupp:"
+
+#: ../libgaim/protocols/toc/toc.c:1555
 msgid "Get Dir Info"
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "Määra kasutajateave"
-
-#: ../src/protocols/toc/toc.c:1689
+#: ../libgaim/protocols/toc/toc.c:1695
 msgid "Set Dir Info"
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:1694
-msgid "Change Password"
-msgstr "Muuda parooli"
-
-#: ../src/protocols/toc/toc.c:1811
+#: ../libgaim/protocols/toc/toc.c:1817
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:1847
+#: ../libgaim/protocols/toc/toc.c:1853
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:1892 ../src/protocols/toc/toc.c:1932
-#: ../src/protocols/toc/toc.c:2056 ../src/protocols/toc/toc.c:2144
+#: ../libgaim/protocols/toc/toc.c:1898 ../libgaim/protocols/toc/toc.c:1938
+#: ../libgaim/protocols/toc/toc.c:2062 ../libgaim/protocols/toc/toc.c:2150
 msgid "Could not connect for transfer."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:2089
+#: ../libgaim/protocols/toc/toc.c:2095
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:2189
+#: ../libgaim/protocols/toc/toc.c:2195
 msgid "Gaim - Save As..."
 msgstr ""
 
-#: ../src/protocols/toc/toc.c:2223
+#: ../libgaim/protocols/toc/toc.c:2229
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/protocols/toc/toc.c:2230
+#: ../libgaim/protocols/toc/toc.c:2236
 #, c-format
 msgid "%s requests you to send them a file"
-msgstr ""
+msgstr "%s soovib, et sa saadaksid talle faili"
 
 #. *< type
 #. *< ui_requirement
@@ -11736,27 +13605,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/toc/toc.c:2319 ../src/protocols/toc/toc.c:2321
+#: ../libgaim/protocols/toc/toc.c:2326 ../libgaim/protocols/toc/toc.c:2328
 msgid "TOC Protocol Plugin"
 msgstr "TOC protokolli plugin"
 
-#: ../src/protocols/toc/toc.c:2340
-msgid "TOC host"
-msgstr ""
-
-#: ../src/protocols/toc/toc.c:2344
-msgid "TOC port"
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoo.c:712
+#: ../libgaim/protocols/yahoo/yahoo.c:793
 msgid "Your Yahoo! message did not get sent."
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:766 ../src/protocols/yahoo/yahoo.c:3569
+#: ../libgaim/protocols/yahoo/yahoo.c:852
+#: ../libgaim/protocols/yahoo/yahoo.c:3738
 msgid "Buzz!!"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:811
+#: ../libgaim/protocols/yahoo/yahoo.c:898
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr ""
@@ -11764,33 +13626,32 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: ../src/protocols/yahoo/yahoo.c:907
-#, fuzzy, c-format
+#: ../libgaim/protocols/yahoo/yahoo.c:994
+#, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
-msgstr "Kasutaja %s soovib lisada sind oma sõbranimekirja."
-
-#: ../src/protocols/yahoo/yahoo.c:913
-#, fuzzy
+msgstr "Kasutaja %s soovib lisada %s oma sõbranimekirja%s%s."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1000
 msgid "Message (optional) :"
-msgstr "Sõnumitest teavitaja"
-
-#: ../src/protocols/yahoo/yahoo.c:955
+msgstr ""
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1042
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:958
+#: ../libgaim/protocols/yahoo/yahoo.c:1045
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:961
+#: ../libgaim/protocols/yahoo/yahoo.c:1048
 msgid "Add buddy rejected"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:1704
+#: ../libgaim/protocols/yahoo/yahoo.c:1799
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -11798,30 +13659,30 @@
 "on to Yahoo.  Check %s for updates."
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:1707
+#: ../libgaim/protocols/yahoo/yahoo.c:1802
 msgid "Failed Yahoo! Authentication"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:1773
+#: ../libgaim/protocols/yahoo/yahoo.c:1868
 #, 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 ""
 
-#: ../src/protocols/yahoo/yahoo.c:1776
+#: ../libgaim/protocols/yahoo/yahoo.c:1871
 msgid "Ignore buddy?"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:1810
+#: ../libgaim/protocols/yahoo/yahoo.c:1905
 msgid "Invalid username."
 msgstr "Vigane kasutajanimi."
 
-#: ../src/protocols/yahoo/yahoo.c:1821
+#: ../libgaim/protocols/yahoo/yahoo.c:1919
 msgid "Normal authentication failed!"
 msgstr "Tõrge tavalisel autentimisel!"
 
-#: ../src/protocols/yahoo/yahoo.c:1822
+#: ../libgaim/protocols/yahoo/yahoo.c:1920
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -11832,142 +13693,143 @@
 "on Yahoo! autentimisskeemi muudetud. Gaim proovim nüüd sisse logida Web "
 "Messenger'i autentimise abil, mille tulemuseks on vähendatud funktsionaalsus."
 
-#: ../src/protocols/yahoo/yahoo.c:1830
-msgid "Incorrect password."
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoo.c:1833
+#: ../libgaim/protocols/yahoo/yahoo.c:1931
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:1836
+#: ../libgaim/protocols/yahoo/yahoo.c:1934
 #, 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."
 
-#: ../src/protocols/yahoo/yahoo.c:1890
+#: ../libgaim/protocols/yahoo/yahoo.c:1988
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:1893
+#: ../libgaim/protocols/yahoo/yahoo.c:1991
 msgid "Could not add buddy to server list"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:2012
+#: ../libgaim/protocols/yahoo/yahoo.c:2110
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:2151 ../src/protocols/yahoo/yahoo.c:2298
-#: ../src/protocols/yahoo/yahoo.c:2313 ../src/protocols/yahoo/ycht.c:472
-msgid "Unable to read"
-msgstr "Ei suuda lugeda"
-
-#: ../src/protocols/yahoo/yahoo.c:2337 ../src/protocols/yahoo/yahoo.c:2494
-#: ../src/protocols/yahoo/yahoo.c:2596 ../src/protocols/yahoo/yahoo.c:2606
-#: ../src/protocols/yahoo/yahoochat.c:1447
-#: ../src/protocols/yahoo/yahoochat.c:1517 ../src/protocols/yahoo/ycht.c:576
+#: ../libgaim/protocols/yahoo/yahoo.c:2441
+msgid "Received unexpected HTTP response from server."
+msgstr ""
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2465
+#: ../libgaim/protocols/yahoo/yahoo.c:2637
+#: ../libgaim/protocols/yahoo/yahoo.c:2740
+#: ../libgaim/protocols/yahoo/yahoo.c:2750
+#: ../libgaim/protocols/yahoo/yahoochat.c:1455
+#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+#: ../libgaim/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3302
+msgstr "Ühendumisprobleem"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2865
+#: ../libgaim/protocols/yahoo/yahoo.c:3472
 msgid "Not at Home"
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoo.c:2717 ../src/protocols/yahoo/yahoo.c:3305
+msgstr "Pole kodus"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2867
+#: ../libgaim/protocols/yahoo/yahoo.c:3475
 msgid "Not at Desk"
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoo.c:2719 ../src/protocols/yahoo/yahoo.c:3308
-#, fuzzy
+msgstr "Pole töölaua taga"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2869
+#: ../libgaim/protocols/yahoo/yahoo.c:3478
 msgid "Not in Office"
-msgstr "Määramata"
-
-#: ../src/protocols/yahoo/yahoo.c:2723 ../src/protocols/yahoo/yahoo.c:3314
+msgstr "Pole kontoris"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2873
+#: ../libgaim/protocols/yahoo/yahoo.c:3484
 msgid "On Vacation"
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoo.c:2727 ../src/protocols/yahoo/yahoo.c:3320
+msgstr "Puhkusel"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2877
+#: ../libgaim/protocols/yahoo/yahoo.c:3490
 msgid "Stepped Out"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:2820 ../src/protocols/yahoo/yahoo.c:2850
+#: ../libgaim/protocols/yahoo/yahoo.c:2970
+#: ../libgaim/protocols/yahoo/yahoo.c:3000
 msgid "Not on server list"
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoo.c:2867 ../src/protocols/yahoo/yahoo.c:2926
-#, fuzzy
+msgstr "Pole serveri loendis"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3017
+#: ../libgaim/protocols/yahoo/yahoo.c:3076
 msgid "Appear Online"
-msgstr "Ühendatud"
-
-#: ../src/protocols/yahoo/yahoo.c:2870 ../src/protocols/yahoo/yahoo.c:2947
+msgstr ""
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3020
+#: ../libgaim/protocols/yahoo/yahoo.c:3097
 msgid "Appear Permanently Offline"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:2889
-#, fuzzy
+#: ../libgaim/protocols/yahoo/yahoo.c:3039
 msgid "Presence"
-msgstr "Eelistused"
-
-#: ../src/protocols/yahoo/yahoo.c:2932
+msgstr ""
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3082
 msgid "Appear Offline"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:2941
+#: ../libgaim/protocols/yahoo/yahoo.c:3091
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:2989
+#: ../libgaim/protocols/yahoo/yahoo.c:3139
 msgid "Join in Chat"
-msgstr "Ühine vestluseks"
-
-#: ../src/protocols/yahoo/yahoo.c:2995
+msgstr "Ühine vestlusega"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3145
 msgid "Initiate Conference"
 msgstr "Algata konverents"
 
-#: ../src/protocols/yahoo/yahoo.c:3023
-#, fuzzy
+#: ../libgaim/protocols/yahoo/yahoo.c:3173
 msgid "Presence Settings"
-msgstr "Keskkonnast tulenevate sätete kasutamine"
-
-#: ../src/protocols/yahoo/yahoo.c:3029
+msgstr ""
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3179
 msgid "Start Doodling"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:3061
+#: ../libgaim/protocols/yahoo/yahoo.c:3211
 msgid "Active which ID?"
 msgstr "Milline ID aktiveerida?"
 
-#: ../src/protocols/yahoo/yahoo.c:3070
+#: ../libgaim/protocols/yahoo/yahoo.c:3220
 msgid "Join who in chat?"
 msgstr "Kellega ühineda jututoas?"
 
-#: ../src/protocols/yahoo/yahoo.c:3080
+#: ../libgaim/protocols/yahoo/yahoo.c:3230
 msgid "Activate ID..."
 msgstr "Aktiveeri ID..."
 
-#: ../src/protocols/yahoo/yahoo.c:3084
-#, fuzzy
+#: ../libgaim/protocols/yahoo/yahoo.c:3234
 msgid "Join User in Chat..."
-msgstr "Ühine kasutajaga jututoas..."
-
-#: ../src/protocols/yahoo/yahoo.c:3628
+msgstr "Ühine kasutajaga vestluses..."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3797
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoo.c:3633
+msgstr "join &lt;tuba&gt;:  Yahoo võrgus oleva jututoaga ühinemine"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3802
 msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoo.c:3637
+msgstr "list: Yahoo võrgu jututubade nimekirja kuvamine"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3806
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:3641
+#: ../libgaim/protocols/yahoo/yahoo.c:3810
 msgid "doodle: Request user to start a Doodle session"
-msgstr ""
+msgstr "doodle: Kasutajaga Doodle seansi algatamine"
 
 #. *< type
 #. *< ui_requirement
@@ -11979,195 +13841,88 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3734 ../src/protocols/yahoo/yahoo.c:3736
+#: ../libgaim/protocols/yahoo/yahoo.c:3904
+#: ../libgaim/protocols/yahoo/yahoo.c:3906
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo protokolli plugin"
 
-#: ../src/protocols/yahoo/yahoo.c:3753
+#: ../libgaim/protocols/yahoo/yahoo.c:3923
 msgid "Yahoo Japan"
 msgstr "Jaapani Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3756
-msgid "Pager host"
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoo.c:3759
-msgid "Japan Pager host"
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoo.c:3762
+#: ../libgaim/protocols/yahoo/yahoo.c:3926
+msgid "Pager server"
+msgstr ""
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3929
+msgid "Japan Pager server"
+msgstr ""
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3932
 msgid "Pager port"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:3765
-msgid "File transfer host"
-msgstr "Failiülekande host"
-
-#: ../src/protocols/yahoo/yahoo.c:3768
-#, fuzzy
-msgid "Japan file transfer host"
-msgstr "Jaapani failiülekande host"
-
-#: ../src/protocols/yahoo/yahoo.c:3771
+#: ../libgaim/protocols/yahoo/yahoo.c:3935
+msgid "File transfer server"
+msgstr "Failiülekandeserver"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3938
+msgid "Japan file transfer server"
+msgstr "Jaapani failiülekandeserver"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3941
 msgid "File transfer port"
 msgstr "Failiülekande port"
 
-#: ../src/protocols/yahoo/yahoo.c:3774
+#: ../libgaim/protocols/yahoo/yahoo.c:3944
 msgid "Chat room locale"
 msgstr "Jututoa lokaat"
 
-#: ../src/protocols/yahoo/yahoo.c:3777
+#: ../libgaim/protocols/yahoo/yahoo.c:3947
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konverentside ja jututubade kutseid eiratakse"
 
-#: ../src/protocols/yahoo/yahoo.c:3781
+#: ../libgaim/protocols/yahoo/yahoo.c:3955
 msgid "Chat room list URL"
 msgstr "Jututubade nimekirja URL"
 
-#: ../src/protocols/yahoo/yahoo.c:3784
-msgid "YCHT host"
-msgstr "YCHT host"
-
-#: ../src/protocols/yahoo/yahoo.c:3787
-msgid "YCHT port"
-msgstr "YCHT port"
-
-#. Write a local message to this conversation showing that a request for a
-#. * Doodle session has been made
-#.
-#: ../src/protocols/yahoo/yahoo_doodle.c:96
-msgid "Sent Doodle request."
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoo_filexfer.c:253
-#: ../src/protocols/yahoo/yahoo_filexfer.c:262
-#: ../src/protocols/yahoo/yahoo_filexfer.c:271
-msgid "Unable to establish file descriptor."
-msgstr ""
-
-#. TODO: what to do here - do we really have to disconnect?
-#: ../src/protocols/yahoo/yahoo_packet.c:265
-#, fuzzy
-msgid "Write Error"
-msgstr "Kirjutamise viga"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:707
-#, c-format
-msgid "<b>IP Address:</b> %s<br>"
-msgstr "<b>IP aadress:</b> %s<br>"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:783
-msgid "Yahoo! Japan Profile"
-msgstr "Jaapani Yahoo! profiil"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:784
-msgid "Yahoo! Profile"
-msgstr "Yahoo! profiil"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:828
-msgid ""
-"Sorry, profiles marked as containing adult content are not supported at this "
-"time."
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoo_profile.c:830
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser"
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1012
-msgid "Yahoo! ID"
-msgstr "Yahoo! ID"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1084
-#: ../src/protocols/yahoo/yahoo_profile.c:1088
-#: ../src/protocols/yahoo/yahoo_profile.c:1092
-msgid "Hobbies"
-msgstr "Hobid"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1102
-#: ../src/protocols/yahoo/yahoo_profile.c:1106
-msgid "Latest News"
-msgstr "Viimased uudised"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1127
-msgid "Home Page"
-msgstr "Koduleht"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1142
-msgid "Cool Link 1"
-msgstr "Lahe viit nr 1"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1147
-msgid "Cool Link 2"
-msgstr "Lahe viit nr 2"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1151
-msgid "Cool Link 3"
-msgstr "Lahe viit nr 3"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1164
-msgid "Last Update"
-msgstr "Viimane uuendus"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1170
-#, c-format
-msgid "User information for %s unavailable"
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1176
-msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1192
-msgid ""
-"Could not retrieve the user's profile. This most likely is a temporary "
-"server-side problem. Please try again later."
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1195
-msgid ""
-"Could not retrieve the user's profile. This most likely means that the user "
-"does not exist; however, Yahoo! sometimes does fail to find a user's "
-"profile. If you know that the user exists, please try again later."
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1203
-msgid "The user's profile is empty."
-msgstr "Kasutajaprofiil on tühi."
-
-#: ../src/protocols/yahoo/yahoochat.c:203
+#: ../libgaim/protocols/yahoo/yahoo.c:3958
+msgid "Yahoo Chat server"
+msgstr "Yahoo jututoaserver"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3961
+msgid "Yahoo Chat port"
+msgstr "Yahoo jututoaport"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoochat.c:205
+#: ../libgaim/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoochat.c:361
+#: ../libgaim/protocols/yahoo/yahoochat.c:361
 msgid "Failed to join chat"
 msgstr ""
 
 #. -6
-#: ../src/protocols/yahoo/yahoochat.c:364
+#: ../libgaim/protocols/yahoo/yahoochat.c:364
 msgid "Unknown room"
 msgstr "Tundmatu tuba"
 
 #. -15
-#: ../src/protocols/yahoo/yahoochat.c:367
+#: ../libgaim/protocols/yahoo/yahoochat.c:367
 msgid "Maybe the room is full"
 msgstr "Võibolla on tuba täis"
 
 #. -35
-#: ../src/protocols/yahoo/yahoochat.c:370
+#: ../libgaim/protocols/yahoo/yahoochat.c:370
 msgid "Not available"
 msgstr "Pole saadaval"
 
-#: ../src/protocols/yahoo/yahoochat.c:374
+#: ../libgaim/protocols/yahoo/yahoochat.c:374
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -12175,147 +13930,264 @@
 "Tundmatu viga. Võib-olla pead sa välja logima ja enne jututoaga "
 "taasliitumist 5 minutit ootama"
 
-#: ../src/protocols/yahoo/yahoochat.c:452
+#: ../libgaim/protocols/yahoo/yahoochat.c:452
 #, c-format
 msgid "You are now chatting in %s."
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoochat.c:626
+msgstr "Sa vestled nüüd jututoas %s."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:627
 msgid "Failed to join buddy in chat"
 msgstr "Tõrge sõbraga jututoas ühinemisel"
 
-#: ../src/protocols/yahoo/yahoochat.c:627
+#: ../libgaim/protocols/yahoo/yahoochat.c:628
 msgid "Maybe they're not in a chat?"
 msgstr "Võibolla pole nad jututoas?"
 
-#: ../src/protocols/yahoo/yahoochat.c:1345
-#: ../src/protocols/yahoo/yahoochat.c:1372
+#: ../libgaim/protocols/yahoo/yahoochat.c:1357
+#: ../libgaim/protocols/yahoo/yahoochat.c:1383
 msgid "Fetching the room list failed."
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoochat.c:1433
+msgstr "Tõrge jututubade nimekirja hankimisel."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1441
 msgid "Voices"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoochat.c:1436
+#: ../libgaim/protocols/yahoo/yahoochat.c:1444
 msgid "Webcams"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoochat.c:1447
-#: ../src/protocols/yahoo/yahoochat.c:1517
+#: ../libgaim/protocols/yahoo/yahoochat.c:1455
+#: ../libgaim/protocols/yahoo/yahoochat.c:1525
 msgid "Unable to fetch room list."
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoochat.c:1510
+#: ../libgaim/protocols/yahoo/yahoochat.c:1518
 msgid "User Rooms"
 msgstr ""
 
-#: ../src/protocols/yahoo/ycht.c:456
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+#: ../libgaim/protocols/yahoo/yahoo_doodle.c:96
+msgid "Sent Doodle request."
+msgstr "Doodle päringu saatmine."
+
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:291
+msgid "Unable to establish file descriptor."
+msgstr ""
+
+#. TODO: what to do here - do we really have to disconnect?
+#: ../libgaim/protocols/yahoo/yahoo_packet.c:288
+msgid "Write Error"
+msgstr "Viga kirjutamisel"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:707
+#, c-format
+msgid "<b>IP Address:</b> %s<br>"
+msgstr "<b>IP aadress:</b> %s<br>"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:782
+msgid "Yahoo! Japan Profile"
+msgstr "Jaapani Yahoo! profiil"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:783
+msgid "Yahoo! Profile"
+msgstr "Yahoo! profiil"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:827
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr ""
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:829
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser"
+msgstr ""
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1026
+msgid "Yahoo! ID"
+msgstr "Yahoo! ID"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1098
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1102
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1106
+msgid "Hobbies"
+msgstr "Hobid"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1116
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1120
+msgid "Latest News"
+msgstr "Viimased uudised"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1141
+msgid "Home Page"
+msgstr "Koduleht"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1156
+msgid "Cool Link 1"
+msgstr "Lahe viit nr 1"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
+msgid "Cool Link 2"
+msgstr "Lahe viit nr 2"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1165
+msgid "Cool Link 3"
+msgstr "Lahe viit nr 3"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1179
+msgid "Last Update"
+msgstr "Viimane uuendus"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1186
+#, c-format
+msgid "User information for %s unavailable"
+msgstr "Kasutaja %s andmed pole saadaval"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1192
+msgid ""
+"Sorry, this profile seems to be in a language or format that is not "
+"supported at this time."
+msgstr ""
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1208
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1211
+msgid ""
+"Could not retrieve the user's profile. This most likely means that the user "
+"does not exist; however, Yahoo! sometimes does fail to find a user's "
+"profile. If you know that the user exists, please try again later."
+msgstr ""
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1218
+msgid "The user's profile is empty."
+msgstr "Kasutajaprofiil on tühi."
+
+#: ../libgaim/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:346
+#: ../libgaim/protocols/yahoo/ycht.c:475
+#, fuzzy, c-format
+msgid ""
+"Lost connection with server\n"
+"%s"
+msgstr "Puudub ühendus serveriga."
+
+#: ../libgaim/protocols/zephyr/zephyr.c:355
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:701
-#, fuzzy, c-format
+#: ../libgaim/protocols/zephyr/zephyr.c:753
+#, c-format
 msgid "Unable to send to chat %s,%s,%s"
-msgstr "Pole võimalik autentida: %s"
-
-#: ../src/protocols/zephyr/zephyr.c:734 ../src/protocols/zephyr/zephyr.c:1151
+msgstr ""
+
+#: ../libgaim/protocols/zephyr/zephyr.c:786
+#: ../libgaim/protocols/zephyr/zephyr.c:1203
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:738 ../src/protocols/zephyr/zephyr.c:1156
+#: ../libgaim/protocols/zephyr/zephyr.c:790
+#: ../libgaim/protocols/zephyr/zephyr.c:1208
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Peidetud või pole sisse logitud"
 
-#: ../src/protocols/zephyr/zephyr.c:743 ../src/protocols/zephyr/zephyr.c:1158
+#: ../libgaim/protocols/zephyr/zephyr.c:795
+#: ../libgaim/protocols/zephyr/zephyr.c:1210
 #, c-format
 msgid "<br>At %s since %s"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:1490 ../src/protocols/zephyr/zephyr.c:1491
+#: ../libgaim/protocols/zephyr/zephyr.c:1542
+#: ../libgaim/protocols/zephyr/zephyr.c:1543
 msgid "Anyone"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2298
+#: ../libgaim/protocols/zephyr/zephyr.c:2350
 msgid "_Class:"
 msgstr "_Klass:"
 
-#: ../src/protocols/zephyr/zephyr.c:2304
+#: ../libgaim/protocols/zephyr/zephyr.c:2356
 msgid "_Instance:"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2310
+#: ../libgaim/protocols/zephyr/zephyr.c:2362
 msgid "_Recipient:"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2321
+#: ../libgaim/protocols/zephyr/zephyr.c:2373
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2627
+#: ../libgaim/protocols/zephyr/zephyr.c:2686
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2632
+#: ../libgaim/protocols/zephyr/zephyr.c:2691
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2637
+#: ../libgaim/protocols/zephyr/zephyr.c:2696
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2642
+#: ../libgaim/protocols/zephyr/zephyr.c:2701
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2647
+#: ../libgaim/protocols/zephyr/zephyr.c:2706
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2653
+#: ../libgaim/protocols/zephyr/zephyr.c:2712
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2658
+#: ../libgaim/protocols/zephyr/zephyr.c:2717
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2664
+#: ../libgaim/protocols/zephyr/zephyr.c:2723
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2670
+#: ../libgaim/protocols/zephyr/zephyr.c:2729
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2676
+#: ../libgaim/protocols/zephyr/zephyr.c:2735
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2681
+#: ../libgaim/protocols/zephyr/zephyr.c:2740
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2787
+#: ../libgaim/protocols/zephyr/zephyr.c:2846
 msgid "Resubscribe"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2790
+#: ../libgaim/protocols/zephyr/zephyr.c:2849
 msgid "Retrieve subscriptions from server"
 msgstr ""
 
@@ -12329,211 +14201,353 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/zephyr/zephyr.c:2875 ../src/protocols/zephyr/zephyr.c:2877
+#: ../libgaim/protocols/zephyr/zephyr.c:2935
+#: ../libgaim/protocols/zephyr/zephyr.c:2937
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr protokolli plugin"
 
-#: ../src/protocols/zephyr/zephyr.c:2896
-#, fuzzy
+#: ../libgaim/protocols/zephyr/zephyr.c:2956
 msgid "Use tzc"
-msgstr "L_isa"
-
-#: ../src/protocols/zephyr/zephyr.c:2899
-#, fuzzy
+msgstr ""
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2959
 msgid "tzc command"
-msgstr "Käsk"
-
-#: ../src/protocols/zephyr/zephyr.c:2902
+msgstr ""
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2962
 msgid "Export to .anyone"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2905
+#: ../libgaim/protocols/zephyr/zephyr.c:2965
 msgid "Export to .zephyr.subs"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2908
+#: ../libgaim/protocols/zephyr/zephyr.c:2968
 msgid "Import from .anyone"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2911
+#: ../libgaim/protocols/zephyr/zephyr.c:2971
 msgid "Import from .zephyr.subs"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2914
-#, fuzzy
+#: ../libgaim/protocols/zephyr/zephyr.c:2974
 msgid "Realm"
-msgstr "Tegelik nimi"
-
-#: ../src/protocols/zephyr/zephyr.c:2917
+msgstr ""
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2977
 msgid "Exposure"
 msgstr ""
 
-#: ../src/proxy.c:1216 ../src/proxy.c:1272 ../src/proxy.c:1320
-#: ../src/proxy.c:1347
-#, c-format
-msgid "Proxy connection error %d"
-msgstr ""
-
-#. Forbidden
-#: ../src/proxy.c:1336
-#, c-format
-msgid "Access denied: proxy server forbids port %d tunnelling."
-msgstr ""
+#: ../libgaim/proxy.c:446 ../libgaim/proxy.c:868 ../libgaim/proxy.c:1025
+#: ../libgaim/proxy.c:1583
+#, fuzzy, c-format
+msgid ""
+"Unable to create socket:\n"
+"%s"
+msgstr "Soklit pole võimalik luua"
+
+#: ../libgaim/proxy.c:648
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s\n"
+msgstr "Kasutajale pole võimalik rolli \"%s\" määrata: %s"
+
+#: ../libgaim/proxy.c:676 ../libgaim/proxy.c:722 ../libgaim/proxy.c:760
+#: ../libgaim/proxy.c:772
+#, c-format
+msgid "HTTP proxy connection error %d"
+msgstr "Proksi ühenduse viga %d"
+
+#: ../libgaim/proxy.c:768
+#, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgstr "Ligipääs keelatud: HTTP proksi server keelab pordi %d tunneldamise."
+
+#: ../libgaim/proxy.c:988
+#, c-format
+msgid "Error resolving %s"
+msgstr "Viga %s lahendamisel"
+
+#: ../libgaim/proxy.c:1677
+msgid "Could not resolve host name"
+msgstr "Hostinime pole võimalik lahendada"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../src/request.h:1354
-#, fuzzy
+#: ../libgaim/request.h:1354
 msgid "_Accept"
-msgstr "_Konto"
-
-#: ../src/savedstatuses.c:514
-msgid "saved statuses"
-msgstr ""
-
-#: ../src/savedstatuses.c:767
+msgstr ""
+
+#. *
+#. * The default message to use when the user becomes auto-away.
+#.
+#: ../libgaim/savedstatuses.c:46
 msgid "I'm not here right now"
 msgstr "Ma pole hetkel siin"
 
-#: ../src/server.c:227
+#: ../libgaim/savedstatuses.c:525
+msgid "saved statuses"
+msgstr ""
+
+#: ../libgaim/server.c:228
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s on nüüd nimega %s.\n"
 
-#: ../src/server.c:681
+#: ../libgaim/server.c:686
 #, fuzzy, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
 msgstr "%s kutsub kasutaja %s jututuppa %s\n"
 
-#: ../src/server.c:686
+#: ../libgaim/server.c:691
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s kutsub kasutaja %s jututuppa %s\n"
 
-#: ../src/server.c:690
+#: ../libgaim/server.c:695
 msgid "Accept chat invitation?"
 msgstr "Kas nõustume jututoa kutsega?"
 
-#: ../src/status.c:153
-#, fuzzy
+#: ../libgaim/status.c:153
 msgid "Unset"
-msgstr "L_isa"
-
-#: ../src/status.c:156
+msgstr ""
+
+#: ../libgaim/status.c:156
 msgid "Unavailable"
-msgstr ""
-
-#: ../src/status.c:160
-#, fuzzy
+msgstr "Pole saadaval"
+
+#: ../libgaim/status.c:160
 msgid "Mobile"
-msgstr "Mobiiltelefon"
-
-#: ../src/status.c:622
-#, fuzzy, c-format
+msgstr ""
+
+#: ../libgaim/status.c:611
+#, c-format
 msgid "%s changed status from %s to %s"
-msgstr "%s määras uueks teemaks: %s"
-
-#: ../src/status.c:632
-#, fuzzy, c-format
+msgstr "%s muutus olekut %s -> %s"
+
+#: ../libgaim/status.c:621
+#, c-format
 msgid "%s is now %s"
-msgstr "%s on nüüd nimega %s"
-
-#: ../src/status.c:637
-#, fuzzy, c-format
+msgstr "%s on nüüd %s"
+
+#: ../libgaim/status.c:626
+#, c-format
 msgid "%s is no longer %s"
-msgstr "%s pole enam jõude."
-
-#: ../src/status.c:1320
+msgstr "%s pole enam %s"
+
+#: ../libgaim/status.c:1293
 #, c-format
 msgid "%s became idle"
-msgstr ""
-
-#: ../src/status.c:1337
+msgstr "%s jäi jõude"
+
+#: ../libgaim/status.c:1310
 #, c-format
 msgid "%s became unidle"
-msgstr ""
-
-#: ../src/status.c:1403
+msgstr "%s naases jõudeolekust"
+
+#: ../libgaim/status.c:1376
 #, c-format
 msgid "+++ %s became idle"
-msgstr ""
-
-#: ../src/status.c:1405
+msgstr "+++ %s jäi jõude"
+
+#: ../libgaim/status.c:1378
 #, c-format
 msgid "+++ %s became unidle"
-msgstr ""
-
-#: ../src/util.c:679
+msgstr "+++ %s naases jõudeolekust"
+
+#: ../libgaim/util.c:680
 #, c-format
 msgid "%x %X"
 msgstr ""
 
-#: ../src/util.c:2451
-#, fuzzy, c-format
+#: ../libgaim/util.c:2429
+#, c-format
 msgid "Error Reading %s"
-msgstr "Viga pildi salvestamisel: %s"
-
-#: ../src/util.c:2452
+msgstr "Viga %s lugemisel"
+
+#: ../libgaim/util.c:2430
 #, 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 ""
 
-#: ../src/util.c:2891
+#: ../libgaim/util.c:2893
 msgid "Calculating..."
 msgstr "Arvutamine..."
 
-#: ../src/util.c:2894
+#: ../libgaim/util.c:2896
 msgid "Unknown."
 msgstr "Tundmatu."
 
-#: ../src/util.c:2920
+#: ../libgaim/util.c:2922
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekundit"
 
-#: ../src/util.c:2932
+#: ../libgaim/util.c:2934
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d päev"
 msgstr[1] "%d päeva"
 
-#: ../src/util.c:2940
+#: ../libgaim/util.c:2942
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d tund"
 msgstr[1] "%s, %d tundi"
 
-#: ../src/util.c:2946
+#: ../libgaim/util.c:2948
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tund"
 msgstr[1] "%d tundi"
 
-#: ../src/util.c:2954
+#: ../libgaim/util.c:2956
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minut"
 msgstr[1] "%s, %d minutit"
 
-#: ../src/util.c:2960
+#: ../libgaim/util.c:2962
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minutit"
 
-#: ../src/util.c:3427
+#: ../libgaim/util.c:3161 ../libgaim/util.c:3460
+#, fuzzy, c-format
+msgid "Unable to connect to %s"
+msgstr "Hostiga pole võimalik ühenduda"
+
+#: ../libgaim/util.c:3287
+#, c-format
+msgid ""
+"Unable to allocate enough memory to hold the contents from %s.  The web "
+"server may be trying something malicious."
+msgstr ""
+
+#: ../libgaim/util.c:3324
+#, fuzzy, c-format
+msgid "Error reading from %s: %s"
+msgstr "Viga pildi salvestamisel: %s"
+
+#: ../libgaim/util.c:3355
+#, fuzzy, c-format
+msgid "Error writing to %s: %s"
+msgstr ""
+"Viga faili %s kirjutamisel: \n"
+"%s.\n"
+
+#: ../libgaim/util.c:3380
+#, fuzzy, c-format
+msgid "Unable to connect to %s: %s"
+msgstr "Hostiga pole võimalik ühenduda"
+
+msgid "Cipher Test"
+msgstr "Šifritest"
+
+msgid "Tests the ciphers that ship with gaim."
+msgstr "Gaimiga kaasasolevate šifrite testimine."
+
+msgid "Crazychat"
+msgstr "Crazychat"
+
+msgid "Plugin to establish a Crazychat session."
+msgstr "Plugin Crazychat seansside tarbeks."
+
+msgid "TCP port"
+msgstr "TCP port"
+
+msgid "UDP port"
+msgstr "UDP port"
+
+msgid "Disabled"
+msgstr "Keelatud"
+
+msgid "DBus"
+msgstr "DBus"
+
+msgid "Blink tray icon for unread..."
+msgstr "Salveikoon plingib, kui on lugemata..."
+
+msgid "_Instant Messages:"
+msgstr "Välksõnum_id:"
+
+msgid "In hidden conversations"
+msgstr "Peidetud vestlustes"
+
+msgid "C_hat Messages:"
+msgstr "Ka_nali sõnumid:"
+
+msgid "When my nick is said"
+msgstr "Kui mu hüüdnime öeldakse"
+
+msgid "System Tray Icon"
+msgstr "Süsteemisalve ikoon"
+
+msgid "Displays an icon for Gaim in the system tray."
+msgstr "Kuvab Gaimi ikooni süsteemisalves"
+
+msgid ""
+"Displays a system tray icon (in GNOME, KDE, or Windows for example) to "
+"show the current status of Gaim, allow fast access to commonly used "
+"functions, and to toggle display of the buddy list. Also provides options "
+"to blink for unread messages."
+msgstr ""
+"Kuvab süsteemisalve ikooni (näiteks GNOME, KDE või Windows keskkonnas), "
+"mille abil näidatakse Gaim'i hetkeolekut ja samuti lubatakse selle abil "
+"kiiret ligipääsu enamkasutatavatele funktsioonidele ning lülitada "
+"sõbranimekirja ja sisselogimisakna kuvamine sisse või välja. Samuti lubab "
+"valikut, kus uute sõnumite puhul hakkab ikoon vilkuma."
+
+msgid "Buddy icon:"
+msgstr "Sõbraikoon:"
+
+msgid "IM the user"
+msgstr "Välksõnumi saatmine kasutajale"
+
+msgid "Ignore the user"
+msgstr "Kasutaja eiramine"
+
+msgid "Get the user's information"
+msgstr "Kasutaja andmete hankimine"
+
+msgid "Use TLS if available"
+msgstr "TLS-i kasutamine võimaluse korral"
+
+msgid "Require TLS"
+msgstr "TLS on vajalik"
+
+msgid "Unable to read header from server"
+msgstr "Serverist pole võimalik päist lugeda"
+
+msgid ""
+"Unable to read message from server: %s.  Command is %hd, length is %hd."
+msgstr ""
+"Serverilt tulnud sõnumit pole võimalik lugeda: %s.  Käsk on %hd, "
+"pikkus on %hd."
+
+msgid "Unknown server error."
+msgstr "Serveri tundmatu viga."
+
+msgid "users: %s, files: %s, size: %sGB"
+msgstr "kasutajaid: %s, faile: %s, suurus: %sGB"
+
+msgid "NAPSTER Protocol Plugin"
+msgstr "NAPSTER protokolli plugin"
+
+msgid "Unable to read"
+msgstr "Lugemine pole võimalik"
+
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Viga ühenduse avamisel.\n"
-