diff po/et.po @ 11857:f244cd5647af

[gaim-migrate @ 14148] I ran make dist, found lots and lots of changes. So I decided to clean out the translations tracker as well. oh and we now have a greek translation. there was also a kurdish translation, but that didn't tell me everything I need to know to commit it (such as two letter language code) committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 27 Oct 2005 19:49:55 +0000
parents 81e26b7f262e
children 83e2fa10df1c
line wrap: on
line diff
--- a/po/et.po	Thu Oct 27 19:29:15 2005 +0000
+++ b/po/et.po	Thu Oct 27 19:49:55 2005 +0000
@@ -1,14 +1,17 @@
 # GAIM'i eesti keele tõlge
-# 
+# Estonian translation of GAIM.
+#
 # Copyright (C) 2005 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GAIM package.
+#
 # Ivar Smolin <okul@linux.ee>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim 1.3.0\n"
+"Project-Id-Version: gaim 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-23 16:42-0400\n"
-"PO-Revision-Date: 2005-05-31 15:59+0200\n"
+"POT-Creation-Date: 2005-08-11 22:22-0400\n"
+"PO-Revision-Date: 2005-08-28 18:45+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
@@ -16,22 +19,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: plugins/autorecon.c:301
+#: plugins/autorecon.c:240
 msgid "Error Message Suppression"
 msgstr "Veateadete mahasurumine"
 
-#: plugins/autorecon.c:305
+#: plugins/autorecon.c:244
 msgid "Hide Disconnect Errors"
 msgstr "Lahtiühendamise vead peidetakse"
 
-#: plugins/autorecon.c:309
+#: plugins/autorecon.c:248
 msgid "Hide Login Errors"
 msgstr "Sisselogimise vead peidetakse"
 
-#: plugins/autorecon.c:313
-#, fuzzy
-msgid "Hide Reconnecting Dialog"
-msgstr "Lahtiühendamise vead peidetakse"
+#: plugins/autorecon.c:252
+msgid "Restore Away State On Reconnect"
+msgstr "Taasühendumisel taastatakse eemalolek"
 
 #. *< type
 #. *< ui_requirement
@@ -39,7 +41,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:337
+#: plugins/autorecon.c:276
 msgid "Auto-Reconnect"
 msgstr "Automaatne taasühendaja"
 
@@ -47,10 +49,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:340 plugins/autorecon.c:342
+#: plugins/autorecon.c:279 plugins/autorecon.c:281
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Katkenud ühenduse puhul ühendatakse sind taas automaatselt."
 
+#: plugins/chkmail.c:94 plugins/chkmail.c:117 plugins/chkmail.c:126
+msgid "Mail Server"
+msgstr "Postiserver"
+
+#: plugins/chkmail.c:136
+#, c-format
+msgid "%s (%d new/%d total)"
+msgstr "%s (%d uut/%d kokku)"
+
+#: plugins/chkmail.c:199
+msgid "Check Mail"
+msgstr "E-posti kontrollimine"
+
+#: plugins/chkmail.c:203
+msgid "Check email every X seconds.\n"
+msgstr "E-posti kontrollimine iga X sekundi tagant.\n"
+
 #: plugins/contact_priority.c:84
 msgid "Point values to use when..."
 msgstr ""
@@ -76,13 +95,13 @@
 msgid ""
 "The buddy with the lowest score is the buddy who will have priority in the "
 "contact.\n"
-"The default values (offline = 4, away = 2, and idle = 1) will use what used "
-"to be\n"
-"the built-in order: active, idle, away, away + idle, offline."
+"The default values (offline = 4,away = 2, and idle = 1)\n"
+"will use what used to be the built-in order active->idle->away->away+idle-"
+">offline."
 msgstr ""
 
 #: plugins/contact_priority.c:144
-msgid "Point values to use for account..."
+msgid "Point values to use for Account..."
 msgstr ""
 
 #. *< type
@@ -110,6 +129,104 @@
 "in contact priority computations."
 msgstr ""
 
+#: plugins/docklet/docklet.c:137 src/gtkaccount.c:751 src/gtkaccount.c:2179
+msgid "Auto-login"
+msgstr "Automaatne sisselogimine"
+
+#: plugins/docklet/docklet.c:140
+msgid "New Message..."
+msgstr "Uus sõnum..."
+
+#: plugins/docklet/docklet.c:141
+msgid "Join A Chat..."
+msgstr "Ühine jututoaga..."
+
+#: plugins/docklet/docklet.c:173
+msgid "New..."
+msgstr "Uus..."
+
+#: plugins/docklet/docklet.c:177 src/gtkprefs.c:1813 src/protocols/gg/gg.c:52
+#: src/protocols/irc/msgs.c:227 src/protocols/jabber/jabber.c:998
+#: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:69
+#: src/protocols/jabber/presence.c:132 src/protocols/novell/novell.c:2800
+#: src/protocols/novell/novell.c:2917 src/protocols/novell/novell.c:2969
+#: src/protocols/oscar/oscar.c:685 src/protocols/oscar/oscar.c:5830
+#: src/protocols/oscar/oscar.c:6827 src/protocols/oscar/oscar.c:7027
+#: src/protocols/silc/buddy.c:1388 src/protocols/silc/silc.c:47
+#: src/protocols/silc/silc.c:81
+msgid "Away"
+msgstr "Eemal"
+
+#. else...
+#: plugins/docklet/docklet.c:183 src/away.c:595
+#: src/protocols/oscar/oscar.c:5748 src/protocols/oscar/oscar.c:7035
+msgid "Back"
+msgstr "Tagasi"
+
+#: plugins/docklet/docklet.c:191
+msgid "Mute Sounds"
+msgstr "Vaigista helid"
+
+#: plugins/docklet/docklet.c:196 src/gtkft.c:659
+msgid "File Transfers"
+msgstr "Failiülekanded"
+
+#: plugins/docklet/docklet.c:197 src/gtkaccount.c:2391
+msgid "Accounts"
+msgstr "Kontod"
+
+#: plugins/docklet/docklet.c:198 src/gtkprefs.c:2514
+msgid "Preferences"
+msgstr "Eelistused"
+
+#: plugins/docklet/docklet.c:207
+msgid "Signoff"
+msgstr "Logi välja"
+
+#: plugins/docklet/docklet.c:211
+msgid "Quit"
+msgstr "Lõpeta"
+
+#: plugins/docklet/docklet.c:527
+msgid "Tray Icon Configuration"
+msgstr "Süsteemisalve ikooni sätted"
+
+#: plugins/docklet/docklet.c:531
+msgid "_Hide new messages until tray icon is clicked"
+msgstr "_Uute sõnumite peitmine kuni ikoonil pole klõpsatud"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/docklet/docklet.c:557
+msgid "System Tray Icon"
+msgstr "Süsteemisalve ikoon"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/docklet/docklet.c:560
+msgid "Displays an icon for Gaim in the system tray."
+msgstr "Kuvab Gaim'i ikooni süsteemisalves"
+
+#. *  description
+#: plugins/docklet/docklet.c:562
+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 or login window. Also allows "
+"messages to be queued until the icon is clicked, similar to ICQ."
+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 "
+"lubatakse ICQ sarnaselt sõnumite järjekorda panekut kuni ikoonil "
+"klõpsamiseni."
+
 #.
 #. *  DEFINES, MACROS & DATA TYPES
 #.
@@ -125,88 +242,27 @@
 msgid "Gaim - Away"
 msgstr "Gaim - eemal"
 
-#: plugins/docklet/docklet.c:383
-#, fuzzy
-msgid "Show Buddy List"
-msgstr "Sõbranimekiri"
-
-#: plugins/docklet/docklet.c:390
-msgid "New Message..."
-msgstr "Uus sõnum..."
-
-#: plugins/docklet/docklet.c:394
-msgid "Join A Chat..."
-msgstr "Ühine jututoaga..."
-
-#: plugins/docklet/docklet.c:399
-msgid "Mute Sounds"
-msgstr "Vaigista helid"
-
-#: plugins/docklet/docklet.c:406 src/gtkft.c:691
-#: src/protocols/oscar/oscar.c:8351
-msgid "File Transfers"
-msgstr "Failiülekanded"
-
-#: plugins/docklet/docklet.c:407 src/gtkaccount.c:2406
-msgid "Accounts"
-msgstr "Kontod"
-
-#: plugins/docklet/docklet.c:408 src/gtkprefs.c:1792
-msgid "Preferences"
-msgstr "Eelistused"
-
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: plugins/docklet/docklet.c:416
-msgid "Quit"
-msgstr "Lõpeta"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/docklet/docklet.c:556
-msgid "System Tray Icon"
-msgstr "Süsteemisalve ikoon"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/docklet/docklet.c:559
-msgid "Displays an icon for Gaim in the system tray."
-msgstr "Kuvab Gaim'i ikooni süsteemisalves"
-
-#. *  description
-#: plugins/docklet/docklet.c:561
-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 or login window. Also allows "
-"messages to be queued until the icon is clicked, similar to ICQ."
-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 "
-"lubatakse ICQ sarnaselt sõnumite järjekorda panekut kuni ikoonil "
-"klõpsamiseni."
-
-#: plugins/extplacement.c:79
+#: plugins/docklet/eggtrayicon.c:122
+msgid "Orientation"
+msgstr ""
+
+#: plugins/docklet/eggtrayicon.c:123
+msgid "The orientation of the tray."
+msgstr ""
+
+#: plugins/extplacement.c:77
 msgid "By conversation count"
 msgstr "Vestluste arvu järgi"
 
-#: plugins/extplacement.c:100
+#: plugins/extplacement.c:98
 msgid "Conversation Placement"
 msgstr "Vestluse asetamine"
 
-#: plugins/extplacement.c:105
+#: plugins/extplacement.c:103
 msgid "Number of conversations per window"
 msgstr "Vestluste arv akna kohta"
 
-#: plugins/extplacement.c:111
+#: plugins/extplacement.c:109
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Välksõnumi- ja jututoaakende eraldamine, kui asetatakse numbrite järgi"
 
@@ -216,19 +272,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:132
+#: plugins/extplacement.c:130
 msgid "ExtPlacement"
 msgstr "EkstraAsetus"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:134
+#: plugins/extplacement.c:132
 msgid "Extra conversation placement options."
 msgstr "Täiendavad valikud vestlusakende asetamisele."
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:136
+#: plugins/extplacement.c:134
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -242,7 +298,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:245
+#: plugins/filectl.c:224
 msgid "Gaim File Control"
 msgstr ""
 
@@ -250,7 +306,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:248 plugins/filectl.c:250
+#: plugins/filectl.c:227 plugins/filectl.c:229
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr ""
 
@@ -260,19 +316,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:91
+#: plugins/gaiminc.c:90
 msgid "Gaim Demonstration Plugin"
 msgstr "Gaim'i näidisplugin"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:94
+#: plugins/gaiminc.c:93
 msgid "An example plugin that does stuff - see the description."
 msgstr "Näidisplugin, mis teeb midagi - vaata kirjeldust."
 
 #. *  description
-#: plugins/gaiminc.c:96
+#: plugins/gaiminc.c:95
 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"
@@ -280,100 +336,74 @@
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-#: plugins/gaimrc.c:40
-msgid "Cursor Color"
-msgstr ""
-
-#: plugins/gaimrc.c:41
-msgid "Secondary Cursor Color"
-msgstr ""
-
-#: plugins/gaimrc.c:42
-#, fuzzy
-msgid "Hyperlink Color"
-msgstr "Hüperviida värv"
-
-#: plugins/gaimrc.c:53
-msgid "GtkTreeView Expander Size"
-msgstr ""
-
-#: plugins/gaimrc.c:72
-#, fuzzy
-msgid "Conversation Entry"
-msgstr "Vestlused"
-
-#: plugins/gaimrc.c:73
-#, fuzzy
-msgid "Conversation History"
-msgstr "Vestlused"
-
-#: plugins/gaimrc.c:74
-#, fuzzy
-msgid "Log Viewer"
-msgstr "Sisselogimise server"
-
-#: plugins/gaimrc.c:75
-#, fuzzy
-msgid "Request Dialog"
-msgstr "Autoriseerimise küsimine"
-
-#: plugins/gaimrc.c:76
-#, fuzzy
-msgid "Notify Dialog"
-msgstr "Teavitused kehtivad"
-
-#: plugins/gaimrc.c:209
-#, fuzzy, c-format
-msgid "Select Color for %s"
-msgstr "Teksti värvi valimine"
-
-#: plugins/gaimrc.c:211
-#, fuzzy
-msgid "Select Color"
-msgstr "Teksti värvi valimine"
-
-#: plugins/gaimrc.c:246
-#, fuzzy, c-format
-msgid "Select Font for %s"
-msgstr "Kirjatüübi valimine"
-
-#: plugins/gaimrc.c:284
-#, fuzzy
-msgid "Select Interface Font"
-msgstr "Kirjatüübi valimine"
-
-#: plugins/gaimrc.c:343
-#, fuzzy
-msgid "GTK+ Interface Font"
-msgstr "Liidese valikud"
-
-#: plugins/gaimrc.c:362
-msgid "GTK+ Text Shortcut Theme"
-msgstr ""
-
-#: plugins/gaimrc.c:460
-msgid "Gaim GTK+ Theme Control"
-msgstr ""
-
-#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
-msgid "Provides access to commonly used gtkrc settings."
-msgstr ""
+#: plugins/gaim-remote/remote.c:91
+msgid "Not connected to AIM"
+msgstr ""
+
+#: plugins/gaim-remote/remote.c:100 plugins/gaim-remote/remote.c:139
+msgid "No screenname given."
+msgstr "Ekraaninime pole määratud."
+
+#: plugins/gaim-remote/remote.c:176
+msgid "No roomname given."
+msgstr "Toa nime pole määratud."
+
+#: plugins/gaim-remote/remote.c:195
+msgid "Invalid AIM URI"
+msgstr "Vigane AIM'i URI"
+
+#: plugins/gaim-remote/remote.c:673
+#, c-format
+msgid ""
+"Failed to assign %s to a socket:\n"
+"%s"
+msgstr ""
+
+#: plugins/gaim-remote/remote.c:697
+msgid "Unable to open socket"
+msgstr "Soklit pole võimalik avada"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gaim-remote/remote.c:747
+msgid "Remote Control"
+msgstr "Kaugjuhtimine"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/gaim-remote/remote.c:750
+msgid "Provides remote control for gaim applications."
+msgstr "Gaimi rakenduste kaugjuhtimine."
+
+#. *  description
+#: plugins/gaim-remote/remote.c:752
+msgid ""
+"Gives Gaim the ability to be remote-controlled through third-party "
+"applications or through the gaim-remote tool."
+msgstr ""
+"Lisab Gaim'ile kaugjuhtimise võimaluse kolmandate osapoolte rakenduste või "
+"gaim-remote vahendi abil."
 
 #. Configuration frame
-#: plugins/gestures/gestures.c:243
+#: plugins/gestures/gestures.c:221
 msgid "Mouse Gestures Configuration"
 msgstr ""
 
-#: plugins/gestures/gestures.c:250
+#: plugins/gestures/gestures.c:228
 msgid "Middle mouse button"
 msgstr "Keskmine hiirenupp"
 
-#: plugins/gestures/gestures.c:255
+#: plugins/gestures/gestures.c:233
 msgid "Right mouse button"
 msgstr "Parempoolne hiirenupp"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:267
+#: plugins/gestures/gestures.c:245
 msgid "_Visual gesture display"
 msgstr ""
 
@@ -383,19 +413,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:296
+#: plugins/gestures/gestures.c:274
 msgid "Mouse Gestures"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:299
+#: plugins/gestures/gestures.c:277
 msgid "Provides support for mouse gestures"
 msgstr ""
 
 #. *  description
-#: plugins/gestures/gestures.c:301
+#: plugins/gestures/gestures.c:279
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -406,8 +436,9 @@
 msgstr ""
 
 #: plugins/gevolution/add_buddy_dialog.c:132
-#: plugins/gevolution/assoc-buddy.c:120 src/gtkroomlist.c:572
-#: src/protocols/jabber/jabber.c:638 src/protocols/msn/msn.c:1539
+#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2168
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:609
+#: src/protocols/msn/msn.c:1474 src/protocols/trepia/trepia.c:399
 msgid "Name"
 msgstr "Nimi"
 
@@ -416,31 +447,30 @@
 msgstr "Välksõnumivahendid"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:459
+#: plugins/gevolution/add_buddy_dialog.c:455
 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:472
-#: plugins/gevolution/assoc-buddy.c:354 src/protocols/jabber/buddy.c:1357
-#: src/protocols/oscar/oscar.c:8122
+#: plugins/gevolution/add_buddy_dialog.c:468
+#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7311
 msgid "Search"
 msgstr "Otsi"
 
-#: plugins/gevolution/add_buddy_dialog.c:553
-#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4069
-#: src/gtkblist.c:4446
+#: plugins/gevolution/add_buddy_dialog.c:549
+#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4186
+#: src/gtkblist.c:4534
 msgid "Group:"
 msgstr "Grupp:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:579
-#: plugins/gevolution/assoc-buddy.c:465
+#: plugins/gevolution/add_buddy_dialog.c:575
+#: plugins/gevolution/assoc-buddy.c:466
 msgid "New Person"
 msgstr "Uus isik"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:596
+#: plugins/gevolution/add_buddy_dialog.c:592
 msgid "Select Buddy"
 msgstr "Vali sõber"
 
@@ -451,56 +481,47 @@
 "person."
 msgstr ""
 
-#. Add the expander
+#. Add the disclosure
 #: plugins/gevolution/assoc-buddy.c:429
-#, fuzzy
-msgid "User _details"
-msgstr "Näita ülekande üksikasju"
+msgid "Show user details"
+msgstr "Näita kasutaja üksikasju"
+
+#: plugins/gevolution/assoc-buddy.c:430
+msgid "Hide user details"
+msgstr "Peida kasutaja üksikasjad"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:482
+#: plugins/gevolution/assoc-buddy.c:483
 msgid "_Associate Buddy"
 msgstr ""
 
-#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
-#: src/blist.c:518 src/blist.c:1259 src/blist.c:1480 src/gtkblist.c:3884
-#: src/protocols/jabber/roster.c:66
+#: plugins/gevolution/eds-utils.c:74 plugins/gevolution/eds-utils.c:87
+#: src/gtkblist.c:3122 src/gtkprefs.c:962 src/gtkprefs.c:1014
+#: src/gtkprefs.c:1827 src/protocols/jabber/jabber.c:949
+msgid "None"
+msgstr "Puudub"
+
+#: plugins/gevolution/gevolution.c:93 plugins/gevolution/gevo-util.c:64
+#: src/blist.c:776 src/blist.c:983 src/blist.c:1936 src/gtkblist.c:4001
+#: src/protocols/jabber/roster.c:67
 msgid "Buddies"
 msgstr "Sõbrad"
 
-#: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
-#, fuzzy
-msgid "Unable to send e-mail"
-msgstr "Sõnumit pole võimalik saata."
-
-#: plugins/gevolution/gevolution.c:263
-msgid "The evolution executable was not found in the PATH."
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:269
-msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:286
+#: plugins/gevolution/gevolution.c:225
 msgid "Add to Address Book"
 msgstr ""
 
-#: plugins/gevolution/gevolution.c:290
-#, fuzzy
-msgid "Send E-Mail"
-msgstr "E-post"
-
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:414
+#: plugins/gevolution/gevolution.c:348
 msgid "Evolution Integration Configuration"
 msgstr "Evolution'iga sidumise sätted"
 
 #. Label
-#: plugins/gevolution/gevolution.c:417
+#: plugins/gevolution/gevolution.c:351
 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:447 plugins/idle.c:111 plugins/idle.c:140
+#: plugins/gevolution/gevolution.c:381 plugins/idle.c:52 src/gtkconn.c:627
 msgid "Account"
 msgstr "Konto"
 
@@ -510,7 +531,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:530
+#: plugins/gevolution/gevolution.c:464
 msgid "Evolution Integration"
 msgstr "Evolution'iga sidumine"
 
@@ -518,78 +539,80 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
-#, fuzzy
-msgid "Provides integration with Evolution."
+#: plugins/gevolution/gevolution.c:467 plugins/gevolution/gevolution.c:469
+msgid "Provides integration with Ximian Evolution."
 msgstr "Tagab integratsiooni Ximian Evolution'iga."
 
-#: plugins/gevolution/new_person_dialog.c:266
+#: plugins/gevolution/new_person_dialog.c:264
 msgid "Please enter the person's information below."
 msgstr ""
 
-#: plugins/gevolution/new_person_dialog.c:270
+#: plugins/gevolution/new_person_dialog.c:268
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Palun sisesta allolevasse vormi sõbra ekraaninimi ja konto tüüp."
 
-#: plugins/gevolution/new_person_dialog.c:290
+#: plugins/gevolution/new_person_dialog.c:288
 msgid "Account type:"
 msgstr "Konto tüüp:"
 
-#: plugins/gevolution/new_person_dialog.c:294
+#: plugins/gevolution/new_person_dialog.c:292
 msgid "Screenname:"
 msgstr "Ekraaninimi:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:314
+#: plugins/gevolution/new_person_dialog.c:312
 msgid "Optional information:"
-msgstr "Täiendav teave:"
+msgstr "Täiendavad andmed:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:413
-#: src/gtkaccount.c:435 src/protocols/oscar/oscar.c:613
+#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:379
+#: src/gtkaccount.c:409 src/protocols/oscar/oscar.c:591
 msgid "Buddy Icon"
 msgstr "Sõbraikoon"
 
-#: plugins/gevolution/new_person_dialog.c:349
+#: plugins/gevolution/new_person_dialog.c:347
 msgid "First name:"
 msgstr "Eesnimi:"
 
-#: plugins/gevolution/new_person_dialog.c:361
+#: plugins/gevolution/new_person_dialog.c:359
 msgid "Last name:"
 msgstr "Perekonnanimi:"
 
-#: plugins/gevolution/new_person_dialog.c:381
+#: plugins/gevolution/new_person_dialog.c:379
 msgid "E-mail:"
 msgstr "E-post:"
 
-#: plugins/history.c:138
-msgid "History Plugin Requires Logging"
-msgstr ""
-
-#: plugins/history.c:139
-msgid ""
-"Logging can be enabled from Tools -> Preferences -> Logging.\n"
-"\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
-msgstr ""
-
-#: plugins/history.c:178
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gtk-signals-test.c:102
+msgid "GTK Signals Test"
+msgstr "GTK signaalide test"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/gtk-signals-test.c:105 plugins/gtk-signals-test.c:107
+msgid "Test to see that all ui signals are working properly."
+msgstr ""
+"Test kontrollimaks, kas kasutajaliidese signaalid töötavad korrektselt."
+
+#: plugins/history.c:92
 msgid "History"
 msgstr "Ajalugu"
 
-#: plugins/history.c:180
+#: plugins/history.c:94
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Uutes vestlustes näidatakse viimati logitud vestlusi."
 
-#: plugins/history.c:181
+#: plugins/history.c:95
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation.\n"
-"\n"
-"The history plugin requires logging be enabled. Logging can be enabled from "
-"Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
-"chats will activate history for the same conversation type(s)."
+"conversation into the current conversation."
 msgstr ""
 
 #. *< type
@@ -598,7 +621,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/iconaway.c:101
+#: plugins/iconaway.c:104
 msgid "Iconify on Away"
 msgstr ""
 
@@ -606,47 +629,32 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:104 plugins/iconaway.c:106
+#: plugins/iconaway.c:107 plugins/iconaway.c:109
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Sinu eemaldumisel sõbranimekirja ja vestlusakende ikooniks taandaja."
 
-#: plugins/idle.c:115
+#: plugins/idle.c:56
 msgid "Minutes"
 msgstr "Minuteid"
 
-#: plugins/idle.c:122 plugins/idle.c:149 plugins/idle.c:215
+#: plugins/idle.c:63 plugins/idle.c:98
 msgid "I'dle Mak'er"
 msgstr "Tegevuseta aja määraja"
 
-#: plugins/idle.c:123 plugins/idle.c:181
+#: plugins/idle.c:64 plugins/idle.c:79
 msgid "Set Account Idle Time"
 msgstr "Määra konto tegevuseta aeg"
 
-#: plugins/idle.c:126
+#: plugins/idle.c:67
 msgid "_Set"
 msgstr "_Määra"
 
-#: plugins/idle.c:127 plugins/idle.c:154
+#: plugins/idle.c:68 src/away.c:922
 msgid "_Cancel"
 msgstr "_Loobu"
 
-#: plugins/idle.c:150 plugins/idle.c:185
-#, fuzzy
-msgid "Unset Account Idle Time"
-msgstr "Määra konto tegevuseta aeg"
-
-#: plugins/idle.c:153
-#, fuzzy
-msgid "_Unset"
-msgstr "_Kasuta"
-
-#: plugins/idle.c:190
-msgid "Unset Idle Time For All Idled Accounts"
-msgstr ""
-
-#: plugins/idle.c:217 plugins/idle.c:218
-#, fuzzy
-msgid "Allows you to hand-configure how long you've been idle"
+#: plugins/idle.c:100 plugins/idle.c:101
+msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "Lubab sul käsitsi määrata, kui kaua sa oled jõude olnud"
 
 #. *< type
@@ -697,85 +705,81 @@
 
 #: plugins/mailchk.c:160
 msgid "Mail Checker"
-msgstr ""
+msgstr "E-posti kontrollija"
 
 #: plugins/mailchk.c:162
 msgid "Checks for new local mail."
-msgstr ""
+msgstr "Uute e-posti sõnumite kontrollimine."
 
 #: plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
+"Lisab sõbranimekirja väikese kastikese, mille abil näidatakse uute e-posti "
+"sõnumite olemasolu."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:638
+#: plugins/notify.c:614
 msgid "Notify For"
 msgstr "Teavitused kehtivad"
 
-#: plugins/notify.c:642
+#: plugins/notify.c:618
 msgid "_IM windows"
 msgstr "_Välksõnumiakendele"
 
-#: plugins/notify.c:649
+#: plugins/notify.c:625
 msgid "C_hat windows"
 msgstr "_Jututoaakendele"
 
-#: plugins/notify.c:656
+#: plugins/notify.c:632
 msgid "_Focused windows"
 msgstr "_Fookuses olevatele akendele"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:664
+#: plugins/notify.c:640
 msgid "Notification Methods"
 msgstr "Teavitamisviisid"
 
-#: plugins/notify.c:671
+#: plugins/notify.c:647
 msgid "Prepend _string into window title:"
 msgstr "Aknatiitli ette _lisatakse string:"
 
 #. Count method button
-#: plugins/notify.c:690
+#: plugins/notify.c:666
 msgid "Insert c_ount of new messages into window title"
 msgstr "Aknatiitlisse lisatakse uute sõnumite _arv"
 
 #. Urgent method button
-#: plugins/notify.c:698
+#: plugins/notify.c:674
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Aknahalduri \"_URGENT\" vihje"
 
-#. Raise window method button
-#: plugins/notify.c:706
-#, fuzzy
-msgid "R_aise conversation window"
-msgstr "Välksõnumite aknad"
-
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:714
+#: plugins/notify.c:682
 msgid "Notification Removal"
 msgstr "Teavituste eemaldamine"
 
 #. Remove on focus button
-#: plugins/notify.c:719
+#: plugins/notify.c:687
 msgid "Remove when conversation window _gains focus"
 msgstr "Eemaldamine, kui vestlusaken sa_tub fookusesse"
 
 #. Remove on click button
-#: plugins/notify.c:726
+#: plugins/notify.c:694
 msgid "Remove when conversation window _receives click"
 msgstr "Eemaldamine, kui vestlusaknale _klikitakse"
 
 #. Remove on type button
-#: plugins/notify.c:734
+#: plugins/notify.c:702
 msgid "Remove when _typing in conversation window"
 msgstr "Eemaldamine, kui vestlusaknas _trükitakse"
 
 #. Remove on message send button
-#: plugins/notify.c:742
+#: plugins/notify.c:710
 msgid "Remove when a _message gets sent"
 msgstr "Eemaldamine, kui sõ_num saab saadetud"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:751
+#: plugins/notify.c:719
 msgid "Remove on switch to conversation ta_b"
 msgstr ""
 
@@ -785,7 +789,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:841
+#: plugins/notify.c:809
 msgid "Message Notification"
 msgstr "Sõnumitest teavitaja"
 
@@ -793,7 +797,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:844 plugins/notify.c:846
+#: plugins/notify.c:812 plugins/notify.c:814
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Mitut sorti võimalusi lugemata sõnumitest teavitamiseks"
 
@@ -803,14 +807,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:583
+#: plugins/perl/perl.c:535
 msgid "Perl Plugin Loader"
 msgstr "Perl'i pluginate laadija"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:585 plugins/perl/perl.c:586
+#: plugins/perl/perl.c:537 plugins/perl/perl.c:538
 msgid "Provides support for loading perl plugins."
 msgstr "Perl'is kirjutatud pluginate tugi"
 
@@ -885,7 +889,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:730
+#: plugins/signals-test.c:601
 msgid "Signals Test"
 msgstr ""
 
@@ -893,7 +897,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:733 plugins/signals-test.c:735
+#: plugins/signals-test.c:604 plugins/signals-test.c:606
 msgid "Test to see that all signals are working properly."
 msgstr ""
 
@@ -915,51 +919,35 @@
 msgid "Tests to see that most things are working."
 msgstr ""
 
-#: plugins/spellchk.c:1788
-msgid "Duplicate Correction"
-msgstr ""
-
-#: plugins/spellchk.c:1789
-msgid "The specified word already exists in the correction list."
-msgstr ""
-
-#: plugins/spellchk.c:1939
+#: plugins/spellchk.c:416
 msgid "Text Replacements"
 msgstr "Tekstiasendused"
 
-#: plugins/spellchk.c:1963
+#: plugins/spellchk.c:440
 msgid "You type"
 msgstr "Sina trükid"
 
-#: plugins/spellchk.c:1975
+#: plugins/spellchk.c:452
 msgid "You send"
 msgstr "Tekst saaadetakse kui"
 
-#: plugins/spellchk.c:1987
-msgid "Whole words only"
-msgstr ""
-
-#: plugins/spellchk.c:2013
+#: plugins/spellchk.c:478
 msgid "Add a new text replacement"
 msgstr "Uue asenduse lisamine"
 
-#: plugins/spellchk.c:2023
+#: plugins/spellchk.c:485
 msgid "You _type:"
 msgstr "Sina _trükid:"
 
-#: plugins/spellchk.c:2039
+#: plugins/spellchk.c:499
 msgid "You _send:"
 msgstr "Tekst saadetakse _kui:"
 
-#: plugins/spellchk.c:2051
-msgid "Only replace _whole words"
-msgstr ""
-
-#: plugins/spellchk.c:2088
+#: plugins/spellchk.c:541
 msgid "Text replacement"
 msgstr "Tekstiasendaja"
 
-#: plugins/spellchk.c:2090 plugins/spellchk.c:2091
+#: plugins/spellchk.c:543 plugins/spellchk.c:544
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Asendab väljaminevates sõnumites teksti vastavalt kasutaja poolt määratud "
@@ -971,42 +959,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:227
-msgid "GNUTLS"
-msgstr "GNUTLS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl-gnutls.c:230 plugins/ssl/ssl-gnutls.c:232
-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:319
-msgid "NSS"
-msgstr "NSS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl-nss.c:322 plugins/ssl/ssl-nss.c:324
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "SSL toe tagamine Mozilal NSS'i abil"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
 #: plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr ""
@@ -1019,35 +971,71 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr ""
 
-#: plugins/statenotify.c:42
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-gnutls.c:226
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/ssl/ssl-gnutls.c:229 plugins/ssl/ssl-gnutls.c:231
+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:318
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/ssl/ssl-nss.c:321 plugins/ssl/ssl-nss.c:323
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "SSL toe tagamine Mozilal NSS'i abil"
+
+#: plugins/statenotify.c:41
 #, c-format
 msgid "%s has gone away."
-msgstr ""
-
-#: plugins/statenotify.c:49
+msgstr "%s on eemal."
+
+#: plugins/statenotify.c:48
 #, c-format
 msgid "%s is no longer away."
-msgstr ""
-
-#: plugins/statenotify.c:56
+msgstr "%s ei ole enam eemal."
+
+#: plugins/statenotify.c:55
 #, c-format
 msgid "%s has become idle."
-msgstr ""
-
-#: plugins/statenotify.c:63
+msgstr "%s on tegevuseta."
+
+#: plugins/statenotify.c:62
 #, c-format
 msgid "%s is no longer idle."
-msgstr ""
-
-#: plugins/statenotify.c:74
+msgstr "%s ei ole enam tegevuseta."
+
+#: plugins/statenotify.c:73
 msgid "Notify When"
 msgstr "Millal teavitatakse"
 
-#: plugins/statenotify.c:77
+#: plugins/statenotify.c:76
 msgid "Buddy Goes _Away"
 msgstr "Kui sõber läheb _eemale"
 
-#: plugins/statenotify.c:80
+#: plugins/statenotify.c:79
 msgid "Buddy Goes _Idle"
 msgstr "Kui sõber on _tegevuseta"
 
@@ -1057,7 +1045,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:120
+#: plugins/statenotify.c:119
 msgid "Buddy State Notification"
 msgstr "Sõprade oleku teavitaja"
 
@@ -1065,7 +1053,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:123 plugins/statenotify.c:126
+#: plugins/statenotify.c:122 plugins/statenotify.c:125
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1086,7 +1074,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:326
+#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:331
 msgid "Buddy Ticker"
 msgstr "Sõbratiksuja"
 
@@ -1094,29 +1082,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:329 plugins/ticker/ticker.c:331
+#: plugins/ticker/ticker.c:334 plugins/ticker/ticker.c:336
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Horisontalselt keriv versioon sõbranimekirjast."
 
-#: plugins/timestamp.c:202
+#: plugins/timestamp.c:186
 msgid "iChat Timestamp"
 msgstr "iChat ajatempel"
 
-#: plugins/timestamp.c:209
+#: plugins/timestamp.c:193
 msgid "Delay"
 msgstr "Viivitus"
 
-#: plugins/timestamp.c:216
+#: plugins/timestamp.c:200
 msgid "minutes."
 msgstr "minutit."
 
+#: plugins/timestamp.c:206
+msgid "_Apply"
+msgstr "_Rakenda"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:279
+#: plugins/timestamp.c:271
 msgid "Timestamp"
 msgstr "Ajatempel"
 
@@ -1124,288 +1116,284 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:282 plugins/timestamp.c:284
+#: plugins/timestamp.c:274 plugins/timestamp.c:276
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "iChat-stiilis ajatemplite lisamine vestlusele iga N minuti järel."
 
-#: plugins/win32/transparency/win2ktrans.c:183
-#: plugins/win32/transparency/win2ktrans.c:569
-#: plugins/win32/transparency/win2ktrans.c:616
+#: plugins/win32/transparency/win2ktrans.c:134
+#: plugins/win32/transparency/win2ktrans.c:413
+#: plugins/win32/transparency/win2ktrans.c:444
 msgid "Opacity:"
 msgstr "Läbipaistmatus:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:533
+#: plugins/win32/transparency/win2ktrans.c:394
 msgid "IM Conversation Windows"
 msgstr "Välksõnumite aknad"
 
-#: plugins/win32/transparency/win2ktrans.c:534
+#: plugins/win32/transparency/win2ktrans.c:395
 msgid "_IM window transparency"
 msgstr "_Välksõnumiaknad on läbipaistvad"
 
-#: plugins/win32/transparency/win2ktrans.c:548
+#: plugins/win32/transparency/win2ktrans.c:405
 msgid "_Show slider bar in IM window"
 msgstr "_Liuguri näitamine välksõnumiakendes"
 
-#: plugins/win32/transparency/win2ktrans.c:555
-#, fuzzy
-msgid "Remove IM window transparency on focus"
-msgstr "_Välksõnumiaknad on läbipaistvad"
-
-#: plugins/win32/transparency/win2ktrans.c:558
-#: plugins/win32/transparency/win2ktrans.c:606
-msgid "Always on top"
-msgstr ""
-
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:590
+#: plugins/win32/transparency/win2ktrans.c:430 src/gtkprefs.c:956
 msgid "Buddy List Window"
 msgstr "Sõbranimekirja aken"
 
-#: plugins/win32/transparency/win2ktrans.c:591
+#: plugins/win32/transparency/win2ktrans.c:431
 msgid "_Buddy List window transparency"
 msgstr "Sõbraaken on _läbipaistev"
 
-#: plugins/win32/transparency/win2ktrans.c:604
-#, fuzzy
-msgid "Remove Buddy List window transparency on focus"
-msgstr "Sõbraaken on _läbipaistev"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:657
+#: plugins/win32/transparency/win2ktrans.c:489
 msgid "Transparency"
 msgstr "Läbipaistvus"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:660
+#: plugins/win32/transparency/win2ktrans.c:492
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr ""
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:662
+#: plugins/win32/transparency/win2ktrans.c:494
 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:385
+"* Note: This plugin requires Win2000 or WinXP."
+msgstr ""
+
+#: plugins/win32/winprefs/winprefs.c:344
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime versioon"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:393
+#: plugins/win32/winprefs/winprefs.c:352
 msgid "Startup"
 msgstr "Käivitamine"
 
-#: plugins/win32/winprefs/winprefs.c:394
+#: plugins/win32/winprefs/winprefs.c:353
 msgid "_Start Gaim on Windows startup"
 msgstr "_Gaim'i käivitamine Windows'i käivitamisel"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:405 src/gtkblist.c:3164
-#: src/gtkprefs.c:1755
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3167
+#: src/gtkprefs.c:2421
 msgid "Buddy List"
 msgstr "Sõbranimekiri"
 
-#: plugins/win32/winprefs/winprefs.c:406
+#: plugins/win32/winprefs/winprefs.c:363
 msgid "_Dockable Buddy List"
 msgstr "_Dokitav sõbranimekiri"
 
+#. Docked Blist On Top
+#: plugins/win32/winprefs/winprefs.c:367
+msgid "Docked _Buddy List is always on top"
+msgstr "D_okitud sõbranimekiri on alati pealmine"
+
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:410
-#, fuzzy
-msgid "_Keep Buddy List window on top:"
+#: plugins/win32/winprefs/winprefs.c:377
+msgid "_Keep Buddy List window on top"
 msgstr "Sõbranimekirja _hoitakse pealmisena"
 
-#: plugins/win32/winprefs/winprefs.c:412 src/gtkprefs.c:1691
-msgid "Never"
-msgstr "Mitte iial"
-
-#: plugins/win32/winprefs/winprefs.c:413
-#, fuzzy
-msgid "Always"
-msgstr "Eemal"
-
-#. XXX: Did this ever work?
-#: plugins/win32/winprefs/winprefs.c:415
-msgid "Only when docked"
-msgstr ""
-
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:419 src/gtkprefs.c:837
-#: src/gtkprefs.c:1756
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1007
+#: src/gtkprefs.c:2422 src/protocols/msn/msn.c:1811
 msgid "Conversations"
 msgstr "Vestlused"
 
-#: plugins/win32/winprefs/winprefs.c:420
-#, fuzzy
-msgid "_Flash window when messages are received"
+#: plugins/win32/winprefs/winprefs.c:383
+msgid "_Flash Window when messages are received"
 msgstr "_Akna vilgutamine sõnumi vastuvõtmisel"
 
-#: plugins/win32/winprefs/winprefs.c:443
+#: plugins/win32/winprefs/winprefs.c:407
 msgid "WinGaim Options"
 msgstr "WinGaim'i valikud"
 
-#: plugins/win32/winprefs/winprefs.c:445
+#: plugins/win32/winprefs/winprefs.c:409 plugins/win32/winprefs/winprefs.c:410
 msgid "Options specific to Windows Gaim."
 msgstr "Windows'i Gaim'ile omased valikud."
 
-#: plugins/win32/winprefs/winprefs.c:446
-msgid ""
-"Provides options specific to Windows Gaim, such as buddy list docking and "
-"conversation flashing."
-msgstr ""
-
-#: src/account.c:773
-#, fuzzy
-msgid "accounts"
-msgstr "Kontod"
-
-#: src/account.c:915
-#, fuzzy
-msgid "Password is required to sign on."
-msgstr "Parool on aegunud"
-
-#: src/account.c:940
-#, c-format
-msgid "Enter password for %s (%s)"
-msgstr "Sisesta parool %s jaoks (%s)"
-
-#: src/account.c:947
-#, fuzzy
-msgid "Enter Password"
-msgstr "Muuda parooli"
-
-#: src/account.c:952
-#, fuzzy
-msgid "Save password"
+#: src/account.c:298 src/protocols/jabber/jabber.c:1039
+msgid "New passwords do not match."
+msgstr "Uued paroolid ei klapi omavahel."
+
+#: src/account.c:307
+msgid "Fill out all fields completely."
+msgstr ""
+
+#: src/account.c:332
+msgid "Original password"
+msgstr "Algne parool"
+
+#: src/account.c:339
+msgid "New password"
 msgstr "Uus parool"
 
+#: src/account.c:346
+msgid "New password (again)"
+msgstr "Uus parool (veel kord)"
+
+#: src/account.c:352
+#, c-format
+msgid "Change password for %s"
+msgstr ""
+
+#: src/account.c:360
+msgid "Please enter your current password and your new password."
+msgstr "Palun sisesta oma praegune parool ja uus parool."
+
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:960 src/account.c:1116 src/gtkdialogs.c:506
-#: src/gtkdialogs.c:647 src/gtkdialogs.c:703 src/gtkrequest.c:260
-#: src/protocols/gg/gg.c:434 src/protocols/gg/gg.c:581
-#: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1162
-#: 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:2902
-#: src/protocols/oscar/oscar.c:4410 src/protocols/oscar/oscar.c:4491
-#: src/protocols/oscar/oscar.c:7851 src/protocols/oscar/oscar.c:7976
-#: src/protocols/oscar/oscar.c:8001 src/protocols/oscar/oscar.c:8053
-#: src/protocols/silc/buddy.c:465 src/protocols/silc/buddy.c:1137
-#: src/protocols/silc/chat.c:422 src/protocols/silc/chat.c:460
-#: src/protocols/silc/chat.c:723 src/protocols/silc/ops.c:1083
-#: src/protocols/silc/ops.c:1696 src/protocols/silc/silc.c:716
-#: src/protocols/yahoo/yahoo.c:2947 src/protocols/yahoo/yahoo.c:2956
-#: src/request.h:1331
+#: src/account.c:363 src/connection.c:198 src/gtkblist.c:2492
+#: src/gtkdialogs.c:506 src/gtkdialogs.c:648 src/gtkdialogs.c:702
+#: src/gtkrequest.c:243 src/protocols/jabber/jabber.c:1086
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:226
+#: src/protocols/msn/msn.c:241 src/protocols/msn/msn.c:256
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:2418
+#: src/protocols/oscar/oscar.c:3715 src/protocols/oscar/oscar.c:3809
+#: src/protocols/oscar/oscar.c:7098 src/protocols/oscar/oscar.c:7190
+#: src/protocols/oscar/oscar.c:7242 src/protocols/oscar/oscar.c:7328
+#: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
+#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: src/protocols/silc/chat.c:722 src/protocols/silc/ops.c:1081
+#: src/protocols/silc/ops.c:1699 src/protocols/silc/silc.c:711
+#: src/protocols/yahoo/yahoo.c:3021 src/protocols/yahoo/yahoo.c:3030
+#: src/request.h:1245
 msgid "OK"
 msgstr "Olgu"
 
-#: src/account.c:961 src/account.c:1117 src/account.c:1155
-#: src/gtkaccount.c:2108 src/gtkaccount.c:2570 src/gtkblist.c:4484
-#: src/gtkdialogs.c:507 src/gtkdialogs.c:648 src/gtkdialogs.c:704
-#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
-#: src/gtkdialogs.c:809 src/gtkdialogs.c:871 src/gtkdialogs.c:913
-#: src/gtkdialogs.c:955 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:595
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
-#: src/gtkrequest.c:261 src/gtksavedstatuses.c:188 src/protocols/gg/gg.c:435
-#: src/protocols/gg/gg.c:582 src/protocols/gg/gg.c:656
-#: src/protocols/gg/gg.c:1498 src/protocols/jabber/buddy.c:573
-#: src/protocols/jabber/buddy.c:1358 src/protocols/jabber/buddy.c:1392
-#: src/protocols/jabber/chat.c:780 src/protocols/jabber/jabber.c:707
-#: src/protocols/jabber/jabber.c:1163 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:1596
-#: src/protocols/oscar/oscar.c:2903 src/protocols/oscar/oscar.c:4368
-#: src/protocols/oscar/oscar.c:4411 src/protocols/oscar/oscar.c:4448
-#: src/protocols/oscar/oscar.c:4492 src/protocols/oscar/oscar.c:7852
-#: src/protocols/oscar/oscar.c:7977 src/protocols/oscar/oscar.c:8002
-#: src/protocols/oscar/oscar.c:8054 src/protocols/oscar/oscar.c:8123
-#: src/protocols/silc/buddy.c:466 src/protocols/silc/buddy.c:1042
-#: src/protocols/silc/buddy.c:1138 src/protocols/silc/chat.c:595
-#: src/protocols/silc/chat.c:724 src/protocols/silc/ops.c:1697
-#: src/protocols/silc/silc.c:717 src/protocols/yahoo/yahoo.c:2948
-#: src/protocols/yahoo/yahoo.c:2957 src/request.h:1331 src/request.h:1341
+#: src/account.c:364 src/account.c:402 src/away.c:367 src/connection.c:199
+#: src/gtkaccount.c:2029 src/gtkaccount.c:2568 src/gtkaccount.c:2599
+#: src/gtkblist.c:2493 src/gtkblist.c:4572 src/gtkconn.c:169
+#: src/gtkdialogs.c:507 src/gtkdialogs.c:649 src/gtkdialogs.c:703
+#: src/gtkdialogs.c:801 src/gtkdialogs.c:823 src/gtkdialogs.c:843
+#: src/gtkdialogs.c:880 src/gtkdialogs.c:940 src/gtkdialogs.c:983
+#: src/gtkdialogs.c:1024 src/gtkimhtmltoolbar.c:437 src/gtkprivacy.c:597
+#: src/gtkprivacy.c:610 src/gtkprivacy.c:635 src/gtkprivacy.c:646
+#: src/gtkrequest.c:244 src/protocols/icq/gaim_icq.c:276
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:754
+#: src/protocols/jabber/jabber.c:678 src/protocols/jabber/jabber.c:1087
+#: src/protocols/jabber/presence.c:213 src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:227 src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:257 src/protocols/msn/msn.c:272
+#: src/protocols/msn/msn.c:289 src/protocols/oscar/oscar.c:1535
+#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:3673
+#: src/protocols/oscar/oscar.c:3716 src/protocols/oscar/oscar.c:3753
+#: src/protocols/oscar/oscar.c:3810 src/protocols/oscar/oscar.c:7099
+#: src/protocols/oscar/oscar.c:7191 src/protocols/oscar/oscar.c:7243
+#: src/protocols/oscar/oscar.c:7312 src/protocols/oscar/oscar.c:7329
+#: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
+#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:594
+#: src/protocols/silc/chat.c:723 src/protocols/silc/ops.c:1700
+#: src/protocols/silc/silc.c:712 src/protocols/trepia/trepia.c:348
+#: src/protocols/yahoo/yahoo.c:3022 src/protocols/yahoo/yahoo.c:3031
+#: src/request.h:1245 src/request.h:1255
 msgid "Cancel"
 msgstr "Loobu"
 
-#: src/account.c:986 src/connection.c:96
-#, c-format
-msgid "Missing protocol plugin for %s"
-msgstr ""
-
-#: src/account.c:988 src/connection.c:99
-msgid "Connection Error"
-msgstr ""
-
-#: src/account.c:1052 src/protocols/gg/gg.c:470
-#: src/protocols/jabber/jabber.c:1115
-msgid "New passwords do not match."
-msgstr "Uued paroolid ei klapi omavahel."
-
-#: src/account.c:1061
-msgid "Fill out all fields completely."
-msgstr ""
-
-#: src/account.c:1085
-msgid "Original password"
-msgstr "Algne parool"
-
-#: src/account.c:1092
-msgid "New password"
-msgstr "Uus parool"
-
-#: src/account.c:1099
-msgid "New password (again)"
-msgstr "Uus parool (veel kord)"
-
-#: src/account.c:1105
-#, c-format
-msgid "Change password for %s"
-msgstr ""
-
-#: src/account.c:1113
-msgid "Please enter your current password and your new password."
-msgstr "Palun sisesta oma praegune parool ja uus parool."
-
-#: src/account.c:1146
+#: src/account.c:393
 #, c-format
 msgid "Change user information for %s"
 msgstr ""
 
-#: src/account.c:1154 src/gtkdebug.c:684 src/gtkrequest.c:267
-#: src/protocols/jabber/buddy.c:572
+#: src/account.c:401 src/gtkrequest.c:250 src/protocols/jabber/buddy.c:514
+#: src/protocols/trepia/trepia.c:347
 msgid "Save"
 msgstr ""
 
-#: src/account.c:1641 src/gtkft.c:156 src/protocols/jabber/buddy.c:633
-#: src/protocols/jabber/buddy.c:1083 src/protocols/jabber/buddy.c:1100
-#: src/protocols/novell/novell.c:2837
+#: src/account.c:760 src/gtkft.c:159 src/protocols/jabber/buddy.c:573
+#: src/protocols/novell/novell.c:2812
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: src/blist.c:545
-#, fuzzy
-msgid "buddy list"
-msgstr "Sõbranimekiri"
-
-#: src/blist.c:1162
+#: src/away.c:233
+msgid "Away!"
+msgstr "Eemal!"
+
+#: src/away.c:303
+msgid "Edit This Message"
+msgstr "Muuda seda teadet"
+
+#: src/away.c:308
+msgid "I'm Back!"
+msgstr "Olen tagasi!"
+
+#: src/away.c:362
+#, c-format
+msgid "Are you sure you want to remove the away message \"%s\"?"
+msgstr "Kas sa tõesti soovid eemaldada eemalolekuteadet \"%s\"?"
+
+#: src/away.c:364 src/away.c:442
+msgid "Remove Away Message"
+msgstr "Eemalda eemaloleku teade"
+
+#. Remove button
+#: src/away.c:366 src/gtkconv.c:1535 src/gtkconv.c:3917 src/gtkconv.c:3988
+#: src/gtkrequest.c:249
+msgid "Remove"
+msgstr "Eemalda"
+
+#: src/away.c:436
+msgid "New Away Message"
+msgstr "Uus eemaloleku teade"
+
+#: src/away.c:663
+msgid "Set All Away"
+msgstr "Määra kõik eemalolevaks"
+
+#: src/away.c:770
+msgid "You cannot save an away message with a blank title"
+msgstr "Sa ei saa tühja pealkirjaga eemalolekuteadet salvestada"
+
+#: src/away.c:772
+msgid ""
+"Please give the message a title, or choose \"Use\" to use without saving."
+msgstr ""
+"Palun määra teatele pealkiri või vali \"Kasuta\" kasutamiseks ilma "
+"salvestamata."
+
+#: src/away.c:782
+msgid "You cannot create an empty away message"
+msgstr "Sa ei saa luua tühja eemalolekuteadet"
+
+#: src/away.c:847
+msgid "New away message"
+msgstr "Uus eemaloleku teade"
+
+#: src/away.c:862
+msgid "Away title: "
+msgstr "Eemaloleku pealkiri: "
+
+#: src/away.c:910
+msgid "_Save"
+msgstr "_Salvesta"
+
+#: src/away.c:914
+msgid "Sa_ve & Use"
+msgstr "Sal_vesta ja kasuta"
+
+#: src/away.c:918
+msgid "_Use"
+msgstr "_Kasuta"
+
+#: src/blist.c:682
 msgid "Chats"
 msgstr "Jututoad"
 
-#: src/blist.c:1863
+#: src/blist.c:1357
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1416,122 +1404,166 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/blist.c:1872
+#: src/blist.c:1366
 msgid "Group not removed"
 msgstr ""
 
-#: src/connection.c:98
+#: src/blist.c:2069
+msgid ""
+"An error was encountered parsing your buddy list.  It has not been loaded, "
+"and the old file has moved to blist.xml~."
+msgstr ""
+
+#: src/blist.c:2072
+msgid "Buddy List Error"
+msgstr "Sõbranimekirja viga"
+
+#: src/connection.c:118 src/connection.c:169
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr ""
+
+#: src/connection.c:123
 msgid "Registration Error"
 msgstr ""
 
-#: src/conversation.c:205
-#, fuzzy
-msgid "Unable to send message: The message is too large."
-msgstr "Sõnum on liiga suur."
-
-#: src/conversation.c:208 src/conversation.c:221
-#, fuzzy, c-format
-msgid "Unable to send message to %s."
+#: src/connection.c:174
+msgid "Connection Error"
+msgstr ""
+
+#: src/connection.c:195
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "Sisesta parool %s jaoks (%s)"
+
+#: src/conversation.c:233
+msgid "Unable to send message. The message is too large."
+msgstr ""
+
+#: src/conversation.c:237 src/conversation.c:251
+#: src/protocols/oscar/oscar.c:4276
+#, c-format
+msgid "Unable to send message to %s:"
 msgstr "Kasutajale %s pole võimalik sõnumit saata:"
 
-#: src/conversation.c:209
+#: src/conversation.c:239
 msgid "The message is too large."
 msgstr "Sõnum on liiga suur."
 
-#: src/conversation.c:218
+#: src/conversation.c:248
 msgid "Unable to send message."
 msgstr "Sõnumit pole võimalik saata."
 
-#: src/conversation.c:1497
+#: src/conversation.c:2070
 #, c-format
 msgid "%s entered the room."
 msgstr "%s sisenes tuppa."
 
-#: src/conversation.c:1499
+#: src/conversation.c:2073
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] sisenes tuppa."
 
-#: src/conversation.c:1598
+#: src/conversation.c:2171
 #, c-format
 msgid "You are now known as %s"
 msgstr "Sa oled nüüd nimega %s"
 
-#: src/conversation.c:1613
+#: src/conversation.c:2174
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nüüd nimega %s"
 
-#: src/conversation.c:1669
+#: src/conversation.c:2216
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s väljus toast (%s)."
 
-#: src/conversation.c:1671
+#: src/conversation.c:2218
 #, c-format
 msgid "%s left the room."
 msgstr "%s väljus toast."
 
-#: src/conversation.c:1748
+#: src/conversation.c:2291
 #, c-format
 msgid "(+%d more)"
 msgstr ""
 
-#: src/conversation.c:1750
+#: src/conversation.c:2293
 #, c-format
 msgid " left the room (%s)."
 msgstr " väljus toast (%s)."
 
-#: src/ft.c:188 src/protocols/msn/msn.c:412
+#: src/conversation.c:2698
+msgid "Last created window"
+msgstr "Viimati loodud aknasse"
+
+#: src/conversation.c:2700
+msgid "Separate IM and Chat windows"
+msgstr ""
+
+#: src/conversation.c:2702 src/gtkprefs.c:1387
+msgid "New window"
+msgstr "Uude aknasse"
+
+#: src/conversation.c:2704
+msgid "By group"
+msgstr "Grupi kaupa"
+
+#: src/conversation.c:2706
+msgid "By account"
+msgstr "Konto kaupa"
+
+#: src/ft.c:148 src/protocols/msn/msn.c:369
 #, c-format
 msgid ""
 "Error reading %s: \n"
 "%s.\n"
 msgstr ""
 
-#: src/ft.c:192
+#: src/ft.c:152
 #, c-format
 msgid ""
 "Error writing %s: \n"
 "%s.\n"
 msgstr ""
 
-#: src/ft.c:196
+#: src/ft.c:156
 #, c-format
 msgid ""
 "Error accessing %s: \n"
 "%s.\n"
 msgstr ""
 
-#: src/ft.c:229
+#: src/ft.c:189
 msgid "Cannot send a file of 0 bytes."
 msgstr "Nullsuurusega faili pole võimalik saata."
 
-#: src/ft.c:239
+#: src/ft.c:199
 msgid "Cannot send a directory."
 msgstr "Kataloogi pole võimalik saata."
 
-#: src/ft.c:248
+#: src/ft.c:208
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
-#: src/ft.c:306
+#: src/ft.c:265
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s soovib saata sulle faili %s (%s)"
 
-#: src/ft.c:313
+#: src/ft.c:273
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s soovib saata sulle faili"
 
-#: src/ft.c:354
+#: src/ft.c:311
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Kas nõustud failiülekandega kasutajalt %s?"
 
-#: src/ft.c:358
+#: src/ft.c:315
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1539,65 +1571,144 @@
 "Remote port: %d"
 msgstr ""
 
-#: src/ft.c:382
-#, fuzzy, c-format
+#: src/ft.c:338
+#, c-format
 msgid "%s is offering to send file %s"
-msgstr "Pakun faili %s saatmist kasutajale %s"
-
-#: src/ft.c:422
+msgstr "%s pakub faili %s saatmist"
+
+#: src/ft.c:374
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ei ole lubatud failinimi.\n"
 
-#: src/ft.c:443
+#: src/ft.c:395
 #, c-format
 msgid "Offering to send %s to %s"
-msgstr "Pakun faili %s saatmist kasutajale %s"
-
-#: src/ft.c:454
-#, fuzzy, c-format
-msgid "Starting transfer of %s from %s"
-msgstr "Kas nõustud failiülekandega kasutajalt %s?"
-
-#: src/ft.c:608
+msgstr "Faili %s saatmise pakkumine kasutajale %s"
+
+#: src/ft.c:890
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Fail %s täielikult üle kantud"
 
-#: src/ft.c:611
+#: src/ft.c:893
 msgid "File transfer complete"
 msgstr "Fail on täielikult üle kantud"
 
-#: src/ft.c:995
+#: src/ft.c:942
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Sa katkestasid faili %s ülekande"
 
-#: src/ft.c:1000
+#: src/ft.c:948
 msgid "File transfer cancelled"
 msgstr "Faili ülekandmine katkestatud"
 
-#: src/ft.c:1057
+#: src/ft.c:1001
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s katkestas faili %s ülekande"
 
-#: src/ft.c:1062
+#: src/ft.c:1007
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s katkestas failiülekande"
 
-#: src/ft.c:1119
-#, fuzzy, c-format
-msgid "File transfer to %s failed."
+#: src/ft.c:1056
+#, c-format
+msgid "File transfer to %s aborted.\n"
 msgstr "Failiülekanne kasutajale %s tühistatud.\n"
 
-#: src/ft.c:1121
-#, fuzzy, c-format
-msgid "File transfer from %s failed."
+#: src/ft.c:1058
+#, c-format
+msgid "File transfer from %s aborted.\n"
 msgstr "Failiülekanne kasutajalt %s tühistatud.\n"
 
-#: src/gtkaccount.c:363
+#: src/gaim-disclosure.c:253
+msgid "Expander Size"
+msgstr ""
+
+#: src/gaim-disclosure.c:254
+msgid "Size of the expander arrow"
+msgstr ""
+
+#: src/gaim-remote.c:108
+#, c-format
+msgid ""
+"Usage: %s command [OPTIONS] [URI]\n"
+"\n"
+"    COMMANDS:\n"
+"       uri                      Handle AIM: URI\n"
+"       away                     Popup the away dialog with the default "
+"message\n"
+"       back                     Remove the away dialog\n"
+"       quit                     Close running copy of Gaim\n"
+"\n"
+"    OPTIONS:\n"
+"       -h, --help [command]     Show help for command\n"
+msgstr ""
+"Kasutamine: %s käsk [VÕTI] [URI]\n"
+"\n"
+"    KÄSUD:\n"
+"       uri                      Käsitletakse AIM: URI\n"
+"       away                     Eemalolekuakna kuvamine koos vaikimisi "
+"teatega\n"
+"       back                     Eemalolekudialoogi eemaldamine\n"
+"       quit                     Töötava Gaim'i koopia sulgemine\n"
+"\n"
+"    VÕTMED:\n"
+"       -h, --help [käsk]        Käsu kohta abiteabe näitamine\n"
+
+#: src/gaim-remote.c:185 src/gaim-remote.c:203
+msgid ""
+"Gaim not running (on session 0)\n"
+"Is the \"Remote Control\" plugin loaded?\n"
+msgstr ""
+"Gaim ei tööta (seanss 0)\n"
+"Kas plugin \"Kaugjuhtimine\" on laaditud?\n"
+
+#: src/gaim-remote.c:219
+msgid ""
+"\n"
+"Using AIM: URIs:\n"
+"Sending an IM to a screen name:\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
+"In this case, 'Penguin' is the screen name we wish to IM, and 'hello world'\n"
+"is the message to be sent.  '+' must be used in place of spaces.\n"
+"Please note the quoting used above - if you run this from a shell the '&'\n"
+"needs to be escaped, or the command will stop at that point.\n"
+"Also,the following will just open a conversation window to a screen name,\n"
+"with no message:\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
+"\n"
+"Joining a chat:\n"
+"\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
+"...joins the 'PenguinLounge' chat room.\n"
+"\n"
+"Adding a buddy to your buddy list:\n"
+"\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
+"...prompts you to add 'Penguin' to your buddy list.\n"
+msgstr ""
+
+#: src/gaim-remote.c:239
+msgid ""
+"\n"
+"Close running copy of Gaim\n"
+msgstr ""
+
+#: src/gaim-remote.c:243
+msgid ""
+"\n"
+"Mark all accounts as \"away\" with the default message.\n"
+msgstr ""
+
+#: src/gaim-remote.c:247
+msgid ""
+"\n"
+"Set all accounts as not away.\n"
+msgstr ""
+
+#: src/gtkaccount.c:331
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1609,383 +1720,413 @@
 "<b>Pildi suurus:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:731
+#: src/gtkaccount.c:638
 msgid "Login Options"
 msgstr "Sisselogimise valikud"
 
-#: src/gtkaccount.c:748 src/gtkft.c:623
+#: src/gtkaccount.c:655 src/gtkft.c:585
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/gtkaccount.c:753 src/gtkblist.c:4038
+#: src/gtkaccount.c:660 src/gtkblist.c:4158
 msgid "Screen Name:"
 msgstr "Ekraaninimi:"
 
-#: src/gtkaccount.c:826
+#: src/gtkaccount.c:733
 msgid "Password:"
 msgstr "Parool:"
 
-#: src/gtkaccount.c:831 src/gtkblist.c:4052 src/gtkblist.c:4431
+#: src/gtkaccount.c:738 src/gtkblist.c:4172 src/gtkblist.c:4519
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:835
+#: src/gtkaccount.c:742
 msgid "Remember password"
 msgstr "Parooli peetakse meeles"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:880
+#: src/gtkaccount.c:798
 msgid "User Options"
 msgstr "Kasutaja valikud"
 
-#: src/gtkaccount.c:893
+#: src/gtkaccount.c:811
 msgid "New mail notifications"
 msgstr "Uutest sõnumitest teavitamine"
 
-#: src/gtkaccount.c:902
+#: src/gtkaccount.c:820
 msgid "Buddy icon:"
 msgstr "Sõbraikoon:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:991
+#: src/gtkaccount.c:909
 #, c-format
 msgid "%s Options"
 msgstr "%s valikud"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1129 src/gtkaccount.c:1176
+#: src/gtkaccount.c:1048 src/gtkaccount.c:1095
 msgid "Use Global Proxy Settings"
 msgstr "Üldiste proksi sätete kasutamine"
 
 #. No Proxy
-#: src/gtkaccount.c:1135 src/gtkaccount.c:1183
+#: src/gtkaccount.c:1054 src/gtkaccount.c:1102
 msgid "No Proxy"
 msgstr "Proksi puudub"
 
 #. HTTP
-#: src/gtkaccount.c:1141 src/gtkaccount.c:1190
+#: src/gtkaccount.c:1060 src/gtkaccount.c:1109
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1147 src/gtkaccount.c:1197
+#: src/gtkaccount.c:1066 src/gtkaccount.c:1116
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1153 src/gtkaccount.c:1204
+#: src/gtkaccount.c:1072 src/gtkaccount.c:1123
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1159 src/gtkaccount.c:1211 src/gtkprefs.c:1041
+#: src/gtkaccount.c:1078 src/gtkaccount.c:1130 src/gtkprefs.c:1190
 msgid "Use Environmental Settings"
 msgstr "Keskkonnast tulenevate sätete kasutamine"
 
-#: src/gtkaccount.c:1250
+#: src/gtkaccount.c:1169
 msgid "you can see the butterflies mating"
 msgstr ""
 
-#: src/gtkaccount.c:1254
+#: src/gtkaccount.c:1173
 msgid "If you look real closely"
 msgstr ""
 
-#: src/gtkaccount.c:1270
+#: src/gtkaccount.c:1189
 msgid "Proxy Options"
 msgstr "Proksi valikud"
 
-#: src/gtkaccount.c:1288 src/gtkprefs.c:1035
+#: src/gtkaccount.c:1207 src/gtkprefs.c:1184
 msgid "Proxy _type:"
 msgstr "Proksi _tüüp:"
 
-#: src/gtkaccount.c:1297 src/gtkprefs.c:1056
+#: src/gtkaccount.c:1216 src/gtkprefs.c:1211
 msgid "_Host:"
 msgstr "_Host:"
 
-#: src/gtkaccount.c:1301 src/gtkprefs.c:1074
+#: src/gtkaccount.c:1220 src/gtkprefs.c:1229
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:1309
+#: src/gtkaccount.c:1228
 msgid "_Username:"
 msgstr "_Kasutajanimi:"
 
-#: src/gtkaccount.c:1314 src/gtkprefs.c:1111
+#: src/gtkaccount.c:1233 src/gtkprefs.c:1266
 msgid "Pa_ssword:"
 msgstr "_Parool:"
 
-#: src/gtkaccount.c:1720
+#: src/gtkaccount.c:1604
 msgid "Add Account"
 msgstr "Konto lisamine"
 
-#: src/gtkaccount.c:1722
+#: src/gtkaccount.c:1606
 msgid "Modify Account"
 msgstr "Konto muutmine"
 
+#. Add the disclosure
+#: src/gtkaccount.c:1630
+msgid "Show more options"
+msgstr "Näita rohkem valikuid"
+
+#: src/gtkaccount.c:1631
+msgid "Show fewer options"
+msgstr "Näita vähem valikuid"
+
 #. Register button
-#: src/gtkaccount.c:1770 src/protocols/jabber/jabber.c:706
+#: src/gtkaccount.c:1658 src/protocols/jabber/jabber.c:677
 msgid "Register"
 msgstr "Registreeri"
 
-#: src/gtkaccount.c:2102 src/gtksavedstatuses.c:184
+#: src/gtkaccount.c:2023
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Kas sa soovid kustutada kontot %s?"
 
-#: src/gtkaccount.c:2107 src/gtkrequest.c:264 src/gtksavedstatuses.c:187
+#: src/gtkaccount.c:2028 src/gtkrequest.c:247
 msgid "Delete"
 msgstr "Kustuta"
 
-#: src/gtkaccount.c:2171 src/gtksavedstatuses.c:629
-#: src/protocols/oscar/oscar.c:5055
+#: src/gtkaccount.c:2142 src/protocols/oscar/oscar.c:4360
 msgid "Screen Name"
 msgstr "Ekraaninimi"
 
-#: src/gtkaccount.c:2194
-#, fuzzy
-msgid "Enabled"
-msgstr "Nurjunud"
-
-#: src/gtkaccount.c:2202
+#: src/gtkaccount.c:2166 src/protocols/jabber/jabber.c:996
+#: src/protocols/oscar/oscar.c:691 src/protocols/oscar/oscar.c:5828
+#: src/protocols/oscar/oscar.c:7026 src/protocols/silc/silc.c:45
+#: src/protocols/yahoo/yahoo.c:2784 src/protocols/zephyr/zephyr.c:2110
+#: src/protocols/zephyr/zephyr.c:2129
+msgid "Online"
+msgstr "Ühendatud"
+
+#: src/gtkaccount.c:2187
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/gtkaccount.c:2545
+#. XXX: Tidy this up when not in string freeze
+#: src/gtkaccount.c:2521 src/protocols/jabber/presence.c:202
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s määras %s oma sõbraks%s%s%s"
 
-#: src/gtkaccount.c:2559
+#: src/gtkaccount.c:2535 src/protocols/jabber/presence.c:208
 msgid ""
 "\n"
 "\n"
 "Do you wish to add him or her to your buddy list?"
 msgstr ""
 
-#: src/gtkaccount.c:2567
+#: src/gtkaccount.c:2561
+msgid "Information"
+msgstr "Teave"
+
+#: src/gtkaccount.c:2565 src/gtkaccount.c:2596
+#: src/protocols/jabber/presence.c:210
 msgid "Add buddy to your list?"
 msgstr ""
 
-#: src/gtkaccount.c:2569 src/gtkblist.c:4483 src/gtkconv.c:1501
-#: src/gtkrequest.c:265 src/protocols/gg/gg.c:655
-#: src/protocols/oscar/oscar.c:4680 src/protocols/silc/chat.c:594
+#. Add button
+#: src/gtkaccount.c:2567 src/gtkaccount.c:2598 src/gtkblist.c:4571
+#: src/gtkconv.c:1537 src/gtkconv.c:3910 src/gtkconv.c:3981
+#: src/gtkrequest.c:248 src/protocols/icq/gaim_icq.c:276
+#: src/protocols/jabber/presence.c:212 src/protocols/oscar/oscar.c:3987
+#: src/protocols/silc/chat.c:593
 msgid "Add"
 msgstr "Lisa"
 
-#: src/gtkblist.c:595
+#: src/gtkblist.c:846
 msgid "Join a Chat"
 msgstr "Jututoaga ühinemine"
 
-#: src/gtkblist.c:616
+#: src/gtkblist.c:867
 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:627 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: src/gtkblist.c:878 src/gtkpounce.c:415 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: src/gtkblist.c:935
+#: src/gtkblist.c:1173 src/gtkblist.c:3323
 msgid "Get _Info"
 msgstr "Hangi _teavet"
 
-#: src/gtkblist.c:938
+#: src/gtkblist.c:1176 src/gtkblist.c:3313
 msgid "I_M"
 msgstr "Vä_lksõnum"
 
-#: src/gtkblist.c:944
+#: src/gtkblist.c:1182
 msgid "_Send File"
 msgstr "_Saada fail"
 
-#: src/gtkblist.c:950
+#: src/gtkblist.c:1188
 msgid "Add Buddy _Pounce"
-msgstr ""
-
-#: src/gtkblist.c:954 src/gtkblist.c:958 src/gtkblist.c:1056
-#: src/gtkblist.c:1079
+msgstr "Lisa sõbra_märguanne"
+
+#: src/gtkblist.c:1190 src/gtkblist.c:1287
 msgid "View _Log"
 msgstr "Vaata _logi"
 
-#: src/gtkblist.c:969
+#: src/gtkblist.c:1200
 msgid "_Alias Buddy..."
 msgstr ""
 
-#: src/gtkblist.c:971
+#: src/gtkblist.c:1202
 msgid "_Remove Buddy"
 msgstr ""
 
-#: src/gtkblist.c:973
+#: src/gtkblist.c:1204
 msgid "Alias Contact..."
 msgstr ""
 
-#: src/gtkblist.c:976 src/gtkdialogs.c:807 src/gtkdialogs.c:808
+#: src/gtkblist.c:1207 src/gtkdialogs.c:877 src/gtkdialogs.c:879
 msgid "Remove Contact"
 msgstr ""
 
-#: src/gtkblist.c:980 src/gtkblist.c:1064 src/gtkblist.c:1085
+#: src/gtkblist.c:1211 src/gtkblist.c:1295 src/gtkblist.c:1309
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:982 src/gtkblist.c:1066 src/gtkblist.c:1087
+#: src/gtkblist.c:1213 src/gtkblist.c:1297 src/gtkblist.c:1314
+#: src/gtkconn.c:367
 msgid "_Remove"
 msgstr "_Eemalda"
 
-#: src/gtkblist.c:1028
+#: src/gtkblist.c:1259
 msgid "Add a _Buddy"
 msgstr "Lisa _sõber"
 
-#: src/gtkblist.c:1030
+#: src/gtkblist.c:1261
 msgid "Add a C_hat"
 msgstr "Lisa _jututuba"
 
-#: src/gtkblist.c:1032
+#: src/gtkblist.c:1263
 msgid "_Delete Group"
 msgstr "_Kustuta grupp"
 
-#: src/gtkblist.c:1034
+#: src/gtkblist.c:1265
 msgid "_Rename"
 msgstr "_Nimeta ümber"
 
 #. join button
-#: src/gtkblist.c:1052 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:119
+#: src/gtkblist.c:1283 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/stock.c:88
 msgid "_Join"
 msgstr "Ü_hine"
 
-#: src/gtkblist.c:1054
+#: src/gtkblist.c:1285
 msgid "Auto-Join"
 msgstr "Automaatühinemine"
 
-#: src/gtkblist.c:1092 src/gtkblist.c:1115
+#: src/gtkblist.c:1311 src/gtkblist.c:1336
 msgid "_Collapse"
 msgstr "Ahen_da"
 
-#: src/gtkblist.c:1120
+#: src/gtkblist.c:1341
 msgid "_Expand"
 msgstr "Laien_da"
 
-#: src/gtkblist.c:1347 src/gtkblist.c:1357 src/gtkblist.c:3316
-#: src/gtkblist.c:3319
-#, fuzzy
-msgid "/Tools/Mute Sounds"
-msgstr "Vaigista helid"
-
-#: src/gtkblist.c:1816 src/gtkconv.c:3719 src/gtkpounce.c:314
+#: src/gtkblist.c:2016 src/gtkconv.c:4553 src/gtkpounce.c:316
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
+"Sa pole pole praegu ühegi sellise konto alt sisselogitud, mille alt saaks "
+"sõpru lisada."
 
 #. Buddies menu
-#: src/gtkblist.c:2323
+#: src/gtkblist.c:2437
 msgid "/_Buddies"
 msgstr "/_Sõbrad"
 
-#: src/gtkblist.c:2324
+#: src/gtkblist.c:2438
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Sõbrad/Uus _välksõnum..."
 
-#: src/gtkblist.c:2325
+#: src/gtkblist.c:2439
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Sõbrad/Ühine _jututoaga..."
 
-#: src/gtkblist.c:2326
+#: src/gtkblist.c:2440
 msgid "/Buddies/Get User _Info..."
 msgstr "/Sõbrad/Hangi kasutaja_teavet"
 
-#: src/gtkblist.c:2327
+#: src/gtkblist.c:2441
 msgid "/Buddies/View User _Log..."
 msgstr "/Sõbrad/Vaata kasutaja _logi..."
 
-#: src/gtkblist.c:2329
+#: src/gtkblist.c:2443
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Sõbrad/Näita _ühendamata sõpru"
 
-#: src/gtkblist.c:2330
+#: src/gtkblist.c:2444
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Sõbrad/Näita _tühje gruppe"
 
-#: src/gtkblist.c:2331
+#: src/gtkblist.c:2445
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Sõbrad/Lisa _sõber..."
 
-#: src/gtkblist.c:2332
+#: src/gtkblist.c:2446
 msgid "/Buddies/Add C_hat..."
 msgstr "/Sõbrad/Lisa ju_tutuba..."
 
-#: src/gtkblist.c:2333
+#: src/gtkblist.c:2447
 msgid "/Buddies/Add _Group..."
 msgstr "/Sõbrad/Lisa _grupp..."
 
-#: src/gtkblist.c:2335
+#: src/gtkblist.c:2449
+msgid "/Buddies/_Signoff"
+msgstr "/Sõbrad/_Logi välja"
+
+#: src/gtkblist.c:2450
 msgid "/Buddies/_Quit"
 msgstr "/Sõbrad/_Lõpeta"
 
 #. Tools
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2453
 msgid "/_Tools"
 msgstr "/_Vahendid"
 
-#: src/gtkblist.c:2339
+#: src/gtkblist.c:2454
+msgid "/Tools/_Away"
+msgstr "/Vahendid/_Eemal"
+
+#: src/gtkblist.c:2455
 msgid "/Tools/Buddy _Pounce"
-msgstr ""
-
-#: src/gtkblist.c:2340
+msgstr "/Vahendid/Sõbra_märguanne"
+
+#: src/gtkblist.c:2456
 msgid "/Tools/Account Ac_tions"
 msgstr "/Vahendid/K_ontotoimingud"
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2457
+msgid "/Tools/Pl_ugin Actions"
+msgstr "/Vahendid/P_luginatoimingud"
+
+#: src/gtkblist.c:2459
 msgid "/Tools/A_ccounts"
 msgstr "/Vahendid/_Kontod"
 
-#: src/gtkblist.c:2343
+#: src/gtkblist.c:2460
+msgid "/Tools/_File Transfers"
+msgstr "/Vahendid/_Failiülekanded"
+
+#: src/gtkblist.c:2461
+msgid "/Tools/R_oom List"
+msgstr "/Vahendid/_Tubade nimekiri"
+
+#: src/gtkblist.c:2462
 msgid "/Tools/Pr_eferences"
 msgstr "/Vahendid/_Eelistused"
 
-#: src/gtkblist.c:2344
-#, fuzzy
-msgid "/Tools/P_lugins"
-msgstr "/Vahendid/Pluginatoimingud"
-
-#: src/gtkblist.c:2345
+#: src/gtkblist.c:2463
 msgid "/Tools/Pr_ivacy"
 msgstr "/Vahendid/_Privaatsus"
 
-#: src/gtkblist.c:2346
-msgid "/Tools/_File Transfers"
-msgstr "/Vahendid/_Failiülekanded"
-
-#: src/gtkblist.c:2347
-msgid "/Tools/R_oom List"
-msgstr "/Vahendid/_Tubade nimekiri"
-
-#: src/gtkblist.c:2349
-#, fuzzy
-msgid "/Tools/Mute _Sounds"
-msgstr "Vaigista helid"
-
-#: src/gtkblist.c:2350
+#: src/gtkblist.c:2465
 msgid "/Tools/View System _Log"
 msgstr "/Vahendid/Vaata _süsteemset logi"
 
 #. Help
-#: src/gtkblist.c:2353
+#: src/gtkblist.c:2468
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: src/gtkblist.c:2354
+#: src/gtkblist.c:2469
 msgid "/Help/Online _Help"
 msgstr "/Abi/_Online abi"
 
-#: src/gtkblist.c:2355
+#: src/gtkblist.c:2470
 msgid "/Help/_Debug Window"
 msgstr "/Abi/_Silumisaken"
 
-#: src/gtkblist.c:2356
+#: src/gtkblist.c:2471
 msgid "/Help/_About"
 msgstr "/Abi/Gaim'ist _lähemalt"
 
-#: src/gtkblist.c:2388 src/gtkblist.c:2455
+#: src/gtkblist.c:2489
+msgid "Rename Group"
+msgstr "Grupi ümbernimetamine"
+
+#: src/gtkblist.c:2489
+msgid "New group name"
+msgstr "Uus grupinimi"
+
+#: src/gtkblist.c:2490
+msgid "Please enter a new name for the selected group."
+msgstr "Palun sisesta valitud grupile uus nimi."
+
+#: src/gtkblist.c:2519
 #, c-format
 msgid ""
 "\n"
@@ -1994,61 +2135,7 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: src/gtkblist.c:2464
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Contact Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>Kontakti alias:</b>"
-
-#: src/gtkblist.c:2472
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>Alias:</b>"
-
-#: src/gtkblist.c:2480
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Nickname:</b> %s"
-msgstr ""
-"\n"
-"<b>Hüüdnimi:</b>"
-
-#: src/gtkblist.c:2489
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Logged In:</b> %s"
-msgstr ""
-"\n"
-"<b>Sisse loginud:</b>"
-
-#: src/gtkblist.c:2501
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Idle:</b> %s"
-msgstr ""
-"\n"
-"<b>%s:</b> %s"
-
-#: src/gtkblist.c:2537
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Last Seen:</b> %s ago"
-msgstr ""
-"\n"
-"<b>%s:</b> %s"
-
-#: src/gtkblist.c:2545
+#: src/gtkblist.c:2585
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2056,129 +2143,183 @@
 "\n"
 "<b>Olek:</b> Ühendamata"
 
-#: src/gtkblist.c:2568
+#: src/gtkblist.c:2600
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: src/gtkblist.c:2616
+msgid ""
+"\n"
+"<b>Account:</b>"
+msgstr ""
+"\n"
+"<b>Konto:</b>"
+
+#: src/gtkblist.c:2617
+msgid ""
+"\n"
+"<b>Contact Alias:</b>"
+msgstr ""
+"\n"
+"<b>Kontakti alias:</b>"
+
+#: src/gtkblist.c:2618
+msgid ""
+"\n"
+"<b>Alias:</b>"
+msgstr ""
+"\n"
+"<b>Alias:</b>"
+
+#: src/gtkblist.c:2619
+msgid ""
+"\n"
+"<b>Nickname:</b>"
+msgstr ""
+"\n"
+"<b>Hüüdnimi:</b>"
+
+#: src/gtkblist.c:2620
+msgid ""
+"\n"
+"<b>Logged In:</b>"
+msgstr ""
+"\n"
+"<b>Sisse loginud:</b>"
+
+#: src/gtkblist.c:2621
+msgid ""
+"\n"
+"<b>Idle:</b>"
+msgstr ""
+
+#: src/gtkblist.c:2622
+msgid ""
+"\n"
+"<b>Warned:</b>"
+msgstr ""
+
+#: src/gtkblist.c:2624
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
 msgstr ""
 
-#: src/gtkblist.c:2570
-#, fuzzy
+#: src/gtkblist.c:2625
+msgid ""
+"\n"
+"<b>Status</b>: Awesome"
+msgstr ""
+
+#: src/gtkblist.c:2626
 msgid ""
 "\n"
-"<b>Status:</b> Awesome"
-msgstr ""
-"\n"
-"<b>Olek:</b> Ühendamata"
-
-#: src/gtkblist.c:2572
-#, fuzzy
-msgid ""
-"\n"
-"<b>Status:</b> Rockin'"
-msgstr ""
-"\n"
-"<b>Olek:</b> Ühendamata"
-
-#: src/gtkblist.c:2834
-#, fuzzy, c-format
-msgid "Idle (%dh %02dm) "
+"<b>Status</b>: Rockin'"
+msgstr ""
+
+#: src/gtkblist.c:2908
+#, c-format
+msgid "Idle (%dh%02dm) "
 msgstr "Jõude (%dt%02dm) "
 
-#: src/gtkblist.c:2836
+#: src/gtkblist.c:2910
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Jõude (%dm) "
 
-#: src/gtkblist.c:2839
-#, fuzzy
-msgid "Idle "
-msgstr "Tegevusetus"
-
-#: src/gtkblist.c:2843
+#: src/gtkblist.c:2915
+#, c-format
+msgid "Warned (%d%%) "
+msgstr ""
+
+#: src/gtkblist.c:2918
 msgid "Offline "
 msgstr "Ühendamata "
 
-#: src/gtkblist.c:2959
-#, fuzzy
-msgid "/Buddies/New Instant Message..."
-msgstr "/Sõbrad/Uus _välksõnum..."
-
-#: src/gtkblist.c:2960 src/gtkblist.c:2994
+#. Make menu items sensitive/insensitive where appropriate
+#: src/gtkblist.c:3036
 msgid "/Buddies/Join a Chat..."
 msgstr "/Sõbrad/Ühine jututoaga..."
 
-#: src/gtkblist.c:2961
-#, fuzzy
-msgid "/Buddies/Get User Info..."
-msgstr "/Sõbrad/Hangi kasutaja_teavet"
-
-#: src/gtkblist.c:2962
-#, fuzzy
-msgid "/Buddies/Add Buddy..."
-msgstr "/Sõbrad/Lisa _sõber..."
-
-#: src/gtkblist.c:2963
-#, fuzzy
-msgid "/Buddies/Add Chat..."
-msgstr "/Sõbrad/Lisa ju_tutuba..."
-
-#: src/gtkblist.c:2964
-#, fuzzy
-msgid "/Buddies/Add Group..."
-msgstr "/Sõbrad/Lisa _grupp..."
-
-#: src/gtkblist.c:2997
+#: src/gtkblist.c:3039
 msgid "/Tools/Room List"
 msgstr "/Vahendid/Tubade nimekiri"
 
-#: src/gtkblist.c:3000
+#: src/gtkblist.c:3042
 msgid "/Tools/Privacy"
 msgstr "/Vahendid/Privaatsus"
 
-#: src/gtkblist.c:3076 src/protocols/jabber/jabber.c:982
-#: src/protocols/yahoo/yahoo.c:2776
-msgid "None"
-msgstr "Puudub"
-
-#: src/gtkblist.c:3078
+#: src/gtkblist.c:3124
 msgid "Alphabetical"
 msgstr "Tähestikuline"
 
-#: src/gtkblist.c:3079
+#: src/gtkblist.c:3125
 msgid "By status"
 msgstr "Oleku järgi"
 
-#: src/gtkblist.c:3080
+#: src/gtkblist.c:3126
 msgid "By log size"
 msgstr "Logi suuruse järgi"
 
 #: src/gtkblist.c:3192
+msgid "/Tools/Away"
+msgstr ""
+
+#: src/gtkblist.c:3195
 msgid "/Tools/Buddy Pounce"
-msgstr ""
-
-#: src/gtkblist.c:3193
+msgstr "/Vahendid/Sõbramärguanne"
+
+#: src/gtkblist.c:3198
 msgid "/Tools/Account Actions"
 msgstr ""
 
+#: src/gtkblist.c:3201
+msgid "/Tools/Plugin Actions"
+msgstr "/Vahendid/Pluginatoimingud"
+
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3312
+#: src/gtkblist.c:3292
 msgid "/Buddies/Show Offline Buddies"
 msgstr ""
 
-#: src/gtkblist.c:3314
+#: src/gtkblist.c:3294
 msgid "/Buddies/Show Empty Groups"
 msgstr ""
 
-#: src/gtkblist.c:3992 src/protocols/silc/buddy.c:736
-#: src/protocols/silc/buddy.c:994 src/protocols/silc/buddy.c:1039
-#: src/protocols/silc/buddy.c:1129 src/protocols/yahoo/yahoo.c:2874
+#: src/gtkblist.c:3319
+msgid "Send a message to the selected buddy"
+msgstr "Sõnumi saatmine valitud sõbrale"
+
+#: src/gtkblist.c:3329
+msgid "Get information on the selected buddy"
+msgstr "Valitud sõpra puudutava teabe hankimine"
+
+#: src/gtkblist.c:3333
+msgid "_Chat"
+msgstr "_Jututuba"
+
+#: src/gtkblist.c:3338
+msgid "Join a chat room"
+msgstr "Ühinemine jututoaga"
+
+#: src/gtkblist.c:3343
+msgid "_Away"
+msgstr "_Eemal"
+
+#: src/gtkblist.c:3348
+msgid "Set an away message"
+msgstr "Eemaloleku teate määramine"
+
+#: src/gtkblist.c:4112 src/protocols/silc/buddy.c:731
+#: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2951
 msgid "Add Buddy"
 msgstr "Sõbra lisamine"
 
-#: src/gtkblist.c:4016
+#: src/gtkblist.c:4136
 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. "
@@ -2189,25 +2330,25 @@
 "kuvatakse hüüdnime ekraaninime asemel.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4079 src/gtkblist.c:4411
+#: src/gtkblist.c:4196 src/gtkblist.c:4499
 msgid "Account:"
 msgstr "Konto:"
 
-#: src/gtkblist.c:4344
+#: src/gtkblist.c:4432
 msgid "This protocol does not support chat rooms."
 msgstr ""
 
-#: src/gtkblist.c:4360
+#: src/gtkblist.c:4448
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
 
-#: src/gtkblist.c:4377
+#: src/gtkblist.c:4465
 msgid "Add Chat"
 msgstr "Jututoa lisamine"
 
-#: src/gtkblist.c:4401
+#: src/gtkblist.c:4489
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2215,49 +2356,77 @@
 "Palun sisesta alias ja jututoa kohta käiv teave lisatakse sinu "
 "sõbranimekirjale.\n"
 
-#: src/gtkblist.c:4480
+#: src/gtkblist.c:4568
 msgid "Add Group"
 msgstr "Grupi lisamine"
 
-#: src/gtkblist.c:4481
+#: src/gtkblist.c:4569
 msgid "Please enter the name of the group to be added."
 msgstr "Palun sisesta lisatava grupi nimi."
 
-#: src/gtkblist.c:5005
+#: src/gtkblist.c:5138 src/gtkblist.c:5235
 msgid "No actions available"
 msgstr "Toiminguid pole"
 
-#: src/gtkblist.c:5074
-#, fuzzy
-msgid "/Tools"
-msgstr "/_Vahendid"
-
-#: src/gtkconn.c:190
-#, fuzzy, c-format
-msgid "%s disconnected"
-msgstr "Server katkestas ühenduse"
-
-#: src/gtkconn.c:191
-#, c-format
-msgid ""
-"%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
-msgstr ""
-
-#: src/gtkconv.c:325
+#: src/gtkconn.c:79 src/gtkconn.c:250 src/gtkconn.c:261
+msgid "Done."
+msgstr "Valmis."
+
+#: src/gtkconn.c:158
+msgid "Signon: "
+msgstr "Sisselogimine: "
+
+#: src/gtkconn.c:204
+msgid "Signon"
+msgstr "Sisselogimine"
+
+#: src/gtkconn.c:216
+msgid "Cancel All"
+msgstr "Loobu kõigist"
+
+#: src/gtkconn.c:367 src/gtkconn.c:600
+msgid "_Reconnect"
+msgstr "Ühendu _uuesti"
+
+#: src/gtkconn.c:564
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
+"\n"
+"%s\n"
+"%s"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">%s pole ühendatud.</span>\n"
+"\n"
+"%s\n"
+"%s"
+
+#: src/gtkconn.c:566
+msgid "Reason Unknown."
+msgstr ""
+
+#: src/gtkconn.c:605
+msgid "Reconnect _All"
+msgstr "Ühendu _kõikjale uuesti"
+
+#: src/gtkconn.c:635
+msgid "Time"
+msgstr ""
+
+#: src/gtkconv.c:342
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "me kasutab Gaim versiooni %s."
 
-#: src/gtkconv.c:334
+#: src/gtkconv.c:351
 msgid "Supported debug options are:  version"
 msgstr ""
 
-#: src/gtkconv.c:371
+#: src/gtkconv.c:390
 msgid "No such command (in this context)."
 msgstr "Sellist käsku pole (selles kontekstis)."
 
-#: src/gtkconv.c:374
+#: src/gtkconv.c:393
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2265,46 +2434,46 @@
 "Kasuta \"/help &lt;käsk&gt;\" selle käsu abiteabe saamiseks.\n"
 "Sellest kontekstis on saadaval järgnevad käsud:\n"
 
-#: src/gtkconv.c:446
+#: src/gtkconv.c:465
 msgid "No such command."
 msgstr "Sellist käsku pole."
 
-#: src/gtkconv.c:453
+#: src/gtkconv.c:472
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Süntaksi viga:  Sa ei sisestanud sellele käsule sobival hulgal argumente."
 
-#: src/gtkconv.c:458
+#: src/gtkconv.c:477
 msgid "Your command failed for an unknown reason."
 msgstr ""
 
-#: src/gtkconv.c:465
-msgid "That command only works in chats, not IMs."
-msgstr ""
-
-#: src/gtkconv.c:468
-msgid "That command only works in IMs, not chats."
-msgstr ""
-
-#: src/gtkconv.c:472
+#: src/gtkconv.c:484
+msgid "That command only works in Chats, not IMs."
+msgstr ""
+
+#: src/gtkconv.c:487
+msgid "That command only works in IMs, not Chats."
+msgstr ""
+
+#: src/gtkconv.c:491
 msgid "That command doesn't work on this protocol."
 msgstr ""
 
-#: src/gtkconv.c:699 src/gtkconv.c:725
-msgid "That buddy is not on the same protocol as this chat."
-msgstr ""
-
-#: src/gtkconv.c:719
+#: src/gtkconv.c:734 src/gtkconv.c:760
+msgid "That buddy is not on the same protocol as this chat"
+msgstr ""
+
+#: src/gtkconv.c:754
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 
-#: src/gtkconv.c:772
+#: src/gtkconv.c:808
 msgid "Invite Buddy Into Chat Room"
 msgstr "Sõbra kutsumine jututuppa"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:802
+#: src/gtkconv.c:838
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2312,291 +2481,347 @@
 "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:823
+#: src/gtkconv.c:859
 msgid "_Buddy:"
 msgstr "_Sõber:"
 
-#: src/gtkconv.c:843 src/gtksavedstatuses.c:779
+#: src/gtkconv.c:879
 msgid "_Message:"
 msgstr "Sõ_num:"
 
-#: src/gtkconv.c:900 src/gtkconv.c:2206 src/gtkdebug.c:217 src/gtkft.c:470
+#: src/gtkconv.c:935 src/gtkconv.c:2660 src/gtkdebug.c:182
 msgid "Unable to open file."
 msgstr "Faili pole võimalik avada."
 
-#: src/gtkconv.c:906
+#: src/gtkconv.c:940
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Vestlused - %s</h1>\n"
 
-#: src/gtkconv.c:930
+#: src/gtkconv.c:954
 msgid "Save Conversation"
 msgstr "Vestluse salvestamine"
 
-#: src/gtkconv.c:1030 src/gtkdebug.c:165 src/gtkdebug.c:678
+#: src/gtkconv.c:1039 src/gtkdebug.c:131
 msgid "Find"
 msgstr "Otsing"
 
-#: src/gtkconv.c:1056 src/gtkdebug.c:193
+#: src/gtkconv.c:1065 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "O_tsi stringi:"
 
-#: src/gtkconv.c:1463
+#: src/gtkconv.c:1481
 msgid "IM"
 msgstr "Välksõnum"
 
-#: src/gtkconv.c:1469 src/protocols/oscar/oscar.c:628
+#. Send File button
+#: src/gtkconv.c:1490 src/gtkconv.c:3903 src/protocols/oscar/oscar.c:606
 msgid "Send File"
 msgstr "Saada fail"
 
-#: src/gtkconv.c:1476
+#: src/gtkconv.c:1499
 msgid "Un-Ignore"
 msgstr "Ära eira"
 
-#: src/gtkconv.c:1479
+#: src/gtkconv.c:1501 src/gtkprefs.c:831
 msgid "Ignore"
 msgstr "Eira"
 
-#: src/gtkconv.c:1485
+#. Info button
+#: src/gtkconv.c:1510 src/gtkconv.c:3924
 msgid "Info"
 msgstr "Teave"
 
-#: src/gtkconv.c:1491
-#, fuzzy
-msgid "Get Away Message"
-msgstr "Uus eemaloleku teade"
-
-#: src/gtkconv.c:1498 src/gtkrequest.c:266
-msgid "Remove"
-msgstr "Eemalda"
-
-#: src/gtkconv.c:2214
+#: src/gtkconv.c:1519
+msgid "Get Away Msg"
+msgstr ""
+
+#: src/gtkconv.c:2668
 msgid "Unable to save icon file to disk."
 msgstr ""
 
-#: src/gtkconv.c:2237
+#: src/gtkconv.c:2690
 msgid "Save Icon"
 msgstr "Ikooni salvestamine"
 
-#: src/gtkconv.c:2287
+#: src/gtkconv.c:2720
 msgid "Animate"
 msgstr ""
 
-#: src/gtkconv.c:2292
+#: src/gtkconv.c:2725
 msgid "Hide Icon"
 msgstr "Peida ikoon"
 
-#: src/gtkconv.c:2298
+#: src/gtkconv.c:2731
 msgid "Save Icon As..."
 msgstr "Salvesta ikoon kui..."
 
+#: src/gtkconv.c:3108
+msgid "User is typing..."
+msgstr "Kasutaja kirjutab..."
+
+#: src/gtkconv.c:3116
+msgid "User has typed something and paused"
+msgstr ""
+
+#. Build the Send As menu
+#: src/gtkconv.c:3219
+msgid "_Send As"
+msgstr "_Saada kui"
+
 #. Conversation menu
-#: src/gtkconv.c:2346
+#: src/gtkconv.c:3673
 msgid "/_Conversation"
 msgstr "/_Vestlus"
 
-#: src/gtkconv.c:2348
+#: src/gtkconv.c:3675
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Vestlus/Uus _välksõnum..."
 
-#: src/gtkconv.c:2353
+#: src/gtkconv.c:3680
 msgid "/Conversation/_Find..."
 msgstr "/Vestlus/_Otsi..."
 
-#: src/gtkconv.c:2355
+#: src/gtkconv.c:3682
 msgid "/Conversation/View _Log"
 msgstr "/Vestlus/Vaata _logi"
 
-#: src/gtkconv.c:2356
+#: src/gtkconv.c:3683
 msgid "/Conversation/_Save As..."
 msgstr "/Vestlus/Salvesta _kui..."
 
-#: src/gtkconv.c:2358
+#: src/gtkconv.c:3685
 msgid "/Conversation/Clear"
 msgstr "/Vestlus/Puhasta"
 
-#: src/gtkconv.c:2362
+#: src/gtkconv.c:3689
 msgid "/Conversation/Se_nd File..."
 msgstr "/Vestlus/Saada _fail..."
 
-#: src/gtkconv.c:2363
+#: src/gtkconv.c:3690
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr ""
-
-#: src/gtkconv.c:2365
+msgstr "/Vestlus/Lisa sõbra_märguanne"
+
+#: src/gtkconv.c:3692
 msgid "/Conversation/_Get Info"
 msgstr "/Vestlus/_Hangi teavet"
 
-#: src/gtkconv.c:2367
+#: src/gtkconv.c:3694
+msgid "/Conversation/_Warn..."
+msgstr "/Vestlus/_Hoiata"
+
+#: src/gtkconv.c:3696
 msgid "/Conversation/In_vite..."
 msgstr "/Vestlus/_Kutsu..."
 
-#: src/gtkconv.c:2372
-#, fuzzy
+#: src/gtkconv.c:3701
 msgid "/Conversation/Al_ias..."
 msgstr "/Vestlus/_Alias..."
 
-#: src/gtkconv.c:2374
+#: src/gtkconv.c:3703
 msgid "/Conversation/_Block..."
 msgstr "/Vestlus/_Bloki..."
 
-#: src/gtkconv.c:2376
+#: src/gtkconv.c:3705
 msgid "/Conversation/_Add..."
 msgstr "/Vestlus/_Lisa..."
 
-#: src/gtkconv.c:2378
+#: src/gtkconv.c:3707
 msgid "/Conversation/_Remove..."
 msgstr "/Vestlus/_Eemalda"
 
-#: src/gtkconv.c:2383
+#: src/gtkconv.c:3712
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Vestlus/Lisa _viit..."
 
-#: src/gtkconv.c:2385
+#: src/gtkconv.c:3714
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Vestlus/Lisa _pilt..."
 
-#: src/gtkconv.c:2390
+#: src/gtkconv.c:3719
 msgid "/Conversation/_Close"
 msgstr "/Vestlus/_Sulge"
 
 #. Options
-#: src/gtkconv.c:2394
+#: src/gtkconv.c:3723
 msgid "/_Options"
 msgstr "/_Valikud"
 
-#: src/gtkconv.c:2395
+#: src/gtkconv.c:3724
 msgid "/Options/Enable _Logging"
 msgstr "/Valikud/Luba _logimine"
 
-#: src/gtkconv.c:2396
+#: src/gtkconv.c:3725
 msgid "/Options/Enable _Sounds"
 msgstr "/Valikud/Luba _helid"
 
-#: src/gtkconv.c:2397
-#, fuzzy
-msgid "/Options/Show Formatting _Toolbars"
+#: src/gtkconv.c:3726
+msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Valikud/Luba _vormindamise tööriistad"
 
-#: src/gtkconv.c:2398
-#, fuzzy
+#: src/gtkconv.c:3727
 msgid "/Options/Show Ti_mestamps"
-msgstr "/Valikud/Luba _ajatemplid"
-
-#: src/gtkconv.c:2399
-#, fuzzy
-msgid "/Options/Show Buddy _Icon"
-msgstr "Sõbra _ikooni näitamine"
-
-#: src/gtkconv.c:2439
+msgstr "/Valikud/Näita _ajatempleid"
+
+#: src/gtkconv.c:3769
 msgid "/Conversation/View Log"
 msgstr ""
 
-#: src/gtkconv.c:2445
+#: src/gtkconv.c:3774
 msgid "/Conversation/Send File..."
 msgstr ""
 
-#: src/gtkconv.c:2449
+#: src/gtkconv.c:3778
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr ""
-
-#: src/gtkconv.c:2455
+msgstr "/Vestlus/Lisa sõbra_märguanne..."
+
+#: src/gtkconv.c:3784
 msgid "/Conversation/Get Info"
 msgstr ""
 
-#: src/gtkconv.c:2459
+#: src/gtkconv.c:3788
+msgid "/Conversation/Warn..."
+msgstr ""
+
+#: src/gtkconv.c:3792
 msgid "/Conversation/Invite..."
 msgstr "/Vestlus/Kutsu..."
 
-#: src/gtkconv.c:2465
+#: src/gtkconv.c:3798
 msgid "/Conversation/Alias..."
 msgstr ""
 
-#: src/gtkconv.c:2469
+#: src/gtkconv.c:3802
 msgid "/Conversation/Block..."
 msgstr ""
 
-#: src/gtkconv.c:2473
+#: src/gtkconv.c:3806
 msgid "/Conversation/Add..."
 msgstr ""
 
-#: src/gtkconv.c:2477
+#: src/gtkconv.c:3810
 msgid "/Conversation/Remove..."
 msgstr ""
 
-#: src/gtkconv.c:2483
+#: src/gtkconv.c:3816
 msgid "/Conversation/Insert Link..."
 msgstr ""
 
-#: src/gtkconv.c:2487
+#: src/gtkconv.c:3820
 msgid "/Conversation/Insert Image..."
 msgstr ""
 
-#: src/gtkconv.c:2493
+#: src/gtkconv.c:3826
 msgid "/Options/Enable Logging"
 msgstr ""
 
-#: src/gtkconv.c:2496
+#: src/gtkconv.c:3829
 msgid "/Options/Enable Sounds"
 msgstr ""
 
-#: src/gtkconv.c:2499
-#, fuzzy
-msgid "/Options/Show Formatting Toolbars"
-msgstr "/Valikud/Luba _vormindamise tööriistad"
-
-#: src/gtkconv.c:2502
+#: src/gtkconv.c:3832
+msgid "/Options/Show Formatting Toolbar"
+msgstr ""
+
+#: src/gtkconv.c:3835
 msgid "/Options/Show Timestamps"
 msgstr ""
 
-#: src/gtkconv.c:2505
-#, fuzzy
-msgid "/Options/Show Buddy Icon"
-msgstr "Sõbra _ikooni näitamine"
-
-#: src/gtkconv.c:2578
-msgid "User is typing..."
-msgstr "Kasutaja kirjutab..."
-
-#: src/gtkconv.c:2584
-msgid "User has typed something and paused"
-msgstr ""
-
-#. Build the Send As menu
-#: src/gtkconv.c:2722
-#, fuzzy
-msgid "_Send To"
-msgstr "_Saada kui"
-
-#: src/gtkconv.c:3351
+#. The buttons, from left to right
+#. Warn button
+#: src/gtkconv.c:3889
+msgid "Warn"
+msgstr "Hoiata"
+
+#: src/gtkconv.c:3890
+msgid "Warn the user"
+msgstr "Kasutaja hoiatamine"
+
+#. Block button
+#: src/gtkconv.c:3896 src/gtkprivacy.c:634 src/gtkprivacy.c:645
+msgid "Block"
+msgstr "Bloki"
+
+#: src/gtkconv.c:3897
+msgid "Block the user"
+msgstr "Kasutaja blokeerimine"
+
+#: src/gtkconv.c:3904
+msgid "Send a file to the user"
+msgstr "Faili saatmine kasutajale"
+
+#: src/gtkconv.c:3911
+msgid "Add the user to your buddy list"
+msgstr "Kasutaja lisamine sõbranimekirja"
+
+#: src/gtkconv.c:3918
+msgid "Remove the user from your buddy list"
+msgstr "Kasutaja eemaldamine sinu sõbranimekirjast"
+
+#: src/gtkconv.c:3925 src/gtkconv.c:4260
+msgid "Get the user's information"
+msgstr "Kasutaja kohta käiva teabe hankimine"
+
+#. Send button
+#: src/gtkconv.c:3931 src/gtkconv.c:3995
+msgid "Send"
+msgstr "Saada"
+
+#: src/gtkconv.c:3932 src/gtkconv.c:3996
+msgid "Send message"
+msgstr "Sõnumi saatmine"
+
+#. The buttons, from left to right
+#. Invite
+#: src/gtkconv.c:3974
+msgid "Invite"
+msgstr "Kutsu"
+
+#: src/gtkconv.c:3975
+msgid "Invite a user"
+msgstr "Kasutaja kutsumine"
+
+#: src/gtkconv.c:3982
+msgid "Add the chat to your buddy list"
+msgstr "Jututoa lisamine sinu sõbranimekirja"
+
+#: src/gtkconv.c:3989
+msgid "Remove the chat from your buddy list"
+msgstr "Jututoa eemaldamine sinu sõbranimekirjast"
+
+#: src/gtkconv.c:4113
 msgid "Topic:"
 msgstr "Teema:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3399
+#: src/gtkconv.c:4176
 msgid "0 people in room"
 msgstr "0 isikut toas"
 
-#: src/gtkconv.c:3478
+#: src/gtkconv.c:4237
 msgid "IM the user"
 msgstr "Välksõnumi saatmine kasutajale"
 
-#: src/gtkconv.c:3491
+#: src/gtkconv.c:4249
 msgid "Ignore the user"
 msgstr "Kasutaja eiramine"
 
-#: src/gtkconv.c:3503
-msgid "Get the user's information"
-msgstr "Kasutaja kohta käiva teabe hankimine"
-
-#: src/gtkconv.c:4310 src/gtkconv.c:4412 src/gtkconv.c:4467
+#: src/gtkconv.c:4848
+msgid "Close conversation"
+msgstr "Vestluse sulgemine"
+
+#: src/gtkconv.c:5385 src/gtkconv.c:5414 src/gtkconv.c:5510 src/gtkconv.c:5568
 #, 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:5526
+#: src/gtkconv.c:6145 src/gtkconv.c:6148
+msgid "<main>/Conversation/Close"
+msgstr ""
+
+#: src/gtkconv.c:6520
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -2604,342 +2829,328 @@
 "say &lt;message&gt;:  Sõnumi saatmine nagu tehtaks seda ilma käsku "
 "kasutamata."
 
-#: src/gtkconv.c:5529
+#: src/gtkconv.c:6523
 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 jututoale."
 
-#: src/gtkconv.c:5532
+#: src/gtkconv.c:6526
 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:5535
-#, fuzzy
+#: src/gtkconv.c:6529
 msgid "clear: Clears the conversation scrollback."
-msgstr "%s sulges vestlusakna."
-
-#: src/gtkconv.c:5538
+msgstr "clear: Vestluse tagasikeritava ajaloo puhastamine."
+
+#: src/gtkconv.c:6532
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;käsk&gt;:  Abiteave käsu kohta."
 
-#: src/gtkconv.c:5643
-msgid "Confirm close"
-msgstr ""
-
-#: src/gtkconv.c:5675
-#, fuzzy
-msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "Kas sa soovid kustutada kontot %s?"
-
-#: src/gtkconv.c:6340
-msgid "Close conversation"
-msgstr "Vestluse sulgemine"
-
-#: src/gtkconv.c:6801
-msgid "Last created window"
-msgstr "Viimati loodud aknasse"
-
-#: src/gtkconv.c:6803
-msgid "Separate IM and Chat windows"
-msgstr ""
-
-#: src/gtkconv.c:6805 src/gtkprefs.c:1239
-msgid "New window"
-msgstr "Uude aknasse"
-
-#: src/gtkconv.c:6807
-msgid "By group"
-msgstr "Grupi kaupa"
-
-#: src/gtkconv.c:6809
-msgid "By account"
-msgstr "Konto kaupa"
-
-#: src/gtkdebug.c:232
+#: src/gtkdebug.c:197
 msgid "Save Debug Log"
 msgstr "Silumislogi salvestamine"
 
-#: src/gtkdebug.c:586
-#, fuzzy
-msgid "Invert"
-msgstr "L_isa"
-
-#: src/gtkdebug.c:589
-msgid "Highlight matches"
-msgstr ""
-
-#: src/gtkdebug.c:636
+#: src/gtkdebug.c:250
 msgid "Debug Window"
 msgstr "Silumisaken"
 
-#: src/gtkdebug.c:689
-#, fuzzy
-msgid "Clear"
-msgstr "Sulge"
-
-#: src/gtkdebug.c:698
+#: src/gtkdebug.c:288
 msgid "Pause"
 msgstr "Paus"
 
-#: src/gtkdebug.c:705 src/gtkdebug.c:706
+#: src/gtkdebug.c:294
 msgid "Timestamps"
 msgstr "Ajatemplid"
 
-#: src/gtkdebug.c:724
-#, fuzzy
-msgid "Filter"
-msgstr "Nurjunud"
-
-#: src/gtkdebug.c:743
-#, fuzzy
-msgid "Right click for more options."
-msgstr "Näita rohkem valikuid"
-
-#: src/gtkdialogs.c:59 src/gtkdialogs.c:90
+#: src/gtkdialogs.c:63
 msgid "lead developer"
 msgstr "juhtiv arendaja"
 
-#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
-#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
+#: src/gtkdialogs.c:64 src/gtkdialogs.c:67 src/gtkdialogs.c:68
 #: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
+#: src/gtkdialogs.c:73 src/gtkdialogs.c:74 src/gtkdialogs.c:75
 msgid "developer"
 msgstr ""
 
-#: src/gtkdialogs.c:61
+#: src/gtkdialogs.c:65
 msgid "developer & webmaster"
 msgstr ""
 
-#: src/gtkdialogs.c:62
+#: src/gtkdialogs.c:66
 msgid "win32 port"
 msgstr ""
 
-#: src/gtkdialogs.c:68
+#: src/gtkdialogs.c:72
 msgid "support"
 msgstr ""
 
-#: src/gtkdialogs.c:88 src/gtkdialogs.c:91
+#: src/gtkdialogs.c:91
 msgid "maintainer"
 msgstr "hooldaja"
 
-#: src/gtkdialogs.c:89
-#, fuzzy
-msgid "libfaim maintainer"
+#: src/gtkdialogs.c:92
+msgid "former libfaim maintainer"
 msgstr "endine libfaim'i hooldaja"
 
-#: src/gtkdialogs.c:92
-#, fuzzy
-msgid "Jabber developer"
-msgstr "endine Jabber'i arendaja"
-
 #: src/gtkdialogs.c:93
-msgid "original author"
-msgstr "algne autor"
+msgid "former lead developer"
+msgstr "endine juhtiv arendaja"
 
 #: src/gtkdialogs.c:94
+msgid "former maintainer"
+msgstr "endine hooldaja"
+
+#: src/gtkdialogs.c:95
+msgid "former Jabber developer"
+msgstr "endine Jabber'i arendaja"
+
+#: src/gtkdialogs.c:96
+msgid "original author"
+msgstr "algne autor"
+
+#: src/gtkdialogs.c:97
 msgid "hacker and designated driver [lazy bum]"
 msgstr ""
 
-#: src/gtkdialogs.c:99 src/gtkdialogs.c:100 src/gtkdialogs.c:143
+#: src/gtkdialogs.c:102
+msgid "Azerbaijani"
+msgstr "Aserbaidžaani"
+
+#: src/gtkdialogs.c:103 src/gtkdialogs.c:150
 msgid "Bulgarian"
 msgstr "Bulgaaria"
 
-#: src/gtkdialogs.c:101 src/gtkdialogs.c:144 src/gtkdialogs.c:145
-msgid "Catalan"
-msgstr "Kataloonia"
-
-#: src/gtkdialogs.c:102 src/gtkdialogs.c:146
-msgid "Czech"
-msgstr "Tšehhi"
-
 #: src/gtkdialogs.c:103
+msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
+msgstr "Vladimira Girginova ja Vladimir (Kaladan) Petkov"
+
+#: src/gtkdialogs.c:104 src/gtkdialogs.c:151 src/gtkdialogs.c:152
+msgid "Catalan"
+msgstr "Kataloonia"
+
+#: src/gtkdialogs.c:105 src/gtkdialogs.c:153
+msgid "Czech"
+msgstr "Tšehhi"
+
+#: src/gtkdialogs.c:106
 msgid "Danish"
 msgstr "Taani"
 
-#: src/gtkdialogs.c:104 src/gtkdialogs.c:147
+#: src/gtkdialogs.c:107 src/gtkdialogs.c:154
 msgid "German"
 msgstr "Saksa"
 
-#: src/gtkdialogs.c:105
+#: src/gtkdialogs.c:108
 msgid "Australian English"
 msgstr "Austraalia inglise"
 
-#: src/gtkdialogs.c:106
+#: src/gtkdialogs.c:109
+msgid "Canadian English"
+msgstr "Kanada inglise"
+
+#: src/gtkdialogs.c:110
 msgid "British English"
 msgstr "Briti inglise"
 
-#: src/gtkdialogs.c:107
-msgid "Canadian English"
-msgstr "Kanada inglise"
-
-#: src/gtkdialogs.c:108 src/gtkdialogs.c:148
+#: src/gtkdialogs.c:111 src/gtkdialogs.c:155
 msgid "Spanish"
 msgstr "Hispaania"
 
-#: src/gtkdialogs.c:109 src/gtkdialogs.c:149
+#: src/gtkdialogs.c:112
+msgid "Estonian"
+msgstr "Eesti"
+
+#: src/gtkdialogs.c:113 src/gtkdialogs.c:156
 msgid "Finnish"
 msgstr "Soome"
 
-#: src/gtkdialogs.c:110 src/gtkdialogs.c:150
+#: src/gtkdialogs.c:114 src/gtkdialogs.c:157
 msgid "French"
 msgstr "Prantsuse"
 
-#: src/gtkdialogs.c:111
+#: src/gtkdialogs.c:115
 msgid "Hebrew"
 msgstr "Heebrea"
 
-#: src/gtkdialogs.c:112
+#: src/gtkdialogs.c:116 src/gtkdialogs.c:158
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/gtkdialogs.c:113
+#: src/gtkdialogs.c:117 src/gtkdialogs.c:159
 msgid "Hungarian"
 msgstr "Ungari"
 
-#: src/gtkdialogs.c:114 src/gtkdialogs.c:151
+#: src/gtkdialogs.c:118 src/gtkdialogs.c:160
 msgid "Italian"
 msgstr "Itaalia"
 
-#: src/gtkdialogs.c:115 src/gtkdialogs.c:152
+#: src/gtkdialogs.c:119 src/gtkdialogs.c:161
 msgid "Japanese"
 msgstr "Jaapani"
 
-#: src/gtkdialogs.c:116
-msgid "Lithuanian"
-msgstr "Leedu"
-
-#: src/gtkdialogs.c:117
+#: src/gtkdialogs.c:120
 msgid "Georgian"
 msgstr "Gruusia"
 
-#: src/gtkdialogs.c:118 src/gtkdialogs.c:153
+#: src/gtkdialogs.c:121 src/gtkdialogs.c:162
 msgid "Korean"
 msgstr "Korea"
 
-#: src/gtkdialogs.c:119
-#, fuzzy
-msgid "Dutch, Flemish"
-msgstr "Hollandi; Flaami"
-
-#: src/gtkdialogs.c:120
+#: src/gtkdialogs.c:122
+msgid "Lithuanian"
+msgstr "Leedu"
+
+#: src/gtkdialogs.c:123
 msgid "Macedonian"
 msgstr "Makedoonia"
 
-#: src/gtkdialogs.c:121
+#: src/gtkdialogs.c:124
+msgid "Burmese"
+msgstr ""
+
+#: src/gtkdialogs.c:125 src/gtkdialogs.c:163
 msgid "Norwegian"
 msgstr "Norra"
 
-#: src/gtkdialogs.c:122 src/gtkdialogs.c:123 src/gtkdialogs.c:154
-msgid "Polish"
-msgstr "Poola"
-
-#: src/gtkdialogs.c:124
-msgid "Portuguese"
-msgstr "Portugali"
-
-#: src/gtkdialogs.c:125
-msgid "Portuguese-Brazil"
-msgstr "Portugali-Brasiilia"
-
 #: src/gtkdialogs.c:126
+msgid "Dutch; Flemish"
+msgstr "Hollandi; Flaami"
+
+#: src/gtkdialogs.c:127
+msgid "Norwegian (Nynorsk)"
+msgstr "Norra (Nynorsk)"
+
+#: src/gtkdialogs.c:128
+msgid "Punjabi"
+msgstr ""
+
+#: src/gtkdialogs.c:129 src/gtkdialogs.c:164
+msgid "Polish"
+msgstr "Poola"
+
+#: src/gtkdialogs.c:130
+msgid "Portuguese"
+msgstr "Portugali"
+
+#: src/gtkdialogs.c:131
+msgid "Portuguese-Brazil"
+msgstr "Portugali-Brasiilia"
+
+#: src/gtkdialogs.c:132
 msgid "Romanian"
 msgstr "Rumeenia"
 
-#: src/gtkdialogs.c:127 src/gtkdialogs.c:155 src/gtkdialogs.c:156
+#: src/gtkdialogs.c:133 src/gtkdialogs.c:165 src/gtkdialogs.c:166
 msgid "Russian"
 msgstr "Vene"
 
-#: src/gtkdialogs.c:128 src/gtkdialogs.c:129
+#: src/gtkdialogs.c:134
+msgid "Slovenian"
+msgstr "Sloveenia"
+
+#: src/gtkdialogs.c:135
+msgid "Albanian"
+msgstr "Albaania"
+
+#: src/gtkdialogs.c:136
 msgid "Serbian"
 msgstr "Serbia"
 
-#: src/gtkdialogs.c:130
-msgid "Slovenian"
-msgstr "Sloveenia"
-
-#: src/gtkdialogs.c:131 src/gtkdialogs.c:158
+#: src/gtkdialogs.c:137 src/gtkdialogs.c:168 src/gtkdialogs.c:169
 msgid "Swedish"
 msgstr "Rootsi"
 
-#: src/gtkdialogs.c:132
-msgid "Telugu"
-msgstr ""
-
-#: src/gtkdialogs.c:133
+#: src/gtkdialogs.c:138
+msgid "Turkish"
+msgstr "Türgi"
+
+#: src/gtkdialogs.c:139
+msgid "Ukrainian"
+msgstr "Ukraina"
+
+#: src/gtkdialogs.c:140
 msgid "Vietnamese"
 msgstr "Vietnami"
 
-#: src/gtkdialogs.c:133
+#: src/gtkdialogs.c:140
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh ja Gnome-Vi meeskond"
 
-#: src/gtkdialogs.c:134 src/gtkdialogs.c:159
+#: src/gtkdialogs.c:141
+msgid "Xhosa"
+msgstr ""
+
+#: src/gtkdialogs.c:142
 msgid "Simplified Chinese"
 msgstr "Hiina lihtsustatud"
 
-#: src/gtkdialogs.c:135 src/gtkdialogs.c:136 src/gtkdialogs.c:160
+#: src/gtkdialogs.c:143
 msgid "Traditional Chinese"
 msgstr "Hiina traditsiooniline"
 
-#: src/gtkdialogs.c:142
+#: src/gtkdialogs.c:149
 msgid "Amharic"
 msgstr "Amhari"
 
-#: src/gtkdialogs.c:157
+#: src/gtkdialogs.c:167
 msgid "Slovak"
 msgstr "Slovaki"
 
-#: src/gtkdialogs.c:201
+#: src/gtkdialogs.c:170
+msgid "Chinese"
+msgstr "Hiina"
+
+#: src/gtkdialogs.c:212
 msgid "About Gaim"
 msgstr "Lähem teave Gaim'i kohta"
 
-#: src/gtkdialogs.c:225
+#: src/gtkdialogs.c:227
+#, c-format
+msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+
+#: src/gtkdialogs.c:249
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
-msgstr ""
-
-#: src/gtkdialogs.c:234
+"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+msgstr ""
+
+#: src/gtkdialogs.c:259
 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:237
+#: src/gtkdialogs.c:262
 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:243
+#: src/gtkdialogs.c:268
 msgid "Active Developers"
 msgstr "Aktiivsed arendajad"
 
-#: src/gtkdialogs.c:258
+#: src/gtkdialogs.c:283
 msgid "Crazy Patch Writers"
 msgstr "Hullunud parandustekirjutajad"
 
-#: src/gtkdialogs.c:273
+#: src/gtkdialogs.c:298
 msgid "Retired Developers"
 msgstr "Endised arendajad"
 
-#: src/gtkdialogs.c:288
+#: src/gtkdialogs.c:313
 msgid "Current Translators"
 msgstr "Praegused tõlkijad"
 
-#: src/gtkdialogs.c:308
+#: src/gtkdialogs.c:333
 msgid "Past Translators"
 msgstr "Eelmised tõlkijad"
 
-#: src/gtkdialogs.c:326
-#, fuzzy
-msgid "Debugging Information"
-msgstr "Teave"
-
-#: src/gtkdialogs.c:488 src/gtkdialogs.c:629 src/gtkdialogs.c:684
-#, fuzzy
-msgid "_Name"
-msgstr "Nimi"
-
-#: src/gtkdialogs.c:493 src/gtkdialogs.c:634 src/gtkdialogs.c:689
+#: src/gtkdialogs.c:488 src/gtkdialogs.c:630 src/gtkdialogs.c:683
+msgid "_Screen name"
+msgstr "_Ekraaninimi"
+
+#: src/gtkdialogs.c:494 src/gtkdialogs.c:636 src/gtkdialogs.c:689
 msgid "_Account"
 msgstr "_Konto"
 
@@ -2948,82 +3159,88 @@
 msgstr "Uus välksõnum"
 
 #: src/gtkdialogs.c:503
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
+msgid "Please enter the screen name of the person you would like to IM."
 msgstr "Palun sisesta isiku nimi, kellele soovid sõnumit saata."
 
-#: src/gtkdialogs.c:642
+#: src/gtkdialogs.c:643
 msgid "Get User Info"
 msgstr "Teabe hankimine kasutaja kohta"
 
-#: src/gtkdialogs.c:644
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
+#: src/gtkdialogs.c:645
+msgid ""
+"Please enter the screen name 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:698
-#, fuzzy
-msgid "View User Log"
+#: src/gtkdialogs.c:697
+msgid "Get User Log"
 msgstr "Kasutaja logi hankimine"
 
-#: src/gtkdialogs.c:700
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
+#: src/gtkdialogs.c:699
+msgid ""
+"Please enter the screen name of the person whose log you would like to view."
 msgstr "Palun sisesta isiku ekraaninimi, kelle logi sa soovid vaadata."
 
-#: src/gtkdialogs.c:719
+#: src/gtkdialogs.c:739
+msgid "Warn User"
+msgstr ""
+
+#: src/gtkdialogs.c:760
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+
+#: src/gtkdialogs.c:769
+msgid "Warn _anonymously?"
+msgstr ""
+
+#: src/gtkdialogs.c:776
+msgid "<b>Anonymous warnings are less severe.</b>"
+msgstr ""
+
+#: src/gtkdialogs.c:797
 msgid "Alias Contact"
 msgstr ""
 
-#: src/gtkdialogs.c:720
+#: src/gtkdialogs.c:798
 msgid "Enter an alias for this contact."
 msgstr "Sisesta sellele kontaktile alias."
 
-#: src/gtkdialogs.c:722 src/gtkdialogs.c:744 src/gtkdialogs.c:764
-#: src/gtkrequest.c:268 src/protocols/silc/chat.c:585
+#: src/gtkdialogs.c:800 src/gtkdialogs.c:822 src/gtkdialogs.c:842
+#: src/gtkrequest.c:251 src/protocols/silc/chat.c:584
 msgid "Alias"
 msgstr "Alias"
 
-#: src/gtkdialogs.c:740
+#: src/gtkdialogs.c:818
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Sisesta kasutajale %s alias."
 
-#: src/gtkdialogs.c:742
+#: src/gtkdialogs.c:820
 msgid "Alias Buddy"
 msgstr "Sõbrale aliase määramine"
 
-#: src/gtkdialogs.c:761
+#: src/gtkdialogs.c:839
 msgid "Alias Chat"
 msgstr ""
 
-#: src/gtkdialogs.c:762
+#: src/gtkdialogs.c:840
 msgid "Enter an alias for this chat."
 msgstr ""
 
-#: src/gtkdialogs.c:799
-#, fuzzy, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
+#: src/gtkdialogs.c:874
+#, c-format
+msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"Sa oled eemaldamas jututuba %s oma sõbranimekirjast.  Kas sa soovid seda "
-"teha?"
-msgstr[1] ""
-"Sa oled eemaldamas jututuba %s oma sõbranimekirjast.  Kas sa soovid seda "
-"teha?"
-
-#: src/gtkdialogs.c:866
+msgstr ""
+
+#: src/gtkdialogs.c:935
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3032,11 +3249,11 @@
 "Sa oled eemaldamas gruppi %s ja kõiki selle liikmeid oma sõbranimekirjast. "
 "Kas sa soovid seda teha?"
 
-#: src/gtkdialogs.c:869 src/gtkdialogs.c:870
+#: src/gtkdialogs.c:938 src/gtkdialogs.c:939
 msgid "Remove Group"
 msgstr "Grupi eemaldamine"
 
-#: src/gtkdialogs.c:908
+#: src/gtkdialogs.c:977
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
@@ -3044,11 +3261,11 @@
 "Sa oled eemaldamas kasutajat %s oma sõbranimekirjast. Kas sa soovid seda "
 "teha?"
 
-#: src/gtkdialogs.c:911 src/gtkdialogs.c:912
+#: src/gtkdialogs.c:980 src/gtkdialogs.c:982
 msgid "Remove Buddy"
 msgstr "Sõbra eemaldamine"
 
-#: src/gtkdialogs.c:950
+#: src/gtkdialogs.c:1019
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3057,406 +3274,320 @@
 "Sa oled eemaldamas jututuba %s oma sõbranimekirjast.  Kas sa soovid seda "
 "teha?"
 
-#: src/gtkdialogs.c:953 src/gtkdialogs.c:954
+#: src/gtkdialogs.c:1022 src/gtkdialogs.c:1023
 msgid "Remove Chat"
 msgstr "Jututoa eemaldamine"
 
-#: src/gtkft.c:138
+#: src/gtkft.c:141
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:159 src/gtkft.c:1035
+#: src/gtkft.c:162 src/gtkft.c:1012
 msgid "Finished"
 msgstr "Lõpetatud"
 
-#: src/gtkft.c:162 src/gtkft.c:986
+#: src/gtkft.c:165 src/gtkft.c:963
 msgid "Canceled"
 msgstr "Tühistatud"
 
-#: src/gtkft.c:165 src/gtkft.c:905
+#: src/gtkft.c:168 src/gtkft.c:882
 msgid "Waiting for transfer to begin"
 msgstr "Oodatakse ülekande algust"
 
-#: src/gtkft.c:218
+#: src/gtkft.c:221
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Saaja:</b>"
 
-#: src/gtkft.c:220
+#: src/gtkft.c:223
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Saatja:</b>"
 
-#: src/gtkft.c:224
+#: src/gtkft.c:227
 msgid "<b>Sending To:</b>"
 msgstr "<b>Faili saaja:</b>"
 
-#: src/gtkft.c:226
+#: src/gtkft.c:229
 msgid "<b>Sending As:</b>"
 msgstr "<b>Saatja:</b>"
 
-#: src/gtkft.c:442
+#: src/gtkft.c:436
 msgid "There is no application configured to open this type of file."
 msgstr "Selle faili avamiseks pole seadistustes rakendust määratud."
 
-#: src/gtkft.c:447
+#: src/gtkft.c:441
 msgid "An error occurred while opening the file."
 msgstr "Faili avamisel tekkis viga."
 
-#: src/gtkft.c:467
-#, fuzzy, c-format
-msgid "Error launching %s: %s"
-msgstr "Viga parooli muutmisel"
-
-#: src/gtkft.c:476
-#, fuzzy, c-format
-msgid "Error running %s"
-msgstr "Viga pildi salvestamisel: %s"
-
-#: src/gtkft.c:477
-#, c-format
-msgid "Process returned error code %d"
-msgstr ""
-
-#: src/gtkft.c:572
+#: src/gtkft.c:533
 msgid "Progress"
 msgstr "Edenemine"
 
-#: src/gtkft.c:579
+#: src/gtkft.c:540
 msgid "Filename"
 msgstr "Failinimi"
 
-#: src/gtkft.c:586
+#: src/gtkft.c:547
 msgid "Size"
 msgstr "Suurus"
 
-#: src/gtkft.c:593
+#: src/gtkft.c:554
 msgid "Remaining"
 msgstr "Jäänud"
 
-#: src/gtkft.c:624
+#: src/gtkft.c:586
 msgid "Filename:"
 msgstr "Failinimi:"
 
-#: src/gtkft.c:625
+#: src/gtkft.c:587
 msgid "Local File:"
 msgstr ""
 
-#: src/gtkft.c:626
+#: src/gtkft.c:588
 msgid "Status:"
 msgstr "Olek:"
 
-#: src/gtkft.c:627
+#: src/gtkft.c:589
 msgid "Speed:"
 msgstr "Kiirus:"
 
-#: src/gtkft.c:628
+#: src/gtkft.c:590
 msgid "Time Elapsed:"
 msgstr "Aega kulunud:"
 
-#: src/gtkft.c:629
+#: src/gtkft.c:591
 msgid "Time Remaining:"
 msgstr "Aega jäänud:"
 
-#: src/gtkft.c:715
+#: src/gtkft.c:683
 msgid "_Keep the dialog open"
 msgstr "_Dialoogi hoitakse avatuna"
 
-#: src/gtkft.c:725
-#, fuzzy
-msgid "C_lear finished transfers"
+#: src/gtkft.c:693
+msgid "_Clear finished transfers"
 msgstr "_Lõpetatud ülekannete puhastamine"
 
 #. "Download Details" arrow
-#: src/gtkft.c:734
-#, fuzzy
-msgid "File transfer _details"
+#: src/gtkft.c:702
+msgid "Show transfer details"
+msgstr "Näita ülekande üksikasju"
+
+#: src/gtkft.c:703
+msgid "Hide transfer details"
 msgstr "Peida ülekande üksikasjad"
 
 #. Pause button
-#: src/gtkft.c:764 src/gtkstock.c:123
+#: src/gtkft.c:745 src/stock.c:92
 msgid "_Pause"
 msgstr "P_aus"
 
 #. Resume button
-#: src/gtkft.c:774
+#: src/gtkft.c:755
 msgid "_Resume"
 msgstr "_Jätka"
 
-#: src/gtkft.c:988
+#: src/gtkft.c:965
 msgid "Failed"
 msgstr "Nurjunud"
 
-#: src/gtkimhtml.c:817
+#: src/gtkimhtml.c:693
 msgid "Pa_ste As Text"
-msgstr ""
-
-#: src/gtkimhtml.c:1314
+msgstr "As_eta tekstina"
+
+#: src/gtkimhtml.c:1087
 msgid "Hyperlink color"
 msgstr "Hüperviida värv"
 
-#: src/gtkimhtml.c:1315
+#: src/gtkimhtml.c:1088
 msgid "Color to draw hyperlinks."
 msgstr ""
 
+#: src/gtkimhtml.c:1296
+msgid "_Copy E-Mail Address"
+msgstr "_Kopeeri e-posti aadress"
+
+#: src/gtkimhtml.c:1308
+msgid "_Copy Link Location"
+msgstr "_Kopeeri viida asukoht"
+
 #: src/gtkimhtml.c:1318
-#, fuzzy
-msgid "Hyperlink prelight color"
-msgstr "Hüperviida värv"
-
-#: src/gtkimhtml.c:1319
-msgid "Color to draw hyperlinks when mouse is over them."
-msgstr ""
-
-#: src/gtkimhtml.c:1538
-msgid "_Copy E-Mail Address"
-msgstr "_Kopeeri e-posti aadress"
-
-#: src/gtkimhtml.c:1550
 msgid "_Open Link in Browser"
 msgstr "_Ava viit veebilehitsejas"
 
-#: src/gtkimhtml.c:1560
-msgid "_Copy Link Location"
-msgstr "_Kopeeri viida asukoht"
-
-#: src/gtkimhtml.c:3239
+#: src/gtkimhtml.c:2915
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
 
-#: src/gtkimhtml.c:3242
+#: src/gtkimhtml.c:2918
 msgid ""
 "Unrecognized file type\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
 
-#: src/gtkimhtml.c:3255
-#, fuzzy, c-format
+#: src/gtkimhtml.c:2931
+#, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
 "\n"
 "%s"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Sulle on e-kiri!</span>\n"
+"<span size='larger' weight='bold'>Viga pildi salvestamisel</span>\n"
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3258
-#, fuzzy, c-format
+#: src/gtkimhtml.c:2934
+#, c-format
 msgid ""
 "Error saving image\n"
 "\n"
 "%s"
-msgstr "Viga pildi salvestamisel: %s"
-
-#: src/gtkimhtml.c:3338 src/gtkimhtml.c:3350
+msgstr ""
+"Viga pildi salvestamisel\n"
+"\n"
+"%s"
+
+#: src/gtkimhtml.c:3014 src/gtkimhtml.c:3026
 msgid "Save Image"
 msgstr "Pildi salvestamine"
 
-#: src/gtkimhtml.c:3378
+#: src/gtkimhtml.c:3054
 msgid "_Save Image..."
 msgstr "_Salvesta pilt..."
 
-#: src/gtkimhtmltoolbar.c:147
+#: src/gtkimhtmltoolbar.c:176
 msgid "Select Font"
 msgstr "Kirjatüübi valimine"
 
-#: src/gtkimhtmltoolbar.c:226
+#: src/gtkimhtmltoolbar.c:254
 msgid "Select Text Color"
 msgstr "Teksti värvi valimine"
 
-#: src/gtkimhtmltoolbar.c:305
+#: src/gtkimhtmltoolbar.c:328
 msgid "Select Background Color"
 msgstr "Taustavärvi valimine"
 
-#: src/gtkimhtmltoolbar.c:394
+#: src/gtkimhtmltoolbar.c:412
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:402
+#: src/gtkimhtmltoolbar.c:420
 msgid "_Description"
 msgstr "_Kirjeldus"
 
-#: src/gtkimhtmltoolbar.c:405
+#: src/gtkimhtmltoolbar.c:423
 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
+#: src/gtkimhtmltoolbar.c:427
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Palin sisesta URL, mida soovid lisada."
 
-#: src/gtkimhtmltoolbar.c:414
+#: src/gtkimhtmltoolbar.c:432
 msgid "Insert Link"
 msgstr "Viida lisamine"
 
-#: src/gtkimhtmltoolbar.c:418
+#: src/gtkimhtmltoolbar.c:436
 msgid "_Insert"
 msgstr "L_isa"
 
-#: src/gtkimhtmltoolbar.c:487
+#: src/gtkimhtmltoolbar.c:505
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Tõrge pildi salvestamisel: %s\n"
 
-#: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
+#: src/gtkimhtmltoolbar.c:531 src/gtkimhtmltoolbar.c:541
 msgid "Insert Image"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:721
+#: src/gtkimhtmltoolbar.c:679
 msgid "This theme has no available smileys."
 msgstr ""
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:735
+#: src/gtkimhtmltoolbar.c:694
 msgid "Smile!"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:918
+#: src/gtkimhtmltoolbar.c:912
 msgid "Bold"
 msgstr "Rasvane"
 
-#: src/gtkimhtmltoolbar.c:929
+#: src/gtkimhtmltoolbar.c:923
 msgid "Italic"
 msgstr "Kursiiv"
 
-#: src/gtkimhtmltoolbar.c:940
+#: src/gtkimhtmltoolbar.c:934
 msgid "Underline"
 msgstr "Allajoonitud"
 
-#: src/gtkimhtmltoolbar.c:956
+#: src/gtkimhtmltoolbar.c:950
 msgid "Larger font size"
 msgstr "Suurem kirjatüübi suurus"
 
-#: src/gtkimhtmltoolbar.c:968
+#: src/gtkimhtmltoolbar.c:962
 msgid "Smaller font size"
 msgstr "Väiksem kirjatüübi suurus"
 
-#: src/gtkimhtmltoolbar.c:985
+#: src/gtkimhtmltoolbar.c:979
 msgid "Font Face"
 msgstr "Kirjatüüp"
 
-#: src/gtkimhtmltoolbar.c:997
+#: src/gtkimhtmltoolbar.c:991
 msgid "Foreground font color"
 msgstr "Teksti värv"
 
-#: src/gtkimhtmltoolbar.c:1009
+#: src/gtkimhtmltoolbar.c:1003
 msgid "Background color"
 msgstr "Taustavärv"
 
-#: src/gtkimhtmltoolbar.c:1025
-#, fuzzy
-msgid "Clear formatting"
-msgstr "_Puhasta vormindus"
-
-#: src/gtkimhtmltoolbar.c:1040
+#: src/gtkimhtmltoolbar.c:1018
 msgid "Insert link"
 msgstr "Viida lisamine"
 
-#: src/gtkimhtmltoolbar.c:1050
+#: src/gtkimhtmltoolbar.c:1028
 msgid "Insert image"
 msgstr "Pildi lisamine"
 
-#: src/gtkimhtmltoolbar.c:1061
+#: src/gtkimhtmltoolbar.c:1039
 msgid "Insert smiley"
 msgstr "Emotikoni lisamine"
 
-#: src/gtklog.c:200
-#, fuzzy, c-format
-msgid "Conversation in %s on %s"
-msgstr "Vestlused - %s"
-
-#: src/gtklog.c:202
-#, fuzzy, c-format
-msgid "Conversation with %s on %s"
-msgstr "Vestlused - %s"
-
-#: src/gtklog.c:374
-#, fuzzy
-msgid "Total log size:"
-msgstr "Logi suuruse järgi"
-
-#: src/gtklog.c:422
-msgid ""
-"System events will only be logged if the <span style=\"italic\">Log all "
-"status changes to system log</span> preference is enabled."
-msgstr ""
-
-#: src/gtklog.c:426
-msgid ""
-"Instant messages will only be logged if the <span style=\"italic\">Log all "
-"instant messages</span> preference is enabled."
-msgstr ""
-
-#: src/gtklog.c:429
-msgid ""
-"Chats will only be logged if the <span style=\"italic\">Log all chats "
-"preference</span> is enabled."
-msgstr ""
-
-#: src/gtklog.c:434
-msgid "No logs were found."
-msgstr ""
-
-#: src/gtklog.c:480
-#, fuzzy, c-format
-msgid "Conversations in %s"
-msgstr "Vestlused - %s"
-
-#: src/gtklog.c:488 src/gtklog.c:539
+#: src/gtklog.c:316
 #, c-format
 msgid "Conversations with %s"
 msgstr "Vestlused - %s"
 
-#: src/gtklog.c:564
+#. Window **********
+#: src/gtklog.c:412 src/gtklog.c:429
 msgid "System Log"
 msgstr "Süsteemne logi"
 
-#: src/gtkmain.c:326
-#, 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:328
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -a, --acct          display account editor window\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"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-
 #. Descriptive label
-#: src/gtknotify.c:275
+#: src/gtknotify.c:216
 #, 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:289
+#: src/gtknotify.c:230
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">Saatja:</span> %s\n"
 
-#: src/gtknotify.c:298
+#: src/gtknotify.c:239
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Teema:</span> %s\n"
 
-#: src/gtknotify.c:303
+#: src/gtknotify.c:244
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3467,7 +3598,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:319
+#: src/gtknotify.c:260
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3478,35 +3609,22 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:504
-msgid "Search Results"
-msgstr "Otsingutulemused"
-
-#: src/gtknotify.c:643 src/protocols/oscar/oscar.c:4864
-#, c-format
-msgid "Info for %s"
-msgstr ""
-
-#: src/gtknotify.c:644 src/protocols/toc/toc.c:470
-msgid "Buddy Information"
-msgstr "Sõbrateave"
-
-#: src/gtknotify.c:687
+#: src/gtknotify.c:430
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr ""
 
-#: src/gtknotify.c:689 src/gtknotify.c:701 src/gtknotify.c:714
-#: src/gtknotify.c:838
+#: src/gtknotify.c:432 src/gtknotify.c:444 src/gtknotify.c:457
+#: src/gtknotify.c:581
 msgid "Unable to open URL"
 msgstr "URL'i pole võimalik avada"
 
-#: src/gtknotify.c:699 src/gtknotify.c:712
+#: src/gtknotify.c:442 src/gtknotify.c:455
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr ""
 
-#: src/gtknotify.c:839
+#: src/gtknotify.c:582
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -3517,21 +3635,21 @@
 
 #: src/gtkpounce.c:161
 msgid "Please enter a buddy to pounce."
-msgstr ""
+msgstr "Palun sisesta sõbera nimi, kelle kohta sa soovid märguannet lisada."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:898
+#: src/gtkpounce.c:391 src/gtkpounce.c:895
 msgid "New Buddy Pounce"
-msgstr ""
+msgstr "Uus sõbramärguanne"
 
 #: src/gtkpounce.c:391
 msgid "Edit Buddy Pounce"
-msgstr ""
+msgstr "Sõbramärguande redigeerimine"
 
 #. Create the "Pounce Who" frame.
 #: src/gtkpounce.c:408
 msgid "Pounce Who"
-msgstr ""
+msgstr "Kellest märku antakse"
 
 #: src/gtkpounce.c:435
 msgid "_Buddy name:"
@@ -3540,7 +3658,7 @@
 #. Create the "Pounce When" frame.
 #: src/gtkpounce.c:459
 msgid "Pounce When"
-msgstr ""
+msgstr "Märguanne kui"
 
 #: src/gtkpounce.c:467
 msgid "Si_gn on"
@@ -3560,24 +3678,24 @@
 
 #: src/gtkpounce.c:475
 msgid "_Idle"
-msgstr ""
+msgstr "_Jäädakse jõude"
 
 #: src/gtkpounce.c:477
 msgid "Retur_n from idle"
-msgstr ""
+msgstr "_Naasetakse jõudeolekust"
 
 #: src/gtkpounce.c:479
 msgid "Buddy starts _typing"
-msgstr "Sõber alustab _kirjutamist"
+msgstr "Sõber al_ustab tippimist"
 
 #: src/gtkpounce.c:481
 msgid "Buddy stops t_yping"
-msgstr "Sõber lõpetab _trükkimise"
+msgstr "Sõber lõpetab _tippimise"
 
 #. Create the "Pounce Action" frame.
 #: src/gtkpounce.c:510
 msgid "Pounce Action"
-msgstr ""
+msgstr "Märguande tegevus"
 
 #: src/gtkpounce.c:518
 msgid "Op_en an IM window"
@@ -3601,11 +3719,11 @@
 
 #: src/gtkpounce.c:530
 msgid "B_rowse..."
-msgstr "_Lehitse..."
+msgstr "Si_rvi..."
 
 #: src/gtkpounce.c:532
 msgid "Bro_wse..."
-msgstr "Le_hitse..."
+msgstr "S_irvi..."
 
 #: src/gtkpounce.c:533
 msgid "Pre_view"
@@ -3613,58 +3731,66 @@
 
 #: src/gtkpounce.c:616
 msgid "Sav_e this pounce after activation"
-msgstr ""
+msgstr "Märguande sal_vestamine peale aktiveerimist"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:906
+#: src/gtkpounce.c:902
 msgid "Remove Buddy Pounce"
-msgstr ""
-
-#: src/gtkpounce.c:964
+msgstr "Sõbramärguande eemaldamine"
+
+#: src/gtkpounce.c:963
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s alustas sulle sõnumi sisestamist (%s)"
 
-#: src/gtkpounce.c:966
+#: src/gtkpounce.c:965
 #, c-format
 msgid "%s has signed on (%s)"
-msgstr ""
-
-#: src/gtkpounce.c:968
+msgstr "%s logis sisse (%s)"
+
+#: src/gtkpounce.c:967
 #, c-format
 msgid "%s has returned from being idle (%s)"
-msgstr ""
-
-#: src/gtkpounce.c:970
+msgstr "%s pole enam jõude (%s)"
+
+#: src/gtkpounce.c:969
 #, c-format
 msgid "%s has returned from being away (%s)"
-msgstr ""
-
-#: src/gtkpounce.c:972
+msgstr "%s pole enam eemal (%s)"
+
+#: src/gtkpounce.c:971
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s lõpetas sulle sõnumi sisestamise (%s)"
 
-#: src/gtkpounce.c:974
+#: src/gtkpounce.c:973
 #, c-format
 msgid "%s has signed off (%s)"
-msgstr ""
-
-#: src/gtkpounce.c:976
+msgstr "%s logis välja (%s)"
+
+#: src/gtkpounce.c:975
 #, c-format
 msgid "%s has become idle (%s)"
-msgstr ""
-
-#: src/gtkpounce.c:978
+msgstr "%s jäi jõude (%s)"
+
+#: src/gtkpounce.c:977
 #, c-format
 msgid "%s has gone away. (%s)"
-msgstr ""
-
-#: src/gtkpounce.c:979
+msgstr "%s eemaldus (%s)"
+
+#: src/gtkpounce.c:978
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
-#: src/gtkprefs.c:623
+#: src/gtkprefs.c:447
+msgid "Interface Options"
+msgstr "Liidese valikud"
+
+#: src/gtkprefs.c:449
+msgid "D_isplay remote nicknames if no alias is set"
+msgstr "_Teise poole hüüdnimede kuvamine kui aliast pole seatud"
+
+#: src/gtkprefs.c:681
 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."
@@ -3672,58 +3798,48 @@
 "Vali allolevast loendist emotikonide teema, mida sa soovid kasutada. Uusi "
 "teemasid saab paigaldada lohistades neid teemade nimekirja."
 
-#: src/gtkprefs.c:658
+#: src/gtkprefs.c:721
 msgid "Icon"
 msgstr "Ikoon"
 
-#: src/gtkprefs.c:665 src/protocols/jabber/buddy.c:267
-#: src/protocols/jabber/buddy.c:811 src/protocols/jabber/chat.c:769
+#: src/gtkprefs.c:728 src/gtkprefs.c:2205 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:757 src/protocols/jabber/chat.c:743
 msgid "Description"
 msgstr "Kirjeldus"
 
-#: src/gtkprefs.c:786
-msgid "Buddy List Sorting"
-msgstr "Sõbranimekirja sortimine"
-
-#: src/gtkprefs.c:795
-msgid "_Sorting:"
-msgstr "S_ortimine:"
-
-#: src/gtkprefs.c:800
-msgid "Buddy Display"
-msgstr "Sõprade kuvamine"
-
-#: src/gtkprefs.c:801
-#, fuzzy
-msgid "Show more buddy details"
-msgstr "Näita ülekande üksikasju"
+#: src/gtkprefs.c:824
+msgid "Display"
+msgstr "Kuva"
+
+#: src/gtkprefs.c:825
+msgid "Show _timestamp on messages"
+msgstr "_Ajatemplite näitamine sõnumites"
+
+#: src/gtkprefs.c:828
+msgid "_Highlight misspelled words"
+msgstr "Õigekirjaprobleemidega sõnade _esiletõstmine"
+
+#: src/gtkprefs.c:832
+msgid "Ignore c_olors"
+msgstr "_Värvide eiramine"
+
+#: src/gtkprefs.c:834
+msgid "Ignore font _faces"
+msgstr "_Kirjatüüpide eiramine"
+
+#: src/gtkprefs.c:836
+msgid "Ignore font si_zes"
+msgstr "Ki_rjasuuruste eiramine"
 
 #: src/gtkprefs.c:839
-msgid "Send unknown \"_slash\" commands as messages"
-msgstr "Tun_dmatute \"kaldkriipsuga\" käskude saatmine sõnumitena"
+msgid "Default Formatting"
+msgstr "Vaikimisi vormindamine"
 
 #: src/gtkprefs.c:841
-#, fuzzy
-msgid "Show _formatting on incoming messages"
-msgstr "Vo_rmindamise tööriistariba näitamine"
-
-#: src/gtkprefs.c:843
-msgid "Show buddy _icons"
-msgstr "Sõbra _ikooni näitamine"
-
-#: src/gtkprefs.c:845
-msgid "Enable buddy ic_on animation"
-msgstr "Sõbrai_kooni animatsioon lubatud"
-
-#: src/gtkprefs.c:847
-msgid "_Notify buddies that you are typing to them"
-msgstr "Sõprade _teavitamine kui sa oled neile sõnumit kirjutamas"
-
-#: src/gtkprefs.c:850
-msgid "_Highlight misspelled words"
-msgstr "Õigekirjaprobleemidega sõnade _esiletõstmine"
-
-#: src/gtkprefs.c:868
+msgid "_Send default formatting with outgoing messages"
+msgstr "Väljuvad sõ_numid saadetakse vaikimisi vorminguga"
+
+#: src/gtkprefs.c:873
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3731,164 +3847,273 @@
 "Nii paistab sinu väljuv sõnum juhul, kui sa kasutad vormindamist toetavat "
 "protokolli. :)"
 
-#. All the tab options!
-#: src/gtkprefs.c:890
-msgid "Tab Options"
-msgstr "Sakkide valikud"
-
-#: src/gtkprefs.c:892
-msgid "Show IMs and chats in _tabbed windows"
-msgstr "_Välksõnumid ja vestlused sakkidega aknas"
-
-#: src/gtkprefs.c:906
-msgid "Show close b_utton on tabs"
-msgstr "Sakkidel näidatakse sul_gemisnuppu"
-
-#: src/gtkprefs.c:912
-#, fuzzy
-msgid "_Placement:"
-msgstr "EkstraAsetus"
+#: src/gtkprefs.c:876
+msgid "_Clear Formatting"
+msgstr "_Puhasta vormindus"
+
+#: src/gtkprefs.c:913
+msgid "Send Message"
+msgstr "Sõnumi saatmine"
 
 #: src/gtkprefs.c:914
-msgid "Top"
-msgstr "Üleval"
-
-#: src/gtkprefs.c:915
-msgid "Bottom"
-msgstr "All"
+msgid "Enter _sends message"
+msgstr "Ente_r saadab sõnumi"
 
 #: src/gtkprefs.c:916
-msgid "Left"
-msgstr "Vasakul"
-
-#: src/gtkprefs.c:917
-msgid "Right"
-msgstr "Paremal"
+msgid "C_ontrol-Enter sends message"
+msgstr "C_ontrol-Enter saadab sõnumi"
 
 #: src/gtkprefs.c:919
-msgid "Left Vertical"
-msgstr ""
+msgid "Window Closing"
+msgstr "Akna sulgemine"
 
 #: src/gtkprefs.c:920
-msgid "Right Vertical"
-msgstr ""
-
-#: src/gtkprefs.c:925
-#, fuzzy
-msgid "N_ew conversations:"
-msgstr "Vestluse sulgemine"
-
-#: src/gtkprefs.c:976 src/protocols/oscar/oscar.c:779
-#: src/protocols/oscar/oscar.c:5951
-msgid "IP Address"
-msgstr "IP aadress"
-
-#: src/gtkprefs.c:978
-#, fuzzy
-msgid "STUN Server:"
-msgstr "_Server:"
-
-#: src/gtkprefs.c:980
-msgid "_Autodetect IP Address"
-msgstr "IP aadressi _automaattuvastus"
-
-#: src/gtkprefs.c:989
-msgid "Public _IP:"
-msgstr "Avalik _IP:"
-
-#: src/gtkprefs.c:1013
-msgid "Ports"
-msgstr "Pordid"
-
-#: src/gtkprefs.c:1016
-msgid "_Manually specify range of ports to listen on"
-msgstr "_Kuulatavate portide vahemiku käsitsi määramine"
-
-#: src/gtkprefs.c:1019
-msgid "_Start Port:"
-msgstr "Al_gusport:"
+msgid "_Escape closes window"
+msgstr "_Escape sulgeb akna"
+
+#: src/gtkprefs.c:923
+msgid "Insertions"
+msgstr "Lisamised"
+
+#: src/gtkprefs.c:924
+msgid "Control-{B/I/U} changes _formatting"
+msgstr "Control-{B/I/U} muudab _vormingut"
+
+#: src/gtkprefs.c:926
+msgid "Control-(number) _inserts smileys"
+msgstr "Control-(number) _lisab emotikoni"
+
+#: src/gtkprefs.c:942
+msgid "Buddy List Sorting"
+msgstr "Sõbranimekirja sortimine"
+
+#: src/gtkprefs.c:951
+msgid "_Sorting:"
+msgstr "S_ortimine:"
+
+#: src/gtkprefs.c:957 src/gtkprefs.c:1009
+msgid "Show _buttons as:"
+msgstr "_Nuppude näitamine:"
+
+#: src/gtkprefs.c:959 src/gtkprefs.c:1011
+msgid "Pictures"
+msgstr "Piltidena"
+
+#: src/gtkprefs.c:960 src/gtkprefs.c:1012
+msgid "Text"
+msgstr "Tekstina"
+
+#: src/gtkprefs.c:961 src/gtkprefs.c:1013
+msgid "Pictures and text"
+msgstr "Piltide ja tekstina"
+
+#: src/gtkprefs.c:964
+msgid "_Raise window on events"
+msgstr "_Akna esiletõstmine sündmuste puhul"
+
+#: src/gtkprefs.c:967
+msgid "Buddy Display"
+msgstr "Sõprade kuvamine"
+
+#: src/gtkprefs.c:968 src/gtkprefs.c:1030
+msgid "Show buddy _icons"
+msgstr "Sõbra _ikooni näitamine"
+
+#: src/gtkprefs.c:970
+msgid "Show _warning levels"
+msgstr "_Hoiatustasemete näitamine"
+
+#: src/gtkprefs.c:972
+msgid "Show idle _times"
+msgstr "_Jõudeoleku aja näitamine"
+
+#: src/gtkprefs.c:974
+msgid "Dim i_dle buddies"
+msgstr "T_uhmista jõudeolevad sõbrad"
+
+#: src/gtkprefs.c:976
+msgid "_Automatically expand contacts"
+msgstr "_Kontaktide automaatne laiendamine"
+
+#: src/gtkprefs.c:1020
+msgid "Enable \"_slash\" commands"
+msgstr ""
+
+#: src/gtkprefs.c:1023
+msgid "Send unknown \"_slash\" commands as messages"
+msgstr "Tun_dmatute \"kaldkriipsuga\" käskude saatmine sõnumitena"
 
 #: src/gtkprefs.c:1026
+msgid "Show _formatting toolbar"
+msgstr "Vo_rmindamise tööriistariba näitamine"
+
+#: src/gtkprefs.c:1028
+msgid "Show _aliases in tabs/titles"
+msgstr "A_liaste näitamine sakkides/tiitlites"
+
+#: src/gtkprefs.c:1032
+msgid "Enable buddy ic_on animation"
+msgstr "Sõbrai_kooni animatsioon lubatud"
+
+#: src/gtkprefs.c:1034
+msgid "_Notify buddies that you are typing to them"
+msgstr "Sõprade _teavitamine kui sa oled neile sõnumit kirjutamas"
+
+#: src/gtkprefs.c:1036
+msgid "_Raise IM window on events"
+msgstr "Välksõnumi aken tõstetakse sündmuse _puhul esiplaanile"
+
+#: src/gtkprefs.c:1039
+msgid "Raise chat _window on events"
+msgstr "_Jututoa aken tõstetakse sündmuse puhul esiplaanile"
+
+#: src/gtkprefs.c:1041
+msgid "Use _multi-colored screen names in chats"
+msgstr "Jututoas kasutatakse _mitmevärvilisi ekraaninimesid"
+
+#. All the tab options!
+#: src/gtkprefs.c:1045
+msgid "Tab Options"
+msgstr "Sakkide valikud"
+
+#: src/gtkprefs.c:1047
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "_Välksõnumid ja vestlused sakkidega aknas"
+
+#: src/gtkprefs.c:1062
+msgid "Show close b_utton on tabs"
+msgstr "Sakkidel näidatakse sul_gemisnuppu"
+
+#: src/gtkprefs.c:1065
+msgid "Tab p_lacement:"
+msgstr "Sakkide _asetus:"
+
+#: src/gtkprefs.c:1067
+msgid "Top"
+msgstr "Üleval"
+
+#: src/gtkprefs.c:1068
+msgid "Bottom"
+msgstr "All"
+
+#: src/gtkprefs.c:1069
+msgid "Left"
+msgstr "Vasakul"
+
+#: src/gtkprefs.c:1070
+msgid "Right"
+msgstr "Paremal"
+
+#: src/gtkprefs.c:1076
+msgid "New conversation _placement:"
+msgstr "_Uue vestluse asetamine:"
+
+#: src/gtkprefs.c:1127 src/protocols/oscar/oscar.c:749
+#: src/protocols/oscar/oscar.c:5227
+msgid "IP Address"
+msgstr "IP aadress"
+
+#: src/gtkprefs.c:1129
+msgid "_Autodetect IP Address"
+msgstr "IP aadressi _automaattuvastus"
+
+#: src/gtkprefs.c:1138
+msgid "Public _IP:"
+msgstr "Avalik _IP:"
+
+#: src/gtkprefs.c:1162
+msgid "Ports"
+msgstr "Pordid"
+
+#: src/gtkprefs.c:1165
+msgid "_Manually specify range of ports to listen on"
+msgstr "_Kuulatavate portide vahemiku käsitsi määramine"
+
+#: src/gtkprefs.c:1168
+msgid "_Start Port:"
+msgstr "Al_gusport:"
+
+#: src/gtkprefs.c:1175
 msgid "_End Port:"
 msgstr "_Lõpuport:"
 
-#: src/gtkprefs.c:1033
+#: src/gtkprefs.c:1182
 msgid "Proxy Server"
 msgstr "Proksi server"
 
-#: src/gtkprefs.c:1037
+#: src/gtkprefs.c:1186
 msgid "No proxy"
 msgstr "Proksi puudub"
 
-#: src/gtkprefs.c:1093
+#: src/gtkprefs.c:1248
 msgid "_User:"
 msgstr "Kasuta_ja:"
 
-#: src/gtkprefs.c:1153
+#: src/gtkprefs.c:1304
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1154
+#: src/gtkprefs.c:1305
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1155
+#: src/gtkprefs.c:1306
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1156
+#: src/gtkprefs.c:1307
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1157
+#: src/gtkprefs.c:1308
 msgid "Gnome Default"
 msgstr "Gnome vaikimisi"
 
-#: src/gtkprefs.c:1158
+#: src/gtkprefs.c:1309
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1159
+#: src/gtkprefs.c:1310
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1160
+#: src/gtkprefs.c:1311
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1161
+#: src/gtkprefs.c:1312
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1170
+#: src/gtkprefs.c:1321
 msgid "Manual"
 msgstr "Käsitsi"
 
-#: src/gtkprefs.c:1223
+#: src/gtkprefs.c:1372
 msgid "Browser Selection"
 msgstr "Veebilehitseja valimine"
 
-#: src/gtkprefs.c:1227
+#: src/gtkprefs.c:1376
 msgid "_Browser:"
 msgstr "_Lehitseja:"
 
-#: src/gtkprefs.c:1235
+#: src/gtkprefs.c:1383
 msgid "_Open link in:"
 msgstr "_Viitade avamine:"
 
-#: src/gtkprefs.c:1237
+#: src/gtkprefs.c:1385
 msgid "Browser default"
 msgstr "Veebilehitseja vaikimisi sätted"
 
-#: src/gtkprefs.c:1238
+#: src/gtkprefs.c:1386
 msgid "Existing window"
 msgstr "Olemasolevasse aknasse"
 
-#: src/gtkprefs.c:1240
+#: src/gtkprefs.c:1388
 msgid "New tab"
 msgstr "Uude sakki"
 
-#: src/gtkprefs.c:1254
+#: src/gtkprefs.c:1402
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3897,57 +4122,84 @@
 "_Käsitsi:\n"
 "(%s URL'i jaoks)"
 
-#: src/gtkprefs.c:1290 src/gtkprefs.c:1767
-msgid "Logging"
-msgstr "Logimine"
-
-#: src/gtkprefs.c:1293
+#: src/gtkprefs.c:1439
+msgid "Message Logs"
+msgstr "Sõnumilogid"
+
+#: src/gtkprefs.c:1442
 msgid "Log _Format:"
 msgstr "Logi_vorming:"
 
-#: src/gtkprefs.c:1298
-#, fuzzy
-msgid "Log all _instant messages"
+#: src/gtkprefs.c:1445
+msgid "_Log all instant messages"
 msgstr "_Logitakse kõiki välksõnumeid"
 
-#: src/gtkprefs.c:1300
+#: src/gtkprefs.c:1447
 msgid "Log all c_hats"
 msgstr "Logitakse kõiki _jututubasid"
 
-#: src/gtkprefs.c:1302
-msgid "Log all _status changes to system log"
-msgstr ""
-
-#: src/gtkprefs.c:1434
+#: src/gtkprefs.c:1450
+msgid "System Logs"
+msgstr "Süsteemsed logid"
+
+#: src/gtkprefs.c:1452
+msgid "_Enable system log"
+msgstr "Süstee_mne logi lubatud"
+
+#: src/gtkprefs.c:1455
+msgid "Log when buddies _sign on/sign off"
+msgstr "Logitakse sõprade s_isse- ja väljalogimisi"
+
+#: src/gtkprefs.c:1461
+msgid "Log when buddies become _idle/un-idle"
+msgstr "Logitakse sõprade lülitumisi _tegevuseta ja aktiivse oleku vahel"
+
+#: src/gtkprefs.c:1467
+msgid "Log when buddies go away/come _back"
+msgstr "Logitakse sõprade _eemaldumisi ja tagasitulekuid"
+
+#: src/gtkprefs.c:1473
+msgid "Log your _own signons/idleness/awayness"
+msgstr ""
+"Logitakse en_da tegevusi (sisse/väljalogimine, tegevusetus, eemaldumised)"
+
+#: src/gtkprefs.c:1600
 msgid "Sound Selection"
 msgstr "Heli valimine"
 
-#: src/gtkprefs.c:1488
+#: src/gtkprefs.c:1651
+msgid "Sound Options"
+msgstr "Helide valikud"
+
+#: src/gtkprefs.c:1652
+msgid "Sounds when conversation has _focus"
+msgstr "_Heli kui vestlus saab fookuse"
+
+#: src/gtkprefs.c:1654
+msgid "_Sounds while away"
+msgstr "Helid ka _eemal olles"
+
+#: src/gtkprefs.c:1658
 msgid "Sound Method"
 msgstr "Helitegemise meetod"
 
-#: src/gtkprefs.c:1489
+#: src/gtkprefs.c:1659
 msgid "_Method:"
 msgstr "_Meetod"
 
-#: src/gtkprefs.c:1491
+#: src/gtkprefs.c:1661
 msgid "Console beep"
 msgstr "Konsoolipiiks"
 
-#: src/gtkprefs.c:1493
+#: src/gtkprefs.c:1663
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: src/gtkprefs.c:1498
+#: src/gtkprefs.c:1670
 msgid "Command"
 msgstr "Käsk"
 
-#: src/gtkprefs.c:1499
-#, fuzzy
-msgid "No sounds"
-msgstr "Helid"
-
-#: src/gtkprefs.c:1507
+#: src/gtkprefs.c:1678
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3956,113 +4208,179 @@
 "Helitegemise _käsk:\n"
 "(%s failinime jaoks)"
 
-#: src/gtkprefs.c:1533
-msgid "Sound Options"
-msgstr "Helide valikud"
-
-#: src/gtkprefs.c:1534
-msgid "Sounds when conversation has _focus"
-msgstr "_Heli kui vestlus saab fookuse"
-
-#: src/gtkprefs.c:1536
-msgid "_Sounds while away"
-msgstr "Helid ka _eemal olles"
-
-#: src/gtkprefs.c:1546
+#: src/gtkprefs.c:1705
 msgid "Sound Events"
 msgstr "Helisündmused"
 
-#: src/gtkprefs.c:1597
+#: src/gtkprefs.c:1756
 msgid "Play"
 msgstr "Mängida"
 
-#: src/gtkprefs.c:1604
+#: src/gtkprefs.c:1763
 msgid "Event"
 msgstr "Sündmus"
 
-#: src/gtkprefs.c:1623
+#: src/gtkprefs.c:1782
 msgid "Test"
 msgstr "Proovi"
 
-#: src/gtkprefs.c:1627
+#: src/gtkprefs.c:1786
 msgid "Reset"
 msgstr "Algväärtusta"
 
-#: src/gtkprefs.c:1631
+#: src/gtkprefs.c:1790
 msgid "Choose..."
 msgstr "Vali..."
 
-#: src/gtkprefs.c:1685 src/gtkstatusbox.c:288 src/protocols/irc/irc.c:176
-#: src/protocols/irc/msgs.c:221 src/protocols/jabber/buddy.c:1093
-#: src/protocols/jabber/jabber.c:1055 src/protocols/msn/msn.c:577
-#: src/protocols/novell/novell.c:2825 src/protocols/novell/novell.c:2959
-#: src/protocols/novell/novell.c:3041 src/protocols/oscar/oscar.c:707
-#: src/protocols/oscar/oscar.c:6510 src/protocols/oscar/oscar.c:6579
-#: src/protocols/oscar/oscar.c:7604 src/protocols/oscar/oscar.c:7758
-#: src/protocols/silc/buddy.c:1417 src/protocols/silc/silc.c:52
-#: src/protocols/yahoo/yahoo.c:3234 src/protocols/zephyr/zephyr.c:2259
-#: src/status.c:158
-msgid "Away"
-msgstr "Eemal"
-
-#: src/gtkprefs.c:1686
+#: src/gtkprefs.c:1814
 msgid "_Queue new messages when away"
 msgstr "Eemaloleku ajal _pannakse uued sõnumid järjekorda"
 
-#: src/gtkprefs.c:1689
+#: src/gtkprefs.c:1817
 msgid "_Auto-reply:"
 msgstr "_Automaatne vastamine:"
 
-#: src/gtkprefs.c:1692
+#: src/gtkprefs.c:1819
+msgid "Never"
+msgstr "Mitte iial"
+
+#: src/gtkprefs.c:1820
 msgid "When away"
 msgstr "Kui olen eemal"
 
-#: src/gtkprefs.c:1693
-#, fuzzy
-msgid "When both away and idle"
+#: src/gtkprefs.c:1821
+msgid "When away and idle"
 msgstr "Kui olen eemal ja jõude"
 
-#: src/gtkprefs.c:1696
-#, fuzzy
-msgid "_Report idle time"
-msgstr "_Jõudeoleku aja näitamine"
-
-#: src/gtkprefs.c:1699
+#: src/gtkprefs.c:1824 src/protocols/msn/msn.c:1327
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2806
+#: src/protocols/oscar/oscar.c:4375 src/protocols/yahoo/yahoo.c:2780
+#: src/protocols/yahoo/yahoo_profile.c:664
+msgid "Idle"
+msgstr "Tegevusetus"
+
+#: src/gtkprefs.c:1825
+msgid "Idle _time reporting:"
+msgstr "Tegevusetuse a_ja raporteerimine:"
+
+#: src/gtkprefs.c:1828
+msgid "Gaim usage"
+msgstr "Gaim'i kasutus"
+
+#: src/gtkprefs.c:1831
+msgid "X usage"
+msgstr "X'i kasutus"
+
+#: src/gtkprefs.c:1833
+msgid "Windows usage"
+msgstr "Windows'i kasutus"
+
+#: src/gtkprefs.c:1841
 msgid "Auto-away"
 msgstr "Automaatne eemaldumine"
 
-#: src/gtkprefs.c:1700
+#: src/gtkprefs.c:1842
 msgid "Set away _when idle"
 msgstr "_Eemaoleku määramine jõudeoleku puhul"
 
-#: src/gtkprefs.c:1704
+#: src/gtkprefs.c:1846
 msgid "_Minutes before setting away:"
 msgstr "_Mitme minuti jooksul määratakse:"
 
-#: src/gtkprefs.c:1712
+#: src/gtkprefs.c:1854
 msgid "Away m_essage:"
 msgstr "Eemaloleku sõ_num:"
 
-#: src/gtkprefs.c:1757
+#: src/gtkprefs.c:1923
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">Web site:</span>\t\t%s\n"
+"<span weight=\"bold\">File name:</span>\t%s"
+msgstr ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Autor:</span>\t%s\n"
+"<span weight=\"bold\">Veebikoht:</span>\t\t%s\n"
+"<span weight=\"bold\">Failinimi:</span>\t%s"
+
+#: src/gtkprefs.c:1928
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>  %s\n"
+"<span weight=\"bold\">URL:</span>  %s\n"
+"<span weight=\"bold\">File name:</span>  %s"
+msgstr ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Autor:</span>  %s\n"
+"<span weight=\"bold\">URL:</span>  %s\n"
+"<span weight=\"bold\">Failinimi:</span>  %s"
+
+#: src/gtkprefs.c:2161
+msgid "Load"
+msgstr "Laaditud"
+
+#: src/gtkprefs.c:2175
+msgid "Summary"
+msgstr "Kokkuvõte"
+
+#: src/gtkprefs.c:2223
+msgid "Details"
+msgstr "Üksikasjad"
+
+#: src/gtkprefs.c:2384
+msgid "_Edit"
+msgstr "_Redigeeri"
+
+#: src/gtkprefs.c:2420
+msgid "Interface"
+msgstr "Liides"
+
+#: src/gtkprefs.c:2423
+msgid "Message Text"
+msgstr "Sõnumi tekst"
+
+#: src/gtkprefs.c:2424
+msgid "Shortcuts"
+msgstr "Kiirkorraldused"
+
+#: src/gtkprefs.c:2425
 msgid "Smiley Themes"
 msgstr "Emotikonide teemad"
 
-#: src/gtkprefs.c:1758
+#: src/gtkprefs.c:2426
 msgid "Sounds"
 msgstr "Helid"
 
-#: src/gtkprefs.c:1759 src/protocols/silc/silc.c:1589
+#: src/gtkprefs.c:2427 src/protocols/silc/silc.c:1588
 msgid "Network"
 msgstr "Võrk"
 
-#: src/gtkprefs.c:1764
+#: src/gtkprefs.c:2432
 msgid "Browser"
 msgstr "Veebilehitseja"
 
-#: src/gtkprefs.c:1768
+#: src/gtkprefs.c:2435
+msgid "Logging"
+msgstr "Logimine"
+
+#: src/gtkprefs.c:2436
 msgid "Away / Idle"
 msgstr "Eemal / jõude"
 
+#: src/gtkprefs.c:2437
+msgid "Away Messages"
+msgstr "Eemaloleku teated"
+
+#: src/gtkprefs.c:2440
+msgid "Plugins"
+msgstr "Pluginad"
+
 #: src/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "Lubada kõigil kasutajail minuga ühendust võtta"
@@ -4083,68 +4401,64 @@
 msgid "Block only the users below"
 msgstr "Blokkida ainult allpool kuvatud kasutajad"
 
-#: src/gtkprivacy.c:398
+#: src/gtkprivacy.c:397 src/protocols/jabber/jabber.c:1504
 msgid "Privacy"
 msgstr "Privaatsus"
 
-#: src/gtkprivacy.c:411
+#: src/gtkprivacy.c:410
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Privaatsussätted rakenduvad koheselt."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:423
+#: src/gtkprivacy.c:422
 msgid "Set privacy for:"
 msgstr "Privaatsus kontole:"
 
-#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
+#: src/gtkprivacy.c:591 src/gtkprivacy.c:607
 msgid "Permit User"
 msgstr "Kasutaja lubamine"
 
-#: src/gtkprivacy.c:590
+#: src/gtkprivacy.c:592
 msgid "Type a user you permit to contact you."
 msgstr "Sisesta kasutaja, kellel sa lubad endaga ühendust võtta"
 
-#: src/gtkprivacy.c:591
+#: src/gtkprivacy.c:593
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "Palun sisesta kasutaja nimi, kellele sa annad load endaga ühendust võtta."
 
-#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
+#: src/gtkprivacy.c:596 src/gtkprivacy.c:609
 msgid "Permit"
 msgstr "Luba"
 
-#: src/gtkprivacy.c:599
+#: src/gtkprivacy.c:601
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr ""
 
-#: src/gtkprivacy.c:601
+#: src/gtkprivacy.c:603
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr ""
 
-#: src/gtkprivacy.c:628 src/gtkprivacy.c:641
+#: src/gtkprivacy.c:630 src/gtkprivacy.c:643
 msgid "Block User"
 msgstr "Kasutaja blokkimine"
 
-#: src/gtkprivacy.c:629
+#: src/gtkprivacy.c:631
 msgid "Type a user to block."
 msgstr "Sisesta kasutaja, keda blokkida."
 
-#: src/gtkprivacy.c:630
+#: src/gtkprivacy.c:632
 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:632 src/gtkprivacy.c:643 src/protocols/gg/gg.c:1135
-msgid "Block"
-msgstr "Bloki"
-
-#: src/gtkprivacy.c:637
+#: src/gtkprivacy.c:639
 #, c-format
 msgid "Block %s?"
 msgstr "Blokkida %s?"
 
-#: src/gtkprivacy.c:639
+#: src/gtkprivacy.c:641
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Oled sa kindel, et soovid %s blokkida?"
@@ -4152,42 +4466,44 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:258 src/protocols/msn/dialog.c:113
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1902 src/protocols/silc/buddy.c:312
-#: src/protocols/silc/pk.c:117 src/request.h:1322
+#: src/gtkrequest.c:241 src/protocols/gg/gg.c:951
+#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:499
+#: src/protocols/msn/msn.c:502 src/protocols/novell/novell.c:1892
+#: src/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:117
+#: src/request.h:1236
 msgid "Yes"
 msgstr "Jah"
 
-#: src/gtkrequest.c:259 src/protocols/msn/dialog.c:114
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1903 src/protocols/silc/buddy.c:313
-#: src/protocols/silc/pk.c:118 src/request.h:1322
+#: src/gtkrequest.c:242 src/protocols/gg/gg.c:951
+#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:499
+#: src/protocols/msn/msn.c:502 src/protocols/novell/novell.c:1893
+#: src/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:118
+#: src/request.h:1236
 msgid "No"
 msgstr "Ei"
 
-#: src/gtkrequest.c:262
+#: src/gtkrequest.c:245
 msgid "Apply"
 msgstr ""
 
-#: src/gtkrequest.c:263 src/protocols/msn/msn.c:357
+#: src/gtkrequest.c:246 src/protocols/msn/msn.c:314
 #: src/protocols/silc/util.c:335
 msgid "Close"
 msgstr "Sulge"
 
-#: src/gtkrequest.c:1795
+#: src/gtkrequest.c:1421
 msgid "That file already exists"
 msgstr "See fail on juba olemas"
 
-#: src/gtkrequest.c:1796
+#: src/gtkrequest.c:1422
 msgid "Would you like to overwrite it?"
 msgstr "Kas sa soovid seda üle kirjutada?"
 
-#: src/gtkrequest.c:1838 src/gtkrequest.c:1879
+#: src/gtkrequest.c:1460 src/gtkrequest.c:1481
 msgid "Save File..."
 msgstr "Faili salvestamine..."
 
-#: src/gtkrequest.c:1839 src/gtkrequest.c:1880
+#: src/gtkrequest.c:1461 src/gtkrequest.c:1482
 msgid "Open File..."
 msgstr "Faili avamine..."
 
@@ -4200,789 +4516,528 @@
 msgid "_Get List"
 msgstr "_Hangi nimekiri"
 
-#: src/gtksavedstatuses.c:317 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:805 src/protocols/novell/novell.c:1460
-msgid "Title"
-msgstr "Tiitel"
-
-#: src/gtksavedstatuses.c:332
-msgid "Type"
-msgstr ""
-
-#: src/gtksavedstatuses.c:343 src/protocols/gg/gg.c:1083
-#: src/protocols/gg/gg.c:1088 src/protocols/gg/gg.c:1097
-#: src/protocols/gg/gg.c:1107 src/protocols/gg/gg.c:1112
-#: src/protocols/irc/irc.c:177 src/protocols/jabber/jabber.c:1032
-#: src/protocols/jabber/jabber.c:1040 src/protocols/jabber/jabber.c:1048
-#: src/protocols/jabber/jabber.c:1056 src/protocols/jabber/jabber.c:1064
-#: src/protocols/jabber/jabber.c:1072 src/protocols/novell/novell.c:2845
-#: src/protocols/oscar/oscar.c:7752 src/protocols/oscar/oscar.c:7759
-#: src/protocols/yahoo/yahoo.c:3202 src/protocols/yahoo/yahoo.c:3235
-#: src/protocols/zephyr/zephyr.c:2260
-msgid "Message"
-msgstr ""
-
-#: src/gtksavedstatuses.c:406
-#, fuzzy
-msgid "Saved Statuses"
-msgstr "Olek"
-
-#: src/gtksavedstatuses.c:527
-msgid "Title already in use.  You must choose a unique title."
-msgstr ""
-
-#: src/gtksavedstatuses.c:618
-#, fuzzy
-msgid "Custom status"
-msgstr "Oleku järgi"
-
-#: src/gtksavedstatuses.c:721 src/protocols/gg/gg.c:1064
-#: src/protocols/gg/gg.c:1069 src/protocols/jabber/buddy.c:626
-#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/buddy.c:644
-#: src/protocols/jabber/jabber.c:1005 src/protocols/msn/msn.c:544
-#: src/protocols/novell/novell.c:2844 src/protocols/novell/novell.c:2848
-#: src/protocols/oscar/oscar.c:762 src/protocols/oscar/oscar.c:767
-#: src/protocols/oscar/oscar.c:769 src/protocols/yahoo/yahoo.c:2783
-msgid "Status"
-msgstr "Olek"
-
-#: src/gtksavedstatuses.c:740
-#, fuzzy
-msgid "_Title:"
-msgstr "Tiitel"
-
-#: src/gtksavedstatuses.c:760
-#, fuzzy
-msgid "_Status:"
-msgstr "Olek:"
-
-#. Custom status message expander
-#: src/gtksavedstatuses.c:795
-msgid "Use a _different status for some accounts"
-msgstr ""
-
-#: src/gtksound.c:61
+#: src/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "Sõber logib sisse"
 
-#: src/gtksound.c:62
+#: src/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "Sõber logib välja"
 
-#: src/gtksound.c:63
+#: src/gtksound.c:65
 msgid "Message received"
 msgstr "Sõnumi vastuvõtmine"
 
-#: src/gtksound.c:64
+#: src/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "Sõnumi vastuvõtmine alustab vestlust"
 
-#: src/gtksound.c:65
+#: src/gtksound.c:67
 msgid "Message sent"
 msgstr "Sõnumi saatmine"
 
-#: src/gtksound.c:66
+#: src/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Isik siseneb jututuppa"
 
-#: src/gtksound.c:67
+#: src/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Isik väljub jututoast"
 
-#: src/gtksound.c:68
+#: src/gtksound.c:70
 msgid "You talk in chat"
 msgstr "Sa kõneled jututoas"
 
-#: src/gtksound.c:69
+#: src/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Teisted kõnelevad jututoas"
 
-#: src/gtksound.c:72
+#: src/gtksound.c:74
 msgid "Someone says your name in chat"
 msgstr "Keegi ütleb jututoas sinu nime"
 
-#: src/gtksound.c:414
+#: src/gtksound.c:173
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "Heli pole võimalik mängida kuna valitud faili (%s) pole olemas."
 
-#: src/gtksound.c:430
+#: src/gtksound.c:189
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr ""
 
-#: src/gtksound.c:442
+#: src/gtksound.c:201
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 msgstr ""
 
-#: src/gtkstatusbox.c:190
-#, fuzzy
-msgid "Typing"
-msgstr "Ping"
-
-#. connect to the server
-#: src/gtkstatusbox.c:193 src/protocols/irc/irc.c:258
-#: src/protocols/jabber/jabber.c:838 src/protocols/msn/session.c:362
-#: src/protocols/napster/napster.c:525 src/protocols/novell/novell.c:2164
-#: src/protocols/oscar/oscar.c:1824 src/protocols/yahoo/yahoo.c:2451
-#: src/protocols/zephyr/zephyr.c:1546
-msgid "Connecting"
-msgstr "Ühendumine"
-
-#. hacks
-#: src/gtkstatusbox.c:287 src/protocols/irc/irc.c:172
-#: src/protocols/jabber/jabber.c:1039 src/protocols/msn/msn.c:573
-#: 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:2822 src/protocols/novell/novell.c:2956
-#: src/protocols/novell/novell.c:3039 src/protocols/oscar/oscar.c:808
-#: src/protocols/oscar/oscar.c:7751 src/protocols/silc/silc.c:48
-#: src/protocols/yahoo/yahoo.c:3196 src/status.c:155
-msgid "Available"
-msgstr "Saadaval"
-
-#.
-#. * Without this selecting Invisible as own status doesn't
-#. * work. It's not used and not needed to show status of buddies.
-#.
-#: src/gtkstatusbox.c:289 src/protocols/gg/gg.c:1096
-#: src/protocols/oscar/oscar.c:711 src/protocols/oscar/oscar.c:7765
-#: src/protocols/yahoo/yahoo.c:2629 src/protocols/yahoo/yahoo.c:3239
-msgid "Invisible"
-msgstr "Nähtamatu"
-
-#: src/gtkstatusbox.c:290 src/protocols/gg/gg.c:1082
-#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:1087
-#: src/protocols/jabber/jabber.c:1032 src/protocols/msn/msn.c:569
-#: src/protocols/napster/napster.c:573 src/protocols/novell/novell.c:2834
-#: src/protocols/novell/novell.c:2953 src/protocols/oscar/oscar.c:769
-#: src/protocols/oscar/oscar.c:7585 src/protocols/oscar/oscar.c:7746
-#: src/protocols/silc/silc.c:46 src/protocols/yahoo/yahoo.c:2633
-#: src/protocols/yahoo/yahoo.c:3193 src/status.c:154
-msgid "Offline"
-msgstr "Ühendamata"
-
-#: src/gtkstatusbox.c:292
-#, fuzzy
-msgid "Custom..."
-msgstr "Kohandatud"
-
-#: src/gtkstatusbox.c:293
-#, fuzzy
-msgid "Saved..."
-msgstr "Faili salvestamine..."
-
-#. TODO: Should save the previous status as a transient status?
-#. Save the newly selected status to prefs.xml and status.xml
-#: src/gtkstatusbox.c:655 src/gtkstatusbox.c:657 src/gtkstatusbox.c:660
-#: src/status.c:1696
-#, fuzzy
-msgid "Default"
-msgstr "Gnome vaikimisi"
-
-#: src/gtkstock.c:118
-msgid "_Alias"
-msgstr "_Alias"
-
-#: src/gtkstock.c:120
-msgid "_Invite"
-msgstr "_Kutsu"
-
-#: src/gtkstock.c:121
-msgid "_Modify"
-msgstr "_Muuda"
-
-#: src/gtkstock.c:122
-msgid "_Open Mail"
-msgstr "_Ava sõnum"
-
-#: src/gtkstock.c:124
-msgid "_Warn"
-msgstr "_Hoiata"
-
-#: src/gtkutils.c:1393 src/gtkutils.c:1418
-#, c-format
-msgid "The following error has occurred loading %s: %s"
-msgstr ""
-
-#: src/gtkutils.c:1395 src/gtkutils.c:1420
-#, fuzzy
-msgid "Failed to load image"
-msgstr "Tõrge pildi salvestamisel: %s\n"
-
-#: src/gtkutils.c:1495
-#, fuzzy, c-format
-msgid "Cannot send folder %s."
-msgstr "Faili pole võimalik saata"
-
-#: src/gtkutils.c:1497
-msgid ""
-"Gaim cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr ""
-
-#: src/gtkutils.c:1525 src/gtkutils.c:1534 src/gtkutils.c:1539
-msgid "You have dragged an image"
-msgstr ""
-
-#: src/gtkutils.c:1526
-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:1530 src/gtkutils.c:1545
-#, fuzzy
-msgid "Set as buddy icon"
-msgstr "Sõbra _ikooni näitamine"
-
-#: src/gtkutils.c:1531 src/gtkutils.c:1546
-#, fuzzy
-msgid "Send image file"
-msgstr "Sõnumi saatmine"
-
-#: src/gtkutils.c:1532 src/gtkutils.c:1546
-#, fuzzy
-msgid "Insert in message"
-msgstr "Pildi lisamine"
-
-#: src/gtkutils.c:1535
-msgid "Would you like to set it as the buddy icon for this user?"
-msgstr ""
-
-#: src/gtkutils.c:1540
-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:1542
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
-
-#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
-#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
-#. * 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:1596
-#, fuzzy
-msgid "Cannot send launcher"
-msgstr "Faili pole võimalik saata"
-
-#: src/gtkutils.c:1596
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-
-#: src/log.c:129
+#: src/log.c:104
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 
-#: src/log.c:577
-msgid "Logging of this conversation failed."
-msgstr ""
-
-#: src/log.c:839
+#: src/log.c:545
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:904
+#: src/log.c:610
 #, 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:906
+#: src/log.c:612
 #, 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:957 src/log.c:1074
+#: src/log.c:663 src/log.c:793
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 
-#: src/log.c:967 src/log.c:1086
+#: src/log.c:673 src/log.c:805
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr ""
 
-#: src/log.c:1019
+#: src/log.c:677
+msgid "HTML"
+msgstr "HTML"
+
+#: src/log.c:738
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMAATVASTUS>: %s\n"
 
-#: src/plugin.c:331
+#: src/log.c:809
+msgid "Plain text"
+msgstr "Lihttekst"
+
+#: src/main.c:150
+msgid "Please create an account."
+msgstr ""
+
+#: src/main.c:232
+msgid "Login"
+msgstr "Sisselogimine"
+
+#: src/main.c:248
+msgid "<b>_Account:</b>"
+msgstr "<b>_Konto:</b>"
+
+#: src/main.c:262
+msgid "<b>_Password:</b>"
+msgstr "<b>_Parool:</b>"
+
+#. And now for the buttons
+#: src/main.c:279
+msgid "A_ccounts"
+msgstr "K_ontod"
+
+#: src/main.c:285
+msgid "P_references"
+msgstr "_Eelistused"
+
+#: src/main.c:291
+msgid "_Sign on"
+msgstr "_Logi sisse"
+
+#. full help text
+#: src/main.c:513
+#, c-format
+msgid ""
+"Gaim %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          display account editor window\n"
+"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
+"                      name of away message to use)\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, seperated by commas)\n"
+"  -n, --loginwin      don't automatically login; show login window\n"
+"  -u, --user=NAME     use account NAME\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -v, --version       display the current version and exit\n"
+"  -h, --help          display this help and exit\n"
+msgstr ""
+"Gaim %s\n"
+"Kasutamine: %s [VÕTI]...\n"
+"\n"
+"  -a, --acct             kuvatakse kontoredaktori akent\n"
+"  -w, --away[=SÕNUM]     eemaloleku seadmine peale sisselogimist (argumendi\n"
+"                         SÕNUM abil saab määrata eemaloleku teadet)\n"
+"  -l, --login[=NIMI]     automaatne sisselogimine (argumendi NIMI abil saab\n"
+"                         määrata kontosid, mitme konto eraldajaks on koma)\n"
+"  -n, --loginwin         automaatse sisselogimise keelamine, kuvatakse\n"
+"                         sisselogimisakent\n"
+"  -u, --user=NIMI        konto määramine\n"
+"  -c, --config=KATALOOG  seadistusfailide kataloogi määramine\n"
+"  -d, --debug            silumisteadete väljastamine standardväljundisse\n"
+"  -v, --version          käesoleva versiooni kuvamine ja programmi töö\n"
+"                         lõpetamine\n"
+"  -h, --help             käesoleva abiteksti kuvamine ja programmi töö\n"
+"                         lõpetamine\n"
+
+#. short message
+#: src/main.c:528
+#, 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/main.c:895
+msgid "Unable to load preferences"
+msgstr "Eelistusi pole võimalik laadida"
+
+#: src/main.c:895
+msgid ""
+"Gaim was not able to load your preferences because they are stored in an old "
+"format that is no longer used.  Please reconfigure your settings using the "
+"Preferences window."
+msgstr ""
+
+#: src/plugin.c:295
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
 
-#: src/plugin.c:336 src/plugin.c:364
+#: src/plugin.c:300 src/plugin.c:328
 msgid "Gaim was unable to load your plugin."
 msgstr ""
 
-#: src/plugin.c:360
+#: src/plugin.c:324
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr ""
 
-#: src/protocols/gg/gg.c:136 src/protocols/gg/gg.c:155
-#, fuzzy
-msgid "Save Buddylist..."
-msgstr "Faili salvestamine..."
+#: src/prefs.c:113 src/status.c:273
+msgid "Slightly less boring default"
+msgstr "Veidike igav vaikeväärtus"
+
+#: src/protocols/gg/gg.c:50 src/protocols/jabber/jutil.c:44
+#: src/protocols/msn/msn.c:513 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:2797
+#: src/protocols/novell/novell.c:2916 src/protocols/novell/novell.c:2967
+#: src/protocols/oscar/oscar.c:771 src/protocols/yahoo/yahoo.c:3125
+#: src/protocols/yahoo/yahoo.c:3241
+msgid "Available"
+msgstr "Saadaval"
+
+#: src/protocols/gg/gg.c:51
+msgid "Available for friends only"
+msgstr "Saadaval ainult sõprade jaoks"
+
+#: src/protocols/gg/gg.c:53
+msgid "Away for friends only"
+msgstr ""
+
+#: src/protocols/gg/gg.c:54 src/protocols/jabber/jabber.c:1002
+#: src/protocols/jabber/presence.c:139 src/protocols/oscar/oscar.c:689
+#: src/protocols/oscar/oscar.c:5743 src/protocols/oscar/oscar.c:5821
+#: src/protocols/oscar/oscar.c:5845 src/protocols/oscar/oscar.c:7032
+#: src/protocols/oscar/oscar.c:7037 src/protocols/yahoo/yahoo.c:2778
+#: src/protocols/yahoo/yahoo.c:3145 src/protocols/yahoo/yahoo.c:3253
+msgid "Invisible"
+msgstr "Nähtamatu"
+
+#: src/protocols/gg/gg.c:55
+msgid "Invisible for friends only"
+msgstr ""
+
+#: src/protocols/gg/gg.c:56
+msgid "Unavailable"
+msgstr ""
 
 #: src/protocols/gg/gg.c:137
-msgid "Your buddylist is empty, nothing was written to the file."
-msgstr ""
-
-#: src/protocols/gg/gg.c:143 src/protocols/gg/gg.c:145
-#: src/protocols/gg/gg.c:176
-#, fuzzy
-msgid "Couldn't open file"
-msgstr "Faili pole võimalik saata"
-
-#: src/protocols/gg/gg.c:156
-#, fuzzy
-msgid "Buddylist saved successfully!"
-msgstr "Paroolimuutmine õnnestus"
-
-#: src/protocols/gg/gg.c:178
-#, fuzzy
-msgid "Could't open file"
-msgstr "Faili pole võimalik saata"
-
-#: src/protocols/gg/gg.c:199
-msgid "Load Buddylist..."
-msgstr ""
-
-#: src/protocols/gg/gg.c:200
-#, fuzzy
-msgid "Buddylist loaded successfully!"
-msgstr "Paroolimuutmine õnnestus"
-
-#: src/protocols/gg/gg.c:211
-#, fuzzy
-msgid "Save buddylist..."
-msgstr "Faili salvestamine..."
-
-#: src/protocols/gg/gg.c:254
-msgid "Fill in the registration fields."
-msgstr ""
-
-#: src/protocols/gg/gg.c:259
-#, fuzzy
-msgid "Passwords do not match."
-msgstr "Uued paroolid ei klapi omavahel."
-
-#: src/protocols/gg/gg.c:266
-#, fuzzy
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "Uut ühendust pole võimalik luua."
-
-#: src/protocols/gg/gg.c:279
-msgid "New Gadu-Gadu Account Registered"
-msgstr ""
-
-#: src/protocols/gg/gg.c:280
-#, fuzzy
-msgid "Registration completed successfully!"
-msgstr "Registreerimine õnnestus"
-
-#: src/protocols/gg/gg.c:401
-#, fuzzy
-msgid "Last name"
-msgstr "Perekonnanimi:"
-
-#: src/protocols/gg/gg.c:405
-#, fuzzy
-msgid "First name"
-msgstr "Eesnimi:"
-
-#: src/protocols/gg/gg.c:409 src/protocols/gg/gg.c:1664
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:698
-#: src/protocols/jabber/buddy.c:1341 src/protocols/jabber/jabber.c:648
-#: src/protocols/msn/msn.c:1394 src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/ops.c:822 src/protocols/silc/ops.c:965
-#: src/protocols/silc/ops.c:1114 src/protocols/yahoo/yahoo_profile.c:1000
-msgid "Nickname"
+msgid "Unable to resolve hostname."
+msgstr "Hostinime pole võimalik lahendada."
+
+#: src/protocols/gg/gg.c:140 src/protocols/novell/novell.c:1711
+msgid "Unable to connect to server."
+msgstr "Serveriga pole võimalik ühendust võtta."
+
+#: src/protocols/gg/gg.c:143 src/protocols/jabber/auth.c:134
+#: src/protocols/jabber/auth.c:208 src/protocols/jabber/auth.c:369
+#: src/protocols/jabber/auth.c:467 src/protocols/jabber/auth.c:479
+#: src/protocols/jabber/jabber.c:108
+msgid "Invalid response from server."
+msgstr ""
+
+#: src/protocols/gg/gg.c:146
+msgid "Error while reading from socket."
+msgstr "Viga soklist lugemisel."
+
+#: src/protocols/gg/gg.c:149
+msgid "Error while writing to socket."
+msgstr "Viga soklisse kirjutamisel."
+
+#: src/protocols/gg/gg.c:152
+msgid "Authentication failed."
+msgstr "Tõrge autentimisel."
+
+#: src/protocols/gg/gg.c:155
+msgid "Unknown Error Code."
+msgstr "Tundmatu veakood."
+
+#: src/protocols/gg/gg.c:243 src/protocols/oscar/oscar.c:4176
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
+msgstr ""
+
+#. res[0] == username
+#. XXX this should use gaim_notify_userinfo, but it is unclear to me what should be passed for 'who'
+#: src/protocols/gg/gg.c:244 src/protocols/gg/gg.c:1013
+#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:4180
+#: src/protocols/oscar/oscar.c:4404 src/protocols/silc/ops.c:1086
+#: src/protocols/silc/ops.c:1148 src/protocols/toc/toc.c:468
+#: src/protocols/zephyr/zephyr.c:726 src/protocols/zephyr/zephyr.c:1136
+msgid "Buddy Information"
+msgstr "Sõbrateave"
+
+#: src/protocols/gg/gg.c:294
+#, c-format
+msgid "Status: %s"
+msgstr "Olek: %s"
+
+#: src/protocols/gg/gg.c:447
+msgid "Could not connect"
+msgstr ""
+
+#: src/protocols/gg/gg.c:454
+msgid "Unable to read socket"
+msgstr "Soklit pole võimalik lugeda"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:343
+#: src/protocols/napster/napster.c:486 src/protocols/napster/napster.c:517
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/yahoo/yahoo.c:2436 src/protocols/yahoo/yahoo.c:2499
+#: src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:482
+msgid "Unable to connect."
+msgstr ""
+
+#: src/protocols/gg/gg.c:690
+msgid "Reading data"
+msgstr "Andmete lugemine"
+
+#: src/protocols/gg/gg.c:693
+msgid "Balancer handshake"
+msgstr ""
+
+#: src/protocols/gg/gg.c:696
+msgid "Reading server key"
+msgstr "Serveri võtme lugemine"
+
+#: src/protocols/gg/gg.c:699
+msgid "Exchanging key hash"
+msgstr "Võtmeräsi vahetamine"
+
+#: src/protocols/gg/gg.c:709
+msgid "Critical error in GG library\n"
+msgstr "Kriitiline viga GG teegis\n"
+
+#: src/protocols/gg/gg.c:727 src/protocols/gg/gg.c:818
+#: src/protocols/toc/toc.c:146
+#, c-format
+msgid "Connect to %s failed"
+msgstr ""
+
+#: src/protocols/gg/gg.c:775
+msgid "Unable to ping server"
+msgstr "Serverit pole võimalik pingida"
+
+#: src/protocols/gg/gg.c:787
+msgid "Send as message"
+msgstr ""
+
+#: src/protocols/gg/gg.c:792
+msgid "Looking up GG server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:795
+msgid "Invalid Gadu-Gadu UIN specified"
+msgstr ""
+
+#: src/protocols/gg/gg.c:841
+msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
+msgstr ""
+
+#: src/protocols/gg/gg.c:919
+msgid "Couldn't get search results"
+msgstr ""
+
+#: src/protocols/gg/gg.c:924
+msgid "Gadu-Gadu Search Engine"
+msgstr "Gadu-Gadu otsingumootor"
+
+#: src/protocols/gg/gg.c:950
+msgid "Active"
+msgstr "Aktiivne"
+
+#: src/protocols/gg/gg.c:955 src/protocols/oscar/oscar.c:5219
+msgid "UIN"
+msgstr "UIN"
+
+#. First Name
+#: src/protocols/gg/gg.c:959 src/protocols/jabber/jabber.c:624
+#: src/protocols/oscar/oscar.c:5230 src/protocols/silc/ops.c:808
+#: src/protocols/trepia/trepia.c:268
+msgid "First Name"
+msgstr "Eesnimi"
+
+#. Last Name
+#: src/protocols/gg/gg.c:964 src/protocols/jabber/jabber.c:629
+#: src/protocols/oscar/oscar.c:5231 src/protocols/trepia/trepia.c:275
+msgid "Last Name"
+msgstr "Perekonnanimi"
+
+#: src/protocols/gg/gg.c:968 src/protocols/gg/gg.c:1712
+#: src/protocols/irc/msgs.c:219 src/protocols/oscar/oscar.c:5220
+#: src/protocols/silc/ops.c:1204
+msgid "Nick"
 msgstr "Hüüdnimi"
 
-#: src/protocols/gg/gg.c:413 src/protocols/jabber/jabber.c:668
-#: src/protocols/oscar/oscar.c:5998 src/protocols/oscar/oscar.c:6006
+#: src/protocols/gg/gg.c:975 src/protocols/gg/gg.c:978
+msgid "Birth Year"
+msgstr "Sünniaasta"
+
+#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:986
+#: src/protocols/gg/gg.c:988
+msgid "Sex"
+msgstr "Sugu"
+
+#. City
+#: src/protocols/gg/gg.c:992 src/protocols/jabber/jabber.c:639
+#: src/protocols/oscar/oscar.c:5274 src/protocols/oscar/oscar.c:5282
+#: src/protocols/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
 msgid "City"
 msgstr "Linn"
 
-#: src/protocols/gg/gg.c:417
-msgid "Year of birth"
-msgstr ""
-
-#: src/protocols/gg/gg.c:426
-#, fuzzy
-msgid "Only online"
-msgstr "Ühendatud"
-
-#: src/protocols/gg/gg.c:430 src/protocols/gg/gg.c:431
-#: src/protocols/gg/gg.c:1509
-#, fuzzy
-msgid "Find buddies"
-msgstr "T_uhmista jõudeolevad sõbrad"
-
-#: src/protocols/gg/gg.c:432
-#, fuzzy
-msgid "Please, enter your search criteria below"
-msgstr "Palun sisesta uus parool"
-
-#: src/protocols/gg/gg.c:465
-msgid "Fill in the fields."
-msgstr ""
-
-#: src/protocols/gg/gg.c:476
-msgid "Your current password is different from the one that you specified."
-msgstr ""
-
-#: src/protocols/gg/gg.c:491
-#, fuzzy
-msgid "Unable to change password. Error occured.\n"
-msgstr "Gadu-Gadu parooli pole võimalik muuta"
-
-#: src/protocols/gg/gg.c:500
-msgid "Change password for the Gadu-Gadu account"
-msgstr ""
-
-#: src/protocols/gg/gg.c:501
-#, fuzzy
-msgid "Password was changed successfully!"
-msgstr "Paroolimuutmine õnnestus"
-
-#: src/protocols/gg/gg.c:535
-#, fuzzy
-msgid "Token Error"
-msgstr "Tundmatu viga"
-
-#: src/protocols/gg/gg.c:536
-#, fuzzy
-msgid "Unable to fetch the token.\n"
-msgstr "Soklit pole võimalik luua"
-
-#: src/protocols/gg/gg.c:551
-#, fuzzy
-msgid "Current password"
-msgstr "Uus parool"
-
-#: src/protocols/gg/gg.c:555 src/protocols/gg/gg.c:1475
-#: src/protocols/jabber/jabber.c:632 src/protocols/jabber/jabber.c:1150
-msgid "Password"
-msgstr "Parool"
-
-#: src/protocols/gg/gg.c:559 src/protocols/gg/gg.c:1479
-#, fuzzy
-msgid "Password (retype)"
-msgstr "Parool saadetud"
-
-#: src/protocols/gg/gg.c:563 src/protocols/gg/gg.c:1483
-#, fuzzy
-msgid "Enter current token"
-msgstr "%s pole hetkel sisse logitud."
-
-#. original size: 60x24
-#: src/protocols/gg/gg.c:568 src/protocols/gg/gg.c:1488
-#, fuzzy
-msgid "Current token"
-msgstr "Hetkel jututubades"
-
-#: src/protocols/gg/gg.c:574
-#, fuzzy
-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:578 src/protocols/gg/gg.c:579
-#, fuzzy
-msgid "Change Gadu-Gadu Password"
-msgstr "Gadu-Gadu parooli pole võimalik muuta"
-
-#: src/protocols/gg/gg.c:649
-#, fuzzy, c-format
-msgid "Select a chat for buddy: %s"
-msgstr "Jututoa eemaldamine sinu sõbranimekirjast"
-
-#: src/protocols/gg/gg.c:651 src/protocols/gg/gg.c:652
-#, fuzzy
-msgid "Add to chat..."
-msgstr "Lisa _jututuba"
-
-#: src/protocols/gg/gg.c:812
-msgid "Unable to read socket"
-msgstr "Ei suuda soklit lugeda"
-
-#: src/protocols/gg/gg.c:959
-msgid "Gadu-Gadu Public Directory"
-msgstr ""
-
-#: src/protocols/gg/gg.c:960
-#, fuzzy
-msgid "Search results"
-msgstr "Otsingutulemused"
-
-#. zephyr has several exposures
-#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
-#. OPSTAFF "hidden"
-#. REALM-VISIBLE visible to people in local realm
-#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
-#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
-#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
-#.
-#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
-#. Hidden, will set the user's exposure to OPSTAFF
-#.
-#. Away won't change their exposure but will set an auto away message (for IMs only)
-#.
-#: src/protocols/gg/gg.c:1087 src/protocols/jabber/buddy.c:1089
-#: src/protocols/napster/napster.c:578 src/protocols/oscar/oscar.c:713
-#: src/protocols/yahoo/yahoo.c:2635 src/protocols/zephyr/zephyr.c:2252
-msgid "Online"
-msgstr "Ühendatud"
-
-#. type = gaim_status_type_new_with_attrs(GAIM_STATUS_UNAVAILABLE, "not-available", "Not Available",
-#. TRUE, TRUE, FALSE, "message", _("Message"),
-#. gaim_value_new(GAIM_TYPE_STRING), NULL);
-#. types = g_list_append(types, type);
-#: src/protocols/gg/gg.c:1106 src/protocols/msn/msn.c:585
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2828
-#: src/protocols/novell/novell.c:2962 src/protocols/novell/novell.c:3044
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:54
-#: src/protocols/yahoo/yahoo.c:2613 src/protocols/yahoo/yahoo.c:3209
-msgid "Busy"
-msgstr "Hõivatud"
-
-#: src/protocols/gg/gg.c:1111 src/protocols/msn/msn.c:554
-msgid "Blocked"
-msgstr "Blokitud"
+#: src/protocols/gg/gg.c:1035
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1043
+msgid "Couldn't Import Buddy List from Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1105
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
+msgstr "Sõbranimekiri on Gadu-Gadu serverisse edukalt üle kantud"
+
+#: src/protocols/gg/gg.c:1113
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
+msgstr "Sõbranimekirja pole võimalik Gadu-Gadu serverisse üle kanda"
+
+#: src/protocols/gg/gg.c:1121
+msgid "Buddy List successfully deleted from Gadu-Gadu server"
+msgstr "Sõbranimekiri on Gadu-Gadu serverist edukalt kustutatud"
 
 #: src/protocols/gg/gg.c:1129
-#, fuzzy
-msgid "Add to chat"
-msgstr "Jututoa lisamine"
-
-#: src/protocols/gg/gg.c:1133
-#, fuzzy
-msgid "Unblock"
-msgstr "Bloki"
-
-#: src/protocols/gg/gg.c:1149
-#, fuzzy
-msgid "Chat _name:"
-msgstr "Perekonnanimi:"
-
-#: src/protocols/gg/gg.c:1182
-#, fuzzy
-msgid "Connection failed."
-msgstr "Tõrge ühendumisel"
-
-#: src/protocols/gg/gg.c:1356
-#, fuzzy
-msgid "Chat error"
-msgstr "Lugemise viga"
-
-#: src/protocols/gg/gg.c:1357
-#, fuzzy
-msgid "This chat name is already in use"
-msgstr "See fail on juba olemas"
-
-#: src/protocols/gg/gg.c:1434
-#, fuzzy
-msgid "Not connected to the server."
-msgstr "Sa oled serverist lahti ühendatud."
-
-#: src/protocols/gg/gg.c:1455
-msgid "Token Error: Unable to fetch the token.\n"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1471
-#, fuzzy
-msgid "e-Mail"
-msgstr "E-post"
-
-#: src/protocols/gg/gg.c:1494 src/protocols/gg/gg.c:1495
-#, fuzzy
-msgid "Register New Gadu-Gadu Account"
-msgstr "Uue Jabber'i konto registreerimine"
-
-#: src/protocols/gg/gg.c:1496
-msgid "Please, fill in the following fields"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1514
-#, fuzzy
-msgid "Change password"
-msgstr "Muuda parooli"
-
-#: src/protocols/gg/gg.c:1519
-msgid "Upload buddylist to Server"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1522
-msgid "Download buddylist from Server"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1525
-#, fuzzy
-msgid "Delete buddylist from Server"
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Sõbranimekirja pole võimalik Gadu-Gadu serverist kustutada"
 
-#: src/protocols/gg/gg.c:1528
-msgid "Save buddylist to file"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1531
-msgid "Load buddylist from file"
-msgstr ""
-
-#. magic
-#. major_version
-#. minor_version
-#. plugin type
-#. ui_requirement
-#. flags
-#. dependencies
-#. priority
-#. id
-#. name
-#. version
-#: src/protocols/gg/gg.c:1616
-msgid "Gadu-Gadu Protocol Plugin"
-msgstr "Gadu-Gadu protokolli plugin"
-
-#. summary
-#: src/protocols/gg/gg.c:1617
-msgid "Polish popular IM"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1664
-#, fuzzy
-msgid "Gadu-Gadu User"
-msgstr "Gadu-Gadu otsingumootor"
-
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1313
-#, c-format
-msgid "Unknown command: %s"
-msgstr "Tundmatu käsk: %s"
-
-#: src/protocols/irc/cmds.c:463 src/protocols/jabber/chat.c:592
-#: src/protocols/silc/silc.c:1021
-#, c-format
-msgid "current topic is: %s"
-msgstr "hetketeema on: %s"
-
-#: src/protocols/irc/cmds.c:467 src/protocols/jabber/chat.c:596
-#: src/protocols/silc/silc.c:1025
-msgid "No topic is set"
-msgstr "Teemat pole seatud"
-
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:173
-#: src/protocols/yahoo/yahoo_filexfer.c:182
-#: src/protocols/yahoo/yahoo_filexfer.c:191
-#, fuzzy
-msgid "File Transfer Failed"
-msgstr "Faili ülekandmine katkestatud"
-
-#: src/protocols/irc/dcc_send.c:273
-msgid "Gaim could not open a listening port."
-msgstr ""
-
-#: src/protocols/irc/irc.c:79
-msgid "Error displaying MOTD"
-msgstr "Viga päevasõnumi kuvamisel"
-
-#: src/protocols/irc/irc.c:79
-msgid "No MOTD available"
-msgstr "Päevasõnumit pole saadaval"
-
-#: src/protocols/irc/irc.c:80
-msgid "There is no MOTD associated with this connection."
-msgstr "Selle ühendusega pole päevasõnumit seotud"
-
-#: src/protocols/irc/irc.c:83
-#, c-format
-msgid "MOTD for %s"
-msgstr "%s päevasõnum"
-
-#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:522
-#: src/protocols/irc/irc.c:544
-msgid "Server has disconnected"
-msgstr "Server katkestas ühenduse"
-
-#: src/protocols/irc/irc.c:188
-msgid "View MOTD"
-msgstr "Vaata päevasõnumit"
-
-#: src/protocols/irc/irc.c:200 src/protocols/silc/chat.c:32
-msgid "_Channel:"
-msgstr "_Kanal:"
-
-#: src/protocols/irc/irc.c:206 src/protocols/jabber/chat.c:59
-msgid "_Password:"
-msgstr "_Parool:"
-
-#: src/protocols/irc/irc.c:238
-msgid "IRC nicks may not contain whitespace"
-msgstr "IRC nimed ei tohi sisaldada tühje kohti"
-
-#: src/protocols/irc/irc.c:266 src/protocols/jabber/jabber.c:433
-#: src/protocols/jabber/jabber.c:770
-msgid "SSL support unavailable"
-msgstr "SSL tugi pole saadaval"
-
-#: src/protocols/irc/irc.c:277
-msgid "Couldn't create socket"
-msgstr "Soklit pole võimalik luua"
-
-#: src/protocols/irc/irc.c:348 src/protocols/jabber/jabber.c:306
-#: src/protocols/oscar/oscar.c:1744 src/protocols/oscar/oscar.c:1820
-msgid "Couldn't connect to host"
-msgstr "Hostiga ei saa ühendust"
-
-#: src/protocols/irc/irc.c:373 src/protocols/jabber/jabber.c:333
-msgid "Connection Failed"
-msgstr "Tõrge ühendumisel"
-
-#: src/protocols/irc/irc.c:376 src/protocols/jabber/jabber.c:336
-msgid "SSL Handshake Failed"
-msgstr "Tõrge SSL käepigistusel"
-
-#: src/protocols/irc/irc.c:519 src/protocols/irc/irc.c:541
-msgid "Read error"
-msgstr "Lugemise viga"
-
-#: src/protocols/irc/irc.c:690 src/protocols/silc/chat.c:1388
-#: src/protocols/yahoo/yahoochat.c:1376
-msgid "Users"
-msgstr "Kasutajad"
-
-#: src/protocols/irc/irc.c:693 src/protocols/silc/chat.c:1391
-#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1385
-msgid "Topic"
-msgstr "Teema"
-
-#: src/protocols/irc/irc.c:730
-msgid "IRC"
-msgstr ""
-
-#: src/protocols/irc/irc.c:734
-#, fuzzy
-msgid "Quit message"
-msgstr "(1 sõnum)"
+#: src/protocols/gg/gg.c:1138
+msgid "Password changed successfully"
+msgstr "Paroolimuutmine õnnestus"
+
+#: src/protocols/gg/gg.c:1145
+msgid "Password couldn't be changed"
+msgstr "Parooli pole võimalik muuta"
+
+#: src/protocols/gg/gg.c:1264
+msgid "Error communicating with Gadu-Gadu server"
+msgstr "Viga Gadu-Gadu serveriga suhtlemisel"
+
+#: src/protocols/gg/gg.c:1265
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating with "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1294
+msgid "Unable to import Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1295
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1368
+msgid "Couldn't export buddy list"
+msgstr "Sõbranimekirja pole võimalik eksportida"
+
+#: src/protocols/gg/gg.c:1369 src/protocols/gg/gg.c:1392
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1391
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1442
+msgid "Unable to access directory"
+msgstr "Kataloogile pole võimalik ligi pääseda"
+
+#: src/protocols/gg/gg.c:1443
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1477
+msgid "Unable to change Gadu-Gadu password"
+msgstr "Gadu-Gadu parooli pole võimalik muuta"
+
+#: src/protocols/gg/gg.c:1478
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1494
+msgid "Directory Search"
+msgstr ""
+
+#. if (js->protocol_options & CHANGE_PASSWORD) {
+#: src/protocols/gg/gg.c:1499 src/protocols/jabber/jabber.c:1100
+#: src/protocols/toc/toc.c:1591
+msgid "Change Password"
+msgstr "Muuda parooli"
+
+#: src/protocols/gg/gg.c:1503
+msgid "Import Buddy List from Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1507
+msgid "Export Buddy List to Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1511
+msgid "Delete Buddy List from Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1544
+msgid "Unable to access user profile."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1545
+msgid ""
+"Gaim was unable to access this user's profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -4992,174 +5047,325 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:820
+#. *  summary
+#. *  description
+#: src/protocols/gg/gg.c:1691 src/protocols/gg/gg.c:1693
+msgid "Gadu-Gadu Protocol Plugin"
+msgstr "Gadu-Gadu protokolli plugin"
+
+#: src/protocols/icq/gaim_icq.c:223
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:293
+#, c-format
+msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:300
+#: src/protocols/msn/userlist.c:103 src/protocols/oscar/oscar.c:3915
+#: src/protocols/oscar/oscar.c:6480 src/protocols/yahoo/yahoo.c:1080
+msgid "Authorize"
+msgstr "Autoriseeri"
+
+#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:301
+#: src/protocols/msn/userlist.c:104 src/protocols/oscar/oscar.c:3917
+#: src/protocols/oscar/oscar.c:6481 src/protocols/yahoo/yahoo.c:1082
+msgid "Deny"
+msgstr "Keela"
+
+#: src/protocols/icq/gaim_icq.c:309
+msgid "Send message through server"
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:351
+msgid "Connecting..."
+msgstr "Ühendumine..."
+
+#: src/protocols/icq/gaim_icq.c:497
+msgid "Nick:"
+msgstr "Hüüdnimi:"
+
+#: src/protocols/icq/gaim_icq.c:498
+msgid "Gaim User"
+msgstr ""
+
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1311
+#, c-format
+msgid "Unknown command: %s"
+msgstr "Tundmatu käsk: %s"
+
+#: src/protocols/irc/cmds.c:464 src/protocols/jabber/chat.c:576
+#: src/protocols/silc/silc.c:1019
+#, c-format
+msgid "current topic is: %s"
+msgstr "hetketeema on: %s"
+
+#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:580
+#: src/protocols/silc/silc.c:1023
+msgid "No topic is set"
+msgstr "Teemat pole seatud"
+
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:176
+#: src/protocols/yahoo/yahoo_filexfer.c:185
+#: src/protocols/yahoo/yahoo_filexfer.c:194
+msgid "File Transfer Aborted"
+msgstr "Failiülekanne katkestatud"
+
+#: src/protocols/irc/dcc_send.c:273
+msgid "Gaim could not open a listening port."
+msgstr ""
+
+#: src/protocols/irc/irc.c:76
+msgid "Error displaying MOTD"
+msgstr "Viga päevasõnumi kuvamisel"
+
+#: src/protocols/irc/irc.c:76
+msgid "No MOTD available"
+msgstr "Päevasõnumit pole saadaval"
+
+#: src/protocols/irc/irc.c:77
+msgid "There is no MOTD associated with this connection."
+msgstr "Selle ühendusega pole päevasõnumit seotud"
+
+#: src/protocols/irc/irc.c:80
+#, c-format
+msgid "MOTD for %s"
+msgstr "%s päevasõnum"
+
+#: src/protocols/irc/irc.c:94 src/protocols/irc/irc.c:406
+msgid "Server has disconnected"
+msgstr "Server katkestas ühenduse"
+
+#: src/protocols/irc/irc.c:159
+msgid "View MOTD"
+msgstr "Vaata päevasõnumit"
+
+#: src/protocols/irc/irc.c:181 src/protocols/silc/chat.c:32
+msgid "_Channel:"
+msgstr "_Kanal:"
+
+#: src/protocols/irc/irc.c:186 src/protocols/jabber/chat.c:56
+msgid "_Password:"
+msgstr "_Parool:"
+
+#: src/protocols/irc/irc.c:218
+msgid "IRC nicks may not contain whitespace"
+msgstr "IRC nimed ei tohi sisaldada tühje kohti"
+
+#. connect to the server
+#: src/protocols/irc/irc.c:238 src/protocols/jabber/jabber.c:798
+#: src/protocols/msn/session.c:364 src/protocols/napster/napster.c:510
+#: src/protocols/novell/novell.c:2152 src/protocols/oscar/oscar.c:1760
+#: src/protocols/trepia/trepia.c:1065 src/protocols/yahoo/yahoo.c:2641
+#: src/protocols/zephyr/zephyr.c:1458
+msgid "Connecting"
+msgstr "Ühendumine"
+
+#: src/protocols/irc/irc.c:245
+msgid "Couldn't create socket"
+msgstr "Soklit pole võimalik luua"
+
+#: src/protocols/irc/irc.c:260 src/protocols/jabber/jabber.c:304
+#: src/protocols/oscar/oscar.c:1691 src/protocols/oscar/oscar.c:1756
+msgid "Couldn't connect to host"
+msgstr "Hostiga pole võimalik ühendust saada"
+
+#: src/protocols/irc/irc.c:403 src/protocols/trepia/trepia.c:927
+msgid "Read error"
+msgstr "Lugemise viga"
+
+#: src/protocols/irc/irc.c:568 src/protocols/silc/chat.c:1373
+#: src/protocols/yahoo/yahoochat.c:1444
+msgid "Users"
+msgstr "Kasutajad"
+
+#: src/protocols/irc/irc.c:571 src/protocols/silc/chat.c:1376
+#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1453
+msgid "Topic"
+msgstr "Teema"
+
+#: src/protocols/irc/irc.c:608
+msgid "IRC"
+msgstr "IRC"
+
+#: src/protocols/irc/irc.c:612
+msgid "Quit message"
+msgstr "Lõpetamissõnum"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: src/protocols/irc/irc.c:699
 msgid "IRC Protocol Plugin"
 msgstr "IRC protokolli plugin"
 
 #. *  summary
-#: src/protocols/irc/irc.c:821
+#: src/protocols/irc/irc.c:700
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr ""
 
-#: src/protocols/irc/irc.c:840 src/protocols/irc/msgs.c:233
-#: src/protocols/jabber/jabber.c:1708 src/protocols/napster/napster.c:707
-#: src/protocols/silc/ops.c:1028 src/protocols/silc/ops.c:1130
+#: src/protocols/irc/irc.c:719 src/protocols/irc/msgs.c:239
+#: src/protocols/jabber/jabber.c:1617 src/protocols/napster/napster.c:672
+#: src/protocols/silc/ops.c:1026 src/protocols/silc/ops.c:1129
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:843 src/protocols/msn/msn.c:1968
-#: src/protocols/napster/napster.c:712 src/protocols/silc/silc.c:1597
+#: src/protocols/irc/irc.c:722 src/protocols/jabber/jabber.c:1638
+#: src/protocols/msn/msn.c:1934 src/protocols/napster/napster.c:677
+#: src/protocols/silc/silc.c:1596 src/protocols/trepia/trepia.c:1301
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/irc/irc.c:846
+#: src/protocols/irc/irc.c:725
 msgid "Encodings"
 msgstr "Kooditabelid"
 
-#: src/protocols/irc/irc.c:849 src/protocols/irc/msgs.c:227
-#: src/protocols/jabber/jabber.c:628 src/protocols/silc/buddy.c:1483
-#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
-#: src/protocols/silc/ops.c:1124 src/protocols/silc/ops.c:1126
+#: src/protocols/irc/irc.c:728 src/protocols/irc/msgs.c:233
+#: src/protocols/jabber/jabber.c:599 src/protocols/silc/buddy.c:1454
+#: src/protocols/silc/ops.c:973 src/protocols/silc/ops.c:975
+#: src/protocols/silc/ops.c:1123 src/protocols/silc/ops.c:1125
 msgid "Username"
 msgstr "Kasutajanimi"
 
-#: src/protocols/irc/irc.c:852
+#: src/protocols/irc/irc.c:731
 msgid "Real name"
 msgstr "Tegelik nimi"
 
-#: src/protocols/irc/irc.c:855
-msgid "Use SSL"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:105
+#: src/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:116
+#: src/protocols/irc/msgs.c:120
 #, c-format
 msgid "You are banned from %s."
 msgstr ""
 
-#: src/protocols/irc/msgs.c:117
+#: src/protocols/irc/msgs.c:121
 msgid "Banned"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:134
+#: src/protocols/irc/msgs.c:139
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:213 src/protocols/irc/msgs.c:233
-#: src/protocols/irc/msgs.c:246
+#: src/protocols/irc/msgs.c:219 src/protocols/irc/msgs.c:239
+#: src/protocols/irc/msgs.c:252
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: src/protocols/irc/msgs.c:213 src/protocols/oscar/oscar.c:5944
-#: src/protocols/silc/ops.c:1198
-msgid "Nick"
-msgstr "Hüüdnimi"
-
-#: src/protocols/irc/msgs.c:216
+#: src/protocols/irc/msgs.c:222
 msgid " <i>(ircop)</i>"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:217
+#: src/protocols/irc/msgs.c:223
 msgid " <i>(identified)</i>"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:221 src/protocols/irc/msgs.c:227
-#: src/protocols/irc/msgs.c:228 src/protocols/irc/msgs.c:239
-#: src/protocols/yahoo/yahoo_profile.c:660
+#: src/protocols/irc/msgs.c:227 src/protocols/irc/msgs.c:233
+#: src/protocols/irc/msgs.c:234 src/protocols/irc/msgs.c:245
+#: src/protocols/msn/msn.c:1327 src/protocols/yahoo/yahoo_profile.c:664
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:228 src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1118 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/irc/msgs.c:234 src/protocols/silc/ops.c:967
+#: src/protocols/silc/ops.c:1117 src/protocols/yahoo/yahoo_profile.c:1012
 msgid "Realname"
 msgstr "Tegelik nimi"
 
-#: src/protocols/irc/msgs.c:239 src/protocols/silc/ops.c:1041
+#: src/protocols/irc/msgs.c:245 src/protocols/silc/ops.c:1039
 msgid "Currently on"
 msgstr "Hetkel jututubades"
 
-#: src/protocols/irc/msgs.c:244
+#: src/protocols/irc/msgs.c:250
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Tegevuseta:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:246
+#: src/protocols/irc/msgs.c:252
 msgid "Online since"
 msgstr "Ühendatud alates"
 
-#: src/protocols/irc/msgs.c:249
+#: src/protocols/irc/msgs.c:255
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:317
+#: src/protocols/irc/msgs.c:262
+#, c-format
+msgid "Buddy Information for %s"
+msgstr "Teave sõbra %s kohta"
+
+#: src/protocols/irc/msgs.c:325
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s määras uueks teemaks: %s"
 
-#: src/protocols/irc/msgs.c:322
+#: src/protocols/irc/msgs.c:330
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Kanali %s teema on: %s"
 
-#: src/protocols/irc/msgs.c:339
+#: src/protocols/irc/msgs.c:348
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Tundmatu sõnum '%s'"
 
-#: src/protocols/irc/msgs.c:340
+#: src/protocols/irc/msgs.c:349
 msgid "Unknown message"
 msgstr "Tundmatu sõnum"
 
-#: src/protocols/irc/msgs.c:340
+#: src/protocols/irc/msgs.c:349
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim saatis sõnumi, millest IRC server ei saanud aru."
 
-#: src/protocols/irc/msgs.c:363
+#: src/protocols/irc/msgs.c:373
 #, c-format
 msgid "Users on %s: %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:482
+#: src/protocols/irc/msgs.c:473
 msgid "Time Response"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:483
+#: src/protocols/irc/msgs.c:474
 msgid "The IRC server's local time is:"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:494
+#: src/protocols/irc/msgs.c:488
 msgid "No such channel"
 msgstr "Sellist kanalit pole"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:505
+#: src/protocols/irc/msgs.c:501
 msgid "no such channel"
 msgstr "sellist kanalit pole"
 
-#: src/protocols/irc/msgs.c:508
+#: src/protocols/irc/msgs.c:504
 msgid "User is not logged in"
 msgstr "Kasutaja pole sisse logitud"
 
-#: src/protocols/irc/msgs.c:513
+#: src/protocols/irc/msgs.c:510
 msgid "No such nick or channel"
 msgstr "Sellist kanalit või hüüdnime pole"
 
-#: src/protocols/irc/msgs.c:533
+#: src/protocols/irc/msgs.c:531
 msgid "Could not send"
 msgstr "Ei saa saata"
 
-#: src/protocols/irc/msgs.c:589
+#: src/protocols/irc/msgs.c:587
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Ühinemine %s'ga on vaja kutset."
 
-#: src/protocols/irc/msgs.c:590
+#: src/protocols/irc/msgs.c:588
 msgid "Invitation only"
 msgstr "Ainult kutsetega"
 
@@ -5178,7 +5384,16 @@
 msgid "mode (%s %s) by %s"
 msgstr "mood (%s %s) %s poolt"
 
-#: src/protocols/irc/msgs.c:805
+#: src/protocols/irc/msgs.c:808
+#, c-format
+msgid "Invalid nickname '%s'"
+msgstr "Vigane hüüdnimi '%s'"
+
+#: src/protocols/irc/msgs.c:809
+msgid "Invalid nickname"
+msgstr "Vigane hüüdnimi"
+
+#: src/protocols/irc/msgs.c:811 src/protocols/irc/msgs.c:816
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -5186,52 +5401,47 @@
 "Sinu valitud hüüdnimi lükati serveri poolt tagasi, arvatavasti sisaldab nimi "
 "lubamatuid märke."
 
-#: src/protocols/irc/msgs.c:844
+#: src/protocols/irc/msgs.c:858
 msgid "Cannot change nick"
 msgstr "Hüüdnime pole võimalik muuta"
 
-#: src/protocols/irc/msgs.c:844
+#: src/protocols/irc/msgs.c:858
 msgid "Could not change nick"
 msgstr "Hüüdnime pole võimalik muuta"
 
-#: src/protocols/irc/msgs.c:865
+#: src/protocols/irc/msgs.c:880
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:907
+#: src/protocols/irc/msgs.c:922
 msgid "Error: invalid PONG from server"
 msgstr "Viga: serverilt tuli vigane PONG"
 
-#: src/protocols/irc/msgs.c:909
+#: src/protocols/irc/msgs.c:924
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING vastus -- Viivitud: %lu sekundit"
 
-#: src/protocols/irc/msgs.c:984
+#: src/protocols/irc/msgs.c:999
 #, c-format
 msgid "Cannot join %s:"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:985 src/protocols/silc/ops.c:914
+#: src/protocols/irc/msgs.c:1001 src/protocols/silc/ops.c:912
 msgid "Cannot join channel"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:1019
-#, fuzzy
-msgid "Nick or channel is temporarily unavailable."
-msgstr "Kataloogiteenus pole ajutiselt saadaval."
-
-#: src/protocols/irc/msgs.c:1031
+#: src/protocols/irc/msgs.c:1038
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
 
-#: src/protocols/irc/parse.c:114
+#: src/protocols/irc/parse.c:113
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;tegevusm&gt;:  Tegevuse sooritamine."
 
-#: src/protocols/irc/parse.c:115
+#: src/protocols/irc/parse.c:114
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -5239,284 +5449,293 @@
 "away [sõnum]:  Eemaloleku teate määramine. Ilma sõnumita käsku kasutatakse "
 "eemaolekust tagasitulemise puhul."
 
-#: src/protocols/irc/parse.c:116
+#: src/protocols/irc/parse.c:115
 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:117
+#: src/protocols/irc/parse.c:116
 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:118
+#: src/protocols/irc/parse.c:117
 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:119
+#: src/protocols/irc/parse.c:118
 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:119
+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:120
 msgid ""
-"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
+"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:121
 msgid ""
-"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
-"channel operator to do this."
+"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:122
-msgid ""
-"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
-"may disconnect you upon doing this.</i>"
-msgstr ""
+msgid "me &lt;action to perform&gt;:  Perform an action."
+msgstr "me &lt;tegevusm&gt;:  Tegevuse sooritamine."
 
 #: src/protocols/irc/parse.c:123
-msgid "me &lt;action to perform&gt;:  Perform an action."
-msgstr "me &lt;tegevusm&gt;:  Tegevuse sooritamine."
-
-#: src/protocols/irc/parse.c:124
 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:125
+#: src/protocols/irc/parse.c:124
 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:126
+#: src/protocols/irc/parse.c:125
 msgid "names [channel]:  List the users currently in a channel."
 msgstr ""
 
-#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1555
+#: src/protocols/irc/parse.c:126 src/protocols/jabber/jabber.c:1448
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr ""
 
+#: src/protocols/irc/parse.c:127
+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:128
 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:129
-msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr ""
 "operwall &lt;message&gt;:  Kui sa ei tea, mis asi see on, siis pole sul "
 "arvatavasti seda vaja ka kasutada."
 
-#: src/protocols/irc/parse.c:130
+#: src/protocols/irc/parse.c:129
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
 
-#: src/protocols/irc/parse.c:131
+#: src/protocols/irc/parse.c:130
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
 
-#: src/protocols/irc/parse.c:132
+#: src/protocols/irc/parse.c:131
 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:132
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgstr ""
+
 #: src/protocols/irc/parse.c:133
-msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgid "quote [...]:  Send a raw command to the server."
 msgstr ""
 
 #: src/protocols/irc/parse.c:134
-msgid "quote [...]:  Send a raw command to the server."
+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:135
-msgid ""
-"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
-"channel operator to do this."
+msgid "time: Displays the current local time at the IRC server."
 msgstr ""
 
 #: src/protocols/irc/parse.c:136
-msgid "time: Displays the current local time at the IRC server."
+msgid "topic [new topic]:  View or change the channel topic."
 msgstr ""
 
 #: src/protocols/irc/parse.c:137
-msgid "topic [new topic]:  View or change the channel topic."
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
 
 #: src/protocols/irc/parse.c:138
-msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+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:139
 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:140
-msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
 "wallops &lt;message&gt;:  Kui sa ei tea, mis asi see on, siis pole sul "
 "arvatavasti seda vaja ka kasutada."
 
-#: src/protocols/irc/parse.c:141
+#: src/protocols/irc/parse.c:140
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [server] &lt;nick&gt;:  Kasutaja kohta teabe hankimine."
 
-#: src/protocols/irc/parse.c:422
+#: src/protocols/irc/parse.c:421
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr ""
 
-#: src/protocols/irc/parse.c:423
+#: src/protocols/irc/parse.c:422
 msgid "PONG"
 msgstr ""
 
-#: src/protocols/irc/parse.c:423
+#: src/protocols/irc/parse.c:422
 msgid "CTCP PING reply"
 msgstr ""
 
-#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
-#: src/protocols/oscar/oscar.c:1653 src/protocols/toc/toc.c:190
-#: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
-#: src/protocols/toc/toc.c:780
+#: src/protocols/irc/parse.c:525 src/protocols/irc/parse.c:529
+#: src/protocols/oscar/oscar.c:1588 src/protocols/toc/toc.c:188
+#: src/protocols/toc/toc.c:596 src/protocols/toc/toc.c:612
+#: src/protocols/toc/toc.c:689
 msgid "Disconnected."
 msgstr ""
 
-#: src/protocols/jabber/auth.c:51
+#: src/protocols/jabber/auth.c:52
 msgid ""
 "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 "account properties"
 msgstr ""
 
-#: src/protocols/jabber/auth.c:53
+#: src/protocols/jabber/auth.c:54
 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
+#: src/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server vajab avatekstiautentimist üle krüptimata andmevoo"
 
-#: src/protocols/jabber/auth.c:133 src/protocols/jabber/auth.c:207
-#: src/protocols/jabber/auth.c:375 src/protocols/jabber/auth.c:473
-#: src/protocols/jabber/auth.c:485 src/protocols/jabber/jabber.c:110
-msgid "Invalid response from server."
-msgstr ""
-
-#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
-#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
+#: src/protocols/jabber/auth.c:164 src/protocols/jabber/auth.c:165
+#: src/protocols/jabber/auth.c:242 src/protocols/jabber/auth.c:243
 msgid "Plaintext Authentication"
 msgstr "Avatekstiline autentimine"
 
-#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
+#: src/protocols/jabber/auth.c:166 src/protocols/jabber/auth.c:244
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr ""
 
-#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
+#: src/protocols/jabber/auth.c:174 src/protocols/jabber/auth.c:252
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
-#: src/protocols/jabber/auth.c:396
+#: src/protocols/jabber/auth.c:390
 msgid "Invalid challenge from server"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:667
-#: src/protocols/silc/ops.c:806
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:613
+#: src/protocols/silc/ops.c:804
 msgid "Full Name"
 msgstr "Täisnimi"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:680
-#: src/protocols/silc/ops.c:818
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:626
+#: src/protocols/silc/ops.c:816
 msgid "Family Name"
 msgstr "Perekonnanimi"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:684
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:630
 msgid "Given Name"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:688
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:644
+#: src/protocols/jabber/jabber.c:619 src/protocols/msn/msn.c:1317
+#: src/protocols/silc/buddy.c:1451 src/protocols/silc/ops.c:820
+#: src/protocols/silc/ops.c:963 src/protocols/silc/ops.c:1113
+#: src/protocols/yahoo/yahoo_profile.c:1007
+msgid "Nickname"
+msgstr "Hüüdnimi"
+
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:659
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:726
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:672
 msgid "Street Address"
 msgstr "Tänavaaadress"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:722
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:668
 msgid "Extended Address"
 msgstr "Laiendatud aadress"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:730
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:676
 msgid "Locality"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:734
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:680
 msgid "Region"
 msgstr "Piirkond"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:738
-#: src/protocols/jabber/jabber.c:678
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:684
+#: src/protocols/jabber/jabber.c:649
 msgid "Postal Code"
 msgstr "Postiindeks"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:743
+#. Country
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:689
+#: src/protocols/trepia/trepia.c:340 src/protocols/trepia/trepia.c:417
 msgid "Country"
 msgstr "Riik"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:754
-#: src/protocols/jabber/buddy.c:761
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:700
+#: src/protocols/jabber/buddy.c:707
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:772
-#: src/protocols/jabber/buddy.c:780 src/protocols/silc/silc.c:661
-#: src/protocols/silc/util.c:511 src/protocols/yahoo/yahoo_profile.c:995
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:718
+#: src/protocols/jabber/buddy.c:726 src/protocols/silc/silc.c:656
+#: src/protocols/silc/util.c:511 src/protocols/yahoo/yahoo_profile.c:1002
 msgid "Email"
 msgstr "E-post"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:795
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:741
 msgid "Organization Name"
 msgstr "Organisatsiooni nimi"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:799
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:745
 msgid "Organization Unit"
 msgstr "Organisatsiooni üksus"
 
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:808
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:751
+#: src/protocols/novell/novell.c:1451
+msgid "Title"
+msgstr "Tiitel"
+
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:754
 msgid "Role"
 msgstr "Roll"
 
-#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:701
-#: src/protocols/oscar/oscar.c:5979
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:647
+#: src/protocols/oscar/oscar.c:5255
 msgid "Birthday"
 msgstr "Sünnipäev"
 
-#: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
+#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
 msgid "Edit Jabber vCard"
 msgstr "Jabber'i vKaardi redigeerimine"
 
-#: src/protocols/jabber/buddy.c:569
+#: src/protocols/jabber/buddy.c:511
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5524,633 +5743,593 @@
 "Ükski allpool olev väli pole kohustuslik. Sisesta ainult seda teavet, mis "
 "tundub sulle sobilik."
 
-#: src/protocols/jabber/buddy.c:616
+#: src/protocols/jabber/buddy.c:556
 msgid "Jabber ID"
 msgstr "Jabber'i ID"
 
-#: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
-msgid "Resource"
-msgstr "Vahend"
-
-#: src/protocols/jabber/buddy.c:688 src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:566 src/protocols/jabber/buddy.c:573
+#: src/protocols/jabber/buddy.c:586 src/protocols/jabber/jabber.c:971
+#: src/protocols/msn/msn.c:489 src/protocols/novell/novell.c:2819
+#: src/protocols/novell/novell.c:2823 src/protocols/oscar/oscar.c:731
+#: src/protocols/oscar/oscar.c:737 src/protocols/oscar/oscar.c:739
+#: src/protocols/yahoo/yahoo.c:2903
+msgid "Status"
+msgstr "Olek"
+
+#: src/protocols/jabber/buddy.c:634 src/protocols/silc/ops.c:812
 msgid "Middle Name"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:706 src/protocols/jabber/jabber.c:663
-#: src/protocols/oscar/oscar.c:5997 src/protocols/oscar/oscar.c:6005
-#: src/protocols/silc/ops.c:850
+#: src/protocols/jabber/buddy.c:652 src/protocols/jabber/jabber.c:634
+#: src/protocols/oscar/oscar.c:5273 src/protocols/oscar/oscar.c:5281
+#: src/protocols/silc/ops.c:848
 msgid "Address"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:718
+#: src/protocols/jabber/buddy.c:664
 msgid "P.O. Box"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:832
+#: src/protocols/jabber/buddy.c:770
 msgid "Photo"
 msgstr "Foto"
 
-#: src/protocols/jabber/buddy.c:832
+#: src/protocols/jabber/buddy.c:770
 msgid "Logo"
 msgstr "Logo"
 
-#: src/protocols/jabber/buddy.c:1035
+#: src/protocols/jabber/buddy.c:786
+msgid "Jabber Profile"
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:941
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:1038
+#: src/protocols/jabber/buddy.c:944
 msgid "Temporarily Hide From"
 msgstr ""
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1045
+#: src/protocols/jabber/buddy.c:951
 msgid "Cancel Presence Notification"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:1051
+#: src/protocols/jabber/buddy.c:957
 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:1059
+#: src/protocols/jabber/buddy.c:965
 msgid "Unsubscribe"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/chat.c:677
-#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:1018
-#: src/protocols/silc/ops.c:1235
-msgid "Error"
-msgstr "Viga"
-
-#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1047
-msgid "Chatty"
-msgstr "Lobisev"
-
-#: src/protocols/jabber/buddy.c:1095 src/protocols/jabber/jabber.c:1063
-#: src/status.c:159
-msgid "Extended Away"
-msgstr "Kaua eemal"
-
-#: src/protocols/jabber/buddy.c:1097 src/protocols/jabber/jabber.c:1071
-#: src/protocols/oscar/oscar.c:701 src/protocols/oscar/oscar.c:7785
-msgid "Do Not Disturb"
-msgstr "Mitte segada"
-
-#: src/protocols/jabber/buddy.c:1235
-msgid "The following are the results of your search"
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
-#: src/protocols/oscar/oscar.c:5954 src/protocols/silc/ops.c:810
-msgid "First Name"
-msgstr "Eesnimi"
-
-#: src/protocols/jabber/buddy.c:1336 src/protocols/jabber/jabber.c:658
-#: src/protocols/oscar/oscar.c:5955
-msgid "Last Name"
-msgstr "Perekonnanimi"
-
-#: src/protocols/jabber/buddy.c:1346
-msgid "E-Mail Address"
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
-msgid "Search for Jabber users"
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1370
-#, fuzzy
-msgid "Invalid Directory"
-msgstr "Vigane grupp"
-
-#: src/protocols/jabber/buddy.c:1387
-#, fuzzy
-msgid "Enter a User Directory"
-msgstr "Kataloogi pole võimalik saata."
-
-#: src/protocols/jabber/buddy.c:1388
-#, fuzzy
-msgid "Select a user directory to search"
-msgstr "Vali jututoaserver, kuhu päring esitada"
-
-#: src/protocols/jabber/buddy.c:1391
-#, fuzzy
-msgid "Search Directory"
-msgstr "O_tsi stringi:"
-
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:7312
-#: src/protocols/yahoo/yahoochat.c:979
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6551
+#: src/protocols/yahoo/yahoochat.c:1040
 msgid "_Room:"
 msgstr "_Tuba:"
 
-#: src/protocols/jabber/chat.c:47
+#: src/protocols/jabber/chat.c:46
 msgid "_Server:"
 msgstr "_Server:"
 
-#: src/protocols/jabber/chat.c:53
+#: src/protocols/jabber/chat.c:51
 msgid "_Handle:"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:223
+#: src/protocols/jabber/chat.c:212
 #, c-format
 msgid "%s is not a valid room name"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:224
+#: src/protocols/jabber/chat.c:213
 msgid "Invalid Room Name"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:229
+#: src/protocols/jabber/chat.c:218
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s on vigane serverinimi"
 
-#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
+#: src/protocols/jabber/chat.c:219 src/protocols/jabber/chat.c:220
 msgid "Invalid Server Name"
 msgstr "Vigane serverinimi"
 
-#: src/protocols/jabber/chat.c:235
+#: src/protocols/jabber/chat.c:224
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:236 src/protocols/jabber/chat.c:237
+#: src/protocols/jabber/chat.c:225 src/protocols/jabber/chat.c:226
 msgid "Invalid Room Handle"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:395
+#: src/protocols/jabber/chat.c:379
 msgid "Configuration error"
 msgstr "Seadistuste viga"
 
-#: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
+#: src/protocols/jabber/chat.c:388 src/protocols/jabber/chat.c:533
 msgid "Unable to configure"
 msgstr "Pole võimalik seadistada"
 
-#: src/protocols/jabber/chat.c:420
+#: src/protocols/jabber/chat.c:404
 msgid "Room Configuration Error"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:421
+#: src/protocols/jabber/chat.c:405
 msgid "This room is not capable of being configured"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:471 src/protocols/jabber/chat.c:540
+#: src/protocols/jabber/chat.c:455 src/protocols/jabber/chat.c:524
 msgid "Registration error"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:628
+#: src/protocols/jabber/chat.c:607
 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:1235
-#, fuzzy
-msgid "Error retrieving room list"
+#: src/protocols/jabber/chat.c:651 src/protocols/jabber/chat.c:662
+msgid "Roomlist Error"
+msgstr "Tubade nimekirja viga"
+
+#: src/protocols/jabber/chat.c:652 src/protocols/jabber/chat.c:663
+msgid "Error retreiving roomlist"
 msgstr "Viga tubade nimekirja vastuvõtmisel"
 
-#: src/protocols/jabber/chat.c:737
+#: src/protocols/jabber/chat.c:711
 msgid "Invalid Server"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:775
+#: src/protocols/jabber/chat.c:749
 msgid "Enter a Conference Server"
 msgstr "Jututoaserveri sisestamine"
 
-#: src/protocols/jabber/chat.c:776
+#: src/protocols/jabber/chat.c:750
 msgid "Select a conference server to query"
 msgstr "Vali jututoaserver, kuhu päring esitada"
 
-#: src/protocols/jabber/chat.c:779
+#: src/protocols/jabber/chat.c:753
 msgid "Find Rooms"
 msgstr "Otsi jututube"
 
-#: src/protocols/jabber/jabber.c:79
+#: src/protocols/jabber/jabber.c:77
 msgid "Error initializing session"
 msgstr "Viga seansi lähtestamisel"
 
-#: src/protocols/jabber/jabber.c:215
+#: src/protocols/jabber/jabber.c:213 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:699 src/protocols/trepia/trepia.c:988
+#: src/protocols/trepia/trepia.c:1032 src/protocols/trepia/trepia.c:1131
+#: src/protocols/trepia/trepia.c:1177
 msgid "Write error"
 msgstr "Kirjutamise viga"
 
-#: src/protocols/jabber/jabber.c:253 src/protocols/jabber/jabber.c:273
+#: src/protocols/jabber/jabber.c:251 src/protocols/jabber/jabber.c:271
 msgid "Read Error"
 msgstr "Lugemise viga"
 
-#: src/protocols/jabber/jabber.c:359 src/protocols/jabber/jabber.c:780
+#: src/protocols/jabber/jabber.c:331
+msgid "Connection Failed"
+msgstr "Tõrge ühendumisel"
+
+#: src/protocols/jabber/jabber.c:334
+msgid "SSL Handshake Failed"
+msgstr "Tõrge SSL käepigistusel"
+
+#: src/protocols/jabber/jabber.c:378 src/protocols/jabber/jabber.c:711
+msgid "Invalid Jabber ID"
+msgstr "Vigane Jabber'i ID"
+
+#: src/protocols/jabber/jabber.c:409 src/protocols/jabber/jabber.c:741
+msgid "SSL support unavailable"
+msgstr "SSL tugi pole saadaval"
+
+#: src/protocols/jabber/jabber.c:419 src/protocols/jabber/jabber.c:751
+#: src/protocols/trepia/trepia.c:1071
 msgid "Unable to create socket"
 msgstr "Soklit pole võimalik luua"
 
-#: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
-msgstr "Vigane Jabber'i ID"
-
-#: src/protocols/jabber/jabber.c:473
+#: src/protocols/jabber/jabber.c:444
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Kasutaja %s@%s registreerimine õnnestus"
 
-#: src/protocols/jabber/jabber.c:475 src/protocols/jabber/jabber.c:476
+#: src/protocols/jabber/jabber.c:446 src/protocols/jabber/jabber.c:447
 msgid "Registration Successful"
 msgstr "Registreerimine õnnestus"
 
-#: src/protocols/jabber/jabber.c:482 src/protocols/jabber/jabber.c:1299
+#: src/protocols/jabber/jabber.c:453 src/protocols/jabber/jabber.c:1219
 msgid "Unknown Error"
 msgstr "Tundmatu viga"
 
-#: src/protocols/jabber/jabber.c:484 src/protocols/jabber/jabber.c:485
+#: src/protocols/jabber/jabber.c:455 src/protocols/jabber/jabber.c:456
 msgid "Registration Failed"
 msgstr "Tõrge registreerimisel"
 
-#: src/protocols/jabber/jabber.c:596 src/protocols/jabber/jabber.c:597
+#: src/protocols/jabber/jabber.c:567 src/protocols/jabber/jabber.c:568
 msgid "Already Registered"
 msgstr "Juba registreeritud"
 
-#: src/protocols/jabber/jabber.c:643
+#: src/protocols/jabber/jabber.c:603 src/protocols/jabber/jabber.c:1074
+msgid "Password"
+msgstr "Parool"
+
+#: src/protocols/jabber/jabber.c:614
 msgid "E-Mail"
 msgstr "E-post"
 
-#: src/protocols/jabber/jabber.c:673 src/protocols/oscar/oscar.c:5999
-#: src/protocols/oscar/oscar.c:6007
+#. State
+#: src/protocols/jabber/jabber.c:644 src/protocols/oscar/oscar.c:5275
+#: src/protocols/oscar/oscar.c:5283 src/protocols/trepia/trepia.c:336
+#: src/protocols/trepia/trepia.c:414
 msgid "State"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:683 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:663 src/protocols/silc/util.c:513
+#: src/protocols/jabber/jabber.c:654 src/protocols/silc/ops.c:853
+#: src/protocols/silc/silc.c:658 src/protocols/silc/util.c:513
 msgid "Phone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:693
+#: src/protocols/jabber/jabber.c:664
 msgid "Date"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:701
+#: src/protocols/jabber/jabber.c:672
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
+#: src/protocols/jabber/jabber.c:675 src/protocols/jabber/jabber.c:676
 msgid "Register New Jabber Account"
 msgstr "Uue Jabber'i konto registreerimine"
 
-#: src/protocols/jabber/jabber.c:842
+#: src/protocols/jabber/jabber.c:759
+msgid "Logged out"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:802
 msgid "Initializing Stream"
 msgstr "Andmevoo lähtestamine"
 
-#: src/protocols/jabber/jabber.c:848 src/protocols/msn/session.c:368
+#: src/protocols/jabber/jabber.c:808 src/protocols/msn/session.c:370
 msgid "Authenticating"
 msgstr "Autentimine"
 
-#: src/protocols/jabber/jabber.c:857
+#: src/protocols/jabber/jabber.c:817
 msgid "Re-initializing Stream"
 msgstr "Andmevaa taaslähtestamine"
 
-#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jabber.c:1277
-#: src/protocols/jabber/jabber.c:1318 src/protocols/jabber/jabber.c:1351
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:7583
+#: src/protocols/jabber/jabber.c:897 src/protocols/jabber/jabber.c:1197
+#: src/protocols/jabber/jabber.c:1238 src/protocols/jabber/jabber.c:1271
+#: src/protocols/oscar/oscar.c:737 src/protocols/oscar/oscar.c:6835
 msgid "Not Authorized"
 msgstr "Autoriseerimata"
 
-#: src/protocols/jabber/jabber.c:971
+#: src/protocols/jabber/jabber.c:938
 msgid "Both"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:973
+#: src/protocols/jabber/jabber.c:940
 msgid "From (To pending)"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:975
+#: src/protocols/jabber/jabber.c:942
 msgid "From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:978
+#: src/protocols/jabber/jabber.c:945
 msgid "To"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:980
+#: src/protocols/jabber/jabber.c:947
 msgid "None (To pending)"
 msgstr ""
 
+#: src/protocols/jabber/jabber.c:951
+msgid "Subscription"
+msgstr ""
+
 #: src/protocols/jabber/jabber.c:984
-msgid "Subscription"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1047
-#: src/protocols/jabber/jabber.c:1055 src/protocols/jabber/jabber.c:1063
-#: src/protocols/jabber/jabber.c:1071
-#, fuzzy
-msgid "Priority"
-msgstr "Port"
-
-#: src/protocols/jabber/jabber.c:1093
+msgid "Error"
+msgstr "Viga"
+
+#: src/protocols/jabber/jabber.c:997 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/presence.c:72 src/protocols/jabber/presence.c:130
+msgid "Chatty"
+msgstr "Lobisev"
+
+#: src/protocols/jabber/jabber.c:999 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/presence.c:74 src/protocols/jabber/presence.c:135
+msgid "Extended Away"
+msgstr "Kaua eemal"
+
+#: src/protocols/jabber/jabber.c:1000 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/presence.c:76 src/protocols/jabber/presence.c:137
+#: src/protocols/oscar/oscar.c:679 src/protocols/oscar/oscar.c:5833
+#: src/protocols/oscar/oscar.c:7028
+msgid "Do Not Disturb"
+msgstr "Mitte segada"
+
+#: src/protocols/jabber/jabber.c:1017
 msgid "Password Changed"
 msgstr "Parool muudetud"
 
-#: src/protocols/jabber/jabber.c:1094
+#: src/protocols/jabber/jabber.c:1018
 msgid "Your password has been changed."
 msgstr "Sinu parool sai muudetud."
 
-#: src/protocols/jabber/jabber.c:1098 src/protocols/jabber/jabber.c:1099
+#: src/protocols/jabber/jabber.c:1022 src/protocols/jabber/jabber.c:1023
 msgid "Error changing password"
 msgstr "Viga parooli muutmisel"
 
-#: src/protocols/jabber/jabber.c:1155
+#: src/protocols/jabber/jabber.c:1079
 msgid "Password (again)"
 msgstr "Parool (uuesti)"
 
-#: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1084 src/protocols/jabber/jabber.c:1085
 msgid "Change Jabber Password"
 msgstr "Jabber'i parooli muutmine"
 
-#: src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1085
 msgid "Please enter your new password"
 msgstr "Palun sisesta uus parool"
 
-#: src/protocols/jabber/jabber.c:1171 src/protocols/toc/toc.c:1684
+#: src/protocols/jabber/jabber.c:1095 src/protocols/toc/toc.c:1581
 msgid "Set User Info"
 msgstr "Määra kasutajateave"
 
-#. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/jabber/jabber.c:1176 src/protocols/toc/toc.c:1694
-msgid "Change Password"
-msgstr "Muuda parooli"
-
-#. }
+#: src/protocols/jabber/jabber.c:1177
+msgid "Bad Request"
+msgstr "Vigane päring"
+
+#: src/protocols/jabber/jabber.c:1179
+msgid "Conflict"
+msgstr ""
+
 #: src/protocols/jabber/jabber.c:1181
-#, fuzzy
-msgid "Search for users"
-msgstr "O_tsi stringi:"
+msgid "Feature Not Implemented"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1183
+msgid "Forbidden"
+msgstr "Keelatud"
+
+#: src/protocols/jabber/jabber.c:1185
+msgid "Gone"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1187 src/protocols/jabber/jabber.c:1261
+msgid "Internal Server Error"
+msgstr "Serveri sisemine viga"
+
+#: src/protocols/jabber/jabber.c:1189
+msgid "Item Not Found"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1191
+msgid "Malformed Jabber ID"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1193
+msgid "Not Acceptable"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1195
+msgid "Not Allowed"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1199
+msgid "Payment Required"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1201
+msgid "Recipient Unavailable"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1205
+msgid "Registration Required"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1207
+msgid "Remote Server Not Found"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1209
+msgid "Remote Server Timeout"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1211
+msgid "Server Overloaded"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1213
+msgid "Service Unavailable"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1215
+msgid "Subscription Required"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1217
+msgid "Unexpected Request"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1224
+msgid "Authorization Aborted"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1226
+msgid "Incorrect encoding in authorization"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1229
+msgid "Invalid authzid"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1232
+msgid "Invalid Authorization Mechanism"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1235
+msgid "Authorization mechanism too weak"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1240
+msgid "Temporary Authentication Failure"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1242
+msgid "Authentication Failure"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1246
+msgid "Bad Format"
+msgstr "Vigane vorming"
+
+#: src/protocols/jabber/jabber.c:1248
+msgid "Bad Namespace Prefix"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1251
+msgid "Resource Conflict"
+msgstr "Vahendi vastuolu"
+
+#: src/protocols/jabber/jabber.c:1253 src/protocols/silc/ops.c:1519
+msgid "Connection Timeout"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1255
+msgid "Host Gone"
+msgstr ""
 
 #: src/protocols/jabber/jabber.c:1257
-msgid "Bad Request"
-msgstr "Vigane päring"
+msgid "Host Unknown"
+msgstr "Tundmatu host"
 
 #: src/protocols/jabber/jabber.c:1259
-msgid "Conflict"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1261
-msgid "Feature Not Implemented"
+msgid "Improper Addressing"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1263
-msgid "Forbidden"
-msgstr "Keelatud"
+msgid "Invalid ID"
+msgstr "Vigane ID"
 
 #: src/protocols/jabber/jabber.c:1265
-msgid "Gone"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1267 src/protocols/jabber/jabber.c:1341
-msgid "Internal Server Error"
-msgstr "Serveri sisemine viga"
+msgid "Invalid Namespace"
+msgstr "Vigane nimeruum"
+
+#: src/protocols/jabber/jabber.c:1267
+msgid "Invalid XML"
+msgstr "Vigane XML"
 
 #: src/protocols/jabber/jabber.c:1269
-msgid "Item Not Found"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
+msgid "Non-matching Hosts"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1273
-msgid "Not Acceptable"
+msgid "Policy Violation"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1275
-msgid "Not Allowed"
-msgstr ""
+msgid "Remote Connection Failed"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1277
+msgid "Resource Constraint"
+msgstr "Vahendi piirang"
 
 #: src/protocols/jabber/jabber.c:1279
-msgid "Payment Required"
+msgid "Restricted XML"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1281
-msgid "Recipient Unavailable"
+msgid "See Other Host"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1283
+msgid "System Shutdown"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1285
-msgid "Registration Required"
+msgid "Undefined Condition"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1287
-msgid "Remote Server Not Found"
-msgstr ""
+msgid "Unsupported Encoding"
+msgstr "Toetamata kooditabel"
 
 #: src/protocols/jabber/jabber.c:1289
-msgid "Remote Server Timeout"
+msgid "Unsupported Stanza Type"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1291
-msgid "Server Overloaded"
-msgstr ""
+msgid "Unsupported Version"
+msgstr "Toetamata versioon"
 
 #: src/protocols/jabber/jabber.c:1293
-msgid "Service Unavailable"
-msgstr ""
+msgid "XML Not Well Formed"
+msgstr "XML pole korralikult vormindatud"
 
 #: src/protocols/jabber/jabber.c:1295
-msgid "Subscription Required"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1297
-msgid "Unexpected Request"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1304
-msgid "Authorization Aborted"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1306
-msgid "Incorrect encoding in authorization"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1309
-msgid "Invalid authzid"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1312
-msgid "Invalid Authorization Mechanism"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1315
-msgid "Authorization mechanism too weak"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1320
-msgid "Temporary Authentication Failure"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1322
-msgid "Authentication Failure"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1326
-msgid "Bad Format"
-msgstr "Vigane vorming"
-
-#: src/protocols/jabber/jabber.c:1328
-msgid "Bad Namespace Prefix"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1331
-msgid "Resource Conflict"
-msgstr "Vahendi vastuolu"
-
-#: src/protocols/jabber/jabber.c:1333 src/protocols/silc/ops.c:1514
-msgid "Connection Timeout"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1335
-msgid "Host Gone"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1337
-msgid "Host Unknown"
-msgstr "Tundmatu host"
-
-#: src/protocols/jabber/jabber.c:1339
-msgid "Improper Addressing"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1343
-msgid "Invalid ID"
-msgstr "Vigane ID"
-
-#: src/protocols/jabber/jabber.c:1345
-msgid "Invalid Namespace"
-msgstr "Vigane nimeruum"
-
-#: src/protocols/jabber/jabber.c:1347
-msgid "Invalid XML"
-msgstr "Vigane XML"
-
-#: src/protocols/jabber/jabber.c:1349
-msgid "Non-matching Hosts"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1353
-msgid "Policy Violation"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1355
-msgid "Remote Connection Failed"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1357
-msgid "Resource Constraint"
-msgstr "Vahendi piirang"
-
-#: src/protocols/jabber/jabber.c:1359
-msgid "Restricted XML"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1361
-msgid "See Other Host"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1363
-msgid "System Shutdown"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1365
-msgid "Undefined Condition"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1367
-msgid "Unsupported Encoding"
-msgstr "Toetamata kooditabel"
-
-#: src/protocols/jabber/jabber.c:1369
-msgid "Unsupported Stanza Type"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1371
-msgid "Unsupported Version"
-msgstr "Toetamata versioon"
-
-#: src/protocols/jabber/jabber.c:1373
-msgid "XML Not Well Formed"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1375
 msgid "Stream Error"
 msgstr "Voo viga"
 
-#: src/protocols/jabber/jabber.c:1442
+#: src/protocols/jabber/jabber.c:1362
 #, c-format
 msgid "Unable to ban user %s"
 msgstr ""
 
+#: src/protocols/jabber/jabber.c:1414
+#, c-format
+msgid "Unable to kick user %s"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1440
+msgid "config:  Configure a chat room."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1444
+msgid "configure:  Configure a chat room."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1453
+msgid "part [room]:  Leave the room."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1458
+msgid "register:  Register with a chat room."
+msgstr ""
+
 #: src/protocols/jabber/jabber.c:1464
-#, fuzzy, c-format
-msgid "Unknown affiliation: \"%s\""
-msgstr "Tundmatu käsk: %s"
-
-#: src/protocols/jabber/jabber.c:1469
-#, fuzzy, c-format
-msgid "Unable to affiliate user %s as \"%s\""
-msgstr "Kasutajat pole võimalik kutsuda (%s)."
-
-#: src/protocols/jabber/jabber.c:1521
-#, c-format
-msgid "Unable to kick user %s"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1547
-msgid "config:  Configure a chat room."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1551
-msgid "configure:  Configure a chat room."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1560
-msgid "part [room]:  Leave the room."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1565
-msgid "register:  Register with a chat room."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1571
 msgid "topic [new topic]:  View or change the topic."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1577
+#: src/protocols/jabber/jabber.c:1470
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1583
-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:1589
-#, fuzzy
+#: src/protocols/jabber/jabber.c:1476
 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:1595
+msgstr "invite &lt;kasutaja&gt; [sõnum]:  Kasutaja kutsumine tuppa."
+
+#: src/protocols/jabber/jabber.c:1482
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1601
+#: src/protocols/jabber/jabber.c:1488
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1606
+#: src/protocols/jabber/jabber.c:1493
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;kasutaja&gt; &lt;sõnum&gt;:  Erasõnumi saatmine teisele kasutajale."
 
+#: src/protocols/jabber/jabber.c:1508
+msgid "Hide Operating System"
+msgstr "Operatsioonisüsteemi peitmine"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6161,48 +6340,42 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
+#: src/protocols/jabber/jabber.c:1595 src/protocols/jabber/jabber.c:1597
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber protokolli plugin"
 
-#: src/protocols/jabber/jabber.c:1714
+#: src/protocols/jabber/jabber.c:1620
+msgid "Resource"
+msgstr "Vahend"
+
+#: src/protocols/jabber/jabber.c:1623
 msgid "Use TLS if available"
 msgstr "TLS'i kasutamine võimaluse korral"
 
-#: src/protocols/jabber/jabber.c:1719
-msgid "Require TLS"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1722
-#, fuzzy
-msgid "Force old (port 5223) SSL"
+#: src/protocols/jabber/jabber.c:1628
+msgid "Force old SSL"
 msgstr "Vana SSL'i pealesurumine"
 
-#: src/protocols/jabber/jabber.c:1727
+#: src/protocols/jabber/jabber.c:1633
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Avatekstiautentimise lubamine üle krüptimata andmevoo"
 
-#: src/protocols/jabber/jabber.c:1732
-#, fuzzy
-msgid "Connect port"
-msgstr "Ühendumisserver"
-
 #. Account options
-#: src/protocols/jabber/jabber.c:1736 src/protocols/silc/silc.c:1593
+#: src/protocols/jabber/jabber.c:1642 src/protocols/silc/silc.c:1592
 msgid "Connect server"
 msgstr "Ühendumisserver"
 
-#: src/protocols/jabber/message.c:114
+#: src/protocols/jabber/message.c:111
 #, c-format
 msgid "Message from %s"
 msgstr ""
 
-#: src/protocols/jabber/message.c:178
+#: src/protocols/jabber/message.c:175
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s määras teemaks: %s"
 
-#: src/protocols/jabber/message.c:180
+#: src/protocols/jabber/message.c:177
 #, c-format
 msgid "The topic is: %s"
 msgstr "Teema on: %s"
@@ -6225,61 +6398,49 @@
 msgid "XML Parse error"
 msgstr "XML'i parsimise viga"
 
-#: src/protocols/jabber/presence.c:284
+#: src/protocols/jabber/presence.c:290
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
-#, c-format
-msgid "The user %s wants to add %s to his or her buddy list."
-msgstr ""
-
-#: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:4608 src/protocols/oscar/oscar.c:7242
-#: src/protocols/yahoo/yahoo.c:893
-msgid "Authorize"
-msgstr "Autoriseeri"
-
-#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:4610 src/protocols/oscar/oscar.c:7243
-#: src/protocols/yahoo/yahoo.c:895
-msgid "Deny"
-msgstr "Keela"
-
-#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
+#: src/protocols/jabber/presence.c:293
+#, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr "Kasutaja %s soovib lisada sind oma sõbranimekirja."
+
+#: src/protocols/jabber/presence.c:348 src/protocols/jabber/presence.c:349
 msgid "Create New Room"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:347
+#: src/protocols/jabber/presence.c:350
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:349
+#: src/protocols/jabber/presence.c:352
 msgid "Configure Room"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:351
+#: src/protocols/jabber/presence.c:354
 msgid "Accept Defaults"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:388
+#: src/protocols/jabber/presence.c:384
 #, c-format
 msgid "Error in chat %s"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:391
+#: src/protocols/jabber/presence.c:387
 #, c-format
 msgid "Error joining chat %s"
 msgstr ""
 
-#: src/protocols/jabber/si.c:591
+#: src/protocols/jabber/si.c:594
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 
-#: src/protocols/jabber/si.c:592 src/protocols/jabber/si.c:593
+#: src/protocols/jabber/si.c:595 src/protocols/jabber/si.c:596
 msgid "File Send Failed"
 msgstr ""
 
@@ -6348,7 +6509,7 @@
 msgid "Not on list"
 msgstr "Pole nimekirjas"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:690
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:686
 msgid "User is offline"
 msgstr "Kasutaja pole ühendatud"
 
@@ -6400,7 +6561,7 @@
 msgid "Too many hits to a FND"
 msgstr ""
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:206
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:193
 msgid "Not logged in"
 msgstr "Pole sisse logitud"
 
@@ -6493,8 +6654,8 @@
 msgid "Server too busy"
 msgstr "Server on liiga hõivatud"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2764
-#: src/protocols/silc/ops.c:1503 src/protocols/toc/toc.c:722
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2277
+#: src/protocols/silc/ops.c:1508 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "Tõrge autentimisel"
 
@@ -6528,67 +6689,58 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN'i viga: %s\n"
 
-#: src/protocols/msn/msn.c:113
-msgid "You have just sent a Nudge!"
-msgstr ""
-
-#: src/protocols/msn/msn.c:138
+#: src/protocols/msn/msn.c:114
 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
+#: src/protocols/msn/msn.c:222
 msgid "Set your friendly name."
 msgstr "Sõbraliku nime määramine."
 
-#: src/protocols/msn/msn.c:247
+#: src/protocols/msn/msn.c:223
 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
+#: src/protocols/msn/msn.c:239
 msgid "Set your home phone number."
 msgstr "Määra oma kodutelefoni number."
 
-#: src/protocols/msn/msn.c:278
+#: src/protocols/msn/msn.c:254
 msgid "Set your work phone number."
 msgstr "Määra oma töötelefoni number."
 
-#: src/protocols/msn/msn.c:293
+#: src/protocols/msn/msn.c:269
 msgid "Set your mobile phone number."
 msgstr "Määra oma mobiiltelefoni number."
 
-#: src/protocols/msn/msn.c:306
+#: src/protocols/msn/msn.c:282
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: src/protocols/msn/msn.c:307
+#: src/protocols/msn/msn.c:283
 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
+#: src/protocols/msn/msn.c:287
 msgid "Allow"
 msgstr "Luba"
 
-#: src/protocols/msn/msn.c:312
+#: src/protocols/msn/msn.c:288
 msgid "Disallow"
 msgstr "Ära luba"
 
-#: src/protocols/msn/msn.c:328
-msgid "This Hotmail account may not be active."
-msgstr ""
-
-#: src/protocols/msn/msn.c:354
+#: src/protocols/msn/msn.c:311
 msgid "Send a mobile message."
 msgstr ""
 
-#: src/protocols/msn/msn.c:356
+#: src/protocols/msn/msn.c:313
 msgid "Page"
 msgstr ""
 
-#: src/protocols/msn/msn.c:544 src/protocols/msn/msn.c:551
-#: src/protocols/msn/msn.c:554 src/protocols/yahoo/yahoo.c:2783
-#: src/protocols/yahoo/yahoo.c:2789
+#: src/protocols/msn/msn.c:489 src/protocols/msn/msn.c:497
+#: src/protocols/msn/msn.c:500 src/protocols/yahoo/yahoo.c:2903
 #, c-format
 msgid ""
 "\n"
@@ -6597,177 +6749,202 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:546 src/protocols/msn/state.c:32
-#: src/protocols/novell/novell.c:2831 src/protocols/oscar/oscar.c:5070
-#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo_profile.c:660
-msgid "Idle"
-msgstr "Tegevusetus"
-
-#: src/protocols/msn/msn.c:551
+#: src/protocols/msn/msn.c:497
 msgid "Has you"
 msgstr "Sina tema nimekirjas"
 
-#: src/protocols/msn/msn.c:581 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:3206
+#: src/protocols/msn/msn.c:500
+msgid "Blocked"
+msgstr "Blokitud"
+
+#: src/protocols/msn/msn.c:514 src/protocols/msn/msn.c:801
+#: src/protocols/msn/state.c:34
+msgid "Away From Computer"
+msgstr "Arvutist eemal"
+
+#: src/protocols/msn/msn.c:515 src/protocols/msn/msn.c:803
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2760
+#: src/protocols/yahoo/yahoo.c:3127 src/protocols/yahoo/yahoo.c:3243
 msgid "Be Right Back"
 msgstr "Tulen kohe tagasi"
 
-#: src/protocols/msn/msn.c:589 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2621 src/protocols/yahoo/yahoo.c:3221
+#: src/protocols/msn/msn.c:516 src/protocols/msn/msn.c:805
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2803
+#: src/protocols/novell/novell.c:2918 src/protocols/novell/novell.c:2972
+#: src/protocols/silc/buddy.c:1392 src/protocols/silc/silc.c:48
+#: src/protocols/silc/silc.c:83 src/protocols/yahoo/yahoo.c:2762
+#: src/protocols/yahoo/yahoo.c:3129 src/protocols/yahoo/yahoo.c:3244
+msgid "Busy"
+msgstr "Hõivatud"
+
+#: src/protocols/msn/msn.c:517 src/protocols/msn/msn.c:807
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2770
+#: src/protocols/yahoo/yahoo.c:3137 src/protocols/yahoo/yahoo.c:3248
 msgid "On The Phone"
 msgstr "Räägin telefoniga"
 
-#: src/protocols/msn/msn.c:593 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2625 src/protocols/yahoo/yahoo.c:3227
+#: src/protocols/msn/msn.c:518 src/protocols/msn/msn.c:809
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2774
+#: src/protocols/yahoo/yahoo.c:3141 src/protocols/yahoo/yahoo.c:3250
 msgid "Out To Lunch"
 msgstr "Lõunal"
 
-#: src/protocols/msn/msn.c:597 src/protocols/zephyr/zephyr.c:2255
-#: src/status.c:157
+#: src/protocols/msn/msn.c:519 src/protocols/msn/msn.c:811
+#: src/protocols/zephyr/zephyr.c:2099 src/protocols/zephyr/zephyr.c:2131
 msgid "Hidden"
 msgstr "Peidetud"
 
-#: src/protocols/msn/msn.c:613
+#: src/protocols/msn/msn.c:530
 msgid "Set Friendly Name"
 msgstr "Määra sõbralik nimi"
 
-#: src/protocols/msn/msn.c:618
+#: src/protocols/msn/msn.c:535
 msgid "Set Home Phone Number"
 msgstr "Määra kodutelefoni number"
 
-#: src/protocols/msn/msn.c:622
+#: src/protocols/msn/msn.c:539
 msgid "Set Work Phone Number"
 msgstr "Määra töötelefoni number"
 
-#: src/protocols/msn/msn.c:626
+#: src/protocols/msn/msn.c:543
 msgid "Set Mobile Phone Number"
 msgstr "Määra mobiiltelefoni number"
 
-#: src/protocols/msn/msn.c:632
+#: src/protocols/msn/msn.c:549
 msgid "Enable/Disable Mobile Devices"
 msgstr ""
 
-#: src/protocols/msn/msn.c:637
+#: src/protocols/msn/msn.c:554
 msgid "Allow/Disallow Mobile Pages"
 msgstr ""
 
-#: src/protocols/msn/msn.c:647
-msgid "Open Hotmail Inbox"
-msgstr ""
-
-#: src/protocols/msn/msn.c:671
+#: src/protocols/msn/msn.c:577
 msgid "Send to Mobile"
 msgstr ""
 
-#: src/protocols/msn/msn.c:680 src/protocols/novell/novell.c:3442
+#: src/protocols/msn/msn.c:586 src/protocols/novell/novell.c:3369
 msgid "Initiate _Chat"
 msgstr "Algata _jututuba"
 
-#: src/protocols/msn/msn.c:717
+#: src/protocols/msn/msn.c:623
 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:745
+#: src/protocols/msn/msn.c:651
 msgid "Failed to connect to server."
 msgstr "Tõrge serveriga ühendumisel."
 
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo_profile.c:654
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
+#: src/protocols/msn/msn.c:1309 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:717 src/protocols/zephyr/zephyr.c:1126
 #, 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:1394 src/protocols/msn/msn.c:1740
-#: src/protocols/yahoo/yahoo_profile.c:1167 src/util.c:801
+#: src/protocols/msn/msn.c:1317 src/protocols/msn/msn.c:1675
+#: src/protocols/yahoo/yahoo_profile.c:1174 src/util.c:796
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: src/protocols/msn/msn.c:1471
+#: src/protocols/msn/msn.c:1405
 msgid "MSN Profile"
 msgstr "MSN'i profiil"
 
-#: src/protocols/msn/msn.c:1476 src/protocols/msn/msn.c:1727
-#: src/protocols/yahoo/yahoo_profile.c:760
+#: src/protocols/msn/msn.c:1410 src/protocols/msn/msn.c:1662
+#: src/protocols/yahoo/yahoo_profile.c:763
 msgid "Error retrieving profile"
 msgstr "Viga profiili vastuvõtmisel"
 
-#: src/protocols/msn/msn.c:1546 src/protocols/oscar/oscar.c:5984
-#: src/protocols/yahoo/yahoo_profile.c:1015
+#. Age
+#: src/protocols/msn/msn.c:1481 src/protocols/oscar/oscar.c:5260
+#: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
+#: src/protocols/yahoo/yahoo_profile.c:1022
 msgid "Age"
 msgstr "Vanus"
 
-#: src/protocols/msn/msn.c:1553 src/protocols/oscar/oscar.c:5971
-#: src/protocols/yahoo/yahoo_profile.c:1025
+#. Gender
+#: src/protocols/msn/msn.c:1488 src/protocols/oscar/oscar.c:5246
+#: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
+#: src/protocols/yahoo/yahoo_profile.c:1032
 msgid "Gender"
 msgstr "Sugu"
 
-#: src/protocols/msn/msn.c:1562 src/protocols/yahoo/yahoo_profile.c:1020
+#: src/protocols/msn/msn.c:1497 src/protocols/yahoo/yahoo_profile.c:1027
 msgid "Marital Status"
 msgstr "Perekonnaseis"
 
-#: src/protocols/msn/msn.c:1569 src/protocols/novell/novell.c:1454
-#: src/protocols/yahoo/yahoo_profile.c:1010
+#: src/protocols/msn/msn.c:1504 src/protocols/novell/novell.c:1445
+#: src/protocols/yahoo/yahoo_profile.c:1017
 msgid "Location"
 msgstr "Asukoht"
 
-#: src/protocols/msn/msn.c:1577 src/protocols/yahoo/yahoo_profile.c:1030
+#: src/protocols/msn/msn.c:1512 src/protocols/yahoo/yahoo_profile.c:1037
 msgid "Occupation"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1594 src/protocols/msn/msn.c:1600
-#: src/protocols/msn/msn.c:1607 src/protocols/msn/msn.c:1615
-#: src/protocols/msn/msn.c:1622
+#: src/protocols/msn/msn.c:1529 src/protocols/msn/msn.c:1535
+#: src/protocols/msn/msn.c:1542 src/protocols/msn/msn.c:1550
+#: src/protocols/msn/msn.c:1557
 msgid "A Little About Me"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1631 src/protocols/msn/msn.c:1637
-#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1651
+#: src/protocols/msn/msn.c:1566 src/protocols/msn/msn.c:1572
+#: src/protocols/msn/msn.c:1579 src/protocols/msn/msn.c:1586
 msgid "Favorite Things"
 msgstr "Lemmikasjad"
 
-#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1666
-#: src/protocols/msn/msn.c:1673
+#: src/protocols/msn/msn.c:1595 src/protocols/msn/msn.c:1601
+#: src/protocols/msn/msn.c:1608
 msgid "Hobbies and Interests"
 msgstr "Hobid ja huvid"
 
-#: src/protocols/msn/msn.c:1682 src/protocols/msn/msn.c:1688
-#: src/protocols/yahoo/yahoo_profile.c:1072
+#: src/protocols/msn/msn.c:1617 src/protocols/msn/msn.c:1623
+#: src/protocols/yahoo/yahoo_profile.c:1079
 msgid "Favorite Quote"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1696
+#: src/protocols/msn/msn.c:1631
 msgid "Last Updated"
 msgstr "Viimati uuendatud"
 
-#: src/protocols/msn/msn.c:1707 src/protocols/silc/ops.c:846
+#. Homepage
+#: src/protocols/msn/msn.c:1642 src/protocols/silc/ops.c:844
+#: src/protocols/trepia/trepia.c:290 src/protocols/trepia/trepia.c:420
 msgid "Homepage"
 msgstr "Koduleht"
 
-#: src/protocols/msn/msn.c:1729
+#: src/protocols/msn/msn.c:1664
 msgid "The user has not created a public profile."
 msgstr "Kasutaja pole loonud avalikku profiili."
 
-#: src/protocols/msn/msn.c:1730
+#: src/protocols/msn/msn.c:1665
 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:1734
+#: src/protocols/msn/msn.c:1669
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1740 src/protocols/yahoo/yahoo_profile.c:1167
+#: src/protocols/msn/msn.c:1675 src/protocols/yahoo/yahoo_profile.c:1174
 msgid "Profile URL"
 msgstr "Profiili URL"
 
+#: src/protocols/msn/msn.c:1816
+msgid "Display conversation closed notices"
+msgstr "Vestluse sulgemise märkuste kuvamine"
+
+#: src/protocols/msn/msn.c:1821
+msgid "Display timeout notices"
+msgstr "Ajapiirangu ületamise märkuste kuvamine"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6778,24 +6955,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1942 src/protocols/msn/msn.c:1944
+#: src/protocols/msn/msn.c:1908 src/protocols/msn/msn.c:1910
 msgid "MSN Protocol Plugin"
 msgstr "MSN protokolli plugin"
 
-#: src/protocols/msn/msn.c:1963
+#: src/protocols/msn/msn.c:1929 src/protocols/trepia/trepia.c:1296
 msgid "Login server"
 msgstr "Sisselogimise server"
 
-#: src/protocols/msn/msn.c:1972
+#: src/protocols/msn/msn.c:1938
 msgid "Use HTTP Method"
 msgstr "HTTP meetodi kasutamine"
 
-#: src/protocols/msn/msn.c:1980
-msgid "nudge: nudge a contact to get their attention"
-msgstr ""
-
 #: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
-#: src/protocols/yahoo/yahoochat.c:1326
+#: src/protocols/yahoo/yahoochat.c:1394
 msgid "Unable to connect"
 msgstr "Pole võimalik ühenduda"
 
@@ -6804,8 +6977,8 @@
 msgid "%s is not a valid group."
 msgstr ""
 
-#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:528
-#: src/protocols/msn/session.c:347
+#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:523
+#: src/protocols/msn/session.c:349
 msgid "Unknown error."
 msgstr "Tundmatu viga."
 
@@ -6814,40 +6987,40 @@
 msgid "%s on %s (%s)"
 msgstr ""
 
-#: src/protocols/msn/notification.c:498
+#: src/protocols/msn/notification.c:493
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr ""
 
-#: src/protocols/msn/notification.c:502
+#: src/protocols/msn/notification.c:497
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr ""
 
-#: src/protocols/msn/notification.c:506
+#: src/protocols/msn/notification.c:501
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr ""
 
-#: src/protocols/msn/notification.c:514
+#: src/protocols/msn/notification.c:509
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr ""
 
-#: src/protocols/msn/notification.c:523
+#: src/protocols/msn/notification.c:518
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr ""
 
-#: src/protocols/msn/notification.c:811
+#: src/protocols/msn/notification.c:805
 msgid "Unable to rename group"
 msgstr "Gruppi pole võimalik ümber nimetada"
 
-#: src/protocols/msn/notification.c:866
+#: src/protocols/msn/notification.c:860
 msgid "Unable to delete group"
 msgstr "Gruppi pole võimalik ümber kustutada"
 
-#: src/protocols/msn/notification.c:1299
+#: src/protocols/msn/notification.c:1287
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6874,8 +7047,8 @@
 msgid "Reading error"
 msgstr "Lugemise viga"
 
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
-#: src/protocols/oscar/oscar.c:4931
+#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:341
+#: src/protocols/oscar/oscar.c:4238
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
@@ -6888,178 +7061,160 @@
 "Ühenduse viga %s serverist (%s):\n"
 "%s"
 
-#: src/protocols/msn/session.c:317
+#: src/protocols/msn/session.c:319
 msgid "Our protocol is not supported by the server."
 msgstr "Meie protokoll pole serveri poolt toetatud."
 
-#: src/protocols/msn/session.c:321
+#: src/protocols/msn/session.c:323
 msgid "Error parsing HTTP."
 msgstr "Viga HTTP parsimisel."
 
-#. MSG_SERVER_GHOST
-#. Looks like someone logged in as us! =-O
-#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:450
-#: src/protocols/oscar/oscar.c:5635 src/protocols/yahoo/yahoo.c:194
+#: src/protocols/msn/session.c:327
 msgid "You have signed on from another location."
 msgstr "Sa oled teisest kohast sisse loginud."
 
-#: src/protocols/msn/session.c:328
+#: src/protocols/msn/session.c:330
 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:333
+#: src/protocols/msn/session.c:335
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN serverid jäetakse ajutiselt seisma"
 
-#: src/protocols/msn/session.c:337
+#: src/protocols/msn/session.c:339
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Pole võimalik autentida: %s"
 
-#: src/protocols/msn/session.c:342
+#: src/protocols/msn/session.c:344
 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:363 src/protocols/msn/session.c:365
+#: src/protocols/msn/session.c:365 src/protocols/msn/session.c:367
 msgid "Handshaking"
 msgstr "Käepigistus"
 
-#: src/protocols/msn/session.c:364
+#: src/protocols/msn/session.c:366
 msgid "Transferring"
 msgstr "Ülekandmine"
 
-#: src/protocols/msn/session.c:366
+#: src/protocols/msn/session.c:368
 msgid "Starting authentication"
 msgstr "Autentimise alustamine"
 
-#: src/protocols/msn/session.c:367
+#: src/protocols/msn/session.c:369
 msgid "Getting cookie"
 msgstr "Küpsise võtmine"
 
-#: src/protocols/msn/session.c:369
+#: src/protocols/msn/session.c:371
 msgid "Sending cookie"
 msgstr "Küpsise saatmine"
 
-#: src/protocols/msn/session.c:370
+#: src/protocols/msn/session.c:372 src/protocols/trepia/trepia.c:636
 msgid "Retrieving buddy list"
 msgstr "Sõbranimekirja vastuvõtmine"
 
-#: src/protocols/msn/state.c:34
-msgid "Away From Computer"
-msgstr "Arvutist eemal"
-
-#: src/protocols/msn/switchboard.c:403
+#: src/protocols/msn/switchboard.c:401
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr ""
 
-#: src/protocols/msn/switchboard.c:411
+#: src/protocols/msn/switchboard.c:409
 msgid "Message could not be sent, not allowed while invisible:"
-msgstr "Nähtamatu olles ei saa sõnumit saata:"
-
-#: src/protocols/msn/switchboard.c:415
+msgstr "Nähtamatu olles pole võimalik sõnumit saata:"
+
+#: src/protocols/msn/switchboard.c:413
 msgid "Message could not be sent because the user is offline:"
-msgstr "Võrku ühendumata kasutajale ei saa sõnumit saata:"
-
-#: src/protocols/msn/switchboard.c:419
+msgstr "Võrku ühendumata kasutajale pole võimalik sõnumit saata:"
+
+#: src/protocols/msn/switchboard.c:417
 msgid "Message could not be sent because a connection error occurred:"
-msgstr "Ühenduse vea tõttu ei saa sõnumit saata:"
-
-#: src/protocols/msn/switchboard.c:423
+msgstr "Ühenduse vea tõttu pole võimalik sõnumit saata:"
+
+#: src/protocols/msn/switchboard.c:421
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 
-#: src/protocols/msn/switchboard.c:431
+#: src/protocols/msn/switchboard.c:429
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#: src/protocols/msn/switchboard.c:952
-#, fuzzy, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s soovib saata sulle faili"
-
-#: src/protocols/msn/userlist.c:85
+#: src/protocols/msn/switchboard.c:678
+msgid "The conversation has become inactive and timed out."
+msgstr "Vestlus ületas ajapiirangu ja pole enam aktiivne."
+
+#: src/protocols/msn/switchboard.c:697
+#, c-format
+msgid "%s has closed the conversation window."
+msgstr "%s sulges vestlusakna."
+
+#: src/protocols/msn/userlist.c:87
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/userlist.c:275
-#, c-format
-msgid "%s has added you to his or her contact list."
-msgstr ""
-
-#: src/protocols/msn/userlist.c:339
-#, c-format
-msgid "%s has removed you from his or her contact list."
-msgstr ""
-
-#: src/protocols/msn/userlist.c:659
-#, fuzzy, c-format
+#: src/protocols/msn/userlist.c:96
+#, c-format
+msgid "The user %s wants to add %s to his or her buddy list."
+msgstr ""
+
+#: src/protocols/msn/userlist.c:627
+#, c-format
 msgid "Unable to add \"%s\"."
-msgstr "Ei suuda lugeda faili %s."
-
-#: src/protocols/msn/userlist.c:661
+msgstr "\"%s\" pole võimalik lisada."
+
+#: src/protocols/msn/userlist.c:629
 msgid "The screen name specified is invalid."
 msgstr ""
 
-#: src/protocols/napster/napster.c:260
+#: src/protocols/napster/napster.c:241
 msgid "Unable to read header from server"
-msgstr "Ei suuda lugeda serverist päist"
-
-#: src/protocols/napster/napster.c:274
+msgstr "Serverist pole võimalik päist lugeda"
+
+#: src/protocols/napster/napster.c:255
 #, 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:290
-#, fuzzy
-msgid "Unknown server error."
-msgstr "Tundmatu viga."
-
-#: src/protocols/napster/napster.c:339
+"Serverist pole võimalik sõnumit lugeda: %s.  Käsk on %hd, pikkus on %hd."
+
+#: src/protocols/napster/napster.c:318
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
-msgstr ""
+msgstr "kasutajaid: %s, faile: %s, suurus: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:350
+#: src/protocols/napster/napster.c:329
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr ""
 
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: src/protocols/napster/napster.c:357
+#: src/protocols/napster/napster.c:337
 msgid "You were disconnected from the server."
 msgstr "Sa oled serverist lahti ühendatud."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:414
+#: src/protocols/napster/napster.c:395
 #, c-format
 msgid "%s requested your information"
-msgstr ""
+msgstr "%s küsis sinu andmeid"
+
+#: src/protocols/napster/napster.c:433
+msgid ""
+"You were disconnected from the server, because you logged on from a "
+"different location"
+msgstr "Sind ühendati serverist lahti kuna sa logisid sisse teisest kohast"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:454
+#: src/protocols/napster/napster.c:439
 #, c-format
 msgid "%s requested a PING"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/napster/napster.c:501 src/protocols/napster/napster.c:532
-#: src/protocols/toc/toc.c:172 src/protocols/yahoo/yahoo.c:2209
-#: src/protocols/yahoo/yahoo.c:2236 src/protocols/yahoo/yahoo.c:2299
-#: src/protocols/yahoo/yahoo_filexfer.c:69
-#: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:481
-msgid "Unable to connect."
-msgstr ""
-
-#: src/protocols/napster/napster.c:590 src/protocols/toc/toc.c:1367
+#: src/protocols/napster/napster.c:554 src/protocols/toc/toc.c:1268
 msgid "_Group:"
 msgstr "_Grupp:"
 
@@ -7073,7 +7228,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:687 src/protocols/napster/napster.c:689
+#: src/protocols/napster/napster.c:652 src/protocols/napster/napster.c:654
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER protokolli plugin"
 
@@ -7083,11 +7238,11 @@
 
 #: src/protocols/novell/nmuser.c:1871
 msgid "Unable to write to network"
-msgstr ""
+msgstr "Võrku pole võimalik kirjutada"
 
 #: src/protocols/novell/nmuser.c:1874
 msgid "Unable to read from network"
-msgstr "Ei suuda võrgust lugeda"
+msgstr "Võrgust pole võimalik lugeda"
 
 #: src/protocols/novell/nmuser.c:1877
 msgid "Error communicating with server"
@@ -7103,7 +7258,7 @@
 
 #: src/protocols/novell/nmuser.c:1888
 msgid "A folder with that name already exists"
-msgstr ""
+msgstr "Selle nimega kataloog on juba olemas"
 
 #: src/protocols/novell/nmuser.c:1891
 msgid "Not supported"
@@ -7207,112 +7362,112 @@
 msgid "Login failed (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:232
+#: src/protocols/novell/novell.c:230
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:381
+#: src/protocols/novell/novell.c:379
 #, 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:407
+#: src/protocols/novell/novell.c:405
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Sõnumit pole võimalik saata (%s)."
 
-#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
+#: src/protocols/novell/novell.c:476 src/protocols/novell/novell.c:970
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Kasutajat pole võimalik kutsuda (%s)."
 
-#: src/protocols/novell/novell.c:517
+#: src/protocols/novell/novell.c:515
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:522
+#: src/protocols/novell/novell.c:520
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:569
+#: src/protocols/novell/novell.c:567
 #, 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:617
+#: src/protocols/novell/novell.c:615
 #, 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:690
+#: src/protocols/novell/novell.c:688
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
+#: src/protocols/novell/novell.c:734 src/protocols/novell/novell.c:880
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:783
+#: src/protocols/novell/novell.c:781
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:836
+#: src/protocols/novell/novell.c:834
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:904
+#: src/protocols/novell/novell.c:902
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1628
+#: src/protocols/novell/novell.c:925 src/protocols/novell/novell.c:1620
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:999
+#: src/protocols/novell/novell.c:997
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1667
+#: src/protocols/novell/novell.c:1108 src/protocols/novell/novell.c:1659
 msgid "Error communicating with server. Closing connection."
 msgstr ""
 
-#: src/protocols/novell/novell.c:1452
+#: src/protocols/novell/novell.c:1443
 msgid "Telephone Number"
 msgstr "Telefoninumber"
 
-#: src/protocols/novell/novell.c:1456
+#: src/protocols/novell/novell.c:1447
 msgid "Department"
 msgstr ""
 
-#: src/protocols/novell/novell.c:1458
+#: src/protocols/novell/novell.c:1449
 msgid "Personal Title"
 msgstr ""
 
-#: src/protocols/novell/novell.c:1462
+#: src/protocols/novell/novell.c:1453
 msgid "Mailstop"
 msgstr ""
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5957
-#: src/protocols/oscar/oscar.c:5964
+#: src/protocols/novell/novell.c:1455 src/protocols/oscar/oscar.c:5233
+#: src/protocols/oscar/oscar.c:5240
 msgid "Email Address"
 msgstr "E-posti aadress"
 
-#: src/protocols/novell/novell.c:1480
+#: src/protocols/novell/novell.c:1471
 msgid "User ID"
 msgstr "Kasutaja ID"
 
@@ -7323,46 +7478,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1494
+#: src/protocols/novell/novell.c:1485
 msgid "Full name"
 msgstr "Täisnimi"
 
-#: src/protocols/novell/novell.c:1618
+#: src/protocols/novell/novell.c:1506
+msgid "User Properties"
+msgstr "Kasutaja omadused"
+
+#: src/protocols/novell/novell.c:1610
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr ""
 
-#: src/protocols/novell/novell.c:1643
+#: src/protocols/novell/novell.c:1635
 msgid "Unable to make SSL connection to server."
 msgstr "Serverisse pole võimalik luua SSL ühendust."
 
-#: src/protocols/novell/novell.c:1673
+#: src/protocols/novell/novell.c:1665
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:1707
+#: src/protocols/novell/novell.c:1699
 msgid "Authenticating..."
 msgstr ""
 
-#: src/protocols/novell/novell.c:1719
-msgid "Unable to connect to server."
-msgstr "Serveriga pole võimalik ühendust võtta."
-
-#: src/protocols/novell/novell.c:1722
+#: src/protocols/novell/novell.c:1714
 msgid "Waiting for response..."
 msgstr "Vastuse ootamine..."
 
-#: src/protocols/novell/novell.c:1857
+#: src/protocols/novell/novell.c:1849
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr ""
 
-#: src/protocols/novell/novell.c:1885
+#: src/protocols/novell/novell.c:1876
 msgid "Invitation to Conversation"
 msgstr ""
 
-#: src/protocols/novell/novell.c:1886
+#: src/protocols/novell/novell.c:1877
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7370,15 +7525,15 @@
 "Sent: %s"
 msgstr ""
 
-#: src/protocols/novell/novell.c:1888
+#: src/protocols/novell/novell.c:1879
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-#: src/protocols/novell/novell.c:1995
+#: src/protocols/novell/novell.c:1985
 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:2051
+#: src/protocols/novell/novell.c:2039
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7388,22 +7543,30 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2149
+#: src/protocols/novell/novell.c:2137
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr ""
 
-#: src/protocols/novell/novell.c:2171
+#: src/protocols/novell/novell.c:2159
 msgid "Error. SSL support is not installed."
 msgstr "Viga. SSL tugi pole paigaldatud."
 
-#: src/protocols/novell/novell.c:2475
+#: src/protocols/novell/novell.c:2463
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 
-#: src/protocols/novell/novell.c:2965 src/protocols/novell/novell.c:3047
-#: src/protocols/yahoo/yahoo.c:2835
+#: src/protocols/novell/novell.c:2809 src/protocols/oscar/oscar.c:739
+#: src/protocols/oscar/oscar.c:6837 src/protocols/yahoo/yahoo.c:2782
+msgid "Offline"
+msgstr "Ühendamata"
+
+#: src/protocols/novell/novell.c:2820
+msgid "Message"
+msgstr ""
+
+#: src/protocols/novell/novell.c:2919 src/protocols/novell/novell.c:2975
 msgid "Appear Offline"
 msgstr ""
 
@@ -7417,295 +7580,294 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3540 src/protocols/novell/novell.c:3542
+#: src/protocols/novell/novell.c:3468 src/protocols/novell/novell.c:3470
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr ""
 
-#: src/protocols/novell/novell.c:3561
+#: src/protocols/novell/novell.c:3489
 msgid "Server address"
 msgstr "Serveri aadress"
 
-#: src/protocols/novell/novell.c:3565
+#: src/protocols/novell/novell.c:3493
 msgid "Server port"
 msgstr "Serveri port"
 
+#: src/protocols/oscar/oscar.c:189
+msgid "Invalid error"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:190
+msgid "Invalid SNAC"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:191
+msgid "Rate to host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:192
+msgid "Rate to client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:194
+msgid "Service unavailable"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:195
+msgid "Service not defined"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:196
+msgid "Obsolete SNAC"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:197
+msgid "Not supported by host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:198
+msgid "Not supported by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:199
+msgid "Refused by client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:200
+msgid "Reply too big"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:201
+msgid "Responses lost"
+msgstr ""
+
 #: src/protocols/oscar/oscar.c:202
-msgid "Invalid error"
+msgid "Request denied"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:203
-msgid "Invalid SNAC"
+msgid "Busted SNAC payload"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:204
-msgid "Rate to host"
-msgstr ""
+msgid "Insufficient rights"
+msgstr "Pole piisavalt õigusi"
 
 #: src/protocols/oscar/oscar.c:205
-msgid "Rate to client"
+msgid "In local permit/deny"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:206
+msgid "Too evil (sender)"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:207
-msgid "Service unavailable"
+msgid "Too evil (receiver)"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:208
-msgid "Service not defined"
+msgid "User temporarily unavailable"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:209
-msgid "Obsolete SNAC"
+msgid "No match"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:210
-msgid "Not supported by host"
-msgstr ""
+msgid "List overflow"
+msgstr "Nimekirja ületäitumine"
 
 #: src/protocols/oscar/oscar.c:211
-msgid "Not supported by client"
+msgid "Request ambiguous"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:212
-msgid "Refused by client"
+msgid "Queue full"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:213
-msgid "Reply too big"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:214
-msgid "Responses lost"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:215
-msgid "Request denied"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:216
-msgid "Busted SNAC payload"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:217
-msgid "Insufficient rights"
-msgstr "Pole piisavalt õigusi"
-
-#: src/protocols/oscar/oscar.c:218
-msgid "In local permit/deny"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:219
-msgid "Too evil (sender)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:220
-msgid "Too evil (receiver)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:221
-msgid "User temporarily unavailable"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:222
-msgid "No match"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:223
-msgid "List overflow"
-msgstr "Nimekirja ületäitumine"
-
-#: src/protocols/oscar/oscar.c:224
-msgid "Request ambiguous"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:225
-msgid "Queue full"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:226
 msgid "Not while on AOL"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:417 src/protocols/oscar/oscar.c:502
+#: src/protocols/oscar/oscar.c:409 src/protocols/oscar/oscar.c:492
 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:594
+msgid "Voice"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:597
+msgid "AIM Direct IM"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:600 src/protocols/silc/silc.c:654
+#: src/protocols/silc/util.c:509
+msgid "Chat"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:603 src/protocols/oscar/oscar.c:7139
+msgid "Get File"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:610
+msgid "Games"
+msgstr "Mängud"
+
+#: src/protocols/oscar/oscar.c:613
+msgid "Add-Ins"
+msgstr ""
+
 #: src/protocols/oscar/oscar.c:616
-msgid "Voice"
+msgid "Send Buddy List"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:619
-msgid "AIM Direct IM"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:622 src/protocols/silc/silc.c:659
-#: src/protocols/silc/util.c:509
-msgid "Chat"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:625 src/protocols/oscar/oscar.c:7892
-msgid "Get File"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:632
-msgid "Games"
-msgstr "Mängud"
-
-#: src/protocols/oscar/oscar.c:635
-msgid "Add-Ins"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:638
-msgid "Send Buddy List"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:641
 msgid "ICQ Direct Connect"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:644
+#: src/protocols/oscar/oscar.c:622
 msgid "AP User"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:625
 msgid "ICQ RTF"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:650
+#: src/protocols/oscar/oscar.c:628
 msgid "Nihilist"
 msgstr ""
 
+#: src/protocols/oscar/oscar.c:631
+msgid "ICQ Server Relay"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:634
+msgid "Old ICQ UTF8"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:637
+msgid "Trillian Encryption"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:640
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:643
+msgid "Hiptop"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:646
+msgid "Security Enabled"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:649
+msgid "Video Chat"
+msgstr "Videovestlus"
+
 #: src/protocols/oscar/oscar.c:653
-msgid "ICQ Server Relay"
+msgid "iChat AV"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:656
-msgid "Old ICQ UTF8"
+msgid "Live Video"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:659
-msgid "Trillian Encryption"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:662
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-#: src/protocols/oscar/oscar.c:665
-msgid "Hiptop"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:668
-msgid "Security Enabled"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:671
-msgid "Video Chat"
-msgstr "Videovestlus"
-
-#: src/protocols/oscar/oscar.c:675
-msgid "iChat AV"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:678
-msgid "Live Video"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:681
 msgid "Camera"
 msgstr "Kaamera"
 
-#: src/protocols/oscar/oscar.c:699 src/protocols/oscar/oscar.c:7775
+#: src/protocols/oscar/oscar.c:677 src/protocols/oscar/oscar.c:5842
+#: src/protocols/oscar/oscar.c:7031
 msgid "Free For Chat"
 msgstr "Vestluseks vaba"
 
-#: src/protocols/oscar/oscar.c:703 src/protocols/oscar/oscar.c:7790
+#: src/protocols/oscar/oscar.c:681 src/protocols/oscar/oscar.c:5836
+#: src/protocols/oscar/oscar.c:7029
 msgid "Not Available"
 msgstr "Pole saadaval"
 
-#: src/protocols/oscar/oscar.c:705 src/protocols/oscar/oscar.c:7780
+#: src/protocols/oscar/oscar.c:683 src/protocols/oscar/oscar.c:5839
+#: src/protocols/oscar/oscar.c:7030
 msgid "Occupied"
 msgstr "Hõivatud"
 
-#: src/protocols/oscar/oscar.c:709
+#: src/protocols/oscar/oscar.c:687
 msgid "Web Aware"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:786 src/protocols/oscar/oscar.c:5056
-msgid "Warning Level"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:792
+#: src/protocols/oscar/oscar.c:755
 msgid "Capabilities"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:801
+#: src/protocols/oscar/oscar.c:764
 msgid "Buddy Comment"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:958
+#: src/protocols/oscar/oscar.c:899
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:960
+#: src/protocols/oscar/oscar.c:901
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:968
+#: src/protocols/oscar/oscar.c:908
 msgid "Direct Connect failed"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1045 src/protocols/oscar/oscar.c:1176
+#: src/protocols/oscar/oscar.c:985 src/protocols/oscar/oscar.c:1116
 #, c-format
 msgid "Direct IM with %s established"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1126
+#: src/protocols/oscar/oscar.c:1066
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1547
+#: src/protocols/oscar/oscar.c:1486
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1552
+#: src/protocols/oscar/oscar.c:1491
 msgid "Unable to open Direct IM"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1587
+#: src/protocols/oscar/oscar.c:1526
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1591
+#: src/protocols/oscar/oscar.c:1530
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1595 src/protocols/oscar/oscar.c:4367
+#: src/protocols/oscar/oscar.c:1534 src/protocols/oscar/oscar.c:3672
 msgid "Connect"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1661
-#, c-format
-msgid "You have lost your connection to chat room %s."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1684
+#: src/protocols/oscar/oscar.c:1601 src/protocols/toc/toc.c:874
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1620
 msgid "Chat is currently unavailable"
 msgstr "Jututuba pole hetkel saadaval"
 
-#: src/protocols/oscar/oscar.c:1754
+#: src/protocols/oscar/oscar.c:1701
 msgid "Screen name sent"
 msgstr "Ekraaninimi saadetud"
 
-#: src/protocols/oscar/oscar.c:1778
+#: src/protocols/oscar/oscar.c:1715
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7713,180 +7875,161 @@
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1807
+#: src/protocols/oscar/oscar.c:1743
 msgid "Unable to login to AIM"
 msgstr "AIM'i pole võimalik sisse logida"
 
-#: src/protocols/oscar/oscar.c:1911 src/protocols/oscar/oscar.c:2854
+#: src/protocols/oscar/oscar.c:1845 src/protocols/oscar/oscar.c:2370
 msgid "Could Not Connect"
 msgstr "Ei saa ühenduda"
 
-#: src/protocols/oscar/oscar.c:1919
+#: src/protocols/oscar/oscar.c:1853
 msgid "Connection established, cookie sent"
 msgstr "Ühendus saavutatud, küpsis saadetud"
 
-#. clientip & verifiedip failed, request a redirect
-#. * that is, we want the sender to connect to us
-#. Let the user not to lose hope quite yet
-#: src/protocols/oscar/oscar.c:2071
-msgid "Attempting connection redirect..."
-msgstr ""
-
-#. proxyip timed out
-#. * Yes, it's a bit odd to ask the user to enable proxied file transfers
-#. * when it's a proxied transfer that timed out. It is possible that a
-#. * stage 1/2 proxied transfer might work when a stage 3 will not.
-#: src/protocols/oscar/oscar.c:2116
-#, c-format
-msgid ""
-"Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
-"ICQ."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2214 src/protocols/yahoo/yahoo_filexfer.c:174
-#: src/protocols/yahoo/yahoo_filexfer.c:183
-#: src/protocols/yahoo/yahoo_filexfer.c:192
+#: src/protocols/oscar/oscar.c:1964
+#, c-format
+msgid "Transfer of file %s timed out."
+msgstr "Faili %s ülekanne ületas ajapiirangu."
+
+#: src/protocols/oscar/oscar.c:2052 src/protocols/yahoo/yahoo_filexfer.c:177
+#: src/protocols/yahoo/yahoo_filexfer.c:186
+#: src/protocols/yahoo/yahoo_filexfer.c:195
 msgid "Unable to establish file descriptor."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2219
+#: src/protocols/oscar/oscar.c:2057
 msgid "Unable to create new connection."
 msgstr "Uut ühendust pole võimalik luua."
 
-#: src/protocols/oscar/oscar.c:2453 src/protocols/oscar/oscar.c:2462
-#: src/protocols/oscar/oscar.c:2476 src/protocols/oscar/oscar.c:2486
-#, fuzzy
-msgid "Unable to log into file transfer proxy."
-msgstr "Faili pole võimalik avada."
-
-#: src/protocols/oscar/oscar.c:2540
-msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2741 src/protocols/toc/toc.c:543
+#: src/protocols/oscar/oscar.c:2129
+msgid "Unable to establish listener socket."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2254 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "Vigane hüüdnimi või parool."
 
-#: src/protocols/oscar/oscar.c:2746
+#: src/protocols/oscar/oscar.c:2259
 msgid "Your account is currently suspended."
 msgstr ""
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2750
+#: src/protocols/oscar/oscar.c:2263
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL'i välksõnumiserver pole ajutiselt saadaval."
 
-#: src/protocols/oscar/oscar.c:2755
+#: src/protocols/oscar/oscar.c:2268
 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:2760
+#: src/protocols/oscar/oscar.c:2273
 #, 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:2791
+#: src/protocols/oscar/oscar.c:2305
 msgid "Internal Error"
 msgstr "Sisemine viga"
 
-#: src/protocols/oscar/oscar.c:2861
+#: src/protocols/oscar/oscar.c:2377
 msgid "Received authorization"
 msgstr "Autoriseerimine vastu võetud"
 
-#: src/protocols/oscar/oscar.c:2885
+#: src/protocols/oscar/oscar.c:2401
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2899
+#: src/protocols/oscar/oscar.c:2415
 msgid "Enter SecurID"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2900
+#: src/protocols/oscar/oscar.c:2416
 msgid "Enter the 6 digit number from the digital display."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2940 src/protocols/oscar/oscar.c:2970
-#: src/protocols/oscar/oscar.c:3059
+#: src/protocols/oscar/oscar.c:2456 src/protocols/oscar/oscar.c:2486
+#: src/protocols/oscar/oscar.c:2575
 #, 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:2943 src/protocols/oscar/oscar.c:2973
+#: src/protocols/oscar/oscar.c:2459 src/protocols/oscar/oscar.c:2489
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3062
+#: src/protocols/oscar/oscar.c:2578
 msgid "Gaim was unable to get a valid login hash."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3093
+#: src/protocols/oscar/oscar.c:2610
 msgid "Password sent"
 msgstr "Parool saadetud"
 
-#: src/protocols/oscar/oscar.c:4358
+#: src/protocols/oscar/oscar.c:3664
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4361
+#: src/protocols/oscar/oscar.c:3667
 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 ""
 
-#: src/protocols/oscar/oscar.c:4400
+#: src/protocols/oscar/oscar.c:3705
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4408
+#: src/protocols/oscar/oscar.c:3713
 msgid "Authorization Request Message:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4409
+#: src/protocols/oscar/oscar.c:3714
 msgid "Please authorize me!"
 msgstr "Palun autoriseeri mind!"
 
-#: src/protocols/oscar/oscar.c:4439
+#: src/protocols/oscar/oscar.c:3744
 #, 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:4444 src/protocols/oscar/oscar.c:4446
+#: src/protocols/oscar/oscar.c:3749 src/protocols/oscar/oscar.c:3751
 msgid "Request Authorization"
 msgstr "Autoriseerimise küsimine"
 
-#: src/protocols/oscar/oscar.c:4484 src/protocols/oscar/oscar.c:4490
-#: src/protocols/oscar/oscar.c:4594 src/protocols/oscar/oscar.c:4618
-#: src/protocols/oscar/oscar.c:7228 src/protocols/oscar/oscar.c:7280
+#: src/protocols/oscar/oscar.c:3799 src/protocols/oscar/oscar.c:3801
+#: src/protocols/oscar/oscar.c:3808 src/protocols/oscar/oscar.c:3905
+#: src/protocols/oscar/oscar.c:3925 src/protocols/oscar/oscar.c:6472
+#: src/protocols/oscar/oscar.c:6518
 msgid "No reason given."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4489
+#: src/protocols/oscar/oscar.c:3807
 msgid "Authorization Denied Message:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4596
-#, fuzzy, c-format
-msgid ""
-"The user %u wants to add %s to their buddy list for the following reason:\n"
+#: src/protocols/oscar/oscar.c:3905
+#, c-format
+msgid ""
+"The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
-msgstr "Kasutaja %s soovib lisada sind oma sõbranimekirja."
-
-#: src/protocols/oscar/oscar.c:4606 src/protocols/oscar/oscar.c:7240
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3913 src/protocols/oscar/oscar.c:6478
 msgid "Authorization Request"
 msgstr "Autoriseerimispäring"
 
-#: src/protocols/oscar/oscar.c:4618
+#: src/protocols/oscar/oscar.c:3925
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7894,17 +8037,17 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4619
+#: src/protocols/oscar/oscar.c:3926
 msgid "ICQ authorization denied."
 msgstr ""
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:4626
+#: src/protocols/oscar/oscar.c:3933
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4634
+#: src/protocols/oscar/oscar.c:3941
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7913,7 +8056,7 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4642
+#: src/protocols/oscar/oscar.c:3949
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7922,7 +8065,7 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4650
+#: src/protocols/oscar/oscar.c:3957
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7931,34 +8074,34 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4671
+#: src/protocols/oscar/oscar.c:3978
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4677
+#: src/protocols/oscar/oscar.c:3984
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4681
+#: src/protocols/oscar/oscar.c:3988
 msgid "Decline"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4765
+#: src/protocols/oscar/oscar.c:4072
 #, 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:4774
+#: src/protocols/oscar/oscar.c:4081
 #, 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:4783
+#: src/protocols/oscar/oscar.c:4090
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7967,268 +8110,279 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:4792
+#: src/protocols/oscar/oscar.c:4099
 #, 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:4801
+#: src/protocols/oscar/oscar.c:4108
 #, 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:4810
+#: src/protocols/oscar/oscar.c:4117
 #, 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:4869
-#, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4930
+#: src/protocols/oscar/oscar.c:4171 src/protocols/oscar/oscar.c:4403
+#, c-format
+msgid "Info for %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4237
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4967
+#: src/protocols/oscar/oscar.c:4273
 #, c-format
 msgid "Unable to send message: %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4967 src/protocols/oscar/oscar.c:4972
-#: src/protocols/oscar/oscar.c:5030 src/protocols/oscar/oscar.c:5034
+#: src/protocols/oscar/oscar.c:4273 src/protocols/oscar/oscar.c:4278
+#: src/protocols/oscar/oscar.c:4336 src/protocols/oscar/oscar.c:4340
 msgid "Unknown reason."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4970
-#, c-format
-msgid "Unable to send message to %s:"
-msgstr "Kasutajale %s pole võimalik sõnumit saata:"
-
-#: src/protocols/oscar/oscar.c:5030
+msgstr "Tundmatu põhjus."
+
+#: src/protocols/oscar/oscar.c:4336
 #, c-format
 msgid "User information not available: %s"
 msgstr "Kasutajateave pole saadaval: %s"
 
-#: src/protocols/oscar/oscar.c:5033
+#: src/protocols/oscar/oscar.c:4339
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Kasutajateave %s kohta pole saadaval:"
 
-#: src/protocols/oscar/oscar.c:5060
+#: src/protocols/oscar/oscar.c:4361
+msgid "Warning Level"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4365
 msgid "Online Since"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5065 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/oscar/oscar.c:4370 src/protocols/yahoo/yahoo_profile.c:1125
 msgid "Member Since"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5148
+#: src/protocols/oscar/oscar.c:4454
 msgid "Your AIM connection may be lost."
 msgstr ""
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:5334
+#: src/protocols/oscar/oscar.c:4640
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5560
+#: src/protocols/oscar/oscar.c:4865
 msgid "Rate limiting error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5561
+#: src/protocols/oscar/oscar.c:4866
 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:5637
+#: src/protocols/oscar/oscar.c:4929
+msgid ""
+"You have been disconnected because you have signed on with this screen name "
+"at another location."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4931
 msgid "You have been signed off for an unknown reason."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5650 src/protocols/toc/toc.c:971
-#, c-format
-msgid "You have been disconnected from chat room %s."
-msgstr ""
-
-#. XXX - Don't call this with ssi
-#: src/protocols/oscar/oscar.c:5675
+#: src/protocols/oscar/oscar.c:4962
 msgid "Finalizing connection"
 msgstr "Ühendumise lõpuleviimine"
 
-#: src/protocols/oscar/oscar.c:5943
-msgid "UIN"
-msgstr "UIN"
-
-#: src/protocols/oscar/oscar.c:5969 src/protocols/silc/util.c:541
+#: src/protocols/oscar/oscar.c:5245 src/protocols/silc/util.c:541
 msgid "Mobile Phone"
 msgstr "Mobiiltelefon"
 
-#: src/protocols/oscar/oscar.c:5971
+#: src/protocols/oscar/oscar.c:5246
+msgid "Not specified"
+msgstr "Määramata"
+
+#: src/protocols/oscar/oscar.c:5247 src/protocols/trepia/trepia.c:282
+#: src/protocols/trepia/trepia.c:408
 msgid "Female"
 msgstr "Naine"
 
-#: src/protocols/oscar/oscar.c:5971
+#: src/protocols/oscar/oscar.c:5247 src/protocols/trepia/trepia.c:281
+#: src/protocols/trepia/trepia.c:408
 msgid "Male"
 msgstr "Mees"
 
-#: src/protocols/oscar/oscar.c:5987
+#: src/protocols/oscar/oscar.c:5263
 msgid "Personal Web Page"
 msgstr "Isiklik veebileht"
 
-#: src/protocols/oscar/oscar.c:5991
+#: src/protocols/oscar/oscar.c:5267
 msgid "Additional Information"
-msgstr "Täiendav teave"
-
-#: src/protocols/oscar/oscar.c:5996
+msgstr "Täiendavad andmed"
+
+#: src/protocols/oscar/oscar.c:5272
 msgid "Home Address"
 msgstr "Koduaadress"
 
-#: src/protocols/oscar/oscar.c:6000 src/protocols/oscar/oscar.c:6008
+#: src/protocols/oscar/oscar.c:5276 src/protocols/oscar/oscar.c:5284
 msgid "Zip Code"
 msgstr "Indeks"
 
-#: src/protocols/oscar/oscar.c:6004
+#: src/protocols/oscar/oscar.c:5280
 msgid "Work Address"
 msgstr "Tööaadress"
 
-#: src/protocols/oscar/oscar.c:6012
+#: src/protocols/oscar/oscar.c:5288
 msgid "Work Information"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6013
+#: src/protocols/oscar/oscar.c:5289
 msgid "Company"
 msgstr "Firma"
 
-#: src/protocols/oscar/oscar.c:6014
+#: src/protocols/oscar/oscar.c:5290
 msgid "Division"
 msgstr "Üksus"
 
-#: src/protocols/oscar/oscar.c:6015
+#: src/protocols/oscar/oscar.c:5291
 msgid "Position"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6017
+#: src/protocols/oscar/oscar.c:5293
 msgid "Web Page"
 msgstr "Veebileht"
 
-#: src/protocols/oscar/oscar.c:6074
+#: src/protocols/oscar/oscar.c:5303
+#, c-format
+msgid "ICQ Info for %s"
+msgstr "ICQ andmed %s kohta"
+
+#: src/protocols/oscar/oscar.c:5352
 msgid "Pop-Up Message"
 msgstr ""
 
-#. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:6103
+#: src/protocols/oscar/oscar.c:5373
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6132
+#: src/protocols/oscar/oscar.c:5377
+msgid "Search Results"
+msgstr "Otsingutulemused"
+
+#: src/protocols/oscar/oscar.c:5394
 #, c-format
 msgid "No results found for email address %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6153
+#: src/protocols/oscar/oscar.c:5415
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6155
+#: src/protocols/oscar/oscar.c:5417
 msgid "Account Confirmation Requested"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6186
+#: src/protocols/oscar/oscar.c:5448
 msgid "Error Changing Account Info"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6189
+msgstr "Viga kontoandmete muutmisel"
+
+#: src/protocols/oscar/oscar.c:5451
 #, 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:6192
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6195
+#: src/protocols/oscar/oscar.c:5454
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"ends in a space."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5457
 #, 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:6198
+#: src/protocols/oscar/oscar.c:5460
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6201
+#: src/protocols/oscar/oscar.c:5463
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6204
+#: src/protocols/oscar/oscar.c:5466
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6207
+#: src/protocols/oscar/oscar.c:5469
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6217
+#: src/protocols/oscar/oscar.c:5479
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6218 src/protocols/oscar/oscar.c:6225
+#: src/protocols/oscar/oscar.c:5480 src/protocols/oscar/oscar.c:5487
 msgid "Account Info"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6223
+#: src/protocols/oscar/oscar.c:5485
 #, c-format
 msgid "The email address for %s is %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6290
+#: src/protocols/oscar/oscar.c:5550
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6474
+#: src/protocols/oscar/oscar.c:5691
 msgid "Unable to set AIM profile."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6475
+#: src/protocols/oscar/oscar.c:5692
 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:6489
+#: src/protocols/oscar/oscar.c:5719
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8239,11 +8393,26 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:6494
+#: src/protocols/oscar/oscar.c:5724
 msgid "Profile too long."
 msgstr "Profiil on liiga pikk."
 
-#: src/protocols/oscar/oscar.c:6517 src/protocols/oscar/oscar.c:6590
+#: src/protocols/oscar/oscar.c:5740 src/protocols/oscar/oscar.c:7036
+msgid "Visible"
+msgstr "Nähtav"
+
+#: src/protocols/oscar/oscar.c:5758
+msgid "Unable to set AIM away message."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5759
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5799
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8254,22 +8423,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:6522 src/protocols/oscar/oscar.c:6595
+#: src/protocols/oscar/oscar.c:5804
 msgid "Away message too long."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6554
-msgid "Unable to set AIM away message."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6555
-msgid ""
-"You have probably requested to set your away message before the login "
-"procedure completed.  You remain in a \"present\" state; try setting it "
-"again when you are fully connected."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6685
+#: src/protocols/oscar/oscar.c:5881
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8277,40 +8435,40 @@
 "spaces, or contain only numbers."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6687 src/protocols/oscar/oscar.c:7086
-#: src/protocols/oscar/oscar.c:7100
+#: src/protocols/oscar/oscar.c:5883 src/protocols/oscar/oscar.c:6338
+#: src/protocols/oscar/oscar.c:6352
 msgid "Unable To Add"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6792
+#: src/protocols/oscar/oscar.c:6050
 msgid "Unable To Retrieve Buddy List"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6793
+#: src/protocols/oscar/oscar.c:6051
 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:6977 src/protocols/oscar/oscar.c:6978
-#: src/protocols/oscar/oscar.c:6983 src/protocols/oscar/oscar.c:7144
-#: src/protocols/oscar/oscar.c:7145 src/protocols/oscar/oscar.c:7150
+#: src/protocols/oscar/oscar.c:6233 src/protocols/oscar/oscar.c:6234
+#: src/protocols/oscar/oscar.c:6239 src/protocols/oscar/oscar.c:6396
+#: src/protocols/oscar/oscar.c:6397 src/protocols/oscar/oscar.c:6402
 msgid "Orphans"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7084
+#: src/protocols/oscar/oscar.c:6336
 #, 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:7084 src/protocols/oscar/oscar.c:7098
+#: src/protocols/oscar/oscar.c:6336 src/protocols/oscar/oscar.c:6350
 msgid "(no name)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7098
+#: src/protocols/oscar/oscar.c:6350
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8318,36 +8476,36 @@
 "buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7181
+#: src/protocols/oscar/oscar.c:6433
 #, 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:7187
+#: src/protocols/oscar/oscar.c:6439
 msgid "Authorization Given"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7231
-#, fuzzy, c-format
-msgid ""
-"The user %s wants to add %s to their buddy list for the following reason:\n"
+#: src/protocols/oscar/oscar.c:6472
+#, c-format
+msgid ""
+"The user %s wants to add you to their buddy list for the following reason:\n"
 "%s"
-msgstr "Kasutaja %s soovib lisada sind oma sõbranimekirja."
+msgstr ""
 
 #. Granted
-#: src/protocols/oscar/oscar.c:7276
+#: src/protocols/oscar/oscar.c:6514
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7277
+#: src/protocols/oscar/oscar.c:6515
 msgid "Authorization Granted"
 msgstr ""
 
 #. Denied
-#: src/protocols/oscar/oscar.c:7280
+#: src/protocols/oscar/oscar.c:6518
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8355,182 +8513,153 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7281
+#: src/protocols/oscar/oscar.c:6519
 msgid "Authorization Denied"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7318 src/protocols/toc/toc.c:1372
+#: src/protocols/oscar/oscar.c:6556 src/protocols/toc/toc.c:1273
 msgid "_Exchange:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7354
+#: src/protocols/oscar/oscar.c:6594
 msgid "Invalid chat name specified."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7424
+#: src/protocols/oscar/oscar.c:6683
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7559
+#: src/protocols/oscar/oscar.c:6809
 msgid "Away Message"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:7848
+msgstr "Eemaloleku sõnum"
+
+#: src/protocols/oscar/oscar.c:7095
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Sõbrakommentaar %s kohta"
 
-#: src/protocols/oscar/oscar.c:7849
+#: src/protocols/oscar/oscar.c:7096
 msgid "Buddy Comment:"
 msgstr "Sõbrakommentaar:"
 
-#: src/protocols/oscar/oscar.c:7868
+#: src/protocols/oscar/oscar.c:7115
 msgid "Edit Buddy Comment"
 msgstr "Redigeeri sõbrakommentaari"
 
-#: src/protocols/oscar/oscar.c:7874
+#: src/protocols/oscar/oscar.c:7121
 msgid "Get Status Msg"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7886
+#: src/protocols/oscar/oscar.c:7133
 msgid "Direct IM"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7903
+#: src/protocols/oscar/oscar.c:7150
 msgid "Re-request Authorization"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7963
-#, fuzzy
-msgid "Require authorization"
-msgstr "Autoriseerimise küsimine"
-
-#: src/protocols/oscar/oscar.c:7966
-#, fuzzy
-msgid "Hide IP address"
-msgstr "IP aadress"
-
-#: src/protocols/oscar/oscar.c:7969
-#, fuzzy
-msgid "Web aware"
-msgstr "Veebileht"
-
-#: src/protocols/oscar/oscar.c:7974
-#, fuzzy
-msgid "ICQ Privacy Options"
-msgstr "Proksi valikud"
-
-#: src/protocols/oscar/oscar.c:7991
+#: src/protocols/oscar/oscar.c:7180
 msgid "The new formatting is invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7992
+#: src/protocols/oscar/oscar.c:7181
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7999
+#: src/protocols/oscar/oscar.c:7188
 msgid "New screen name formatting:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:8051
+#: src/protocols/oscar/oscar.c:7240
 msgid "Change Address To:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:8096
+#: src/protocols/oscar/oscar.c:7285
 msgid "<i>you are not waiting for authorization</i>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:8099
+#: src/protocols/oscar/oscar.c:7288
 msgid "You are awaiting authorization from the following buddies"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:8100
+#: src/protocols/oscar/oscar.c:7289
 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:8117
+#: src/protocols/oscar/oscar.c:7306
 msgid "Find Buddy by E-mail"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:8118
+#: src/protocols/oscar/oscar.c:7307
 msgid "Search for a buddy by e-mail address"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:8119
+#: src/protocols/oscar/oscar.c:7308
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:8206 src/protocols/silc/silc.c:817
+#: src/protocols/oscar/oscar.c:7325
+msgid "Available Message:"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:7326
+msgid "I'm doing work and hoping for a distraction--IM me!"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:7407 src/protocols/silc/silc.c:812
 msgid "Set User Info..."
 msgstr "Määra kasutajateave..."
 
-#: src/protocols/oscar/oscar.c:8212
+#: src/protocols/oscar/oscar.c:7412
 msgid "Set User Info (URL)..."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:8217 src/protocols/silc/silc.c:813
+#: src/protocols/oscar/oscar.c:7418
+msgid "Set Available Message..."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:7423 src/protocols/silc/silc.c:808
 msgid "Change Password..."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:8223
+#: src/protocols/oscar/oscar.c:7428
 msgid "Change Password (URL)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:8227
+#: src/protocols/oscar/oscar.c:7432
 msgid "Configure IM Forwarding (URL)"
 msgstr ""
 
-#. ICQ actions
-#: src/protocols/oscar/oscar.c:8237
-#, fuzzy
-msgid "Show privacy options..."
-msgstr "Näita rohkem valikuid"
-
-#. AIM actions
-#: src/protocols/oscar/oscar.c:8244
+#: src/protocols/oscar/oscar.c:7441
 msgid "Format Screen Name..."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:8248
+#: src/protocols/oscar/oscar.c:7445
 msgid "Confirm Account"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:8252
+#: src/protocols/oscar/oscar.c:7449
 msgid "Display Currently Registered Address"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:8256
+#: src/protocols/oscar/oscar.c:7453
 msgid "Change Currently Registered Address..."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:8263
+#: src/protocols/oscar/oscar.c:7460
 msgid "Show Buddies Awaiting Authorization"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:8269
+#: src/protocols/oscar/oscar.c:7466
 msgid "Search for Buddy by Email..."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:8274
+#: src/protocols/oscar/oscar.c:7471
 msgid "Search for Buddy by Information"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:8344
-#, fuzzy
-msgid "Use recent buddies group"
-msgstr "Kasutaja pole grupis"
-
-#: src/protocols/oscar/oscar.c:8347
-#, fuzzy
-msgid "Show how long you have been idle"
-msgstr "Lubab sul käsitsi määrata, kui kaua sa oled jõude olnud"
-
-#: src/protocols/oscar/oscar.c:8356
-msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8541,33 +8670,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:8470 src/protocols/oscar/oscar.c:8472
+#: src/protocols/oscar/oscar.c:7619 src/protocols/oscar/oscar.c:7621
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ protokolli plugin"
 
-#: src/protocols/oscar/oscar.c:8491
+#: src/protocols/oscar/oscar.c:7640
 msgid "Auth host"
 msgstr "Autentimishost"
 
-#: src/protocols/oscar/oscar.c:8494
+#: src/protocols/oscar/oscar.c:7643
 msgid "Auth port"
 msgstr "Autentimisport"
 
-#: src/protocols/oscar/oscar.c:8497 src/protocols/zephyr/zephyr.c:2892
+#: src/protocols/oscar/oscar.c:7646 src/protocols/zephyr/zephyr.c:2748
 msgid "Encoding"
 msgstr "Kooditabel"
 
-#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:419
-#: src/protocols/silc/buddy.c:544 src/protocols/silc/buddy.c:711
+#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:414
+#: src/protocols/silc/buddy.c:539 src/protocols/silc/buddy.c:706
 #: src/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:114
-#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:123
-#: src/protocols/silc/buddy.c:128 src/protocols/silc/buddy.c:133
-#: src/protocols/silc/buddy.c:138 src/protocols/silc/buddy.c:256
+#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:109
+#: src/protocols/silc/buddy.c:114 src/protocols/silc/buddy.c:118
+#: src/protocols/silc/buddy.c:123 src/protocols/silc/buddy.c:128
+#: src/protocols/silc/buddy.c:133 src/protocols/silc/buddy.c:251
 msgid "Key Agreement"
 msgstr ""
 
@@ -8575,43 +8704,43 @@
 msgid "Cannot perform the key agreement"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:115
+#: src/protocols/silc/buddy.c:110
 msgid "Error occurred during key agreement"
 msgstr ""
 
+#: src/protocols/silc/buddy.c:114
+msgid "Key Agreement failed"
+msgstr ""
+
 #: src/protocols/silc/buddy.c:119
-msgid "Key Agreement failed"
+msgid "Timeout during key agreement"
 msgstr ""
 
 #: src/protocols/silc/buddy.c:124
-msgid "Timeout during key agreement"
+msgid "Key agreement was aborted"
 msgstr ""
 
 #: src/protocols/silc/buddy.c:129
-msgid "Key agreement was aborted"
+msgid "Key agreement is already started"
 msgstr ""
 
 #: src/protocols/silc/buddy.c:134
-msgid "Key agreement is already started"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:139
 msgid "Key agreement cannot be started with yourself"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:257 src/protocols/silc/buddy.c:387
-#: src/protocols/silc/buddy.c:512
+#: src/protocols/silc/buddy.c:252 src/protocols/silc/buddy.c:382
+#: src/protocols/silc/buddy.c:507
 msgid "The remote user is not present in the network any more"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:293
+#: src/protocols/silc/buddy.c:288
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:297
+#: src/protocols/silc/buddy.c:292
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8619,307 +8748,310 @@
 "Remote port: %d"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:310
+#: src/protocols/silc/buddy.c:305
 msgid "Key Agreement Request"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:386 src/protocols/silc/buddy.c:421
-#: src/protocols/silc/buddy.c:463
+#: src/protocols/silc/buddy.c:381 src/protocols/silc/buddy.c:416
+#: src/protocols/silc/buddy.c:458
 msgid "IM With Password"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:422
+#: src/protocols/silc/buddy.c:417
 msgid "Cannot set IM key"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:464
+#: src/protocols/silc/buddy.c:459
 msgid "Set IM Password"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:511 src/protocols/silc/buddy.c:546
-#: src/protocols/silc/ops.c:1278 src/protocols/silc/ops.c:1289
+#: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
+#: src/protocols/silc/ops.c:1284 src/protocols/silc/ops.c:1295
 msgid "Get Public Key"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:547 src/protocols/silc/ops.c:1279
-#: src/protocols/silc/ops.c:1290
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1285
+#: src/protocols/silc/ops.c:1296
 msgid "Cannot fetch the public key"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:634 src/protocols/silc/buddy.c:1583
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1553
 msgid "Show Public Key"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:635 src/protocols/silc/buddy.c:994
-#: src/protocols/silc/chat.c:235
+#: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
+#: src/protocols/silc/chat.c:234
 msgid "Could not load public key"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:712 src/protocols/silc/ops.c:873
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
-#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1099
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:871
+#: src/protocols/silc/ops.c:943 src/protocols/silc/ops.c:1078
+#: src/protocols/silc/ops.c:1079 src/protocols/silc/ops.c:1098
 msgid "User Information"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:713 src/protocols/silc/ops.c:946
-#: src/protocols/silc/ops.c:1100
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:944
+#: src/protocols/silc/ops.c:1099
 msgid "Cannot get user information"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:734
+#: src/protocols/silc/buddy.c:729
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:737
+#: src/protocols/silc/buddy.c:732
 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:1028
+#: src/protocols/silc/buddy.c:1023
 msgid "Open..."
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1037
+#: src/protocols/silc/buddy.c:1032
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1040
+#: src/protocols/silc/buddy.c:1035
 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:1043
+#: src/protocols/silc/buddy.c:1038
 msgid "Import..."
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1130
+#: src/protocols/silc/buddy.c:1125
 msgid "Select correct user"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1132
+#: src/protocols/silc/buddy.c:1127
 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:1134
+#: src/protocols/silc/buddy.c:1129
 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:1415
+#: src/protocols/silc/buddy.c:1386
 msgid "Detached"
 msgstr "Eemalolev"
 
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:56
+#: src/protocols/silc/buddy.c:1390 src/protocols/silc/silc.c:49
+#: src/protocols/silc/silc.c:85
 msgid "Indisposed"
 msgstr "Vastaline"
 
-#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:58
+#: src/protocols/silc/buddy.c:1394 src/protocols/silc/silc.c:50
+#: src/protocols/silc/silc.c:87
 msgid "Wake Me Up"
 msgstr "Ärata mind üles"
 
-#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:50
+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:46
+#: src/protocols/silc/silc.c:79
 msgid "Hyper Active"
 msgstr "Üliaktiivne"
 
-#: src/protocols/silc/buddy.c:1427
+#: src/protocols/silc/buddy.c:1398
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1434 src/protocols/silc/silc.c:634
+#: src/protocols/silc/buddy.c:1405 src/protocols/silc/silc.c:629
 #: src/protocols/silc/util.c:472
 msgid "Happy"
 msgstr "Õnnelik"
 
-#: src/protocols/silc/buddy.c:1436 src/protocols/silc/silc.c:636
+#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:631
 #: src/protocols/silc/util.c:474
 msgid "Sad"
 msgstr "Kurb"
 
-#: src/protocols/silc/buddy.c:1438 src/protocols/silc/silc.c:638
+#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:633
 #: src/protocols/silc/util.c:476
 msgid "Angry"
 msgstr "Vihane"
 
-#: src/protocols/silc/buddy.c:1440 src/protocols/silc/silc.c:640
+#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:635
 #: src/protocols/silc/util.c:478
 msgid "Jealous"
 msgstr "Armukade"
 
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/silc.c:642
+#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:637
 #: src/protocols/silc/util.c:480
 msgid "Ashamed"
 msgstr "Häbenev"
 
-#: src/protocols/silc/buddy.c:1444 src/protocols/silc/silc.c:644
+#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:639
 #: src/protocols/silc/util.c:482
 msgid "Invincible"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1446 src/protocols/silc/silc.c:646
+#: src/protocols/silc/buddy.c:1417 src/protocols/silc/silc.c:641
 #: src/protocols/silc/util.c:484
 msgid "In Love"
 msgstr "Armunud"
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/silc.c:648
+#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:643
 #: src/protocols/silc/util.c:486
 msgid "Sleepy"
 msgstr "Unine"
 
-#: src/protocols/silc/buddy.c:1450 src/protocols/silc/silc.c:650
+#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:645
 #: src/protocols/silc/util.c:488
 msgid "Bored"
 msgstr "Tüdinud"
 
-#: src/protocols/silc/buddy.c:1452 src/protocols/silc/silc.c:652
+#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:647
 #: src/protocols/silc/util.c:490
 msgid "Excited"
 msgstr "Põnevil"
 
-#: src/protocols/silc/buddy.c:1454 src/protocols/silc/silc.c:654
+#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:649
 #: src/protocols/silc/util.c:492
 msgid "Anxious"
 msgstr "Rahutu"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:982
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:980
 msgid "User Modes"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:991
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:989
 msgid "Mood"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:997
+#: src/protocols/silc/buddy.c:1470 src/protocols/silc/ops.c:995
 msgid "Status Text"
 msgstr "Olekutekst"
 
-#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1475 src/protocols/silc/ops.c:1001
 msgid "Preferred Contact"
 msgstr "Eelistatud kontakt"
 
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1008
+#: src/protocols/silc/buddy.c:1480 src/protocols/silc/ops.c:1006
 msgid "Preferred Language"
 msgstr "Eelistatud keel"
 
-#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1013
+#: src/protocols/silc/buddy.c:1485 src/protocols/silc/ops.c:1011
 msgid "Device"
 msgstr "Seade"
 
-#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:702 src/protocols/silc/silc.c:704
+#: src/protocols/silc/buddy.c:1490 src/protocols/silc/ops.c:1016
+#: src/protocols/silc/silc.c:697 src/protocols/silc/silc.c:699
 msgid "Timezone"
 msgstr "Ajavöönd"
 
-#: src/protocols/silc/buddy.c:1524 src/protocols/silc/ops.c:1023
+#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:1021
 msgid "Geolocation"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1567
+#: src/protocols/silc/buddy.c:1538
 msgid "Reset IM Key"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1572
+#: src/protocols/silc/buddy.c:1543
 msgid "IM with Key Exchange"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1576
+#: src/protocols/silc/buddy.c:1547
 msgid "IM with Password"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1588
+#: src/protocols/silc/buddy.c:1558
 msgid "Get Public Key..."
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1595 src/protocols/silc/ops.c:1409
+#: src/protocols/silc/buddy.c:1564 src/protocols/silc/ops.c:1417
 msgid "Kill User"
 msgstr ""
 
-#: src/protocols/silc/chat.c:38
+#: src/protocols/silc/chat.c:37
 msgid "_Passphrase:"
 msgstr "_Parool:"
 
-#: src/protocols/silc/chat.c:79
+#: src/protocols/silc/chat.c:78
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr ""
 
-#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
+#: src/protocols/silc/chat.c:79 src/protocols/silc/chat.c:171
 msgid "Channel Information"
-msgstr "Kanali teave"
-
-#: src/protocols/silc/chat.c:81
+msgstr "Kanali andmed"
+
+#: src/protocols/silc/chat.c:80
 msgid "Cannot get channel information"
-msgstr "Kanali teavet pole võimalik hankida"
-
-#: src/protocols/silc/chat.c:118
+msgstr "Kanali andmeid pole võimalik hankida"
+
+#: src/protocols/silc/chat.c:117
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Kanali nimi:</b> %s"
 
-#: src/protocols/silc/chat.c:121
+#: src/protocols/silc/chat.c:120
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Kasutajate arv:</b> %d"
 
-#: src/protocols/silc/chat.c:128
+#: src/protocols/silc/chat.c:127
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Kanali asutaja:</b> %s"
 
-#: src/protocols/silc/chat.c:137
+#: src/protocols/silc/chat.c:136
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Kanali šiffer:</b> %s"
 
-#: src/protocols/silc/chat.c:140
+#: src/protocols/silc/chat.c:139
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Kanali HMAC:</b> %s"
 
-#: src/protocols/silc/chat.c:145
+#: src/protocols/silc/chat.c:144
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Kanali teema:</b><br>%s"
 
-#: src/protocols/silc/chat.c:150
+#: src/protocols/silc/chat.c:149
 msgid "<br><b>Channel Modes:</b> "
 msgstr ""
 
-#: src/protocols/silc/chat.c:163
+#: src/protocols/silc/chat.c:162
 #, 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:164
+#: src/protocols/silc/chat.c:163
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr ""
 
-#: src/protocols/silc/chat.c:234
+#: src/protocols/silc/chat.c:233
 msgid "Add Channel Public Key"
 msgstr ""
 
 #. Add new public key
-#: src/protocols/silc/chat.c:289
+#: src/protocols/silc/chat.c:288
 msgid "Open Public Key..."
 msgstr ""
 
-#: src/protocols/silc/chat.c:398
+#: src/protocols/silc/chat.c:397
 msgid "Channel Passphrase"
 msgstr "Kanali parool"
 
-#: src/protocols/silc/chat.c:405
+#: src/protocols/silc/chat.c:404
 msgid "Channel Public Keys List"
 msgstr ""
 
-#: src/protocols/silc/chat.c:410
+#: src/protocols/silc/chat.c:409
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8928,122 +9060,122 @@
 "able to join."
 msgstr ""
 
-#: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
-#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
-#: src/protocols/silc/chat.c:891
+#: src/protocols/silc/chat.c:418 src/protocols/silc/chat.c:419
+#: src/protocols/silc/chat.c:456 src/protocols/silc/chat.c:457
+#: src/protocols/silc/chat.c:886
 msgid "Channel Authentication"
 msgstr ""
 
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: src/protocols/silc/chat.c:420 src/protocols/silc/chat.c:458
 msgid "Add / Remove"
 msgstr ""
 
-#: src/protocols/silc/chat.c:576
+#: src/protocols/silc/chat.c:575
 msgid "Group Name"
 msgstr "Grupinimi"
 
-#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1694
+#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1697
 msgid "Passphrase"
 msgstr "Parool"
 
-#: src/protocols/silc/chat.c:591
+#: src/protocols/silc/chat.c:590
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr ""
 
-#: src/protocols/silc/chat.c:593
+#: src/protocols/silc/chat.c:592
 msgid "Add Channel Private Group"
 msgstr ""
 
+#: src/protocols/silc/chat.c:719
+msgid "User Limit"
+msgstr ""
+
 #: src/protocols/silc/chat.c:720
-msgid "User Limit"
-msgstr ""
-
-#: src/protocols/silc/chat.c:721
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 
-#: src/protocols/silc/chat.c:863
+#: src/protocols/silc/chat.c:862
 msgid "Get Info"
 msgstr ""
 
-#: src/protocols/silc/chat.c:871
+#: src/protocols/silc/chat.c:869
 msgid "Invite List"
 msgstr ""
 
-#: src/protocols/silc/chat.c:876
+#: src/protocols/silc/chat.c:873
 msgid "Ban List"
 msgstr ""
 
-#: src/protocols/silc/chat.c:884
+#: src/protocols/silc/chat.c:880
 msgid "Add Private Group"
 msgstr ""
 
-#: src/protocols/silc/chat.c:897
+#: src/protocols/silc/chat.c:891
 msgid "Reset Permanent"
 msgstr ""
 
+#: src/protocols/silc/chat.c:895
+msgid "Set Permanent"
+msgstr ""
+
 #: src/protocols/silc/chat.c:902
-msgid "Set Permanent"
-msgstr ""
-
-#: src/protocols/silc/chat.c:910
 msgid "Set User Limit"
 msgstr ""
 
-#: src/protocols/silc/chat.c:916
+#: src/protocols/silc/chat.c:907
 msgid "Reset Topic Restriction"
 msgstr ""
 
+#: src/protocols/silc/chat.c:911
+msgid "Set Topic Restriction"
+msgstr ""
+
+#: src/protocols/silc/chat.c:917
+msgid "Reset Private Channel"
+msgstr ""
+
 #: src/protocols/silc/chat.c:921
-msgid "Set Topic Restriction"
-msgstr ""
-
-#: src/protocols/silc/chat.c:928
-msgid "Reset Private Channel"
-msgstr ""
-
-#: src/protocols/silc/chat.c:933
 msgid "Set Private Channel"
 msgstr ""
 
-#: src/protocols/silc/chat.c:940
+#: src/protocols/silc/chat.c:927
 msgid "Reset Secret Channel"
 msgstr ""
 
-#: src/protocols/silc/chat.c:945
+#: src/protocols/silc/chat.c:931
 msgid "Set Secret Channel"
 msgstr ""
 
-#: src/protocols/silc/chat.c:1008
+#: src/protocols/silc/chat.c:993
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr ""
 
-#: src/protocols/silc/chat.c:1012
+#: src/protocols/silc/chat.c:997
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr ""
 
-#: src/protocols/silc/chat.c:1071
+#: src/protocols/silc/chat.c:1056
 #, 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:1073
+#: src/protocols/silc/chat.c:1058
 msgid "Join Private Group"
 msgstr ""
 
-#: src/protocols/silc/chat.c:1074
+#: src/protocols/silc/chat.c:1059
 msgid "Cannot join private group"
 msgstr ""
 
-#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:917
+#: src/protocols/silc/chat.c:1252 src/protocols/silc/silc.c:911
 msgid "Cannot call command"
 msgstr ""
 
-#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:918
+#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:912
 msgid "Unknown command"
 msgstr "Tundmatu käsk"
 
@@ -9070,8 +9202,7 @@
 msgstr ""
 
 #: src/protocols/silc/ft.c:102
-#, fuzzy
-msgid "File transfer session does not exist"
+msgid "File transfer sessions does not exist"
 msgstr "Failiülekande seanssi pole olemas"
 
 #: src/protocols/silc/ft.c:206
@@ -9094,102 +9225,102 @@
 msgid "Cannot send file"
 msgstr "Faili pole võimalik saata"
 
-#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
-#: src/protocols/silc/ops.c:359
+#: src/protocols/silc/ops.c:339 src/protocols/silc/ops.c:348
+#: src/protocols/silc/ops.c:357
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr ""
 
-#: src/protocols/silc/ops.c:425
+#: src/protocols/silc/ops.c:423
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr ""
 
-#: src/protocols/silc/ops.c:429
+#: src/protocols/silc/ops.c:427
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr ""
 
-#: src/protocols/silc/ops.c:462
+#: src/protocols/silc/ops.c:460
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr ""
 
-#: src/protocols/silc/ops.c:470
+#: src/protocols/silc/ops.c:468
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr ""
 
-#: src/protocols/silc/ops.c:499
+#: src/protocols/silc/ops.c:497
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr ""
 
-#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
-#: src/protocols/silc/ops.c:539
+#: src/protocols/silc/ops.c:527 src/protocols/silc/ops.c:532
+#: src/protocols/silc/ops.c:537
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr ""
 
-#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
-#: src/protocols/silc/ops.c:570
+#: src/protocols/silc/ops.c:558 src/protocols/silc/ops.c:563
+#: src/protocols/silc/ops.c:568
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr ""
 
-#: src/protocols/silc/ops.c:616
+#: src/protocols/silc/ops.c:614
 msgid "Server signoff"
 msgstr ""
 
-#: src/protocols/silc/ops.c:803
+#: src/protocols/silc/ops.c:801
 msgid "Personal Information"
-msgstr "Isiklik teave"
-
-#: src/protocols/silc/ops.c:826
+msgstr "Isiklikud andmed"
+
+#: src/protocols/silc/ops.c:824
 msgid "Birth Day"
 msgstr ""
 
-#: src/protocols/silc/ops.c:830
+#: src/protocols/silc/ops.c:828
 msgid "Job Title"
 msgstr ""
 
-#: src/protocols/silc/ops.c:834
+#: src/protocols/silc/ops.c:832
 msgid "Job Role"
 msgstr ""
 
-#: src/protocols/silc/ops.c:838
+#: src/protocols/silc/ops.c:836
 msgid "Organization"
 msgstr ""
 
-#: src/protocols/silc/ops.c:842
+#: src/protocols/silc/ops.c:840
 msgid "Unit"
 msgstr ""
 
-#: src/protocols/silc/ops.c:861
+#: src/protocols/silc/ops.c:859
 msgid "EMail"
 msgstr "E-post"
 
-#: src/protocols/silc/ops.c:866
+#: src/protocols/silc/ops.c:864
 msgid "Note"
 msgstr "Märkus"
 
-#: src/protocols/silc/ops.c:914
+#: src/protocols/silc/ops.c:912
 msgid "Join Chat"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1140
+#: src/protocols/silc/ops.c:1068 src/protocols/silc/ops.c:1139
 msgid "Public Key Fingerprint"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1141
+#: src/protocols/silc/ops.c:1069 src/protocols/silc/ops.c:1140
 msgid "Public Key Babbleprint"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1084
+#: src/protocols/silc/ops.c:1082
 msgid "More..."
 msgstr ""
 
-#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:805
+#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:800
 msgid "Detach From Server"
 msgstr ""
 
@@ -9201,43 +9332,43 @@
 msgid "Cannot set topic"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1198
+#: src/protocols/silc/ops.c:1204
 msgid "Failed to change nickname"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1246
+#: src/protocols/silc/ops.c:1241 src/protocols/silc/ops.c:1252
 msgid "Roomlist"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1246
+#: src/protocols/silc/ops.c:1241 src/protocols/silc/ops.c:1252
 msgid "Cannot get room list"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1291
+#: src/protocols/silc/ops.c:1297
 msgid "No public key was received"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1304 src/protocols/silc/ops.c:1317
+#: src/protocols/silc/ops.c:1310 src/protocols/silc/ops.c:1324
 msgid "Server Information"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1305
+#: src/protocols/silc/ops.c:1311
 msgid "Cannot get server information"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
+#: src/protocols/silc/ops.c:1342 src/protocols/silc/ops.c:1351
 msgid "Server Statistics"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1335
+#: src/protocols/silc/ops.c:1343
 msgid "Cannot get server statistics"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1344
+#: src/protocols/silc/ops.c:1352
 msgid "No server statistics available"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1366
+#: src/protocols/silc/ops.c:1374
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9257,97 +9388,97 @@
 "Total router operators: %d\n"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1389
+#: src/protocols/silc/ops.c:1397
 msgid "Network Statistics"
 msgstr "Võrgustatistika"
 
-#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
+#: src/protocols/silc/ops.c:1405 src/protocols/silc/ops.c:1410
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1397
+#: src/protocols/silc/ops.c:1405
 msgid "Ping failed"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1402
-msgid "Ping reply received from server"
-msgstr ""
-
 #: src/protocols/silc/ops.c:1410
+msgid "Ping reply received from server"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1418
 msgid "Could not kill user"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1494
-msgid "Error during connecting to SILC Server"
-msgstr ""
-
 #: src/protocols/silc/ops.c:1499
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1504
 msgid "Key Exchange failed"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1508
+#: src/protocols/silc/ops.c:1513
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-#: src/protocols/silc/ops.c:1543
+#: src/protocols/silc/ops.c:1548
 msgid "Disconnected by server"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1605 src/protocols/silc/ops.c:1652
-#: src/protocols/silc/silc.c:194
+#: src/protocols/silc/ops.c:1608 src/protocols/silc/ops.c:1655
+#: src/protocols/silc/silc.c:178
 msgid "Resuming session"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1607
+#: src/protocols/silc/ops.c:1610
 msgid "Authenticating connection"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1654
+#: src/protocols/silc/ops.c:1657
 msgid "Verifying server public key"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1695
+#: src/protocols/silc/ops.c:1698
 msgid "Passphrase required"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1724
+#: src/protocols/silc/ops.c:1727
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Tõrge: Versioonid ei klapi, uuenda oma klienti"
 
-#: src/protocols/silc/ops.c:1727
+#: src/protocols/silc/ops.c:1730
 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:1730
+#: src/protocols/silc/ops.c:1733
 msgid "Failure: Remote does not support proposed KE group"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1733
+#: src/protocols/silc/ops.c:1736
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Tõrge: Teine pool ei toeta pakutud šifrit"
 
-#: src/protocols/silc/ops.c:1736
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Tõrge: Teine pool ei toeta pakutud PKCS'i"
-
 #: src/protocols/silc/ops.c:1739
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "Tõrge: Teine pool ei toeta pakutud PKCS'i"
+
+#: src/protocols/silc/ops.c:1742
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Tõrge: Teine pool ei toeta pakutud räsifunktsiooni"
 
-#: src/protocols/silc/ops.c:1742
+#: src/protocols/silc/ops.c:1745
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Tõrge: Teine pool ei toeta pakutud HMAC'i"
 
-#: src/protocols/silc/ops.c:1744
+#: src/protocols/silc/ops.c:1747
 msgid "Failure: Incorrect signature"
 msgstr "Tõrge: Vigane signatuur"
 
-#: src/protocols/silc/ops.c:1746
+#: src/protocols/silc/ops.c:1749
 msgid "Failure: Invalid cookie"
 msgstr "Tõrge: Vigane küpsis"
 
-#: src/protocols/silc/ops.c:1757
+#: src/protocols/silc/ops.c:1760
 msgid "Failure: Authentication failed"
 msgstr "Tõrge: Autentimine nurjus"
 
@@ -9384,284 +9515,288 @@
 msgid "Unsupported public key type"
 msgstr "Toetamata avaliku võtme tüüp"
 
-#: src/protocols/silc/silc.c:154
+#: src/protocols/silc/silc.c:138
 msgid "Connection failed"
 msgstr "Tõrge ühendumisel"
 
-#: src/protocols/silc/silc.c:186
+#: src/protocols/silc/silc.c:170
 msgid "Cannot initialize SILC Client connection"
 msgstr ""
 
-#: src/protocols/silc/silc.c:197
+#: src/protocols/silc/silc.c:181
 msgid "Performing key exchange"
 msgstr ""
 
-#: src/protocols/silc/silc.c:270
+#: src/protocols/silc/silc.c:254
 msgid "Out of memory"
 msgstr "Mälu sai otsa"
 
 #. Progress
-#: src/protocols/silc/silc.c:309
+#: src/protocols/silc/silc.c:293
 msgid "Connecting to SILC Server"
 msgstr "Ühendumine SILC serverisse"
 
-#: src/protocols/silc/silc.c:630
+#: src/protocols/silc/silc.c:625
 msgid "Your Current Mood"
 msgstr ""
 
-#: src/protocols/silc/silc.c:632
+#: src/protocols/silc/silc.c:627
 msgid "Normal"
 msgstr ""
 
-#: src/protocols/silc/silc.c:657
+#: src/protocols/silc/silc.c:652
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
 msgstr ""
 
-#: src/protocols/silc/silc.c:665 src/protocols/silc/util.c:517
+#: src/protocols/silc/silc.c:660 src/protocols/silc/util.c:517
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:667 src/protocols/silc/util.c:519
+#: src/protocols/silc/silc.c:662 src/protocols/silc/util.c:519
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:669 src/protocols/silc/util.c:521
+#: src/protocols/silc/silc.c:664 src/protocols/silc/util.c:521
 msgid "Video Conferencing"
 msgstr ""
 
-#: src/protocols/silc/silc.c:674
+#: src/protocols/silc/silc.c:669
 msgid "Your Current Status"
 msgstr "Sinu hetkeolek"
 
-#: src/protocols/silc/silc.c:681
+#: src/protocols/silc/silc.c:676
 msgid "Online Services"
 msgstr ""
 
-#: src/protocols/silc/silc.c:684
+#: src/protocols/silc/silc.c:679
 msgid "Let others see what services you are using"
 msgstr ""
 
-#: src/protocols/silc/silc.c:690
+#: src/protocols/silc/silc.c:685
 msgid "Let others see what computer you are using"
 msgstr ""
 
-#: src/protocols/silc/silc.c:697
+#: src/protocols/silc/silc.c:692
 msgid "Your VCard File"
 msgstr ""
 
-#: src/protocols/silc/silc.c:710 src/protocols/silc/silc.c:711
+#: src/protocols/silc/silc.c:705 src/protocols/silc/silc.c:706
 msgid "User Online Status Attributes"
 msgstr ""
 
-#: src/protocols/silc/silc.c:712
+#: src/protocols/silc/silc.c:707
 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:752 src/protocols/silc/silc.c:758
-#: src/protocols/silc/silc.c:1162
+#: src/protocols/silc/silc.c:747 src/protocols/silc/silc.c:753
+#: src/protocols/silc/silc.c:1160
 msgid "Message of the Day"
 msgstr "Päevateade"
 
-#: src/protocols/silc/silc.c:752
+#: src/protocols/silc/silc.c:747
 msgid "No Message of the Day available"
 msgstr "Päevateadet pole"
 
-#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:1157
+#: src/protocols/silc/silc.c:748 src/protocols/silc/silc.c:1155
 msgid "There is no Message of the Day associated with this connection"
 msgstr ""
 
-#: src/protocols/silc/silc.c:800
+#: src/protocols/silc/silc.c:795
 msgid "Online Status"
 msgstr ""
 
-#: src/protocols/silc/silc.c:809
+#: src/protocols/silc/silc.c:804
 msgid "View Message of the Day"
 msgstr "Päevateate vaatamine"
 
-#: src/protocols/silc/silc.c:882
+#: src/protocols/silc/silc.c:876
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1033
+#: src/protocols/silc/silc.c:985
+msgid "Failed to leave channel"
+msgstr "Tõrge kanalilt lahkumisel"
+
+#: src/protocols/silc/silc.c:1031
 msgid "Topic too long"
 msgstr "Teema on liiga pikk"
 
-#: src/protocols/silc/silc.c:1114
+#: src/protocols/silc/silc.c:1112
 msgid "You must specify a nick"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1216
+#: src/protocols/silc/silc.c:1214
 #, c-format
 msgid "channel %s not found"
 msgstr ""
 
+#: src/protocols/silc/silc.c:1219
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr ""
+
 #: src/protocols/silc/silc.c:1221
 #, c-format
-msgid "channel modes for %s: %s"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1223
-#, c-format
 msgid "no channel modes are set on %s"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1236
+#: src/protocols/silc/silc.c:1234
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1266
+#: src/protocols/silc/silc.c:1264
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Tundmatu käsk: %s, (võib olla on see Gaim'i viga)"
 
-#: src/protocols/silc/silc.c:1329
+#: src/protocols/silc/silc.c:1327
 msgid "part [channel]:  Leave the chat"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1333
+#: src/protocols/silc/silc.c:1331
 msgid "leave [channel]:  Leave the chat"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1337
+#: src/protocols/silc/silc.c:1335
 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:1342
+#: src/protocols/silc/silc.c:1340
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1346
+#: src/protocols/silc/silc.c:1344
 msgid "list:  List channels on this network"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1350
+#: src/protocols/silc/silc.c:1348
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1354 src/protocols/zephyr/zephyr.c:2597
+#: src/protocols/silc/silc.c:1352 src/protocols/zephyr/zephyr.c:2466
 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:1358
+#: src/protocols/silc/silc.c:1356
 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:1362
+#: src/protocols/silc/silc.c:1360
 msgid "motd:  View the server's Message Of The Day"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1366
+#: src/protocols/silc/silc.c:1364
 msgid "detach:  Detach this session"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1370
+#: src/protocols/silc/silc.c:1368
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1374
+#: src/protocols/silc/silc.c:1372
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1380
+#: src/protocols/silc/silc.c:1378
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1384
+#: src/protocols/silc/silc.c:1382
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1388
+#: src/protocols/silc/silc.c:1386
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1392
+#: src/protocols/silc/silc.c:1390
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1396
+#: src/protocols/silc/silc.c:1394
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1400
+#: src/protocols/silc/silc.c:1398
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1404
+#: src/protocols/silc/silc.c:1402
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1408
+#: src/protocols/silc/silc.c:1406
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1412
+#: src/protocols/silc/silc.c:1410
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1416
+#: src/protocols/silc/silc.c:1414
 msgid "info [server]:  View server administrative details"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1420
+#: src/protocols/silc/silc.c:1418
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1424
+#: src/protocols/silc/silc.c:1422
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1428
+#: src/protocols/silc/silc.c:1426
 msgid "stats:  View server and network statistics"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1432
+#: src/protocols/silc/silc.c:1430
 msgid "ping:  Send PING to the connected server"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1437
+#: src/protocols/silc/silc.c:1435
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1441
+#: src/protocols/silc/silc.c:1439
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1453
+#: src/protocols/silc/silc.c:1451
 msgid "Instant Messages"
 msgstr "Välksõnumid"
 
-#: src/protocols/silc/silc.c:1458
+#: src/protocols/silc/silc.c:1456
 msgid "Digitally sign all IM messages"
 msgstr "Kõikide välksõnumite digitaalne signeerimine"
 
-#: src/protocols/silc/silc.c:1463
+#: src/protocols/silc/silc.c:1461
 msgid "Verify all IM message signatures"
 msgstr "Kõikide välksõnumite signatuuri kontrollimine"
 
-#: src/protocols/silc/silc.c:1466
+#: src/protocols/silc/silc.c:1464
 msgid "Channel Messages"
 msgstr "Kanali sõnumid"
 
-#: src/protocols/silc/silc.c:1471
+#: src/protocols/silc/silc.c:1469
 msgid "Digitally sign all channel messages"
 msgstr "Kõikide kanalisõnumite digitaalne signeerimine"
 
-#: src/protocols/silc/silc.c:1476
+#: src/protocols/silc/silc.c:1474
 msgid "Verify all channel message signatures"
 msgstr "Kõikide kanalisõnumite signatuuri kontrollimine"
 
@@ -9674,40 +9809,40 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1564
+#: src/protocols/silc/silc.c:1563
 msgid "SILC Protocol Plugin"
 msgstr "SILC protokolli plugin"
 
 #. *  description
-#: src/protocols/silc/silc.c:1566
+#: src/protocols/silc/silc.c:1565
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) protokoll"
 
-#: src/protocols/silc/silc.c:1600
+#: src/protocols/silc/silc.c:1599
 msgid "Public Key file"
 msgstr "Avaliku võtme fail"
 
-#: src/protocols/silc/silc.c:1604
+#: src/protocols/silc/silc.c:1603
 msgid "Private Key file"
 msgstr "Salajase võtme fail"
 
-#: src/protocols/silc/silc.c:1607
+#: src/protocols/silc/silc.c:1606
 msgid "Public key authentication"
 msgstr "Avaliku võtmega autentimine"
 
-#: src/protocols/silc/silc.c:1611
+#: src/protocols/silc/silc.c:1610
 msgid "Reject watching by other users"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1614
+#: src/protocols/silc/silc.c:1613
 msgid "Block invites"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1617
+#: src/protocols/silc/silc.c:1616
 msgid "Block IMs without Key Exchange"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1620
+#: src/protocols/silc/silc.c:1619
 msgid "Reject online status attribute requests"
 msgstr ""
 
@@ -9778,7 +9913,7 @@
 
 #: src/protocols/silc/util.c:332 src/protocols/silc/util.c:333
 msgid "Public Key Information"
-msgstr "Avaliku võtme teave"
+msgstr "Avaliku võtme andmed"
 
 #: src/protocols/silc/util.c:515
 msgid "Paging"
@@ -9796,205 +9931,195 @@
 msgid "Terminal"
 msgstr "Terminal"
 
-#: src/protocols/toc/toc.c:139
+#: src/protocols/toc/toc.c:137
 #, c-format
 msgid "Looking up %s"
 msgstr ""
 
-#: src/protocols/toc/toc.c:148
-#, c-format
-msgid "Connect to %s failed"
-msgstr ""
-
-#: src/protocols/toc/toc.c:200
+#: src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr ""
 
-#: src/protocols/toc/toc.c:482
+#: src/protocols/toc/toc.c:480
 #, c-format
 msgid "Unable to write file %s."
 msgstr ""
 
-#: src/protocols/toc/toc.c:485
+#: src/protocols/toc/toc.c:483
 #, 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."
+
+#: src/protocols/toc/toc.c:486
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr ""
 
-#: src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:489
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s pole hetkel sisse logitud."
 
-#: src/protocols/toc/toc.c:494
+#: src/protocols/toc/toc.c:492
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr ""
 
-#: src/protocols/toc/toc.c:497
+#: src/protocols/toc/toc.c:495
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 
-#: src/protocols/toc/toc.c:500
+#: src/protocols/toc/toc.c:498
 #, c-format
 msgid "Chat in %s is not available."
 msgstr ""
 
-#: src/protocols/toc/toc.c:503
+#: src/protocols/toc/toc.c:501
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr ""
 
-#: src/protocols/toc/toc.c:506
+#: src/protocols/toc/toc.c:504
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr ""
 
-#: src/protocols/toc/toc.c:509
+#: src/protocols/toc/toc.c:507
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 
-#: src/protocols/toc/toc.c:512
+#: src/protocols/toc/toc.c:510
 msgid "Failure."
 msgstr "Tõrge."
 
-#: src/protocols/toc/toc.c:515
+#: src/protocols/toc/toc.c:513
 msgid "Too many matches."
 msgstr "Liiga palju vastavusi."
 
-#: src/protocols/toc/toc.c:518
+#: src/protocols/toc/toc.c:516
 msgid "Need more qualifiers."
 msgstr ""
 
-#: src/protocols/toc/toc.c:521
+#: src/protocols/toc/toc.c:519
 msgid "Dir service temporarily unavailable."
 msgstr "Kataloogiteenus pole ajutiselt saadaval."
 
-#: src/protocols/toc/toc.c:524
+#: src/protocols/toc/toc.c:522
 msgid "Email lookup restricted."
 msgstr ""
 
-#: src/protocols/toc/toc.c:527
+#: src/protocols/toc/toc.c:525
 msgid "Keyword ignored."
 msgstr ""
 
-#: src/protocols/toc/toc.c:530
+#: src/protocols/toc/toc.c:528
 msgid "No keywords."
 msgstr ""
 
-#: src/protocols/toc/toc.c:533
+#: src/protocols/toc/toc.c:531
 msgid "User has no directory information."
 msgstr ""
 
-#: src/protocols/toc/toc.c:537
+#: src/protocols/toc/toc.c:535
 msgid "Country not supported."
 msgstr ""
 
-#: src/protocols/toc/toc.c:540
+#: src/protocols/toc/toc.c:538
 #, c-format
 msgid "Failure unknown: %s."
 msgstr ""
 
-#: src/protocols/toc/toc.c:546
+#: src/protocols/toc/toc.c:544
 msgid "The service is temporarily unavailable."
 msgstr ""
 
-#: src/protocols/toc/toc.c:549
+#: src/protocols/toc/toc.c:547
 msgid "Your warning level is currently too high to log in."
 msgstr ""
 
+#: src/protocols/toc/toc.c:550
+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:552
-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
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr ""
 
-#: src/protocols/toc/toc.c:557
+#: src/protocols/toc/toc.c:555
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr ""
 
-#: src/protocols/toc/toc.c:584
-#, fuzzy
-msgid "Invalid Groupname"
-msgstr "Vigane grupp"
-
-#: src/protocols/toc/toc.c:668
+#: src/protocols/toc/toc.c:576
 msgid "Connection Closed"
 msgstr ""
 
-#: src/protocols/toc/toc.c:708
+#: src/protocols/toc/toc.c:616
 msgid "Waiting for reply..."
 msgstr ""
 
-#: src/protocols/toc/toc.c:786
+#: src/protocols/toc/toc.c:695
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 
-#: src/protocols/toc/toc.c:989
+#: src/protocols/toc/toc.c:892
 msgid "Password Change Successful"
 msgstr "Paroolimuutmine õnnestus"
 
-#: src/protocols/toc/toc.c:993
+#: src/protocols/toc/toc.c:896
 msgid "TOC has sent a PAUSE command."
 msgstr ""
 
-#: src/protocols/toc/toc.c:994
+#: src/protocols/toc/toc.c:897
 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
+#: src/protocols/toc/toc.c:1450
 msgid "Get Dir Info"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1689
+#: src/protocols/toc/toc.c:1586
 msgid "Set Dir Info"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1811
+#: src/protocols/toc/toc.c:1708
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1847
+#: src/protocols/toc/toc.c:1744
 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
+#: src/protocols/toc/toc.c:1789 src/protocols/toc/toc.c:1829
+#: src/protocols/toc/toc.c:1953 src/protocols/toc/toc.c:2041
 msgid "Could not connect for transfer."
 msgstr ""
 
-#: src/protocols/toc/toc.c:2089
+#: src/protocols/toc/toc.c:1986
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: src/protocols/toc/toc.c:2189
+#: src/protocols/toc/toc.c:2086
 msgid "Gaim - Save As..."
 msgstr ""
 
-#: src/protocols/toc/toc.c:2223
+#: src/protocols/toc/toc.c:2120
 #, 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
+#: src/protocols/toc/toc.c:2127
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr ""
@@ -10009,61 +10134,149 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
+#: src/protocols/toc/toc.c:2214 src/protocols/toc/toc.c:2216
 msgid "TOC Protocol Plugin"
 msgstr "TOC protokolli plugin"
 
-#: src/protocols/toc/toc.c:2337
+#: src/protocols/toc/toc.c:2235
 msgid "TOC host"
 msgstr ""
 
-#: src/protocols/toc/toc.c:2341
+#: src/protocols/toc/toc.c:2239
 msgid "TOC port"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:706
+#. Basic Profile group.
+#: src/protocols/trepia/trepia.c:264
+msgid "Basic Profile"
+msgstr ""
+
+#. E-Mail Address
+#: src/protocols/trepia/trepia.c:295
+msgid "E-Mail Address"
+msgstr ""
+
+#: src/protocols/trepia/trepia.c:301
+msgid "Profile Information"
+msgstr ""
+
+#. Instant Messagers
+#: src/protocols/trepia/trepia.c:307
+msgid "Instant Messagers"
+msgstr ""
+
+#. AIM
+#: src/protocols/trepia/trepia.c:311
+msgid "AIM"
+msgstr "AIM"
+
+#. ICQ
+#: src/protocols/trepia/trepia.c:315
+msgid "ICQ UIN"
+msgstr ""
+
+#. MSN
+#: src/protocols/trepia/trepia.c:319
+msgid "MSN"
+msgstr "MSN"
+
+#. Yahoo
+#: src/protocols/trepia/trepia.c:323
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#. I'm From
+#: src/protocols/trepia/trepia.c:328
+msgid "I'm From"
+msgstr ""
+
+#. Call the dialog.
+#: src/protocols/trepia/trepia.c:345
+msgid "Set your Trepia profile data."
+msgstr ""
+
+#: src/protocols/trepia/trepia.c:425
+msgid "Profile"
+msgstr ""
+
+#: src/protocols/trepia/trepia.c:439
+msgid "Set Profile"
+msgstr ""
+
+#: src/protocols/trepia/trepia.c:476
+msgid "Visit Homepage"
+msgstr ""
+
+#: src/protocols/trepia/trepia.c:822 src/protocols/trepia/trepia.c:825
+msgid "Local Users"
+msgstr ""
+
+#: src/protocols/trepia/trepia.c:1028
+msgid "Logging in"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: src/protocols/trepia/trepia.c:1275 src/protocols/trepia/trepia.c:1277
+msgid "Trepia Protocol Plugin"
+msgstr "Trepia protokolli plugin"
+
+#: src/protocols/yahoo/yahoo.c:419
+msgid ""
+"You have been logged off as you have logged in on a different machine or "
+"device."
+msgstr "Sind logiti välja kuna sa logisid sisse teisest masinast või seadmest."
+
+#: src/protocols/yahoo/yahoo.c:912
 msgid "Your Yahoo! message did not get sent."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:750 src/protocols/yahoo/yahoo.c:3481
+#: src/protocols/yahoo/yahoo.c:936 src/protocols/yahoo/yahoo.c:3520
 msgid "Buzz!!"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:795
+#: src/protocols/yahoo/yahoo.c:981
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr ""
 
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
-#.
-#: src/protocols/yahoo/yahoo.c:885
-#, fuzzy, c-format
+#. *
+#: src/protocols/yahoo/yahoo.c:1072
+#, 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:891
-#, fuzzy
+msgstr "Kasutaja %s soovib lisada %s oma sõbranimekirja%s%s."
+
+#: src/protocols/yahoo/yahoo.c:1078
 msgid "Message (optional) :"
-msgstr "Sõnumitest teavitaja"
-
-#: src/protocols/yahoo/yahoo.c:933
+msgstr "Sõnum (pole kohustuslik) :"
+
+#: src/protocols/yahoo/yahoo.c:1120
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:936
+#: src/protocols/yahoo/yahoo.c:1123
 #, 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:939
+#: src/protocols/yahoo/yahoo.c:1126
 msgid "Add buddy rejected"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1681
+#: src/protocols/yahoo/yahoo.c:1887
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10071,30 +10284,30 @@
 "on to Yahoo.  Check %s for updates."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1684
+#: src/protocols/yahoo/yahoo.c:1890
 msgid "Failed Yahoo! Authentication"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1757
+#: src/protocols/yahoo/yahoo.c:1962
 #, 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:1760
+#: src/protocols/yahoo/yahoo.c:1965
 msgid "Ignore buddy?"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1794
+#: src/protocols/yahoo/yahoo.c:1999
 msgid "Invalid username."
 msgstr "Vigane kasutajanimi."
 
-#: src/protocols/yahoo/yahoo.c:1805
+#: src/protocols/yahoo/yahoo.c:2010
 msgid "Normal authentication failed!"
 msgstr "Tõrge tavalisel autentimisel!"
 
-#: src/protocols/yahoo/yahoo.c:1806
+#: src/protocols/yahoo/yahoo.c:2011
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10105,122 +10318,101 @@
 "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:1814
+#: src/protocols/yahoo/yahoo.c:2019
 msgid "Incorrect password."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1817
+#: src/protocols/yahoo/yahoo.c:2022
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1820
+#: src/protocols/yahoo/yahoo.c:2025
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1874
+#: src/protocols/yahoo/yahoo.c:2079
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1877
+#: src/protocols/yahoo/yahoo.c:2082
 msgid "Could not add buddy to server list"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2121 src/protocols/yahoo/yahoo.c:2267
-#: src/protocols/yahoo/ycht.c:413
+#: src/protocols/yahoo/yahoo.c:2319 src/protocols/yahoo/yahoo.c:2467
+#: src/protocols/yahoo/ycht.c:414
 msgid "Unable to read"
-msgstr "Ei suuda lugeda"
-
-#: src/protocols/yahoo/yahoo.c:2289 src/protocols/yahoo/yahoo.c:2417
-#: src/protocols/yahoo/yahoo.c:2502 src/protocols/yahoo/yahoo.c:2512
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
-#: src/protocols/yahoo/ycht.c:517
+msgstr "Pole võimalik lugeda"
+
+#: src/protocols/yahoo/yahoo.c:2489 src/protocols/yahoo/yahoo.c:2610
+#: src/protocols/yahoo/yahoo.c:2660 src/protocols/yahoo/yahoo.c:2670
+#: src/protocols/yahoo/yahoochat.c:1461 src/protocols/yahoo/yahoochat.c:1528
+#: src/protocols/yahoo/ycht.c:518
 msgid "Connection problem"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:3212
+msgstr "Ühendumisprobleem"
+
+#: src/protocols/yahoo/yahoo.c:2764 src/protocols/yahoo/yahoo.c:3131
+#: src/protocols/yahoo/yahoo.c:3245
 msgid "Not At Home"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2617 src/protocols/yahoo/yahoo.c:3215
+#: src/protocols/yahoo/yahoo.c:2766 src/protocols/yahoo/yahoo.c:3133
+#: src/protocols/yahoo/yahoo.c:3246
 msgid "Not At Desk"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:3218
+#: src/protocols/yahoo/yahoo.c:2768 src/protocols/yahoo/yahoo.c:3135
+#: src/protocols/yahoo/yahoo.c:3247
 msgid "Not In Office"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2623 src/protocols/yahoo/yahoo.c:3224
+#: src/protocols/yahoo/yahoo.c:2772 src/protocols/yahoo/yahoo.c:3139
+#: src/protocols/yahoo/yahoo.c:3249
 msgid "On Vacation"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2627 src/protocols/yahoo/yahoo.c:3230
+#: src/protocols/yahoo/yahoo.c:2776 src/protocols/yahoo/yahoo.c:3143
+#: src/protocols/yahoo/yahoo.c:3251
 msgid "Stepped Out"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2719 src/protocols/yahoo/yahoo.c:2746
+#: src/protocols/yahoo/yahoo.c:2857 src/protocols/yahoo/yahoo.c:2883
 msgid "Not on server list"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2769 src/protocols/yahoo/yahoo.c:2829
-#, fuzzy
-msgid "Appear Online"
-msgstr "Ühendatud"
-
-#: src/protocols/yahoo/yahoo.c:2772 src/protocols/yahoo/yahoo.c:2851
-msgid "Appear Permanently Offline"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2790
-#, fuzzy
-msgid "Stealth"
-msgstr "Otsi"
-
-#: src/protocols/yahoo/yahoo.c:2845
-msgid "Don't Appear Permanently Offline"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2884
+#: src/protocols/yahoo/yahoo.c:2962
 msgid "Join in Chat"
 msgstr "Ühine vestluseks"
 
-#: src/protocols/yahoo/yahoo.c:2889
+#: src/protocols/yahoo/yahoo.c:2967
 msgid "Initiate Conference"
 msgstr "Algata konverents"
 
-#: src/protocols/yahoo/yahoo.c:2914
-msgid "Stealth Settings"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2945
+#: src/protocols/yahoo/yahoo.c:3019
 msgid "Active which ID?"
 msgstr "Milline ID aktiveerida?"
 
-#: src/protocols/yahoo/yahoo.c:2954
+#: src/protocols/yahoo/yahoo.c:3028
 msgid "Join who in chat?"
 msgstr "Kellega ühineda jututoas?"
 
-#: src/protocols/yahoo/yahoo.c:2964
+#: src/protocols/yahoo/yahoo.c:3038
 msgid "Activate ID..."
 msgstr "Aktiveeri ID..."
 
-#: src/protocols/yahoo/yahoo.c:2968
+#: src/protocols/yahoo/yahoo.c:3042
 msgid "Join user in chat..."
 msgstr "Ühine kasutajaga jututoas..."
 
-#: src/protocols/yahoo/yahoo.c:3523
+#: src/protocols/yahoo/yahoo.c:3562
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3527
+#: src/protocols/yahoo/yahoo.c:3566
 msgid "buzz: Buzz a contact to get their attention"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3532
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10231,300 +10423,294 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3621 src/protocols/yahoo/yahoo.c:3623
+#: src/protocols/yahoo/yahoo.c:3645 src/protocols/yahoo/yahoo.c:3647
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo protokolli plugin"
 
-#: src/protocols/yahoo/yahoo.c:3640
+#: src/protocols/yahoo/yahoo.c:3666
 msgid "Yahoo Japan"
 msgstr "Jaapani Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3643
+#: src/protocols/yahoo/yahoo.c:3669
 msgid "Pager host"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3646
+#: src/protocols/yahoo/yahoo.c:3672
 msgid "Japan Pager host"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3649
+#: src/protocols/yahoo/yahoo.c:3675
 msgid "Pager port"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3652
+#: src/protocols/yahoo/yahoo.c:3678
 msgid "File transfer host"
 msgstr "Failiülekande host"
 
-#: src/protocols/yahoo/yahoo.c:3655
+#: src/protocols/yahoo/yahoo.c:3681
 msgid "Japan File transfer host"
 msgstr "Jaapani failiülekande host"
 
-#: src/protocols/yahoo/yahoo.c:3658
+#: src/protocols/yahoo/yahoo.c:3684
 msgid "File transfer port"
 msgstr "Failiülekande port"
 
-#: src/protocols/yahoo/yahoo.c:3661
-#, fuzzy
+#: src/protocols/yahoo/yahoo.c:3687
 msgid "Chat Room Locale"
-msgstr "Jututubade nimekirja URL"
-
-#: src/protocols/yahoo/yahoo.c:3664
+msgstr "Jututoa lokaat"
+
+#: src/protocols/yahoo/yahoo.c:3690
 msgid "Chat Room List Url"
-msgstr "Jututubade nimekirja URL"
-
-#: src/protocols/yahoo/yahoo.c:3667
+msgstr "Jutututoaloendi URL"
+
+#: src/protocols/yahoo/yahoo.c:3693
 msgid "YCHT Host"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3670
+#: src/protocols/yahoo/yahoo.c:3696
 msgid "YCHT Port"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:672
+#: src/protocols/yahoo/yahoochat.c:206
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:208
+msgid "Invitation Rejected"
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:363
+msgid "Failed to join chat"
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:363
+msgid "Maybe the room is full?"
+msgstr "Võibolla on tuba täis?"
+
+#: src/protocols/yahoo/yahoochat.c:441
+#, c-format
+msgid "You are now chatting in %s."
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:616
+msgid "Failed to join buddy in chat"
+msgstr "Tõrge sõbraga jututoas ühinemisel"
+
+#: src/protocols/yahoo/yahoochat.c:617
+msgid "Maybe they're not in a chat?"
+msgstr "Võibolla pole nad jututoas?"
+
+#: src/protocols/yahoo/yahoochat.c:1394
+msgid "Fetching the room list failed."
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:1447
+msgid "Voices"
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:1450
+msgid "Webcams"
+msgstr "Veebikaamerad"
+
+#: src/protocols/yahoo/yahoochat.c:1461 src/protocols/yahoo/yahoochat.c:1528
+msgid "Unable to fetch room list."
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:1521
+msgid "User Rooms"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:675
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP aadress:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:748
+#: src/protocols/yahoo/yahoo_profile.c:751
 msgid "Yahoo! Japan Profile"
 msgstr "Jaapani Yahoo! profiil"
 
-#: src/protocols/yahoo/yahoo_profile.c:749
+#: src/protocols/yahoo/yahoo_profile.c:752
 msgid "Yahoo! Profile"
 msgstr "Yahoo! profiil"
 
-#: src/protocols/yahoo/yahoo_profile.c:793
+#: src/protocols/yahoo/yahoo_profile.c:796
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:795
+#: src/protocols/yahoo/yahoo_profile.c:798
 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:971
+#: src/protocols/yahoo/yahoo_profile.c:976
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo_profile.c:1043
-#: src/protocols/yahoo/yahoo_profile.c:1047
-#: src/protocols/yahoo/yahoo_profile.c:1051
+#: src/protocols/yahoo/yahoo_profile.c:1050
+#: src/protocols/yahoo/yahoo_profile.c:1054
+#: src/protocols/yahoo/yahoo_profile.c:1058
 msgid "Hobbies"
 msgstr "Hobid"
 
-#: src/protocols/yahoo/yahoo_profile.c:1061
-#: src/protocols/yahoo/yahoo_profile.c:1065
+#: src/protocols/yahoo/yahoo_profile.c:1068
+#: src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Latest News"
 msgstr "Viimased uudised"
 
-#: src/protocols/yahoo/yahoo_profile.c:1086
+#: src/protocols/yahoo/yahoo_profile.c:1093
 msgid "Home Page"
 msgstr "Koduleht"
 
-#: src/protocols/yahoo/yahoo_profile.c:1101
+#: src/protocols/yahoo/yahoo_profile.c:1108
 msgid "Cool Link 1"
 msgstr "Lahe viit nr 1"
 
-#: src/protocols/yahoo/yahoo_profile.c:1106
+#: src/protocols/yahoo/yahoo_profile.c:1113
 msgid "Cool Link 2"
 msgstr "Lahe viit nr 2"
 
-#: src/protocols/yahoo/yahoo_profile.c:1110
+#: src/protocols/yahoo/yahoo_profile.c:1117
 msgid "Cool Link 3"
 msgstr "Lahe viit nr 3"
 
-#: src/protocols/yahoo/yahoo_profile.c:1123
-#, fuzzy
+#: src/protocols/yahoo/yahoo_profile.c:1130
 msgid "Last Update"
 msgstr "Viimati uuendatud"
 
-#: src/protocols/yahoo/yahoo_profile.c:1129
+#: src/protocols/yahoo/yahoo_profile.c:1136
 #, c-format
 msgid "User information for %s unavailable"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:1135
+#: src/protocols/yahoo/yahoo_profile.c:1142
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:1151
+#: src/protocols/yahoo/yahoo_profile.c:1158
 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:1154
+#: src/protocols/yahoo/yahoo_profile.c:1161
 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:1162
+#: src/protocols/yahoo/yahoo_profile.c:1169
 msgid "The user's profile is empty."
 msgstr "Kasutajaprofiil on tühi."
 
-#: src/protocols/yahoo/yahoochat.c:202
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:204
-msgid "Invitation Rejected"
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:358
-msgid "Failed to join chat"
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:358
-msgid "Maybe the room is full?"
-msgstr "Võibolla on tuba täis?"
-
-#: src/protocols/yahoo/yahoochat.c:435
-#, c-format
-msgid "You are now chatting in %s."
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:608
-msgid "Failed to join buddy in chat"
-msgstr "Tõrge sõbraga jututoas ühinemisel"
-
-#: src/protocols/yahoo/yahoochat.c:609
-msgid "Maybe they're not in a chat?"
-msgstr "Võibolla pole nad jututoas?"
-
-#: src/protocols/yahoo/yahoochat.c:1326
-msgid "Fetching the room list failed."
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:1379
-msgid "Voices"
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:1382
-msgid "Webcams"
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
-msgid "Unable to fetch room list."
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:1453
-msgid "User Rooms"
-msgstr ""
-
-#: src/protocols/yahoo/ycht.c:400
+#: src/protocols/yahoo/ycht.c:401
 msgid "Connection problem with the YCHT server."
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:331
+#: src/protocols/zephyr/zephyr.c:327
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:686
-#, fuzzy, c-format
-msgid "Unable to send to chat %s,%s,%s"
-msgstr "Pole võimalik autentida: %s"
-
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
+#: src/protocols/zephyr/zephyr.c:682
+#, c-format
+msgid "Unable send to chat %s,%s,%s"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:715 src/protocols/zephyr/zephyr.c:1124
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Kasutaja:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
+#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1129
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Peidetud või pole sisse logitud"
 
-#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
+#: src/protocols/zephyr/zephyr.c:724 src/protocols/zephyr/zephyr.c:1131
 #, c-format
 msgid "<br>At %s since %s"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
+#: src/protocols/zephyr/zephyr.c:1414 src/protocols/zephyr/zephyr.c:1415
 msgid "Anyone"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:2273
+msgstr "Igaüks"
+
+#: src/protocols/zephyr/zephyr.c:2143
 msgid "_Class:"
 msgstr "_Klass:"
 
-#: src/protocols/zephyr/zephyr.c:2279
+#: src/protocols/zephyr/zephyr.c:2149
 msgid "_Instance:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2285
+#: src/protocols/zephyr/zephyr.c:2155
 msgid "_Recipient:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2296
+#: src/protocols/zephyr/zephyr.c:2166
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2602
+#: src/protocols/zephyr/zephyr.c:2471
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2607
+#: src/protocols/zephyr/zephyr.c:2476
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2612
+#: src/protocols/zephyr/zephyr.c:2481
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2617
+#: src/protocols/zephyr/zephyr.c:2486
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2622
-msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:2628
+#: src/protocols/zephyr/zephyr.c:2492
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2633
+#: src/protocols/zephyr/zephyr.c:2497
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2639
+#: src/protocols/zephyr/zephyr.c:2503
 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:2645
+#: src/protocols/zephyr/zephyr.c:2509
 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:2651
+#: src/protocols/zephyr/zephyr.c:2515
 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:2656
+#: src/protocols/zephyr/zephyr.c:2520
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2762
+#: src/protocols/zephyr/zephyr.c:2626
 msgid "Resubscribe"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2765
+#: src/protocols/zephyr/zephyr.c:2629
 msgid "Retrieve subscriptions from server"
 msgstr ""
 
@@ -10538,871 +10724,208 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
+#: src/protocols/zephyr/zephyr.c:2712 src/protocols/zephyr/zephyr.c:2714
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr protokolli plugin"
 
-#: src/protocols/zephyr/zephyr.c:2874
+#: src/protocols/zephyr/zephyr.c:2739
 msgid "Export to .anyone"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2877
+#: src/protocols/zephyr/zephyr.c:2742
 msgid "Export to .zephyr.subs"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2880
-msgid "Import from .anyone"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:2883
-msgid "Import from .zephyr.subs"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:2886
-#, fuzzy
-msgid "Realm"
-msgstr "Tegelik nimi"
-
-#: src/protocols/zephyr/zephyr.c:2889
+#: src/protocols/zephyr/zephyr.c:2745
 msgid "Exposure"
 msgstr ""
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:1036
+#: src/proxy.c:958
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr ""
 
-#: src/proxy.c:1040
+#: src/proxy.c:962
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Proksiga ühendumise viga %d"
 
-#: src/proxy.c:1874
+#: src/proxy.c:1790
 msgid "Invalid proxy settings"
 msgstr "Vigased proksi sätted"
 
-#: src/proxy.c:1874
+#: src/proxy.c:1790
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
 
+#. * Custom away message.
+#: src/prpl.h:187
+msgid "Custom"
+msgstr "Kohandatud"
+
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1341
+#: src/request.h:1255
 msgid "Accept"
 msgstr "Nõustu"
 
-#: src/server.c:243
+#: src/server.c:64
+msgid "Please enter your password"
+msgstr "Palun sisesta oma parool"
+
+#: src/server.c:533
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s on nüüd nimega %s.\n"
 
-#: src/server.c:625
+#: src/server.c:978
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d sõnum)"
 msgstr[1] "(%d sõnumit)"
 
-#: src/server.c:639
+#: src/server.c:992
 msgid "(1 message)"
 msgstr "(1 sõnum)"
 
-#: src/server.c:860
-#, 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:865
-#, c-format
-msgid "%s has invited %s to the chat room %s\n"
-msgstr "%s kutsub kasutaja %s jututuppa %s\n"
-
-#: src/server.c:869
-msgid "Accept chat invitation?"
-msgstr "Kas nõustume jututoa kutsega?"
-
-#: src/status.c:153
-#, fuzzy
-msgid "Unset"
-msgstr "L_isa"
-
-#: src/status.c:156
-msgid "Unavailable"
-msgstr ""
-
-#: src/status.c:621
+#: src/server.c:1215 src/server.c:1224
+#, c-format
+msgid "%s logged in."
+msgstr "%s logis sisse."
+
+#: src/server.c:1236
+#, c-format
+msgid "%s signed on"
+msgstr ""
+
+#: src/server.c:1251
 #, c-format
 msgid "%s came back"
 msgstr "%s tuli tagasi"
 
-#: src/status.c:626
+#: src/server.c:1253
 #, c-format
 msgid "%s went away"
 msgstr "%s läks eemale"
 
-#: src/status.c:1308
+#: src/server.c:1267
 #, c-format
 msgid "%s became idle"
-msgstr ""
-
-#: src/status.c:1323
+msgstr "%s on eemal"
+
+#: src/server.c:1278
 #, c-format
 msgid "%s became unidle"
-msgstr ""
-
-#: src/status.c:1697
-#, fuzzy
-msgid "Default auto-away"
-msgstr "Automaatne eemaldumine"
-
-#: src/util.c:2121
-#, fuzzy, c-format
-msgid "Error Reading %s"
-msgstr "Viga pildi salvestamisel: %s"
-
-#: src/util.c:2122
-#, 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:2559
+msgstr "%s ei ole enam eemal"
+
+#: src/server.c:1288 src/server.c:1295
+#, c-format
+msgid "%s logged out."
+msgstr "%s logis välja."
+
+#: src/server.c:1308
+#, c-format
+msgid "%s signed off"
+msgstr ""
+
+#: src/server.c:1370
+#, c-format
+msgid ""
+"%s has just been warned by %s.\n"
+"Your new warning level is %d%%"
+msgstr ""
+
+#: src/server.c:1373
+msgid "an anonymous person"
+msgstr "anonüümne isik"
+
+#: src/server.c:1487
+#, c-format
+msgid ""
+"%s has invited %s to the chat room %s:\n"
+"<b>%s</b>"
+msgstr ""
+"%s kutsub kasutaja %s jututuppa %s:\n"
+"<b>%s</b>"
+
+#: src/server.c:1493
+#, c-format
+msgid "%s has invited %s to the chat room %s\n"
+msgstr "%s kutsub kasutaja %s jututuppa %s\n"
+
+#: src/server.c:1502
+msgid "Accept chat invitation?"
+msgstr "Kas nõustume jututoa kutsega?"
+
+#. for people like myself who are too lazy to add an away msg :)
+#. I don't know who "myself" is in this context.  The exclamation point
+#. * makes it slightly less boring ;)
+#: src/status.c:36
+msgid "Sorry, I ran out for a bit!"
+msgstr "Vabandust, olen hetkel natuke eemal!"
+
+#: src/stock.c:87
+msgid "_Alias"
+msgstr "_Alias"
+
+#: src/stock.c:89
+msgid "_Invite"
+msgstr "_Kutsu"
+
+#: src/stock.c:90
+msgid "_Modify"
+msgstr "_Muuda"
+
+#: src/stock.c:91
+msgid "_Open Mail"
+msgstr "_Ava sõnum"
+
+#: src/stock.c:93
+msgid "_Warn"
+msgstr "_Hoiata"
+
+#: src/util.c:2403
 msgid "Calculating..."
-msgstr ""
-
-#: src/util.c:2562
+msgstr "Arvutamine..."
+
+#: src/util.c:2406
 msgid "Unknown."
 msgstr "Tundmatu."
 
-#: src/util.c:2592
+#: src/util.c:2436
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekund"
 msgstr[1] "sekundit"
 
-#: src/util.c:2606
+#: src/util.c:2450
 msgid "day"
 msgid_plural "days"
 msgstr[0] "päev"
 msgstr[1] "päeva"
 
-#: src/util.c:2614
+#: src/util.c:2458
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "tund"
 msgstr[1] "tundi"
 
-#: src/util.c:2622
+#: src/util.c:2466
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minutit"
 
-#: src/util.c:3045
+#: src/util.c:2886
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Viga ühenduse avamisel.\n"
 
-#~ msgid "Restore Away State On Reconnect"
-#~ msgstr "Taasühendumisel taastatakse eemalolek"
-
-#~ msgid "Mail Server"
-#~ msgstr "Postiserver"
-
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s (%d uut/%d kokku)"
-
-#~ msgid "Check Mail"
-#~ msgstr "E-posti kontrollimine"
-
-#~ msgid "Check email every X seconds.\n"
-#~ msgstr "E-posti kontrollimine iga X sekundi tagant.\n"
-
-#~ msgid "Auto-login"
-#~ msgstr "Automaatne sisselogimine"
-
-#~ msgid "New..."
-#~ msgstr "Uus..."
-
-#~ msgid "Back"
-#~ msgstr "Tagasi"
-
-#~ msgid "Signoff"
-#~ msgstr "Logi välja"
-
-#~ msgid "Tray Icon Configuration"
-#~ msgstr "Süsteemisalve ikooni sätted"
-
-#~ msgid "_Hide new messages until tray icon is clicked"
-#~ msgstr "_Uute sõnumite peitmine kuni ikoonil pole klõpsatud"
-
-#~ msgid "No screenname given."
-#~ msgstr "Ekraaninime pole määratud."
-
-#~ msgid "No roomname given."
-#~ msgstr "Toa nime pole määratud."
-
-#~ msgid "Invalid AIM URI"
-#~ msgstr "Vigane AIM'i URI"
-
-#~ msgid "Unable to open socket"
-#~ msgstr "Soklit pole võimalik avada"
-
-#~ msgid "Remote Control"
-#~ msgstr "Kaugjuhtimine"
-
-#~ msgid "Provides remote control for gaim applications."
-#~ msgstr "Gaimi rakenduste kaugjuhtimine."
-
-#~ msgid ""
-#~ "Gives Gaim the ability to be remote-controlled through third-party "
-#~ "applications or through the gaim-remote tool."
-#~ msgstr ""
-#~ "Lisab Gaim'ile kaugjuhtimise võimaluse kolmandate osapoolte rakenduste "
-#~ "või gaim-remote vahendi abil."
-
-#~ msgid "_Apply"
-#~ msgstr "_Rakenda"
-
-#~ msgid "Docked _Buddy List is always on top"
-#~ msgstr "D_okitud sõbranimekiri on alati pealmine"
-
-#~ msgid "Away!"
-#~ msgstr "Eemal!"
-
-#~ msgid "Edit This Message"
-#~ msgstr "Muuda seda teadet"
-
-#~ msgid "I'm Back!"
-#~ msgstr "Olen tagasi!"
-
-#~ msgid "Are you sure you want to remove the away message \"%s\"?"
-#~ msgstr "Kas sa tõesti soovid eemaldada eemalolekuteadet \"%s\"?"
-
-#~ msgid "Remove Away Message"
-#~ msgstr "Eemalda eemaloleku teade"
-
-#~ msgid "Set All Away"
-#~ msgstr "Määra kõik eemalolevaks"
-
-#~ msgid "You cannot save an away message with a blank title"
-#~ msgstr "Sa ei saa ühtegi teadet salvestada tühja pealkirjaga"
-
-#~ msgid ""
-#~ "Please give the message a title, or choose \"Use\" to use without saving."
-#~ msgstr ""
-#~ "Palun määra teatele pealkiri või vali \"Kasuta\" kasutamiseks ilma "
-#~ "salvestamata."
-
-#~ msgid "You cannot create an empty away message"
-#~ msgstr "Sa ei saa luua tühja eemalolekuteadet"
-
-#~ msgid "New away message"
-#~ msgstr "Uus eemaloleku teade"
-
-#~ msgid "Away title: "
-#~ msgstr "Eemaloleku pealkiri: "
-
-#~ msgid "_Save"
-#~ msgstr "_Salvesta"
-
-#~ msgid "Sa_ve & Use"
-#~ msgstr "Sal_vesta ja kasuta"
-
-#~ msgid "Buddy List Error"
-#~ msgstr "Sõbranimekirja viga"
-
-#~ msgid ""
-#~ "Usage: %s command [OPTIONS] [URI]\n"
-#~ "\n"
-#~ "    COMMANDS:\n"
-#~ "       uri                      Handle AIM: URI\n"
-#~ "       away                     Popup the away dialog with the default "
-#~ "message\n"
-#~ "       back                     Remove the away dialog\n"
-#~ "       quit                     Close running copy of Gaim\n"
-#~ "\n"
-#~ "    OPTIONS:\n"
-#~ "       -h, --help [command]     Show help for command\n"
-#~ msgstr ""
-#~ "Kasutamine: %s käsk [VÕTI] [URI]\n"
-#~ "\n"
-#~ "    KÄSUD:\n"
-#~ "       uri                      Käsitletakse AIM: URI\n"
-#~ "       away                     Eemalolekuakna kuvamine koos vaikimisi "
-#~ "teatega\n"
-#~ "       back                     Eemalolekudialoogi eemaldamine\n"
-#~ "       quit                     Töötava Gaim'i koopia sulgemine\n"
-#~ "\n"
-#~ "    VÕTMED:\n"
-#~ "       -h, --help [käsk]        Käsu kohta abiteabe näitamine\n"
-
-#~ msgid ""
-#~ "Gaim not running (on session 0)\n"
-#~ "Is the \"Remote Control\" plugin loaded?\n"
-#~ msgstr ""
-#~ "Gaim ei tööta (seanss 0)\n"
-#~ "Kas plugin \"Kaugjuhtimine\" on laetud?\n"
-
-#~ msgid "Show fewer options"
-#~ msgstr "Näita vähem valikuid"
-
-#~ msgid "/Buddies/_Signoff"
-#~ msgstr "/Sõbrad/_Logi välja"
-
-#~ msgid "/Tools/_Away"
-#~ msgstr "/Vahendid/_Eemal"
-
-#~ msgid "/Tools/Pl_ugin Actions"
-#~ msgstr "/Vahendid/P_luginatoimingud"
-
-#~ msgid "Rename Group"
-#~ msgstr "Grupi ümbernimetamine"
-
-#~ msgid "New group name"
-#~ msgstr "Uus grupinimi"
-
-#~ msgid "Please enter a new name for the selected group."
-#~ msgstr "Palun sisesta valitud grupile uus nimi."
-
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Konto:</b>"
-
-#~ msgid "Send a message to the selected buddy"
-#~ msgstr "Sõnumi saatmine valitud sõbrale"
-
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Valitud sõpra puudutava teabe hankimine"
-
-#~ msgid "_Chat"
-#~ msgstr "_Jututuba"
-
-#~ msgid "Join a chat room"
-#~ msgstr "Ühinemine jututoaga"
-
-#~ msgid "_Away"
-#~ msgstr "_Eemal"
-
-#~ msgid "Set an away message"
-#~ msgstr "Eemaloleku teate määramine"
-
-#~ msgid "Done."
-#~ msgstr "Valmis."
-
-#~ msgid "Signon: "
-#~ msgstr "Sisselogimine: "
-
-#~ msgid "Signon"
-#~ msgstr "Sisselogimine"
-
-#~ msgid "Cancel All"
-#~ msgstr "Loobu kõigist"
-
-#~ msgid "_Reconnect"
-#~ msgstr "Ühendu _uuesti"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s pole ühendatud.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-
-#~ msgid "Reconnect _All"
-#~ msgstr "Ühendu _kõikjale uuesti"
-
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/Vestlus/_Hoiata"
-
-#~ msgid "Warn"
-#~ msgstr "Hoiata"
-
-#~ msgid "Warn the user"
-#~ msgstr "Kasutaja hoiatamine"
-
-#~ msgid "Block the user"
-#~ msgstr "Kasutaja blokeerimine"
-
-#~ msgid "Send a file to the user"
-#~ msgstr "Faili saatmine kasutajale"
-
-#~ msgid "Add the user to your buddy list"
-#~ msgstr "Kasutaja lisamine sõbranimekirja"
-
-#~ msgid "Remove the user from your buddy list"
-#~ msgstr "Kasutaja eemaldamine sinu sõbranimekirjast"
-
-#~ msgid "Send"
-#~ msgstr "Saada"
-
-#~ msgid "Invite"
-#~ msgstr "Kutsu"
-
-#~ msgid "Invite a user"
-#~ msgstr "Kasutaja kutsumine"
-
-#~ msgid "Add the chat to your buddy list"
-#~ msgstr "Jututoa lisamine sinu sõbranimekirja"
-
-#~ msgid "former lead developer"
-#~ msgstr "endine juhtiv arendaja"
-
-#~ msgid "former maintainer"
-#~ msgstr "endine hooldaja"
-
-#, fuzzy
-#~ msgid "Azerbaijani"
-#~ msgstr "Serbia"
-
-#~ msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
-#~ msgstr "Vladimira Girginova ja Vladimir (Kaladan) Petkov"
-
-#~ msgid "Estonian"
-#~ msgstr "Eesti"
-
-#, fuzzy
-#~ msgid "Norwegian (Nynorsk)"
-#~ msgstr "Norra"
-
-#~ msgid "Albanian"
-#~ msgstr "Albaania"
-
-#~ msgid "Turkish"
-#~ msgstr "Türgi"
-
-#~ msgid "Ukrainian"
-#~ msgstr "Ukraina"
-
-#~ msgid "Chinese"
-#~ msgstr "Hiina"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-
-#~ msgid "_Screen name"
-#~ msgstr "_Ekraaninimi"
-
-#~ msgid "D_isplay remote nicknames if no alias is set"
-#~ msgstr "_Teise poole hüüdnimede kuvamine kui aliast pole seatud"
-
-#~ msgid "Display"
-#~ msgstr "Kuva"
-
-#~ msgid "Show _timestamp on messages"
-#~ msgstr "_Ajatemplite näitamine sõnumites"
-
-#~ msgid "Ignore c_olors"
-#~ msgstr "_Värvide eiramine"
-
-#~ msgid "Ignore font _faces"
-#~ msgstr "_Kirjatüüpide eiramine"
-
-#~ msgid "Ignore font si_zes"
-#~ msgstr "Ki_rjasuuruste eiramine"
-
-#~ msgid "Default Formatting"
-#~ msgstr "Vaikimisi vormindamine"
-
-#~ msgid "_Send default formatting with outgoing messages"
-#~ msgstr "Väljuvad sõ_numid saadetakse vaikimisi vorminguga"
-
-#~ msgid "Send Message"
-#~ msgstr "Sõnumi saatmine"
-
-#~ msgid "Enter _sends message"
-#~ msgstr "Ente_r saadab sõnumi"
-
-#~ msgid "C_ontrol-Enter sends message"
-#~ msgstr "C_ontrol-Enter saadab sõnumi"
-
-#~ msgid "Window Closing"
-#~ msgstr "Akna sulgemine"
-
-#~ msgid "_Escape closes window"
-#~ msgstr "_Escape sulgeb akna"
-
-#~ msgid "Insertions"
-#~ msgstr "Lisamised"
-
-#~ msgid "Control-{B/I/U} changes _formatting"
-#~ msgstr "Control-{B/I/U} muudab _vormingut"
-
-#~ msgid "Control-(number) _inserts smileys"
-#~ msgstr "Control-(number) _lisab emotikoni"
-
-#~ msgid "Show _buttons as:"
-#~ msgstr "_Nuppude näitamine:"
-
-#~ msgid "Pictures"
-#~ msgstr "Piltidena"
-
-#~ msgid "Text"
-#~ msgstr "Tekstina"
-
-#~ msgid "Pictures and text"
-#~ msgstr "Piltide ja tekstina"
-
-#~ msgid "_Raise window on events"
-#~ msgstr "_Akna esiletõstmine sündmuste puhul"
-
-#~ msgid "Show _warning levels"
-#~ msgstr "_Hoiatustasemete näitamine"
-
-#~ msgid "_Automatically expand contacts"
-#~ msgstr "_Kontaktide automaatne laiendamine"
-
-#~ msgid "Show _aliases in tabs/titles"
-#~ msgstr "A_liaste näitamine sakkides/tiitlites"
-
-#~ msgid "_Raise IM window on events"
-#~ msgstr "Välksõnumi aken tõstetakse sündmuse _puhul esiplaanile"
-
-#~ msgid "Raise chat _window on events"
-#~ msgstr "_Jututoa aken tõstetakse sündmuse puhul esiplaanile"
-
-#~ msgid "Use _multi-colored screen names in chats"
-#~ msgstr "Jututoas kasutatakse _mitmevärvilisi ekraaninimesid"
-
-#~ msgid "Tab p_lacement:"
-#~ msgstr "Sakkide _asetus:"
-
-#~ msgid "New conversation _placement:"
-#~ msgstr "_Uue vestluse asetamine:"
-
-#~ msgid "Message Logs"
-#~ msgstr "Sõnumilogid"
-
-#~ msgid "System Logs"
-#~ msgstr "Süsteemsed logid"
-
-#~ msgid "_Enable system log"
-#~ msgstr "Süstee_mne logi lubatud"
-
-#~ msgid "Log when buddies _sign on/sign off"
-#~ msgstr "Logitakse sõprade s_isse- ja väljalogimisi"
-
-#~ msgid "Log when buddies become _idle/un-idle"
-#~ msgstr "Logitakse sõprade lülitumisi _tegevuseta ja aktiivse oleku vahel"
-
-#~ msgid "Log when buddies go away/come _back"
-#~ msgstr "Logitakse sõprade _eemaldumisi ja tagasitulekuid"
-
-#~ msgid "Log your _own signons/idleness/awayness"
-#~ msgstr ""
-#~ "Logitakse en_da tegevusi (sisse/väljalogimine, tegevusetus, eemaldumised)"
-
-#~ msgid "Idle _time reporting:"
-#~ msgstr "Tegevusetuse a_ja raporteerimine:"
-
-#~ msgid "Gaim usage"
-#~ msgstr "Gaim'i kasutus"
-
-#~ msgid "X usage"
-#~ msgstr "X'i kasutus"
-
-#~ msgid "Windows usage"
-#~ msgstr "Windows'i kasutus"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>\t%s\n"
-#~ "<span weight=\"bold\">Web site:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">File name:</span>\t%s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Autor:</span>\t%s\n"
-#~ "<span weight=\"bold\">Veebikoht:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">Failinimi:</span>\t%s"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">File name:</span>  %s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Autor:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">Failinimi:</span>  %s"
-
-#~ msgid "Load"
-#~ msgstr "Laetud"
-
-#~ msgid "Summary"
-#~ msgstr "Kokkuvõte"
-
-#~ msgid "Details"
-#~ msgstr "Üksikasjad"
-
-#~ msgid "_Edit"
-#~ msgstr "_Redigeeri"
-
-#~ msgid "Interface"
-#~ msgstr "Liides"
-
-#~ msgid "Message Text"
-#~ msgstr "Sõnumi tekst"
-
-#~ msgid "Shortcuts"
-#~ msgstr "Kiirkorraldused"
-
-#~ msgid "Away Messages"
-#~ msgstr "Eemaloleku teated"
-
-#~ msgid "Plugins"
-#~ msgstr "Pluginad"
-
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Plain text"
-#~ msgstr "Lihttekst"
-
-#~ msgid "Login"
-#~ msgstr "Sisselogimine"
-
-#~ msgid "<b>_Account:</b>"
-#~ msgstr "<b>_Konto:</b>"
-
-#~ msgid "<b>_Password:</b>"
-#~ msgstr "<b>_Parool:</b>"
-
-#~ msgid "A_ccounts"
-#~ msgstr "K_ontod"
-
-#~ msgid "P_references"
-#~ msgstr "_Eelistused"
-
-#~ msgid "_Sign on"
-#~ msgstr "_Logi sisse"
-
-#~ msgid ""
-#~ "Gaim %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -a, --acct          display account editor window\n"
-#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
-#~ "specifies\n"
-#~ "                      name of away message to use)\n"
-#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
-#~ "specifies\n"
-#~ "                      account(s) to use, seperated by commas)\n"
-#~ "  -n, --loginwin      don't automatically login; show login window\n"
-#~ "  -u, --user=NAME     use account NAME\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ "  -h, --help          display this help and exit\n"
-#~ msgstr ""
-#~ "Gaim %s\n"
-#~ "Kasutamine: %s [VÕTI]...\n"
-#~ "\n"
-#~ "  -a, --acct             kuvatakse kontoredaktori akent\n"
-#~ "  -w, --away[=SÕNUM]     eemaloleku seadmine peale sisselogimist "
-#~ "(argumendi\n"
-#~ "                         SÕNUM abil saab määrata eemaloleku teadet)\n"
-#~ "  -l, --login[=NIMI]     automaatne sisselogimine (argumendi NIMI abil "
-#~ "saab\n"
-#~ "                         määrata kontosid, mitme konto eraldajaks on "
-#~ "koma)\n"
-#~ "  -n, --loginwin         automaatse sisselogimise keelamine, kuvatakse\n"
-#~ "                         sisselogimisakent\n"
-#~ "  -u, --user=NIMI        konto määramine\n"
-#~ "  -c, --config=KATALOOG  seadistusfailide kataloogi määramine\n"
-#~ "  -d, --debug            silumisteadete väljastamine standardväljundisse\n"
-#~ "  -v, --version          käesoleva versiooni kuvamine ja programmi töö\n"
-#~ "                         lõpetamine\n"
-#~ "  -h, --help             käesoleva abiteksti kuvamine ja programmi töö\n"
-#~ "                         lõpetamine\n"
-
-#~ msgid "Unable to load preferences"
-#~ msgstr "Eelistusi pole võimalik laadida"
-
-#~ msgid "Slightly less boring default"
-#~ msgstr "Veidike igav vaikeväärtus"
-
-#~ msgid "Available for friends only"
-#~ msgstr "Saadaval ainult sõprade jaoks"
-
-#~ msgid "Unable to resolve hostname."
-#~ msgstr "Hostinime pole võimalik lahendada."
-
-#~ msgid "Error while reading from socket."
-#~ msgstr "Viga soklist lugemisel."
-
-#~ msgid "Error while writing to socket."
-#~ msgstr "Viga soklisse kirjutamisel."
-
-#~ msgid "Authentication failed."
-#~ msgstr "Tõrge autentimisel."
-
-#~ msgid "Unknown Error Code."
-#~ msgstr "Tundmatu veakood."
-
-#~ msgid "Status: %s"
-#~ msgstr "Olek: %s"
-
-#~ msgid "Reading data"
-#~ msgstr "Andmete lugemine"
-
-#~ msgid "Reading server key"
-#~ msgstr "Serveri võtme lugemine"
-
-#~ msgid "Exchanging key hash"
-#~ msgstr "Võtmeräsi vahetamine"
-
-#~ msgid "Critical error in GG library\n"
-#~ msgstr "Kriitiline viga GG teegis\n"
-
-#~ msgid "Unable to ping server"
-#~ msgstr "Serverit pole võimalik pingida"
-
-#~ msgid "Active"
-#~ msgstr "Aktiivne"
-
-#~ msgid "Birth Year"
-#~ msgstr "Sünniaasta"
-
-#~ msgid "Sex"
-#~ msgstr "Sugu"
-
-#~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
-#~ msgstr "Sõbranimekiri on Gadu-Gadu serverisse edukalt üle kantud"
-
-#~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
-#~ msgstr "Sõbranimekirja pole võimalik Gadu-Gadu serverisse üle kanda"
-
-#~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
-#~ msgstr "Sõbranimekiri on Gadu-Gadu serverist edukalt kustutatud"
-
-#~ msgid "Password couldn't be changed"
-#~ msgstr "Parooli pole võimalik muuta"
-
-#~ msgid "Error communicating with Gadu-Gadu server"
-#~ msgstr "Viga Gadu-Gadu serveriga suhtlemisel"
-
-#~ msgid "Couldn't export buddy list"
-#~ msgstr "Sõbranimekirja pole võimalik eksportida"
-
-#~ msgid "Unable to access directory"
-#~ msgstr "Kataloogile pole võimalik ligi pääseda"
-
-#~ msgid "Connecting..."
-#~ msgstr "Ühendumine..."
-
-#~ msgid "Nick:"
-#~ msgstr "Hüüdnimi:"
-
-#~ msgid "File Transfer Aborted"
-#~ msgstr "Failiülekanne katkestatud"
-
-#~ msgid "Buddy Information for %s"
-#~ msgstr "Teave sõbra %s kohta"
-
-#~ msgid "Invalid nickname '%s'"
-#~ msgstr "Vigane hüüdnimi '%s'"
-
-#~ msgid "Invalid nickname"
-#~ msgstr "Vigane hüüdnimi"
-
-#~ msgid "Roomlist Error"
-#~ msgstr "Tubade nimekirja viga"
-
-#~ msgid "Hide Operating System"
-#~ msgstr "Operatsioonisüsteemi peitmine"
-
-#~ msgid "Display conversation closed notices"
-#~ msgstr "Vestluse sulgemise märkuste kuvamine"
-
-#~ msgid "Display timeout notices"
-#~ msgstr "Ajapiirangu ületamise märkuste kuvamine"
-
-#~ msgid "The conversation has become inactive and timed out."
-#~ msgstr "Vestlus ületas ajapiirangu ja pole enam aktiivne."
-
-#~ msgid ""
-#~ "You were disconnected from the server, because you logged on from a "
-#~ "different location"
-#~ msgstr "Sind ühendati serverist lahti kuna sa logisid sisse teisest kohast"
-
-#~ msgid "User Properties"
-#~ msgstr "Kasutaja omadused"
-
-#, fuzzy
-#~ msgid "Transfer of file %s timed out."
-#~ msgstr "Fail %s täielikult üle kantud"
-
-#~ msgid "Not specified"
-#~ msgstr "Määramata"
-
-#~ msgid "ICQ Info for %s"
-#~ msgstr "ICQ teave %s kohta"
-
-#~ msgid "Failed to leave channel"
-#~ msgstr "Tõrge kanalilt lahkumisel"
-
-#~ msgid "AIM"
-#~ msgstr "AIM"
-
-#~ msgid "MSN"
-#~ msgstr "MSN"
-
-#~ msgid "Yahoo"
-#~ msgstr "Yahoo"
-
-#~ msgid "Trepia Protocol Plugin"
-#~ msgstr "Trepia protokolli plugin"
-
-#~ msgid ""
-#~ "You have been logged off as you have logged in on a different machine or "
-#~ "device."
-#~ msgstr ""
-#~ "Sind logiti välja kuna sa logisid sisse teisest masinast või seadmest."
-
-#~ msgid "Please enter your password"
-#~ msgstr "Palun sisesta oma parool"
-
-#~ msgid "%s logged in."
-#~ msgstr "%s logis sisse."
-
-#~ msgid "%s logged out."
-#~ msgstr "%s logis välja."
-
-#~ msgid "an anonymous person"
-#~ msgstr "anonüümne isik"
-
-#~ msgid ""
-#~ "%s has invited %s to the chat room %s:\n"
-#~ "<b>%s</b>"
-#~ msgstr ""
-#~ "%s kutsub kasutaja %s jututuppa %s:\n"
-#~ "<b>%s</b>"
-
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "Vabandust, olen hetkel natuke eemal!"
-
 #~ msgid "Default SILC Key Pair"
 #~ msgstr "Vaikimisi SILC võtmepaar"